openstack
/
neutron
Code Issues Proposed changes

Merge "test_network_ip_availability: Skip IPv6 tests when configured so" into stable/mitaka

This commit is contained in:
Jenkins 2016-04-12 09:16:38 +00:00 committed by Gerrit Code Review
parent 0af55c89f9 05ac0125fe
commit de3813296d
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
neutron/tests/api/test_network_ip_availability.py
View File

@ -107,8 +107,6 @@ def calc_total_ips(prefix, ip_version):
class NetworksIpAvailabilityIPv4Test(NetworksIpAvailabilityTest):
ip_version = lib_constants.IP_VERSION_4
@test.attr(type='smoke')
@test.idempotent_id('0f33cc8c-1bf6-47d1-9ce1-010618240599')
def test_admin_network_availability_before_subnet(self):
@ -124,7 +122,7 @@ class NetworksIpAvailabilityIPv4Test(NetworksIpAvailabilityTest):
net_name = data_utils.rand_name('network-')
network = self.create_network(network_name=net_name)
self.addCleanup(self.client.delete_network, network['id'])
subnet, prefix = self._create_subnet(network, self.ip_version)
subnet, prefix = self._create_subnet(network, self._ip_version)
self.addCleanup(self.client.delete_subnet, subnet['id'])
body = self.admin_client.list_network_ip_availabilities()
used_ip = self._get_used_ips(network, body)
@ -135,7 +133,7 @@ class NetworksIpAvailabilityIPv4Test(NetworksIpAvailabilityTest):
net_availability = self.admin_client.list_network_ip_availabilities()
self._assert_total_and_used_ips(
used_ip + 2,
calc_total_ips(prefix, self.ip_version),
calc_total_ips(prefix, self._ip_version),
network, net_availability)
@test.attr(type='smoke')
@ -144,7 +142,7 @@ class NetworksIpAvailabilityIPv4Test(NetworksIpAvailabilityTest):
net_name = data_utils.rand_name('network-')
network = self.create_network(network_name=net_name)
self.addCleanup(self.client.delete_network, network['id'])
subnet, prefix = self._create_subnet(network, self.ip_version)
subnet, prefix = self._create_subnet(network, self._ip_version)
self.addCleanup(self.client.delete_subnet, subnet['id'])
port = self.client.create_port(network_id=network['id'])
self.addCleanup(self._cleanUp_port, port['port']['id'])
@ -166,4 +164,4 @@ class NetworksIpAvailabilityIPv4Test(NetworksIpAvailabilityTest):
class NetworksIpAvailabilityIPv6Test(NetworksIpAvailabilityIPv4Test):
ip_version = lib_constants.IP_VERSION_6
_ip_version = lib_constants.IP_VERSION_6