x/python-ganttclient
Code Issues Proposed changes

Merge "nova-manage doesn't validate key to update the quota"

Browse Source
This commit is contained in:
Jenkins
2012-10-14 23:39:33 +00:00
committed by Gerrit Code Review
parent 098c278357 0b30122586
commit 2364c3d30a
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/nova-manage
View File

@@ -221,13 +221,17 @@ class ProjectCommands(object):
def quota(self, project_id, key=None, value=None): def quota(self, project_id, key=None, value=None):
"""Set or display quotas for project""" """Set or display quotas for project"""
ctxt = context.get_admin_context() ctxt = context.get_admin_context()
if key: project_quota = QUOTAS.get_project_quotas(ctxt, project_id)
if key and key in project_quota:
if value.lower() == 'unlimited': if value.lower() == 'unlimited':
value = -1 value = -1
try: try:
db.quota_update(ctxt, project_id, key, value) db.quota_update(ctxt, project_id, key, value)
except exception.ProjectQuotaNotFound: except exception.ProjectQuotaNotFound:
db.quota_create(ctxt, project_id, key, value) db.quota_create(ctxt, project_id, key, value)
else:
print "error: Invalid key %s supplied for update" % key
sys.exit(2)
project_quota = QUOTAS.get_project_quotas(ctxt, project_id) project_quota = QUOTAS.get_project_quotas(ctxt, project_id)
for key, value in project_quota.iteritems(): for key, value in project_quota.iteritems():
if value['limit'] < 0 or value['limit'] is None: if value['limit'] < 0 or value['limit'] is None: