From 02b32c8aedb37b72cd5ece2ea2609df8aafb3eff Mon Sep 17 00:00:00 2001 From: Juan Manuel Olle Date: Wed, 14 May 2014 11:11:08 -0300 Subject: [PATCH] Quotaset update does not return result This patch adds the updated quota values to the output shell Closes-Bug: #1316474 Change-Id: I95bbefa5fdee316a3a3ba77a5b3067345da3344f --- cinderclient/v1/quotas.py | 5 +++-- cinderclient/v1/shell.py | 2 +- cinderclient/v2/quotas.py | 5 +++-- cinderclient/v2/shell.py | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/cinderclient/v1/quotas.py b/cinderclient/v1/quotas.py index 800a70aac..7453cb7fe 100644 --- a/cinderclient/v1/quotas.py +++ b/cinderclient/v1/quotas.py @@ -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, diff --git a/cinderclient/v1/shell.py b/cinderclient/v1/shell.py index 47e0a5748..0e96a8867 100644 --- a/cinderclient/v1/shell.py +++ b/cinderclient/v1/shell.py @@ -696,7 +696,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='', diff --git a/cinderclient/v2/quotas.py b/cinderclient/v2/quotas.py index fcb87dd06..fbc691450 100644 --- a/cinderclient/v2/quotas.py +++ b/cinderclient/v2/quotas.py @@ -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, diff --git a/cinderclient/v2/shell.py b/cinderclient/v2/shell.py index 10b763132..76a0803cc 100644 --- a/cinderclient/v2/shell.py +++ b/cinderclient/v2/shell.py @@ -754,7 +754,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',