Skip exception if model doesn't exist after delete failure 96/11996/2
authorDavid Garcia <david.garcia@canonical.com>
Tue, 3 May 2022 10:23:59 +0000 (12:23 +0200)
committerDavid Garcia <david.garcia@canonical.com>
Tue, 3 May 2022 10:26:01 +0000 (12:26 +0200)
- bug: 2016
Change-Id: I9d118602c747840a4a32fd670c8724c82c1ee094
Signed-off-by: David Garcia <david.garcia@canonical.com>
n2vc/libjuju.py

index 1fade62..bca3665 100644 (file)
@@ -1341,6 +1341,10 @@ class Libjuju:
                 controller,
                 timeout=total_timeout,
             )
                 controller,
                 timeout=total_timeout,
             )
+        except Exception as e:
+            if not await self.model_exists(model_name, controller=controller):
+                return
+            raise e
         finally:
             if model:
                 await self.disconnect_model(model)
         finally:
             if model:
                 await self.disconnect_model(model)