openstack
/
cinder
Code Issues Proposed changes

Merge "Fix volume type quota defaults in quotas tests"

This commit is contained in:
Zuul 2019-06-18 21:00:15 +00:00 committed by Gerrit Code Review
parent d7cc181622 66fcf82521
commit 740ef46f77
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cinder/tests/unit/api/contrib/test_quotas.py
View File

@ -43,7 +43,8 @@ CONF = cfg.CONF
def make_body(root=True, gigabytes=1000, snapshots=10,
volumes=10, backups=10, backup_gigabytes=1000,
tenant_id=fake.PROJECT_ID, per_volume_gigabytes=-1, groups=10):
tenant_id=fake.PROJECT_ID, per_volume_gigabytes=-1, groups=10,
subproject=False):
resources = {'gigabytes': gigabytes,
'snapshots': snapshots,
'volumes': volumes,
@ -55,9 +56,11 @@ def make_body(root=True, gigabytes=1000, snapshots=10,
volume_types = db.volume_type_get_all(context.get_admin_context())
for volume_type in volume_types:
resources['gigabytes_' + volume_type] = -1
resources['snapshots_' + volume_type] = -1
resources['volumes_' + volume_type] = -1
# default values for subproject are 0
quota = 0 if subproject else -1
resources['gigabytes_' + volume_type] = quota
resources['snapshots_' + volume_type] = quota
resources['volumes_' + volume_type] = quota
if tenant_id:
resources['id'] = tenant_id
@ -74,7 +77,8 @@ def make_subproject_body(root=True, gigabytes=0, snapshots=0,
return make_body(root=root, gigabytes=gigabytes, snapshots=snapshots,
volumes=volumes, backups=backups,
backup_gigabytes=backup_gigabytes, tenant_id=tenant_id,
per_volume_gigabytes=per_volume_gigabytes)
per_volume_gigabytes=per_volume_gigabytes,
subproject=True)
class QuotaSetsControllerTestBase(test.TestCase):

9
cinder/tests/unit/api/contrib/test_quotas_classes.py
View File

@ -22,6 +22,7 @@ import mock
from cinder.api.contrib import quota_classes
from cinder import context
from cinder import db
from cinder import exception
from cinder import quota
from cinder import test
@ -52,6 +53,14 @@ def make_body(root=True, gigabytes=1000, snapshots=10,
resources['snapshots_' + volume_type] = -1
resources['volumes_' + volume_type] = -1
# need to consider preexisting volume types as well
volume_types = db.volume_type_get_all(context.get_admin_context())
for volume_type in volume_types:
resources['gigabytes_' + volume_type] = -1
resources['snapshots_' + volume_type] = -1
resources['volumes_' + volume_type] = -1
if tenant_id:
resources['id'] = tenant_id
if root: