X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=juju%2Funit.py;h=3dbc1e963577c8882ada5457aa0396073ca21493;hb=b89f2fff0ca59f55a5caed03d15e34884721c88b;hp=4d75484ccf639fb54ba592b6cca4a47d49e3ae99;hpb=fe2d2f1a5ef2453359858481929a2526ea1a3c5c;p=osm%2FN2VC.git

diff --git a/juju/unit.py b/juju/unit.py
index 4d75484..3dbc1e9 100644
--- a/juju/unit.py
+++ b/juju/unit.py
@@ -1,7 +1,62 @@
+import asyncio
+import logging
+from datetime import datetime
+
 from . import model
+from .client import client
+
+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.
 
@@ -18,11 +73,17 @@ class Unit(model.ModelEntity):
         """
         pass
 
-    def destroy(self):
+    async def destroy(self):
         """Destroy this unit.
 
         """
-        pass
+        app_facade = client.ApplicationFacade()
+        app_facade.connect(self.connection)
+
+        log.debug(
+            'Destroying %s', self.name)
+
+        return await app_facade.DestroyUnits([self.name])
     remove = destroy
 
     def get_resources(self, details=False):
@@ -42,14 +103,30 @@ class Unit(model.ModelEntity):
         """
         pass
 
-    def run(self, command, timeout=None):
+    async def run(self, command, timeout=None):
         """Run command on this unit.
 
         :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.
+
         """
-        pass
+        action = client.ActionFacade()
+        action.connect(self.connection)
+
+        log.debug(
+            'Running `%s` on %s', command, self.name)
+
+        res = await action.Run(
+            [],
+            command,
+            [],
+            timeout,
+            [self.name],
+        )
+        return await self.model.wait_for_action(res.results[0].action.tag)
 
     def run_action(self, action_name, **params):
         """Run action on this unit.