From 6d46466c27874245ad03fde6c22e7607b1ba4cb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dulko?= Date: Thu, 6 Feb 2020 10:09:48 +0100 Subject: [PATCH] Revert "Ensure namespace network resources are deleted even on subnet not found" This reverts commit 7691e94ef3327e185d0157f83b9e75f9ef555346. The 0.41.0 version of openstacksdk is free of this issue. Also we still need to keep the handle_neutron_errors for support of older openstacksdks. Change-Id: I5bffda72cc8f1e348581ef38cb68cb8336e2af59 --- .../controller/drivers/namespace_subnet.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/kuryr_kubernetes/controller/drivers/namespace_subnet.py b/kuryr_kubernetes/controller/drivers/namespace_subnet.py index 9217f8f29..0e7399082 100644 --- a/kuryr_kubernetes/controller/drivers/namespace_subnet.py +++ b/kuryr_kubernetes/controller/drivers/namespace_subnet.py @@ -102,17 +102,11 @@ class NamespacePodSubnetDriver(default_subnet.DefaultPodSubnetDriver): # or subnet is already detached. LOG.debug(e.message) pass - except os_exc.SDKException as e: - # FIXME(maysams): Rely only on the NotFoundException handling - # when the bug fixed at 704998 is merged. - if "could not be found" in str(e.message): - LOG.debug(e.message) - else: - LOG.exception( - "Error deleting subnet %(subnet)s from router " - "%(router)s.", {'subnet': subnet_id, 'router': - router_id}) - raise + except os_exc.SDKException: + LOG.exception("Error deleting subnet %(subnet)s from router " + "%(router)s.", + {'subnet': subnet_id, 'router': router_id}) + raise try: os_net.delete_network(net_id)