Merge "Make _get_router() non-private"
This commit is contained in:
commit
a227e3a12e
|
@ -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,7 +1624,7 @@ class NetworkScenarioTest(ScenarioTest):
|
|||
project_id=project_id,
|
||||
port_security_enabled=port_security_enabled,
|
||||
**net_dict)
|
||||
router = self._get_router(client=routers_client,
|
||||
router = self.get_router(client=routers_client,
|
||||
project_id=project_id)
|
||||
subnet_kwargs = dict(network=network,
|
||||
subnets_client=subnets_client)
|
||||
|
|
|
@ -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…
Reference in New Issue