X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=n2vc%2Flibjuju.py;fp=n2vc%2Flibjuju.py;h=14e8467bb70dd0962030077033de727cc84ef305;hp=bca366577326e8132abb10dbbff88cabf01a1af4;hb=1608b5679d337a5a9c40499049e2eee9d12828ce;hpb=8070c3c8260010f052ee9fe546c85bed4aa6b2eb diff --git a/n2vc/libjuju.py b/n2vc/libjuju.py index bca3665..14e8467 100644 --- a/n2vc/libjuju.py +++ b/n2vc/libjuju.py @@ -1326,11 +1326,12 @@ class Libjuju: model = None try: if not await self.model_exists(model_name, controller=controller): + self.log.warn(f"Model {model_name} doesn't exist") return - self.log.debug("Destroying model {}".format(model_name)) - + self.log.debug(f"Getting model {model_name} to be destroyed") model = await self.get_model(controller, model_name) + self.log.debug(f"Destroying manual machines in model {model_name}") # Destroy machines that are manually provisioned # and still are in pending state await self._destroy_pending_machines(model, only_manual=True) @@ -1343,7 +1344,11 @@ class Libjuju: ) except Exception as e: if not await self.model_exists(model_name, controller=controller): + self.log.warn( + f"Failed deleting model {model_name}: model doesn't exist" + ) return + self.log.warn(f"Failed deleting model {model_name}: {e}") raise e finally: if model: @@ -1360,6 +1365,7 @@ class Libjuju: :param: controller: Controller object :param: timeout: Timeout in seconds """ + self.log.debug(f"Destroying model {model_name}") async def _destroy_model_loop(model_name: str, controller: Controller): while await self.model_exists(model_name, controller=controller):