Fixes for quota_sets v3 extension

Various fixes for the quota_sets v3 extension:

* Removes reference to ext_mgr as this is a v2 concept and causes
  the extension to fail to load

* Merges os-extended-quotas extension which was just used as a switch
  by it being loaded or not and didn't contain any content itself. The
  extension presumes the functionality is always enabled. This means
  that the force paramter must now always be passed if the client
  wants to set the new quota lower than what is already used and
  reserved

* Updates test suite and consolidates tests given extended quotas is
  no longer a separate extension

Partially implements blueprint nova-v3-api

Change-Id: I868636b526a5990f96e63168d50c2d894ed33d52

2 files changed, 41 insertions, 95 deletions

diff --git a/nova/api/openstack/compute/plugins/v3/quota_sets.py b/nova/api/openstack/compute/plugins/v3/quota_sets.py
index 67af5d127..5f31b626d 100644
--- a/nova/api/openstack/compute/plugins/v3/quota_sets.py
+++ b/nova/api/openstack/compute/plugins/v3/quota_sets.py
@@ -56,9 +56,6 @@ class QuotaTemplate(xmlutil.TemplateBuilder):
 
 class QuotaSetsController(object):
 
-    def __init__(self, ext_mgr):
-        self.ext_mgr = ext_mgr
-
     def _format_quota_set(self, project_id, quota_set):
         """Convert the quota object to a result dict."""
 
@@ -100,25 +97,14 @@ class QuotaSetsController(object):
         project_id = id
 
         bad_keys = []
-
-        # By default, we can force update the quota if the extended
-        # is not loaded
-        force_update = True
-        extended_loaded = False
-        if self.ext_mgr.is_loaded('os-extended-quotas'):
-            # force optional has been enabled, the default value of
-            # force_update need to be changed to False
-            extended_loaded = True
-            force_update = False
+        force_update = False
 
         for key, value in body['quota_set'].items():
             if (key not in QUOTAS and
                     key not in NON_QUOTA_KEYS):
                 bad_keys.append(key)
                 continue
-            if key == 'force' and extended_loaded:
-                # only check the force optional when the extended has
-                # been loaded
+            if key == 'force':
                 force_update = strutils.bool_from_string(value)
             elif key not in NON_QUOTA_KEYS and value:
                 try:
@@ -180,16 +166,14 @@ class QuotaSetsController(object):
         return self._format_quota_set(id, QUOTAS.get_defaults(context))
 
     def delete(self, req, id):
-        if self.ext_mgr.is_loaded('os-extended-quotas'):
-            context = req.environ['nova.context']
-            authorize_delete(context)
-            try:
-                nova.context.authorize_project_context(context, id)
-                QUOTAS.destroy_all_by_project(context, id)
-                return webob.Response(status_int=202)
-            except exception.NotAuthorized:
-                raise webob.exc.HTTPForbidden()
-        raise webob.exc.HTTPNotFound()
+        context = req.environ['nova.context']
+        authorize_delete(context)
+        try:
+            nova.context.authorize_project_context(context, id)
+            QUOTAS.destroy_all_by_project(context, id)
+            return webob.Response(status_int=202)
+        except exception.NotAuthorized:
+            raise webob.exc.HTTPForbidden()
 
 
 class QuotaSets(extensions.V3APIExtensionBase):
@@ -204,7 +188,7 @@ class QuotaSets(extensions.V3APIExtensionBase):
         resources = []
 
         res = extensions.ResourceExtension(ALIAS,
-                                            QuotaSetsController(self.ext_mgr),
+                                            QuotaSetsController(),
                                             member_actions={'defaults': 'GET'})
         resources.append(res)
 
diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_quota_sets.py b/nova/tests/api/openstack/compute/plugins/v3/test_quota_sets.py
index 6eea01cff..48dee4f44 100644
--- a/nova/tests/api/openstack/compute/plugins/v3/test_quota_sets.py
+++ b/nova/tests/api/openstack/compute/plugins/v3/test_quota_sets.py
@@ -41,8 +41,7 @@ class QuotaSetsTest(test.TestCase):
 
     def setUp(self):
         super(QuotaSetsTest, self).setUp()
