Modifying acceptance tests to support alternative network name
diff --git a/acceptance/openstack/compute/v2/servers_test.go b/acceptance/openstack/compute/v2/servers_test.go
index d77d34a..7b928e9 100644
--- a/acceptance/openstack/compute/v2/servers_test.go
+++ b/acceptance/openstack/compute/v2/servers_test.go
@@ -57,7 +57,6 @@
}
return openstack.NewNetworkV2(provider, gophercloud.EndpointOpts{
- Name: "neutron",
Region: os.Getenv("OS_REGION_NAME"),
})
}
@@ -74,7 +73,10 @@
t.Fatalf("Unable to create a networking client: %v", err)
}
- pager := networks.List(networkingClient, networks.ListOpts{Name: "public", Limit: 1})
+ pager := networks.List(networkingClient, networks.ListOpts{
+ Name: choices.NetworkName,
+ Limit: 1,
+ })
pager.EachPage(func(page pagination.Page) (bool, error) {
networks, err := networks.ExtractNetworks(page)
if err != nil {
@@ -152,7 +154,7 @@
return true, nil
})
- pager = servers.ListAddressesByNetwork(client, server.ID, "public")
+ pager = servers.ListAddressesByNetwork(client, server.ID, choices.NetworkName)
pager.EachPage(func(page pagination.Page) (bool, error) {
addresses, err := servers.ExtractNetworkAddresses(page)
if err != nil {