Remove deprecated auth-related api extensions

* Delete the accounts and users extensions
* Delete associated tests
* Related to bp remove-deprecated-auth

Change-Id: I429551dbb39ec569c6d2c229fa0c3cafd9e56f11

3 files changed, 0 insertions, 305 deletions

diff --git a/nova/tests/api/openstack/compute/contrib/test_accounts.py b/nova/tests/api/openstack/compute/contrib/test_accounts.py
deleted file mode 100644
index f5c8ff62e..000000000
--- a/nova/tests/api/openstack/compute/contrib/test_accounts.py
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 2010 OpenStack LLC.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-from lxml import etree
-import webob
-
-from nova.api.openstack.compute.contrib import accounts
-from nova.auth import manager as auth_manager
-from nova.openstack.common import jsonutils
-from nova import test
-from nova.tests.api.openstack import fakes
-
-
-def fake_init(self):
-    self.manager = fakes.FakeAuthManager()
-
-
-class AccountsTest(test.TestCase):
-    def setUp(self):
-        super(AccountsTest, self).setUp()
-        self.flags(verbose=True)
-        self.stubs.Set(accounts.Controller, '__init__',
-                       fake_init)
-        fakes.FakeAuthManager.clear_fakes()
-        fakes.FakeAuthDatabase.data = {}
-        fakes.stub_out_networking(self.stubs)
-        fakes.stub_out_rate_limiting(self.stubs)
-
-        fakemgr = fakes.FakeAuthManager()
-        joeuser = auth_manager.User('id1', 'guy1', 'acc1', 'secret1', False)
-        superuser = auth_manager.User('id2', 'guy2', 'acc2', 'secret2', True)
-        fakemgr.add_user(joeuser)
-        fakemgr.add_user(superuser)
-        fakemgr.create_project('test1', joeuser)
-        fakemgr.create_project('test2', superuser)
-
-    def test_get_account(self):
-        req = webob.Request.blank('/v2/fake/accounts/test1')
-        res = req.get_response(fakes.wsgi_app())
-        res_dict = jsonutils.loads(res.body)
-
-        self.assertEqual(res.status_int, 200)
-        self.assertEqual(res_dict['account']['id'], 'test1')
-        self.assertEqual(res_dict['account']['name'], 'test1')
-        self.assertEqual(res_dict['account']['manager'], 'id1')
-
-    def test_get_account_xml(self):
-        req = webob.Request.blank('/v2/fake/accounts/test1.xml')
-        res = req.get_response(fakes.wsgi_app())
-        res_tree = etree.fromstring(res.body)
-
-        self.assertEqual(res.status_int, 200)
-        self.assertEqual('account', res_tree.tag)
-        self.assertEqual('test1', res_tree.get('id'))
-        self.assertEqual('test1', res_tree.get('name'))
-        self.assertEqual('id1', res_tree.get('manager'))
-
-    def test_account_delete(self):
-        req = webob.Request.blank('/v2/fake/accounts/test1')
-        req.method = 'DELETE'
-        res = req.get_response(fakes.wsgi_app())
-        self.assertTrue('test1' not in fakes.FakeAuthManager.projects)
-        self.assertEqual(res.status_int, 200)
-
-    def test_account_create(self):
-        body = dict(account=dict(description='test account',
-                                 manager='id1'))
-        req = webob.Request.blank('/v2/fake/accounts/newacct')
-        req.headers["Content-Type"] = "application/json"
-        req.method = 'PUT'
-        req.body = jsonutils.dumps(body)
-
-        res = req.get_response(fakes.wsgi_app())
-        res_dict = jsonutils.loads(res.body)
-
-        self.assertEqual(res.status_int, 200)
-        self.assertEqual(res_dict['account']['id'], 'newacct')
-        self.assertEqual(res_dict['account']['name'], 'newacct')
-        self.assertEqual(res_dict['account']['description'], 'test account')
-        self.assertEqual(res_dict['account']['manager'], 'id1')
-        self.assertTrue('newacct' in
-                        fakes.FakeAuthManager.projects)
-        self.assertEqual(len(fakes.FakeAuthManager.projects.values()), 3)
-
-    def test_account_create_xml(self):
-        body = dict(account=dict(description='test account',
-                                 manager='id1'))
-        req = webob.Request.blank('/v2/fake/accounts/newacct.xml')
-        req.headers["Content-Type"] = "application/json"
-        req.method = 'PUT'
-        req.body = jsonutils.dumps(body)
-
-        res = req.get_response(fakes.wsgi_app())
-        res_tree = etree.fromstring(res.body)
-
-        self.assertEqual(res.status_int, 200)
-        self.assertEqual(res_tree.tag, 'account')
-        self.assertEqual(res_tree.get('id'), 'newacct')
-        self.assertEqual(res_tree.get('name'), 'newacct')
-        self.assertEqual(res_tree.get('description'), 'test account')
-        self.assertEqual(res_tree.get('manager'), 'id1')
-        self.assertTrue('newacct' in
-                        fakes.FakeAuthManager.projects)
-        self.assertEqual(len(fakes.FakeAuthManager.projects.values()), 3)
-
-    def test_account_update(self):
-        body = dict(account=dict(description='test account',
-                                 manager='id2'))
-        req = webob.Request.blank('/v2/fake/accounts/test1')
-        req.headers["Content-Type"] = "application/json"
-        req.method = 'PUT'
-        req.body = jsonutils.dumps(body)
-
-        res = req.get_response(fakes.wsgi_app())
-        res_dict = jsonutils.loads(res.body)
-
-        self.assertEqual(res.status_int, 200)
-        self.assertEqual(res_dict['account']['id'], 'test1')
-        self.assertEqual(res_dict['account']['name'], 'test1')
-        self.assertEqual(res_dict['account']['description'], 'test account')
-        self.assertEqual(res_dict['account']['manager'], 'id2')
-        self.assertEqual(len(fakes.FakeAuthManager.projects.values()), 2)
-
-    def test_account_update_xml(self):
-        body = dict(account=dict(description='test account',
-                                 manager='id2'))
-        req = webob.Request.blank('/v2/fake/accounts/test1.xml')
-        req.headers["Content-Type"] = "application/json"
-        req.method = 'PUT'
-        req.body = jsonutils.dumps(body)
-
-        res = req.get_response(fakes.wsgi_app())
-        res_tree = etree.fromstring(res.body)
-
-        self.assertEqual(res.status_int, 200)
-        self.assertEqual(res_tree.tag, 'account')
-        self.assertEqual(res_tree.get('id'), 'test1')
-        self.assertEqual(res_tree.get('name'), 'test1')
-        self.assertEqual(res_tree.get('description'), 'test account')
-        self.assertEqual(res_tree.get('manager'), 'id2')
-        self.assertEqual(len(fakes.FakeAuthManager.projects.values()), 2)
diff --git a/nova/tests/api/openstack/compute/contrib/test_users.py b/nova/tests/api/openstack/compute/contrib/test_users.py
deleted file mode 100644
index bec52f5f7..000000000
--- a/nova/tests/api/openstack/compute/contrib/test_users.py
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 2010 OpenStack LLC.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-from lxml import etree
-
-from nova.api.openstack.compute.contrib import users
-import nova.auth.manager as auth_manager
-from nova import test
-from nova.tests.api.openstack import fakes
-from nova import utils
-
-
-def fake_init(self):
-    self.manager = fakes.FakeAuthManager()
-
-
-class UsersTest(test.TestCase):
-    def setUp(self):
-        super(UsersTest, self).setUp()
-        self.flags(verbose=True)
-        self.stubs.Set(users.Controller, '__init__',
-                       fake_init)
-        fakes.FakeAuthManager.clear_fakes()
-        fakes.FakeAuthManager.projects = dict(testacct=auth_manager.Project(
-                                                               'testacct',
-                                                               'testacct',
-                                                               'id1',
-                                                               'test',
-                                                               []))
-        fakes.FakeAuthDatabase.data = {}
-        fakes.stub_out_networking(self.stubs)
-        fakes.stub_out_rate_limiting(self.stubs)
-
-        fakemgr = fakes.FakeAuthManager()
-        fakemgr.add_user(auth_manager.User('id1', 'guy1',
-                'acc1', 'secret1', False))
-        fakemgr.add_user(auth_manager.User('id2', 'guy2',
-                'acc2', 'secret2', True))
-
-        self.controller = users.Controller()
-
-    def test_get_user_list(self):
-        req = fakes.HTTPRequest.blank('/v2/fake/users')
-        res_dict = self.controller.index(req)
-
-        self.assertEqual(len(res_dict['users']), 2)
-
-    def test_get_user_by_id(self):
-        req = fakes.HTTPRequest.blank('/v2/fake/users/id2')
-        res_dict = self.controller.show(req, 'id2')
-
-        self.assertEqual(res_dict['user']['id'], 'id2')
-        self.assertEqual(res_dict['user']['name'], 'guy2')
-        self.assertEqual(res_dict['user']['secret'], 'secret2')
-        self.assertEqual(res_dict['user']['admin'], True)
-
-    def test_user_delete(self):
-        req = fakes.HTTPRequest.blank('/v2/fake/users/id1')
-        self.controller.delete(req, 'id1')
-
-        self.assertTrue('id1' not in [u.id for u in
-                        fakes.FakeAuthManager.auth_data])
-
-    def test_user_create(self):
-        secret = utils.generate_password()
-        body = dict(user=dict(name='test_guy',
-                              access='acc3',
-                              secret=secret,
-                              admin=True))
-        req = fakes.HTTPRequest.blank('/v2/fake/users')
-        res_dict = self.controller.create(req, body)
-
-        # NOTE(justinsb): This is a questionable assertion in general
-        # fake sets id=name, but others might not...
-        self.assertEqual(res_dict['user']['id'], 'test_guy')
-
-        self.assertEqual(res_dict['user']['name'], 'test_guy')
-        self.assertEqual(res_dict['user']['access'], 'acc3')
-        self.assertEqual(res_dict['user']['secret'], secret)
-        self.assertEqual(res_dict['user']['admin'], True)
-        self.assertTrue('test_guy' in [u.id for u in
-                        fakes.FakeAuthManager.auth_data])
-        self.assertEqual(len(fakes.FakeAuthManager.auth_data), 3)
-
-    def test_user_update(self):
-        new_secret = utils.generate_password()
-        body = dict(user=dict(name='guy2',
-                              access='acc2',
-                              secret=new_secret))
-
-        req = fakes.HTTPRequest.blank('/v2/fake/users/id2')
-        res_dict = self.controller.update(req, 'id2', body)
-
-        self.assertEqual(res_dict['user']['id'], 'id2')
-        self.assertEqual(res_dict['user']['name'], 'guy2')
-        self.assertEqual(res_dict['user']['access'], 'acc2')
-        self.assertEqual(res_dict['user']['secret'], new_secret)
-        self.assertEqual(res_dict['user']['admin'], True)
-
-
-class TestUsersXMLSerializer(test.TestCase):
-
-    def test_index(self):
-        serializer = users.UsersTemplate()
-        fixture = {'users': [{'id': 'id1',
-                              'name': 'guy1',
-                              'secret': 'secret1',
-                              'admin': False},
-                             {'id': 'id2',
-                              'name': 'guy2',
-                              'secret': 'secret2',
-                              'admin': True}]}
-
-        output = serializer.serialize(fixture)
-        res_tree = etree.XML(output)
-
-        self.assertEqual(res_tree.tag, 'users')
-        self.assertEqual(len(res_tree), 2)
-        self.assertEqual(res_tree[0].tag, 'user')
-        self.assertEqual(res_tree[0].get('id'), 'id1')
-        self.assertEqual(res_tree[1].tag, 'user')
-        self.assertEqual(res_tree[1].get('id'), 'id2')
-
-    def test_show(self):
-        serializer = users.UserTemplate()
-        fixture = {'user': {'id': 'id2',
-                            'name': 'guy2',
-                            'secret': 'secret2',
-                            'admin': True}}
-
-        output = serializer.serialize(fixture)
-        res_tree = etree.XML(output)
-
-        self.assertEqual(res_tree.tag, 'user')
-        self.assertEqual(res_tree.get('id'), 'id2')
-        self.assertEqual(res_tree.get('name'), 'guy2')
-        self.assertEqual(res_tree.get('secret'), 'secret2')
-        self.assertEqual(res_tree.get('admin'), 'True')
diff --git a/nova/tests/api/openstack/compute/test_extensions.py b/nova/tests/api/openstack/compute/test_extensions.py
index 7db25100a..c426a5727 100644
--- a/nova/tests/api/openstack/compute/test_extensions.py
+++ b/nova/tests/api/openstack/compute/test_extensions.py
@@ -151,7 +151,6 @@ class ExtensionControllerTest(ExtensionTestCase):
     def setUp(self):
         super(ExtensionControllerTest, self).setUp()
         self.ext_list = [
-            "Accounts",
             "AdminActions",
             "Aggregates",
             "Certificates",
@@ -182,7 +181,6 @@ class ExtensionControllerTest(ExtensionTestCase):
             "ServerDiagnostics",
             "ServerStartStop",
             "SimpleTenantUsage",
-            "Users",
             "VirtualInterfaces",
             "Volumes",
             "VolumeTypes",