From a446d703c865af3311b1213c85f45dc8e5c4ad04 Mon Sep 17 00:00:00 2001 From: Soniya Vyas Date: Tue, 23 Feb 2021 15:58:53 +0530 Subject: [PATCH] Make _get_server_port_id_and_ip4() non-private _get_server_port_id_and_ip4() 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: I25bf66fff0892a87face97660127e92479ef8100 --- tempest/scenario/manager.py | 6 +++--- tempest/scenario/test_network_basic_ops.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py index 99a3f327c3..c8508b0788 100644 --- a/tempest/scenario/manager.py +++ b/tempest/scenario/manager.py @@ -1164,7 +1164,7 @@ class NetworkScenarioTest(ScenarioTest): return subnet - def _get_server_port_id_and_ip4(self, server, ip_addr=None, **kwargs): + def get_server_port_id_and_ip4(self, server, ip_addr=None, **kwargs): if ip_addr and not kwargs.get('fixed_ips'): kwargs['fixed_ips'] = 'ip_address=%s' % ip_addr @@ -1217,7 +1217,7 @@ class NetworkScenarioTest(ScenarioTest): if not client: client = self.floating_ips_client if not port_id: - port_id, ip4 = self._get_server_port_id_and_ip4(server) + port_id, ip4 = self.get_server_port_id_and_ip4(server) else: ip4 = None @@ -1245,7 +1245,7 @@ class NetworkScenarioTest(ScenarioTest): This wrapper utility attaches the floating_ip for the respective port_id of server """ - port_id, _ = self._get_server_port_id_and_ip4(server) + port_id, _ = self.get_server_port_id_and_ip4(server) kwargs = dict(port_id=port_id) floating_ip = self.floating_ips_client.update_floatingip( floating_ip['id'], **kwargs)['floatingip'] diff --git a/tempest/scenario/test_network_basic_ops.py b/tempest/scenario/test_network_basic_ops.py index 6c1b3fa83a..bd58da232a 100644 --- a/tempest/scenario/test_network_basic_ops.py +++ b/tempest/scenario/test_network_basic_ops.py @@ -223,7 +223,7 @@ class TestNetworkBasicOps(manager.NetworkScenarioTest): floating_ip, server = self.floating_ip_tuple # create a new server for the floating ip server = self._create_server(self.network) - port_id, _ = self._get_server_port_id_and_ip4(server) + port_id, _ = self.get_server_port_id_and_ip4(server) floating_ip = self.floating_ips_client.update_floatingip( floating_ip['id'], port_id=port_id)['floatingip'] self.assertEqual(port_id, floating_ip['port_id'])