openstack
/
python-novaclient
Code Issues Proposed changes

Merge "Remove incorrect legacy QuotaSet.id property"

This commit is contained in:
Zuul 2018-01-02 18:08:20 +00:00 committed by Gerrit Code Review
parent 60e6a3d7d6 f4009a71a0
commit 92405514f0
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
novaclient/tests/unit/fixture_data/quotas.py
View File

@ -52,8 +52,8 @@ class V1(base.Fixture):
def test_quota(self, tenant_id='test'):
return {
'tenant_id': tenant_id,
'metadata_items': [],
'id': tenant_id,
'metadata_items': 1,
'injected_file_content_bytes': 1,
'injected_file_path_bytes': 1,
'ram': 1,
@ -61,7 +61,9 @@ class V1(base.Fixture):
'instances': 1,
'injected_files': 1,
'cores': 1,
'keypairs': 1,
'key_pairs': 1,
'security_groups': 1,
'security_group_rules': 1
'security_group_rules': 1,
'server_groups': 1,
'server_group_members': 1
}

11
novaclient/v2/quotas.py
View File

@ -18,15 +18,8 @@ from novaclient import base
class QuotaSet(base.Resource):
@property
def id(self):
"""QuotaSet does not have a 'id' attribute but base.Resource needs it
to self-refresh and QuotaSet is indexed by tenant_id.
"""
return self.tenant_id
def update(self, *args, **kwargs):
return self.manager.update(self.tenant_id, *args, **kwargs)
return self.manager.update(self.id, *args, **kwargs)
class QuotaSetManager(base.Manager):
@ -37,8 +30,6 @@ class QuotaSetManager(base.Manager):
if detail:
url += '/detail'
if hasattr(tenant_id, 'tenant_id'):
tenant_id = tenant_id.tenant_id
if user_id:
params = {'tenant_id': tenant_id, 'user_id': user_id}
url += '?user_id=%(user_id)s'