MinDiskGigabytes, MinRamMegabytes, SizeBytes

Author: James Fisher

openstack/imageservice/v2/requests_test.go

@@ -56,6 +56,7 @@ func TestGetImage(t *testing.T) {
 	th.AssertNoErr(t, err)
 
 	checksum := "64d7c1cd2b6f60c92c14662941cb7913"
+	sizebytes := 13167616
 
 	expectedImage := Image{
 		Id: "1bea47ed-f6a9-463b-b423-14b9cca9ad27",
@@ -76,7 +77,7 @@ func TestGetImage(t *testing.T) {
 		Visibility: ImageVisibilityPublic,
 
 		Checksum: &checksum,
-		SizeBytes: 13167616,
+		SizeBytes: &sizebytes,
 	}
 
 	th.AssertDeepEquals(t, &expectedImage, actualImage)

openstack/imageservice/v2/results.go

@@ -3,6 +3,7 @@ package v2
 import (
 	"errors"
 	"fmt"
+	"reflect"
 
 	"github.com/rackspace/gophercloud"
 	//"github.com/rackspace/gophercloud/pagination"
@@ -33,7 +34,7 @@ type Image struct {
 	Visibility ImageVisibility
 
 	Checksum *string `mapstructure:"checksum"`
-	SizeBytes int `mapstructure:"size"`
+	SizeBytes *int `mapstructure:"size"`
 
 	Metadata map[string]string `mapstructure:"metadata"`
 	Properties map[string]string `mapstructure:"properties"`
@@ -57,6 +58,16 @@ func asBool(any interface{}) (bool, error) {
 	}
 }
 
+func asInt(any interface{}) (int, error) {
+	// FIXME integers decoded as float64s
+	if f, ok := any.(float64); ok {
+		i := int(f)
+		return i, nil
+	} else {
+		return 0, errors.New(fmt.Sprintf("expected int value, but found: %#v", any))
+	}
+}
+
 func asString(any interface{}) (string, error) {
 	if str, ok := any.(string); ok {
 		return str, nil
@@ -77,6 +88,23 @@ func asNoneableString(any interface{}) (*string, error) {
 	}
 }
 
+func asNoneableInteger(any interface{}) (*int, error) {
+	// FIXME problem here is that provider_client.go uses: json.NewDecoder(resp.Body).Decode(options.JSONResponse)
+	// which apparently converts integers in JSON to float64 values
+	if f, ok := any.(float64); ok {
+		i := int(f)
+		return &i, nil
+	} else if s, ok := any.(string); ok {
+		if s == "None" {
+			return nil, nil
+		} else {
+			return nil, errors.New(fmt.Sprintf("expected \"None\" or integer value, but found unexpected string: \"%s\"", s))
+		}
+	} else {
+		return nil, errors.New(fmt.Sprintf("expected \"None\" or integer value, but found: %#v of type %s", any, reflect.TypeOf(any)))
+	}
+}
+
 func extractBoolAtKey(m map[string]interface{}, k string) (bool, error) {
 	if any, ok := m[k]; ok {
 		return asBool(any)
@@ -85,6 +113,14 @@ func extractBoolAtKey(m map[string]interface{}, k string) (bool, error) {
 	}
 }
 
+func extractIntAtKey(m map[string]interface{}, k string) (int, error) {
+	if any, ok := m[k]; ok {
+		return asInt(any)
+	} else {
+		return 0, 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)
@@ -101,6 +137,14 @@ func extractNoneableStringAtKey(m map[string]interface{}, k string) (*string, er
 	}
 }
 
+func extractNoneableIntegerAtKey(m map[string]interface{}, k string) (*int, error) {
+	if any, ok := m[k]; ok {
+		return asNoneableInteger(any)
+	} else {
+		return nil, errors.New(fmt.Sprintf("expected key \"%s\" in map, but this key is not present", k))
+	}
+}
+
 func extractStringSliceAtKey(m map[string]interface{}, k string) ([]string, error) {
 	if any, ok := m[k]; ok {
 		if slice, ok := any.([]interface{}); ok {
@@ -177,7 +221,7 @@ func extractImage(res gophercloud.ErrResult) (*Image, error) {
 	var image Image
 
 	var err error
-	
+
 	if image.Id, err = extractStringAtKey(body, "id"); err != nil {
 		return nil, err
 	}
@@ -202,6 +246,14 @@ func extractImage(res gophercloud.ErrResult) (*Image, error) {
 		return nil, err
 	}
 
+	if image.MinDiskGigabytes, err = extractIntAtKey(body, "min_disk"); err != nil {
+		return nil, err
+	}
+
+	if image.MinRamMegabytes, err = extractIntAtKey(body, "min_ram"); err != nil {
+		return nil, err
+	}
+	
 	if image.Owner, err = extractStringAtKey(body, "owner"); err != nil {
 		return nil, err
 	}
@@ -217,7 +269,14 @@ func extractImage(res gophercloud.ErrResult) (*Image, error) {
 	if image.Checksum, err = extractNoneableStringAtKey(body, "checksum"); err != nil {
 		return nil, err
 	}
-	
+
+	if image.SizeBytes, err = extractNoneableIntegerAtKey(body, "size"); err != nil {
+		return nil, err
+	}
+
+	// TODO Metadata map[string]string `mapstructure:"metadata"`
+	// TODO Properties map[string]string `mapstructure:"properties"`
+
 	return &image, nil
 }