-        self.ext_mgr = self.mox.CreateMock(extensions.ExtensionManager)
-        self.controller = quotas.QuotaSetsController(self.ext_mgr)
+        self.controller = quotas.QuotaSetsController()
 
     def test_format_quota_set(self):
         raw_quota_set = {
@@ -77,7 +76,7 @@ class QuotaSetsTest(test.TestCase):
         self.assertEqual(qs['key_pairs'], 100)
 
     def test_quotas_defaults(self):
-        uri = '/os-quota-sets/fake_tenant/defaults'
+        uri = '/os-quota-sets/defaults'
 
         req = fakes.HTTPRequestV3.blank(uri)
         res_dict = self.controller.defaults(req, 'fake_tenant')
@@ -112,8 +111,6 @@ class QuotaSetsTest(test.TestCase):
                           req, 1234)
 
     def test_quotas_update_as_admin(self):
-        self.ext_mgr.is_loaded('os-extended-quotas').AndReturn(True)
-        self.mox.ReplayAll()
         body = {'quota_set': {'instances': 50, 'cores': 50,
                               'ram': 51200, 'floating_ips': 10,
                               'fixed_ips': -1, 'metadata_items': 128,
@@ -131,8 +128,6 @@ class QuotaSetsTest(test.TestCase):
         self.assertEqual(res_dict, body)
 
     def test_quotas_update_as_user(self):
-        self.ext_mgr.is_loaded('os-extended-quotas').AndReturn(True)
-        self.mox.ReplayAll()
         body = {'quota_set': {'instances': 50, 'cores': 50,
                               'ram': 51200, 'floating_ips': 10,
                               'fixed_ips': -1, 'metadata_items': 128,
@@ -147,8 +142,6 @@ class QuotaSetsTest(test.TestCase):
                           req, 'update_me', body)
 
     def test_quotas_update_invalid_key(self):
-        self.ext_mgr.is_loaded('os-extended-quotas').AndReturn(True)
-        self.mox.ReplayAll()
         body = {'quota_set': {'instances2': -2, 'cores': -2,
                               'ram': -2, 'floating_ips': -2,
                               'metadata_items': -2, 'injected_files': -2,
@@ -160,8 +153,6 @@ class QuotaSetsTest(test.TestCase):
                           req, 'update_me', body)
 
     def test_quotas_update_invalid_limit(self):
-        self.ext_mgr.is_loaded('os-extended-quotas').AndReturn(True)
-        self.mox.ReplayAll()
         body = {'quota_set': {'instances': -2, 'cores': -2,
                               'ram': -2, 'floating_ips': -2, 'fixed_ips': -2,
                               'metadata_items': -2, 'injected_files': -2,
@@ -196,8 +187,6 @@ class QuotaSetsTest(test.TestCase):
                               'key_pairs': 100}}
         req = fakes.HTTPRequestV3.blank('/os-quota-sets/update_me',
                                       use_admin_context=True)
-        self.ext_mgr.is_loaded('os-extended-quotas').AndReturn(True)
-        self.mox.ReplayAll()
         res_dict = self.controller.update(req, 'update_me', body)
         self.assertEqual(res_dict, expected_resp)
 
@@ -224,8 +213,6 @@ class QuotaSetsTest(test.TestCase):
                               'key_pairs': 100}}
         req = fakes.HTTPRequestV3.blank('/os-quota-sets/update_me',
                                       use_admin_context=True)
-        self.ext_mgr.is_loaded('os-extended-quotas').AndReturn(True)
-        self.mox.ReplayAll()
         res_dict = self.controller.update(req, 'update_me', body)
         self.assertEqual(res_dict, expected_resp)
 
@@ -242,21 +229,10 @@ class QuotaSetsTest(test.TestCase):
                               'key_pairs': 100}}
         req = fakes.HTTPRequestV3.blank('/os-quota-sets/update_me',
                                       use_admin_context=True)
-        self.ext_mgr.is_loaded('os-extended-quotas').AndReturn(True)
-        self.mox.ReplayAll()
         self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update,
                           req, 'update_me', body)
 
-    def test_delete_quotas_when_extension_not_loaded(self):
-        self.ext_mgr.is_loaded('os-extended-quotas').AndReturn(False)
-        self.mox.ReplayAll()
-        req = fakes.HTTPRequestV3.blank('/os-quota-sets/1234')
-        self.assertRaises(webob.exc.HTTPNotFound, self.controller.delete,
-                          req, 1234)
-
     def test_quotas_delete_as_unauthorized_user(self):
