Merge "Set OS_VOLUME_API_VERSION before running functional tests"

3 files changed, 27 insertions, 4 deletions

diff --git a/functional/tests/volume/v1/common.py b/functional/tests/volume/v1/common.py
new file mode 100644
index 00000000..7d35ed5e
--- /dev/null
+++ b/functional/tests/volume/v1/common.py
@@ -0,0 +1,23 @@
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import os
+
+from functional.common import test
+
+
+class BaseVolumeTests(test.TestCase):
+    """Base class for Volume functional tests. """
+
+    @classmethod
+    def setUpClass(cls):
+        os.environ['OS_VOLUME_API_VERSION'] = '1'
diff --git a/functional/tests/volume/v1/test_qos.py b/functional/tests/volume/v1/test_qos.py
index 122a4538..f4b2fec3 100644
--- a/functional/tests/volume/v1/test_qos.py
+++ b/functional/tests/volume/v1/test_qos.py
@@ -12,10 +12,10 @@
 
 import uuid
 
-from functional.common import test
+from functional.tests.volume.v1 import common
 
 
-class VolumeQosTests(test.TestCase):
+class VolumeTests(common.BaseVolumeTests):
     """Functional tests for volume qos. """
 
     NAME = uuid.uuid4().hex
diff --git a/functional/tests/volume/v1/test_volume.py b/functional/tests/volume/v1/test_volume.py
index a0b77c7d..a5a6dca4 100644
--- a/functional/tests/volume/v1/test_volume.py
+++ b/functional/tests/volume/v1/test_volume.py
@@ -12,10 +12,10 @@
 
 import uuid
 
-from functional.common import test
+from functional.tests.volume.v1 import common
 
 
-class VolumeTests(test.TestCase):
+class VolumeTests(common.BaseVolumeTests):
     """Functional tests for volume. """
 
     NAME = uuid.uuid4().hex