Add ability to turn-on/off acceptance test for server live-migration

gophercloud · Jan 20, 2018 · 1d12f0d · 1d12f0d
1 parent 4f5656e
commit 1d12f0d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/acceptance/clients/clients.go b/acceptance/clients/clients.go
@@ -6,6 +6,7 @@ package clients
 import (
 	"fmt"
 	"os"
+	"strconv"
 	"strings"
 
 	"github.com/gophercloud/gophercloud"
@@ -42,6 +43,9 @@ type AcceptanceTestChoices struct {
 
 	// DBDatastoreTypeID is the datastore type version for DB tests.
 	DBDatastoreVersion string
+
+	// LiveMigrate indicates ability to run multi-node migration tests
+	LiveMigrate bool
 }
 
 // AcceptanceTestChoicesFromEnv populates a ComputeChoices struct from environment variables.
@@ -56,6 +60,7 @@ func AcceptanceTestChoicesFromEnv() (*AcceptanceTestChoices, error) {
 	shareNetworkID := os.Getenv("OS_SHARE_NETWORK_ID")
 	dbDatastoreType := os.Getenv("OS_DB_DATASTORE_TYPE")
 	dbDatastoreVersion := os.Getenv("OS_DB_DATASTORE_VERSION")
+	liveMigrate := os.Getenv("OS_LIVE_MIGRATE")
 
 	missing := make([]string, 0, 3)
 	if imageID == "" {
@@ -84,6 +89,8 @@ func AcceptanceTestChoicesFromEnv() (*AcceptanceTestChoices, error) {
 		notDistinct = "OS_FLAVOR_ID and OS_FLAVOR_ID_RESIZE must be distinct."
 	}
 
+	LiveMigrate, _ := strconv.ParseBool(liveMigrate)
+
 	if len(missing) > 0 || notDistinct != "" {
 		text := "You're missing some important setup:\n"
 		if len(missing) > 0 {
@@ -106,6 +113,7 @@ func AcceptanceTestChoicesFromEnv() (*AcceptanceTestChoices, error) {
 		ShareNetworkID:     shareNetworkID,
 		DBDatastoreType:    dbDatastoreType,
 		DBDatastoreVersion: dbDatastoreVersion,
+		LiveMigrate:        LiveMigrate,
 	}, nil
 }
 

diff --git a/acceptance/openstack/compute/v2/migrate_test.go b/acceptance/openstack/compute/v2/migrate_test.go
@@ -30,6 +30,15 @@ func TestMigrate(t *testing.T) {
 }
 
 func TestLiveMigrate(t *testing.T) {
+	choices, err := clients.AcceptanceTestChoicesFromEnv()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if !choices.LiveMigrate {
+		t.Skip()
+	}
+
 	client, err := clients.NewComputeV2Client()
 	if err != nil {
 		t.Fatalf("Unable to create a compute client: %v", err)

diff --git a/openstack/compute/v2/extensions/migrate/requests.go b/openstack/compute/v2/extensions/migrate/requests.go
@@ -18,7 +18,6 @@ type LiveMigrateOptsBuilder interface {
 
 // LiveMigrateOpts specifies parameters of live migrate action.
 type LiveMigrateOpts struct {
-
 	// The host to which to migrate the server.
 	// If this parameter is None, the scheduler chooses a host.
 	Host *string `json:"host"`