tests: Handle removal of block-storage v2 API

Cinder recently removed their v2 API [1] which is causing the functional
tests to fail. Improve our 'is_service_enabled' test helper to use the
'versions show' command, which queries the service catalog and can give
us information about the service version as well as answer the more
general "is this service available" question. We also resolve a
long-standing TODO in the process.

[1] https://review.opendev.org/c/openstack/cinder/+/792299

Change-Id: I381069357aa008344e15327adf3a863c0c2e1f04
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>

1 files changed, 10 insertions, 1 deletions

diff --git a/openstackclient/tests/functional/volume/v2/common.py b/openstackclient/tests/functional/volume/v2/common.py
index 38176714..7e3a8084 100644
--- a/openstackclient/tests/functional/volume/v2/common.py
+++ b/openstackclient/tests/functional/volume/v2/common.py
@@ -18,8 +18,17 @@ from openstackclient.tests.functional.volume import base
 class BaseVolumeTests(base.BaseVolumeTests):
     """Base class for Volume functional tests. """
 
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.haz_volume_v2 = cls.is_service_enabled('block-storage', '2.0')
+
     def setUp(self):
-        super(BaseVolumeTests, self).setUp()
+        super().setUp()
+
+        if not self.haz_volume_v2:
+            self.skipTest("No Volume v2 service present")
+
         ver_fixture = fixtures.EnvironmentVariable(
             'OS_VOLUME_API_VERSION', '2'
         )