Remove consistencygroup quota

Cinder doesn't support to update consistencygroup quota. And
since cg will be deprecated in Queue, there is no value to support it
at server or client side. So this patch removed it.

Change-Id: I5fbfb30611a60d575fedb676119bb0a1564700df
Closes-bug: #1693584
This commit is contained in:
wangxiyuan 2017-05-27 09:07:52 +08:00
parent bb5c120460
commit f3a1e6e708
6 changed files with 4 additions and 18 deletions

View File

@ -21,8 +21,7 @@ from cinderclient import utils
_quota_resources = ['volumes', 'snapshots', 'gigabytes',
'backups', 'backup_gigabytes',
'consistencygroups', 'per_volume_gigabytes',
'groups', ]
'per_volume_gigabytes', 'groups', ]
_quota_infos = ['Type', 'In_use', 'Reserved', 'Limit']

View File

@ -627,7 +627,6 @@ class FakeHTTPClient(base_client.HTTPClient):
'gigabytes': 1,
'backups': 1,
'backup_gigabytes': 1,
'consistencygroups': 1,
'per_volume_gigabytes': 1, }})
def get_os_quota_sets_test_defaults(self):
@ -639,7 +638,6 @@ class FakeHTTPClient(base_client.HTTPClient):
'gigabytes': 1,
'backups': 1,
'backup_gigabytes': 1,
'consistencygroups': 1,
'per_volume_gigabytes': 1, }})
def put_os_quota_sets_test(self, body, **kw):
@ -654,7 +652,6 @@ class FakeHTTPClient(base_client.HTTPClient):
'gigabytes': 1,
'backups': 1,
'backup_gigabytes': 1,
'consistencygroups': 2,
'per_volume_gigabytes': 1, }})
def delete_os_quota_sets_1234(self, **kw):

View File

@ -41,7 +41,6 @@ class QuotaSetsTest(utils.TestCase):
q.update(gigabytes=2000)
q.update(backups=2)
q.update(backup_gigabytes=2000)
q.update(consistencygroups=2)
q.update(per_volume_gigabytes=100)
cs.assert_called('PUT', '/os-quota-sets/test')
self._assert_request_id(q)
@ -54,7 +53,6 @@ class QuotaSetsTest(utils.TestCase):
self.assertEqual(q.gigabytes, q2.gigabytes)
self.assertEqual(q.backups, q2.backups)
self.assertEqual(q.backup_gigabytes, q2.backup_gigabytes)
self.assertEqual(q.consistencygroups, q2.consistencygroups)
self.assertEqual(q.per_volume_gigabytes, q2.per_volume_gigabytes)
q2.volumes = 0
self.assertNotEqual(q.volumes, q2.volumes)
@ -66,8 +64,6 @@ class QuotaSetsTest(utils.TestCase):
self.assertNotEqual(q.backups, q2.backups)
q2.backup_gigabytes = 0
self.assertNotEqual(q.backup_gigabytes, q2.backup_gigabytes)
q2.consistencygroups = 0
self.assertNotEqual(q.consistencygroups, q2.consistencygroups)
q2.per_volume_gigabytes = 0
self.assertNotEqual(q.per_volume_gigabytes, q2.per_volume_gigabytes)
q2.get()
@ -76,7 +72,6 @@ class QuotaSetsTest(utils.TestCase):
self.assertEqual(q.gigabytes, q2.gigabytes)
self.assertEqual(q.backups, q2.backups)
self.assertEqual(q.backup_gigabytes, q2.backup_gigabytes)
self.assertEqual(q.consistencygroups, q2.consistencygroups)
self.assertEqual(q.per_volume_gigabytes, q2.per_volume_gigabytes)
self._assert_request_id(q)
self._assert_request_id(q2)

View File

@ -978,10 +978,6 @@ def do_quota_defaults(cs, args):
metavar='<backup_gigabytes>',
type=int, default=None,
help='The new "backup_gigabytes" quota value. Default=None.')
@utils.arg('--consistencygroups',
metavar='<consistencygroups>',
type=int, default=None,
help='The new "consistencygroups" quota value. Default=None.')
@utils.arg('--volume-type',
metavar='<volume_type_name>',
default=None,

View File

@ -743,10 +743,6 @@ def do_group_type_key(cs, args):
metavar='<backup_gigabytes>',
type=int, default=None,
help='The new "backup_gigabytes" quota value. Default=None.')
@utils.arg('--consistencygroups',
metavar='<consistencygroups>',
type=int, default=None,
help='The new "consistencygroups" quota value. Default=None.')
@utils.arg('--groups',
metavar='<groups>',
type=int, default=None,

View File

@ -0,0 +1,3 @@
---
other:
- The useless consistencygroup quota operation has been removed.