Merge lp:~frankban/juju-deployer/guiserver-bundle-v4 into lp:juju-deployer

[Francesco Banconi]

Allow deploying bundles with v4 syntax also from the GUI server/API side of the deployer.
Also fix the add_unit logic in the importer so that the expected result (of adding one single unit) is achieved also when using the juju-core API (GUIEnvironment) for deploying charms.

[Madison Scott-Clary (makyo)]

Thanks Francesco, LGTM

review: Approve (code)

[Brad Crittenden (bac)]

Thanks

review: Approve (code)

[Tim Van Steenburgh (tvansteenburgh)]

LGTM

review: Approve

=== modified file 'deployer/action/importer.py'
--- deployer/action/importer.py	2015-08-06 14:16:54 +0000
+++ deployer/action/importer.py	2015-08-10 15:51:53 +0000
@@ -195,11 +195,10 @@
             else:
                 num_units = svc.num_units
 
-            # Unset num_units if we are not adding units.  This should be done
-            # after the above work to ensure that the status is still retrieved
-            # as necessary.
+            # Only add a single unit if requested. This is done after the above
+            # work to ensure that the status is still retrieved as necessary.
             if not add_units:
-                num_units = None
+                num_units = 1
 
             placement = self.deployment.get_unit_placement(svc, env_status)
 
 
=== modified file 'deployer/guiserver.py'
--- deployer/guiserver.py	2014-12-17 13:06:49 +0000
+++ deployer/guiserver.py	2015-08-10 15:51:53 +0000
@@ -37,8 +37,8 @@
 class GUIDeployment(Deployment):
     """Handle bundle deployments requested by the GUI server."""
 
-    def __init__(self, name, data):
-        super(GUIDeployment, self).__init__(name, data, [])
+    def __init__(self, name, data, version):
+        super(GUIDeployment, self).__init__(name, data, [], version=version)
 
     def _handle_feedback(self, feedback):
         """Raise a DeploymentError if the given feedback includes errors.
@@ -82,10 +82,17 @@
         env.close()
 
 
-def import_bundle(apiurl, username, password, name, bundle, options):
-    """Import a bundle."""
+def import_bundle(apiurl, username, password, name, bundle, version, options):
+    """Import a bundle.
+
+    To connect to the Juju environment, use the given API URL, user name and
+    password. The name and bundle arguments are used to deploy the bundle. The
+    version argument specifies whether the given bundle content uses the
+    legacy v3 or the new v4 bundle syntax. The given options are used to
+    start the bundle deployment process.
+    """
     env = GUIEnvironment(apiurl, username, password)
-    deployment = GUIDeployment(name, bundle)
+    deployment = GUIDeployment(name, bundle, version=version)
     importer = Importer(env, deployment, options)
     env.connect()
     # The Importer tries to retrieve the Juju home from the JUJU_HOME
 
=== modified file 'deployer/tests/test_guiserver.py'
--- deployer/tests/test_guiserver.py	2015-08-06 08:40:16 +0000
+++ deployer/tests/test_guiserver.py	2015-08-10 15:51:53 +0000
@@ -83,7 +83,7 @@
 
     def setUp(self):
         # Set up a GUIDeployment instance and a Feedback object.
-        self.deployment = guiserver.GUIDeployment('mybundle', 'mydata')
+        self.deployment = guiserver.GUIDeployment('mybundle', 'mydata', 4)
         self.feedback = Feedback()
 
     def test_valid_deployment(self):
@@ -213,11 +213,11 @@
             finally:
                 del os.environ['JUJU_HOME']
 
-    def import_bundle(self):
+    def import_bundle(self, version=4):
         """Call the import_bundle function."""
         guiserver.import_bundle(
             self.apiurl, self.username, self.password, self.name, self.bundle,
-            self.options)
+            version, self.options)
 
     def cleanup_series_path(self):
         """Remove the series path created by the Deployment object."""
@@ -274,7 +274,7 @@
         patch_env_status(mock_environment(), {'mysql': 1, 'wordpress': 1})
         mock_environment.reset_mock()
         with self.patch_juju_home():
-            self.import_bundle()
+            self.import_bundle(version=3)
         mock_sleep.assert_has_calls([mock.call(5.1), mock.call(60)])
         # If any of the calls below fails, then we have to change the
         # signatures of deployer.guiserver.GUIEnvironment methods.
@@ -313,12 +313,13 @@
                 },
             },
         }
+        version = 4
         self.addCleanup(self.cleanup_series_path)
         with self.patch_juju_home():
             with self.assertRaises(guiserver.DeploymentError) as cm:
                 guiserver.import_bundle(
                     self.apiurl, self.username, self.password, self.name,
-                    bundle, self.options)
+                    bundle, version, self.options)
         expected_errors = set([
             'Invalid config charm cs:precise/wordpress-20 no-such-option=42',
             'Invalid config charm cs:precise/mysql-28 bad=wolf',
 
=== modified file 'setup.py'
--- setup.py	2015-08-06 09:19:32 +0000
+++ setup.py	2015-08-10 15:51:53 +0000
@@ -3,7 +3,7 @@
 
 setup(
     name="juju-deployer",
-    version="0.5.1",
+    version="0.5.2",
     description="A tool for deploying complex stacks with juju.",
     long_description=open("README").read(),
     author="Kapil Thangavelu",