From: David Garcia <david.garcia@canonical.com>
Date: Mon, 6 Apr 2020 10:55:23 +0000 (+0200)
Subject: Fix bug 1049: Raise exception if model does not exist when destroying a model
X-Git-Tag: release-v8.0-start~20
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F60%2F8760%2F2;p=osm%2FN2VC.git

Fix bug 1049: Raise exception if model does not exist when destroying a model

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

diff --git a/n2vc/n2vc_juju_conn.py b/n2vc/n2vc_juju_conn.py
index dbd904c..0485e69 100644
--- a/n2vc/n2vc_juju_conn.py
+++ b/n2vc/n2vc_juju_conn.py
@@ -1288,6 +1288,12 @@ class N2VCJujuConnector(N2VCConnector):
             total_timeout = 3600
 
         model = await self._juju_get_model(model_name=model_name)
+
+        if not model:
+            raise N2VCException(
+                message="Model {} does not exist".format(model_name)
+            )
+
         uuid = model.info.uuid
 
         # destroy applications