From 5889ea10ab46e87ec165448b157eed5a60754955 Mon Sep 17 00:00:00 2001 From: ghanshyam Date: Thu, 7 Jun 2018 10:28:28 +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: I1ceb269d5ce9f8c9e557d62e829bb536ac4d2a3d Needed-By: https://review.openstack.org/#/c/573135/ --- nova_lxd_tempest_plugin/tests/scenario/manager.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/nova_lxd_tempest_plugin/tests/scenario/manager.py b/nova_lxd_tempest_plugin/tests/scenario/manager.py index d504b811..67fef94a 100644 --- a/nova_lxd_tempest_plugin/tests/scenario/manager.py +++ b/nova_lxd_tempest_plugin/tests/scenario/manager.py @@ -80,12 +80,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 #