From 2c05b83a8c9445cee06a890789f1e0727cf479be Mon Sep 17 00:00:00 2001 From: TommyLike Date: Fri, 18 Aug 2017 15:12:23 +0800 Subject: [PATCH] Remove unused attribute when updating quota_class When updating quota class, attribute 'class_name' is neither used in the request nor the response [1]. [1]: https://github.com/openstack/cinder/blob/master/cinder/api/contrib/quota_classes.py#L56 Change-Id: Ic1a743ce36a087f369703f10313d51b79b5cab9c --- cinderclient/tests/unit/v2/fakes.py | 4 +--- cinderclient/tests/unit/v2/test_shell.py | 3 +-- cinderclient/v2/quota_classes.py | 7 ++++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/cinderclient/tests/unit/v2/fakes.py b/cinderclient/tests/unit/v2/fakes.py index a4c5d39cb..bf36f24ca 100644 --- a/cinderclient/tests/unit/v2/fakes.py +++ b/cinderclient/tests/unit/v2/fakes.py @@ -677,10 +677,8 @@ class FakeHTTPClient(base_client.HTTPClient): def put_os_quota_class_sets_test(self, body, **kw): assert list(body) == ['quota_class_set'] - fakes.assert_has_keys(body['quota_class_set'], - required=['class_name']) + fakes.assert_has_keys(body['quota_class_set']) return (200, {}, {'quota_class_set': { - 'class_name': 'test', 'volumes': 2, 'snapshots': 2, 'gigabytes': 1, diff --git a/cinderclient/tests/unit/v2/test_shell.py b/cinderclient/tests/unit/v2/test_shell.py index 888631189..2f42f4427 100644 --- a/cinderclient/tests/unit/v2/test_shell.py +++ b/cinderclient/tests/unit/v2/test_shell.py @@ -1392,8 +1392,7 @@ class ShellTest(utils.TestCase): self.assert_called('GET', '/os-quota-class-sets/test') def test_quota_class_update(self): - expected = {'quota_class_set': {'class_name': 'test', - 'volumes': 2, + expected = {'quota_class_set': {'volumes': 2, 'snapshots': 2, 'gigabytes': 1, 'backups': 1, diff --git a/cinderclient/v2/quota_classes.py b/cinderclient/v2/quota_classes.py index 0e5fb5b83..1958fa133 100644 --- a/cinderclient/v2/quota_classes.py +++ b/cinderclient/v2/quota_classes.py @@ -35,12 +35,13 @@ class QuotaClassSetManager(base.Manager): "quota_class_set") def update(self, class_name, **updates): - body = {'quota_class_set': {'class_name': class_name}} + quota_class_set = {} for update in updates: - body['quota_class_set'][update] = updates[update] + quota_class_set[update] = updates[update] - result = self._update('/os-quota-class-sets/%s' % (class_name), body) + result = self._update('/os-quota-class-sets/%s' % (class_name), + {'quota_class_set': quota_class_set}) return self.resource_class(self, result['quota_class_set'], loaded=True, resp=result.request_ids)