Skip to content

Commit 414b566

Browse files
jtopjianstack72
jtopjian
authored and
stack72
committed
provider/openstack: Updating LBaaSV1 acceptance tests (hashicorp#10979)
1 parent af5baf7 commit 414b566

4 files changed

Lines changed: 346 additions & 350 deletions

File tree

‎builtin/providers/openstack/resource_openstack_lb_member_v1_test.go‎

Lines changed: 57 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func TestAccLBV1Member_basic(t *testing.T) {
2020
resource.TestStep{
2121
Config: testAccLBV1Member_basic,
2222
Check: resource.ComposeTestCheckFunc(
23-
testAccCheckLBV1MemberExists(t, "openstack_lb_member_v1.member_1", &member),
23+
testAccCheckLBV1MemberExists("openstack_lb_member_v1.member_1", &member),
2424
),
2525
},
2626
resource.TestStep{
@@ -37,7 +37,7 @@ func testAccCheckLBV1MemberDestroy(s *terraform.State) error {
3737
config := testAccProvider.Meta().(*Config)
3838
networkingClient, err := config.networkingV2Client(OS_REGION_NAME)
3939
if err != nil {
40-
return fmt.Errorf("(testAccCheckLBV1MemberDestroy) Error creating OpenStack networking client: %s", err)
40+
return fmt.Errorf("Error creating OpenStack networking client: %s", err)
4141
}
4242

4343
for _, rs := range s.RootModule().Resources {
@@ -54,7 +54,7 @@ func testAccCheckLBV1MemberDestroy(s *terraform.State) error {
5454
return nil
5555
}
5656

57-
func testAccCheckLBV1MemberExists(t *testing.T, n string, member *members.Member) resource.TestCheckFunc {
57+
func testAccCheckLBV1MemberExists(n string, member *members.Member) resource.TestCheckFunc {
5858
return func(s *terraform.State) error {
5959
rs, ok := s.RootModule().Resources[n]
6060
if !ok {
@@ -68,7 +68,7 @@ func testAccCheckLBV1MemberExists(t *testing.T, n string, member *members.Member
6868
config := testAccProvider.Meta().(*Config)
6969
networkingClient, err := config.networkingV2Client(OS_REGION_NAME)
7070
if err != nil {
71-
return fmt.Errorf("(testAccCheckLBV1MemberExists) Error creating OpenStack networking client: %s", err)
71+
return fmt.Errorf("Error creating OpenStack networking client: %s", err)
7272
}
7373

7474
found, err := members.Get(networkingClient, rs.Primary.ID).Extract()
@@ -86,54 +86,56 @@ func testAccCheckLBV1MemberExists(t *testing.T, n string, member *members.Member
8686
}
8787
}
8888

89-
var testAccLBV1Member_basic = fmt.Sprintf(`
90-
resource "openstack_networking_network_v2" "network_1" {
91-
name = "network_1"
92-
admin_state_up = "true"
93-
}
94-
95-
resource "openstack_networking_subnet_v2" "subnet_1" {
96-
network_id = "${openstack_networking_network_v2.network_1.id}"
97-
cidr = "192.168.199.0/24"
98-
ip_version = 4
99-
}
100-
101-
resource "openstack_lb_pool_v1" "pool_1" {
102-
name = "tf_test_lb_pool"
103-
protocol = "HTTP"
104-
subnet_id = "${openstack_networking_subnet_v2.subnet_1.id}"
105-
lb_method = "ROUND_ROBIN"
106-
}
107-
108-
resource "openstack_lb_member_v1" "member_1" {
109-
pool_id = "${openstack_lb_pool_v1.pool_1.id}"
110-
address = "192.168.199.10"
111-
port = 80
112-
admin_state_up = true
113-
}`)
114-
115-
var testAccLBV1Member_update = fmt.Sprintf(`
116-
resource "openstack_networking_network_v2" "network_1" {
117-
name = "network_1"
118-
admin_state_up = "true"
119-
}
120-
121-
resource "openstack_networking_subnet_v2" "subnet_1" {
122-
network_id = "${openstack_networking_network_v2.network_1.id}"
123-
cidr = "192.168.199.0/24"
124-
ip_version = 4
125-
}
126-
127-
resource "openstack_lb_pool_v1" "pool_1" {
128-
name = "tf_test_lb_pool"
129-
protocol = "HTTP"
130-
subnet_id = "${openstack_networking_subnet_v2.subnet_1.id}"
131-
lb_method = "ROUND_ROBIN"
132-
}
133-
134-
resource "openstack_lb_member_v1" "member_1" {
135-
pool_id = "${openstack_lb_pool_v1.pool_1.id}"
136-
address = "192.168.199.10"
137-
port = 80
138-
admin_state_up = false
139-
}`)
89+
const testAccLBV1Member_basic = `
90+
resource "openstack_networking_network_v2" "network_1" {
91+
name = "network_1"
92+
admin_state_up = "true"
93+
}
94+
95+
resource "openstack_networking_subnet_v2" "subnet_1" {
96+
cidr = "192.168.199.0/24"
97+
ip_version = 4
98+
network_id = "${openstack_networking_network_v2.network_1.id}"
99+
}
100+
101+
resource "openstack_lb_pool_v1" "pool_1" {
102+
name = "pool_1"
103+
protocol = "HTTP"
104+
lb_method = "ROUND_ROBIN"
105+
subnet_id = "${openstack_networking_subnet_v2.subnet_1.id}"
106+
}
107+
108+
resource "openstack_lb_member_v1" "member_1" {
109+
address = "192.168.199.10"
110+
port = 80
111+
admin_state_up = true
112+
pool_id = "${openstack_lb_pool_v1.pool_1.id}"
113+
}
114+
`
115+
116+
const testAccLBV1Member_update = `
117+
resource "openstack_networking_network_v2" "network_1" {
118+
name = "network_1"
119+
admin_state_up = "true"
120+
}
121+
122+
resource "openstack_networking_subnet_v2" "subnet_1" {
123+
cidr = "192.168.199.0/24"
124+
ip_version = 4
125+
network_id = "${openstack_networking_network_v2.network_1.id}"
126+
}
127+
128+
resource "openstack_lb_pool_v1" "pool_1" {
129+
name = "pool_1"
130+
protocol = "HTTP"
131+
lb_method = "ROUND_ROBIN"
132+
subnet_id = "${openstack_networking_subnet_v2.subnet_1.id}"
133+
}
134+
135+
resource "openstack_lb_member_v1" "member_1" {
136+
address = "192.168.199.10"
137+
port = 80
138+
admin_state_up = false
139+
pool_id = "${openstack_lb_pool_v1.pool_1.id}"
140+
}
141+
`

‎builtin/providers/openstack/resource_openstack_lb_monitor_v1_test.go‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func TestAccLBV1Monitor_basic(t *testing.T) {
2121
resource.TestStep{
2222
Config: testAccLBV1Monitor_basic,
2323
Check: resource.ComposeTestCheckFunc(
24-
testAccCheckLBV1MonitorExists(t, "openstack_lb_monitor_v1.monitor_1", &monitor),
24+
testAccCheckLBV1MonitorExists("openstack_lb_monitor_v1.monitor_1", &monitor),
2525
),
2626
},
2727
resource.TestStep{
@@ -38,7 +38,7 @@ func testAccCheckLBV1MonitorDestroy(s *terraform.State) error {
3838
config := testAccProvider.Meta().(*Config)
3939
networkingClient, err := config.networkingV2Client(OS_REGION_NAME)
4040
if err != nil {
41-
return fmt.Errorf("(testAccCheckLBV1MonitorDestroy) Error creating OpenStack networking client: %s", err)
41+
return fmt.Errorf("Error creating OpenStack networking client: %s", err)
4242
}
4343

4444
for _, rs := range s.RootModule().Resources {
@@ -55,7 +55,7 @@ func testAccCheckLBV1MonitorDestroy(s *terraform.State) error {
5555
return nil
5656
}
5757

58-
func testAccCheckLBV1MonitorExists(t *testing.T, n string, monitor *monitors.Monitor) resource.TestCheckFunc {
58+
func testAccCheckLBV1MonitorExists(n string, monitor *monitors.Monitor) resource.TestCheckFunc {
5959
return func(s *terraform.State) error {
6060
rs, ok := s.RootModule().Resources[n]
6161
if !ok {
@@ -69,7 +69,7 @@ func testAccCheckLBV1MonitorExists(t *testing.T, n string, monitor *monitors.Mon
6969
config := testAccProvider.Meta().(*Config)
7070
networkingClient, err := config.networkingV2Client(OS_REGION_NAME)
7171
if err != nil {
72-
return fmt.Errorf("(testAccCheckLBV1MonitorExists) Error creating OpenStack networking client: %s", err)
72+
return fmt.Errorf("Error creating OpenStack networking client: %s", err)
7373
}
7474

7575
found, err := monitors.Get(networkingClient, rs.Primary.ID).Extract()
@@ -87,24 +87,24 @@ func testAccCheckLBV1MonitorExists(t *testing.T, n string, monitor *monitors.Mon
8787
}
8888
}
8989

90-
var testAccLBV1Monitor_basic = fmt.Sprintf(`
91-
resource "openstack_lb_monitor_v1" "monitor_1" {
92-
region = "%s"
93-
type = "PING"
94-
delay = 30
95-
timeout = 5
96-
max_retries = 3
97-
admin_state_up = "true"
98-
}`,
99-
OS_REGION_NAME)
100-
101-
var testAccLBV1Monitor_update = fmt.Sprintf(`
102-
resource "openstack_lb_monitor_v1" "monitor_1" {
103-
region = "%s"
104-
type = "PING"
105-
delay = 20
106-
timeout = 5
107-
max_retries = 3
108-
admin_state_up = "true"
109-
}`,
110-
OS_REGION_NAME)
90+
const testAccLBV1Monitor_basic = `
91+
resource "openstack_lb_monitor_v1" "monitor_1" {
92+
region = "%s"
93+
type = "PING"
94+
delay = 30
95+
timeout = 5
96+
max_retries = 3
97+
admin_state_up = "true"
98+
}
99+
`
100+
101+
const testAccLBV1Monitor_update = `
102+
resource "openstack_lb_monitor_v1" "monitor_1" {
103+
region = "%s"
104+
type = "PING"
105+
delay = 20
106+
timeout = 5
107+
max_retries = 3
108+
admin_state_up = "true"
109+
}
110+
`

0 commit comments

Comments
 (0)