openstack/python-cinderclient
Code Issues Proposed changes

Merge "Quotaset update does not return result"

Browse Source
This commit is contained in:
Jenkins
2014-09-08 20:26:05 +00:00
committed by Gerrit Code Review
parent 4162c9ff5c 02b32c8aed
commit 42d13be346
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cinderclient/v1/quotas.py
View File

@@ -26,7 +26,7 @@ class QuotaSet(base.Resource):
return self.tenant_id
def update(self, *args, **kwargs):
self.manager.update(self.tenant_id, *args, **kwargs)
return self.manager.update(self.tenant_id, *args, **kwargs)
class QuotaSetManager(base.Manager):
@@ -44,7 +44,8 @@ class QuotaSetManager(base.Manager):
for update in updates:
body['quota_set'][update] = updates[update]
self._update('/os-quota-sets/%s' % (tenant_id), body)
result = self._update('/os-quota-sets/%s' % (tenant_id), body)
return self.resource_class(self, result['quota_set'], loaded=True)
def defaults(self, tenant_id):
return self._get('/os-quota-sets/%s/defaults' % tenant_id,

2
cinderclient/v1/shell.py
View File

@@ -693,7 +693,7 @@ def _quota_update(manager, identifier, args):
updates[resource] = val
if updates:
manager.update(identifier, **updates)
_quota_show(manager.update(identifier, **updates))
@utils.arg('tenant', metavar='<tenant_id>',

5
cinderclient/v2/quotas.py
View File

@@ -24,7 +24,7 @@ class QuotaSet(base.Resource):
return self.tenant_id
def update(self, *args, **kwargs):
self.manager.update(self.tenant_id, *args, **kwargs)
return self.manager.update(self.tenant_id, *args, **kwargs)
class QuotaSetManager(base.Manager):
@@ -42,7 +42,8 @@ class QuotaSetManager(base.Manager):
for update in updates:
body['quota_set'][update] = updates[update]
self._update('/os-quota-sets/%s' % (tenant_id), body)
result = self._update('/os-quota-sets/%s' % (tenant_id), body)
return self.resource_class(self, result['quota_set'], loaded=True)
def defaults(self, tenant_id):
return self._get('/os-quota-sets/%s/defaults' % tenant_id,

2
cinderclient/v2/shell.py
View File

@@ -780,7 +780,7 @@ def _quota_update(manager, identifier, args):
updates[resource] = val
if updates:
manager.update(identifier, **updates)
_quota_show(manager.update(identifier, **updates))
@utils.arg('tenant',