Merge lp:~veebers/juju-ci-tools/model-migration_migration_of_models_by_superuser into lp:juju-ci-tools

[Curtis Hovey]

looking

Unmerged revisions

1719. By Christopher Lee on 2016-11-10

Working example.

1718. By Christopher Lee on 2016-11-08

Debugging.

1717. By Christopher Lee on 2016-11-08

Simplify creating users on controllers.

=== modified file 'assess_model_migration.py'
--- assess_model_migration.py	2016-12-02 18:07:25 +0000
+++ assess_model_migration.py	2016-12-05 17:55:04 +0000
@@ -42,12 +42,22 @@
         bs1.client.enable_feature('migration')
         bs2.client.enable_feature('migration')
         bs2.client.env.juju_home = bs1.client.env.juju_home
+<<<<<<< TREE
         with bs2.existing_booted_context(args.upload_tools):
             source_client = bs1.client
             dest_client = bs2.client
             ensure_able_to_migrate_model_between_controllers(
                 source_client, dest_client)
+=======
+        with bs2.existing_booted_context(upload_tools):
+            source_client = bs1.client
+            dest_client = bs2.client
+            # ensure_able_to_migrate_model_between_controllers(
+            #     source_client, dest_client, upload_tools)
+
+>>>>>>> MERGE-SOURCE
             with temp_dir() as temp:
+<<<<<<< TREE
                 ensure_migrating_with_insufficient_user_permissions_fails(
                     source_client, dest_client, temp)
                 ensure_migrating_with_superuser_user_permissions_succeeds(
@@ -67,6 +77,14 @@
                 ensure_api_login_redirects(source_client, dest_client)
                 ensure_migrating_to_target_and_back_to_source_succeeds(
                     source_client, dest_client)
+=======
+                # ensure_migrating_with_insufficient_user_permissions_fails(
+                #     source_client, dest_client, upload_tools, temp)
+                # ensure_migrating_with_superuser_user_permissions_succeeds(
+                #     source_client, dest_client, upload_tools, temp)
+                ensure_superuser_can_migrate_other_user_models(
+                    source_client, dest_client, upload_tools, temp)
+>>>>>>> MERGE-SOURCE
 
 
 def parse_args(argv):
@@ -170,7 +188,11 @@
 
 
 def ensure_able_to_migrate_model_between_controllers(
+<<<<<<< TREE
         source_client, dest_client):
+=======
+        source_client, dest_client, upload_tools):
+>>>>>>> MERGE-SOURCE
     """Test simple migration of a model to another controller.
 
     Ensure that migration a model that has an application deployed upon it is
@@ -347,11 +369,17 @@
     bundle = 'mongodb'
     log.info('Deploying charm')
     # Don't move the default model so we can reuse it in later tests.
+<<<<<<< TREE
     test_model = client.add_model(client.env.clone(model_name))
+=======
+    test_model = source_client.add_model(
+        source_client.env.clone('example-model'))
+>>>>>>> MERGE-SOURCE
     test_model.juju("deploy", (bundle))
     test_model.wait_for_started()
     test_model.wait_for_workloads()
     test_deployed_mongo_is_up(test_model)
+<<<<<<< TREE
     return test_model
 
 
@@ -389,6 +417,22 @@
             source_client.env.user_name, source_client.env.environment)
     else:
         model_name = source_client.env.environment
+=======
+
+    log.info('Initiating migration process')
+
+    migration_target_client = migrate_model_to_controller(
+        test_model, dest_client)
+
+    migration_target_client.wait_for_workloads()
+    test_deployed_mongo_is_up(migration_target_client)
+    ensure_model_is_functional(migration_target_client, application)
+
+    migration_target_client.remove_service(application)
+
+
+def migrate_model_to_controller(source_client, dest_client):
+>>>>>>> MERGE-SOURCE
     source_client.controller_juju(
         'migrate', (model_name, dest_client.env.controller.name))
     migration_target_client = dest_client.clone(
@@ -504,31 +548,73 @@
 
 
 def ensure_migrating_with_insufficient_user_permissions_fails(
+<<<<<<< TREE
         source_client, dest_client, tmp_dir):
+=======
+        source_client, dest_client, upload_tools, tmp_dir):
+>>>>>>> MERGE-SOURCE
     """Ensure migration fails when a user does not have the right permissions.
 
     A non-superuser on a controller cannot migrate their models between
     controllers.
     """
+<<<<<<< TREE
     user_source_client, user_dest_client = create_user_on_controllers(
         source_client, dest_client, tmp_dir, 'failuser', 'addmodel')
     user_new_model = deploy_dummy_source_to_new_model(
         user_source_client, 'user-fail')
+=======
+    source_user_client, dest_user_client = create_user_on_controllers(
+        source_client, dest_client, tmp_dir, 'failuser', 'addmodel')
+
+    source_client = source_user_client.add_model(
+        source_user_client.env.clone('model-a'))
+
+    charm_path = local_charm_path(
+        charm='dummy-source', juju_ver=source_client.version)
+    source_client.deploy(charm_path)
+    source_client.wait_for_started()
+
+>>>>>>> MERGE-SOURCE
     log.info('Attempting migration process')
+<<<<<<< TREE
     expect_migration_attempt_to_fail(user_new_model, user_dest_client)
+=======
+
+    expect_migration_attempt_to_fail(source_client, dest_user_client)
+>>>>>>> MERGE-SOURCE
 
 
 def ensure_migrating_with_superuser_user_permissions_succeeds(
+<<<<<<< TREE
         source_client, dest_client, tmp_dir):
+=======
+        source_client, dest_client, upload_tools, tmp_dir):
+>>>>>>> MERGE-SOURCE
     """Ensure migration succeeds when a user has superuser permissions
 
     A user with superuser permissions is able to migrate between controllers.
     """
+<<<<<<< TREE
     user_source_client, user_dest_client = create_user_on_controllers(
         source_client, dest_client, tmp_dir, 'passuser', 'superuser')
     user_new_model = deploy_dummy_source_to_new_model(
         user_source_client, 'super-permissions')
+=======
+    source_user_client, dest_user_client = create_user_on_controllers(
+        source_client, dest_client, tmp_dir, 'passuser', 'superuser')
+
+    source_client = source_user_client.add_model(
+        source_user_client.env.clone('model-a'))
+
+    charm_path = local_charm_path(
+        charm='dummy-source', juju_ver=source_client.version)
+    source_client.deploy(charm_path)
+    source_client.wait_for_started()
+
+>>>>>>> MERGE-SOURCE
     log.info('Attempting migration process')
+<<<<<<< TREE
     migrate_model_to_controller(
         user_new_model, user_dest_client, include_user_name=True)
     log.info('SUCCESS: superuser migrated other user model.')
@@ -545,11 +631,53 @@
     :param permission: String for permissions to grant user on both
       controllers. Valid values are `EnvJujuClient.controller_permissions`.
     """
