Merge lp:~veebers/juju-ci-tools/remove_-c_from_migration into lp:juju-ci-tools

[Christopher Lee]

Remove the -c argument from migrate command due to changes in 2.2-beta4.

Remove the -c argument from migrate command due to changes in 2.2-beta4.

Retains it's backwards compatibility with version checks.

[Burton Swan (burton-swan)]

Code looks good to me.

review: Approve

=== modified file 'assess_model_migration.py'
--- assess_model_migration.py	2017-03-21 22:35:12 +0000
+++ assess_model_migration.py	2017-05-07 20:29:33 +0000
@@ -5,6 +5,7 @@
 
 import argparse
 from contextlib import contextmanager
+from distutils.version import LooseVersion
 import logging
 import os
 from subprocess import CalledProcessError
@@ -91,6 +92,10 @@
     return not isinstance(client, ModelClient2_0)
 
 
+def after_22beta4(client_version):
+    return LooseVersion(client_version) >= LooseVersion('2.2-beta4')
+
+
 def parse_args(argv):
     """Parse all arguments."""
     parser = argparse.ArgumentParser(
@@ -337,9 +342,15 @@
         attempt_client.env.environment,
         attempt_client.env.user_name)
 
-    source_client.controller_juju(
-        'migrate',
-        (user_qualified_model_name, dest_client.env.controller.name))
+    if after_22beta4(source_client.version):
+        source_client.juju(
+            'migrate',
+            (user_qualified_model_name, dest_client.env.controller.name),
+            include_e=False)
+    else:
+        source_client.controller_juju(
+            'migrate',
+            (user_qualified_model_name, dest_client.env.controller.name))
 
     migration_client = dest_client.clone(
         dest_client.env.clone(user_qualified_model_name))
@@ -394,12 +405,30 @@
         source_client, dest_client, include_user_name=False):
     log.info('Initiating migration process')
     if include_user_name:
-        model_name = '{}/{}'.format(
-            source_client.env.user_name, source_client.env.environment)
-    else:
-        model_name = source_client.env.environment
-    source_client.controller_juju(
-        'migrate', (model_name, dest_client.env.controller.name))
+        if after_22beta4(source_client.version):
+            model_name = '{}:{}/{}'.format(
+                source_client.env.controller.name,
+                source_client.env.user_name,
+                source_client.env.environment)
+        else:
+            model_name = '{}/{}'.format(
+                source_client.env.user_name, source_client.env.environment)
+    else:
+        if after_22beta4(source_client.version):
+            model_name = '{}:{}'.format(
+                source_client.env.controller.name,
+                source_client.env.environment)
+        else:
+            model_name = source_client.env.environment
+
+    if after_22beta4(source_client.version):
+        source_client.juju(
+            'migrate',
+            (model_name, dest_client.env.controller.name),
+            include_e=False)
+    else:
+        source_client.controller_juju(
+            'migrate', (model_name, dest_client.env.controller.name))
     migration_target_client = dest_client.clone(
         dest_client.env.clone(source_client.env.environment))
     wait_for_model(migration_target_client, source_client.env.environment)
@@ -490,10 +519,15 @@
     """
     test_model, application = deploy_simple_server_to_new_model(
         source_client, 'rollmeback')
-    test_model.controller_juju(
-        'migrate',
-        (test_model.env.environment,
-         dest_client.env.controller.name))
+    if after_22beta4(source_client.version):
+        test_model.juju(
+            'migrate',
+            (test_model.env.environment, dest_client.env.controller.name),
+            include_e=False)
+    else:
+        test_model.controller_juju(
+            'migrate',
+            (test_model.env.environment, dest_client.env.controller.name))
     # Once migration has started interrupt it
     wait_for_migrating(test_model)
     log.info('Disrupting target controller to force rollback')
@@ -599,9 +633,19 @@
     appears in test logs.
     """
     try:
-        args = ['-c', source_client.env.controller.name,
+        if after_22beta4(source_client.version):
+            args = [
+                '{}:{}'.format(
+                    source_client.env.controller.name,
+                    source_client.env.environment),
+                dest_client.env.controller.name
+            ]
+        else:
+            args = [
+                '-c', source_client.env.controller.name,
                 source_client.env.environment,
-                dest_client.env.controller.name]
+                dest_client.env.controller.name
+            ]
         log_output = source_client.get_juju_output(
             'migrate', *args, merge_stderr=True, include_e=False)
     except CalledProcessError as e:
 
=== modified file 'tests/test_assess_model_migration.py'
--- tests/test_assess_model_migration.py	2017-02-25 06:09:40 +0000
+++ tests/test_assess_model_migration.py	2017-05-07 20:29:33 +0000
@@ -88,6 +88,20 @@
             "Test model migration feature", fake_stdout.getvalue())
 
 
+class TestAfter22Beta4(TestCase):
+
+    def test_returns_True_when_newer(self):
+        self.assertTrue(amm.after_22beta4('2.2-beta8-xenial-amd64'))
+        self.assertTrue(amm.after_22beta4('2.3-beta4-xenial-amd64'))
+
+    def test_returns_True_when_equal(self):
+        self.assertTrue(amm.after_22beta4('2.2-beta4-xenial-amd64'))
+
+    def test_returns_False_when_older(self):
+        self.assertFalse(amm.after_22beta4('2.1-beta8-xenial-amd64'))
+        self.assertFalse(amm.after_22beta4('2.2-beta2-xenial-amd64'))
+
+
 class TestDeploySimpleResourceServer(TestCase):
 
     def test_deploys_with_resource(self):