From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 1 Apr 2015 21:54:16 +0000 (+0000)
Subject: Merge "Add API tests for subnetpool allocation"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1ef4f3d57208aac7fec6d9e81abc8fa9db8ff42d;p=openstack-build%2Fneutron-build.git

Merge "Add API tests for subnetpool allocation"
---

1ef4f3d57208aac7fec6d9e81abc8fa9db8ff42d
diff --cc neutron/tests/tempest/services/network/json/network_client.py
index 5b7c534ae,a7fbbcfda..82271f71a
--- a/neutron/tests/tempest/services/network/json/network_client.py
+++ b/neutron/tests/tempest/services/network/json/network_client.py
@@@ -168,9 -169,49 +169,49 @@@ class NetworkClientJSON(service_client.
                  return method_functors[index](name[prefix_len:])
          raise AttributeError(name)
  
+     # Subnetpool methods
+     def create_subnetpool(self, post_data):
+         body = self.serialize_list(post_data, "subnetpools", "subnetpool")
+         uri = self.get_uri("subnetpools")
+         resp, body = self.post(uri, body)
+         body = {'subnetpool': self.deserialize_list(body)}
+         self.expected_success(201, resp.status)
+         return service_client.ResponseBody(resp, body)
+ 
+     def get_subnetpool(self, id):
+         uri = self.get_uri("subnetpools")
+         subnetpool_uri = '%s/%s' % (uri, id)
+         resp, body = self.get(subnetpool_uri)
+         body = {'subnetpool': self.deserialize_list(body)}
+         self.expected_success(200, resp.status)
+         return service_client.ResponseBody(resp, body)
+ 
+     def delete_subnetpool(self, id):
+         uri = self.get_uri("subnetpools")
+         subnetpool_uri = '%s/%s' % (uri, id)
+         resp, body = self.delete(subnetpool_uri)
+         self.expected_success(204, resp.status)
+         return service_client.ResponseBody(resp, body)
+ 
+     def list_subnetpools(self):
+         uri = self.get_uri("subnetpools")
+         resp, body = self.get(uri)
+         body = {'subnetpools': self.deserialize_list(body)}
+         self.expected_success(200, resp.status)
+         return service_client.ResponseBody(resp, body)
+ 
+     def update_subnetpool(self, id, post_data):
+         body = self.serialize_list(post_data, "subnetpools", "subnetpool")
+         uri = self.get_uri("subnetpools")
+         subnetpool_uri = '%s/%s' % (uri, id)
+         resp, body = self.put(subnetpool_uri, body)
+         body = {'subnetpool': self.deserialize_list(body)}
+         self.expected_success(200, resp.status)
+         return service_client.ResponseBody(resp, body)
+ 
      # Common methods that are hard to automate
 -    def create_bulk_network(self, names):
 -        network_list = [{'name': name} for name in names]
 +    def create_bulk_network(self, names, shared=False):
 +        network_list = [{'name': name, 'shared': shared} for name in names]
          post_data = {'networks': network_list}
          body = self.serialize_list(post_data, "networks", "network")
          uri = self.get_uri("networks")