extract image visibility

Author: James Fisher

openstack/imageservice/v2/requests_test.go

@@ -38,6 +38,8 @@ func TestCreateImage(t *testing.T) {
 		DiskFormat: "qcow2",
 
 		Owner: "b4eedccc6fb74fa8a7ad6b08382b852b",
+
+		Visibility: ImageVisibilityPrivate,
 	}
 
 	th.AssertDeepEquals(t, &expectedImage, actualImage)

openstack/imageservice/v2/results.go

@@ -106,7 +106,7 @@ func stringToImageStatus(s string) (ImageStatus, error) {
 	} else if s == "active" {
 		return ImageStatusActive, nil
 	} else {
-		return "", errors.New(fmt.Sprintf("expected \"active\" as image status, but found: \"%s\"", s))
+		return "", errors.New(fmt.Sprintf("expected \"queued\" or \"active\" as image status, but found: \"%s\"", s))
 	}
 }
 
@@ -122,6 +122,28 @@ func extractImageStatusAtKey(m map[string]interface{}, k string) (ImageStatus, e
 	}
 }
 
+func stringToImageVisibility(s string) (ImageVisibility, error) {
+	if s == "public" {
+		return ImageVisibilityPublic, nil
+	} else if s == "private" {
+		return ImageVisibilityPrivate, nil
+	} else {
+		return "", errors.New(fmt.Sprintf("expected \"public\" or \"private\" as image status, but found: \"%s\"", s))
+	}
+}
+
+func extractImageVisibilityAtKey(m map[string]interface{}, k string) (ImageVisibility, error) {
+	if any, ok := m[k]; ok {
+		if str, ok := any.(string); ok {
+			return stringToImageVisibility(str)
+		} else {
+			return "", errors.New(fmt.Sprintf("expected string as \"%s\" value, but found: %#v", k, any))
+		}
+	} else {
+		return "", errors.New(fmt.Sprintf("expected key \"%s\" in map, but this key is not present", k))
+	}
+}
+
 func extractImage(res gophercloud.ErrResult) (*Image, error) {
 	if res.Err != nil {
 		return nil, res.Err
@@ -167,6 +189,10 @@ func extractImage(res gophercloud.ErrResult) (*Image, error) {
 	if image.Protected, err = extractBoolAtKey(body, "protected"); err != nil {
 		return nil, err
 	}
+
+	if image.Visibility, err = extractImageVisibilityAtKey(body, "visibility"); err != nil {
+		return nil, err
+	}
 
 	return &image, nil
 }