From 1cfed49811309ce587c2b034be690bc352065e81 Mon Sep 17 00:00:00 2001 From: David Garcia Date: Wed, 8 Jun 2022 11:16:54 +0200 Subject: [PATCH] Fix bug 2060: Ignore "model not found" exception when deleting models Change-Id: Ife06b41bf2bcf32b080b405e607450d9303d19e0 Signed-off-by: David Garcia --- n2vc/libjuju.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/n2vc/libjuju.py b/n2vc/libjuju.py index 4ee0abf..7492acc 100644 --- a/n2vc/libjuju.py +++ b/n2vc/libjuju.py @@ -1422,14 +1422,17 @@ class Libjuju: self.log.info(f"Model {model_name} deleted forcefully") try: - await asyncio.wait_for( - _destroy_model_gracefully(model_name, controller), timeout=120 - ) - except asyncio.TimeoutError: - await _destroy_model_forcefully(model_name, controller) + try: + await asyncio.wait_for( + _destroy_model_gracefully(model_name, controller), timeout=120 + ) + except asyncio.TimeoutError: + await _destroy_model_forcefully(model_name, controller) except juju.errors.JujuError as e: if any("has been removed" in error for error in e.errors): return + if any("model not found" in error for error in e.errors): + return raise e async def destroy_application( -- 2.25.1