Merge pull request #25 from juju/local-bundle-deploy

Add support for deploying local bundles

diff --git a/juju/application.py b/juju/application.py
index 83c2275..74f9057 100644 (file)
--- a/juju/application.py
+++ b/juju/application.py
@@ -88,7 +88,7 @@ class Application(model.ModelEntity):
 
         result = await app_facade.AddUnits(
             application=self.name,
-            placement=[parse_placement(to)],
+            placement=[parse_placement(to)] if to else None,
             num_units=count,
         )
 

diff --git a/juju/model.py b/juju/model.py
index ad061aa..0ba79df 100644 (file)
--- a/juju/model.py
+++ b/juju/model.py
@@ -1270,7 +1270,7 @@ class Model(object):
                     raise Exception(error.message)
 
             for metric in entity_metrics.metrics:
-                metrics[metric.unit].append(metric.to_json())
+                metrics[metric.unit].append(vars(metric))
 
         return metrics
 

diff --git a/juju/placement.py b/juju/placement.py
index 62cd570..6f91aed 100644 (file)
--- a/juju/placement.py
+++ b/juju/placement.py
@@ -6,9 +6,10 @@
 # module should be deprecated.
 #
 
+from .client import client
+
 MACHINE_SCOPE = "#"
 
-from .client import client
 
 def parse(directive):
     """
@@ -17,7 +18,7 @@ def parse(directive):
     back over the websocket API.
 
     """
-    if directive == "":
+    if not directive:
         # Handle null case
         return None
 

diff --git a/juju/unit.py b/juju/unit.py
index 8511a47..cad4bb7 100644 (file)
--- 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]