openstack/tempest
Code Issues Proposed changes

Use random name in network common function

Browse Source 
This is to use random name in network's common function,
to avoid too many random name definitions outside.

Change-Id: Ieb211ce48d2368b1f41109c7fd76e818ee69cfe4
This commit is contained in:
zhufl 2016-10-18 17:03:07 +08:00
parent 7ee11ccf5a
commit d2c40cace0
9 changed files with 30 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tempest/api/network/admin/test_floating_ips_admin_actions.py
View File

@ -14,7 +14,6 @@
# under the License. # under the License.
from tempest.api.network import base from tempest.api.network import base
from tempest.common.utils import data_utils
from tempest import config from tempest import config
from tempest import test from tempest import test
@ -44,8 +43,7 @@ class FloatingIPAdminTestJSON(base.BaseAdminNetworkTest):
cls.floating_ip = cls.create_floatingip(cls.ext_net_id) cls.floating_ip = cls.create_floatingip(cls.ext_net_id)
cls.network = cls.create_network() cls.network = cls.create_network()
cls.subnet = cls.create_subnet(cls.network) cls.subnet = cls.create_subnet(cls.network)
cls.router = cls.create_router(data_utils.rand_name('router-'), cls.router = cls.create_router(external_network_id=cls.ext_net_id)
external_network_id=cls.ext_net_id)
cls.create_router_interface(cls.router['id'], cls.subnet['id']) cls.create_router_interface(cls.router['id'], cls.subnet['id'])
cls.port = cls.create_port(cls.network) cls.port = cls.create_port(cls.network)

3
tempest/api/network/admin/test_l3_agent_scheduler.py
View File

@ -13,7 +13,6 @@
# under the License. # under the License.
from tempest.api.network import base from tempest.api.network import base
from tempest.common.utils import data_utils
from tempest import config from tempest import config
from tempest import exceptions from tempest import exceptions
from tempest import test from tempest import test
@ -66,7 +65,7 @@ class L3AgentSchedulerTestJSON(base.BaseAdminNetworkTest):
else: else:
msg = "L3 Agent Scheduler enabled in conf, but L3 Agent not found" msg = "L3 Agent Scheduler enabled in conf, but L3 Agent not found"
raise exceptions.InvalidConfiguration(msg) raise exceptions.InvalidConfiguration(msg)
cls.router = cls.create_router(data_utils.rand_name('router')) cls.router = cls.create_router()
if CONF.network.dvr_extra_resources: if CONF.network.dvr_extra_resources:
# NOTE(armax): If DVR is an available extension, and the created # NOTE(armax): If DVR is an available extension, and the created

9
tempest/api/network/base.py
View File

@ -26,7 +26,7 @@ CONF = config.CONF
class BaseNetworkTest(tempest.test.BaseTestCase): class BaseNetworkTest(tempest.test.BaseTestCase):
"""Base class for the Neutron tests """Base class for the Neutron tests.
Per the Neutron API Guide, API v1.x was removed from the source code tree Per the Neutron API Guide, API v1.x was removed from the source code tree
(docs.openstack.org/api/openstack-network/2.0/content/Overview-d1e71.html) (docs.openstack.org/api/openstack-network/2.0/content/Overview-d1e71.html)
@ -137,7 +137,8 @@ class BaseNetworkTest(tempest.test.BaseTestCase):
@classmethod @classmethod
def create_network(cls, network_name=None): def create_network(cls, network_name=None):
"""Wrapper utility that returns a test network.""" """Wrapper utility that returns a test network."""
network_name = network_name or data_utils.rand_name('test-network-') network_name = network_name or data_utils.rand_name(
cls.__name__ + "-network")
body = cls.networks_client.create_network(name=network_name) body = cls.networks_client.create_network(name=network_name)
network = body['network'] network = body['network']
@ -148,7 +149,6 @@ class BaseNetworkTest(tempest.test.BaseTestCase):
def create_subnet(cls, network, gateway='', cidr=None, mask_bits=None, def create_subnet(cls, network, gateway='', cidr=None, mask_bits=None,
ip_version=None, client=None, **kwargs): ip_version=None, client=None, **kwargs):
"""Wrapper utility that returns a test subnet.""" """Wrapper utility that returns a test subnet."""
# allow tests to use admin client # allow tests to use admin client
if not client: if not client:
client = cls.subnets_client client = cls.subnets_client
@ -208,6 +208,9 @@ class BaseNetworkTest(tempest.test.BaseTestCase):
def create_router(cls, router_name=None, admin_state_up=False, def create_router(cls, router_name=None, admin_state_up=False,
external_network_id=None, enable_snat=None, external_network_id=None, enable_snat=None,
**kwargs): **kwargs):
router_name = router_name or data_utils.rand_name(
cls.__name__ + "-router")
ext_gw_info = {} ext_gw_info = {}
if external_network_id: if external_network_id:
ext_gw_info['network_id'] = external_network_id ext_gw_info['network_id'] = external_network_id

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

