Merge lp:~xavpaice/juju-deployer/lp1642157 into lp:juju-deployer

[Xav Paice]

This adds the ability for juju-deployer to use the --bind cli option, in bundles it's 'bindings'. The option allows us to use spaces with juju 2.1/maas.

If there is already more than one space defined in juju, without this fix all new LXDs will fail to create.

I'm finding test errors with this patch, and would really appreciate some assistance getting the tests to pass.

[Tim Van Steenburgh (tvansteenburgh)]

+1. Tests pass for me.

review: Approve

=== modified file 'deployer/action/importer.py'
--- deployer/action/importer.py	2017-02-28 14:58:52 +0000
+++ deployer/action/importer.py	2017-03-16 04:28:01 +0000
@@ -206,6 +206,7 @@
                 num_units,
                 placement.get(0),
                 charm.series or self.deployment.series,
+                svc.bindings,
             )
 
             if svc.annotations:

=== modified file 'deployer/deployment.py'
--- deployer/deployment.py	2016-05-12 20:22:06 +0000
+++ deployer/deployment.py	2017-03-16 04:28:01 +0000
@@ -312,4 +312,5 @@
     def to_yaml(dumper, deployment):
         return dumper.represent_dict(deployment.data)
 
+
 yaml.add_representer(Deployment, Deployment.to_yaml)

=== modified file 'deployer/env/base.py'
--- deployer/env/base.py	2017-02-28 14:58:52 +0000
+++ deployer/env/base.py	2017-03-16 04:28:01 +0000
@@ -70,7 +70,7 @@
 
     def deploy(self, name, charm_url, repo=None, config=None, constraints=None,
                resources=None, storage=None, num_units=1, force_machine=None,
-               series=None):
+               series=None, bindings=None):
         params = self._named_env(["juju", "deploy"])
         with temp_file() as fh:
             if config:
@@ -109,6 +109,17 @@
                 params.extend(["--to=%s" % force_machine])
             if series and get_juju_major_version() > 1:
                 params.extend(['--series', series])
+            if bindings:
+                if not isinstance(bindings, dict):
+                    raise DeploymentError(
+                        "bindings must be specified as a dictionary")
+                bindings_list = []
+                for key, value in bindings.items():
+                    if key == "":
+                        bindings_list.append("{}".format(value))
+                    else:
+                        bindings_list.append("{}={}".format(key, value))
+                params.extend(["--bind \"%s\"" % " ".join(bindings_list)])
 
             params.extend([charm_url, name])
             self._check_call(

=== modified file 'deployer/service.py'
--- deployer/service.py	2017-02-28 14:58:52 +0000
+++ deployer/service.py	2017-03-16 04:28:01 +0000
@@ -59,6 +59,10 @@
         return self.svc_data.get('resources', None)
 
     @property
+    def bindings(self):
+        return self.svc_data.get('bindings', None)
+
+    @property
     def storage(self):
         return self.svc_data.get('storage', None)
 

=== added file 'deployer/tests/test_data/wiki-bindings.yaml'
--- deployer/tests/test_data/wiki-bindings.yaml	1970-01-01 00:00:00 +0000
+++ deployer/tests/test_data/wiki-bindings.yaml	2017-03-16 04:28:01 +0000
@@ -0,0 +1,13 @@
+wiki:
+  series: precise
+  services:
+    wiki:
+      charm: cs:precise/mediawiki
+      options:
+        name: $hi_world _are_you_there? {guess_who}
+      bindings:
+        "": "default"
+    db:
+      charm: cs:precise/mysql
+  relations:
+    - [wiki, db]

=== modified file 'deployer/tests/test_guiserver.py'
--- deployer/tests/test_guiserver.py	2017-02-28 14:58:52 +0000
+++ deployer/tests/test_guiserver.py	2017-03-16 04:28:01 +0000
@@ -284,13 +284,13 @@
             mock.call.deploy(
                 'mysql', 'cs:precise/mysql-28', '', None,
                 {'arch': 'i386', 'cpu-cores': 4, 'mem': '4G'},
-                None, None, 2, None, 'precise'),
+                None, None, 2, None, 'precise', None),
             mock.call.set_annotation(
                 'mysql', {'gui-y': '164.547', 'gui-x': '494.347'}),
             mock.call.deploy(
                 'wordpress', 'cs:precise/wordpress-20', '',
                 {'debug': 'no', 'engine': 'nginx', 'tuning': 'single'},
-                None, None, None, 1, None, 'precise'),
+                None, None, None, 1, None, 'precise', None),
             mock.call.set_annotation(
                 'wordpress', {'gui-y': '414.547', 'gui-x': '425.347'}),
             mock.call.add_units('mysql', 2),

=== modified file 'deployer/tests/test_importer.py'
--- deployer/tests/test_importer.py	2017-02-28 14:58:52 +0000
+++ deployer/tests/test_importer.py	2017-03-16 04:28:01 +0000
@@ -63,7 +63,7 @@
             env.method_calls[3], mock.call.deploy(
                 'wiki', 'cs:precise/mediawiki',
                 os.environ.get("JUJU_REPOSITORY", ""),
-                config, None, None, None, 1, None, 'precise'))
+                config, None, None, None, 1, None, 'precise', None))
         env.add_relation.assert_called_once_with('wiki', 'db')
 
     @skip_if_offline
@@ -84,7 +84,7 @@
                 os.environ.get("JUJU_REPOSITORY", ""),
                 config, None,
                 {"config": "./docs/cfg.xml", "tarball": "/some/file.tgz"},
-                None, 1, None, 'precise'))
+                None, 1, None, 'precise', None))
         env.add_relation.assert_called_once_with('wiki', 'db')
 
     @skip_if_offline
@@ -105,7 +105,28 @@
                 'wiki', 'cs:precise/mediawiki',
                 os.environ.get("JUJU_REPOSITORY", ""),
                 config, None, None, {"web-data": "cinder,10G,1"},
-                1, None, 'precise'))
+                1, None, 'precise', None))
+        env.add_relation.assert_called_once_with('wiki', 'db')
+
+    @skip_if_offline
+    @skip_if_offline
+    @mock.patch('deployer.action.importer.time')
+    def test_importer_with_bindings(self, mock_time):
+        mock_time.time.return_value = 0
+        stack = ConfigStack([
+            os.path.join(self.test_data_dir, 'wiki-bindings.yaml')])
+        deploy = stack.get('wiki')
+        env = mock.MagicMock()
+        importer = Importer(env, deploy, self.options)
+        importer.run()
+
+        config = {'name': '$hi_world _are_you_there? {guess_who}'}
+        self.assertEqual(
+            env.method_calls[3], mock.call.deploy(
+                'wiki', 'cs:precise/mediawiki',
+                os.environ.get("JUJU_REPOSITORY", ""),
+                config, None, None, None,
+                1, None, 'precise', {"": "default"}))
         env.add_relation.assert_called_once_with('wiki', 'db')
 
     @skip_if_offline

=== modified file 'deployer/utils.py'
--- deployer/utils.py	2016-10-25 15:28:08 +0000
+++ deployer/utils.py	2017-03-16 04:28:01 +0000
@@ -75,6 +75,7 @@
     node = yaml.ScalarNode(tag=u'tag:yaml.org,2002:str', value=uni)
     return node
 
+
 yaml.add_representer(six.text_type, _unicode_representer)