From: David Garcia Date: Wed, 8 Jun 2022 09:16:54 +0000 (+0200) Subject: Fix bug 2062: Ignore "model not found" exception when deleting models X-Git-Tag: v10.1.2~6 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F80%2F12180%2F1;p=osm%2FN2VC.git Fix bug 2062: Ignore "model not found" exception when deleting models Change-Id: Ife06b41bf2bcf32b080b405e607450d9303d19e0 Signed-off-by: David Garcia --- diff --git a/n2vc/libjuju.py b/n2vc/libjuju.py index 355a51e..5e4bef3 100644 --- a/n2vc/libjuju.py +++ b/n2vc/libjuju.py @@ -1254,14 +1254,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(