openstack/tempest
Code Issues Proposed changes

Merge "Not to create security group when security_group ext is disabled"

Browse Source
This commit is contained in:
Jenkins
2016-06-09 20:50:59 +00:00
committed by Gerrit Code Review
parent cfdea698ff 7012002080
commit 2da9c901ca
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tempest/scenario/test_network_advanced_server_ops.py
View File

@@ -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