Skip to content

Commit eeda2a2

Browse files
EmilienMEmilienM
committed
gofumpt & fix e2e
The additional VIPs should not be created before the load balancer, Octavia already takes care of creating the port for us. Also, this feature is only available in Zed and beyond.
1 parent b25d38a commit eeda2a2

3 files changed

Lines changed: 40 additions & 17 deletions

File tree

‎internal/acceptance/openstack/loadbalancer/v2/loadbalancers_test.go‎

Lines changed: 33 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -245,15 +245,11 @@ func TestLoadbalancerHTTPCRUD(t *testing.T) {
245245
defer DeleteMonitor(t, lbClient, lb.ID, monitor.ID)
246246
}
247247

248-
func TestLoadbalancersCRUD(t *testing.T) {
249-
netClient, err := clients.NewNetworkV2Client()
250-
th.AssertNoErr(t, err)
248+
func TestLoadBalancerWithAdditionalVips(t *testing.T) {
249+
clients.SkipReleasesBelow(t, "stable/zed")
251250

252-
// Create QoS policy first as the loadbalancer and its port
253-
//needs to be deleted before the QoS policy can be deleted
254-
policy2, err := policies.CreateQoSPolicy(t, netClient)
251+
netClient, err := clients.NewNetworkV2Client()
255252
th.AssertNoErr(t, err)
256-
defer policies.DeleteQoSPolicy(t, netClient, policy2.ID)
257253

258254
lbClient, err := clients.NewLoadBalancerV2Client()
259255
th.AssertNoErr(t, err)
@@ -270,21 +266,45 @@ func TestLoadbalancersCRUD(t *testing.T) {
270266
th.AssertNoErr(t, err)
271267
defer networking.DeleteSubnet(t, netClient, additionalSubnet.ID)
272268

273-
additionalSubnetPort, err := networking.CreatePort(t, netClient, network.ID, additionalSubnet.ID)
269+
tags := []string{"test"}
270+
// Octavia takes care of creating the port for the loadbalancer
271+
additionalSubnetIP := "192.168.2.207"
272+
lb, err := CreateLoadBalancer(t, lbClient, subnet.ID, tags, "", []loadbalancers.AdditionalVip{{SubnetID: additionalSubnet.ID, IPAddress: additionalSubnetIP}})
273+
th.AssertNoErr(t, err)
274+
th.AssertEquals(t, 1, len(lb.AdditionalVips))
275+
th.AssertEquals(t, additionalSubnetIP, lb.AdditionalVips[0].IPAddress)
276+
defer DeleteLoadBalancer(t, lbClient, lb.ID)
277+
}
278+
279+
func TestLoadbalancersCRUD(t *testing.T) {
280+
netClient, err := clients.NewNetworkV2Client()
281+
th.AssertNoErr(t, err)
282+
283+
// Create QoS policy first as the loadbalancer and its port
284+
// needs to be deleted before the QoS policy can be deleted
285+
policy2, err := policies.CreateQoSPolicy(t, netClient)
286+
th.AssertNoErr(t, err)
287+
defer policies.DeleteQoSPolicy(t, netClient, policy2.ID)
288+
289+
lbClient, err := clients.NewLoadBalancerV2Client()
290+
th.AssertNoErr(t, err)
291+
292+
network, err := networking.CreateNetwork(t, netClient)
293+
th.AssertNoErr(t, err)
294+
defer networking.DeleteNetwork(t, netClient, network.ID)
295+
296+
subnet, err := networking.CreateSubnetWithCIDR(t, netClient, network.ID, "192.168.1.0/24", "192.168.1.1")
274297
th.AssertNoErr(t, err)
275-
defer networking.DeletePort(t, netClient, additionalSubnetPort.ID)
298+
defer networking.DeleteSubnet(t, netClient, subnet.ID)
276299

277300
policy1, err := policies.CreateQoSPolicy(t, netClient)
278301
th.AssertNoErr(t, err)
279302
defer policies.DeleteQoSPolicy(t, netClient, policy1.ID)
280303

281304
tags := []string{"test"}
282-
lb, err := CreateLoadBalancer(t, lbClient, subnet.ID, tags, policy1.ID, []loadbalancers.AdditionalVip{{SubnetID: additionalSubnet.ID, IPAddress: additionalSubnetPort.FixedIPs[0].IPAddress}})
305+
lb, err := CreateLoadBalancer(t, lbClient, subnet.ID, tags, policy1.ID, nil)
283306
th.AssertNoErr(t, err)
284307
th.AssertEquals(t, lb.VipQosPolicyID, policy1.ID)
285-
th.AssertEquals(t, 1, len(lb.AdditionalVips))
286-
th.AssertEquals(t, additionalSubnetPort.FixedIPs[0].IPAddress, lb.AdditionalVips[0].IPAddress)
287-
th.AssertEquals(t, additionalSubnetPort.FixedIPs[0].SubnetID, lb.AdditionalVips[0].SubnetID)
288308
defer DeleteLoadBalancer(t, lbClient, lb.ID)
289309

290310
lbDescription := ""

‎internal/acceptance/openstack/networking/v2/networking.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ func CreateSubnetWithDefaultGateway(t *testing.T, client *gophercloud.ServiceCli
394394
// specified Network ID. An error will be returned if the subnet could not be
395395
// created.
396396
func CreateSubnetWithNoGateway(t *testing.T, client *gophercloud.ServiceClient, networkID string) (*subnets.Subnet, error) {
397-
var noGateway = ""
397+
noGateway := ""
398398
subnetName := tools.RandomString("TESTACC-", 8)
399399
subnetOctet := tools.RandomInt(1, 250)
400400
subnetCIDR := fmt.Sprintf("192.168.%d.0/24", subnetOctet)

‎openstack/loadbalancer/v2/loadbalancers/testing/fixtures_test.go‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,10 @@ const GetLoadbalancerStatsBody = `
251251
}
252252
`
253253

254-
var createdTime, _ = time.Parse(time.RFC3339, "2019-06-30T04:15:37Z")
255-
var updatedTime, _ = time.Parse(time.RFC3339, "2019-06-30T05:18:49Z")
254+
var (
255+
createdTime, _ = time.Parse(time.RFC3339, "2019-06-30T04:15:37Z")
256+
updatedTime, _ = time.Parse(time.RFC3339, "2019-06-30T05:18:49Z")
257+
)
256258

257259
var (
258260
LoadbalancerWeb = loadbalancers.LoadBalancer{
@@ -294,7 +296,8 @@ var (
294296
SubnetID: "0d4f6a08-60b7-44ab-8903-f7d76ec54095",
295297
IPAddress: "192.168.10.10",
296298
},
297-
}}
299+
},
300+
}
298301
LoadbalancerUpdated = loadbalancers.LoadBalancer{
299302
ID: "36e08a3e-a78f-4b40-a229-1e7e23eee1ab",
300303
ProjectID: "54030507-44f7-473c-9342-b4d14a95f692",

0 commit comments

Comments
 (0)