diff --git a/neutron/tests/tempest/api/admin/test_external_network_extension.py b/neutron/tests/tempest/api/admin/test_external_network_extension.py index 6f6c94d90ce..33303d220ae 100644 --- a/neutron/tests/tempest/api/admin/test_external_network_extension.py +++ b/neutron/tests/tempest/api/admin/test_external_network_extension.py @@ -30,7 +30,7 @@ class ExternalNetworksRBACTestJSON(base.BaseAdminNetworkTest): cls.client2 = cls.os_alt.network_client def _create_network(self, external=True): - post_body = {'name': data_utils.rand_name('network-')} + post_body = {'name': data_utils.rand_name('network')} if external: post_body['router:external'] = external body = self.admin_client.create_network(**post_body) @@ -49,7 +49,7 @@ class ExternalNetworksRBACTestJSON(base.BaseAdminNetworkTest): networks_list = [n['id'] for n in body['networks']] self.assertIn(net['id'], networks_list) r = self.client2.create_router( - data_utils.rand_name('router-'), + data_utils.rand_name('router'), external_gateway_info={'network_id': net['id']})['router'] self.addCleanup(self.admin_client.delete_router, r['id']) @@ -92,7 +92,7 @@ class ExternalNetworksRBACTestJSON(base.BaseAdminNetworkTest): object_id=net_id, action='access_as_external', target_tenant='*')['rbac_policies'][0] r = self.client2.create_router( - data_utils.rand_name('router-'), + data_utils.rand_name('router'), external_gateway_info={'network_id': net_id})['router'] self.addCleanup(self.admin_client.delete_router, r['id']) # changing wildcard to specific tenant should be okay since its the @@ -139,7 +139,7 @@ class ExternalNetworksRBACTestJSON(base.BaseAdminNetworkTest): action='access_as_external', target_tenant=self.client2.tenant_id) r = self.client2.create_router( - data_utils.rand_name('router-'), + data_utils.rand_name('router'), external_gateway_info={'network_id': net['id']})['router'] self.addCleanup(self.admin_client.delete_router, r['id']) @@ -152,7 +152,7 @@ class ExternalNetworksRBACTestJSON(base.BaseAdminNetworkTest): action='access_as_external', target_tenant='*')['rbac_policy'] r = self.client2.create_router( - data_utils.rand_name('router-'), + data_utils.rand_name('router'), external_gateway_info={'network_id': net['id']})['router'] # delete should fail because the wildcard is required for the tenant's # access @@ -181,7 +181,7 @@ class ExternalNetworksRBACTestJSON(base.BaseAdminNetworkTest): # there are no policies allowing it with testtools.ExpectedException(lib_exc.NotFound): self.client2.create_router( - data_utils.rand_name('router-'), + data_utils.rand_name('router'), external_gateway_info={'network_id': net['id']}) @decorators.idempotent_id('7041cec7-d8fe-4c78-9b04-b51b2fd49dc9') diff --git a/neutron/tests/tempest/api/admin/test_floating_ips_admin_actions.py b/neutron/tests/tempest/api/admin/test_floating_ips_admin_actions.py index 18394756720..49d6fb8b6b7 100644 --- a/neutron/tests/tempest/api/admin/test_floating_ips_admin_actions.py +++ b/neutron/tests/tempest/api/admin/test_floating_ips_admin_actions.py @@ -36,7 +36,7 @@ class FloatingIPAdminTestJSON(base.BaseAdminNetworkTest): cls.alt_client = cls.os_alt.network_client cls.network = cls.create_network() cls.subnet = cls.create_subnet(cls.network) - cls.router = cls.create_router(data_utils.rand_name('router-'), + cls.router = cls.create_router(data_utils.rand_name('router'), external_network_id=cls.ext_net_id) cls.create_router_interface(cls.router['id'], cls.subnet['id']) cls.port = cls.create_port(cls.network) diff --git a/neutron/tests/tempest/api/admin/test_quotas_negative.py b/neutron/tests/tempest/api/admin/test_quotas_negative.py index 6ccce2d92a5..c6477993fa8 100644 --- a/neutron/tests/tempest/api/admin/test_quotas_negative.py +++ b/neutron/tests/tempest/api/admin/test_quotas_negative.py @@ -94,7 +94,7 @@ class QuotasAdminNegativeTestJSON(test_quotas.QuotasTestBase): new_quotas = {'router': 1} self._setup_quotas(tenant_id, **new_quotas) - name = data_utils.rand_name('test_router_') + name = data_utils.rand_name('test_router') router_args = {'tenant_id': tenant_id} router = self.admin_client.create_router( name, True, **router_args)['router'] diff --git a/neutron/tests/tempest/api/admin/test_shared_network_extension.py b/neutron/tests/tempest/api/admin/test_shared_network_extension.py index b35b10a46e8..1be327dc393 100644 --- a/neutron/tests/tempest/api/admin/test_shared_network_extension.py +++ b/neutron/tests/tempest/api/admin/test_shared_network_extension.py @@ -186,7 +186,7 @@ class RBACSharedNetworksTest(base.BaseAdminNetworkTest): def _make_admin_net_and_subnet_shared_to_tenant_id(self, tenant_id): net = self.admin_client.create_network( - name=data_utils.rand_name('test-network-'))['network'] + name=data_utils.rand_name('test-network'))['network'] self.addCleanup(self.admin_client.delete_network, net['id']) subnet = self.create_subnet(net, client=self.admin_client) # network is shared to first unprivileged client by default @@ -390,7 +390,7 @@ class RBACSharedNetworksTest(base.BaseAdminNetworkTest): max_policies = quota['rbac_policy'] self.assertGreater(max_policies, 0) net = self.client.create_network( - name=data_utils.rand_name('test-network-'))['network'] + name=data_utils.rand_name('test-network'))['network'] self.addCleanup(self.client.delete_network, net['id']) with testtools.ExpectedException(lib_exc.Conflict): for i in range(0, max_policies + 1): diff --git a/neutron/tests/tempest/api/test_floating_ips.py b/neutron/tests/tempest/api/test_floating_ips.py index 075e0e41da0..6831968c856 100644 --- a/neutron/tests/tempest/api/test_floating_ips.py +++ b/neutron/tests/tempest/api/test_floating_ips.py @@ -35,7 +35,7 @@ class FloatingIPTestJSON(base.BaseNetworkTest): # Create network, subnet, router and add interface cls.network = cls.create_network() cls.subnet = cls.create_subnet(cls.network) - cls.router = cls.create_router(data_utils.rand_name('router-'), + cls.router = cls.create_router(data_utils.rand_name('router'), external_network_id=cls.ext_net_id) cls.create_router_interface(cls.router['id'], cls.subnet['id']) cls.port = list() diff --git a/neutron/tests/tempest/api/test_metering_extensions.py b/neutron/tests/tempest/api/test_metering_extensions.py index 2d95072d9ad..0885cef6e71 100644 --- a/neutron/tests/tempest/api/test_metering_extensions.py +++ b/neutron/tests/tempest/api/test_metering_extensions.py @@ -72,7 +72,7 @@ class MeteringTestJSON(base.BaseAdminNetworkTest): @decorators.idempotent_id('ec8e15ff-95d0-433b-b8a6-b466bddb1e50') def test_create_delete_metering_label_with_filters(self): # Creates a label - name = data_utils.rand_name('metering-label-') + name = data_utils.rand_name('metering-label') description = "label created by tempest" body = self.admin_client.create_metering_label(name=name, description=description) diff --git a/neutron/tests/tempest/api/test_network_ip_availability.py b/neutron/tests/tempest/api/test_network_ip_availability.py index d5bf86785bb..bcec04b1ebf 100644 --- a/neutron/tests/tempest/api/test_network_ip_availability.py +++ b/neutron/tests/tempest/api/test_network_ip_availability.py @@ -111,7 +111,7 @@ class NetworksIpAvailabilityIPv4Test(NetworksIpAvailabilityTest): @decorators.idempotent_id('0f33cc8c-1bf6-47d1-9ce1-010618240599') def test_admin_network_availability_before_subnet(self): - net_name = data_utils.rand_name('network-') + net_name = data_utils.rand_name('network') network = self.create_network(network_name=net_name) self.addCleanup(self.client.delete_network, network['id']) net_availability = self.admin_client.list_network_ip_availabilities() @@ -119,7 +119,7 @@ class NetworksIpAvailabilityIPv4Test(NetworksIpAvailabilityTest): @decorators.idempotent_id('3aecd3b2-16ed-4b87-a54a-91d7b3c2986b') def test_net_ip_availability_after_subnet_and_ports(self): - net_name = data_utils.rand_name('network-') + 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) @@ -138,7 +138,7 @@ class NetworksIpAvailabilityIPv4Test(NetworksIpAvailabilityTest): @decorators.idempotent_id('9f11254d-757b-492e-b14b-f52144e4ee7b') def test_net_ip_availability_after_port_delete(self): - net_name = data_utils.rand_name('network-') + 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) diff --git a/neutron/tests/tempest/api/test_routers.py b/neutron/tests/tempest/api/test_routers.py index 9676673bfd1..a93a3bd66a7 100644 --- a/neutron/tests/tempest/api/test_routers.py +++ b/neutron/tests/tempest/api/test_routers.py @@ -108,7 +108,7 @@ class RoutersTest(base_routers.BaseRouterTest): @decorators.idempotent_id('b386c111-3b21-466d-880c-5e72b01e1a33') @tutils.requires_ext(extension='ext-gw-mode', service='network') def test_update_router_set_gateway_with_snat_explicit(self): - router = self._create_router(data_utils.rand_name('router-')) + router = self._create_router(data_utils.rand_name('router')) self.admin_client.update_router_with_snat_gw_info( router['id'], external_gateway_info={ @@ -123,7 +123,7 @@ class RoutersTest(base_routers.BaseRouterTest): @decorators.idempotent_id('96536bc7-8262-4fb2-9967-5c46940fa279') @tutils.requires_ext(extension='ext-gw-mode', service='network') def test_update_router_set_gateway_without_snat(self): - router = self._create_router(data_utils.rand_name('router-')) + router = self._create_router(data_utils.rand_name('router')) self.admin_client.update_router_with_snat_gw_info( router['id'], external_gateway_info={ @@ -139,7 +139,7 @@ class RoutersTest(base_routers.BaseRouterTest): @tutils.requires_ext(extension='ext-gw-mode', service='network') def test_update_router_reset_gateway_without_snat(self): router = self._create_router( - data_utils.rand_name('router-'), + data_utils.rand_name('router'), external_network_id=CONF.network.public_network_id) self.admin_client.update_router_with_snat_gw_info( router['id'], @@ -157,7 +157,7 @@ class RoutersTest(base_routers.BaseRouterTest): network = self.create_network() subnet = self.create_subnet(network) # Add router interface with subnet id - router = self._create_router(data_utils.rand_name('router-'), True) + router = self._create_router(data_utils.rand_name('router'), True) intf = self.create_router_interface(router['id'], subnet['id']) status_active = lambda: self.client.show_port( intf['port_id'])['port']['status'] == 'ACTIVE' diff --git a/neutron/tests/tempest/api/test_security_groups.py b/neutron/tests/tempest/api/test_security_groups.py index 5ff905db4b4..1d34a5ab0c9 100644 --- a/neutron/tests/tempest/api/test_security_groups.py +++ b/neutron/tests/tempest/api/test_security_groups.py @@ -34,7 +34,7 @@ class SecGroupTest(base.BaseSecGroupTest): secgroup_list.append(secgroup['id']) self.assertIn(group_create_body['security_group']['id'], secgroup_list) # Update the security group - new_name = data_utils.rand_name('security-') + new_name = data_utils.rand_name('security') new_description = data_utils.rand_name('security-description') update_body = self.client.update_security_group( group_create_body['security_group']['id'], diff --git a/neutron/tests/tempest/api/test_timestamp.py b/neutron/tests/tempest/api/test_timestamp.py index 24069225f32..35b505070be 100644 --- a/neutron/tests/tempest/api/test_timestamp.py +++ b/neutron/tests/tempest/api/test_timestamp.py @@ -42,7 +42,7 @@ class TestTimeStamp(base.BaseAdminNetworkTest): cls._subnetpool_data = {'min_prefixlen': '29', 'prefixes': prefixes} def _create_subnetpool(self, is_admin=False, **kwargs): - name = data_utils.rand_name('subnetpool-') + name = data_utils.rand_name('subnetpool') subnetpool_data = copy.deepcopy(self._subnetpool_data) for key in subnetpool_data.keys(): kwargs[key] = subnetpool_data[key] diff --git a/neutron/tests/tempest/api/test_trunk.py b/neutron/tests/tempest/api/test_trunk.py index 2b608581af6..fa490748d9d 100644 --- a/neutron/tests/tempest/api/test_trunk.py +++ b/neutron/tests/tempest/api/test_trunk.py @@ -228,7 +228,7 @@ class TrunkTestInheritJSONBase(TrunkTestJSONBase): def create_provider_network(self): foo_net = config.CONF.neutron_plugin_options.provider_vlans[0] - post_body = {'network_name': data_utils.rand_name('vlan-net-'), + post_body = {'network_name': data_utils.rand_name('vlan-net'), 'provider:network_type': 'vlan', 'provider:physical_network': foo_net} return self.create_shared_network(**post_body) @@ -276,11 +276,11 @@ class TrunkTestMtusJSONBase(TrunkTestJSONBase): super(TrunkTestMtusJSONBase, self).setUp() # VXLAN autocomputed MTU (1450) is smaller than that of GRE (1458) - vxlan_kwargs = {'network_name': data_utils.rand_name('vxlan-net-'), + vxlan_kwargs = {'network_name': data_utils.rand_name('vxlan-net'), 'provider:network_type': 'vxlan'} self.smaller_mtu_net = self.create_shared_network(**vxlan_kwargs) - gre_kwargs = {'network_name': data_utils.rand_name('gre-net-'), + gre_kwargs = {'network_name': data_utils.rand_name('gre-net'), 'provider:network_type': 'gre'} self.larger_mtu_net = self.create_shared_network(**gre_kwargs) diff --git a/neutron/tests/tempest/scenario/base.py b/neutron/tests/tempest/scenario/base.py index b27f04ad43a..e2436b94868 100644 --- a/neutron/tests/tempest/scenario/base.py +++ b/neutron/tests/tempest/scenario/base.py @@ -174,7 +174,7 @@ class BaseTempestTestCase(base_api.BaseNetworkTest): LOG.debug("Created subnet %s", self.subnet['id']) secgroup = self.os_primary.network_client.create_security_group( - name=data_utils.rand_name('secgroup-')) + name=data_utils.rand_name('secgroup')) LOG.debug("Created security group %s", secgroup['security_group']['name']) self.security_groups.append(secgroup['security_group']) diff --git a/neutron/tests/tempest/scenario/test_floatingip.py b/neutron/tests/tempest/scenario/test_floatingip.py index 41ece9a6d82..886168da9fe 100644 --- a/neutron/tests/tempest/scenario/test_floatingip.py +++ b/neutron/tests/tempest/scenario/test_floatingip.py @@ -47,7 +47,7 @@ class FloatingIpTestCasesMixin(object): cls.keypair = cls.create_keypair() cls.secgroup = cls.os_primary.network_client.create_security_group( - name=data_utils.rand_name('secgroup-'))['security_group'] + name=data_utils.rand_name('secgroup'))['security_group'] cls.security_groups.append(cls.secgroup) cls.create_loginable_secgroup_rule(secgroup_id=cls.secgroup['id']) cls.create_pingable_secgroup_rule(secgroup_id=cls.secgroup['id']) diff --git a/neutron/tests/tempest/scenario/test_trunk.py b/neutron/tests/tempest/scenario/test_trunk.py index a988ca8a8c7..74f78d2e98a 100644 --- a/neutron/tests/tempest/scenario/test_trunk.py +++ b/neutron/tests/tempest/scenario/test_trunk.py @@ -57,7 +57,7 @@ class TrunkTest(base.BaseTempestTestCase): cls.create_router_interface(router['id'], cls.subnet['id']) cls.keypair = cls.create_keypair() cls.secgroup = cls.os_primary.network_client.create_security_group( - name=data_utils.rand_name('secgroup-')) + name=data_utils.rand_name('secgroup')) cls.security_groups.append(cls.secgroup['security_group']) cls.create_loginable_secgroup_rule( secgroup_id=cls.secgroup['security_group']['id'])