From 39c80637cde984eb3aa63d57cbf8be12c97bd180 Mon Sep 17 00:00:00 2001 From: ghanshyam Date: Thu, 7 Jun 2018 10:22:24 +0000 Subject: [PATCH] Remove volume v1 API service client usage Volume v1 API has been gone since long and Tempest also marked their deprecation since Juno - https://review.openstack.org/#/c/446238/ Now Tempest is removing the deprecated config option and alias for voluem v1 service client in - https://review.openstack.org/#/c/573135/ Before the Tempest patch gets merged, we need to remove all usage of volume v1 things. Change-Id: I843e6431b905a871eb286e6ae8b3cb4802932e36 Needed-By: https://review.openstack.org/#/c/573135/ --- congress_tempest_plugin/tests/scenario/manager.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/congress_tempest_plugin/tests/scenario/manager.py b/congress_tempest_plugin/tests/scenario/manager.py index 9b03353..a2ee645 100644 --- a/congress_tempest_plugin/tests/scenario/manager.py +++ b/congress_tempest_plugin/tests/scenario/manager.py @@ -81,12 +81,10 @@ class ScenarioTest(tempest.test.BaseTestCase): cls.security_group_rules_client = ( cls.os_primary.security_group_rules_client) - if CONF.volume_feature_enabled.api_v2: - cls.volumes_client = cls.os_primary.volumes_v2_client - cls.snapshots_client = cls.os_primary.snapshots_v2_client - else: - cls.volumes_client = cls.os_primary.volumes_client - cls.snapshots_client = cls.os_primary.snapshots_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 # ## Test functions library #