Merge lp:~allenap/gwacl/list-hosted-services into lp:gwacl

[Gavin Panella]

Rename ListHostedServiceDescriptors to ListHostedServices to match Azure's naming.

[Julian Edwards (julian-edwards)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

 review: approve
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iEYEARECAAYFAlG/t58ACgkQWhGlTF8G/HdWNwCgnZ8+MQ9hR+/FajX6h7IQI758
b+kAoIl2BDnLxiLaHYJXCoSaCs3MJsGh
=jz/b
-----END PGP SIGNATURE-----

review: Approve

=== modified file 'example/management/run.go'
--- example/management/run.go	2013-06-11 10:14:14 +0000
+++ example/management/run.go	2013-06-17 19:58:28 +0000
@@ -106,7 +106,7 @@
     fmt.Println("Done creating a hosted service\n")
 
     fmt.Println("Listing hosted services...")
-    hostedServices, err := api.ListHostedServiceDescriptors()
+    hostedServices, err := api.ListHostedServices()
     checkError(err)
     fmt.Printf("Got %d hosted service(s)\n", len(hostedServices))
     if len(hostedServices) > 0 {
 
=== renamed file 'managementapi.go' => 'management.go'
--- managementapi.go	2013-04-26 15:31:50 +0000
+++ management.go	2013-06-17 19:58:28 +0000
@@ -106,11 +106,11 @@
     return &images, err
 }
 
-// ListHostedServiceDescriptors loads a list of HostedServiceDescriptor objects from the
+// ListHostedServices loads a list of HostedServiceDescriptor objects from the
 // Azure management API. 
 // HostedServiceDescriptor objects contains a small subset of the fields present in
 // HostedService objects.
-func (api *ManagementAPI) ListHostedServiceDescriptors() ([]HostedServiceDescriptor, error) {
+func (api *ManagementAPI) ListHostedServices() ([]HostedServiceDescriptor, error) {
     URI := "services/hostedservices"
     res, err := api.session.get(URI)
     if err != nil {
 
=== renamed file 'managementapi_test.go' => 'management_test.go'
--- managementapi_test.go	2013-04-26 15:41:12 +0000
+++ management_test.go	2013-06-17 19:58:28 +0000
@@ -350,7 +350,7 @@
     c.Check(receivedNames, DeepEquals, imageNames)
 }
 
-func (suite *managementAPISuite) TestListHostedServiceDescriptors(c *C) {
+func (suite *managementAPISuite) TestListHostedServices(c *C) {
     api := makeAPI(c)
     fixedResponse := x509Response{
         StatusCode: http.StatusOK,
@@ -360,14 +360,14 @@
     recordedRequests := make([]*x509Request, 0)
     rigRecordingDispatcher(&recordedRequests)
 
-    _, err := api.ListHostedServiceDescriptors()
+    _, err := api.ListHostedServices()
 
     c.Assert(err, IsNil)
     expectedURL := AZURE_URL + api.session.subscriptionId + "/services/hostedservices"
     checkOneRequest(c, &recordedRequests, expectedURL, []byte{}, "GET")
 }
 
-// TODO test that ListHostedServiceDescriptors parses the structures correctly
+// TODO test that ListHostedServices parses the structures correctly
 
 func (suite *managementAPISuite) TestLoadHostedService(c *C) {
     api := makeAPI(c)
 
=== modified file 'xmlobjects.go'
--- xmlobjects.go	2013-06-11 10:14:14 +0000
+++ xmlobjects.go	2013-06-17 19:58:28 +0000
@@ -293,6 +293,8 @@
     HostedServices []HostedServiceDescriptor `xml:"HostedService"`
 }
 
+// HostedServiceDescriptor contains a subset of the details in HostedService,
+// and is used when describing a list of HostedServices.
 type HostedServiceDescriptor struct {
     XMLNS       string `xml:"xmlns,attr"`
     URL         string `xml:"Url"`