x/vmware-nsx
Code Issues Proposed changes

Merge "Removes redundant code in quantum.api.v2.base.create()"

Browse Source
This commit is contained in:
Jenkins 2012-12-25 11:38:07 +00:00 committed by Gerrit Code Review
commit f9b0eccfda
1 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
quantum/api/v2/base.py
View File

@ -292,11 +292,12 @@ class Controller(object):
try: try:
if self._collection in body: if self._collection in body:
# Have to account for bulk create # Have to account for bulk create
for item in body[self._collection]: items = body[self._collection]
self._validate_network_tenant_ownership( else:
request, items = [body]
item[self._resource], for item in items:
) self._validate_network_tenant_ownership(request,
item[self._resource])
policy.enforce(request.context, policy.enforce(request.context,
action, action,
item[self._resource], item[self._resource],
@ -315,29 +316,6 @@ class Controller(object):
QUOTAS.limit_check(request.context, QUOTAS.limit_check(request.context,
item[self._resource]['tenant_id'], item[self._resource]['tenant_id'],
**kwargs) **kwargs)
else:
self._validate_network_tenant_ownership(
request,
body[self._resource]
)
policy.enforce(request.context,
action,
body[self._resource],
plugin=self._plugin)
try:
count = QUOTAS.count(request.context, self._resource,
self._plugin, self._collection,
body[self._resource]['tenant_id'])
kwargs = {self._resource: count + 1}
except exceptions.QuotaResourceUnknown as e:
# We don't want to quota this resource
LOG.debug(e)
except Exception:
raise
else:
QUOTAS.limit_check(request.context,
body[self._resource]['tenant_id'],
**kwargs)
except exceptions.PolicyNotAuthorized: except exceptions.PolicyNotAuthorized:
LOG.exception(_("Create operation not authorized")) LOG.exception(_("Create operation not authorized"))
raise webob.exc.HTTPForbidden() raise webob.exc.HTTPForbidden()