From acb1c94750188abb2b039362e478a1f49f18baef Mon Sep 17 00:00:00 2001
From: Steve Martinelli <stevemar@ca.ibm.com>
Date: Thu, 30 Jul 2015 11:27:55 -0700
Subject: [PATCH] Set OS_VOLUME_API_VERSION before running functional tests
For v1 functional tests, set the env. var.
Change-Id: I6c554932bdb8f99438d4f2ae855eb16c5bb3a357
---
functional/tests/volume/v1/common.py | 23 +++++++++++++++++++++++
functional/tests/volume/v1/test_qos.py | 4 ++--
functional/tests/volume/v1/test_volume.py | 4 ++--
3 files changed, 27 insertions(+), 4 deletions(-)
create mode 100644 functional/tests/volume/v1/common.py
diff --git a/functional/tests/volume/v1/common.py b/functional/tests/volume/v1/common.py
new file mode 100644
index 0000000000..7d35ed5e6d
--- /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 122a4538ce..f4b2fec3a6 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 a0b77c7d07..a5a6dca480 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