X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=juju%2Funit.py;h=3dbc1e963577c8882ada5457aa0396073ca21493;hb=0a25fd6d5d6802ce2ae9ded5c01750fe0a2aefba;hp=b540ada76fc5132a6e0985f3c1e1fca669e769cd;hpb=173b900fcd95b2436af55df2618302146f4a2f40;p=osm%2FN2VC.git

diff --git a/juju/unit.py b/juju/unit.py
index b540ada..3dbc1e9 100644
--- 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,8 +9,53 @@ log = logging.getLogger(__name__)
 
 
 class Unit(model.ModelEntity):
-    def _get_tag(self):
-        return 'unit-{}'.format(self.data['name'].replace('/', '-'))
+    @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.
@@ -26,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):
@@ -56,21 +109,24 @@ 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()
-        conn = await self.model.connection.clone()
-        action.connect(conn)
+        action.connect(self.connection)
 
         log.debug(
             'Running `%s` on %s', command, self.name)
 
-        return await action.Run(
+        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.