Merge "Fix check_floating_ip_status utility's output"

This commit is contained in:
Zuul 2020-05-28 14:39:09 +00:00 committed by Gerrit Code Review
commit 232744fcc2
1 changed files with 6 additions and 5 deletions

View File

@ -1038,9 +1038,12 @@ class NetworkScenarioTest(ScenarioTest):
floatingip_id = floating_ip['id']
def refresh():
result = (self.floating_ips_client.
show_floatingip(floatingip_id)['floatingip'])
return status == result['status']
floating_ip = (self.floating_ips_client.
show_floatingip(floatingip_id)['floatingip'])
if status == floating_ip['status']:
LOG.info("FloatingIP: {fp} is at status: {st}"
.format(fp=floating_ip, st=status))
return status == floating_ip['status']
if not test_utils.call_until_true(refresh,
CONF.network.build_timeout,
@ -1052,8 +1055,6 @@ class NetworkScenarioTest(ScenarioTest):
"failed to reach status: {st}"
.format(fp=floating_ip, cst=floating_ip['status'],
st=status))
LOG.info("FloatingIP: {fp} is at status: {st}"
.format(fp=floating_ip, st=status))
def check_tenant_network_connectivity(self, server,
username,