Skip to content

Commit cfadb9b

Browse files
author
hellertang
authored
Feat/fix clb testcases (#937)
* add clb testcases * fix clb testcases
1 parent 09fd7e6 commit cfadb9b

File tree

4 files changed

+41
-26
lines changed

4 files changed

+41
-26
lines changed

‎tencentcloud/resource_tc_clb_attachment_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ resource "tencentcloud_clb_listener" "foo" {
176176
177177
resource "tencentcloud_clb_attachment" "foo" {
178178
clb_id = tencentcloud_clb_instance.foo.id
179-
listener_id = tencentcloud_clb_listener.foo.id
179+
listener_id = tencentcloud_clb_listener.foo.listener_id
180180
181181
targets {
182182
instance_id = tencentcloud_instance.default.id
@@ -209,7 +209,7 @@ resource "tencentcloud_clb_listener" "foo" {
209209
210210
resource "tencentcloud_clb_attachment" "foo" {
211211
clb_id = tencentcloud_clb_instance.foo.id
212-
listener_id = tencentcloud_clb_listener.foo.id
212+
listener_id = tencentcloud_clb_listener.foo.listener_id
213213
214214
targets {
215215
instance_id = tencentcloud_instance.default.id
@@ -237,7 +237,7 @@ resource "tencentcloud_clb_listener" "foo" {
237237
238238
resource "tencentcloud_clb_listener_rule" "foo" {
239239
clb_id = tencentcloud_clb_instance.foo.id
240-
listener_id = tencentcloud_clb_listener.foo.id
240+
listener_id = tencentcloud_clb_listener.foo.listener_id
241241
domain = "abc.com"
242242
url = "/"
243243
session_expire_time = 30
@@ -288,7 +288,7 @@ resource "tencentcloud_clb_listener" "foo" {
288288
289289
resource "tencentcloud_clb_listener_rule" "foo" {
290290
clb_id = tencentcloud_clb_instance.foo.id
291-
listener_id = tencentcloud_clb_listener.foo.id
291+
listener_id = tencentcloud_clb_listener.foo.listener_id
292292
domain = "abc.com"
293293
url = "/"
294294
session_expire_time = 30
@@ -297,7 +297,7 @@ resource "tencentcloud_clb_listener_rule" "foo" {
297297
298298
resource "tencentcloud_clb_attachment" "foo" {
299299
clb_id = tencentcloud_clb_instance.foo.id
300-
listener_id = tencentcloud_clb_listener.foo.id
300+
listener_id = tencentcloud_clb_listener.foo.listener_id
301301
rule_id = tencentcloud_clb_listener_rule.foo.id
302302
303303
targets {
@@ -332,7 +332,7 @@ resource "tencentcloud_clb_listener" "foo" {
332332
333333
resource "tencentcloud_clb_listener_rule" "foo" {
334334
clb_id = tencentcloud_clb_instance.foo.id
335-
listener_id = tencentcloud_clb_listener.foo.id
335+
listener_id = tencentcloud_clb_listener.foo.listener_id
336336
domain = "abc.com"
337337
url = "/"
338338
session_expire_time = 30
@@ -341,7 +341,7 @@ resource "tencentcloud_clb_listener_rule" "foo" {
341341
342342
resource "tencentcloud_clb_attachment" "foo" {
343343
clb_id = tencentcloud_clb_instance.foo.id
344-
listener_id = tencentcloud_clb_listener.foo.id
344+
listener_id = tencentcloud_clb_listener.foo.listener_id
345345
rule_id = tencentcloud_clb_listener_rule.foo.id
346346
347347
targets {

‎tencentcloud/resource_tc_clb_instance_test.go‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ import (
1515
const BasicClbName = "tf-clb-basic"
1616
const InternalClbName = "tf-clb-internal"
1717
const InternalClbNameUpdate = "tf-clb-update-internal"
18-
const MyOpenClbName = "my-open-clb"
18+
const SingleClbName = "single-open-clb"
19+
const MultiClbName = "multi-open-clb"
1920
const OpenClbName = "tf-clb-open"
2021
const OpenClbNameUpdate = "tf-clb-update-open"
2122

@@ -187,7 +188,7 @@ func TestAccTencentCloudClbInstance_default_enable(t *testing.T) {
187188
Check: resource.ComposeTestCheckFunc(
188189
testAccCheckClbInstanceExists("tencentcloud_clb_instance.default_enable"),
189190
resource.TestCheckResourceAttr("tencentcloud_clb_instance.default_enable", "network_type", "OPEN"),
190-
resource.TestCheckResourceAttr("tencentcloud_clb_instance.default_enable", "clb_name", MyOpenClbName),
191+
resource.TestCheckResourceAttr("tencentcloud_clb_instance.default_enable", "clb_name", SingleClbName),
191192
resource.TestCheckResourceAttr("tencentcloud_clb_instance.default_enable", "project_id", "0"),
192193
resource.TestCheckResourceAttrSet("tencentcloud_clb_instance.default_enable", "vpc_id"),
193194
resource.TestCheckResourceAttr("tencentcloud_clb_instance.default_enable", "load_balancer_pass_to_target", "true"),
@@ -202,7 +203,7 @@ func TestAccTencentCloudClbInstance_default_enable(t *testing.T) {
202203
Check: resource.ComposeTestCheckFunc(
203204
testAccCheckClbInstanceExists("tencentcloud_clb_instance.default_enable"),
204205
resource.TestCheckResourceAttr("tencentcloud_clb_instance.default_enable", "network_type", "OPEN"),
205-
resource.TestCheckResourceAttr("tencentcloud_clb_instance.default_enable", "clb_name", MyOpenClbName),
206+
resource.TestCheckResourceAttr("tencentcloud_clb_instance.default_enable", "clb_name", SingleClbName),
206207
resource.TestCheckResourceAttr("tencentcloud_clb_instance.default_enable", "project_id", "0"),
207208
resource.TestCheckResourceAttrSet("tencentcloud_clb_instance.default_enable", "vpc_id"),
208209
resource.TestCheckResourceAttr("tencentcloud_clb_instance.default_enable", "load_balancer_pass_to_target", "true"),
@@ -229,7 +230,7 @@ func TestAccTencentCloudClbInstance_multiple_instance(t *testing.T) {
229230
Check: resource.ComposeTestCheckFunc(
230231
testAccCheckClbInstanceExists("tencentcloud_clb_instance.multiple_instance"),
231232
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "network_type", "OPEN"),
232-
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "clb_name", MyOpenClbName),
233+
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "clb_name", MultiClbName),
233234
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "master_zone_id", "100003"),
234235
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "slave_zone_id", "100004"),
235236
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "tags.test", "mytest"),
@@ -240,7 +241,7 @@ func TestAccTencentCloudClbInstance_multiple_instance(t *testing.T) {
240241
Check: resource.ComposeTestCheckFunc(
241242
testAccCheckClbInstanceExists("tencentcloud_clb_instance.multiple_instance"),
242243
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "network_type", "OPEN"),
243-
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "clb_name", MyOpenClbName),
244+
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "clb_name", MultiClbName),
244245
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "master_zone_id", "100003"),
245246
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "slave_zone_id", "100004"),
246247
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "tags.test", "open"),
@@ -448,7 +449,7 @@ resource "tencentcloud_vpc" "foo" {
448449
449450
resource "tencentcloud_clb_instance" "default_enable" {
450451
network_type = "OPEN"
451-
clb_name = "` + MyOpenClbName + `"
452+
clb_name = "` + SingleClbName + `"
452453
project_id = 0
453454
vpc_id = tencentcloud_vpc.foo.id
454455
load_balancer_pass_to_target = true
@@ -493,7 +494,7 @@ resource "tencentcloud_vpc" "foo" {
493494
494495
resource "tencentcloud_clb_instance" "default_enable" {
495496
network_type = "OPEN"
496-
clb_name = "` + MyOpenClbName + `"
497+
clb_name = "` + SingleClbName + `"
497498
project_id = 0
498499
vpc_id = tencentcloud_vpc.foo.id
499500
load_balancer_pass_to_target = true
@@ -511,7 +512,7 @@ resource "tencentcloud_clb_instance" "default_enable" {
511512
const testAccClbInstance__multi_instance = `
512513
resource "tencentcloud_clb_instance" "multiple_instance" {
513514
network_type = "OPEN"
514-
clb_name = "` + MyOpenClbName + `"
515+
clb_name = "` + MultiClbName + `"
515516
master_zone_id = "100003"
516517
slave_zone_id = "100004"
517518
@@ -524,7 +525,7 @@ resource "tencentcloud_clb_instance" "multiple_instance" {
524525
const testAccClbInstance__multi_instance_update = `
525526
resource "tencentcloud_clb_instance" "multiple_instance" {
526527
network_type = "OPEN"
527-
clb_name = "` + MyOpenClbName + `"
528+
clb_name = "` + MultiClbName + `"
528529
master_zone_id = "100003"
529530
slave_zone_id = "100004"
530531

‎tencentcloud/resource_tc_clb_listener_test.go‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -565,14 +565,14 @@ resource "tencentcloud_clb_listener" "listener_https" {
565565
}
566566
`
567567

568-
const clb_instance = `
568+
const clb_tcp_instance = `
569569
resource "tencentcloud_clb_instance" "clb_basic" {
570570
network_type = "OPEN"
571-
clb_name = "tf-clb-listener-tcp"
571+
clb_name = "tf-clb-listener-tcp-tcp"
572572
}
573573
`
574574

575-
const testAccClbListener_tcp_tcp = clb_instance + `
575+
const testAccClbListener_tcp_tcp = clb_tcp_instance + `
576576
resource "tencentcloud_clb_listener" "listener_tcp" {
577577
clb_id = tencentcloud_clb_instance.clb_basic.id
578578
listener_name = "listener_tcp"
@@ -590,7 +590,7 @@ resource "tencentcloud_clb_listener" "listener_tcp" {
590590
}
591591
`
592592

593-
const testAccClbListener_tcp_update_tcp = clb_instance + `
593+
const testAccClbListener_tcp_update_tcp = clb_tcp_instance + `
594594
resource "tencentcloud_clb_listener" "listener_tcp"{
595595
clb_id = tencentcloud_clb_instance.clb_basic.id
596596
listener_name = "listener_tcp_update"
@@ -607,7 +607,14 @@ resource "tencentcloud_clb_listener" "listener_tcp"{
607607
}
608608
`
609609

610-
const testAccClbListener_tcp_http = clb_instance + `
610+
const clb_http_instance = `
611+
resource "tencentcloud_clb_instance" "clb_basic" {
612+
network_type = "OPEN"
613+
clb_name = "tf-clb-listener-tcp-http"
614+
}
615+
`
616+
617+
const testAccClbListener_tcp_http = clb_http_instance + `
611618
resource "tencentcloud_clb_listener" "listener_tcp" {
612619
clb_id = tencentcloud_clb_instance.clb_basic.id
613620
listener_name = "listener_tcp"
@@ -629,7 +636,7 @@ resource "tencentcloud_clb_listener" "listener_tcp" {
629636
}
630637
`
631638

632-
const testAccClbListener_tcp_update_http = clb_instance + `
639+
const testAccClbListener_tcp_update_http = clb_http_instance + `
633640
resource "tencentcloud_clb_listener" "listener_tcp"{
634641
clb_id = tencentcloud_clb_instance.clb_basic.id
635642
listener_name = "listener_tcp_update"
@@ -650,7 +657,14 @@ resource "tencentcloud_clb_listener" "listener_tcp"{
650657
}
651658
`
652659

653-
const testAccClbListener_tcp_customer = clb_instance + `
660+
const clb_customer_instance = `
661+
resource "tencentcloud_clb_instance" "clb_basic" {
662+
network_type = "OPEN"
663+
clb_name = "tf-clb-listener-tcp-customer"
664+
}
665+
`
666+
667+
const testAccClbListener_tcp_customer = clb_customer_instance + `
654668
resource "tencentcloud_clb_listener" "listener_tcp"{
655669
clb_id = tencentcloud_clb_instance.clb_basic.id
656670
listener_name = "listener_tcp"
@@ -670,7 +684,7 @@ resource "tencentcloud_clb_listener" "listener_tcp"{
670684
}
671685
`
672686

673-
const testAccClbListener_tcp_customer_update = clb_instance + `
687+
const testAccClbListener_tcp_customer_update = clb_customer_instance + `
674688
resource "tencentcloud_clb_listener" "listener_tcp"{
675689
clb_id = tencentcloud_clb_instance.clb_basic.id
676690
listener_name = "listener_tcp_update"

‎tencentcloud/resource_tc_clb_redirection_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ func testAccCheckClbRedirectionExists(n string) resource.TestCheckFunc {
102102
const testAccClbRedirection_basic = `
103103
resource "tencentcloud_clb_instance" "clb_basic" {
104104
network_type = "OPEN"
105-
clb_name = "tf-clb-redirection"
105+
clb_name = "tf-clb-redirection-basic"
106106
}
107107
108108
resource "tencentcloud_clb_listener" "listener_basic" {
@@ -150,7 +150,7 @@ resource "tencentcloud_clb_redirection" "redirection_basic" {
150150
const testAccClbRedirection_auto = `
151151
resource "tencentcloud_clb_instance" "clb_basic" {
152152
network_type = "OPEN"
153-
clb_name = "tf-clb-redirection"
153+
clb_name = "tf-clb-redirection-auto"
154154
}
155155
156156
resource "tencentcloud_clb_listener" "listener_basic" {

0 commit comments

Comments
 (0)