Merge lp:~jtv/gwacl/delete-disk into lp:gwacl

[Jeroen T. Vermeulen]

Landing for Raphaël: Add API method to delete a disk.

Landing Raphaël's branch, which had contracted a silly little conflict with trunk: https://code.launchpad.net/~rvb/gwacl/delete-disk/+merge/156190

Resubmitting this because for some reason Tarmac isn't landing the original proposal.

Jeroen

[Jeroen T. Vermeulen (jtv)]

review: Approve

[Jeroen T. Vermeulen (jtv)]

And re-approving.

review: Approve

=== modified file 'example/live_example_managementapi.go'
--- example/live_example_managementapi.go	2013-04-01 08:22:52 +0000
+++ example/live_example_managementapi.go	2013-04-01 09:38:22 +0000
@@ -121,7 +121,9 @@
 
     mediaLink := fmt.Sprintf("http://%s.blob.core.windows.net/vhds/%s.vhd", storageAccount, vhdName)
     sourceImageName := "b39f27a8b8c64d52b05eac6a62ebad85__Ubuntu-12_04_1-LTS-amd64-server-20121218-en-us-30GB"
-    OSVirtualHardDisk := gwacl.NewOSVirtualHardDisk("", "", "", mediaLink, sourceImageName)
+    diskName := makeRandomIdentifier("gwacldisk", 16)
+    diskLabel := makeRandomIdentifier("gwacl", 64)
+    OSVirtualHardDisk := gwacl.NewOSVirtualHardDisk("", diskLabel, diskName, mediaLink, sourceImageName)
     roleName := makeRandomIdentifier("gwaclrole", 16)
     role := gwacl.NewRole("ExtraSmall", roleName, []gwacl.LinuxProvisioningConfiguration{*configurationSet}, OSVirtualHardDisk)
     machineName := makeRandomIdentifier("gwaclmachine", 20)
@@ -131,15 +133,29 @@
     fmt.Println("Done adding VM deployment\n")
 
     fmt.Println("Starting VM...")
-    operation := gwacl.StartRoleOperation
-    err = api.PerformRoleOperation(hostServiceName, deployment.Name, role.RoleName, operation)
+    err = api.PerformRoleOperation(hostServiceName, deployment.Name, role.RoleName, gwacl.StartRoleOperation)
     checkError(err)
     fmt.Println("Done starting VM\n")
 
+    fmt.Println("Stopping VM...")
+    err = api.PerformRoleOperation(hostServiceName, deployment.Name, role.RoleName, gwacl.ShutdownRoleOperation)
+    checkError(err)
+    fmt.Println("Done stopping VM\n")
+
     fmt.Println("Deleting deployment...")
-    api.DeleteDeployment(hostServiceName, deployment.Name)
+    err = api.DeleteDeployment(hostServiceName, deployment.Name)
+    checkError(err)
     fmt.Println("Done deleting deployment\n")
 
+    // TODO: it takes some time for a disk previously attached to a deleted VM 
+    // to become "not in use" and thus be available for deletion.
+    time.Sleep(3 * time.Minute)
+
+    fmt.Println("Deleting VM disk...")
+    err = api.DeleteDisk(diskName)
+    checkError(err)
+    fmt.Println("Done deleting VM disk\n")
+
     fmt.Println("Deleting hosted service...")
     api.DeleteHostedService(hostServiceName)
     fmt.Println("Done deleting hosted service\n")
@@ -147,5 +163,4 @@
     fmt.Printf("Deleting storage account %s...\n", storageAccount)
     api.DeleteStorageAccount(storageAccount)
     fmt.Println("Done deleting storage account\n")
-
 }

=== modified file 'managementapi.go'
--- managementapi.go	2013-03-29 16:03:54 +0000
+++ managementapi.go	2013-04-01 09:38:22 +0000
@@ -170,6 +170,11 @@
     return &keys, nil
 }
 
+func (api *ManagementAPI) DeleteDisk(diskName string) error {
+    URI := "services/disks/" + diskName
+    return api.session.delete(URI)
+}
+
 // Perform an operation on the specified role (as defined by serviceName, deploymentName and
 // roleName)
 // This is an asynchronous operation, it blocks until the operation is completed.

=== modified file 'managementapi_test.go'
--- managementapi_test.go	2013-03-29 16:03:54 +0000
+++ managementapi_test.go	2013-04-01 09:38:22 +0000
@@ -347,6 +347,17 @@
     c.Check(keys.Url, Equals, url)
 }
 
+func (suite *managementAPISuite) TestDeleteDisk(c *C) {
+    api := makeAPI(c)
+    recordedRequests := setUpDispatcher("operationID")
+    diskName := "diskName"
+    err := api.DeleteDisk(diskName)
+
+    c.Assert(err, IsNil)
+    expectedURL := api.session.composeURL("services/disks/" + diskName)
+    checkOneRequest(c, recordedRequests, expectedURL, []byte{}, "DELETE")
+}
+
 func (suite *managementAPISuite) TestPerformNodeOperation(c *C) {
     api := makeAPI(c)
     recordedRequests := setUpDispatcher("operationID")