summaryrefslogtreecommitdiff
path: root/functional
diff options
context:
space:
mode:
authorRichard Theis <rtheis@us.ibm.com>2015-12-23 12:48:45 -0600
committerSteve Martinelli <stevemar@ca.ibm.com>2016-04-21 02:22:42 -0400
commit9df7e9cdcce3eee027a2f597e39c0ef870bc23e6 (patch)
tree5c637305c03372cef05464621a12d755d2783064 /functional
parent4f52b5e8f19561a4c49089931876701800150dab (diff)
downloadpython-openstackclient-9df7e9cdcce3eee027a2f597e39c0ef870bc23e6.tar.gz
Fix stable/liberty gate
**This patch is a merge of 2 patches that needed to be backported** unwedge the gate devstack defaults to v3 and makes some janky assumptions in the generated rc files (cherry picked from commit bd14d078098eb2055c0dae784de892b0b1346ed5) Add all regions to cloud configuration OCC now requires all regions to be listed in the cloud configuration. Update the shell unit tests to list all of the regions being tested. Change-Id: Ic7300d1f708339701b5daadbf2c4769b239a2adb (cherry picked from commit d1311f9742ad93198b9ca72f47d51710e17ced38)
Diffstat (limited to 'functional')
-rw-r--r--functional/tests/volume/v1/test_volume.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/functional/tests/volume/v1/test_volume.py b/functional/tests/volume/v1/test_volume.py
index 596b8217..874be6e1 100644
--- a/functional/tests/volume/v1/test_volume.py
+++ b/functional/tests/volume/v1/test_volume.py
@@ -10,6 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
+import os
import uuid
from functional.tests.volume.v1 import common
@@ -25,6 +26,7 @@ class VolumeTests(common.BaseVolumeTests):
@classmethod
def setUpClass(cls):
+ os.environ['OS_VOLUME_API_VERSION'] = '1'
opts = cls.get_show_opts(cls.FIELDS)
raw_output = cls.openstack('volume create --size 1 ' + cls.NAME + opts)
expected = cls.NAME + '\n'