Merge lp:~rvb/gwacl/listhostedservices-2 into lp:gwacl

[Raphaël Badin]

Add ListSpecificHostedServices.

[Gavin Panella (allenap)]

Looks good.

[1]

+    c.Assert(len(recordedRequests), Equals, 1)

There's a HasLen checker:

    c.Assert(recordedRequests, HasLen, 1)

Here and one other place.

review: Approve

[lp:~rvb/gwacl/listhostedservices-2]

164. By Raphaël Badin on 2013-07-04

Review fixes.

[Raphaël Badin (rvb)]

> Looks good.
>
>
> [1]
>
> +    c.Assert(len(recordedRequests), Equals, 1)
>
> There's a HasLen checker:
>
>    c.Assert(recordedRequests, HasLen, 1)
>
> Here and one other place.

Fixed, thanks for the review!

=== modified file 'management.go'
--- management.go	2013-07-03 09:36:36 +0000
+++ management.go	2013-07-04 10:56:30 +0000
@@ -71,6 +71,31 @@
     return deployments, nil
 }
 
+type ListSpecificHostedServicesRequest struct {
+    ServiceNames []string
+}
+
+// ListSpecificHostedServices returns a slice containing specific
+// HostedServiceDescriptor objects, insofar as they match the request.
+func (api *ManagementAPI) ListSpecificHostedServices(request *ListSpecificHostedServicesRequest) ([]HostedServiceDescriptor, error) {
+    allServices, err := api.ListHostedServices()
+    if err != nil {
+        return nil, err
+    }
+    // Filter the service list according to the given names.
+    filter := make(map[string]bool)
+    for _, name := range request.ServiceNames {
+        filter[name] = true
+    }
+    services := []HostedServiceDescriptor{}
+    for _, service := range allServices {
+        if _, ok := filter[service.ServiceName]; ok {
+            services = append(services, service)
+        }
+    }
+    return services, nil
+}
+
 type DestroyDeploymentRequest struct {
     ServiceName    string
     DeploymentName string
 
=== modified file 'management_test.go'
--- management_test.go	2013-07-03 09:36:36 +0000
+++ management_test.go	2013-07-04 10:56:30 +0000
@@ -83,7 +83,7 @@
     })
 
     // The only request is for the service's properties
-    c.Assert(len(record), Not(Equals), 0)
+    c.Assert(record, Not(HasLen), 0)
     expectedURL := fmt.Sprintf(
         "%ssubscriptionId/services/hostedservices/%s?embed-detail=true",
         AZURE_URL, service.ServiceName)
@@ -122,7 +122,7 @@
     c.Check(deployments, DeepEquals, service.Deployments)
 
     // Only one request to the API is made.
-    c.Assert(len(record), Equals, 1)
+    c.Assert(record, HasLen, 1)
 }
 
 // TestListDeployments tests ListDeployments, including filtering by name.
@@ -143,7 +143,7 @@
     // Only the first deployment - named "Arthur" - is returned.
     c.Check(deployments, DeepEquals, []Deployment{service.Deployments[0]})
     // Only one request to the API is made.
-    c.Assert(len(record), Equals, 1)
+    c.Assert(record, HasLen, 1)
 }
 
 func (suite *managementAPISuite) TestListDeploymentsWithoutNamesReturnsNothing(c *C) {
@@ -160,7 +160,64 @@
     c.Assert(err, IsNil)
 
     // No deployments are returned.
-    c.Check(len(deployments), Equals, 0)
+    c.Check(deployments, HasLen, 0)
+}
+
+func makeHostedServiceDescriptor() *HostedServiceDescriptor {
+    url := MakeRandomString(10)
+    serviceName := MakeRandomString(10)
+    return &HostedServiceDescriptor{ServiceName: serviceName, URL: url}
+}
+
+func (suite *managementAPISuite) TestListSpecificHostedServices(c *C) {
+    service1 := makeHostedServiceDescriptor()
+    service2 := makeHostedServiceDescriptor()
+    list := HostedServiceDescriptorList{HostedServices: []HostedServiceDescriptor{*service1, *service2}}
+    XML, err := list.Serialize()
+    c.Assert(err, IsNil)
+    fixedResponse := x509Response{
+        StatusCode: http.StatusOK,
+        Body:       []byte(XML),
+    }
+    rigFixedResponseDispatcher(&fixedResponse)
+    recordedRequests := make([]*X509Request, 0)
+    rigRecordingDispatcher(&recordedRequests)
+
+    api := makeAPI(c)
+    request := &ListSpecificHostedServicesRequest{
+        ServiceNames: []string{service1.ServiceName},
+    }
+    descriptors, err := api.ListSpecificHostedServices(request)
+
+    // Only the first service is returned.
+    c.Check(descriptors, DeepEquals, []HostedServiceDescriptor{*service1})
+    // Only one request to the API is made.
+    c.Assert(recordedRequests, HasLen, 1)
+}
+
+func (suite *managementAPISuite) TestListSpecificHostedServicesWithoutNamesReturnsNothing(c *C) {
+    service1 := makeHostedServiceDescriptor()
+    service2 := makeHostedServiceDescriptor()
+    list := HostedServiceDescriptorList{HostedServices: []HostedServiceDescriptor{*service1, *service2}}
+    XML, err := list.Serialize()
+    c.Assert(err, IsNil)
+    fixedResponse := x509Response{
+        StatusCode: http.StatusOK,
+        Body:       []byte(XML),
+    }
+    rigFixedResponseDispatcher(&fixedResponse)
+    recordedRequests := make([]*X509Request, 0)
+    rigRecordingDispatcher(&recordedRequests)
+
+    api := makeAPI(c)
+    request := &ListSpecificHostedServicesRequest{
+        ServiceNames: []string{},
+    }
+    descriptors, err := api.ListSpecificHostedServices(request)
+
+    c.Check(descriptors, DeepEquals, []HostedServiceDescriptor{})
+    // Only one request to the API is made.
+    c.Assert(recordedRequests, HasLen, 1)
 }
 
 type suiteDestroyDeployment struct{}