Skip to content

Commit d132aeb

Browse files
tongyimingmikatong
andauthored
fix: clb failed unit test (#1313)
Co-authored-by: mikatong <mikatong@tencent.com>
1 parent 3d6facc commit d132aeb

File tree

4 files changed

+15
-24
lines changed

4 files changed

+15
-24
lines changed

tencentcloud/resource_tc_clb_attachment_test.go

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,6 @@ func testAccCheckClbServerAttachmentExists(n string) resource.TestCheckFunc {
163163
}
164164

165165
const testAccClbServerAttachment_tcp = instanceCommonTestCase + `
166-
data "tencentcloud_ssl_certificates" "foo" {
167-
name = "keep"
168-
}
169-
170166
resource "tencentcloud_clb_instance" "foo" {
171167
network_type = "OPEN"
172168
clb_name = "tf-clb-attach-tcp-test"
@@ -200,10 +196,6 @@ resource "tencentcloud_clb_attachment" "foo" {
200196
`
201197

202198
const testAccClbServerAttachment_tcp_update = instanceCommonTestCase + presetCVM + `
203-
data "tencentcloud_ssl_certificates" "foo" {
204-
name = "keep"
205-
}
206-
207199
resource "tencentcloud_clb_instance" "foo" {
208200
network_type = "OPEN"
209201
clb_name = "tf-clb-attach-tcp-test"
@@ -239,7 +231,7 @@ resource "tencentcloud_clb_attachment" "foo" {
239231

240232
const testAccClbServerAttachment_tcp_update_ssl = instanceCommonTestCase + presetCVM + `
241233
data "tencentcloud_ssl_certificates" "foo" {
242-
name = "keep"
234+
name = "keep-svr-ca"
243235
}
244236
245237
resource "tencentcloud_clb_instance" "foo" {

tencentcloud/resource_tc_clb_instance_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,8 @@ func TestAccTencentCloudClbInstance_multiple_instance(t *testing.T) {
255255
testAccCheckClbInstanceExists("tencentcloud_clb_instance.multiple_instance"),
256256
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "network_type", "OPEN"),
257257
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "clb_name", MultiClbName),
258-
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "master_zone_id", "100003"),
259-
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "slave_zone_id", "100004"),
258+
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "master_zone_id", "100004"),
259+
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "slave_zone_id", "100003"),
260260
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "tags.test", "mytest"),
261261
),
262262
},
@@ -266,8 +266,8 @@ func TestAccTencentCloudClbInstance_multiple_instance(t *testing.T) {
266266
testAccCheckClbInstanceExists("tencentcloud_clb_instance.multiple_instance"),
267267
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "network_type", "OPEN"),
268268
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "clb_name", MultiClbName),
269-
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "master_zone_id", "100003"),
270-
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "slave_zone_id", "100004"),
269+
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "master_zone_id", "100004"),
270+
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "slave_zone_id", "100003"),
271271
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "tags.test", "open"),
272272
),
273273
},
@@ -567,8 +567,8 @@ const testAccClbInstance__multi_instance = `
567567
resource "tencentcloud_clb_instance" "multiple_instance" {
568568
network_type = "OPEN"
569569
clb_name = "` + MultiClbName + `"
570-
master_zone_id = "100003"
571-
slave_zone_id = "100004"
570+
master_zone_id = "100004"
571+
slave_zone_id = "100003"
572572
573573
tags = {
574574
test = "mytest"
@@ -580,8 +580,8 @@ const testAccClbInstance__multi_instance_update = `
580580
resource "tencentcloud_clb_instance" "multiple_instance" {
581581
network_type = "OPEN"
582582
clb_name = "` + MultiClbName + `"
583-
master_zone_id = "100003"
584-
slave_zone_id = "100004"
583+
master_zone_id = "100004"
584+
slave_zone_id = "100003"
585585
586586
tags = {
587587
test = "open"

tencentcloud/resource_tc_clb_log_topic_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
)
1111

1212
func TestAccTencentCloudClbInstanceTopic(t *testing.T) {
13-
t.Parallel()
1413

1514
resource.Test(t, resource.TestCase{
1615
PreCheck: func() { testAccPreCheck(t) },

tencentcloud/resource_tc_clb_redirection_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,20 +100,20 @@ func testAccCheckClbRedirectionExists(n string) resource.TestCheckFunc {
100100
}
101101

102102
const testAccClbRedirection_basic = `
103-
resource "tencentcloud_clb_instance" "clb_basic" {
103+
resource "tencentcloud_clb_instance" "clb_basic_redirection" {
104104
network_type = "OPEN"
105105
clb_name = "tf-clb-redirection-basic"
106106
}
107107
108108
resource "tencentcloud_clb_listener" "listener_basic" {
109-
clb_id = tencentcloud_clb_instance.clb_basic.id
109+
clb_id = tencentcloud_clb_instance.clb_basic_redirection.id
110110
port = 1
111111
protocol = "HTTP"
112112
listener_name = "listener_basic"
113113
}
114114
115115
resource "tencentcloud_clb_listener_rule" "rule_basic" {
116-
clb_id = tencentcloud_clb_instance.clb_basic.id
116+
clb_id = tencentcloud_clb_instance.clb_basic_redirection.id
117117
listener_id = tencentcloud_clb_listener.listener_basic.listener_id
118118
domain = "abc.com"
119119
url = "/"
@@ -122,14 +122,14 @@ resource "tencentcloud_clb_listener_rule" "rule_basic" {
122122
}
123123
124124
resource "tencentcloud_clb_listener" "listener_target" {
125-
clb_id = tencentcloud_clb_instance.clb_basic.id
125+
clb_id = tencentcloud_clb_instance.clb_basic_redirection.id
126126
port = 44
127127
protocol = "HTTP"
128128
listener_name = "listener_basic1"
129129
}
130130
131131
resource "tencentcloud_clb_listener_rule" "rule_target" {
132-
clb_id = tencentcloud_clb_instance.clb_basic.id
132+
clb_id = tencentcloud_clb_instance.clb_basic_redirection.id
133133
listener_id = tencentcloud_clb_listener.listener_target.listener_id
134134
domain = "abcd.com"
135135
url = "/"
@@ -138,7 +138,7 @@ resource "tencentcloud_clb_listener_rule" "rule_target" {
138138
}
139139
140140
resource "tencentcloud_clb_redirection" "redirection_basic" {
141-
clb_id = tencentcloud_clb_instance.clb_basic.id
141+
clb_id = tencentcloud_clb_instance.clb_basic_redirection.id
142142
source_listener_id = tencentcloud_clb_listener.listener_basic.listener_id
143143
target_listener_id = tencentcloud_clb_listener.listener_target.listener_id
144144
source_rule_id = tencentcloud_clb_listener_rule.rule_basic.rule_id

0 commit comments

Comments
 (0)