diff --git a/tencentcloud/resource_tc_clb_attachment_test.go b/tencentcloud/resource_tc_clb_attachment_test.go index 24c9b8be87..a4306dd7b4 100644 --- a/tencentcloud/resource_tc_clb_attachment_test.go +++ b/tencentcloud/resource_tc_clb_attachment_test.go @@ -163,10 +163,6 @@ func testAccCheckClbServerAttachmentExists(n string) resource.TestCheckFunc { } const testAccClbServerAttachment_tcp = instanceCommonTestCase + ` -data "tencentcloud_ssl_certificates" "foo" { - name = "keep" -} - resource "tencentcloud_clb_instance" "foo" { network_type = "OPEN" clb_name = "tf-clb-attach-tcp-test" @@ -200,10 +196,6 @@ resource "tencentcloud_clb_attachment" "foo" { ` const testAccClbServerAttachment_tcp_update = instanceCommonTestCase + presetCVM + ` -data "tencentcloud_ssl_certificates" "foo" { - name = "keep" -} - resource "tencentcloud_clb_instance" "foo" { network_type = "OPEN" clb_name = "tf-clb-attach-tcp-test" @@ -239,7 +231,7 @@ resource "tencentcloud_clb_attachment" "foo" { const testAccClbServerAttachment_tcp_update_ssl = instanceCommonTestCase + presetCVM + ` data "tencentcloud_ssl_certificates" "foo" { - name = "keep" + name = "keep-svr-ca" } resource "tencentcloud_clb_instance" "foo" { diff --git a/tencentcloud/resource_tc_clb_instance_test.go b/tencentcloud/resource_tc_clb_instance_test.go index e5d2db45e2..d20dce138e 100644 --- a/tencentcloud/resource_tc_clb_instance_test.go +++ b/tencentcloud/resource_tc_clb_instance_test.go @@ -255,8 +255,8 @@ func TestAccTencentCloudClbInstance_multiple_instance(t *testing.T) { testAccCheckClbInstanceExists("tencentcloud_clb_instance.multiple_instance"), resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "network_type", "OPEN"), resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "clb_name", MultiClbName), - resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "master_zone_id", "100003"), - resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "slave_zone_id", "100004"), + resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "master_zone_id", "100004"), + resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "slave_zone_id", "100003"), resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "tags.test", "mytest"), ), }, @@ -266,8 +266,8 @@ func TestAccTencentCloudClbInstance_multiple_instance(t *testing.T) { testAccCheckClbInstanceExists("tencentcloud_clb_instance.multiple_instance"), resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "network_type", "OPEN"), resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "clb_name", MultiClbName), - resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "master_zone_id", "100003"), - resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "slave_zone_id", "100004"), + resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "master_zone_id", "100004"), + resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "slave_zone_id", "100003"), resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "tags.test", "open"), ), }, @@ -567,8 +567,8 @@ const testAccClbInstance__multi_instance = ` resource "tencentcloud_clb_instance" "multiple_instance" { network_type = "OPEN" clb_name = "` + MultiClbName + `" - master_zone_id = "100003" - slave_zone_id = "100004" + master_zone_id = "100004" + slave_zone_id = "100003" tags = { test = "mytest" @@ -580,8 +580,8 @@ const testAccClbInstance__multi_instance_update = ` resource "tencentcloud_clb_instance" "multiple_instance" { network_type = "OPEN" clb_name = "` + MultiClbName + `" - master_zone_id = "100003" - slave_zone_id = "100004" + master_zone_id = "100004" + slave_zone_id = "100003" tags = { test = "open" diff --git a/tencentcloud/resource_tc_clb_log_topic_test.go b/tencentcloud/resource_tc_clb_log_topic_test.go index 31ffd35b00..a0a9d05da1 100644 --- a/tencentcloud/resource_tc_clb_log_topic_test.go +++ b/tencentcloud/resource_tc_clb_log_topic_test.go @@ -10,7 +10,6 @@ import ( ) func TestAccTencentCloudClbInstanceTopic(t *testing.T) { - t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, diff --git a/tencentcloud/resource_tc_clb_redirection_test.go b/tencentcloud/resource_tc_clb_redirection_test.go index 87500d2a7a..50f3d6379c 100644 --- a/tencentcloud/resource_tc_clb_redirection_test.go +++ b/tencentcloud/resource_tc_clb_redirection_test.go @@ -100,20 +100,20 @@ func testAccCheckClbRedirectionExists(n string) resource.TestCheckFunc { } const testAccClbRedirection_basic = ` -resource "tencentcloud_clb_instance" "clb_basic" { +resource "tencentcloud_clb_instance" "clb_basic_redirection" { network_type = "OPEN" clb_name = "tf-clb-redirection-basic" } resource "tencentcloud_clb_listener" "listener_basic" { - clb_id = tencentcloud_clb_instance.clb_basic.id + clb_id = tencentcloud_clb_instance.clb_basic_redirection.id port = 1 protocol = "HTTP" listener_name = "listener_basic" } resource "tencentcloud_clb_listener_rule" "rule_basic" { - clb_id = tencentcloud_clb_instance.clb_basic.id + clb_id = tencentcloud_clb_instance.clb_basic_redirection.id listener_id = tencentcloud_clb_listener.listener_basic.listener_id domain = "abc.com" url = "/" @@ -122,14 +122,14 @@ resource "tencentcloud_clb_listener_rule" "rule_basic" { } resource "tencentcloud_clb_listener" "listener_target" { - clb_id = tencentcloud_clb_instance.clb_basic.id + clb_id = tencentcloud_clb_instance.clb_basic_redirection.id port = 44 protocol = "HTTP" listener_name = "listener_basic1" } resource "tencentcloud_clb_listener_rule" "rule_target" { - clb_id = tencentcloud_clb_instance.clb_basic.id + clb_id = tencentcloud_clb_instance.clb_basic_redirection.id listener_id = tencentcloud_clb_listener.listener_target.listener_id domain = "abcd.com" url = "/" @@ -138,7 +138,7 @@ resource "tencentcloud_clb_listener_rule" "rule_target" { } resource "tencentcloud_clb_redirection" "redirection_basic" { - clb_id = tencentcloud_clb_instance.clb_basic.id + clb_id = tencentcloud_clb_instance.clb_basic_redirection.id source_listener_id = tencentcloud_clb_listener.listener_basic.listener_id target_listener_id = tencentcloud_clb_listener.listener_target.listener_id source_rule_id = tencentcloud_clb_listener_rule.rule_basic.rule_id