From: Pete Vander Giessen <petevg@gmail.com>
Date: Wed, 30 Nov 2016 02:11:12 +0000 (-0500)
Subject: Fixed two "null case" bugs:
X-Git-Tag: 0.1.0~25^2~1
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=2f24fbf91801cb5f1cc9561fca539c48f6f15776;p=osm%2FN2VC.git

Fixed two "null case" bugs:

add_unit no longer fails when we pass "None" for our placement
directive.

checking leadership on a subordinate no longer fails, as we are more
careful about pull stuff out of the full status map.
---

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]