From: David Garcia <david.garcia@canonical.com>
Date: Tue, 27 Jul 2021 13:07:42 +0000 (+0200)
Subject: Give a warning when removing a cloud that does not exist
X-Git-Tag: v9.1.4~1
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=227153dbd708538f04622a2c59722c2270b7bd5d;p=osm%2FN2VC.git

Give a warning when removing a cloud that does not exist

Fixes bug 1608

Change-Id: Ide9040f5e97ba07952062f23c9217e227af375d0
Signed-off-by: David Garcia <david.garcia@canonical.com>
---

diff --git a/n2vc/libjuju.py b/n2vc/libjuju.py
index dd37ec8..5c803ed 100644
--- a/n2vc/libjuju.py
+++ b/n2vc/libjuju.py
@@ -17,7 +17,7 @@ import logging
 
 import time
 
-from juju.errors import JujuAPIError
+import juju.errors
 from juju.model import Model
 from juju.machine import Machine
 from juju.application import Application
@@ -620,7 +620,7 @@ class Libjuju:
         db_dict: dict = None,
         progress_timeout: float = None,
         total_timeout: float = None,
-        **kwargs
+        **kwargs,
     ):
         """Execute action
 
@@ -793,7 +793,7 @@ class Libjuju:
         # Add relation
         try:
             await model.add_relation(endpoint_1, endpoint_2)
-        except JujuAPIError as e:
+        except juju.errors.JujuAPIError as e:
             if "not found" in e.message:
                 self.log.warning("Relation not found: {}".format(e.message))
                 return
@@ -1217,6 +1217,11 @@ class Libjuju:
         controller = await self.get_controller()
         try:
             await controller.remove_cloud(name)
+        except juju.errors.JujuError as e:
+            if len(e.errors) == 1 and f'cloud "{name}" not found' == e.errors[0]:
+                self.log.warning(f"Cloud {name} not found, so it could not be deleted.")
+            else:
+                raise e
         finally:
             await self.disconnect_controller(controller)