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

[Andrew Wilkins]

Add "AddDataDisks" and "ListDisks" APIs

These APIs are needed for adding data disks to
VM roles, and for listing disks in the account.

[Ian Booth (wallyworld)]

review: Approve

=== modified file 'management_base.go'
--- management_base.go	2015-07-28 09:58:11 +0000
+++ management_base.go	2015-08-10 08:06:54 +0000
@@ -7,6 +7,7 @@
 	"encoding/xml"
 	"fmt"
 	"net/http"
+	"path"
 	"strings"
 	"time"
 
@@ -435,6 +436,50 @@
 	return api.blockUntilCompleted(response)
 }
 
+type AddDataDiskRequest struct {
+	ServiceName         string
+	DeploymentName      string
+	RoleName            string
+	DataVirtualHardDisk DataVirtualHardDisk
+}
+
+// AddDataDisk requests the addition of a data disk to a VM role.
+// See https://msdn.microsoft.com/en-us/library/azure/jj157199.aspx
+func (api *ManagementAPI) AddDataDisk(req *AddDataDiskRequest) error {
+	url := path.Join(
+		"services", "hostedservices", req.ServiceName,
+		"deployments", req.DeploymentName,
+		"roles", req.RoleName,
+		"DataDisks",
+	)
+	disk := req.DataVirtualHardDisk
+	disk.XMLNS = XMLNS
+	disk.XMLNS_I = XMLNS_I
+	body, err := marshalXML(&disk)
+	if err != nil {
+		return err
+	}
+	response, err := api.session.post(url, baseAPIVersion, []byte(body), "application/xml")
+	if err != nil {
+		return err
+	}
+	return api.blockUntilCompleted(response)
+}
+
+// ListDisks requests a list of disks in the account's image repository.
+// See https://msdn.microsoft.com/en-us/library/azure/jj157176.aspx
+func (api *ManagementAPI) ListDisks() ([]Disk, error) {
+	var disks struct {
+		Disks []Disk `xml:"Disk"`
+	}
+	response, err := api.session.get("services/disks", baseAPIVersion)
+	if err != nil {
+		return nil, err
+	}
+	err = xml.Unmarshal(response.Body, &disks)
+	return disks.Disks, err
+}
+
 // Perform an operation on the specified role (as defined by serviceName,
 // deploymentName and roleName) This is an asynchronous operation on Azure, but
 // the call blocks until the operation is completed.

=== modified file 'management_base_test.go'
--- management_base_test.go	2015-07-28 13:09:12 +0000
+++ management_base_test.go	2015-08-10 08:06:54 +0000
@@ -968,6 +968,102 @@
 	c.Check(values["comp"], DeepEquals, []string{"media"})
 }
 
