Merge lp:~veebers/juju-ci-tools/model-migration-part3-version-test into lp:juju-ci-tools

[Christopher Lee]

Introduce model migration test for controllers of differing versions.

Introduce model migration test for controllers of differing versions.

[Curtis Hovey (sinzui)]

Thank you Chris. I see several calls in these changes that appear to duplicate existing functions. I am concerned that this branch assumes machine 0 is the only controller.

review: Needs Information (code)

[Aaron Bentley (abentley)]

A few more comments inline.

[lp:~veebers/juju-ci-tools/model-migration-part3-version-test]

1435. By Christopher Lee on 2016-06-07

Merged model-migration-part2 into model-migration-part3-version-test.

1436. By Christopher Lee on 2016-06-07

Merge trunk w/ conflict fixes.

1437. By Christopher Lee on 2016-06-08

Merge trunk w/ conflicts resolved.

1438. By Christopher Lee on 2016-06-08

Make changes as per MP review

1439. By Christopher Lee on 2016-06-08

Merged model-migration-part2 into model-migration-part3-version-test.

1440. By Christopher Lee on 2016-06-08

Merged model-migration-part2 into model-migration-part3-version-test.

1441. By Christopher Lee on 2016-06-10

Merged model-migration-part2 into model-migration-part3-version-test.

1442. By Christopher Lee on 2016-06-22

Merge trunk

1443. By Christopher Lee on 2016-07-28

Merged model-migration-part2 into model-migration-part3-version-test.

1444. By Christopher Lee on 2016-07-29

Merged update-fix-model-migration-test into model-migration-part3-version-test.

1445. By Christopher Lee on 2016-08-01

Merged add-test-feature-units-and-remigration into model-migration-part3-version-test.

1446. By Christopher Lee on 2016-08-12

Merge trunk

1447. By Christopher Lee on 2016-08-12

Attempt controller upgrade.

1448. By Christopher Lee on 2016-08-15

Don't force version

1449. By Christopher Lee on 2016-08-18

Merge trunk changes

1450. By Christopher Lee on 2016-08-18

Update upgrade controller to not use upload-tools

Unmerged revisions

1450. By Christopher Lee on 2016-08-18

Update upgrade controller to not use upload-tools

1449. By Christopher Lee on 2016-08-18

Merge trunk changes

=== modified file 'assess_model_migration.py'
--- assess_model_migration.py	2016-08-01 05:57:55 +0000
+++ assess_model_migration.py	2016-08-18 03:40:10 +0000
@@ -10,7 +10,10 @@
 import sys
 from time import sleep
 
-from deploy_stack import BootstrapManager
+from deploy_stack import (
+    BootstrapManager,
+    assess_upgrade,
+)
 from utility import (
     JujuAssertionError,
     add_basic_testing_arguments,
@@ -26,7 +29,8 @@
 
 
 def assess_model_migration(bs1, bs2, upload_tools):
-    ensure_able_to_migrate_model_between_controllers(bs1, bs2, upload_tools)
+    # ensure_able_to_migrate_model_between_controllers(bs1, bs2, upload_tools)
+    ensure_fail_to_migrate_to_lower_version_controller(bs1, bs2, upload_tools)
 
 
 def parse_args(argv):
@@ -48,6 +52,9 @@
     bs_1 = BootstrapManager.from_args(args)
     bs_2 = BootstrapManager.from_args(args)
 
+    # Need to be able to upgrade this controller.
+    bs_1.client.env.config['enable-os-upgrade'] = True
+
     # Give the second a separate/unique name.
     bs_2.temp_env_name = '{}-b'.format(bs_1.temp_env_name)
 
@@ -83,6 +90,19 @@
         ))
 
 
+def _update_client_controller(client):
+    log.info('Updating clients ({}) controller'.format(
+        client.env.environment))
+
+    admin_client = client.get_controller_client()
+    admin_client.env.local = True
+    admin_client.upgrade_controller(force_version=False)
+    admin_client.wait_for_version(
+        admin_client.get_matching_agent_version(), 600)
+    # assess_upgrade(admin_client, admin_client.full_path)
+    # After upgrade, is there an exception perhaps?
+
+
 def test_deployed_mongo_is_up(client):
     """Ensure the mongo service is running as expected."""
     try:
@@ -196,6 +216,35 @@
         raise JujuAssertionError('Appliction units reside on the same machine')
 
 
+def ensure_fail_to_migrate_to_lower_version_controller(bs1, bs2, upload_tools):
+    """
+    Migration must not proceed if the target controller version is less than
+    the source controller.
+
+    """
+    with bs1.booted_context(upload_tools):
+        bs1.client.enable_feature('migration')
+
+        _update_client_controller(bs1.client)
+
+        log.info('Booting second instance')
+        bs2.client.env.juju_home = bs1.client.env.juju_home
+        with bs2.existing_booted_context(upload_tools):
+            log.info('Initiating migration process')
+            try:
+                bs1.client.controller_juju(
+                    'migrate',
+                    (bs1.client.env.environment,
+                     'local.{}'.format(bs2.client.env.controller.name)))
+            except CalledProcessError as e:
+                if 'expected error message' in e:
+                    return True
+            # If the migration didn't fail there is an issue and we need to
+            # fail
+            raise RuntimeError(
+                'Migrating to upgraded controller did not error.')
+
+
 def main(argv=None):
     args = parse_args(argv)
     configure_logging(args.verbose)

=== modified file 'jujupy.py'
--- jujupy.py	2016-08-17 20:53:38 +0000
+++ jujupy.py	2016-08-18 03:40:10 +0000
@@ -1700,7 +1700,7 @@
             version = self.get_matching_agent_version(no_build=True)
             args += ('--version', version)
         if self.env.local:
-            args += ('--upload-tools',)
+            args += ('--build-agent',)
 
         self._upgrade_controller(args)