Fix volume functional tests

The volume v2 functional tests occasionally fail with
"unrecognized arguments: --private". This appears to occur when
volume v1 and volume v2 functional tests are run at the same time
when one or more of the tests do not set OS_VOLUME_API_VERSION
appropriately.

This patch also fixes a timing issue seen when running the
tests locally due to a missing wait and moves the snapshot
test to volume v2 since it was written for v2.

Change-Id: I9c9863fe1aef81b0564920f36452c6f27211d5ba
Closes-Bug: #1589793

4 files changed, 4 insertions, 85 deletions

diff --git a/functional/tests/volume/v1/test_qos.py b/functional/tests/volume/v1/test_qos.py
index f4b2fec3..9324830c 100644
--- a/functional/tests/volume/v1/test_qos.py
+++ b/functional/tests/volume/v1/test_qos.py
@@ -15,7 +15,7 @@ import uuid
 from functional.tests.volume.v1 import common
 
 
-class VolumeTests(common.BaseVolumeTests):
+class QosTests(common.BaseVolumeTests):
     """Functional tests for volume qos. """
 
     NAME = uuid.uuid4().hex
@@ -25,6 +25,7 @@ class VolumeTests(common.BaseVolumeTests):
 
     @classmethod
     def setUpClass(cls):
+        super(QosTests, cls).setUpClass()
         opts = cls.get_show_opts(cls.FIELDS)
         raw_output = cls.openstack('volume qos create ' + cls.NAME + opts)
         cls.ID, name, rol = raw_output.split('\n')
diff --git a/functional/tests/volume/v1/test_snapshot.py b/functional/tests/volume/v1/test_snapshot.py
deleted file mode 100644
index c43a7456..00000000
--- a/functional/tests/volume/v1/test_snapshot.py
+++ /dev/null
@@ -1,82 +0,0 @@
-#    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 time
-import uuid
-
-from functional.common import test
-
-
-class SnapshotTests(test.TestCase):
-    """Functional tests for snapshot. """
-
-    VOLLY = uuid.uuid4().hex
-    NAME = uuid.uuid4().hex
-    OTHER_NAME = uuid.uuid4().hex
-    HEADERS = ['"Name"']
-
-    @classmethod
-    def wait_for_status(cls, command, status, tries):
-        opts = cls.get_show_opts(['status'])
-        for attempt in range(tries):
-            time.sleep(1)
-            raw_output = cls.openstack(command + opts)
-            if (raw_output == status):
-                return
-        cls.assertOutput(status, raw_output)
-
-    @classmethod
-    def setUpClass(cls):
-        cls.openstack('volume create --size 1 ' + cls.VOLLY)
-        cls.wait_for_status('volume show ' + cls.VOLLY, 'available\n', 3)
-        opts = cls.get_show_opts(['status'])
-        raw_output = cls.openstack('snapshot create --name ' + cls.NAME +
-                                   ' ' + cls.VOLLY + opts)
-        cls.assertOutput('creating\n', raw_output)
-        cls.wait_for_status('snapshot show ' + cls.NAME, 'available\n', 3)
-
-    @classmethod
-    def tearDownClass(cls):
-        # Rename test
-        raw_output = cls.openstack(
-            'snapshot set --name ' + cls.OTHER_NAME + ' ' + cls.NAME)
-        cls.assertOutput('', raw_output)
-        # Delete test
-        raw_output = cls.openstack('snapshot delete ' + cls.OTHER_NAME)
-        cls.assertOutput('', raw_output)
-        cls.openstack('volume delete --force ' + cls.VOLLY, fail_ok=True)
-
-    def test_snapshot_list(self):
-        opts = self.get_list_opts(self.HEADERS)
-        raw_output = self.openstack('snapshot list' + opts)
-        self.assertIn(self.NAME, raw_output)
-
-    def test_snapshot_properties(self):
-        raw_output = self.openstack(
-            'snapshot set --property a=b --property c=d ' + self.NAME)
-        self.assertEqual("", raw_output)
-        opts = self.get_show_opts(["properties"])
-        raw_output = self.openstack('snapshot show ' + self.NAME + opts)
-        self.assertEqual("a='b', c='d'\n", raw_output)
-
-        raw_output = self.openstack('snapshot unset --property a ' + self.NAME)
-        self.assertEqual("", raw_output)
-        raw_output = self.openstack('snapshot show ' + self.NAME + opts)
-        self.assertEqual("c='d'\n", raw_output)
-
-    def test_snapshot_set(self):
-        raw_output = self.openstack(
-            'snapshot set --description backup ' + self.NAME)
-        self.assertEqual("", raw_output)
-        opts = self.get_show_opts(["description", "name"])
-        raw_output = self.openstack('snapshot show ' + self.NAME + opts)
-        self.assertEqual("backup\n" + self.NAME + "\n", raw_output)
diff --git a/functional/tests/volume/v1/test_volume.py b/functional/tests/volume/v1/test_volume.py
index 874be6e1..f574075d 100644
--- a/functional/tests/volume/v1/test_volume.py
+++ b/functional/tests/volume/v1/test_volume.py
@@ -10,7 +10,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import os
 import uuid
 
 from functional.tests.volume.v1 import common
@@ -26,7 +25,7 @@ class VolumeTests(common.BaseVolumeTests):
 
     @classmethod
     def setUpClass(cls):
-        os.environ['OS_VOLUME_API_VERSION'] = '1'
+        super(VolumeTests, cls).setUpClass()
         opts = cls.get_show_opts(cls.FIELDS)
         raw_output = cls.openstack('volume create --size 1 ' + cls.NAME + opts)
         expected = cls.NAME + '\n'
diff --git a/functional/tests/volume/v1/test_volume_type.py b/functional/tests/volume/v1/test_volume_type.py
index dc8b1f45..824b20d7 100644
--- a/functional/tests/volume/v1/test_volume_type.py
+++ b/functional/tests/volume/v1/test_volume_type.py
@@ -24,6 +24,7 @@ class VolumeTypeTests(common.BaseVolumeTests):
 
     @classmethod
     def setUpClass(cls):
+        super(VolumeTypeTests, cls).setUpClass()
         opts = cls.get_show_opts(cls.FIELDS)
         raw_output = cls.openstack('volume type create ' + cls.NAME + opts)
         expected = cls.NAME + '\n'