Merge "Remove auth-related nova-manage commands"

1 files changed, 0 insertions, 59 deletions

diff --git a/nova/tests/test_nova_manage.py b/nova/tests/test_nova_manage.py
index c9e2f1bbf..e515bd51d 100644
--- a/nova/tests/test_nova_manage.py
+++ b/nova/tests/test_nova_manage.py
@@ -234,62 +234,3 @@ class NetworkCommandsTestCase(test.TestCase):
         self._test_modify_base(update_value={'project_id': None, 'host': None},
                                project=None, host=None, dis_project=True,
                                dis_host=True)
-
-
-class ExportAuthTestCase(test.TestCase):
-
-    def test_export_with_noauth(self):
-        self._do_test_export()
-
-    def test_export_with_deprecated_auth(self):
-        self.flags(auth_strategy='deprecated')
-        self._do_test_export(noauth=False)
-
-    def _do_test_export(self, noauth=True):
-        self.flags(allowed_roles=['role1', 'role2'])
-        am = nova.auth.manager.AuthManager(new=True)
-        user1 = am.create_user('user1', 'a1', 's1')
-        user2 = am.create_user('user2', 'a2', 's2')
-        user3 = am.create_user('user3', 'a3', 's3')
-        proj1 = am.create_project('proj1', user1, member_users=[user1, user2])
-        proj2 = am.create_project('proj2', user2, member_users=[user2, user3])
-        am.add_role(user1, 'role1', proj1)
-        am.add_role(user1, 'role1', proj2)
-        am.add_role(user3, 'role1', proj1)
-        am.add_role(user3, 'role2', proj2)
-
-        commands = nova_manage.ExportCommands()
-        output = commands._get_auth_data()
-
-        def pw(idx):
-            return ('user' if noauth else 'a') + str(idx)
-
-        expected = {
-            "users": [
-                {"id": "user1", "name": "user1", 'password': pw(1)},
-                {"id": "user2", "name": "user2", 'password': pw(2)},
-                {"id": "user3", "name": "user3", 'password': pw(3)},
-            ],
-            "roles": ["role1", "role2"],
-            "role_user_tenant_list": [
-                {"user_id": "user1", "role": "role1", "tenant_id": "proj1"},
-                {"user_id": "user3", "role": "role2", "tenant_id": "proj2"},
-            ],
-            "user_tenant_list": [
-                {"tenant_id": "proj1", "user_id": "user1"},
-                {"tenant_id": "proj1", "user_id": "user2"},
-                {"tenant_id": "proj2", "user_id": "user2"},
-                {"tenant_id": "proj2", "user_id": "user3"},
-            ],
-            "ec2_credentials": [
-                {"access_key": pw(1), "secret_key": "s1", "user_id": "user1"},
-                {"access_key": pw(2), "secret_key": "s2", "user_id": "user2"},
-                {"access_key": pw(3), "secret_key": "s3", "user_id": "user3"},
-            ],
-            "tenants": [
-                {"description": "proj1", "id": "proj1", "name": "proj1"},
-                {"description": "proj2", "id": "proj2", "name": "proj2"},
-            ],
-        }
-
-        self.assertDictMatch(output, expected)