openstack
/
tempest
Code Issues Proposed changes

Merge "Remove NetworksIPV6TestAttrs duplicate tests"

This commit is contained in:
Jenkins 2016-11-15 19:02:42 +00:00 committed by Gerrit Code Review
parent 1671297307 871547cf6b
commit f590955960
1 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,39 +27,11 @@ from tempest import test
CONF = config.CONF
class NetworksTest(base.BaseNetworkTest):
"""Tests the following operations in the Neutron API:
create a network for a project
list project's networks
show a project network details
create a subnet for a project
list project's subnets
show a project subnet details
network update
subnet update
delete a network also deletes its subnets
list external networks
All subnet tests are run once with ipv4 and once with ipv6.
v2.0 of the Neutron API is assumed. It is also assumed that the following
options are defined in the [network] section of etc/tempest.conf:
project_network_cidr with a block of cidr's from which smaller blocks
can be allocated for project ipv4 subnets
project_network_v6_cidr is the equivalent for ipv6 subnets
project_network_mask_bits with the mask bits to be used to partition
the block defined by project_network_cidr
project_network_v6_mask_bits is the equivalent for ipv6 subnets
"""
class BaseNetworkTestResources(base.BaseNetworkTest):
@classmethod
def resource_setup(cls):
super(NetworksTest, cls).resource_setup()
super(BaseNetworkTestResources, cls).resource_setup()
cls.network = cls.create_network()
cls.name = cls.network['name']
cls.subnet = cls._create_subnet_with_last_subnet_block(cls.network,
@ -171,6 +143,37 @@ class NetworksTest(base.BaseNetworkTest):
self.networks.pop()
self.subnets.pop()
class NetworksTest(BaseNetworkTestResources):
"""Tests the following operations in the Neutron API:
create a network for a project
list project's networks
show a project network details
create a subnet for a project
list project's subnets
show a project subnet details
network update
subnet update
delete a network also deletes its subnets
list external networks
All subnet tests are run once with ipv4 and once with ipv6.
v2.0 of the Neutron API is assumed. It is also assumed that the following
options are defined in the [network] section of etc/tempest.conf:
project_network_cidr with a block of cidr's from which smaller blocks
can be allocated for project ipv4 subnets
project_network_v6_cidr is the equivalent for ipv6 subnets
project_network_mask_bits with the mask bits to be used to partition
the block defined by project_network_cidr
project_network_v6_mask_bits is the equivalent for ipv6 subnets
"""
@test.attr(type='smoke')
@test.idempotent_id('0e269138-0da6-4efc-a46d-578161e7b221')
def test_create_update_delete_network_subnet(self):
@ -559,7 +562,9 @@ class NetworksIpV6Test(NetworksTest):
'Subnet are not in the same network')
class NetworksIpV6TestAttrs(NetworksIpV6Test):
class NetworksIpV6TestAttrs(BaseNetworkTestResources):
_ip_version = 6
@classmethod
def skip_checks(cls):