Compute Acceptance Test Changes (#33)
This commit makes more changes to the compute acceptance tests:
* Makes all reusable functions exportable so other APIs can use them.
* Centralizes client initialization and environment variable checks.
diff --git a/acceptance/openstack/compute/v2/floatingip_test.go b/acceptance/openstack/compute/v2/floatingip_test.go
index 92249c7..001dc9f 100644
--- a/acceptance/openstack/compute/v2/floatingip_test.go
+++ b/acceptance/openstack/compute/v2/floatingip_test.go
@@ -5,13 +5,13 @@
import (
"testing"
- "github.com/gophercloud/gophercloud"
+ "github.com/gophercloud/gophercloud/acceptance/clients"
"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/floatingips"
"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
)
func TestFloatingIPsList(t *testing.T) {
- client, err := newClient()
+ client, err := clients.NewComputeV2Client()
if err != nil {
t.Fatalf("Unable to create a compute client: %v", err)
}
@@ -27,28 +27,28 @@
}
for _, floatingIP := range allFloatingIPs {
- printFloatingIP(t, &floatingIP)
+ PrintFloatingIP(t, &floatingIP)
}
}
func TestFloatingIPsCreate(t *testing.T) {
- client, err := newClient()
+ client, err := clients.NewComputeV2Client()
if err != nil {
t.Fatalf("Unable to create a compute client: %v", err)
}
- choices, err := ComputeChoicesFromEnv()
+ choices, err := clients.AcceptanceTestChoicesFromEnv()
if err != nil {
t.Fatal(err)
}
- floatingIP, err := createFloatingIP(t, client, choices)
+ floatingIP, err := CreateFloatingIP(t, client, choices)
if err != nil {
t.Fatalf("Unable to create floating IP: %v", err)
}
- defer deleteFloatingIP(t, client, floatingIP)
+ defer DeleteFloatingIP(t, client, floatingIP)
- printFloatingIP(t, floatingIP)
+ PrintFloatingIP(t, floatingIP)
}
func TestFloatingIPsAssociate(t *testing.T) {
@@ -56,52 +56,44 @@
t.Skip("Skipping test that requires server creation in short mode.")
}
- client, err := newClient()
+ client, err := clients.NewComputeV2Client()
if err != nil {
t.Fatalf("Unable to create a compute client: %v", err)
}
- choices, err := ComputeChoicesFromEnv()
+ choices, err := clients.AcceptanceTestChoicesFromEnv()
if err != nil {
t.Fatal(err)
}
- server, err := createServer(t, client, choices)
+ server, err := CreateServer(t, client, choices)
if err != nil {
t.Fatalf("Unable to create server: %v", err)
}
+ defer DeleteServer(t, client, server)
- if err = waitForStatus(client, server, "ACTIVE"); err != nil {
- t.Fatalf("Unable to wait for server: %v", err)
- }
- defer deleteServer(t, client, server)
-
- floatingIP, err := createFloatingIP(t, client, choices)
+ floatingIP, err := CreateFloatingIP(t, client, choices)
if err != nil {
t.Fatalf("Unable to create floating IP: %v", err)
}
- defer deleteFloatingIP(t, client, floatingIP)
+ defer DeleteFloatingIP(t, client, floatingIP)
- printFloatingIP(t, floatingIP)
+ PrintFloatingIP(t, floatingIP)
- associateOpts := floatingips.AssociateOpts{
- FloatingIP: floatingIP.IP,
- }
-
- t.Logf("Attempting to associate floating IP %s to instance %s", floatingIP.IP, server.ID)
- err = floatingips.AssociateInstance(client, server.ID, associateOpts).ExtractErr()
+ err = AssociateFloatingIP(t, client, floatingIP, server)
if err != nil {
t.Fatalf("Unable to associate floating IP %s with server %s: %v", floatingIP.IP, server.ID, err)
}
- defer disassociateFloatingIP(t, client, floatingIP, server)
- t.Logf("Floating IP %s is associated with Fixed IP %s", floatingIP.IP, floatingIP.FixedIP)
+ defer DisassociateFloatingIP(t, client, floatingIP, server)
newFloatingIP, err := floatingips.Get(client, floatingIP.ID).Extract()
if err != nil {
t.Fatalf("Unable to get floating IP %s: %v", floatingIP.ID, err)
}
- printFloatingIP(t, newFloatingIP)
+ t.Logf("Floating IP %s is associated with Fixed IP %s", floatingIP.IP, newFloatingIP.FixedIP)
+
+ PrintFloatingIP(t, newFloatingIP)
}
func TestFloatingIPsFixedIPAssociate(t *testing.T) {
@@ -109,38 +101,34 @@
t.Skip("Skipping test that requires server creation in short mode.")
}
- client, err := newClient()
+ client, err := clients.NewComputeV2Client()
if err != nil {
t.Fatalf("Unable to create a compute client: %v", err)
}
- choices, err := ComputeChoicesFromEnv()
+ choices, err := clients.AcceptanceTestChoicesFromEnv()
if err != nil {
t.Fatal(err)
}
- server, err := createServer(t, client, choices)
+ server, err := CreateServer(t, client, choices)
if err != nil {
t.Fatalf("Unable to create server: %v", err)
}
-
- if err = waitForStatus(client, server, "ACTIVE"); err != nil {
- t.Fatalf("Unable to wait for server: %v", err)
- }
- defer deleteServer(t, client, server)
+ defer DeleteServer(t, client, server)
newServer, err := servers.Get(client, server.ID).Extract()
if err != nil {
t.Fatalf("Unable to get server %s: %v", server.ID, err)
}
- floatingIP, err := createFloatingIP(t, client, choices)
+ floatingIP, err := CreateFloatingIP(t, client, choices)
if err != nil {
t.Fatalf("Unable to create floating IP: %v", err)
}
- defer deleteFloatingIP(t, client, floatingIP)
+ defer DeleteFloatingIP(t, client, floatingIP)
- printFloatingIP(t, floatingIP)
+ PrintFloatingIP(t, floatingIP)
var fixedIP string
for _, networkAddresses := range newServer.Addresses[choices.NetworkName].([]interface{}) {
@@ -152,66 +140,18 @@
}
}
- associateOpts := floatingips.AssociateOpts{
- FloatingIP: floatingIP.IP,
- FixedIP: fixedIP,
- }
-
- t.Logf("Attempting to associate floating IP %s to instance %s", floatingIP.IP, newServer.ID)
- err = floatingips.AssociateInstance(client, newServer.ID, associateOpts).ExtractErr()
+ err = AssociateFloatingIPWithFixedIP(t, client, floatingIP, newServer, fixedIP)
if err != nil {
t.Fatalf("Unable to associate floating IP %s with server %s: %v", floatingIP.IP, newServer.ID, err)
}
- defer disassociateFloatingIP(t, client, floatingIP, newServer)
- t.Logf("Floating IP %s is associated with Fixed IP %s", floatingIP.IP, floatingIP.FixedIP)
+ defer DisassociateFloatingIP(t, client, floatingIP, newServer)
newFloatingIP, err := floatingips.Get(client, floatingIP.ID).Extract()
if err != nil {
t.Fatalf("Unable to get floating IP %s: %v", floatingIP.ID, err)
}
- printFloatingIP(t, newFloatingIP)
-}
+ t.Logf("Floating IP %s is associated with Fixed IP %s", floatingIP.IP, newFloatingIP.FixedIP)
-func createFloatingIP(t *testing.T, client *gophercloud.ServiceClient, choices *ComputeChoices) (*floatingips.FloatingIP, error) {
- createOpts := floatingips.CreateOpts{
- Pool: choices.FloatingIPPoolName,
- }
- floatingIP, err := floatingips.Create(client, createOpts).Extract()
- if err != nil {
- return floatingIP, err
- }
-
- t.Logf("Created floating IP: %s", floatingIP.ID)
- return floatingIP, nil
-}
-
-func deleteFloatingIP(t *testing.T, client *gophercloud.ServiceClient, floatingIP *floatingips.FloatingIP) {
- err := floatingips.Delete(client, floatingIP.ID).ExtractErr()
- if err != nil {
- t.Fatalf("Unable to delete floating IP %s: %v", floatingIP.ID, err)
- }
-
- t.Logf("Deleted floating IP: %s", floatingIP.ID)
-}
-
-func disassociateFloatingIP(t *testing.T, client *gophercloud.ServiceClient, floatingIP *floatingips.FloatingIP, server *servers.Server) {
- disassociateOpts := floatingips.DisassociateOpts{
- FloatingIP: floatingIP.IP,
- }
-
- err := floatingips.DisassociateInstance(client, server.ID, disassociateOpts).ExtractErr()
- if err != nil {
- t.Fatalf("Unable to disassociate floating IP %s from server %s: %v", floatingIP.IP, server.ID, err)
- }
-
- t.Logf("Disassociated floating IP %s from server %s", floatingIP.IP, server.ID)
-}
-
-func printFloatingIP(t *testing.T, floatingIP *floatingips.FloatingIP) {
- t.Logf("ID: %s", floatingIP.ID)
- t.Logf("Fixed IP: %s", floatingIP.FixedIP)
- t.Logf("Instance ID: %s", floatingIP.InstanceID)
- t.Logf("IP: %s", floatingIP.IP)
- t.Logf("Pool: %s", floatingIP.Pool)
+ PrintFloatingIP(t, newFloatingIP)
}