Merge "Fix the TypeError exception in 'get_service_ip' function"

This commit is contained in:
Zuul 2018-07-22 11:21:21 +00:00 committed by Gerrit Code Review
commit 719aa0d68f
1 changed files with 6 additions and 5 deletions

View File

@ -215,13 +215,14 @@ class BaseKuryrScenarioTest(manager.NetworkScenarioTest):
["ip_addr"])
except KeyError:
LOG.info("Waiting till LB's IP appears in annotation "
"(ingress.ip=%s)"
% service.status.load_balancer.ingress[0].ip)
"(ingress.ip=%s)",
service.status.load_balancer.ingress[0].ip)
continue
if ann_lb_ip != service.status.load_balancer.ingress[0].ip:
LOG.warning('Annotated pub_ip(%s) != ingress.ip(%s).'
% ann_lb_ip,
service.status.load_balancer.ingress[0].ip)
LOG.warning(
'Annotated pub_ip(%s) != ingress.ip(%s).',
ann_lb_ip,
service.status.load_balancer.ingress[0].ip)
return ann_lb_ip
return service.status.load_balancer.ingress[0].ip
elif spec_type == "ClusterIP":