From: calvinosanch <guillermo.calvinosanchez@altran.com>
Date: Fri, 21 Feb 2020 08:25:21 +0000 (+0100)
Subject: Fix machine deletion when delete execution environment
X-Git-Tag: release-v8.0-start~27
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F27%2F8627%2F3;p=osm%2FN2VC.git

Fix machine deletion when delete execution environment

Change-Id: If389f267e996af3b93ef0ba59444733ab4c7ed7e
Signed-off-by: calvinosanch <guillermo.calvinosanchez@altran.com>
---

diff --git a/n2vc/n2vc_juju_conn.py b/n2vc/n2vc_juju_conn.py
index e0f1824..995f0cb 100644
--- a/n2vc/n2vc_juju_conn.py
+++ b/n2vc/n2vc_juju_conn.py
@@ -585,15 +585,15 @@ class N2VCJujuConnector(N2VCConnector):
                                 .format(ee_id, application_name, e))
 
         # destroy the machine
-        try:
-            await self._juju_destroy_machine(
-                model_name=model_name,
-                machine_id=machine_id,
-                total_timeout=total_timeout
-            )
-        except Exception as e:
-            raise N2VCException(message='Error deleting execution environment {} (machine {}) : {}'
-                                .format(ee_id, machine_id, e))
+        # try: 
+        #     await self._juju_destroy_machine(
+        #         model_name=model_name,
+        #         machine_id=machine_id,
+        #         total_timeout=total_timeout
+        #     )
+        # except Exception as e:
+        #     raise N2VCException(message='Error deleting execution environment {} (machine {}) : {}'
+        #                         .format(ee_id, machine_id, e))
 
         self.info('Execution environment {} deleted'.format(ee_id))
 
@@ -1223,9 +1223,11 @@ class N2VCJujuConnector(N2VCConnector):
 
         # get juju model and observer
         model = await self._juju_get_model(model_name=model_name)
+        observer = self.juju_observers[model_name]
 
         application = model.applications.get(application_name)
         if application:
+            observer.unregister_application(application_name)
             await application.destroy()
         else:
             self.debug('Application not found: {}'.format(application_name))
@@ -1244,10 +1246,12 @@ class N2VCJujuConnector(N2VCConnector):
 
         # get juju model and observer
         model = await self._juju_get_model(model_name=model_name)
+        observer = self.juju_observers[model_name]
 
         machines = await model.get_machines()
         if machine_id in machines:
             machine = model.machines[machine_id]
+            observer.unregister_machine(machine_id)
             await machine.destroy(force=True)
             # max timeout
             end = time.time() + total_timeout