@ -25,7 +25,7 @@ class BaseRouterTest(base.BaseAdminNetworkTest):
self.delete_router(router) self.delete_router(router)
self.routers.remove(router) self.routers.remove(router)
def _create_router(self, name, admin_state_up=False, def _create_router(self, name=None, admin_state_up=False,
external_network_id=None, enable_snat=None): external_network_id=None, enable_snat=None):
# associate a cleanup with created routers to avoid quota limits # associate a cleanup with created routers to avoid quota limits
router = self.create_router(name, admin_state_up, router = self.create_router(name, admin_state_up,

7
tempest/api/network/test_floating_ips.py
View File

@ -14,7 +14,6 @@
# under the License. # under the License.
from tempest.api.network import base from tempest.api.network import base
from tempest.common.utils import data_utils
from tempest.common.utils import net_utils from tempest.common.utils import net_utils
from tempest import config from tempest import config
from tempest import test from tempest import test
@ -55,8 +54,7 @@ class FloatingIPTestJSON(base.BaseNetworkTest):
# Create network, subnet, router and add interface # Create network, subnet, router and add interface
cls.network = cls.create_network() cls.network = cls.create_network()
cls.subnet = cls.create_subnet(cls.network, enable_dhcp=False) cls.subnet = cls.create_subnet(cls.network, enable_dhcp=False)
cls.router = cls.create_router(data_utils.rand_name('router-'), cls.router = cls.create_router(external_network_id=cls.ext_net_id)
external_network_id=cls.ext_net_id)
cls.create_router_interface(cls.router['id'], cls.subnet['id']) cls.create_router_interface(cls.router['id'], cls.subnet['id'])
# Create two ports one each for Creation and Updating of floatingIP # Create two ports one each for Creation and Updating of floatingIP
for i in range(2): for i in range(2):
@ -156,8 +154,7 @@ class FloatingIPTestJSON(base.BaseNetworkTest):
self.assertEqual(created_floating_ip['router_id'], self.router['id']) self.assertEqual(created_floating_ip['router_id'], self.router['id'])
network2 = self.create_network() network2 = self.create_network()
subnet2 = self.create_subnet(network2) subnet2 = self.create_subnet(network2)
router2 = self.create_router(data_utils.rand_name('router-'), router2 = self.create_router(external_network_id=self.ext_net_id)
external_network_id=self.ext_net_id)
self.create_router_interface(router2['id'], subnet2['id']) self.create_router_interface(router2['id'], subnet2['id'])
port_other_router = self.create_port(network2) port_other_router = self.create_port(network2)
# Associate floating IP to the other port on another router # Associate floating IP to the other port on another router

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

@ -175,8 +175,7 @@ class NetworksTest(base.BaseNetworkTest):
@test.idempotent_id('0e269138-0da6-4efc-a46d-578161e7b221') @test.idempotent_id('0e269138-0da6-4efc-a46d-578161e7b221')
def test_create_update_delete_network_subnet(self): def test_create_update_delete_network_subnet(self):
# Create a network # Create a network
name = data_utils.rand_name('network-') network = self.create_network()
network = self.create_network(network_name=name)
self.addCleanup(self._delete_network, network) self.addCleanup(self._delete_network, network)
net_id = network['id'] net_id = network['id']
self.assertEqual('ACTIVE', network['status']) self.assertEqual('ACTIVE', network['status'])
@ -525,8 +524,7 @@ class NetworksIpV6Test(NetworksTest):
def test_create_delete_subnet_with_gw(self): def test_create_delete_subnet_with_gw(self):
net = netaddr.IPNetwork(CONF.network.project_network_v6_cidr) net = netaddr.IPNetwork(CONF.network.project_network_v6_cidr)
gateway = str(netaddr.IPAddress(net.first + 2)) gateway = str(netaddr.IPAddress(net.first + 2))
name = data_utils.rand_name('network-') network = self.create_network()
network = self.create_network(network_name=name)
subnet = self.create_subnet(network, gateway) subnet = self.create_subnet(network, gateway)
# Verifies Subnet GW in IPv6 # Verifies Subnet GW in IPv6
self.assertEqual(subnet['gateway_ip'], gateway) self.assertEqual(subnet['gateway_ip'], gateway)
@ -535,16 +533,14 @@ class NetworksIpV6Test(NetworksTest):
def test_create_delete_subnet_with_default_gw(self): def test_create_delete_subnet_with_default_gw(self):
net = netaddr.IPNetwork(CONF.network.project_network_v6_cidr) net = netaddr.IPNetwork(CONF.network.project_network_v6_cidr)
gateway_ip = str(netaddr.IPAddress(net.first + 1)) gateway_ip = str(netaddr.IPAddress(net.first + 1))
name = data_utils.rand_name('network-') network = self.create_network()
network = self.create_network(network_name=name)
subnet = self.create_subnet(network) subnet = self.create_subnet(network)
# Verifies Subnet GW in IPv6 # Verifies Subnet GW in IPv6
self.assertEqual(subnet['gateway_ip'], gateway_ip) self.assertEqual(subnet['gateway_ip'], gateway_ip)
@test.idempotent_id('a9653883-b2a4-469b-8c3c-4518430a7e55') @test.idempotent_id('a9653883-b2a4-469b-8c3c-4518430a7e55')
def test_create_list_subnet_with_no_gw64_one_network(self): def test_create_list_subnet_with_no_gw64_one_network(self):
name = data_utils.rand_name('network-') network = self.create_network()
network = self.create_network(name)
ipv6_gateway = self.subnet_dict(['gateway'])['gateway'] ipv6_gateway = self.subnet_dict(['gateway'])['gateway']
subnet1 = self.create_subnet(network, subnet1 = self.create_subnet(network,
ip_version=6, ip_version=6,

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

@ -72,8 +72,7 @@ class PortsTestJSON(sec_base.BaseSecGroupTest):
@test.idempotent_id('67f1b811-f8db-43e2-86bd-72c074d4a42c') @test.idempotent_id('67f1b811-f8db-43e2-86bd-72c074d4a42c')
def test_create_bulk_port(self): def test_create_bulk_port(self):
network1 = self.network network1 = self.network
name = data_utils.rand_name('network-') network2 = self.create_network()
network2 = self.create_network(network_name=name)
network_list = [network1['id'], network2['id']] network_list = [network1['id'], network2['id']]
port_list = [{'network_id': net_id} for net_id in network_list] port_list = [{'network_id': net_id} for net_id in network_list]
body = self.ports_client.create_bulk_ports(ports=port_list) body = self.ports_client.create_bulk_ports(ports=port_list)

26
tempest/api/network/test_routers.py
View File

@ -106,9 +106,8 @@ class RoutersTest(base.BaseRouterTest):
@test.requires_ext(extension='ext-gw-mode', service='network') @test.requires_ext(extension='ext-gw-mode', service='network')
def test_create_router_with_default_snat_value(self): def test_create_router_with_default_snat_value(self):
# Create a router with default snat rule # Create a router with default snat rule
name = data_utils.rand_name('router')
router = self._create_router( router = self._create_router(
name, external_network_id=CONF.network.public_network_id) external_network_id=CONF.network.public_network_id)
self._verify_router_gateway( self._verify_router_gateway(
router['id'], {'network_id': CONF.network.public_network_id, router['id'], {'network_id': CONF.network.public_network_id,
'enable_snat': True}) 'enable_snat': True})
@ -136,7 +135,7 @@ class RoutersTest(base.BaseRouterTest):
def test_add_remove_router_interface_with_subnet_id(self): def test_add_remove_router_interface_with_subnet_id(self):
network = self.create_network() network = self.create_network()
subnet = self.create_subnet(network) subnet = self.create_subnet(network)
router = self._create_router(data_utils.rand_name('router-')) router = self._create_router()
# Add router interface with subnet id # Add router interface with subnet id
interface = self.routers_client.add_router_interface( interface = self.routers_client.add_router_interface(
router['id'], subnet_id=subnet['id']) router['id'], subnet_id=subnet['id'])
@ -155,7 +154,7 @@ class RoutersTest(base.BaseRouterTest):
def test_add_remove_router_interface_with_port_id(self): def test_add_remove_router_interface_with_port_id(self):
network = self.create_network() network = self.create_network()
self.create_subnet(network) self.create_subnet(network)
router = self._create_router(data_utils.rand_name('router-')) router = self._create_router()
port_body = self.ports_client.create_port( port_body = self.ports_client.create_port(
network_id=network['id']) network_id=network['id'])
# add router interface to port created above # add router interface to port created above
@ -201,7 +200,7 @@ class RoutersTest(base.BaseRouterTest):
@test.idempotent_id('6cc285d8-46bf-4f36-9b1a-783e3008ba79') @test.idempotent_id('6cc285d8-46bf-4f36-9b1a-783e3008ba79')
def test_update_router_set_gateway(self): def test_update_router_set_gateway(self):
router = self._create_router(data_utils.rand_name('router-')) router = self._create_router()
self.routers_client.update_router( self.routers_client.update_router(
router['id'], router['id'],
external_gateway_info={ external_gateway_info={
@ -215,7 +214,7 @@ class RoutersTest(base.BaseRouterTest):
@test.idempotent_id('b386c111-3b21-466d-880c-5e72b01e1a33') @test.idempotent_id('b386c111-3b21-466d-880c-5e72b01e1a33')
@test.requires_ext(extension='ext-gw-mode', service='network') @test.requires_ext(extension='ext-gw-mode', service='network')
def test_update_router_set_gateway_with_snat_explicit(self): def test_update_router_set_gateway_with_snat_explicit(self):
router = self._create_router(data_utils.rand_name('router-')) router = self._create_router()
self.admin_routers_client.update_router( self.admin_routers_client.update_router(
router['id'], router['id'],
external_gateway_info={ external_gateway_info={
@ -230,7 +229,7 @@ class RoutersTest(base.BaseRouterTest):
@test.idempotent_id('96536bc7-8262-4fb2-9967-5c46940fa279') @test.idempotent_id('96536bc7-8262-4fb2-9967-5c46940fa279')
@test.requires_ext(extension='ext-gw-mode', service='network') @test.requires_ext(extension='ext-gw-mode', service='network')
def test_update_router_set_gateway_without_snat(self): def test_update_router_set_gateway_without_snat(self):
router = self._create_router(data_utils.rand_name('router-')) router = self._create_router()
self.admin_routers_client.update_router( self.admin_routers_client.update_router(
router['id'], router['id'],
external_gateway_info={ external_gateway_info={
@ -245,7 +244,6 @@ class RoutersTest(base.BaseRouterTest):
@test.idempotent_id('ad81b7ee-4f81-407b-a19c-17e623f763e8') @test.idempotent_id('ad81b7ee-4f81-407b-a19c-17e623f763e8')
def test_update_router_unset_gateway(self): def test_update_router_unset_gateway(self):
router = self._create_router( router = self._create_router(
data_utils.rand_name('router-'),
external_network_id=CONF.network.public_network_id) external_network_id=CONF.network.public_network_id)
self.routers_client.update_router(router['id'], self.routers_client.update_router(router['id'],
external_gateway_info={}) external_gateway_info={})
@ -260,7 +258,6 @@ class RoutersTest(base.BaseRouterTest):
@test.requires_ext(extension='ext-gw-mode', service='network') @test.requires_ext(extension='ext-gw-mode', service='network')
def test_update_router_reset_gateway_without_snat(self): def test_update_router_reset_gateway_without_snat(self):
router = self._create_router( router = self._create_router(
data_utils.rand_name('router-'),
external_network_id=CONF.network.public_network_id) external_network_id=CONF.network.public_network_id)
self.admin_routers_client.update_router( self.admin_routers_client.update_router(
router['id'], router['id'],
@ -283,8 +280,7 @@ class RoutersTest(base.BaseRouterTest):
test_routes = [] test_routes = []
routes_num = 4 routes_num = 4
# Create a router # Create a router
router = self._create_router( router = self._create_router(admin_state_up=True)
data_utils.rand_name('router-'), True)
self.addCleanup( self.addCleanup(
self._delete_extra_routes, self._delete_extra_routes,
router['id']) router['id'])
@ -338,7 +334,7 @@ class RoutersTest(base.BaseRouterTest):
@test.idempotent_id('a8902683-c788-4246-95c7-ad9c6d63a4d9') @test.idempotent_id('a8902683-c788-4246-95c7-ad9c6d63a4d9')
def test_update_router_admin_state(self): def test_update_router_admin_state(self):
router = self._create_router(data_utils.rand_name('router-')) router = self._create_router()
self.assertFalse(router['admin_state_up']) self.assertFalse(router['admin_state_up'])
# Update router admin state # Update router admin state
update_body = self.routers_client.update_router(router['id'], update_body = self.routers_client.update_router(router['id'],
@ -357,7 +353,7 @@ class RoutersTest(base.BaseRouterTest):
subnet01 = self.create_subnet(network01) subnet01 = self.create_subnet(network01)
sub02_cidr = netaddr.IPNetwork(self.tenant_cidr).next() sub02_cidr = netaddr.IPNetwork(self.tenant_cidr).next()
subnet02 = self.create_subnet(network02, cidr=sub02_cidr) subnet02 = self.create_subnet(network02, cidr=sub02_cidr)
router = self._create_router(data_utils.rand_name('router-')) router = self._create_router()
interface01 = self._add_router_interface_with_subnet_id(router['id'], interface01 = self._add_router_interface_with_subnet_id(router['id'],
subnet01['id']) subnet01['id'])
self._verify_router_interface(router['id'], subnet01['id'], self._verify_router_interface(router['id'], subnet01['id'],
@ -371,7 +367,7 @@ class RoutersTest(base.BaseRouterTest):
def test_router_interface_port_update_with_fixed_ip(self): def test_router_interface_port_update_with_fixed_ip(self):
network = self.create_network() network = self.create_network()
subnet = self.create_subnet(network) subnet = self.create_subnet(network)
router = self._create_router(data_utils.rand_name('router-')) router = self._create_router()
fixed_ip = [{'subnet_id': subnet['id']}] fixed_ip = [{'subnet_id': subnet['id']}]
interface = self._add_router_interface_with_subnet_id(router['id'], interface = self._add_router_interface_with_subnet_id(router['id'],
subnet['id']) subnet['id'])
@ -417,7 +413,7 @@ class DvrRoutersTest(base.BaseRouterTest):
@test.idempotent_id('644d7a4a-01a1-4b68-bb8d-0c0042cb1729') @test.idempotent_id('644d7a4a-01a1-4b68-bb8d-0c0042cb1729')
def test_convert_centralized_router(self): def test_convert_centralized_router(self):
router = self._create_router(data_utils.rand_name('router')) router = self._create_router()
self.assertNotIn('distributed', router) self.assertNotIn('distributed', router)
update_body = self.admin_routers_client.update_router(router['id'], update_body = self.admin_routers_client.update_router(router['id'],
distributed=True) distributed=True)

7
tempest/api/network/test_routers_negative.py
View File

@ -36,7 +36,7 @@ class RoutersNegativeTest(base.BaseRouterTest):
@classmethod @classmethod
def resource_setup(cls): def resource_setup(cls):
super(RoutersNegativeTest, cls).resource_setup() super(RoutersNegativeTest, cls).resource_setup()
cls.router = cls.create_router(data_utils.rand_name('router-')) cls.router = cls.create_router()
cls.network = cls.create_network() cls.network = cls.create_network()
cls.subnet = cls.create_subnet(cls.network) cls.subnet = cls.create_subnet(cls.network)
cls.tenant_cidr = (CONF.network.project_network_cidr cls.tenant_cidr = (CONF.network.project_network_cidr
@ -55,8 +55,7 @@ class RoutersNegativeTest(base.BaseRouterTest):
@test.attr(type=['negative']) @test.attr(type=['negative'])
@test.idempotent_id('11836a18-0b15-4327-a50b-f0d9dc66bddd') @test.idempotent_id('11836a18-0b15-4327-a50b-f0d9dc66bddd')
def test_router_add_gateway_net_not_external_returns_400(self): def test_router_add_gateway_net_not_external_returns_400(self):
alt_network = self.create_network( alt_network = self.create_network()
network_name=data_utils.rand_name('router-negative-'))
sub_cidr = netaddr.IPNetwork(self.tenant_cidr).next() sub_cidr = netaddr.IPNetwork(self.tenant_cidr).next()
self.create_subnet(alt_network, cidr=sub_cidr) self.create_subnet(alt_network, cidr=sub_cidr)
self.assertRaises(lib_exc.BadRequest, self.assertRaises(lib_exc.BadRequest,
@ -128,7 +127,7 @@ class DvrRoutersNegativeTest(base.BaseRouterTest):
@classmethod @classmethod
def resource_setup(cls): def resource_setup(cls):
super(DvrRoutersNegativeTest, cls).resource_setup() super(DvrRoutersNegativeTest, cls).resource_setup()
cls.router = cls.create_router(data_utils.rand_name('router')) cls.router = cls.create_router()
cls.network = cls.create_network() cls.network = cls.create_network()
cls.subnet = cls.create_subnet(cls.network) cls.subnet = cls.create_subnet(cls.network)