Merge lp:~allenap/gwacl/list-instances into lp:gwacl

[Gavin Panella]

New management API meta-method to list all instances.

[Jeroen T. Vermeulen (jtv)]

It's depressing that it's all so much work, that the code gets so verbose. And that makes me hesitant to suggest further improvements that involve yet more work. Nevertheless, here's what I came up with:

1. The way rigRecordingPreparedResponseDispatcher pops items off "responses" was not entirely obvious to me, what with the combination of slices, closures, and the returned pointer to a nested function. A comment might help.

2. There's a NotNil checker, shorthand for Not(IsNil).

3. It'd be good to test at least *something* about the errors you get back, not just the fact that you get an error. After all a future change could cause completely unrelated errors, and you want those to be reported. If all you check is that there is an error, your test could be passing for the wrong reason. That's one bug hiding the other.

Apart from that though, good work. It's a shame the main function needs to loop API calls across all services and deployments, but I don't think there's anything to be done about it. Approved.

[Jeroen T. Vermeulen (jtv)]

Ho hum. I said Approved, but evidently I didn't tell the voting system.

review: Approve

[lp:~allenap/gwacl/list-instances]

129. By Gavin Panella on 2013-06-22

Fix comment for rigRecordingPreparedResponseDispatcher, and simplify response handling.

130. By Gavin Panella on 2013-06-22

Use NotNil instead of Not(IsNil).

131. By Gavin Panella on 2013-06-22

Ensure that error messages are congruent with the expected error.

[Gavin Panella (allenap)]

> It's depressing that it's all so much work, that the code gets so verbose.
> And that makes me hesitant to suggest further improvements that involve yet
> more work.

Indeed. I really wanted to stub out the calls to ListHostedServices()
and GetHostedServiceProperties(). Alas, etc.

> Nevertheless, here's what I came up with:
>
> 1. The way rigRecordingPreparedResponseDispatcher pops items off "responses"
> was not entirely obvious to me, what with the combination of slices, closures,
> and the returned pointer to a nested function. A comment might help.

I originally copied the existing recording dispatcher which uses an
index. I tried out ways of popping from a slice in Go, and didn't
really mean to commit this.

>
> 2. There's a NotNil checker, shorthand for Not(IsNil).

Ta, changed.

>
> 3. It'd be good to test at least *something* about the errors you get back,
> not just the fact that you get an error. After all a future change could
> cause completely unrelated errors, and you want those to be reported. If all
> you check is that there is an error, your test could be passing for the wrong
> reason. That's one bug hiding the other.

I've checked the strings that their Error() functions return.

>
> Apart from that though, good work. It's a shame the main function needs to
> loop API calls across all services and deployments, but I don't think there's
> anything to be done about it. Approved.

Thanks for the review!

[Julian Edwards (julian-edwards)]

On 22/06/13 11:43, Jeroen T. Vermeulen wrote:
> Apart from that though, good work. It's a shame the main function needs to loop API calls across all services and deployments, but I don't think there's anything to be done about it. Approved.

I noted that too. The API doesn't seem exactly scalable here.

[Raphaël Badin (rvb)]

Two small things (that could be done in follow-up branches if you agree with me that they should be done ;)):

- It would be good to exercise this new method in example/management/run.go

- The provider operates within the confines of one hosted service so we need a method to list all the instances *in a specific hosted service*. We want to use structs to pass parameter to API methods at some point but I'd still recommend modifying the existing ListInstances() so that is takes a string parameter named 'hostedService' for now (i.e. like all the other methods in the management API). When we switch to using structs for parameters, we will change all the methods at once instead of having to live with a hybrid library.

I'm thinking about something like this: http://paste.ubuntu.com/5794784/

=== added file 'management.go'
--- management.go	1970-01-01 00:00:00 +0000
+++ management.go	2013-06-22 14:10:33 +0000
@@ -0,0 +1,24 @@
+// Copyright 2013 Canonical Ltd.  This software is licensed under the
+// GNU Lesser General Public License version 3 (see the file COPYING).
+
+package gwacl
+
+// ListInstances returns a slice of all instances for all deployments for all
+// services reachable with the user's credentials.
+func (api *ManagementAPI) ListInstances() ([]RoleInstance, error) {
+    services, err := api.ListHostedServices()
+    if err != nil {
+        return nil, err
+    }
+    instances := []RoleInstance{}
+    for _, service := range services {
+        properties, err := api.GetHostedServiceProperties(service.ServiceName, true)
+        if err != nil {
+            return nil, err
+        }
+        for _, deployment := range properties.Deployments {
+            instances = append(instances, deployment.RoleInstanceList...)
+        }
+    }
+    return instances, nil
+}