+=======
+
+    migrate_model_to_controller(source_client, dest_user_client)
+
+
+def ensure_superuser_can_migrate_other_user_models(
+        source_client, dest_client, upload_tools, tmp_dir):
+
+    norm_source_client, norm_dest_client = create_user_on_controllers(
+        source_client, dest_client, tmp_dir, 'normaluser', 'addmodel')
+
+    attempt_client = norm_source_client.add_model(
+        norm_source_client.env.clone('model-a'))
+    # This is separated into a useful method in another branch.
+    bundle = 'mongodb'
+    attempt_client.juju("deploy", (bundle))
+    attempt_client.wait_for_started()
+    attempt_client.wait_for_workloads()
+    test_deployed_mongo_is_up(attempt_client)
+
+    log.info('Showing all models available.')
+    source_client.controller_juju('models', ('--all',))
+
+    model_name = '{}/{}'.format(
+        norm_source_client.env.user_name, attempt_client.env.environment)
+    source_client.controller_juju(
+        'migrate', (model_name, dest_client.env.controller.name))
+
+
+def create_user_on_controllers(
+        source_client, dest_client, tmp_dir, username, permission):
+    # Create a user for both controllers that only has addmodel
+    # permissions not superuser.
+>>>>>>> MERGE-SOURCE
     new_user_home = os.path.join(tmp_dir, username)
     os.makedirs(new_user_home)
     new_user = User(username, 'write', [])
+<<<<<<< TREE
     source_user_client = source_client.register_user(new_user, new_user_home)
     source_client.grant(new_user.name, permission)
+=======
+
+    source_user_client = source_client.register_user(
+        new_user, new_user_home)
+    source_client.grant(new_user.name, permission)
+
+>>>>>>> MERGE-SOURCE
     second_controller_name = '{}_controllerb'.format(new_user.name)
     dest_user_client = dest_client.register_user(
         new_user,