+func (suite *managementBaseAPISuite) TestAddDataDisk(c *C) {
+	api := makeAPI(c)
+	serviceName := "serviceName"
+	deploymentName := "deploymentName"
+	roleName := "roleName"
+
+	recordedRequests := setUpDispatcher("operationID")
+	err := api.AddDataDisk(&AddDataDiskRequest{
+		ServiceName:    serviceName,
+		DeploymentName: deploymentName,
+		RoleName:       roleName,
+		DataVirtualHardDisk: DataVirtualHardDisk{
+			DiskLabel:           "abcdef",
+			LUN:                 31,
+			LogicalDiskSizeInGB: 42,
+			MediaLink:           "http://example.blob.core.windows.net/disks/mydisk.vhd",
+		},
+	})
+	c.Assert(err, IsNil)
+	c.Assert(*recordedRequests, HasLen, 1)
+
+	expectedURL := fmt.Sprintf(
+		"%s%s/services/hostedservices/%s/deployments/%s/roles/%s/DataDisks",
+		defaultManagement,
+		api.session.subscriptionId,
+		serviceName,
+		deploymentName,
+		roleName,
+	)
+
+	expectedPayload := []byte(strings.TrimSpace(`
+<DataVirtualHardDisk xmlns="http://schemas.microsoft.com/windowsazure" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+  <DiskLabel>abcdef</DiskLabel>
+  <Lun>31</Lun>
+  <LogicalDiskSizeInGB>42</LogicalDiskSizeInGB>
+  <MediaLink>http://example.blob.core.windows.net/disks/mydisk.vhd</MediaLink>
+</DataVirtualHardDisk>
+	`))
+	checkOneRequest(c, recordedRequests, expectedURL, baseAPIVersion, expectedPayload, "POST")
+}
+
+func (suite *managementBaseAPISuite) TestListDisks(c *C) {
+	api := makeAPI(c)
+
+	fixedResponse := x509Response{
+		StatusCode: http.StatusOK,
+		Body: []byte(strings.TrimSpace(`
+<Disks xmlns="http://schemas.microsoft.com/windowsazure" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+  <Disk>
+    <AffinityGroup>name-of-affinity-group</AffinityGroup>
+    <AttachedTo>
+      <HostedServiceName>name-of-cloud-service</HostedServiceName>
+      <DeploymentName>name-of-deployment</DeploymentName>
+      <RoleName>name-of-virtual-machine</RoleName>
+    </AttachedTo>
+    <OS>operating-system-type</OS>
+    <Location>geo-location-of-disk</Location>
+    <LogicalSizeInGB>123</LogicalSizeInGB>
+    <MediaLink>uri-of-vhd</MediaLink>
+    <Name>name-of-disk</Name>
+    <SourceImageName>name-of-source-image</SourceImageName>
+    <CreatedTime>creation-time-of-disk</CreatedTime>
+    <IOType>IO-Type</IOType>
+  </Disk>
+</Disks>
+`)),
+	}
+	rigFixedResponseDispatcher(&fixedResponse)
+	recordedRequests := make([]*X509Request, 0)
+	rigRecordingDispatcher(&recordedRequests)
+
+	disks, err := api.ListDisks()
+	c.Assert(err, IsNil)
+	c.Assert(disks, HasLen, 1)
+
+	expectedURL := fmt.Sprintf("%s%s/services/disks", defaultManagement, api.session.subscriptionId)
+	checkOneRequest(c, &recordedRequests, expectedURL, baseAPIVersion, nil, "GET")
+
+	c.Assert(disks[0], DeepEquals, Disk{
+		AffinityGroup: "name-of-affinity-group",
+		AttachedTo: &DiskAttachment{
+			HostedServiceName: "name-of-cloud-service",
+			DeploymentName:    "name-of-deployment",
+			RoleName:          "name-of-virtual-machine",
+		},
+		OS:              "operating-system-type",
+		Location:        "geo-location-of-disk",
+		LogicalSizeInGB: 123,
+		MediaLink:       "uri-of-vhd",
+		Name:            "name-of-disk",
+		SourceImageName: "name-of-source-image",
+		CreatedTime:     "creation-time-of-disk",
+		IOType:          "IO-Type",
+	})
+}
+
 func (suite *managementBaseAPISuite) TestPerformNodeOperation(c *C) {
 	api := makeAPI(c)
 	recordedRequests := setUpDispatcher("operationID")

=== modified file 'xmlobjects.go'
--- xmlobjects.go	2015-07-28 13:09:12 +0000
+++ xmlobjects.go	2015-08-10 08:06:54 +0000
@@ -329,11 +329,41 @@
 //
 
 type DataVirtualHardDisk struct {
-	HostCaching         string `xml:"HostCaching"`
-	DiskName            string `xml:"DiskName"`
-	LUN                 string `xml:"Lun"`
-	LogicalDiskSizeInGB string `xml:"LogicalDiskSizeInGB"`
-	MediaLink           string `xml:"MediaLink"`
+	XMLNS               string `xml:"xmlns,attr,omitempty"`
+	XMLNS_I             string `xml:"xmlns:i,attr,omitempty"`
+	HostCaching         string `xml:"HostCaching,omitempty"`
+	DiskLabel           string `xml:"DiskLabel,omitempty"`
+	DiskName            string `xml:"DiskName,omitempty"`
+	LUN                 int    `xml:"Lun,omitempty"`
+	LogicalDiskSizeInGB int    `xml:"LogicalDiskSizeInGB,omitempty"`
+	MediaLink           string `xml:"MediaLink,omitempty"`
+	SourceMediaLink     string `xml:"SourceMediaLink,omitempty"`
+}
+
+//
+// Disk
+//
+
+type Disk struct {
+	XMLNS           string          `xml:"xmlns,attr,omitempty"`
+	XMLNS_I         string          `xml:"xmlns:i,attr,omitempty"`
+	AffinityGroup   string          `xml:"AffinityGroup,omitempty"`
+	AttachedTo      *DiskAttachment `xml:"AttachedTo,omitempty"`
+	OS              string          `xml:"OS"`
+	Location        string          `xml:"Location,omitempty"`
+	LogicalSizeInGB int             `xml:"LogicalSizeInGB,omitempty"`
+	MediaLink       string          `xml:"MediaLink"`
+	Label           string          `xml:"Label,omitempty"`
+	Name            string          `xml:"Name"`
+	SourceImageName string          `xml:"SourceImageName,omitempty"`
+	CreatedTime     string          `xml:"CreatedTime,omitempty"`
+	IOType          string          `xml:"IOType,omitempty"`
+}
+
+type DiskAttachment struct {
+	HostedServiceName string `xml:"HostedServiceName"`
+	DeploymentName    string `xml:"DeploymentName"`
+	RoleName          string `xml:"RoleName"`
 }
 
 //

=== modified file 'xmlobjects_test.go'
--- xmlobjects_test.go	2015-07-28 13:09:12 +0000
+++ xmlobjects_test.go	2015-08-10 08:06:54 +0000
@@ -348,8 +348,8 @@
             <DataVirtualHardDisk>
               <HostCaching>host-caching-mode-of-data-disk</HostCaching>
               <DiskName>new-or-existing-disk-name</DiskName>
-              <Lun>logical-unit-number-of-data-disk</Lun>
-              <LogicalDiskSizeInGB>size-of-data-disk</LogicalDiskSizeInGB>
+              <Lun>31</Lun>
+              <LogicalDiskSizeInGB>42</LogicalDiskSizeInGB>
               <MediaLink>path-to-vhd</MediaLink>
             </DataVirtualHardDisk>
           </DataVirtualHardDisks>
@@ -410,8 +410,8 @@
 			{
 				HostCaching:         "host-caching-mode-of-data-disk",
 				DiskName:            "new-or-existing-disk-name",
-				LUN:                 "logical-unit-number-of-data-disk",
-				LogicalDiskSizeInGB: "size-of-data-disk",
+				LUN:                 31,
+				LogicalDiskSizeInGB: 42,
 				MediaLink:           "path-to-vhd",
 			},
 		},
