diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-05-30 21:23:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-05-30 21:23:21 +0000 |
| commit | b5136060994aecf11290c85f7999bb7b2ec0c035 (patch) | |
| tree | c78d0375dc30cd767900fd5f57a3d317816e0f74 | |
| parent | ca2ee634fe4e527e378ccf8df6e5157009be79ce (diff) | |
| parent | a03519aca345fb95c2d0b7c3bbaab5924559ef49 (diff) | |
Merge "Remove tempest hack for create/rebuild checks"
| -rw-r--r-- | nova/compute/api.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 927476810..80c8074d9 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -538,6 +538,7 @@ class API(base.Base): def _checks_for_create_and_rebuild(self, context, image_id, image, instance_type, metadata, files_to_inject): + self._check_metadata_properties_quota(context, metadata) self._check_injected_file_quota(context, files_to_inject) self._check_requested_image(context, image_id, image, instance_type) @@ -600,13 +601,6 @@ class API(base.Base): instances = [] instance_uuids = [] - # FIXME(sirp): this check should go in - # `_checks_for_create_and_rebuild`, however Tempest has a bug in - # its quota checking test where its submitting a bad image ID. So - # if `_get_image` is called first, we get a `ImageNotFound` - # exception instead of a OverlimitException. - self._check_metadata_properties_quota(context, metadata) - image_id, image = self._get_image(context, image_href) self._checks_for_create_and_rebuild(context, image_id, image, @@ -1809,8 +1803,6 @@ class API(base.Base): metadata = kwargs.get('metadata', {}) instance_type = flavors.extract_instance_type(instance) - self._check_metadata_properties_quota(context, metadata) - image_id, image = self._get_image(context, image_href) self._checks_for_create_and_rebuild(context, image_id, image, |