Merge lp:~mskalka/juju-ci-tools/charm-deploy-aliasing into lp:juju-ci-tools

[Michael Skalka]

Adds the option to alias a jujupy charm deployment with a user-generated charm name. This is a quick workaround for missing multi-series subordinate charm support in juju.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'jujupy/client.py'
--- jujupy/client.py	2017-02-23 17:56:18 +0000
+++ jujupy/client.py	2017-02-27 16:28:20 +0000
@@ -1967,7 +1967,7 @@
 
     def deploy(self, charm, repository=None, to=None, series=None,
                service=None, force=False, resource=None, num=None,
-               storage=None, constraints=None):
+               storage=None, constraints=None, alias=None):
         args = [charm]
         if service is not None:
             args.extend([service])
@@ -1985,6 +1985,8 @@
             args.extend(['--storage', storage])
         if constraints is not None:
             args.extend(['--constraints', constraints])
+        if alias is not None:
+            args.extend([alias])
         return self.juju('deploy', tuple(args))
 
     def attach(self, service, resource):

=== modified file 'jujupy/tests/test_client.py'
--- jujupy/tests/test_client.py	2017-02-23 17:56:18 +0000
+++ jujupy/tests/test_client.py	2017-02-27 16:28:20 +0000
@@ -1202,6 +1202,13 @@
         mock_juju.assert_called_with(
             'deploy', ('mondogb', '--constraints', 'virt-type=kvm'))
 
+    def test_deploy_aliased(self):
+        env = ModelClient(JujuData('foo', {'type': 'local'}), None, None)
+        with patch.object(env, 'juju') as mock_juju:
+            env.deploy('local:blah', alias='blah-blah')
+        mock_juju.assert_called_with(
+            'deploy', ('local:blah', 'blah-blah'))
+
     def test_attach(self):
         env = ModelClient(JujuData('foo', {'type': 'local'}), None, None)
         with patch.object(env, 'juju') as mock_juju: