openstack
/
tempest
Code Issues Proposed changes

Merge "Use tempest.lib clients for bulk ops"

This commit is contained in:
Jenkins 2016-03-04 07:56:23 +00:00 committed by Gerrit Code Review
parent 63053dbeff 1f52fd92df
commit 22dd1c9d94
3 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tempest/api/network/test_networks.py
View File

@ -451,7 +451,7 @@ class BulkNetworkOpsTestJSON(base.BaseNetworkTest):
# Creates 2 networks in one request
network_list = [{'name': data_utils.rand_name('network-')},
{'name': data_utils.rand_name('network-')}]
body = self.client.create_bulk_network(networks=network_list)
body = self.networks_client.create_bulk_networks(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 @@ class BulkNetworkOpsTestJSON(base.BaseNetworkTest):
}
subnets_list.append(p1)
del subnets_list[1]['name']
body = self.client.create_bulk_subnet(subnets=subnets_list)
body = self.subnets_client.create_bulk_subnets(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 @@ class BulkNetworkOpsTestJSON(base.BaseNetworkTest):
}
port_list.append(p1)
del port_list[1]['name']
body = self.client.create_bulk_port(ports=port_list)
body = self.ports_client.create_bulk_ports(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

2
tempest/api/network/test_ports.py
View File

@ -75,7 +75,7 @@ class PortsTestJSON(sec_base.BaseSecGroupTest):
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(ports=port_list)
body = self.ports_client.create_bulk_ports(ports=port_list)
created_ports = body['ports']
port1 = created_ports[0]
port2 = created_ports[1]

27
tempest/services/network/json/network_client.py
View File

@ -34,33 +34,6 @@ class NetworkClient(base.BaseNetworkClient):
quotas
"""
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, kwargs)
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, kwargs)
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, kwargs)
def wait_for_resource_deletion(self, resource_type, id, client=None):
"""Waits for a resource to be deleted."""
start_time = int(time.time())