Make 3 functions in network_client use **kwargs
As we discussed on
http://lists.openstack.org/pipermail/openstack-dev/2015-July/068864.html
All http POST/PUT methods need to contain **kwargs as their arguments.
This patch makes create_bulk_port, create_bulk_subnet,
create_bulk_network of network_client use **kwargs.
Partially implements blueprint consistent-service-method-names
Change-Id: I992769608dedeb4afa752130240ad60e709a99fe
diff --git a/tempest/api/network/test_networks.py b/tempest/api/network/test_networks.py
index a266142..1c446ef 100644
--- a/tempest/api/network/test_networks.py
+++ b/tempest/api/network/test_networks.py
@@ -449,9 +449,9 @@
@test.idempotent_id('d4f9024d-1e28-4fc1-a6b1-25dbc6fa11e2')
def test_bulk_create_delete_network(self):
# Creates 2 networks in one request
- network_names = [data_utils.rand_name('network-'),
- data_utils.rand_name('network-')]
- body = self.client.create_bulk_network(network_names)
+ network_list = [{'name': data_utils.rand_name('network-')},
+ {'name': data_utils.rand_name('network-')}]
+ body = self.client.create_bulk_network(networks=network_list)
created_networks = body['networks']
self.addCleanup(self._delete_networks, created_networks)
# Asserting that the networks are found in the list after creation
@@ -486,7 +486,7 @@
}
subnets_list.append(p1)
del subnets_list[1]['name']
- body = self.client.create_bulk_subnet(subnets_list)
+ body = self.client.create_bulk_subnet(subnets=subnets_list)
created_subnets = body['subnets']
self.addCleanup(self._delete_subnets, created_subnets)
# Asserting that the subnets are found in the list after creation
@@ -512,7 +512,7 @@
}
port_list.append(p1)
del port_list[1]['name']
- body = self.client.create_bulk_port(port_list)
+ body = self.client.create_bulk_port(ports=port_list)
created_ports = body['ports']
self.addCleanup(self._delete_ports, created_ports)
# Asserting that the ports are found in the list after creation
diff --git a/tempest/api/network/test_ports.py b/tempest/api/network/test_ports.py
index 43da1c4..334444d 100644
--- a/tempest/api/network/test_ports.py
+++ b/tempest/api/network/test_ports.py
@@ -74,7 +74,7 @@
network2 = self.create_network(network_name=name)
network_list = [network1['id'], network2['id']]
port_list = [{'network_id': net_id} for net_id in network_list]
- body = self.client.create_bulk_port(port_list)
+ body = self.client.create_bulk_port(ports=port_list)
created_ports = body['ports']
port1 = created_ports[0]
port2 = created_ports[1]
diff --git a/tempest/services/network/json/network_client.py b/tempest/services/network/json/network_client.py
index 08316be..eda4bd8 100644
--- a/tempest/services/network/json/network_client.py
+++ b/tempest/services/network/json/network_client.py
@@ -82,21 +82,32 @@
uri = '/extensions'
return self.list_resources(uri, **filters)
- def create_bulk_network(self, names):
- network_list = [{'name': name} for name in names]
- post_data = {'networks': network_list}
+ def create_bulk_network(self, **kwargs):
+ """create bulk network
+
+ Available params: see http://developer.openstack.org/
+ api-ref-networking-v2.html#bulkCreateNetwork
+ """
uri = '/networks'
- return self.create_resource(uri, post_data)
+ return self.create_resource(uri, kwargs)
- def create_bulk_subnet(self, subnet_list):
- post_data = {'subnets': subnet_list}
+ def create_bulk_subnet(self, **kwargs):
+ """create bulk subnet
+
+ Available params: see http://developer.openstack.org/
+ api-ref-networking-v2.html#bulkCreateSubnet
+ """
uri = '/subnets'
- return self.create_resource(uri, post_data)
+ return self.create_resource(uri, kwargs)
- def create_bulk_port(self, port_list):
- post_data = {'ports': port_list}
+ def create_bulk_port(self, **kwargs):
+ """create bulk port
+
+ Available params: see http://developer.openstack.org/
+ api-ref-networking-v2.html#bulkCreatePorts
+ """
uri = '/ports'
- return self.create_resource(uri, post_data)
+ return self.create_resource(uri, kwargs)
def wait_for_resource_deletion(self, resource_type, id, client=None):
"""Waits for a resource to be deleted."""