Merge lp:~axwalk/gwacl/gwacl into lp:gwacl

[Andrew Wilkins]

Delete OS disk blobs in DestroyDeployment

Fixes bug #1216744

Delete OS disk blobs in DestroyDeployment

Fixes bug #1216744

[Julian Edwards (julian-edwards)]

Looks good, thanks.

review: Approve

=== modified file 'management.go'
--- management.go	2013-08-05 12:50:48 +0000
+++ management.go	2013-08-28 00:17:58 +0000
@@ -160,7 +160,7 @@
     for _, diskName := range diskNames {
         err = api.DeleteDisk(&DeleteDiskRequest{
             DiskName:   diskName,
-            DeleteBlob: false}) // change to true at some point?
+            DeleteBlob: true})
         if err != nil && !IsNotFoundError(err) {
             return err
         }
 
=== modified file 'management_base_test.go'
--- management_base_test.go	2013-08-09 14:59:50 +0000
+++ management_base_test.go	2013-08-28 00:17:58 +0000
@@ -889,9 +889,12 @@
     c.Check(keys.URL, Equals, url)
 }
 
-func assertDeleteDiskRequest(c *C, api *ManagementAPI, diskName string, httpRequest *X509Request) {
+func assertDeleteDiskRequest(c *C, api *ManagementAPI, diskName string, httpRequest *X509Request, deleteBlob bool) {
     expectedURL := fmt.Sprintf("%s%s/services/disks/%s", defaultManagement,
         api.session.subscriptionId, diskName)
+    if deleteBlob {
+        expectedURL += "?comp=media"
+    }
     checkRequest(c, httpRequest, expectedURL, "2012-08-01", nil, "DELETE")
 }
 
@@ -902,13 +905,17 @@
     // Change the polling interval to speed up the tests:
     deleteDiskInterval = time.Nanosecond
     api := makeAPI(c)
-    recordedRequests := setUpDispatcher("operationID")
     diskName := "diskName"
-    err := api.DeleteDisk(&DeleteDiskRequest{DiskName: diskName})
-
-    c.Assert(err, IsNil)
-    c.Assert(*recordedRequests, HasLen, 1)
-    assertDeleteDiskRequest(c, api, diskName, (*recordedRequests)[0])
+    for _, deleteBlob := range [...]bool{false, true} {
+        recordedRequests := setUpDispatcher("operationID")
+        err := api.DeleteDisk(&DeleteDiskRequest{
+            DiskName:   diskName,
+            DeleteBlob: deleteBlob,
+        })
+        c.Assert(err, IsNil)
+        c.Assert(*recordedRequests, HasLen, 1)
+        assertDeleteDiskRequest(c, api, diskName, (*recordedRequests)[0], deleteBlob)
+    }
 }
 
 func (suite *managementBaseAPISuite) TestDeleteDiskWhenDiskDoesNotExist(c *C) {
 
=== modified file 'management_test.go'
--- management_test.go	2013-08-06 08:01:43 +0000
+++ management_test.go	2013-08-28 00:17:58 +0000
@@ -297,9 +297,9 @@
         request.ServiceName, request.DeploymentName}, record[0])
     assertDeleteDeploymentRequest(c, api, request.ServiceName,
         request.DeploymentName, record[1])
-    assertDeleteDiskRequest(c, api, "disk1", record[2])
-    assertDeleteDiskRequest(c, api, "disk2", record[3])
-    assertDeleteDiskRequest(c, api, "disk3", record[4])
+    assertDeleteDiskRequest(c, api, "disk1", record[2], true)
+    assertDeleteDiskRequest(c, api, "disk2", record[3], true)
+    assertDeleteDiskRequest(c, api, "disk3", record[4], true)
 }
 
 func (suite *suiteDestroyDeployment) TestOkayWhenDeploymentNotFound(c *C) {
@@ -343,9 +343,9 @@
         request.ServiceName, request.DeploymentName}, record[0])
     assertDeleteDeploymentRequest(c, api, request.ServiceName,
         request.DeploymentName, record[1])
-    assertDeleteDiskRequest(c, api, "disk1", record[2])
-    assertDeleteDiskRequest(c, api, "disk2", record[3])
-    assertDeleteDiskRequest(c, api, "disk3", record[4])
+    assertDeleteDiskRequest(c, api, "disk1", record[2], true)
+    assertDeleteDiskRequest(c, api, "disk2", record[3], true)
+    assertDeleteDiskRequest(c, api, "disk3", record[4], true)
 }
 
 func (suite *suiteDestroyDeployment) TestFailsGettingDeployment(c *C) {