Minor improvements

[osm/N2VC.git] / juju / unit.py

diff --git a/juju/unit.py b/juju/unit.py
index d0a70bd..ab9d1d0 100644 (file)
--- a/juju/unit.py
+++ b/juju/unit.py
@@ -1,5 +1,6 @@
 import logging
-from datetime import datetime
+
+from dateutil.parser import parse as parse_date
 
 from . import model
 from .client import client
@@ -13,48 +14,42 @@ class Unit(model.ModelEntity):
         """Returns the current agent status string.
 
         """
-        return self.data['agent-status']['current']
+        return self.safe_data['agent-status']['current']
 
     @property
     def agent_status_since(self):
         """Get the time when the `agent_status` was last updated.
 
         """
-        since = self.data['agent-status']['since']
-        # Juju gives us nanoseconds, but Python only supports microseconds
-        since = since[:26]
-        return datetime.strptime(since, "%Y-%m-%dT%H:%M:%S.%f")
+        return parse_date(self.safe_data['agent-status']['since'])
 
     @property
     def agent_status_message(self):
         """Get the agent status message.
 
         """
-        return self.data['agent-status']['message']
+        return self.safe_data['agent-status']['message']
 
     @property
     def workload_status(self):
         """Returns the current workload status string.
 
         """
-        return self.data['workload-status']['current']
+        return self.safe_data['workload-status']['current']
 
     @property
     def workload_status_since(self):
         """Get the time when the `workload_status` was last updated.
 
         """
-        since = self.data['workload-status']['since']
-        # Juju gives us nanoseconds, but Python only supports microseconds
-        since = since[:26]
-        return datetime.strptime(since, "%Y-%m-%dT%H:%M:%S.%f")
+        return parse_date(self.safe_data['workload-status']['since'])
 
     @property
     def workload_status_message(self):
         """Get the workload status message.
 
         """
-        return self.data['workload-status']['message']
+        return self.safe_data['workload-status']['message']
 
     @property
     def tag(self):
@@ -161,9 +156,9 @@ class Unit(model.ModelEntity):
             raise Exception('Unknown action error: %s' % error.serialize())
         action_id = action.tag[len('action-'):]
         log.debug('Action started as %s', action_id)
-        # we can't use wait_for_new here because we don't
-        # consistently (ever?) get an "add" delta for the action
-        return await self.model._wait('action', action_id, None)
+        # we mustn't use wait_for_action because that blocks until the
+        # action is complete, rather than just being in the model
+        return await self.model._wait_for_new('action', action_id)
 
     def scp(
             self, source_path, user=None, destination_path=None, proxy=False,
@@ -227,5 +222,24 @@ class Unit(model.ModelEntity):
 
         status = await c.FullStatus(None)
 
-        return status.applications[app]['units'][self.name].get(
-            'leader', False)
+        # FullStatus may be more up to date than our model, and the
+        # unit may have gone away, or we may be doing something silly,
+        # like trying to fetch leadership for a subordinate, which
+        # will not be filed where we expect in the model. In those
+        # cases, we may simply return False, as a nonexistent or
+        # subordinate unit is not a leader.
+        if not status.applications.get(app):
+            return False
+
+        if not status.applications[app].get('units'):
+            return False
+
+        if not status.applications[app]['units'].get(self.name):
+            return False
+
+        return status.applications[app]['units'][self.name].get('leader',
+                                                                False)
+
+    async def get_metrics(self):
+        metrics = await self.model.get_metrics(self.tag)
+        return metrics[self.name]