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

[Andrew Wilkins]

Add ListLocations API

ListLocations returns role sizes available in
each data centre location, as well as other
information about the locations.

Add ListLocations API

ListLocations returns role sizes available in
each data centre location, as well as other
information about the locations.

[Ian Booth (wallyworld)]

review: Approve

=== modified file 'management_base.go'
--- management_base.go	2014-12-02 00:36:45 +0000
+++ management_base.go	2014-12-03 07:39:03 +0000
@@ -6,10 +6,11 @@
 import (
 	"encoding/xml"
 	"fmt"
-	"launchpad.net/gwacl/fork/tls"
 	"net/http"
 	"strings"
 	"time"
+
+	"launchpad.net/gwacl/fork/tls"
 )
 
 // Note: each API call is required to include a version string in the request header.
@@ -151,6 +152,20 @@
 	return nil
 }
 
+// ListLocations lists the Azure data centre locations, and details
+// about each location (e.g. role sizes available).
+func (api *ManagementAPI) ListLocations() ([]Location, error) {
+	var locations struct {
+		Locations []Location `xml:"Location"`
+	}
+	response, err := api.session.get("locations", "2014-05-01")
+	if err != nil {
+		return nil, err
+	}
+	err = xml.Unmarshal(response.Body, &locations)
+	return locations.Locations, err
+}
+
 // ListOSImages retrieves the list of available operating system disk images
 // from the Azure management API.
 // Images are returned in the order in which Azure lists them.
 
=== modified file 'management_base_test.go'
--- management_base_test.go	2014-12-02 00:36:45 +0000
+++ management_base_test.go	2014-12-03 07:39:03 +0000
@@ -1388,3 +1388,59 @@
 	c.Assert(recordedRequests, HasLen, 1)
 	assertSetNetworkConfigurationRequest(c, api, requestPayload, recordedRequests[0])
 }
+
+func (suite *managementBaseAPISuite) TestListLocationsRequestsListing(c *C) {
+	api := makeAPI(c)
+	rigFixedResponseDispatcher(&x509Response{StatusCode: http.StatusOK, Body: []byte("<Locations></Locations>")})
+	requests := make([]*X509Request, 0)
+	rigRecordingDispatcher(&requests)
+
+	_, err := api.ListLocations()
+	c.Assert(err, IsNil)
+
+	c.Assert(len(requests), Equals, 1)
+	c.Check(requests[0].URL, Equals, api.session.composeURL("locations"))
+}
+
+func (suite *managementBaseAPISuite) TestListLocationsReturnsLocations(c *C) {
+	expectedLocations := []Location{{
+		Name: "West US",
+	}, {
+		Name: "East US",
+		ComputeCapabilities: &ComputeCapabilities{
+			VirtualMachineRoleSizes: []string{"ExtraSmall", "ExtraLarge"},
+			WebWorkerRoleSizes:      []string{"Small", "Large"},
+		},
+	}}
+	body := `
+<Locations>
+    <Location>
+        <Name>West US</Name>
+    </Location>
+    <Location>
+        <Name>East US</Name>
+        <ComputeCapabilities>
+            <VirtualMachinesRoleSizes>
+                <RoleSize>ExtraSmall</RoleSize>
+                <RoleSize>ExtraLarge</RoleSize>
+            </VirtualMachinesRoleSizes>
+            <WebWorkerRoleSizes>
+                <RoleSize>Small</RoleSize>
+                <RoleSize>Large</RoleSize>
+            </WebWorkerRoleSizes>
+        </ComputeCapabilities>
+    </Location>
+</Locations>
+`
+	api := makeAPI(c)
+	rigFixedResponseDispatcher(&x509Response{
+		StatusCode: http.StatusOK,
+		Body:       []byte(body),
+	})
+
+	locations, err := api.ListLocations()
+	c.Assert(err, IsNil)
+
+	c.Assert(len(locations), Equals, 2)
+	c.Assert(locations, DeepEquals, expectedLocations)
+}
 
=== modified file 'xmlobjects.go'
--- xmlobjects.go	2014-12-02 00:36:45 +0000
+++ xmlobjects.go	2014-12-03 07:39:03 +0000
@@ -251,6 +251,23 @@
 }
 
 //
+// Location
+//
+
+type Location struct {
+	Name                string               `xml:"Name"`
+	DisplayName         string               `xml:"DisplayName"`
+	AvailableServices   []string             `xml:"AvailableServices>AvailableService,omitempty"`
+	ComputeCapabilities *ComputeCapabilities `xml:"ComputeCapabilities,omitempty"`
+}
+
+type ComputeCapabilities struct {
+	// The tag name is plural VirtualMachines, contrary to the online documentation.
+	VirtualMachineRoleSizes []string `xml:"VirtualMachinesRoleSizes>RoleSize"`
+	WebWorkerRoleSizes      []string `xml:"WebWorkerRoleSizes>RoleSize"`
+}
+
+//
 // DataVirtualHardDisk
 //