openstack
/
tempest
Code Issues Proposed changes

Merge "Make _get_router() non-private"

This commit is contained in:
Zuul 2021-03-09 00:46:29 +00:00 committed by Gerrit Code Review
parent d9021ee302 73555df4dc
commit a227e3a12e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tempest/scenario/manager.py
View File

@ -1545,7 +1545,7 @@ class NetworkScenarioTest(ScenarioTest):
return rules return rules
def _get_router(self, client=None, project_id=None, **kwargs): def get_router(self, client=None, project_id=None, **kwargs):
"""Retrieve a router for the given tenant id. """Retrieve a router for the given tenant id.
If a public router has been configured, it will be returned. If a public router has been configured, it will be returned.
@ -1624,8 +1624,8 @@ class NetworkScenarioTest(ScenarioTest):
project_id=project_id, project_id=project_id,
port_security_enabled=port_security_enabled, port_security_enabled=port_security_enabled,
**net_dict) **net_dict)
router = self._get_router(client=routers_client, router = self.get_router(client=routers_client,
project_id=project_id) project_id=project_id)
subnet_kwargs = dict(network=network, subnet_kwargs = dict(network=network,
subnets_client=subnets_client) subnets_client=subnets_client)
# use explicit check because empty list is a valid option # use explicit check because empty list is a valid option

2
tempest/scenario/test_network_v6.py
View File

@ -85,7 +85,7 @@ class TestGettingAddress(manager.NetworkScenarioTest):
namestart='sub4', namestart='sub4',
ip_version=4) ip_version=4)
router = self._get_router() router = self.get_router()
self.routers_client.add_router_interface(router['id'], self.routers_client.add_router_interface(router['id'],
subnet_id=sub4['id']) subnet_id=sub4['id'])