X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=juju%2Funit.py;h=2ec1769560e538bce345d07fb42b7d9951f7a7a4;hb=db399019ac73dfb980d48b231d69a267de27dd87;hp=37d45d3fc3ca43f517507ecc7f664db13052a68e;hpb=c7aa2a9872c31ca6be58f3a95b42e7bd0c14c116;p=osm%2FN2VC.git

diff --git a/juju/unit.py b/juju/unit.py
index 37d45d3..2ec1769 100644
--- a/juju/unit.py
+++ b/juju/unit.py
@@ -161,9 +161,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,
@@ -206,3 +206,35 @@ class Unit(model.ModelEntity):
 
         """
         pass
+
+    async def is_leader_from_status(self):
+        """
+        Check to see if this unit is the leader. Returns True if so, and
+        False if it is not, or if leadership does not make sense
+        (e.g., there is no leader in this application.)
+
+        This method is a kluge that calls FullStatus in the
+        ClientFacade to get its information. Once
+        https://bugs.launchpad.net/juju/+bug/1643691 is resolved, we
+        should add a simple .is_leader property, and deprecate this
+        method.
+
+        """
+        app = self.name.split("/")[0]
+
+        c = client.ClientFacade()
+        c.connect(self.model.connection)
+
+        status = await c.FullStatus(None)
+
+        try:
+            return status.applications[app]['units'][self.name].get(
+                'leader', False)
+        except KeyError:
+            # FullStatus may be more up-to-date than the model
+            # referenced by this class. If this unit has been
+            # destroyed between the time the class was created and the
+            # time that we call this method, we'll get a KeyError. In
+            # that case, we simply return False, as a destroyed unit
+            # is not a leader.
+            return False