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 fa20b0587e
1 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -292,42 +292,20 @@ class Controller(object):
try:
if self._collection in body:
# Have to account for bulk create
for item in body[self._collection]:
self._validate_network_tenant_ownership(
request,
item[self._resource],
)
policy.enforce(request.context,
action,
item[self._resource],
plugin=self._plugin)
try:
count = QUOTAS.count(request.context, self._resource,
self._plugin, self._collection,
item[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,
item[self._resource]['tenant_id'],
**kwargs)
items = body[self._collection]
else:
self._validate_network_tenant_ownership(
request,
body[self._resource]
)
items = [body]
for item in items:
self._validate_network_tenant_ownership(request,
item[self._resource])
policy.enforce(request.context,
action,
body[self._resource],
item[self._resource],
plugin=self._plugin)
try:
count = QUOTAS.count(request.context, self._resource,
self._plugin, self._collection,
body[self._resource]['tenant_id'])
item[self._resource]['tenant_id'])
kwargs = {self._resource: count + 1}
except exceptions.QuotaResourceUnknown as e:
# We don't want to quota this resource
@ -336,7 +314,7 @@ class Controller(object):
raise
else:
QUOTAS.limit_check(request.context,
body[self._resource]['tenant_id'],
item[self._resource]['tenant_id'],
**kwargs)
except exceptions.PolicyNotAuthorized:
LOG.exception(_("Create operation not authorized"))