fix tests

Author: James Fisher

openstack/imageservice/v2/requests_test.go

@@ -30,6 +30,8 @@ func TestCreateImage(t *testing.T) {
 	container_format := "bare"
 	disk_format := "qcow2"
 	owner := "b4eedccc6fb74fa8a7ad6b08382b852b"
+	min_disk_gigabytes := 0
+	min_ram_megabytes := 0
 
 	expectedImage := Image{
 		Id: "e7db3b45-8db7-47ad-8109-3fb55c2c24fd",
@@ -41,6 +43,9 @@ func TestCreateImage(t *testing.T) {
 		ContainerFormat: &container_format,
 		DiskFormat: &disk_format,
 
+		MinDiskGigabytes: &min_disk_gigabytes,
+		MinRamMegabytes: &min_ram_megabytes,
+		
 		Owner: &owner,
 
 		Visibility: ImageVisibilityPrivate,
@@ -144,6 +149,9 @@ func TestUpdateImage(t *testing.T) {
 
 		DiskFormat: nil,
 		ContainerFormat: nil,
+
+		Metadata: make(map[string]string),
+		Properties: make(map[string]string),
 	}
 
 	th.AssertDeepEquals(t, &expectedImage, actualImage)

openstack/imageservice/v2/results.go

@@ -213,6 +213,14 @@ func extractImageVisibilityAtKey(m map[string]interface{}, k string) (ImageVisib
 	}
 }
 
+func extractBoolAtKeyOptional(m map[string]interface{}, k string, ifMissing bool) (bool, error) {
+	if any, ok := m[k]; ok {
+		return asBool(any)
+	} else {
+		return ifMissing, nil
+	}
+}
+
 func extractMapStringStringAtKeyOptional(m map[string]interface{}, k string, ifMissing map[string]string) (map[string]string, error) {
 	if any, ok := m[k]; ok {
 		return asMapStringString(any)
@@ -271,7 +279,8 @@ func extractImage(res gophercloud.ErrResult) (*Image, error) {
 		return nil, err
 	}
 
-	if image.Protected, err = extractBoolAtKey(body, "protected"); err != nil {
+	// FIXME should this key actually be optional? Is a missing key equivalent to "protected": false ?
+	if image.Protected, err = extractBoolAtKeyOptional(body, "protected", false); err != nil {
 		return nil, err
 	}