From 701200208081a7846f3bae3caffc247f6ee24be7 Mon Sep 17 00:00:00 2001 From: zhufl Date: Tue, 24 May 2016 17:12:49 +0800 Subject: [PATCH] Not to create security group when security_group ext is disabled When system's security_group ext is disabled(which can be shown by "neutron ext-list"), we can skip creating neutron security_group without skipping the whole testcase. Change-Id: Icbe9f2c394016aa1cad4d198303b5118d1580bed Closes-Bug: #1585104 --- tempest/scenario/test_network_advanced_server_ops.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tempest/scenario/test_network_advanced_server_ops.py b/tempest/scenario/test_network_advanced_server_ops.py index 4c2d31ba28..bfdb0c2b54 100644 --- a/tempest/scenario/test_network_advanced_server_ops.py +++ b/tempest/scenario/test_network_advanced_server_ops.py @@ -52,7 +52,10 @@ class TestNetworkAdvancedServerOps(manager.NetworkScenarioTest): def _setup_network_and_servers(self): keypair = self.create_keypair() - security_group = self._create_security_group() + security_groups = [] + if test.is_extension_enabled('security-group', 'network'): + security_group = self._create_security_group() + security_groups = [{'name': security_group['name']}] network, subnet, router = self.create_networks() public_network_id = CONF.network.public_network_id server_name = data_utils.rand_name('server-smoke') @@ -60,7 +63,7 @@ class TestNetworkAdvancedServerOps(manager.NetworkScenarioTest): name=server_name, networks=[{'uuid': network.id}], key_name=keypair['name'], - security_groups=[{'name': security_group['name']}], + security_groups=security_groups, wait_until='ACTIVE') floating_ip = self.create_floating_ip(server, public_network_id) # Verify that we can indeed connect to the server before we mess with