extract container_format, disk_format, owner, protected

Author: James Fisher

openstack/imageservice/v2/requests_test.go

@@ -30,8 +30,14 @@ func TestCreateImage(t *testing.T) {
 	expectedImage := Image{
 		Id: "e7db3b45-8db7-47ad-8109-3fb55c2c24fd",
 		Name: "Ubuntu 12.10",
-		Status: ImageStatusQueued,
 		Tags: []string{"ubuntu", "quantal"},
+		
+		Status: ImageStatusQueued,
+		
+		ContainerFormat: "bare",
+		DiskFormat: "qcow2",
+
+		Owner: "b4eedccc6fb74fa8a7ad6b08382b852b",
 	}
 
 	th.AssertDeepEquals(t, &expectedImage, actualImage)
@@ -50,9 +56,10 @@ func TestGetImage(t *testing.T) {
 	expectedImage := Image{
 		Id: "1bea47ed-f6a9-463b-b423-14b9cca9ad27",
 		Name: "cirros-0.3.2-x86_64-disk",
-		Status: ImageStatusActive,
 		Tags: []string{},
 
+		Status: ImageStatusActive,
+
 		ContainerFormat: "bare",
 		DiskFormat: "qcow2",
 

openstack/imageservice/v2/results.go

@@ -49,6 +49,14 @@ type CreateResult struct {
 	gophercloud.ErrResult
 }
 
+func asBool(any interface{}) (bool, error) {
+	if b, ok := any.(bool); ok {
+		return b, nil
+	} else {
+		return false, errors.New(fmt.Sprintf("expected bool value, but found: %#v", any))
+	}
+}
+
 func asString(any interface{}) (string, error) {
 	if str, ok := any.(string); ok {
 		return str, nil
@@ -57,6 +65,14 @@ func asString(any interface{}) (string, error) {
 	}
 }
 
+func extractBoolAtKey(m map[string]interface{}, k string) (bool, error) {
+	if any, ok := m[k]; ok {
+		return asBool(any)
+	} else {
+		return false, errors.New(fmt.Sprintf("expected key \"%s\" in map, but this key is not present", k))
+	}
+}
+
 func extractStringAtKey(m map[string]interface{}, k string) (string, error) {
 	if any, ok := m[k]; ok {
 		return asString(any)
@@ -136,6 +152,22 @@ func extractImage(res gophercloud.ErrResult) (*Image, error) {
 		return nil, err
 	}
 
+	if image.ContainerFormat, err = extractStringAtKey(body, "container_format"); err != nil {
+		return nil, err
+	}
+	
+	if image.DiskFormat, err = extractStringAtKey(body, "disk_format"); err != nil {
+		return nil, err
+	}
+
+	if image.Owner, err = extractStringAtKey(body, "owner"); err != nil {
+		return nil, err
+	}
+
+	if image.Protected, err = extractBoolAtKey(body, "protected"); err != nil {
+		return nil, err
+	}
+	
 	return &image, nil
 }