@@ -478,8 +478,8 @@
 			{
 				HostCaching:         "host-caching-mode-of-data-disk",
 				DiskName:            "new-or-existing-disk-name",
-				LUN:                 "logical-unit-number-of-data-disk",
-				LogicalDiskSizeInGB: "size-of-data-disk",
+				LUN:                 31,
+				LogicalDiskSizeInGB: 42,
 				MediaLink:           "path-to-vhd",
 			},
 		},
@@ -940,8 +940,8 @@
 	<DataVirtualHardDisk>
 	  <HostCaching>host-caching-mode-of-data-disk</HostCaching>
 	  <DiskName>name-of-data-disk</DiskName>
-	  <Lun>logical-unit-number-of-data-disk</Lun>
-	  <LogicalDiskSizeInGB>size-of-data-disk</LogicalDiskSizeInGB>
+	  <Lun>31</Lun>
+	  <LogicalDiskSizeInGB>42</LogicalDiskSizeInGB>
 	  <MediaLink>path-to-vhd</MediaLink>
 	</DataVirtualHardDisk>
       </DataVirtualHardDisks>
@@ -1073,8 +1073,8 @@
 					{
 						HostCaching:         "host-caching-mode-of-data-disk",
 						DiskName:            "name-of-data-disk",
-						LUN:                 "logical-unit-number-of-data-disk",
-						LogicalDiskSizeInGB: "size-of-data-disk",
+						LUN:                 31,
+						LogicalDiskSizeInGB: 42,
 						MediaLink:           "path-to-vhd",
 					},
 				},