Merge pull request #28 from petevg/bug/fixes-for-null-cases

Bug/fixes for null cases

diff --git a/juju/model.py b/juju/model.py
index 50b3ad0..df72eb2 100644 (file)
--- a/juju/model.py
+++ b/juju/model.py
@@ -1261,7 +1261,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