-        self.ext_mgr.is_loaded('os-extended-quotas').AndReturn(True)
-        self.mox.ReplayAll()
         req = fakes.HTTPRequestV3.blank('/os-quota-sets/1234')
         self.assertRaises(webob.exc.HTTPForbidden, self.controller.delete,
                           req, 1234)
@@ -265,7 +241,6 @@ class QuotaSetsTest(test.TestCase):
         context = context_maker.get_admin_context()
         self.req = fakes.HTTPRequestV3.blank('/os-quota-sets/1234')
         self.req.environ['nova.context'] = context
-        self.ext_mgr.is_loaded('os-extended-quotas').AndReturn(True)
         self.mox.StubOutWithMock(quota.QUOTAS,
                                  "destroy_all_by_project")
         quota.QUOTAS.destroy_all_by_project(context, 1234)
@@ -274,6 +249,34 @@ class QuotaSetsTest(test.TestCase):
         self.mox.VerifyAll()
         self.assertEqual(res.status_int, 202)
 
+    def test_quotas_update_exceed_in_used(self):
+
+        body = {'quota_set': {'cores': 10}}
+
+        self.stubs.Set(quotas.QuotaSetsController, '_get_quotas',
+                       fake_get_quotas)
+        req = fakes.HTTPRequestV3.blank('/os-quota-sets/update_me',
+                                      use_admin_context=True)
+        self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update,
+                          req, 'update_me', body)
+
+    def test_quotas_force_update_exceed_in_used(self):
+        self.stubs.Set(quotas.QuotaSetsController, '_get_quotas',
+                       fake_get_quotas)
+        req = fakes.HTTPRequestV3.blank('/os-quota-sets/update_me',
+                                      use_admin_context=True)
+        expected = {'quota_set': {'ram': 25600, 'instances': 200, 'cores': 10}}
+        body = {'quota_set': {'ram': 25600,
+                              'instances': 200,
+                              'cores': 10,
+                              'force': 'True'}}
+        fake_quotas.get('ram')['limit'] = 25600
+        fake_quotas.get('cores')['limit'] = 10
+        fake_quotas.get('instances')['limit'] = 200
+
+        res_dict = self.controller.update(req, 'update_me', body)
+        self.assertEqual(res_dict, expected)
+
 
 class QuotaXMLSerializerTest(test.TestCase):
     def setUp(self):
@@ -356,44 +359,3 @@ def fake_get_quotas(self, context, id, usages=False):
         return fake_quotas
     else:
         return dict((k, v['limit']) for k, v in fake_quotas.items())
-
-
-class ExtendedQuotasTest(test.TestCase):
-
-    def setUp(self):
-        super(ExtendedQuotasTest, self).setUp()
-        self.ext_mgr = self.mox.CreateMock(extensions.ExtensionManager)
-        self.controller = quotas.QuotaSetsController(self.ext_mgr)
-
-    def test_quotas_update_exceed_in_used(self):
-
-        body = {'quota_set': {'cores': 10}}
-
-        self.stubs.Set(quotas.QuotaSetsController, '_get_quotas',
-                       fake_get_quotas)
-        req = fakes.HTTPRequestV3.blank('/os-quota-sets/update_me',
-                                      use_admin_context=True)
-        self.ext_mgr.is_loaded('os-extended-quotas').AndReturn(True)
-        self.mox.ReplayAll()
-
-        self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update,
-                          req, 'update_me', body)
-
-    def test_quotas_force_update_exceed_in_used(self):
-        self.stubs.Set(quotas.QuotaSetsController, '_get_quotas',
-                       fake_get_quotas)
-        req = fakes.HTTPRequestV3.blank('/os-quota-sets/update_me',
-                                      use_admin_context=True)
-        expected = {'quota_set': {'ram': 25600, 'instances': 200, 'cores': 10}}
-        body = {'quota_set': {'ram': 25600,
-                              'instances': 200,
-                              'cores': 10,
-                              'force': 'True'}}
-        fake_quotas.get('ram')['limit'] = 25600
-        fake_quotas.get('cores')['limit'] = 10
-        fake_quotas.get('instances')['limit'] = 200
-
-        self.ext_mgr.is_loaded('os-extended-quotas').AndReturn(True)
-        self.mox.ReplayAll()
-        res_dict = self.controller.update(req, 'update_me', body)
-        self.assertEqual(res_dict, expected)