Merge lp:~veebers/juju-ci-tools/migration-check-all-model-names into lp:juju-ci-tools

[Christopher Lee]

Need to check '--all' model names as other user models don't show up by default.

When getting model details (as superuser) for models that are owned by other
users need to pass the --all flag.

[Curtis Hovey (sinzui)]

Is is possible to support --all in EnvJujuClient? See inline.

review: Needs Information (code)

[lp:~veebers/juju-ci-tools/migration-check-all-model-names]

1816. By Christopher Lee on 2016-12-15

Add argument to get_models so it returns models for all users.

1817. By Christopher Lee on 2016-12-15

Use jujupy supplied model listing.

Unmerged revisions

1817. By Christopher Lee on 2016-12-15

Use jujupy supplied model listing.

1816. By Christopher Lee on 2016-12-15

Add argument to get_models so it returns models for all users.

1815. By Christopher Lee on 2016-12-15

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

1814. By Christopher Lee on 2016-12-15

Update unit tests, some still need work.

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-16 00:00:45 +0000
+++ assess_model_migration.py	2016-12-16 00:00:45 +0000
@@ -109,7 +109,7 @@
     with client.check_timeouts():
         with client.ignore_soft_deadline():
             for _ in until_timeout(timeout):
-                models = client.get_controller_client().get_models()
+                models = client.get_models(all_users=True)
                 if model_name in [m['name'] for m in models['models']]:
                     return
                 sleep(1)
@@ -256,9 +256,11 @@
     log.info('Showing all models available.')
     source_client.controller_juju('models', ('--all',))
 
+    # User qualified name for use with migration command.
     user_qualified_model_name = qualified_model_name(
         attempt_client.env.environment,
         attempt_client.env.user_name)
+    unqualified_model_name = attempt_client.env.environment
 
     source_client.controller_juju(
         'migrate',
@@ -267,7 +269,7 @@
     migration_client = dest_client.clone(
         dest_client.env.clone(user_qualified_model_name))
     wait_for_model(
-        migration_client, user_qualified_model_name)
+        migration_client, unqualified_model_name)
     migration_client.wait_for_started()
 
 

=== modified file 'jujupy.py'
--- jujupy.py	2016-12-15 20:14:48 +0000
+++ jujupy.py	2016-12-16 00:00:45 +0000
@@ -2159,15 +2159,17 @@
         """List the models registered with the current controller."""
         self.controller_juju('list-models', ())
 
-    def get_models(self):
+    def get_models(self, all_users=False):
         """return a models dict with a 'models': [] key-value pair.
 
         The server has 120 seconds to respond because this method is called
         often when tearing down a controller-less deployment.
         """
-        output = self.get_juju_output(
-            'list-models', '-c', self.env.controller.name, '--format', 'yaml',
-            include_e=False, timeout=120)
+        args = [
+            'list-models', '-c', self.env.controller.name, '--format', 'yaml']
+        if all_users:
+            args.append('--all')
+        output = self.get_juju_output(*args, include_e=False, timeout=120)
         models = yaml.safe_load(output)
         return models
 

=== modified file 'tests/test_assess_model_migration.py'
--- tests/test_assess_model_migration.py	2016-12-16 00:00:45 +0000
+++ tests/test_assess_model_migration.py	2016-12-16 00:00:45 +0000
@@ -428,26 +428,23 @@
                 amm.wait_for_model(mock_client, 'TestModelName')
 
     def test_returns_when_model_found(self):
-        controller_client = Mock()
-        controller_client.get_models.return_value = dict(
-            models=[
-                dict(name='TestModelName')])
         mock_client = _get_time_noop_mock_client()
-        mock_client.get_controller_client.return_value = controller_client
-        amm.wait_for_model(mock_client, 'TestModelName')
+        with patch.object(
+                amm, 'get_all_model_names',
+                autospec=True, return_value=['TestModelName']) as m_gamn:
+            amm.wait_for_model(mock_client, 'TestModelName')
+        m_gamn.assert_called_once_with(mock_client)
 
     def test_pauses_between_failed_matches(self):
-        controller_client = Mock()
-        controller_client.get_models.side_effect = [
-            dict(models=[]),    # Failed check
-            dict(models=[dict(name='TestModelName')]),  # Successful check
-            ]
+        attempts = ['', 'TestModelName']
         mock_client = _get_time_noop_mock_client()
-        mock_client.get_controller_client.return_value = controller_client
-
-        with patch.object(amm, 'sleep') as mock_sleep:
-            amm.wait_for_model(mock_client, 'TestModelName')
-            mock_sleep.assert_called_once_with(1)
+        with patch.object(
+                amm, 'get_all_model_names',
+                autospec=True, side_effect=attempts) as m_gamn:
+            with patch.object(amm, 'sleep') as mock_sleep:
+                amm.wait_for_model(mock_client, 'TestModelName')
+                mock_sleep.assert_called_once_with(1)
+        self.assertEqual(m_gamn.call_count, 2)
 
     def test_suppresses_deadline(self):
         client = EnvJujuClient(JujuData('local', juju_home=''), None, None)

=== modified file 'tests/test_jujupy.py'
--- tests/test_jujupy.py	2016-12-15 16:37:15 +0000
+++ tests/test_jujupy.py	2016-12-16 00:00:45 +0000
@@ -2022,6 +2022,32 @@
         }
         self.assertEqual(expected_models, models)
 
+    def test_get_models_supplies_all_user_models(self):
+        data = """\
+            models:
+            - name: foo
+              model-uuid: aaaa
+              owner: admin
+            - name: bar
+              model-uuid: bbbb
+              owner: admin
+            current-model: foo
+        """
+        client = EnvJujuClient(JujuData('baz'), None, None)
+        with patch.object(client, 'get_juju_output',
+                          return_value=data) as gjo_mock:
+            models = client.get_models(all_users=True)
+        gjo_mock.assert_called_once_with(
+            'list-models', '-c', 'baz', '--format', 'yaml', '--all',
+            include_e=False, timeout=120)
+        expected_models = {
+            'models': [
+                {'name': 'foo', 'model-uuid': 'aaaa', 'owner': 'admin'},
+                {'name': 'bar', 'model-uuid': 'bbbb', 'owner': 'admin'}],
+            'current-model': 'foo'
+        }
+        self.assertEqual(expected_models, models)
+
     def test_iter_model_clients(self):
         data = """\
             models: