Merge lp:~jjo/juju-deployer/deployer-constraints-fix-subords-and-support-M_G-sizes into lp:juju-deployer

[JuanJo Ciarlante]

[jjo, r=] constraints fixes + tests: don't fail on subords, parse M/G sizes,
cleanup YAML output from diff by default (--raw-output option to avoid this)

[lp:~jjo/juju-deployer/deployer-constraints-fix-subords-and-support-M_G-sizes]

84. By JuanJo Ciarlante on 2013-11-16

skip diffing units count for subordinates

[Kapil Thangavelu (hazmat)]

thanks. merging, with minor changes (nice unicode output by default using yaml.representer).

=== modified file 'deployer/action/diff.py'
--- deployer/action/diff.py	2013-10-30 06:11:47 +0000
+++ deployer/action/diff.py	2013-11-16 01:13:00 +0000
@@ -3,7 +3,7 @@
 
 from .base import BaseAction
 from ..relation import EndpointPair
-from ..utils import _parse_constraints, yaml_dump
+from ..utils import parse_constraints, yaml_dump
 
 
 class Diff(BaseAction):
@@ -111,7 +111,8 @@
         for cs in env_svcs.intersection(dep_svcs):
             d_s = self.deployment.get_service(cs).svc_data
             e_s = self.env_state['services'][cs]
-            mod = self._diff_service(e_s, d_s)
+            mod = self._diff_service(e_s, d_s,
+                                     self.deployment.get_charm_for(cs))
             if not mod:
                 continue
             if not 'modified' in delta:
@@ -119,10 +120,10 @@
             delta['modified'][cs] = mod
         return delta
 
-    def _diff_service(self, e_s, d_s):
+    def _diff_service(self, e_s, d_s, charm):
         mod = {}
         if 'constraints' in d_s:
-            d_sc = _parse_constraints(d_s['constraints'])
+            d_sc = parse_constraints(d_s['constraints'])
             if d_sc != e_s['constraints']:
                 mod['constraints'] = e_s['constraints']
         for k, v in d_s.get('options', {}).items():
@@ -133,8 +134,9 @@
             e_v = e_s['options'].get(k, {}).get('value')
             if e_v != v:
                 mod['config'] = {k: e_v}
-        if e_s['unit_count'] != d_s.get('num_units', 1):
-            mod['num_units'] = e_s['unit_count'] - d_s['num_units']
+        if not charm or not charm.is_subordinate():
+            if e_s['unit_count'] != d_s.get('num_units', 1):
+                mod['num_units'] = e_s['unit_count'] - d_s.get('num_units', 1)
         return mod
 
     def run(self):
@@ -144,4 +146,7 @@
         self.load_env()
         delta = self.get_delta()
         if delta:
-            print yaml_dump(delta)
+            yaml_str = yaml_dump(delta)
+            if not self.options.raw_output:
+                yaml_str = yaml_str.replace('!!python/unicode', '')
+            print yaml_str
 
=== modified file 'deployer/cli.py'
--- deployer/cli.py	2013-10-25 16:02:14 +0000
+++ deployer/cli.py	2013-11-16 01:13:00 +0000
@@ -99,7 +99,11 @@
     parser.add_argument(
         "--diff", action="store_true", default=False,
         help=("Generate a delta between a configured deployment and a running"
-             " environment."))
+              " environment."))
+    parser.add_argument(
+        "--raw-output", action="store_true", default=False,
+        help=("Don't cleanup output YAML from strings like "
+              "'!!python/unicode'"))
     parser.add_argument(
         '-w', '--relation-wait', action='store', dest='rel_wait',
         default=60, type=int,
 
=== modified file 'deployer/env/go.py'
--- deployer/env/go.py	2013-11-12 04:54:58 +0000
+++ deployer/env/go.py	2013-11-16 01:13:00 +0000
@@ -58,7 +58,13 @@
         return self.client.get_config(svc_name)
 
     def get_constraints(self, svc_name):
-        return self.client.get_constraints(svc_name)
+        try:
+            return self.client.get_constraints(svc_name)
+        except EnvError, e:
+            if 'constraints do not apply to subordinate services' in str(e):
+                return None
+            else:
+                raise e
 
     def get_cli_status(self):
         status = super(GoEnvironment, self).get_cli_status()
 
=== added file 'deployer/tests/test_constraints.py'
--- deployer/tests/test_constraints.py	1970-01-01 00:00:00 +0000
+++ deployer/tests/test_constraints.py	2013-11-16 01:13:00 +0000
@@ -0,0 +1,24 @@
+from deployer.service import Service
+from .base import Base
+from ..utils import parse_constraints
+
+
+class ConstraintsTest(Base):
+
+    def test_constraints(self):
+        data = {
+            'branch': 'lp:precise/mysql',
+            'constraints': "instance-type=m1.small",
+        }
+        s = Service('db', data)
+        self.assertEquals(s.constraints, "instance-type=m1.small")
+        data = {
+            'branch': 'lp:precise/mysql',
+            'constraints': "cpu-cores=4 mem=2048M root-disk=10G",
+        }
+        s = Service('db', data)
+        c = parse_constraints(s.constraints)
+        self.assertEquals(s.constraints, "cpu-cores=4 mem=2048M root-disk=10G")
+        self.assertEqual(c['cpu-cores'], 4)
+        self.assertEqual(c['mem'], 2048)
+        self.assertEqual(c['root-disk'], 10 * 1024)
 
=== modified file 'deployer/tests/test_guiserver.py'
--- deployer/tests/test_guiserver.py	2013-11-12 11:27:32 +0000
+++ deployer/tests/test_guiserver.py	2013-11-16 01:13:00 +0000
@@ -212,6 +212,7 @@
             description=False,
             destroy_services=False,
             diff=False,
+            raw_output=False,
             find_service=None,
             juju_env=None,
             list_deploys=False,
 
=== modified file 'deployer/utils.py'
--- deployer/utils.py	2013-08-27 09:44:05 +0000
+++ deployer/utils.py	2013-11-16 01:13:00 +0000
@@ -133,16 +133,25 @@
         os.chmod(extract_path, mode)
 
 
-def _parse_constraints(value):
+def parse_constraints(value):
     constraints = {}
     pairs = value.strip().split()
+    units_dict = {
+        'M': 1,
+        'G': 1024,
+    }
     for p in pairs:
         k, v = p.split('=')
+        units = units_dict.get(v[-1], None)
+        if units:
+            v = v[0:-1]
+        else:
+            units = 1
         try:
-            v = int(v)
+            v = int(v) * units
         except ValueError:
             try:
-                v = float(v)
+                v = float(v) * units
             except:
                 pass
         constraints[k] = v