diff options
| author | Mark Washenberger <mark.washenberger@rackspace.com> | 2011-03-15 14:33:45 -0400 |
|---|---|---|
| committer | Mark Washenberger <mark.washenberger@rackspace.com> | 2011-03-15 14:33:45 -0400 |
| commit | 1d69d499124317aa1a9cf7d4bc54db2ff0bc3be9 (patch) | |
| tree | f9d2de01ca963290dcaec169607c9b1c4688dab7 /nova | |
| parent | 47b751e24651fa7d376e4df03a56430364dd811f (diff) | |
| download | nova-1d69d499124317aa1a9cf7d4bc54db2ff0bc3be9.tar.gz nova-1d69d499124317aa1a9cf7d4bc54db2ff0bc3be9.tar.xz nova-1d69d499124317aa1a9cf7d4bc54db2ff0bc3be9.zip | |
refactor onset_files quota checking
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/compute/api.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index b6ef889f6..c11059a28 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -86,6 +86,8 @@ class API(base.Base): Raises a QuotaError if any limit is exceeded """ + if onset_files is None: + return limit = quota.allowed_onset_files(context) if len(onset_files) > limit: raise quota.QuotaError(code="OnsetFileLimitExceeded") @@ -96,7 +98,6 @@ class API(base.Base): raise quota.QuotaError(code="OnsetFilePathLimitExceeded") if len(content) > content_limit: raise quota.QuotaError(code="OnsetFileContentLimitExceeded") - return onset_files def create(self, context, instance_type, image_id, kernel_id=None, ramdisk_id=None, @@ -142,8 +143,7 @@ class API(base.Base): LOG.warn(msg) raise quota.QuotaError(msg, "MetadataLimitExceeded") - if onset_files is not None: - onset_files = self._check_onset_file_quota(context, onset_files) + self._check_onset_file_quota(context, onset_files) image = self.image_service.show(context, image_id) |