From 2fbe9acfeb54724bc2713d267415e7e422b09c4d Mon Sep 17 00:00:00 2001 From: mikatong Date: Thu, 30 May 2024 17:09:55 +0800 Subject: [PATCH 1/4] generate cvm datasource test --- tencentcloud/services/cvm/data_source_tc_instances_set_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tencentcloud/services/cvm/data_source_tc_instances_set_test.go b/tencentcloud/services/cvm/data_source_tc_instances_set_test.go index 0f959f00c5..e85981deb0 100644 --- a/tencentcloud/services/cvm/data_source_tc_instances_set_test.go +++ b/tencentcloud/services/cvm/data_source_tc_instances_set_test.go @@ -7,7 +7,7 @@ import ( acctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest" ) -func TestAccTencentCloudInstanceSetDataSource_Basic(t *testing.T) { +func TestAccTencentCloudCvmInstanceSetDataSource_Basic(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { From 9147c4b26856258a1519f9913d6b8aae4d05c9b3 Mon Sep 17 00:00:00 2001 From: mikatong Date: Thu, 30 May 2024 17:13:23 +0800 Subject: [PATCH 2/4] keep same testname --- tencentcloud/services/cvm/data_source_tc_instances_set_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tencentcloud/services/cvm/data_source_tc_instances_set_test.go b/tencentcloud/services/cvm/data_source_tc_instances_set_test.go index e85981deb0..0f959f00c5 100644 --- a/tencentcloud/services/cvm/data_source_tc_instances_set_test.go +++ b/tencentcloud/services/cvm/data_source_tc_instances_set_test.go @@ -7,7 +7,7 @@ import ( acctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest" ) -func TestAccTencentCloudCvmInstanceSetDataSource_Basic(t *testing.T) { +func TestAccTencentCloudInstanceSetDataSource_Basic(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { From fa9f2b2c5a6f6dd04868a54616415264dd31dcb5 Mon Sep 17 00:00:00 2001 From: mikatong Date: Fri, 31 May 2024 16:40:48 +0800 Subject: [PATCH 3/4] generate cvm datasource --- ...a_source_tc_cvm_chc_denied_actions_test.go | 20 +++++++------- ...c_cvm_disaster_recover_group_quota_test.go | 17 ++++++------ .../data_source_tc_cvm_image_quota_test.go | 18 ++++++------- ...urce_tc_cvm_image_share_permission_test.go | 26 ++++++++++++------- 4 files changed, 43 insertions(+), 38 deletions(-) diff --git a/tencentcloud/services/cvm/data_source_tc_cvm_chc_denied_actions_test.go b/tencentcloud/services/cvm/data_source_tc_cvm_chc_denied_actions_test.go index 2c9721ed59..b20384c005 100644 --- a/tencentcloud/services/cvm/data_source_tc_cvm_chc_denied_actions_test.go +++ b/tencentcloud/services/cvm/data_source_tc_cvm_chc_denied_actions_test.go @@ -3,30 +3,30 @@ package cvm_test import ( "testing" - tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest" - - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + resource "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + acctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest" ) -func TestAccTencentCloudCvmChcDeniedActionsDataSource_basic(t *testing.T) { +func TestAccTencentCloudCvmChcDeniedActionsDataSource_Basic(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { - tcacctest.AccPreCheck(t) + acctest.AccPreCheck(t) }, - Providers: tcacctest.AccProviders, + Providers: acctest.AccProviders, Steps: []resource.TestStep{ { - Config: testAccCvmChcDeniedActionsDataSource, - Check: resource.ComposeTestCheckFunc(tcacctest.AccCheckTencentCloudDataSourceID("data.tencentcloud_cvm_chc_denied_actions.chc_denied_actions")), + Config: testAccCvmChcDeniedActionsDataSource_BasicCreate, + Check: resource.ComposeTestCheckFunc(acctest.AccCheckTencentCloudDataSourceID("data.tencentcloud_cvm_chc_denied_actions.chc_denied_actions"), resource.TestCheckResourceAttr("data.tencentcloud_cvm_chc_denied_actions.chc_denied_actions", "chc_host_denied_action_set.#", "1"), resource.TestCheckResourceAttrSet("data.tencentcloud_cvm_chc_denied_actions.chc_denied_actions", "chc_host_denied_action_set.0.chc_id"), resource.TestCheckResourceAttrSet("data.tencentcloud_cvm_chc_denied_actions.chc_denied_actions", "chc_host_denied_action_set.0.state"), resource.TestCheckResourceAttrSet("data.tencentcloud_cvm_chc_denied_actions.chc_denied_actions", "chc_host_denied_action_set.0.deny_actions.#")), }, }, }) } -const testAccCvmChcDeniedActionsDataSource = ` +const testAccCvmChcDeniedActionsDataSource_BasicCreate = ` data "tencentcloud_cvm_chc_denied_actions" "chc_denied_actions" { - chc_ids = ["chc-0brmw3wl"] + chc_ids = ["chc-mn3l1qf5"] } + ` diff --git a/tencentcloud/services/cvm/data_source_tc_cvm_disaster_recover_group_quota_test.go b/tencentcloud/services/cvm/data_source_tc_cvm_disaster_recover_group_quota_test.go index 1307611947..89833cbae0 100644 --- a/tencentcloud/services/cvm/data_source_tc_cvm_disaster_recover_group_quota_test.go +++ b/tencentcloud/services/cvm/data_source_tc_cvm_disaster_recover_group_quota_test.go @@ -3,28 +3,27 @@ package cvm_test import ( "testing" - tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest" - - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + resource "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + acctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest" ) -func TestAccTencentCloudCvmDisasterRecoverGroupQuotaDataSource_basic(t *testing.T) { +func TestAccTencentCloudCvmDisasterRecoverGroupQuotaDataSource_Basic(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { - tcacctest.AccPreCheck(t) + acctest.AccPreCheck(t) }, - Providers: tcacctest.AccProviders, + Providers: acctest.AccProviders, Steps: []resource.TestStep{ { - Config: testAccCvmDisasterRecoverGroupQuotaDataSource, - Check: resource.ComposeTestCheckFunc(tcacctest.AccCheckTencentCloudDataSourceID("data.tencentcloud_cvm_disaster_recover_group_quota.disaster_recover_group_quota")), + Config: testAccCvmDisasterRecoverGroupQuotaDataSource_BasicCreate, + Check: resource.ComposeTestCheckFunc(acctest.AccCheckTencentCloudDataSourceID("data.tencentcloud_cvm_disaster_recover_group_quota.disaster_recover_group_quota"), resource.TestCheckResourceAttr("data.tencentcloud_cvm_disaster_recover_group_quota.disaster_recover_group_quota", "cvm_in_sw_group_quota", "20"), resource.TestCheckResourceAttr("data.tencentcloud_cvm_disaster_recover_group_quota.disaster_recover_group_quota", "cvm_in_rack_group_quota", "30"), resource.TestCheckResourceAttr("data.tencentcloud_cvm_disaster_recover_group_quota.disaster_recover_group_quota", "group_quota", "1000"), resource.TestCheckResourceAttrSet("data.tencentcloud_cvm_disaster_recover_group_quota.disaster_recover_group_quota", "current_num"), resource.TestCheckResourceAttr("data.tencentcloud_cvm_disaster_recover_group_quota.disaster_recover_group_quota", "cvm_in_host_group_quota", "50")), }, }, }) } -const testAccCvmDisasterRecoverGroupQuotaDataSource = ` +const testAccCvmDisasterRecoverGroupQuotaDataSource_BasicCreate = ` data "tencentcloud_cvm_disaster_recover_group_quota" "disaster_recover_group_quota" { } diff --git a/tencentcloud/services/cvm/data_source_tc_cvm_image_quota_test.go b/tencentcloud/services/cvm/data_source_tc_cvm_image_quota_test.go index 7cf61dc549..ad8c11a369 100644 --- a/tencentcloud/services/cvm/data_source_tc_cvm_image_quota_test.go +++ b/tencentcloud/services/cvm/data_source_tc_cvm_image_quota_test.go @@ -3,29 +3,29 @@ package cvm_test import ( "testing" - tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest" - - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + resource "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + acctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest" ) -func TestAccTencentCloudCvmImageQuotaDataSource_basic(t *testing.T) { +func TestAccTencentCloudCvmImageQuotaDataSource_Basic(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { - tcacctest.AccPreCheck(t) + acctest.AccPreCheck(t) }, - Providers: tcacctest.AccProviders, + Providers: acctest.AccProviders, Steps: []resource.TestStep{ { - Config: testAccCvmImageQuotaDataSource, - Check: resource.ComposeTestCheckFunc(tcacctest.AccCheckTencentCloudDataSourceID("data.tencentcloud_cvm_image_quota.image_quota")), + Config: testAccCvmImageQuotaDataSource_BasicCreate, + Check: resource.ComposeTestCheckFunc(acctest.AccCheckTencentCloudDataSourceID("data.tencentcloud_cvm_image_quota.image_quota"), resource.TestCheckResourceAttr("data.tencentcloud_cvm_image_quota.image_quota", "image_num_quota", "500")), }, }, }) } -const testAccCvmImageQuotaDataSource = ` +const testAccCvmImageQuotaDataSource_BasicCreate = ` data "tencentcloud_cvm_image_quota" "image_quota" { } + ` diff --git a/tencentcloud/services/cvm/data_source_tc_cvm_image_share_permission_test.go b/tencentcloud/services/cvm/data_source_tc_cvm_image_share_permission_test.go index 126d2ed51c..da36e749a6 100644 --- a/tencentcloud/services/cvm/data_source_tc_cvm_image_share_permission_test.go +++ b/tencentcloud/services/cvm/data_source_tc_cvm_image_share_permission_test.go @@ -3,28 +3,34 @@ package cvm_test import ( "testing" - tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest" - - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + resource "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + acctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest" ) -func TestAccTencentCloudCvmImageSharePermissionDataSource_basic(t *testing.T) { +func TestAccTencentCloudCvmImageSharePermissionDataSource_Basic(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ - PreCheck: func() { tcacctest.AccPreCheckCommon(t, tcacctest.ACCOUNT_TYPE_PREPAY) }, - Providers: tcacctest.AccProviders, + PreCheck: func() { + acctest.AccPreCheck(t) + }, + Providers: acctest.AccProviders, Steps: []resource.TestStep{ { - Config: testAccCvmImageSharePermissionDataSource, - Check: resource.ComposeTestCheckFunc(tcacctest.AccCheckTencentCloudDataSourceID("data.tencentcloud_cvm_image_share_permission.image_share_permission")), + Config: testAccCvmImageSharePermissionDataSource_BasicCreate, + Check: resource.ComposeTestCheckFunc(acctest.AccCheckTencentCloudDataSourceID("data.tencentcloud_cvm_image_share_permission.image_share_permission"), resource.TestCheckResourceAttr("data.tencentcloud_cvm_image_share_permission.image_share_permission", "image_id", "img-l7uxaine"), resource.TestCheckResourceAttr("data.tencentcloud_cvm_image_share_permission.image_share_permission", "share_permission_set.#", "1"), resource.TestCheckResourceAttrSet("data.tencentcloud_cvm_image_share_permission.image_share_permission", "share_permission_set.0.created_time"), resource.TestCheckResourceAttr("data.tencentcloud_cvm_image_share_permission.image_share_permission", "share_permission_set.0.account_id", "100022975249")), }, }, }) } -const testAccCvmImageSharePermissionDataSource = ` +const testAccCvmImageSharePermissionDataSource_BasicCreate = ` data "tencentcloud_cvm_image_share_permission" "image_share_permission" { - image_id = "img-k4h0m5la" + image_id = tencentcloud_cvm_image_share_permission.image_share_permission.image_id } +resource "tencentcloud_cvm_image_share_permission" "image_share_permission" { + image_id = "img-l7uxaine" + account_ids = [100022975249] +} + ` From bb0f2f6266247cff1417f2711267a33e9967eafa Mon Sep 17 00:00:00 2001 From: mikatong Date: Fri, 31 May 2024 17:33:32 +0800 Subject: [PATCH 4/4] add --- .../cvm/data_source_tc_cvm_chc_hosts_test.go | 73 +++++++++++++++---- 1 file changed, 59 insertions(+), 14 deletions(-) diff --git a/tencentcloud/services/cvm/data_source_tc_cvm_chc_hosts_test.go b/tencentcloud/services/cvm/data_source_tc_cvm_chc_hosts_test.go index a542022210..9f9e1bba2c 100644 --- a/tencentcloud/services/cvm/data_source_tc_cvm_chc_hosts_test.go +++ b/tencentcloud/services/cvm/data_source_tc_cvm_chc_hosts_test.go @@ -3,34 +3,79 @@ package cvm_test import ( "testing" - tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest" - - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + resource "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + acctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest" ) -func TestAccTencentCloudCvmChcHostsDataSource_basic(t *testing.T) { +func TestAccTencentCloudCvmChcHostsDataSource_Basic(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { - tcacctest.AccPreCheck(t) + acctest.AccPreCheck(t) }, - Providers: tcacctest.AccProviders, + Providers: acctest.AccProviders, Steps: []resource.TestStep{ { - Config: testAccCvmChcHostsDataSource, - Check: resource.ComposeTestCheckFunc(tcacctest.AccCheckTencentCloudDataSourceID("data.tencentcloud_cvm_chc_hosts.chc_hosts")), + Config: testAccCvmChcHostsDataSource_BasicCreate, + Check: resource.ComposeTestCheckFunc(acctest.AccCheckTencentCloudDataSourceID("data.tencentcloud_cvm_chc_hosts.chc_hosts"), resource.TestCheckResourceAttrSet("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.instance_name"), resource.TestCheckResourceAttr("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.placement.0.host_ids.#", "0"), resource.TestCheckResourceAttr("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.bmc_virtual_private_cloud.#", "1"), resource.TestCheckResourceAttr("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.bmc_security_group_ids.#", "1"), resource.TestCheckResourceAttrSet("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.device_type"), resource.TestCheckResourceAttrSet("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.deploy_virtual_private_cloud.0.subnet_id"), resource.TestCheckResourceAttrSet("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.hardware_description"), resource.TestCheckResourceAttr("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.placement.#", "1"), resource.TestCheckResourceAttrSet("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.bmc_virtual_private_cloud.0.vpc_id"), resource.TestCheckResourceAttrSet("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.deploy_virtual_private_cloud.0.vpc_id"), resource.TestCheckResourceAttrSet("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.deploy_mac"), resource.TestCheckResourceAttrSet("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.bmc_ip"), resource.TestCheckResourceAttrSet("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.deploy_virtual_private_cloud.0.as_vpc_gateway"), resource.TestCheckResourceAttrSet("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.cpu"), resource.TestCheckResourceAttrSet("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.disk"), resource.TestCheckResourceAttrSet("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.deploy_ip"), resource.TestCheckResourceAttrSet("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.created_time"), resource.TestCheckResourceAttrSet("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.serial_number"), resource.TestCheckResourceAttrSet("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.instance_state"), resource.TestCheckResourceAttrSet("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.placement.0.project_id"), resource.TestCheckResourceAttr("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.deploy_virtual_private_cloud.#", "1"), resource.TestCheckResourceAttrSet("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.placement.0.zone"), resource.TestCheckResourceAttrSet("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.tenant_type"), resource.TestCheckResourceAttrSet("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.deploy_virtual_private_cloud.0.ipv6_address_count"), resource.TestCheckResourceAttr("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.deploy_security_group_ids.#", "1"), resource.TestCheckResourceAttrSet("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.memory"), resource.TestCheckResourceAttr("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.#", "1"), resource.TestCheckResourceAttrSet("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.bmc_virtual_private_cloud.0.as_vpc_gateway"), resource.TestCheckResourceAttr("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.bmc_virtual_private_cloud.0.private_ip_addresses.#", "0"), resource.TestCheckResourceAttr("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.deploy_virtual_private_cloud.0.private_ip_addresses.#", "0"), resource.TestCheckResourceAttrSet("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.chc_id"), resource.TestCheckResourceAttr("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.placement.0.host_ips.#", "0"), resource.TestCheckResourceAttrSet("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.bmc_virtual_private_cloud.0.subnet_id"), resource.TestCheckResourceAttrSet("data.tencentcloud_cvm_chc_hosts.chc_hosts", "chc_host_set.0.bmc_mac")), }, }, }) } -const testAccCvmChcHostsDataSource = ` +const testAccCvmChcHostsDataSource_BasicCreate = ` +data "tencentcloud_security_groups" "security_groups1" { + name = "keep-tke" +} +data "tencentcloud_security_groups" "security_groups2" { + name = "keep-reject-all" +} data "tencentcloud_cvm_chc_hosts" "chc_hosts" { - chc_ids = ["chc-0brmw3wl"] - filters { - name = "zone" - values = ["ap-guangzhou-7"] - } + chc_ids = [tencentcloud_cvm_chc_config.chc_config.chc_id] + + filters { + values = ["ap-guangzhou-7"] + name = "zone" + } +} +resource "tencentcloud_vpc" "vpc" { + name = "tf-cvm-vpc" + cidr_block = "172.16.0.0/16" } +resource "tencentcloud_subnet" "subnet1" { + name = "tf_cvm_vpc_subnet1" + vpc_id = tencentcloud_vpc.vpc.id + availability_zone = "ap-guangzhou-7" + cidr_block = "172.16.0.0/20" + is_multicast = true +} +resource "tencentcloud_subnet" "subnet2" { + name = "tf_cvm_vpc_subnet2" + vpc_id = tencentcloud_vpc.vpc.id + availability_zone = "ap-guangzhou-7" + cidr_block = "172.16.16.0/20" + is_multicast = true +} +resource "tencentcloud_cvm_chc_config" "chc_config" { + chc_id = "chc-mn3l1qf5" + instance_name = "test" + bmc_user = "admin" + password = "123" + + bmc_virtual_private_cloud { + vpc_id = tencentcloud_vpc.vpc.id + subnet_id = tencentcloud_subnet.subnet1.id + as_vpc_gateway = false + } + bmc_security_group_ids = [data.tencentcloud_security_groups.security_groups1.security_groups.0.security_group_id] + + deploy_virtual_private_cloud { + as_vpc_gateway = false + vpc_id = tencentcloud_vpc.vpc.id + subnet_id = tencentcloud_subnet.subnet1.id + } + deploy_security_group_ids = [data.tencentcloud_security_groups.security_groups1.security_groups.0.security_group_id] +} + `