openstack/tempest
Code Issues Proposed changes

Merge "Fix tempest cleanup AttributeError"

Browse Source
This commit is contained in:
Zuul 2019-02-05 09:17:56 +00:00 committed by Gerrit Code Review
commit 38e397f64a
1 changed files with 4 additions and 4 deletions

8
tempest/cmd/cleanup_service.py

@ -101,7 +101,7 @@ class BaseService(object):
self.tenant_filter = {} self.tenant_filter = {}
if hasattr(self, 'tenant_id'): if hasattr(self, 'tenant_id'):
self.tenant_filter['tenant_id'] = self.tenant_id self.tenant_filter['project_id'] = self.tenant_id
def _filter_by_tenant_id(self, item_list): def _filter_by_tenant_id(self, item_list):
if (item_list is None or if (item_list is None or
@ -320,13 +320,13 @@ class VolumeQuotaService(BaseService):
def delete(self): def delete(self):
client = self.client client = self.client
try: try:
client.delete_quota_set(self.tenant_id) client.delete_quota_set(self.project_id)
except Exception: except Exception:
LOG.exception("Delete Volume Quotas exception.") LOG.exception("Delete Volume Quotas exception.")
def dry_run(self): def dry_run(self):
quotas = self.client.show_quota_set( quotas = self.client.show_quota_set(
self.tenant_id, params={'usage': True})['quota_set'] self.project_id, params={'usage': True})['quota_set']
self.data['volume_quotas'] = quotas self.data['volume_quotas'] = quotas
@ -339,7 +339,7 @@ class NovaQuotaService(BaseService):
def delete(self): def delete(self):
client = self.client client = self.client
try: try:
client.delete_quota_set(self.tenant_id) client.delete_quota_set(self.project_id)
except Exception: except Exception:
LOG.exception("Delete Quotas exception.") LOG.exception("Delete Quotas exception.")