openstack/tempest
Code Issues Proposed changes

Merge "Make _create_empty_security_group() non-private"

Browse Source
This commit is contained in:
Zuul
2021-03-09 01:03:20 +00:00
committed by Gerrit Code Review
parent a227e3a12e 086020946f
commit b34b6bc684
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tempest/scenario/manager.py
View File

@ -1396,7 +1396,7 @@ class NetworkScenarioTest(ScenarioTest):
security_groups_client = self.security_groups_client
if project_id is None:
project_id = security_groups_client.project_id
secgroup = self._create_empty_security_group(
secgroup = self.create_empty_security_group(
namestart=namestart, client=security_groups_client,
project_id=project_id)
@ -1410,8 +1410,8 @@ class NetworkScenarioTest(ScenarioTest):
self.assertEqual(secgroup['id'], rule['security_group_id'])
return secgroup
def _create_empty_security_group(self, client=None, project_id=None,
namestart='secgroup-smoke'):
def create_empty_security_group(self, client=None, project_id=None,
namestart='secgroup-smoke'):
"""Create a security group without rules.
Default rules will be created:

6
tempest/scenario/test_security_groups_basic_ops.py
View File

@ -197,14 +197,14 @@ class TestSecurityGroupsBasicOps(manager.NetworkScenarioTest):
tenant.keypair = keypair
def _create_tenant_security_groups(self, tenant):
access_sg = self._create_empty_security_group(
access_sg = self.create_empty_security_group(
namestart='secgroup_access-',
project_id=tenant.creds.project_id,
client=tenant.manager.security_groups_client
)
# don't use default secgroup since it allows in-project traffic
def_sg = self._create_empty_security_group(
def_sg = self.create_empty_security_group(
namestart='secgroup_general-',
project_id=tenant.creds.project_id,
client=tenant.manager.security_groups_client
@ -534,7 +534,7 @@ class TestSecurityGroupsBasicOps(manager.NetworkScenarioTest):
new_tenant = self.primary_tenant
# Create empty security group and add icmp rule in it
new_sg = self._create_empty_security_group(
new_sg = self.create_empty_security_group(
namestart='secgroup_new-',
project_id=new_tenant.creds.project_id,
client=new_tenant.manager.security_groups_client)