From 6d4b09fd3e7d812000682e053e6ccca99e046b67 Mon Sep 17 00:00:00 2001 From: Martin Kopec Date: Wed, 16 May 2018 12:34:17 +0000 Subject: [PATCH] Use volume v3 service client as the default Depends-On: https://review.openstack.org/#/c/536121/ Change-Id: I2004e737a9bdca74d3cf619cebe8b4a4d6db21d1 Story: 2001784 Task: 12497 Task: 19693 --- config_tempest/clients.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/config_tempest/clients.py b/config_tempest/clients.py index 23ab4227..586f72ae 100644 --- a/config_tempest/clients.py +++ b/config_tempest/clients.py @@ -29,7 +29,12 @@ from tempest.lib.services.identity.v3 import services_client as s_client from tempest.lib.services.identity.v3 import users_client as users_v3_client from tempest.lib.services.image.v2 import images_client from tempest.lib.services.network import networks_client -from tempest.lib.services.volume.v2 import services_client +try: + # Since Rocky, volume.v3.services_client is the default + from tempest.lib.services.volume.v3 import services_client +except ImportError: + # For backward compatibility + from tempest.lib.services.volume.v2 import services_client class ProjectsClient(object):