X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=n2vc%2Flibjuju.py;h=7492acc87166921f2de553a454da5237f4cb373b;hp=4ee0abfe09573a932a0ffa6d149635d51f73b24f;hb=1cfed49811309ce587c2b034be690bc352065e81;hpb=f2e3383b1d6e7b10bb242a8dfc2149a96e234b6b 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(