X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=n2vc%2Flibjuju.py;fp=n2vc%2Flibjuju.py;h=5e4bef350cf8b6ec77b4bf9302a65a5dd44d3ddb;hp=355a51ec35585d8edf0a2817447deff1e13a9c40;hb=fc98b747173036fff750747a33c0979ac474a63f;hpb=81a934e0b3d778de49ea48a8b0310f0052be821d 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(