Merge "Ensure not found exception is ignored when LB is not present" into stable/train

This commit is contained in:
Zuul 2019-12-11 12:19:50 +00:00 committed by Gerrit Code Review
commit cc166ae3d9
1 changed files with 2 additions and 2 deletions

View File

@ -761,7 +761,7 @@ class LBaaSv2Driver(base.LBaaSDriver):
for remaining in self._provisioning_timer(timeout, interval):
try:
lbaas.get_load_balancer(loadbalancer.id)
except o_exc.ResourceNotFound:
except o_exc.NotFoundException:
return
def _provisioning_timer(self, timeout,
@ -808,7 +808,7 @@ class LBaaSv2Driver(base.LBaaSDriver):
lbaas = clients.get_loadbalancer_client()
try:
response = lbaas.get_load_balancer(lb_uuid)
except o_exc.ResourceNotFound:
except o_exc.NotFoundException:
LOG.debug("Couldn't find loadbalancer with uuid=%s", lb_uuid)
return None