From: David Garcia Date: Tue, 3 May 2022 10:23:59 +0000 (+0200) Subject: Skip exception if model doesn't exist after delete failure X-Git-Tag: v10.1.1-rc1~6 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=5c9bb3a591c5f9fb48e491ae4afc3994ce2718dc;p=osm%2FN2VC.git Skip exception if model doesn't exist after delete failure - bug: 2018 Change-Id: I9d118602c747840a4a32fd670c8724c82c1ee094 Signed-off-by: David Garcia (cherry picked from commit 5c96662b238a20ecc7c516269a0b051e3b0333eb) --- diff --git a/n2vc/libjuju.py b/n2vc/libjuju.py index 6bc9be7..a5b4d7e 100644 --- a/n2vc/libjuju.py +++ b/n2vc/libjuju.py @@ -1179,6 +1179,10 @@ class Libjuju: controller, timeout=total_timeout, ) + except Exception as e: + if not await self.model_exists(model_name, controller=controller): + return + raise e finally: if model: await self.disconnect_model(model)