openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Merge "Ensure not found exception is ignored when LB is not present"

This commit is contained in:
Zuul 2019-11-22 19:37:27 +00:00 committed by Gerrit Code Review
parent 0f3dac9322 2449917831
commit 1f92361b58
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kuryr_kubernetes/controller/drivers/lbaasv2.py
View File

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