test image deletion

Author: James Fisher

openstack/imageservice/v2/fixtures.go

@@ -80,3 +80,12 @@ func HandleImageGetSuccessfully(t *testing.T) {
 		}`)
 	})
 }
+
+func HandleImageDeleteSuccessfully(t *testing.T) {
+	th.Mux.HandleFunc("/images/1bea47ed-f6a9-463b-b423-14b9cca9ad27", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "DELETE")
+		th.TestHeader(t, r, "X-Auth-Token", fakeclient.TokenID)
+		
+		w.WriteHeader(http.StatusNoContent)
+	})
+}

openstack/imageservice/v2/requests.go

@@ -109,7 +109,9 @@ func (opts CreateOpts) ToImageCreateMap() (map[string]interface{}, error) {
 
 func Delete(client *gophercloud.ServiceClient, id string) DeleteResult {
 	var res DeleteResult
-	_, res.Err = client.Delete(deleteURL(client, id), nil)
+	_, res.Err = client.Delete(deleteURL(client, id), &gophercloud.RequestOpts{
+		OkCodes: []int{204},
+	})
 	return res
 }
 

openstack/imageservice/v2/requests_test.go

@@ -88,3 +88,13 @@ func TestGetImage(t *testing.T) {
 
 	th.AssertDeepEquals(t, &expectedImage, actualImage)
 }
+
+func TestDeleteImage(t *testing.T) {
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
+
+	HandleImageDeleteSuccessfully(t)
+
+	Delete(fakeclient.ServiceClient(), "1bea47ed-f6a9-463b-b423-14b9cca9ad27")
+	// TODO
+}

openstack/imageservice/v2/results.go

@@ -6,8 +6,6 @@ import (
 
 	"github.com/rackspace/gophercloud"
 	//"github.com/rackspace/gophercloud/pagination"
-
-	"github.com/mitchellh/mapstructure"
 )
 
 // does not include the literal image data; just metadata.
@@ -24,19 +22,19 @@ type Image struct {
 	ContainerFormat string
 	DiskFormat string
 
-	MinDiskGigabytes int `mapstructure:"min_disk"`
-	MinRamMegabytes int `mapstructure:"min_ram"`
+	MinDiskGigabytes int
+	MinRamMegabytes int
 
 	Owner string
 
 	Protected bool
 	Visibility ImageVisibility
 
-	Checksum *string `mapstructure:"checksum"`
-	SizeBytes *int `mapstructure:"size"`
+	Checksum *string
+	SizeBytes *int
 
-	Metadata map[string]string `mapstructure:"metadata"`
-	Properties map[string]string `mapstructure:"properties"`
+	Metadata map[string]string
+	Properties map[string]string
 }
 
 // implements pagination.Page<Image>, pagination.MarkerPage
@@ -300,19 +298,6 @@ func extractImage(res gophercloud.ErrResult) (*Image, error) {
 	return &image, nil
 }
 
-// The response to `POST /images` follows the same schema as `GET /images/:id`.
-func extractImageOld(res gophercloud.ErrResult) (*Image, error) {
-	if res.Err != nil {
-		return nil, res.Err
-	}
-
-	var image Image
-
-	err := mapstructure.Decode(res.Body, &image)
-	
-	return &image, err
-}
-
 func (c CreateResult) Extract() (*Image, error) {
 	return extractImage(c.ErrResult)
 }