=== renamed file 'management.go' => 'management_base.go'
=== renamed file 'management_test.go' => 'management_base_test.go'
--- management_test.go	2013-06-21 11:58:18 +0000
+++ management_base_test.go	2013-06-22 14:10:33 +0000
@@ -13,12 +13,12 @@
     "time"
 )
 
-type managementAPISuite struct {
+type managementBaseAPISuite struct {
     x509DispatcherFixture
     oldPollerInterval time.Duration
 }
 
-var _ = Suite(&managementAPISuite{})
+var _ = Suite(&managementBaseAPISuite{})
 
 func makeX509ResponseWithOperationHeader(operationID string) *x509Response {
     header := http.Header{}
@@ -39,7 +39,7 @@
     return api
 }
 
-func (suite *managementAPISuite) TestGetOperationIDExtractsHeader(c *C) {
+func (suite *managementBaseAPISuite) TestGetOperationIDExtractsHeader(c *C) {
     operationID := "operationID"
     response := makeX509ResponseWithOperationHeader(operationID)
 
@@ -48,7 +48,7 @@
     c.Check(returnedOperationID, Equals, operationID)
 }
 
-func (suite *managementAPISuite) TestBlockUntilCompletedSucceedsOnSyncSuccess(c *C) {
+func (suite *managementBaseAPISuite) TestBlockUntilCompletedSucceedsOnSyncSuccess(c *C) {
     // Set of expected error returns for success statuses.
     // (They all map to nil.  It makes it easier further down to report
     // unexpected errors in a helpful way).
@@ -69,7 +69,7 @@
     c.Check(receivedErrors, DeepEquals, expectedErrors)
 }
 
-func (suite *managementAPISuite) TestBlockUntilCompletedReturnsHTTPErrorOnSyncFailure(c *C) {
+func (suite *managementBaseAPISuite) TestBlockUntilCompletedReturnsHTTPErrorOnSyncFailure(c *C) {
     // Set of failure statuses, and whether they're supposed to return
     // HTTPError.
     // (They all map to true.  It makes it easier further down to report
@@ -96,7 +96,7 @@
     c.Check(receivedErrors, DeepEquals, expectedErrors)
 }
 
-func (suite *managementAPISuite) TestBlockUntilCompletedPollsOnAsyncOperation(c *C) {
+func (suite *managementBaseAPISuite) TestBlockUntilCompletedPollsOnAsyncOperation(c *C) {
     const operationID = "async-operation-id"
     // We set the dispatcher up for failure, and prove that
     // blockUntilCompleted() makes a polling request.
@@ -118,7 +118,7 @@
     c.Check(polledOperationID, Equals, operationID)
 }
 
-func (suite *managementAPISuite) TestBlockUntilCompletedErrorsIfAsyncOperationFails(c *C) {
+func (suite *managementBaseAPISuite) TestBlockUntilCompletedErrorsIfAsyncOperationFails(c *C) {
     response := DispatcherResponse{
         response: &x509Response{
             Body:       []byte(fmt.Sprintf(operationXMLTemplate, "Failed")),
@@ -136,7 +136,7 @@
     c.Check(err, ErrorMatches, ".*asynchronous operation failed.*")
 }
 
-func (suite *managementAPISuite) TestBlockUntilCompletedErrorsOnInvalidXML(c *C) {
+func (suite *managementBaseAPISuite) TestBlockUntilCompletedErrorsOnInvalidXML(c *C) {
     response := DispatcherResponse{
         response: &x509Response{
             Body:       []byte(">invalidXML<"),
@@ -154,7 +154,7 @@
     c.Check(err, FitsTypeOf, new(xml.SyntaxError))
 }
 
-func (suite *managementAPISuite) TestBlockUntilCompletedErrorsIfPollingFails(c *C) {
+func (suite *managementBaseAPISuite) TestBlockUntilCompletedErrorsIfPollingFails(c *C) {
     response := DispatcherResponse{
         response:    &x509Response{},
         errorObject: fmt.Errorf("unexpected error")}
@@ -169,7 +169,7 @@
     c.Check(err, ErrorMatches, ".*unexpected error.*")
 }
 
-func (suite *managementAPISuite) TestBlockUntilCompletedErrorsCanTimeout(c *C) {
+func (suite *managementBaseAPISuite) TestBlockUntilCompletedErrorsCanTimeout(c *C) {
     response := &x509Response{
         Body:       []byte(fmt.Sprintf(operationXMLTemplate, InProgressOperationStatus)),
         StatusCode: http.StatusOK,
@@ -185,7 +185,7 @@
     c.Check(err, ErrorMatches, ".*polling timed out.*")
 }
 
-func (suite *managementAPISuite) TestBlockUntilCompletedSucceedsIfAsyncOperationSucceeds(c *C) {
+func (suite *managementBaseAPISuite) TestBlockUntilCompletedSucceedsIfAsyncOperationSucceeds(c *C) {
     response := DispatcherResponse{
         response: &x509Response{
             Body:       []byte(fmt.Sprintf(operationXMLTemplate, "Succeeded")),
@@ -203,7 +203,7 @@
     c.Assert(err, IsNil)
 }
 
-func (suite *managementAPISuite) TestNewManagementAPI(c *C) {
+func (suite *managementBaseAPISuite) TestNewManagementAPI(c *C) {
     subscriptionId := "subscriptionId"
     certFile := "certFile"
 
@@ -215,14 +215,14 @@
     c.Assert(api.session.certFile, DeepEquals, session.certFile)
 }
 
-func (suite *managementAPISuite) TestNewManagementAPISetsDefaultPollerInterval(c *C) {
+func (suite *managementBaseAPISuite) TestNewManagementAPISetsDefaultPollerInterval(c *C) {
     api, err := NewManagementAPI("subscriptionId", "certFile")
     c.Assert(err, IsNil)
 
     c.Assert(api.PollerInterval, Equals, DefaultPollerInterval)
 }
 
-func (suite *managementAPISuite) TestNewManagementAPISetsDefaultPollerTimeout(c *C) {
+func (suite *managementBaseAPISuite) TestNewManagementAPISetsDefaultPollerTimeout(c *C) {
     api, err := NewManagementAPI("subscriptionId", "certFile")
     c.Assert(err, IsNil)
 
@@ -232,7 +232,7 @@
 // setUpDispatcher sets up a request dispatcher that:
 // - records requests
 // - returns empty responses
-func (suite *managementAPISuite) setUpDispatcher() *[]*x509Request {
+func (suite *managementBaseAPISuite) setUpDispatcher() *[]*x509Request {
     fixedResponse := x509Response{
         StatusCode: http.StatusOK,
         Body:       []byte{},
@@ -258,7 +258,7 @@
     c.Assert(request.Method, Equals, Method)
 }
 
-func (suite *managementAPISuite) TestGetOperationFailsIfNoHeader(c *C) {
+func (suite *managementBaseAPISuite) TestGetOperationFailsIfNoHeader(c *C) {
     response := x509Response{
         StatusCode: http.StatusOK,
     }
@@ -267,7 +267,7 @@
     c.Check(err, ErrorMatches, ".*no operation header.*")
 }
 
-func (suite *managementAPISuite) TestListOSImagesRequestsListing(c *C) {
+func (suite *managementBaseAPISuite) TestListOSImagesRequestsListing(c *C) {
     api := makeAPI(c)
     rigFixedResponseDispatcher(&x509Response{StatusCode: http.StatusOK, Body: []byte("<Images></Images>")})
     requests := make([]*x509Request, 0)
@@ -280,7 +280,7 @@
     c.Check(requests[0].URL, Equals, api.session.composeURL("services/images"))
 }
 
-func (suite *managementAPISuite) TestListOSImagesReturnsImages(c *C) {
+func (suite *managementBaseAPISuite) TestListOSImagesReturnsImages(c *C) {
     expectedImage := OSImage{
         LogicalSizeInGB:   199.0,
         Label:             MakeRandomString(10),
@@ -322,7 +322,7 @@
     c.Check(listing.Images[0], DeepEquals, expectedImage)
 }
 
-func (suite *managementAPISuite) TestListOSImagesPreservesOrdering(c *C) {
+func (suite *managementBaseAPISuite) TestListOSImagesPreservesOrdering(c *C) {
     imageNames := []string{
         MakeRandomString(5),
         MakeRandomString(5),
@@ -350,7 +350,7 @@
     c.Check(receivedNames, DeepEquals, imageNames)
 }
 
-func (suite *managementAPISuite) TestListHostedServices(c *C) {
+func (suite *managementBaseAPISuite) TestListHostedServices(c *C) {
     api := makeAPI(c)
     fixedResponse := x509Response{
         StatusCode: http.StatusOK,
@@ -369,7 +369,7 @@
 
 // TODO test that ListHostedServices parses the structures correctly
 
-func (suite *managementAPISuite) TestGetHostedServiceProperties_withoutDetails(c *C) {
+func (suite *managementBaseAPISuite) TestGetHostedServiceProperties_withoutDetails(c *C) {
     api := makeAPI(c)
     body := `
         <?xml version="1.0" encoding="utf-8"?>
@@ -416,7 +416,7 @@
     c.Check(len(properties.Deployments), Equals, 0)
 }
 
-func (suite *managementAPISuite) TestGetHostedServiceProperties_withDetails(c *C) {
+func (suite *managementBaseAPISuite) TestGetHostedServiceProperties_withDetails(c *C) {
     api := makeAPI(c)
     body := `
         <?xml version="1.0" encoding="utf-8"?>
@@ -468,7 +468,7 @@
     c.Check(properties.Deployments[0].Name, Equals, "name-of-deployment")
 }
 
-func (suite *managementAPISuite) TestAddHostedService(c *C) {
+func (suite *managementBaseAPISuite) TestAddHostedService(c *C) {
     api := makeAPI(c)
     recordedRequests := setUpDispatcher("operationID")
     createHostedService := NewCreateHostedServiceWithLocation("testName", "testLabel", "East US")
@@ -480,7 +480,7 @@
     checkOneRequest(c, recordedRequests, expectedURL, expectedPayload, "POST")
 }
 
-func (suite *managementAPISuite) TestDeleteHostedService(c *C) {
+func (suite *managementBaseAPISuite) TestDeleteHostedService(c *C) {
     api := makeAPI(c)
     recordedRequests := setUpDispatcher("operationID")
     hostedServiceName := "testName"
@@ -491,7 +491,7 @@
     checkOneRequest(c, recordedRequests, expectedURL, []byte{}, "DELETE")
 }
 
-func (suite *managementAPISuite) TestAddDeployment(c *C) {
+func (suite *managementBaseAPISuite) TestAddDeployment(c *C) {
     api := makeAPI(c)
     recordedRequests := setUpDispatcher("operationID")
     serviceName := "serviceName"
@@ -508,7 +508,7 @@
     checkOneRequest(c, recordedRequests, expectedURL, expectedPayload, "POST")
 }
 
-func (suite *managementAPISuite) TestDeleteDeployment(c *C) {
+func (suite *managementBaseAPISuite) TestDeleteDeployment(c *C) {
     api := makeAPI(c)
     recordedRequests := setUpDispatcher("operationID")
     hostedServiceName := "testHosterServiceName"
@@ -520,7 +520,7 @@
     checkOneRequest(c, recordedRequests, expectedURL, []byte{}, "DELETE")
 }
 
-func (suite *managementAPISuite) TestAddStorageAccount(c *C) {
+func (suite *managementBaseAPISuite) TestAddStorageAccount(c *C) {
     api := makeAPI(c)
     header := http.Header{}
     header.Set("X-Ms-Request-Id", "operationID")
@@ -542,7 +542,7 @@
     checkOneRequest(c, &recordedRequests, expectedURL, expectedPayload, "POST")
 }
 
-func (suite *managementAPISuite) TestDeleteStorageAccount(c *C) {
+func (suite *managementBaseAPISuite) TestDeleteStorageAccount(c *C) {
     const accountName = "myaccount"
     api := makeAPI(c)
     accountURL := api.session.composeURL("services/storageservices/" + accountName)
@@ -554,7 +554,7 @@
     checkOneRequest(c, recordedRequests, accountURL, nil, "DELETE")
 }
 
-func (suite *managementAPISuite) TestGetStorageAccountKeys(c *C) {
+func (suite *managementBaseAPISuite) TestGetStorageAccountKeys(c *C) {
     const (
         accountName  = "accountname"
         primaryKey   = "primarykey"
@@ -584,7 +584,7 @@
     c.Check(keys.URL, Equals, url)
 }
 
-func (suite *managementAPISuite) TestDeleteDisk(c *C) {
+func (suite *managementBaseAPISuite) TestDeleteDisk(c *C) {
     // The current implementation of DeleteDisk() works around a bug in
     // Windows Azure by polling the server.  See the documentation in the file
     // deletedisk.go for details.
@@ -600,7 +600,7 @@
     checkOneRequest(c, recordedRequests, expectedURL, []byte{}, "DELETE")
 }
 
-func (suite *managementAPISuite) TestPerformNodeOperation(c *C) {
+func (suite *managementBaseAPISuite) TestPerformNodeOperation(c *C) {
     api := makeAPI(c)
     recordedRequests := setUpDispatcher("operationID")
     serviceName := "serviceName"

=== added file 'management_test.go'
--- management_test.go	1970-01-01 00:00:00 +0000
+++ management_test.go	2013-06-22 14:10:33 +0000
@@ -0,0 +1,180 @@
+// Copyright 2013 Canonical Ltd.  This software is licensed under the
+// GNU Lesser General Public License version 3 (see the file COPYING).
+
+package gwacl
+
+import (
+    . "launchpad.net/gocheck"
+    "net/http"
+)
+
+type managementAPISuite struct{}
+
+var _ = Suite(&managementAPISuite{})
+
+// TestListInstances goes through the happy path for ListInstances.
+func (suite *managementAPISuite) TestListInstances(c *C) {
+    // First response is the list of services.
+    services := HostedServiceDescriptorList{
+        HostedServices: []HostedServiceDescriptor{
+            {ServiceName: "S1"},
+            {ServiceName: "S2"},
+        },
+    }
+    servicesXML, err := services.Serialize()
+    c.Assert(err, IsNil)
+    servicesResponse := DispatcherResponse{
+        response: &x509Response{
+            Body:       []byte(servicesXML),
+            StatusCode: http.StatusOK,
+        },
+    }
+    // Second response is the list of properties for "S1".
+    propertiesS1 := HostedService{
+        ServiceName: "S1",
+        Deployments: []Deployment{
+            {
+                RoleInstanceList: []RoleInstance{
+                    {RoleName: "one"},
+                    {RoleName: "two"},
+                },
+            },
+            {
+                RoleInstanceList: []RoleInstance{
+                    {RoleName: "three"},
+                    {RoleName: "four"},
+                },
+            },
+        },
+    }
+    propertiesS1XML, err := propertiesS1.Serialize()
+    c.Assert(err, IsNil)
+    propertiesS1Response := DispatcherResponse{
+        response: &x509Response{
+            Body:       []byte(propertiesS1XML),
+            StatusCode: http.StatusOK,
+        },
+    }
+    // Third response is the list of properties for "S2".
+    propertiesS2 := HostedService{
+        ServiceName: "S2",
+        Deployments: []Deployment{
+            {
+                RoleInstanceList: []RoleInstance{
+                    {RoleName: "five"},
+                    {RoleName: "six"},
+                },
+            },
+            {
+                RoleInstanceList: []RoleInstance{
+                    {RoleName: "seven"},
+                    {RoleName: "eight"},
+                },
+            },
+        },
+    }
+    propertiesS2XML, err := propertiesS2.Serialize()
+    c.Assert(err, IsNil)
+    propertiesS2Response := DispatcherResponse{
+        response: &x509Response{
+            Body:       []byte(propertiesS2XML),
+            StatusCode: http.StatusOK,
+        },
+    }
+    // Rig the prepared responses in.
+    record := []*x509Request{}
+    rigRecordingPreparedResponseDispatcher(
+        &record, []DispatcherResponse{
+            servicesResponse,
+            propertiesS1Response,
+            propertiesS2Response,
+        },
+    )
+    // Finally, exercise ListInstances.
+    api := makeAPI(c)
+    instances, err := api.ListInstances()
+    c.Assert(err, IsNil)
+    c.Check(instances, DeepEquals, []RoleInstance{
+        propertiesS1.Deployments[0].RoleInstanceList[0],
+        propertiesS1.Deployments[0].RoleInstanceList[1],
+        propertiesS1.Deployments[1].RoleInstanceList[0],
+        propertiesS1.Deployments[1].RoleInstanceList[1],
+        propertiesS2.Deployments[0].RoleInstanceList[0],
+        propertiesS2.Deployments[0].RoleInstanceList[1],
+        propertiesS2.Deployments[1].RoleInstanceList[0],
+        propertiesS2.Deployments[1].RoleInstanceList[1],
+    })
+    // The first request was for the services.
+    c.Assert(len(record), Not(Equals), 0)
+    c.Check(record[0], DeepEquals, &x509Request{
+        APIVersion: baseAPIVersion,
+        URL:        AZURE_URL + "subscriptionId/services/hostedservices",
+        Method:     "GET",
+    })
+    // The second for S1's properties
+    c.Assert(len(record), Not(Equals), 1)
+    c.Check(record[1], DeepEquals, &x509Request{
+        APIVersion: baseAPIVersion,
+        URL:        AZURE_URL + "subscriptionId/services/hostedservices/S1?embed-detail=true",
+        Method:     "GET",
+    })
+    // The third for S2's properties
+    c.Assert(len(record), Not(Equals), 2)
+    c.Check(record[2], DeepEquals, &x509Request{
+        APIVersion: baseAPIVersion,
+        URL:        AZURE_URL + "subscriptionId/services/hostedservices/S2?embed-detail=true",
+        Method:     "GET",
+    })
+}
+
+func (suite *managementAPISuite) TestListInstancesFailsGettingServices(c *C) {
+    rigPreparedResponseDispatcher(
+        []DispatcherResponse{
+            {
+                response: &x509Response{
+                    StatusCode: http.StatusUnauthorized,
+                },
+            },
+        },
+    )
+    api := makeAPI(c)
+    instances, err := api.ListInstances()
+    c.Check(instances, IsNil)
+    c.Assert(err, NotNil)
+    c.Assert(err.Error(), Equals, "GET request failed (401: Unauthorized)")
+}
+
+func (suite *managementAPISuite) TestListInstancesFailsGettingDetails(c *C) {
+    // First response is the list of services.
+    services := HostedServiceDescriptorList{
+        HostedServices: []HostedServiceDescriptor{
+            {ServiceName: "S1"},
+        },
+    }
+    servicesXML, err := services.Serialize()
+    c.Assert(err, IsNil)
+    servicesResponse := DispatcherResponse{
+        response: &x509Response{
+            Body:       []byte(servicesXML),
+            StatusCode: http.StatusOK,
+        },
+    }
+    // Second response to the properties request is Not Found, to simulate a
+    // race perhaps.
+    propertiesS1Response := DispatcherResponse{
+        response: &x509Response{
+            StatusCode: http.StatusNotFound,
+        },
+    }
+    rigPreparedResponseDispatcher(
+        []DispatcherResponse{
+            servicesResponse,
+            propertiesS1Response,
+        },
+    )
+    api := makeAPI(c)
+    instances, err := api.ListInstances()
+    c.Check(instances, IsNil)
+    c.Assert(err, NotNil)
+    c.Assert(err.Error(), Equals, "GET request failed (404: Not Found)")
+}

=== modified file 'testhelpers_x509dispatch.go'
--- testhelpers_x509dispatch.go	2013-04-24 10:08:54 +0000
+++ testhelpers_x509dispatch.go	2013-06-22 14:10:33 +0000
@@ -56,6 +56,19 @@
     }
 }
 
+// rigRecordingPreparedResponseDispatcher sets up a request dispatcher that
+// returns, for each consecutive request, the next of a series of prepared
+// responses, and records each request.
+func rigRecordingPreparedResponseDispatcher(record *[]*x509Request, responses []DispatcherResponse) {
+    index := 0
+    _X509Dispatcher = func(session *x509Session, request *x509Request) (*x509Response, error) {
+        *record = append(*record, request)
+        response := responses[index]
+        index += 1
+        return response.response, response.errorObject
+    }
+}
+
 // setUpDispatcher sets up a request dispatcher that:
 // - records requests
 // - returns empty responses

=== modified file 'xmlobjects.go'
--- xmlobjects.go	2013-06-21 12:24:53 +0000
+++ xmlobjects.go	2013-06-22 14:10:33 +0000
@@ -296,10 +296,18 @@
     Deployments []Deployment `xml:"Deployments>Deployment"`
 }
 
+func (c HostedService) Serialize() (string, error) {
+    return toxml(c)
+}
+
 type HostedServiceDescriptorList struct {
     HostedServices []HostedServiceDescriptor `xml:"HostedService"`
 }
 
+func (c *HostedServiceDescriptorList) Serialize() (string, error) {
+    return toxml(c)
+}
+
 // HostedServiceDescriptor contains a subset of the details in HostedService,
 // and is used when describing a list of HostedServices.
 type HostedServiceDescriptor struct {