openstack/nova
Code Issues Proposed changes

refactor onset_files quota checking

Browse Source
This commit is contained in:
Mark Washenberger
2011-03-15 14:33:45 -04:00
parent 47b751e246
commit 1d69d49912
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nova/compute/api.py
View File

@@ -86,6 +86,8 @@ class API(base.Base):
Raises a QuotaError if any limit is exceeded Raises a QuotaError if any limit is exceeded
""" """
if onset_files is None:
return
limit = quota.allowed_onset_files(context) limit = quota.allowed_onset_files(context)
if len(onset_files) > limit: if len(onset_files) > limit:
raise quota.QuotaError(code="OnsetFileLimitExceeded") raise quota.QuotaError(code="OnsetFileLimitExceeded")
@@ -96,7 +98,6 @@ class API(base.Base):
raise quota.QuotaError(code="OnsetFilePathLimitExceeded") raise quota.QuotaError(code="OnsetFilePathLimitExceeded")
if len(content) > content_limit: if len(content) > content_limit:
raise quota.QuotaError(code="OnsetFileContentLimitExceeded") raise quota.QuotaError(code="OnsetFileContentLimitExceeded")
return onset_files
def create(self, context, instance_type, def create(self, context, instance_type,
image_id, kernel_id=None, ramdisk_id=None, image_id, kernel_id=None, ramdisk_id=None,
@@ -142,8 +143,7 @@ class API(base.Base):
LOG.warn(msg) LOG.warn(msg)
raise quota.QuotaError(msg, "MetadataLimitExceeded") raise quota.QuotaError(msg, "MetadataLimitExceeded")
if onset_files is not None: self._check_onset_file_quota(context, onset_files)
onset_files = self._check_onset_file_quota(context, onset_files)
image = self.image_service.show(context, image_id) image = self.image_service.show(context, image_id)