Merge lp:~jjo/juju-deployer/diff-fixes-for-services-without-units-and-single-valued-cfg-tags into lp:juju-deployer

[JuanJo Ciarlante]

[jjo] diff fixes: avoid crashing if environment has services without units deployed, convert tags from cfg to list if needed

[JuanJo Ciarlante (jjo)]

$ make test
Ran 99 tests in 64.477s

OK (SKIP=1)

=== modified file 'deployer/action/diff.py'
--- deployer/action/diff.py	2013-11-29 21:55:56 +0000
+++ deployer/action/diff.py	2014-10-22 16:51:05 +0000
@@ -30,7 +30,7 @@
                 'constraints'] = self.env.get_constraints(svc_name)
             self.env_state['services'][svc_name][
                 'unit_count'] = len(self.env_status[
-                    'services'][svc_name]['units'])
+                    'services'][svc_name].get('units',{}))
             rels.update(self._load_rels(svc_name))
         self.env_state['relations'] = sorted(rels)
 
@@ -123,6 +123,10 @@
     def _diff_service(self, e_s, d_s, charm):
         mod = {}
         d_sc = parse_constraints(d_s.get('constraints',''))
+        # 'tags' is a special case, as it can be multi-valued: convert to list
+        # if cfg one is a string
+        if type(d_sc.get('tag')) == str:
+            d_sc['tags'] = [d_sc['tags']]
         if d_sc != e_s['constraints']:
             mod['env-constraints'] = e_s['constraints']
             mod['cfg-constraints'] = d_sc