commit bd5a0c9bcbcd078a2c914f77671d23d4e2afca98
author quilesj <e.nvi001.tid@telefonica.com> Wed Jan 15 12:30:09 2020 +0000
committer quilesj <e.nvi001.tid@telefonica.com> Wed Jan 22 12:23:34 2020 +0000
tree 2654b69ec28ebff2b0763e25dd313620b1d23cce
parent 7ac3f38c67105b94505496b5e321410e8e09fa4e

Destroy machines before destroying the model

Change-Id: If42c99ac9ec88a492d89a201f12a93872a476783
Signed-off-by: quilesj <e.nvi001.tid@telefonica.com>

n2vc/n2vc_juju_conn.py

diff --git a/n2vc/n2vc_juju_conn.py b/n2vc/n2vc_juju_conn.py
index cf865a8..00b1bc1 100644
--- a/n2vc/n2vc_juju_conn.py
+++ b/n2vc/n2vc_juju_conn.py
@@ -1240,6 +1240,15 @@
         model = await self._juju_get_model(model_name=model_name)
         uuid = model.info.uuid
 
+        # destroy machines
+        machines = await model.get_machines()
+        for machine_id in machines:
+            try:
+                await self._juju_destroy_machine(model_name=model_name, machine_id=machine_id)
+            except Exception as e:
+                # ignore exceptions destroying machine
+                pass
+
         await self._juju_disconnect_model(model_name=model_name)
         self.juju_models[model_name] = None
         self.juju_observers[model_name] = None