Merge lp:~veebers/juju-ci-tools/migration-add-migrate-back-to-original into lp:juju-ci-tools

[Christopher Lee]

Add extra test to migrate back to the original controller.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

Unmerged revisions

1815. By Christopher Lee on 2016-12-15

Merged migration-superuser-models into migration-add-migrate-back.

1814. By Christopher Lee on 2016-12-15

Add migrating back to source controller.

1813. By Christopher Lee on 2016-12-15

Merged migration-log-check-fix into migration-superuser-models.

1812. By Christopher Lee on 2016-12-15

Fix model name checks.

1811. By Christopher Lee on 2016-12-15

Get all model names from controller to check against.

=== modified file 'assess_model_migration.py'
--- assess_model_migration.py	2016-12-15 09:03:37 +0000
+++ assess_model_migration.py	2016-12-15 09:03:37 +0000
@@ -234,6 +234,10 @@
       - Migrate that model to the other environment
         - Ensure it's operating as expected
         - Add a new unit to the application to ensure the model is functional
+      - Migrate the model back to the original environment
+        - Note: Test for lp:1607457, lp:1641824
+        - Ensure it's operating as expected
+        - Add a new unit to the application to ensure the model is functional
 
     """
     resource_contents = get_random_string()
@@ -244,6 +248,12 @@
     assert_model_migrated_successfully(
         migration_target_client, application, resource_contents)
 
+    log.info('Migrating back to original controller.')
+    migrate_back_client = migrate_model_to_controller(
+        migration_target_client, source_client)
+    assert_model_migrated_successfully(
+        migrate_back_client, application, resource_contents)
+
     migration_target_client.remove_service(application)
     log.info('SUCCESS: resources migrated')