From 73555df4dca1e13119f7c012e4596b3644381612 Mon Sep 17 00:00:00 2001 From: Soniya Vyas Date: Thu, 4 Mar 2021 19:05:42 +0530 Subject: [PATCH] Make _get_router() non-private _get_router() is made public by this commit as the tempest.scenario.manager interface is meant to be consumed by tempest plugins. Implements: blueprint tempest-scenario-manager-stable Signed-off by: Soniya Vyas Change-Id: I53e894edb6b44c25923f6075e5c6f6d4268a63f4 --- tempest/scenario/manager.py | 6 +++--- tempest/scenario/test_network_v6.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py index 81bbc38977..69488a1865 100644 --- a/tempest/scenario/manager.py +++ b/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 diff --git a/tempest/scenario/test_network_v6.py b/tempest/scenario/test_network_v6.py index 9323628542..a8fe20fd16 100644 --- a/tempest/scenario/test_network_v6.py +++ b/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'])