Merge "Make _create_loginable_secgroup_rule non-private"

This commit is contained in:
Zuul 2021-02-10 13:54:20 +00:00 committed by Gerrit Code Review
commit f4ddd6f8be
2 changed files with 12 additions and 6 deletions

View File

@ -0,0 +1,6 @@
---
features:
- |
Added public interface create_loginable_secgroup_rule().
Since this interface is meant to be used by tempest plugins,
It doesn't neccessarily require to be private api.

View File

@ -535,7 +535,7 @@ class ScenarioTest(tempest.test.BaseTestCase):
self.addCleanup(self._cleanup_volume_type, volume_type) self.addCleanup(self._cleanup_volume_type, volume_type)
return volume_type return volume_type
def _create_loginable_secgroup_rule(self, secgroup_id=None, rulesets=None): def create_loginable_secgroup_rule(self, secgroup_id=None, rulesets=None):
"""Create loginable security group rule by compute clients. """Create loginable security group rule by compute clients.
This function will create by default the following rules: This function will create by default the following rules:
@ -595,7 +595,7 @@ class ScenarioTest(tempest.test.BaseTestCase):
secgroup['id']) secgroup['id'])
# Add rules to the security group # Add rules to the security group
self._create_loginable_secgroup_rule(secgroup['id']) self.create_loginable_secgroup_rule(secgroup['id'])
return secgroup return secgroup
def get_remote_client(self, ip_address, username=None, private_key=None, def get_remote_client(self, ip_address, username=None, private_key=None,
@ -1366,7 +1366,7 @@ class NetworkScenarioTest(ScenarioTest):
project_id=project_id) project_id=project_id)
# Add rules to the security group # Add rules to the security group
rules = self._create_loginable_secgroup_rule( rules = self.create_loginable_secgroup_rule(
security_group_rules_client=security_group_rules_client, security_group_rules_client=security_group_rules_client,
secgroup=secgroup, secgroup=secgroup,
security_groups_client=security_groups_client) security_groups_client=security_groups_client)
@ -1455,9 +1455,9 @@ class NetworkScenarioTest(ScenarioTest):
return sg_rule return sg_rule
def _create_loginable_secgroup_rule(self, security_group_rules_client=None, def create_loginable_secgroup_rule(self, security_group_rules_client=None,
secgroup=None, secgroup=None,
security_groups_client=None): security_groups_client=None):
"""Create loginable security group rule by neutron clients by default. """Create loginable security group rule by neutron clients by default.
This function will create: This function will create: