Added observer + callback for unit.run.

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

diff --git a/juju/unit.py b/juju/unit.py
index 78acaff..6a853c2 100644 (file)
--- a/juju/unit.py
+++ b/juju/unit.py
@@ -1,4 +1,6 @@
+import asyncio
 import logging
+from datetime import datetime
 
 from . import model
 from .client import client
@@ -7,6 +9,54 @@ log = logging.getLogger(__name__)
 
 
 class Unit(model.ModelEntity):
+    @property
+    def agent_status(self):
+        """Returns the current agent status string.
+
+        """
+        return self.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")
+
+    @property
+    def agent_status_message(self):
+        """Get the agent status message.
+
+        """
+        return self.data['agent-status']['message']
+
+    @property
+    def workload_status(self):
+        """Returns the current workload status string.
+
+        """
+        return self.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")
+
+    @property
+    def workload_status_message(self):
+        """Get the workload status message.
+
+        """
+        return self.data['workload-status']['message']
+
     def add_storage(self, name, constraints=None):
         """Add unit storage dynamically.
 
@@ -59,6 +109,9 @@ class Unit(model.ModelEntity):
         :param str command: The command to run
         :param int timeout: Time to wait before command is considered failed
 
+        Returns a tuple containing the stdout, stderr, and return code
+        from the command.
+
         """
         action = client.ActionFacade()
         action.connect(self.connection)
@@ -66,13 +119,48 @@ class Unit(model.ModelEntity):
         log.debug(
             'Running `%s` on %s', command, self.name)
 
-        return await action.Run(
+        action_status = asyncio.Queue(loop=self.model.loop)
+        tag = None
+
+        async def wait_for_tag():
+            while tag is None:
+                asyncio.sleep(0.1)
+            return tag
+
+        async def callback(delta, old, new, model):
+            # Wait until we have something to report
+            if not new:
+                return
+
+            # Verify that we have the the right action.
+            tag = await wait_for_tag()
+            if not new.id in tag:
+                return
+
+            # Wait until the action has completed, or errored out.
+            if new.status not in ['completed', 'error']:
+                return
+
+            # Put the action in our queue, so that we can fetch it
+            # with the await below.
+            await action_status.put(new)
+
+        self.model.add_observer(callback, 'action', None)
+
+        res = await action.Run(
             [],
             command,
             [],
             timeout,
             [self.name],
         )
+        tag = res.results[0].action.tag  # Set the tag for our waiter above.
+        ret = await action_status.get()  # Wait for our callback to fire
+        return (
+            ret.results['Stdout'],
+            ret.results['Stderr'],
+            ret.results['Code']
+        )
 
     def run_action(self, action_name, **params):
         """Run action on this unit.