openinfra/python-tempestconf
Code Issues Proposed changes

Merge "Manila: Add snapshot capabilities in [share]"

Browse Source
This commit is contained in:
Zuul 2021-04-09 14:34:29 +00:00 committed by Gerrit Code Review
commit 18bc878270
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
config_tempest/services/share.py
View File

@ -53,11 +53,18 @@ class ShareService(VersionedService):
backends = set() backends = set()
enable_protocols = set() enable_protocols = set()
dhss = set() dhss = set()
capability_snapshot_support = set()
capability_create_share_from_snapshot_support = set()
for pool in pools: for pool in pools:
backends.add(pool['backend']) backends.add(pool['backend'])
protocol = pool['capabilities']['storage_protocol'].lower() pool_capabilities = pool['capabilities']
protocol = pool_capabilities['storage_protocol'].lower()
enable_protocols.update(protocol.split('_')) enable_protocols.update(protocol.split('_'))
dhss.add(pool['capabilities']['driver_handles_share_servers']) dhss.add(pool_capabilities['driver_handles_share_servers'])
capability_snapshot_support.add(
pool_capabilities['snapshot_support'])
capability_create_share_from_snapshot_support.add(
pool_capabilities['create_share_from_snapshot_support'])
conf.set('share', 'backend_names', ','.join(backends)) conf.set('share', 'backend_names', ','.join(backends))
conf.set('share', 'enable_protocols', ','.join(enable_protocols)) conf.set('share', 'enable_protocols', ','.join(enable_protocols))
@ -67,6 +74,15 @@ class ShareService(VersionedService):
# not both at the same time. Lets err on the side of caution and # not both at the same time. Lets err on the side of caution and
# set this to True if any DHSS=True backend is present. # set this to True if any DHSS=True backend is present.
conf.set('share', 'multitenancy_enabled', str(any(dhss))) conf.set('share', 'multitenancy_enabled', str(any(dhss)))
# Optional capabilities/features:
conf.set('share', 'run_snapshot_tests',
str(any(capability_snapshot_support)))
conf.set('share', 'capability_snapshot_support',
str(any(capability_snapshot_support)))
conf.set('share', 'capability_create_share_from_snapshot_support',
str(any(capability_create_share_from_snapshot_support)))
if len(backends) > 1: if len(backends) > 1:
conf.set('share', 'multi_backend', 'True') conf.set('share', 'multi_backend', 'True')