Align resources status checks funcs

Author: kayrus

pkg/server.go

@@ -46,6 +46,11 @@ var serverNormalStatuses = []string{
 	"SHUTOFF",
 }
 
+var portNormalStatuses = []string{
+	"ACTIVE",
+	"DOWN",
+}
+
 var serverWaitStatuses = []string{
 	"BUILD",
 }
@@ -77,11 +82,11 @@ func waitForServer(client *gophercloud.ServiceClient, id string, secs float64) (
 		}
 
 		log.Printf("Server status: %s", server.Status)
-		if isSliceContainsStr(serverNormalStatuses, string(server.Status)) {
+		if isSliceContainsStr(serverNormalStatuses, server.Status) {
 			return true, nil
 		}
 
-		if !isSliceContainsStr(serverWaitStatuses, string(server.Status)) {
+		if !isSliceContainsStr(serverWaitStatuses, server.Status) {
 			return false, fmt.Errorf("server status is %q", server.Status)
 		}
 
@@ -102,7 +107,7 @@ func waitForPort(client *gophercloud.ServiceClient, id string, secs float64) (*p
 		}
 
 		log.Printf("Port status: %s", port.Status)
-		if port.Status == "ACTIVE" || port.Status == "DOWN" {
+		if isSliceContainsStr(portNormalStatuses, port.Status) {
 			return true, nil
 		}
 

pkg/volume.go

@@ -38,6 +38,15 @@ var (
 	waitForSnapshotSec float64
 )
 
+var volumeNormalStatuses = []string{
+	"available",
+	"in-use",
+}
+
+var snapshotNormalStatuses = []string{
+	"available",
+}
+
 func expandVolumeProperties(srcVolume *volumes.Volume) images.UpdateOpts {
 	// set min_disk and min_ram from a source volume
 	imgAttrUpdateOpts := images.UpdateOpts{
@@ -81,7 +90,7 @@ func waitForSnapshot(client *gophercloud.ServiceClient, id string, secs float64)
 		}
 
 		log.Printf("Intermediate snapshot status: %s", snapshot.Status)
-		if snapshot.Status == "available" {
+		if isSliceContainsStr(snapshotNormalStatuses, snapshot.Status) {
 			return true, nil
 		}
 
@@ -116,7 +125,7 @@ func waitForVolume(client *gophercloud.ServiceClient, id string, secs float64) (
 
 		log.Printf("Volume status: %s", volume.Status)
 		// TODO: specify target states in func params
-		if volume.Status == "available" || volume.Status == "in-use" {
+		if isSliceContainsStr(volumeNormalStatuses, volume.Status) {
 			return true, nil
 		}