openstack
/
barbican-tempest-plugin
Code Issues Proposed changes

Merge "Remove use of deprecated config options for volume API selection"

This commit is contained in:
Zuul 2020-03-17 21:53:25 +00:00 committed by Gerrit Code Review
parent c2099a0b4d 48d10b8be0
commit 57565a5104
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
barbican_tempest_plugin/tests/scenario/barbican_manager.py
View File

@ -79,12 +79,10 @@ class BarbicanScenarioTest(mgr.ScenarioTest):
)
if CONF.compute_feature_enabled.attach_encrypted_volume:
if (CONF.volume_feature_enabled.api_v2 or
CONF.volume_feature_enabled.api_v3):
cls.admin_volume_types_client =\
os_adm.volume_types_v2_client
cls.admin_encryption_types_client =\
os_adm.encryption_types_v2_client
cls.admin_volume_types_client =\
os_adm.volume_types_v2_client
cls.admin_encryption_types_client =\
os_adm.encryption_types_v2_client
def _get_uuid(self, href):
return href.split('/')[-1]

6
barbican_tempest_plugin/tests/scenario/manager.py
View File

@ -75,10 +75,8 @@ class ScenarioTest(manager.NetworkScenarioTest):
cls.security_group_rules_client = (
cls.os_primary.security_group_rules_client)
if (CONF.volume_feature_enabled.api_v2 or
CONF.volume_feature_enabled.api_v3):
cls.volumes_client = cls.os_primary.volumes_client_latest
cls.snapshots_client = cls.os_primary.snapshots_client_latest
cls.volumes_client = cls.os_primary.volumes_client_latest
cls.snapshots_client = cls.os_primary.snapshots_client_latest
# ## Test functions library
#