Skip to content

Commit 3370c4b

Browse files
tongyimingmikatong
tongyiming
and
mikatong
authored
fix: cvm unit test (#995)
* fix: cvm unit test * fix: cvm unit test Co-authored-by: mikatong <mikatong@tencent.com>
1 parent 3c7088d commit 3370c4b

File tree

2 files changed

+28
-33
lines changed

2 files changed

+28
-33
lines changed

‎tencentcloud/basic_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@ data "tencentcloud_instance_types" "default" {
187187
memory_size = 2
188188
}
189189
`
190-
191190
const defaultAzVariable = `
192191
variable "default_az" {
193192
default = "ap-guangzhou-3"

‎tencentcloud/resource_tc_instance_test.go‎

Lines changed: 28 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func TestAccTencentCloudInstanceBasic(t *testing.T) {
8888
Check: resource.ComposeTestCheckFunc(
8989
testAccCheckTencentCloudInstanceExists(id),
9090
resource.TestCheckResourceAttr(id, "instance_status", "RUNNING"),
91-
resource.TestCheckResourceAttr(id, "instance_type", "S2.SMALL2"),
91+
resource.TestCheckResourceAttrSet(id, "instance_type"),
9292
),
9393
},
9494
{
@@ -179,7 +179,6 @@ func TestAccTencentCloudInstanceWithNetwork(t *testing.T) {
179179
}
180180

181181
func TestAccTencentCloudInstanceWithPrivateIP(t *testing.T) {
182-
t.Parallel()
183182

184183
id := "tencentcloud_instance.foo"
185184
resource.Test(t, resource.TestCase{
@@ -575,11 +574,11 @@ func testAccCheckInstanceDestroy(s *terraform.State) error {
575574
const testAccTencentCloudInstanceBasic = defaultInstanceVariable + `
576575
resource "tencentcloud_instance" "foo" {
577576
instance_name = var.instance_name
578-
availability_zone = data.tencentcloud_availability_zones.default.zones.0.name
577+
availability_zone = var.availability_cvm_zone
579578
image_id = data.tencentcloud_images.default.images.0.image_id
580579
instance_type = data.tencentcloud_instance_types.default.instance_types.0.instance_type
581-
vpc_id = var.vpc_id
582-
subnet_id = var.subnet_id
580+
vpc_id = var.cvm_vpc_id
581+
subnet_id = var.cvm_subnet_id
583582
system_disk_type = "CLOUD_PREMIUM"
584583
project_id = 0
585584
}
@@ -630,22 +629,19 @@ resource "tencentcloud_instance" "foo" {
630629

631630
const testAccTencentCloudInstanceModifyInstanceType = defaultInstanceVariable + `
632631
data "tencentcloud_instance_types" "new_type" {
633-
filter {
634-
name = "instance-family"
635-
values = ["S2"]
632+
availability_zone = var.availability_cvm_zone
633+
634+
cpu_core_count = 2
635+
memory_size = 2
636636
}
637637
638-
cpu_core_count = 1
639-
memory_size = 2
640-
}
641-
642638
resource "tencentcloud_instance" "foo" {
643639
instance_name = var.instance_name
644-
availability_zone = data.tencentcloud_availability_zones.default.zones.0.name
640+
availability_zone = var.availability_cvm_zone
645641
image_id = data.tencentcloud_images.default.images.0.image_id
646642
instance_type = data.tencentcloud_instance_types.new_type.instance_types.0.instance_type
647-
vpc_id = var.vpc_id
648-
subnet_id = var.subnet_id
643+
vpc_id = var.cvm_vpc_id
644+
subnet_id = var.cvm_subnet_id
649645
system_disk_type = "CLOUD_PREMIUM"
650646
project_id = 0
651647
}
@@ -654,7 +650,7 @@ resource "tencentcloud_instance" "foo" {
654650
const testAccTencentCloudInstanceWithDataDisk = defaultInstanceVariable + `
655651
resource "tencentcloud_instance" "foo" {
656652
instance_name = var.instance_name
657-
availability_zone = data.tencentcloud_availability_zones.default.zones.0.name
653+
availability_zone = var.availability_cvm_zone
658654
image_id = data.tencentcloud_images.default.images.1.image_id
659655
instance_type = data.tencentcloud_instance_types.default.instance_types.0.instance_type
660656
@@ -683,7 +679,7 @@ resource "tencentcloud_instance" "foo" {
683679
const testAccTencentCloudInstanceWithDataDiskUpdate = defaultInstanceVariable + `
684680
resource "tencentcloud_instance" "foo" {
685681
instance_name = var.instance_name
686-
availability_zone = data.tencentcloud_availability_zones.default.zones.0.name
682+
availability_zone = var.availability_cvm_zone
687683
image_id = data.tencentcloud_images.default.images.1.image_id
688684
instance_type = data.tencentcloud_instance_types.default.instance_types.0.instance_type
689685
@@ -714,7 +710,7 @@ func testAccTencentCloudInstanceWithNetworkFalse(hasPublicIp string) string {
714710
defaultInstanceVariable+`
715711
resource "tencentcloud_instance" "foo" {
716712
instance_name = var.instance_name
717-
availability_zone = data.tencentcloud_availability_zones.default.zones.0.name
713+
availability_zone = var.availability_cvm_zone
718714
image_id = data.tencentcloud_images.default.images.0.image_id
719715
instance_type = data.tencentcloud_instance_types.default.instance_types.0.instance_type
720716
allocate_public_ip = %s
@@ -730,7 +726,7 @@ func testAccTencentCloudInstanceWithNetwork(hasPublicIp string, maxBandWidthOut
730726
defaultInstanceVariable+`
731727
resource "tencentcloud_instance" "foo" {
732728
instance_name = var.instance_name
733-
availability_zone = data.tencentcloud_availability_zones.default.zones.0.name
729+
availability_zone = var.availability_cvm_zone
734730
image_id = data.tencentcloud_images.default.images.0.image_id
735731
instance_type = data.tencentcloud_instance_types.default.instance_types.0.instance_type
736732
internet_max_bandwidth_out = %d
@@ -745,13 +741,13 @@ resource "tencentcloud_instance" "foo" {
745741
const testAccTencentCloudInstanceWithPrivateIP = defaultInstanceVariable + `
746742
resource "tencentcloud_instance" "foo" {
747743
instance_name = var.instance_name
748-
availability_zone = data.tencentcloud_availability_zones.default.zones.0.name
744+
availability_zone = var.availability_cvm_zone
749745
image_id = data.tencentcloud_images.default.images.0.image_id
750746
instance_type = data.tencentcloud_instance_types.default.instance_types.0.instance_type
751747
system_disk_type = "CLOUD_PREMIUM"
752-
vpc_id = var.vpc_id
753-
subnet_id = var.subnet_id
754-
private_ip = "172.16.0.130"
748+
vpc_id = var.cvm_vpc_id
749+
subnet_id = var.cvm_subnet_id
750+
private_ip = "10.0.0.123"
755751
}
756752
`
757753

@@ -770,7 +766,7 @@ resource "tencentcloud_key_pair" "key_pair_1" {
770766
771767
resource "tencentcloud_instance" "foo" {
772768
instance_name = var.instance_name
773-
availability_zone = data.tencentcloud_availability_zones.default.zones.0.name
769+
availability_zone = var.availability_cvm_zone
774770
image_id = data.tencentcloud_images.default.images.0.image_id
775771
instance_type = data.tencentcloud_instance_types.default.instance_types.0.instance_type
776772
key_name = tencentcloud_key_pair.%s.id
@@ -786,7 +782,7 @@ func testAccTencentCloudInstanceWithPassword(password string) string {
786782
defaultInstanceVariable+`
787783
resource "tencentcloud_instance" "foo" {
788784
instance_name = var.instance_name
789-
availability_zone = data.tencentcloud_availability_zones.default.zones.0.name
785+
availability_zone = var.availability_cvm_zone
790786
image_id = data.tencentcloud_images.default.images.0.image_id
791787
instance_type = data.tencentcloud_instance_types.default.instance_types.0.instance_type
792788
password = "%s"
@@ -804,7 +800,7 @@ data "tencentcloud_images" "zoo" {
804800
}
805801
resource "tencentcloud_instance" "foo" {
806802
instance_name = var.instance_name
807-
availability_zone = data.tencentcloud_availability_zones.default.zones.0.name
803+
availability_zone = var.availability_cvm_zone
808804
image_id = data.tencentcloud_images.zoo.images.0.image_id
809805
instance_type = data.tencentcloud_instance_types.default.instance_types.0.instance_type
810806
keep_image_login = true
@@ -817,7 +813,7 @@ func testAccTencentCloudInstanceWithName(instanceName string) string {
817813
defaultInstanceVariable+`
818814
resource "tencentcloud_instance" "foo" {
819815
instance_name = "%s"
820-
availability_zone = data.tencentcloud_availability_zones.default.zones.0.name
816+
availability_zone = var.availability_cvm_zone
821817
image_id = data.tencentcloud_images.default.images.0.image_id
822818
instance_type = data.tencentcloud_instance_types.default.instance_types.0.instance_type
823819
system_disk_type = "CLOUD_PREMIUM"
@@ -830,7 +826,7 @@ resource "tencentcloud_instance" "foo" {
830826
const testAccTencentCloudInstanceWithHostname = defaultInstanceVariable + `
831827
resource "tencentcloud_instance" "foo" {
832828
instance_name = var.instance_name
833-
availability_zone = data.tencentcloud_availability_zones.default.zones.0.name
829+
availability_zone = var.availability_cvm_zone
834830
image_id = data.tencentcloud_images.default.images.0.image_id
835831
instance_type = data.tencentcloud_instance_types.default.instance_types.0.instance_type
836832
hostname = var.instance_name
@@ -871,7 +867,7 @@ resource "tencentcloud_security_group_rule" "bar" {
871867
872868
resource "tencentcloud_instance" "foo" {
873869
instance_name = var.instance_name
874-
availability_zone = data.tencentcloud_availability_zones.default.zones.0.name
870+
availability_zone = var.availability_cvm_zone
875871
image_id = data.tencentcloud_images.default.images.0.image_id
876872
instance_type = data.tencentcloud_instance_types.default.instance_types.0.instance_type
877873
system_disk_type = "CLOUD_PREMIUM"
@@ -887,7 +883,7 @@ func testAccTencentCloudInstanceWithTags(tags string) string {
887883
defaultInstanceVariable+`
888884
resource "tencentcloud_instance" "foo" {
889885
instance_name = var.instance_name
890-
availability_zone = data.tencentcloud_availability_zones.default.zones.0.name
886+
availability_zone = var.availability_cvm_zone
891887
image_id = data.tencentcloud_images.default.images.0.image_id
892888
instance_type = data.tencentcloud_instance_types.default.instance_types.0.instance_type
893889
system_disk_type = "CLOUD_PREMIUM"
@@ -907,7 +903,7 @@ resource "tencentcloud_placement_group" "foo" {
907903
908904
resource "tencentcloud_instance" "foo" {
909905
instance_name = var.instance_name
910-
availability_zone = data.tencentcloud_availability_zones.default.zones.0.name
906+
availability_zone = var.availability_cvm_zone
911907
image_id = data.tencentcloud_images.default.images.0.image_id
912908
instance_type = data.tencentcloud_instance_types.default.instance_types.0.instance_type
913909
system_disk_type = "CLOUD_PREMIUM"
@@ -918,7 +914,7 @@ resource "tencentcloud_instance" "foo" {
918914
const testAccTencentCloudInstanceWithSpotpaid = defaultInstanceVariable + `
919915
resource "tencentcloud_instance" "foo" {
920916
instance_name = var.instance_name
921-
availability_zone = data.tencentcloud_availability_zones.default.zones.0.name
917+
availability_zone = var.availability_cvm_zone
922918
image_id = data.tencentcloud_images.default.images.0.image_id
923919
instance_type = data.tencentcloud_instance_types.default.instance_types.0.instance_type
924920
system_disk_type = "CLOUD_PREMIUM"

0 commit comments

Comments
 (0)