quota: remove unused code
The BaseResource.quota() method was not being used anywhere other than unit tests. Remove it. Change-Id: I7a4d63aa11dc1883ed2f924f85b97b0dec30f9d3
This commit is contained in:
Jay Pipes
parent
297de7fb9f
commit
bcb0bc7fe9
|
|
@ -869,52 +869,6 @@ class BaseResource(object):
|
|||
self.name = name
|
||||
self.flag = flag
|
||||
|
||||
def quota(self, driver, context, **kwargs):
|
||||
"""Given a driver and context, obtain the quota for this
|
||||
resource.
|
||||
|
||||
:param driver: A quota driver.
|
||||
:param context: The request context.
|
||||
:param project_id: The project to obtain the quota value for.
|
||||
If not provided, it is taken from the
|
||||
context. If it is given as None, no
|
||||
project-specific quota will be searched
|
||||
for.
|
||||
:param quota_class: The quota class corresponding to the
|
||||
project, or for which the quota is to be
|
||||
looked up. If not provided, it is taken
|
||||
from the context. If it is given as None,
|
||||
no quota class-specific quota will be
|
||||
searched for. Note that the quota class
|
||||
defaults to the value in the context,
|
||||
which may not correspond to the project if
|
||||
project_id is not the same as the one in
|
||||
the context.
|
||||
"""
|
||||
|
||||
# Get the project ID
|
||||
project_id = kwargs.get('project_id', context.project_id)
|
||||
|
||||
# Ditto for the quota class
|
||||
quota_class = kwargs.get('quota_class', context.quota_class)
|
||||
|
||||
# Look up the quota for the project
|
||||
if project_id:
|
||||
try:
|
||||
return driver.get_by_project(context, project_id, self.name)
|
||||
except exception.ProjectQuotaNotFound:
|
||||
pass
|
||||
|
||||
# Try for the quota class
|
||||
if quota_class:
|
||||
try:
|
||||
return driver.get_by_class(context, quota_class, self.name)
|
||||
except exception.QuotaClassNotFound:
|
||||
pass
|
||||
|
||||
# OK, return the default
|
||||
return self.default
|
||||
|
||||
@property
|
||||
def default(self):
|
||||
"""Return the default value of the quota."""
|
||||
|
|
|
|||
|
|
@ -373,77 +373,6 @@ class BaseResourceTestCase(test.TestCase):
|
|||
self.assertEqual(resource.flag, 'instances')
|
||||
self.assertEqual(resource.default, -1)
|
||||
|
||||
def test_quota_no_project_no_class(self):
|
||||
self.flags(instances=10, group='quota')
|
||||
resource = quota.BaseResource('test_resource', 'instances')
|
||||
driver = FakeDriver()
|
||||
context = FakeContext(None, None)
|
||||
quota_value = resource.quota(driver, context)
|
||||
|
||||
self.assertEqual(quota_value, 10)
|
||||
|
||||
def test_quota_with_project_no_class(self):
|
||||
self.flags(instances=10, group='quota')
|
||||
resource = quota.BaseResource('test_resource', 'instances')
|
||||
driver = FakeDriver(by_project=dict(
|
||||
test_project=dict(test_resource=15),
|
||||
))
|
||||
context = FakeContext('test_project', None)
|
||||
quota_value = resource.quota(driver, context)
|
||||
|
||||
self.assertEqual(quota_value, 15)
|
||||
|
||||
def test_quota_no_project_with_class(self):
|
||||
self.flags(instances=10, group='quota')
|
||||
resource = quota.BaseResource('test_resource', 'instances')
|
||||
driver = FakeDriver(by_class=dict(
|
||||
test_class=dict(test_resource=20),
|
||||
))
|
||||
context = FakeContext(None, 'test_class')
|
||||
quota_value = resource.quota(driver, context)
|
||||
|
||||
self.assertEqual(quota_value, 20)
|
||||
|
||||
def test_quota_with_project_with_class(self):
|
||||
self.flags(instances=10, group='quota')
|
||||
resource = quota.BaseResource('test_resource', 'instances')
|
||||
driver = FakeDriver(by_project=dict(
|
||||
test_project=dict(test_resource=15),
|
||||
),
|
||||
by_class=dict(
|
||||
test_class=dict(test_resource=20),
|
||||
))
|
||||
context = FakeContext('test_project', 'test_class')
|
||||
quota_value = resource.quota(driver, context)
|
||||
|
||||
self.assertEqual(quota_value, 15)
|
||||
|
||||
def test_quota_override_project_with_class(self):
|
||||
self.flags(instances=10, group='quota')
|
||||
resource = quota.BaseResource('test_resource', 'instances')
|
||||
driver = FakeDriver(by_project=dict(
|
||||
test_project=dict(test_resource=15),
|
||||
override_project=dict(test_resource=20),
|
||||
))
|
||||
context = FakeContext('test_project', 'test_class')
|
||||
quota_value = resource.quota(driver, context,
|
||||
project_id='override_project')
|
||||
|
||||
self.assertEqual(quota_value, 20)
|
||||
|
||||
def test_quota_with_project_override_class(self):
|
||||
self.flags(instances=10, group='quota')
|
||||
resource = quota.BaseResource('test_resource', 'instances')
|
||||
driver = FakeDriver(by_class=dict(
|
||||
test_class=dict(test_resource=15),
|
||||
override_class=dict(test_resource=20),
|
||||
))
|
||||
context = FakeContext('test_project', 'test_class')
|
||||
quota_value = resource.quota(driver, context,
|
||||
quota_class='override_class')
|
||||
|
||||
self.assertEqual(quota_value, 20)
|
||||
|
||||
def test_valid_method_call_check_invalid_input(self):
|
||||
resources = {'dummy': 1}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue