Browse Source

Merge "Make _get_router() non-private"

changes/68/779168/2
Zuul 1 year ago committed by Gerrit Code Review
parent
commit
a227e3a12e
  1. 6
      tempest/scenario/manager.py
  2. 2
      tempest/scenario/test_network_v6.py

6
tempest/scenario/manager.py

@ -1545,7 +1545,7 @@ class NetworkScenarioTest(ScenarioTest):
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.
If a public router has been configured, it will be returned.
@ -1624,8 +1624,8 @@ class NetworkScenarioTest(ScenarioTest):
project_id=project_id,
port_security_enabled=port_security_enabled,
**net_dict)
router = self._get_router(client=routers_client,
project_id=project_id)
router = self.get_router(client=routers_client,
project_id=project_id)
subnet_kwargs = dict(network=network,
subnets_client=subnets_client)
# use explicit check because empty list is a valid option

2
tempest/scenario/test_network_v6.py

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

Loading…
Cancel
Save