X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=juju%2Funit.py;h=cad4bb7ac9cf6f0398affc71f32d294ffe0c5c9f;hb=2f24fbf91801cb5f1cc9561fca539c48f6f15776;hp=8511a47775edec3e97b218e02211a4ab579ce618;hpb=132f5ea91d63a915b2d892fc5a54429a8dc92bba;p=osm%2FN2VC.git

diff --git a/juju/unit.py b/juju/unit.py
index 8511a47..cad4bb7 100644
--- a/juju/unit.py
+++ b/juju/unit.py
@@ -227,18 +227,24 @@ class Unit(model.ModelEntity):
 
         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.
+        # 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]