From 83e73e0e6f8e3c7a0bd438f8bebeb0ea08e53216 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Mon, 6 Nov 2017 13:22:52 +0900 Subject: [PATCH] test_security_groups: Randomize SG names To avoid conflicts with concurrent tests. Closes-Bug: #1730271 Change-Id: Id33dc37118f57a0dbbfbe5ee71d1c7a48eefeb3e --- .../tempest/scenario/test_security_groups.py | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/neutron/tests/tempest/scenario/test_security_groups.py b/neutron/tests/tempest/scenario/test_security_groups.py index 61e55fdc659..6b7d98a29a2 100644 --- a/neutron/tests/tempest/scenario/test_security_groups.py +++ b/neutron/tests/tempest/scenario/test_security_groups.py @@ -15,6 +15,7 @@ from neutron_lib import constants from tempest.common import waiters +from tempest.lib.common.utils import data_utils from tempest.lib import decorators from neutron.tests.tempest.common import ssh @@ -111,18 +112,20 @@ class NetworkDefaultSecGroupTest(base.BaseTempestTestCase): @decorators.idempotent_id('3d73ec1a-2ec6-45a9-b0f8-04a283d9d964') def test_two_sec_groups(self): # add 2 sec groups to VM and test rules of both are working + ssh_secgrp_name = data_utils.rand_name('ssh_secgrp') + icmp_secgrp_name = data_utils.rand_name('icmp_secgrp') ssh_secgrp = self.os_primary.network_client.create_security_group( - name='ssh_secgrp') + name=ssh_secgrp_name) self.create_loginable_secgroup_rule( secgroup_id=ssh_secgrp['security_group']['id']) icmp_secgrp = self.os_primary.network_client.create_security_group( - name='icmp_secgrp') + name=icmp_secgrp_name) self.create_pingable_secgroup_rule( secgroup_id=icmp_secgrp['security_group']['id']) for sec_grp in (ssh_secgrp, icmp_secgrp): self.security_groups.append(sec_grp['security_group']) - security_groups_list = [{'name': 'ssh_secgrp'}, - {'name': 'icmp_secgrp'}] + security_groups_list = [{'name': ssh_secgrp_name}, + {'name': icmp_secgrp_name}] server_ssh_clients, fips, servers = self.create_vm_testing_sec_grp( num_servers=1, security_groups=security_groups_list) # make sure ssh connectivity works @@ -165,10 +168,11 @@ class NetworkDefaultSecGroupTest(base.BaseTempestTestCase): @decorators.idempotent_id('3d73ec1a-2ec6-45a9-b0f8-04a283d9d664') def test_ip_prefix(self): # Add specific remote prefix to VMs and check connectivity - + ssh_secgrp_name = data_utils.rand_name('ssh_secgrp') + icmp_secgrp_name = data_utils.rand_name('icmp_secgrp_with_cidr') cidr = self.subnet['cidr'] ssh_secgrp = self.os_primary.network_client.create_security_group( - name='ssh_secgrp') + name=ssh_secgrp_name) self.create_loginable_secgroup_rule( secgroup_id=ssh_secgrp['security_group']['id']) @@ -176,13 +180,13 @@ class NetworkDefaultSecGroupTest(base.BaseTempestTestCase): 'direction': constants.INGRESS_DIRECTION, 'remote_ip_prefix': cidr}] icmp_secgrp = self.os_primary.network_client.create_security_group( - name='icmp_secgrp_with_cidr') + name=icmp_secgrp_name) self.create_secgroup_rules( rule_list, secgroup_id=icmp_secgrp['security_group']['id']) for sec_grp in (ssh_secgrp, icmp_secgrp): self.security_groups.append(sec_grp['security_group']) - security_groups_list = [{'name': 'ssh_secgrp'}, - {'name': 'icmp_secgrp_with_cidr'}] + security_groups_list = [{'name': ssh_secgrp_name}, + {'name': icmp_secgrp_name}] server_ssh_clients, fips, servers = self.create_vm_testing_sec_grp( security_groups=security_groups_list)