Fix bug 1018

- Only destroy manually provisioned machines
- Fix in the observer: check if entity is not dead
- Destroy applications

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

diff --git a/n2vc/juju_observer.py b/n2vc/juju_observer.py
index 10efa98..e2f0470 100644 (file)
--- a/n2vc/juju_observer.py
+++ b/n2vc/juju_observer.py
@@ -258,13 +258,14 @@ class JujuModelObserver(ModelObserver):
                 return
 
             # write change in database
                 return
 
             # write change in database

-            await self.n2vc.write_app_status_to_db(
-                db_dict=self.applications[application_id].db_dict,
-                status=juju_status_2_osm_status(delta.entity, new.workload_status),
-                detailed_status=new.workload_status_message,
-                vca_status=new.workload_status,
-                entity_type='unit'
-            )
+            if not new.dead:
+                await self.n2vc.write_app_status_to_db(
+                    db_dict=self.applications[application_id].db_dict,
+                    status=juju_status_2_osm_status(delta.entity, new.workload_status),
+                    detailed_status=new.workload_status_message,
+                    vca_status=new.workload_status,
+                    entity_type='unit'
+                )

 
             # set event for this application
             self.applications[application_id].event.set()
 
             # set event for this application
             self.applications[application_id].event.set()

diff --git a/n2vc/n2vc_juju_conn.py b/n2vc/n2vc_juju_conn.py
index 9230e6d..dbd904c 100644 (file)
--- a/n2vc/n2vc_juju_conn.py
+++ b/n2vc/n2vc_juju_conn.py
@@ -1257,16 +1257,22 @@ class N2VCJujuConnector(N2VCConnector):
         if machine_id in machines:
             machine = model.machines[machine_id]
             observer.unregister_machine(machine_id)
         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
-            # wait for machine removal
-            machines = await model.get_machines()
-            while machine_id in machines and time.time() < end:
-                self.log.debug('Waiting for machine {} is destroyed'.format(machine_id))
-                await asyncio.sleep(0.5)
+            # TODO: change this by machine.is_manual when this is upstreamed: https://github.com/juju/python-libjuju/pull/396
+            if "instance-id" in machine.safe_data and machine.safe_data[
+                "instance-id"
+            ].startswith("manual:"):
+                self.log.debug("machine.destroy(force=True) started.")
+                await machine.destroy(force=True)
+                self.log.debug("machine.destroy(force=True) passed.")
+                # max timeout
+                end = time.time() + total_timeout
+                # wait for machine removal

                 machines = await model.get_machines()
                 machines = await model.get_machines()

-            self.log.debug('Machine destroyed: {}'.format(machine_id))
+                while machine_id in machines and time.time() < end:
+                    self.log.debug("Waiting for machine {} is destroyed".format(machine_id))
+                    await asyncio.sleep(0.5)
+                    machines = await model.get_machines()
+                self.log.debug("Machine destroyed: {}".format(machine_id))

         else:
             self.log.debug('Machine not found: {}'.format(machine_id))
 
         else:
             self.log.debug('Machine not found: {}'.format(machine_id))
 


@@ -1284,6 +1290,19 @@ class N2VCJujuConnector(N2VCConnector):
         model = await self._juju_get_model(model_name=model_name)
         uuid = model.info.uuid
 
         model = await self._juju_get_model(model_name=model_name)
         uuid = model.info.uuid
 

+        # destroy applications
+        for application_name in model.applications:
+            try:
+                await self._juju_destroy_application(model_name=model_name, application_name=application_name)
+            except Exception as e:
+                self.log.error(
+                    "Error destroying application {} in model {}: {}".format(
+                        application_name,
+                        model_name,
+                        e
+                    )
+                )
+

         # destroy machines
         machines = await model.get_machines()
         for machine_id in machines:
         # destroy machines
         machines = await model.get_machines()
         for machine_id in machines:


@@ -1294,8 +1313,6 @@ class N2VCJujuConnector(N2VCConnector):
                 pass
 
         await self._juju_disconnect_model(model_name=model_name)
                 pass
 
         await self._juju_disconnect_model(model_name=model_name)

-        self.juju_models[model_name] = None
-        self.juju_observers[model_name] = None

 
         self.log.debug('destroying model {}...'.format(model_name))
         await self.controller.destroy_model(uuid)
 
         self.log.debug('destroying model {}...'.format(model_name))
         await self.controller.destroy_model(uuid)