Skip to content

Commit d411ee3

Browse files
SevenEarthSevenEarth
authored
feat(cvm): [117301871]update cvm e2e test (#2664)
* add * add * add * add * add
1 parent fff50d0 commit d411ee3

18 files changed

+492
-112
lines changed

‎tencentcloud/services/cvm/resource_tc_cvm_sync_image.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ func ResourceTencentCloudCvmSyncImage() *schema.Resource {
1818
Create: resourceTencentCloudCvmSyncImageCreate,
1919
Read: resourceTencentCloudCvmSyncImageRead,
2020
Delete: resourceTencentCloudCvmSyncImageDelete,
21-
Importer: &schema.ResourceImporter{
22-
State: schema.ImportStatePassthrough,
23-
},
21+
2422
Schema: map[string]*schema.Schema{
2523
"image_id": {
2624
Required: true,

‎tencentcloud/services/cvm/resource_tc_cvm_sync_image.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,13 @@ Provides a resource to create a cvm sync_image
33
Example Usage
44

55
```hcl
6-
resource "tencentcloud_cvm_sync_image" "sync_image" {
7-
image_id = "img-xxxxxx"
8-
destination_regions =["ap-guangzhou", "ap-shanghai"]
6+
data "tencentcloud_images" "example" {
7+
image_type = ["PRIVATE_IMAGE"]
8+
image_name_regex = "MyImage"
9+
}
10+
11+
resource "tencentcloud_cvm_sync_image" "example" {
12+
image_id = data.tencentcloud_images.example.images.0.image_id
13+
destination_regions = ["ap-guangzhou", "ap-shanghai"]
914
}
1015
```

‎tencentcloud/services/cvm/resource_tc_cvm_sync_image_test.go

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,23 +57,32 @@ func init() {
5757
})
5858
}
5959

60-
func TestAccTencentCloudCvmSyncImageResource_basic(t *testing.T) {
60+
// go test -i; go test -test.run TestAccTencentCloudNeedFixCvmSyncImageResource_basic -v
61+
func TestAccTencentCloudNeedFixCvmSyncImageResource_basic(t *testing.T) {
6162
t.Parallel()
6263
resource.Test(t, resource.TestCase{
63-
PreCheck: func() { tcacctest.AccPreCheckCommon(t, tcacctest.ACCOUNT_TYPE_PREPAY) },
64+
PreCheck: func() { tcacctest.AccPreCheck(t) },
6465
Providers: tcacctest.AccProviders,
6566
Steps: []resource.TestStep{
6667
{
6768
Config: testAccCvmSyncImage,
68-
Check: resource.ComposeTestCheckFunc(resource.TestCheckResourceAttrSet("tencentcloud_cvm_sync_image.sync_image", "id")),
69+
Check: resource.ComposeTestCheckFunc(
70+
resource.TestCheckResourceAttrSet("tencentcloud_cvm_sync_image.example", "id"),
71+
resource.TestCheckResourceAttrSet("tencentcloud_cvm_sync_image.example", "image_id"),
72+
resource.TestCheckResourceAttrSet("tencentcloud_cvm_sync_image.example", "destination_regions.#"),
73+
),
6974
},
7075
},
7176
})
7277
}
7378

7479
const testAccCvmSyncImage = `
75-
resource "tencentcloud_cvm_sync_image" "sync_image" {
76-
image_id = "img-k4h0m5la"
77-
destination_regions = ["ap-shanghai"]
80+
data "tencentcloud_images" "example" {
81+
image_type = ["PRIVATE_IMAGE"]
82+
}
83+
84+
resource "tencentcloud_cvm_sync_image" "example" {
85+
image_id = data.tencentcloud_images.example.images.0.image_id
86+
destination_regions = ["ap-shanghai"]
7887
}
7988
`

‎tencentcloud/services/cvm/resource_tc_eip.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ Provides an EIP resource.
33
Example Usage
44

55
Paid by the bandwidth package
6+
67
```hcl
78
resource "tencentcloud_eip" "foo" {
89
name = "awesome_gateway_ip"
@@ -13,7 +14,8 @@ resource "tencentcloud_eip" "foo" {
1314
```
1415

1516
AntiDDos Eip
16-
```
17+
18+
```hcl
1719
resource "tencentcloud_eip" "foo" {
1820
name = "awesome_gateway_ip"
1921
bandwidth_package_id = "bwp-4ocyia9s"
@@ -28,7 +30,8 @@ resource "tencentcloud_eip" "foo" {
2830
```
2931

3032
Eip With Network Egress
31-
```
33+
34+
```hcl
3235
resource "tencentcloud_eip" "foo" {
3336
name = "egress_eip"
3437
egress = "center_egress2"

‎tencentcloud/services/cvm/resource_tc_eip_address_transform.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ func ResourceTencentCloudEipAddressTransform() *schema.Resource {
1919
Create: resourceTencentCloudEipAddressTransformCreate,
2020
Read: resourceTencentCloudEipAddressTransformRead,
2121
Delete: resourceTencentCloudEipAddressTransformDelete,
22-
Importer: &schema.ResourceImporter{
23-
State: schema.ImportStatePassthrough,
24-
},
22+
2523
Schema: map[string]*schema.Schema{
2624
"instance_id": {
2725
Required: true,

‎tencentcloud/services/cvm/resource_tc_eip_address_transform.md

Lines changed: 40 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,48 @@ Provides a resource to create a eip address_transform
33
Example Usage
44

55
```hcl
6-
resource "tencentcloud_eip_address_transform" "address_transform" {
7-
instance_id = ""
6+
# create vpc
7+
resource "tencentcloud_vpc" "vpc" {
8+
name = "vpc"
9+
cidr_block = "10.0.0.0/16"
10+
}
11+
12+
# create vpc subnet
13+
resource "tencentcloud_subnet" "subnet" {
14+
name = "subnet"
15+
vpc_id = tencentcloud_vpc.vpc.id
16+
availability_zone = "ap-guangzhou-6"
17+
cidr_block = "10.0.20.0/28"
18+
is_multicast = false
819
}
9-
```
1020
11-
Import
21+
# create cvm
22+
resource "tencentcloud_instance" "example" {
23+
instance_name = "tf_example"
24+
availability_zone = "ap-guangzhou-6"
25+
image_id = "img-9qrfy1xt"
26+
instance_type = "SA3.MEDIUM4"
27+
system_disk_type = "CLOUD_HSSD"
28+
system_disk_size = 100
29+
hostname = "example"
30+
project_id = 0
31+
vpc_id = tencentcloud_vpc.vpc.id
32+
subnet_id = tencentcloud_subnet.subnet.id
33+
allocate_public_ip = true
34+
internet_max_bandwidth_out = 10
1235
13-
eip address_transform can be imported using the id, e.g.
36+
data_disks {
37+
data_disk_type = "CLOUD_HSSD"
38+
data_disk_size = 50
39+
encrypt = false
40+
}
1441
42+
tags = {
43+
tagKey = "tagValue"
44+
}
45+
}
46+
47+
resource "tencentcloud_eip_address_transform" "example" {
48+
instance_id = tencentcloud_instance.example.id
49+
}
1550
```
16-
terraform import tencentcloud_eip_address_transform.address_transform address_transform_id
17-
```

‎tencentcloud/services/cvm/resource_tc_eip_address_transform_test.go

Lines changed: 46 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
99
)
1010

11+
// go test -i; go test -test.run TestAccTencentCloudNeedFixEipAddressTransformResource_basic -v
1112
func TestAccTencentCloudNeedFixEipAddressTransformResource_basic(t *testing.T) {
1213
t.Parallel()
1314
resource.Test(t, resource.TestCase{
@@ -18,21 +19,58 @@ func TestAccTencentCloudNeedFixEipAddressTransformResource_basic(t *testing.T) {
1819
Steps: []resource.TestStep{
1920
{
2021
Config: testAccEipAddressTransform,
21-
Check: resource.ComposeTestCheckFunc(resource.TestCheckResourceAttrSet("tencentcloud_eip_address_transform.address_transform", "id")),
22-
},
23-
{
24-
ResourceName: "tencentcloud_eip_address_transform.address_transform",
25-
ImportState: true,
26-
ImportStateVerify: true,
22+
Check: resource.ComposeTestCheckFunc(
23+
resource.TestCheckResourceAttrSet("tencentcloud_eip_address_transform.example", "id"),
24+
resource.TestCheckResourceAttrSet("tencentcloud_eip_address_transform.example", "instance_id"),
25+
),
2726
},
2827
},
2928
})
3029
}
3130

3231
const testAccEipAddressTransform = `
32+
# create vpc
33+
resource "tencentcloud_vpc" "vpc" {
34+
name = "vpc"
35+
cidr_block = "10.0.0.0/16"
36+
}
37+
38+
# create vpc subnet
39+
resource "tencentcloud_subnet" "subnet" {
40+
name = "subnet"
41+
vpc_id = tencentcloud_vpc.vpc.id
42+
availability_zone = "ap-guangzhou-6"
43+
cidr_block = "10.0.20.0/28"
44+
is_multicast = false
45+
}
46+
47+
# create cvm
48+
resource "tencentcloud_instance" "example" {
49+
instance_name = "tf_example"
50+
availability_zone = "ap-guangzhou-6"
51+
image_id = "img-9qrfy1xt"
52+
instance_type = "SA3.MEDIUM4"
53+
system_disk_type = "CLOUD_HSSD"
54+
system_disk_size = 100
55+
hostname = "example"
56+
project_id = 0
57+
vpc_id = tencentcloud_vpc.vpc.id
58+
subnet_id = tencentcloud_subnet.subnet.id
59+
allocate_public_ip = true
60+
internet_max_bandwidth_out = 10
3361
34-
resource "tencentcloud_eip_address_transform" "address_transform" {
35-
instance_id = "ins-2kcdugsq"
62+
data_disks {
63+
data_disk_type = "CLOUD_HSSD"
64+
data_disk_size = 50
65+
encrypt = false
66+
}
67+
68+
tags = {
69+
tagKey = "tagValue"
70+
}
3671
}
3772
73+
resource "tencentcloud_eip_address_transform" "example" {
74+
instance_id = tencentcloud_instance.example.id
75+
}
3876
`

0 commit comments

Comments
 (0)