Merge lp:~julian-edwards/gwacl/listhostedservices into lp:gwacl

[Julian Edwards]

Fix ListHostedServices and give it a test.

I sat down to write ListHostedServices and saw that it was already written. However, its implementation was broken and not surprisingly there were no tests for it. It's all fixed here, and I even improved the existing test TestListHostedServices so it rigs up a real response instead of an empty one.

[Raphaël Badin (rvb)]

Looks good!

I ran the example file (which already called the old version of the method) and everything is okay.

review: Approve

=== modified file 'management_base_test.go'
--- management_base_test.go	2013-07-03 10:01:33 +0000
+++ management_base_test.go	2013-07-04 04:38:23 +0000
@@ -352,23 +352,23 @@
 
 func (suite *managementBaseAPISuite) TestListHostedServices(c *C) {
     api := makeAPI(c)
+    url := MakeRandomString(10)
     fixedResponse := x509Response{
         StatusCode: http.StatusOK,
-        Body:       []byte("<HostedServices></HostedServices>"),
+        Body:       []byte(makeHostedServiceDescriptorList(url)),
     }
     rigFixedResponseDispatcher(&fixedResponse)
     recordedRequests := make([]*X509Request, 0)
     rigRecordingDispatcher(&recordedRequests)
 
-    _, err := api.ListHostedServices()
+    descriptors, err := api.ListHostedServices()
 
     c.Assert(err, IsNil)
     expectedURL := AZURE_URL + api.session.subscriptionId + "/services/hostedservices"
-    checkOneRequest(c, &recordedRequests, expectedURL, []byte{}, "GET")
+    checkOneRequest(c, &recordedRequests, expectedURL, nil, "GET")
+    c.Assert(descriptors[0].URL, Equals, url)
 }
 
-// TODO test that ListHostedServices parses the structures correctly
-
 func (suite *managementBaseAPISuite) TestGetHostedServiceProperties_withoutDetails(c *C) {
     api := makeAPI(c)
     body := `

=== modified file 'xmlobjects.go'
--- xmlobjects.go	2013-07-02 15:39:49 +0000
+++ xmlobjects.go	2013-07-04 04:38:23 +0000
@@ -328,6 +328,8 @@
 }
 
 type HostedServiceDescriptorList struct {
+    XMLName        xml.Name                  `xml:"HostedServices"`
+    XMLNS          string                    `xml:"xmlns,attr"`
     HostedServices []HostedServiceDescriptor `xml:"HostedService"`
 }
 
@@ -335,13 +337,24 @@
     return toxml(c)
 }
 
+func (c *HostedServiceDescriptorList) Deserialize(data []byte) error {
+    return xml.Unmarshal(data, c)
+}
+
 // HostedServiceDescriptor contains a subset of the details in HostedService,
 // and is used when describing a list of HostedServices.
+// See http://msdn.microsoft.com/en-us/library/windowsazure/ee460781.aspx
 type HostedServiceDescriptor struct {
-    XMLNS       string `xml:"xmlns,attr"`
-    URL         string `xml:"Url"`
-    ServiceName string `xml:"ServiceName"`
-    Description string `xml:"Description"`
+    URL                string             `xml:"Url"`
+    ServiceName        string             `xml:"ServiceName"`
+    Description        string             `xml:"HostedServiceProperties>Description"`
+    AffinityGroup      string             `xml:"HostedServiceProperties>AffinityGroup"`
+    Location           string             `xml:"HostedServiceProperties>Location"`
+    Label              string             `xml:"HostedServiceProperties>Label"`
+    Status             string             `xml:"HostedServiceProperties>Status"`
+    DateCreated        string             `xml:"HostedServiceProperties>DateCreated"`
+    DateLastModified   string             `xml:"HostedServiceProperties>DateLastModified"`
+    ExtendedProperties []ExtendedProperty `xml:"HostedServiceProperties>ExtendedProperties>ExtendedProperty"`
 }
 
 type CreateHostedService struct {

=== modified file 'xmlobjects_test.go'
--- xmlobjects_test.go	2013-07-03 00:17:53 +0000
+++ xmlobjects_test.go	2013-07-04 04:38:23 +0000
@@ -1078,6 +1078,68 @@
     c.Assert(observed.Containers[0].Metadata.Items[0].Name(), Equals, "metadata-name")
 }
 
+func makeHostedServiceDescriptorList(url string) string {
+    input := `
+        <?xml version="1.0" encoding="utf-8"?>
+          <HostedServices xmlns="http://schemas.microsoft.com/windowsazure">
+            <HostedService>
+              <Url>%s</Url>
+              <ServiceName>hosted-service-name</ServiceName>
+              <HostedServiceProperties>
+                <Description>description</Description>
+                <AffinityGroup>affinity-group</AffinityGroup>
+                <Location>service-location</Location>
+                <Label>label</Label>
+                <Status>status</Status>
+                <DateCreated>date-created</DateCreated>
+                <DateLastModified>date-modified</DateLastModified>
+                <ExtendedProperties>
+                  <ExtendedProperty>
+                    <Name>property-name</Name>
+                    <Value>property-value</Value>
+                  </ExtendedProperty>
+                </ExtendedProperties>
+              </HostedServiceProperties>
+            </HostedService>
+          </HostedServices>
+    `
+    return fmt.Sprintf(input, url)
+}
+
+func (suite *xmlSuite) TestHostedServiceDescriptorList(c *C) {
+    input := makeHostedServiceDescriptorList("hosted-service-address")
+    expected := &HostedServiceDescriptorList{
+        XMLName: xml.Name{
+            Space: "http://schemas.microsoft.com/windowsazure",
+            Local: "HostedServices"},
+        XMLNS: "http://schemas.microsoft.com/windowsazure",
+        HostedServices: []HostedServiceDescriptor{
+            {
+                URL:              "hosted-service-address",
+                ServiceName:      "hosted-service-name",
+                Description:      "description",
+                AffinityGroup:    "affinity-group",
+                Location:         "service-location",
+                Label:            "label",
+                Status:           "status",
+                DateCreated:      "date-created",
+                DateLastModified: "date-modified",
+                ExtendedProperties: []ExtendedProperty{
+                    {
+                        Name:  "property-name",
+                        Value: "property-value",
+                    },
+                },
+            },
+        },
+    }
+
+    observed := &HostedServiceDescriptorList{}
+    err := observed.Deserialize([]byte(input))
+    c.Assert(err, IsNil)
+    c.Assert(observed, DeepEquals, expected)
+}
+
 // TestCreateStorageService demonstrates that CreateHostedService is a
 // suitable container for the CreateHostedService XML tree that are required
 // for the Create Hosted Service API call.