openstack/tempest
Code Issues Proposed changes

Merge "Make _get_server_port_id_and_ip4() non-private"

Browse Source
This commit is contained in:
Zuul 2021-03-09 01:10:17 +00:00 committed by Gerrit Code Review
commit 218c2f258f
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

@ -1189,7 +1189,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
@ -1242,7 +1242,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
@ -1270,7 +1270,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']

2
tempest/scenario/test_network_basic_ops.py
View File

@ -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'])