From 9aa1c9a485e8c858ce8e022be0df79f798dea65c Mon Sep 17 00:00:00 2001
From: junboli <junbo85.li@gmail.com>
Date: Tue, 19 Jun 2018 09:01:42 +0800
Subject: [PATCH] Use api version 3 for functional test

switch to use OS_VOLUME_API_VERSION = 3 to run
functional tests.

Closes-bug: #1775354
Co-Authored-By: liuyamin <liuyamin@fiberhome.com>
Change-Id: If6c4291aa7d8e85a4f8c1d5665a0e4a72aa1f1d1
---
 cinderclient/tests/functional/test_cli.py           | 13 ++++++++++---
 .../tests/functional/test_volume_create_cli.py      |  2 +-
 tox.ini                                             |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/cinderclient/tests/functional/test_cli.py b/cinderclient/tests/functional/test_cli.py
index 8047459d5..bfa653f6a 100644
--- a/cinderclient/tests/functional/test_cli.py
+++ b/cinderclient/tests/functional/test_cli.py
@@ -17,7 +17,14 @@ from cinderclient.tests.functional import base
 class CinderVolumeTests(base.ClientTestBase):
     """Check of base cinder volume commands."""
 
-    VOLUME_PROPERTY = ('attachment_ids', 'attached_servers',
+    CREATE_VOLUME_PROPERTY = ('attachments', 'multiattach',
+                       'os-vol-tenant-attr:tenant_id',
+                       'availability_zone', 'bootable',
+                       'created_at', 'description', 'encrypted', 'id',
+                       'metadata', 'name', 'size', 'status',
+                       'user_id', 'volume_type')
+
+    SHOW_VOLUME_PROPERTY = ('attachment_ids', 'attached_servers',
                        'availability_zone', 'bootable',
                        'created_at', 'description', 'encrypted', 'id',
                        'metadata', 'name', 'size', 'status',
@@ -26,7 +33,7 @@ class CinderVolumeTests(base.ClientTestBase):
     def test_volume_create_delete_id(self):
         """Create and delete a volume by ID."""
         volume = self.object_create('volume', params='1')
-        self.assert_object_details(self.VOLUME_PROPERTY, volume.keys())
+        self.assert_object_details(self.CREATE_VOLUME_PROPERTY, volume.keys())
         self.object_delete('volume', volume['id'])
         self.check_object_deleted('volume', volume['id'])
 
@@ -44,7 +51,7 @@ class CinderVolumeTests(base.ClientTestBase):
         output = self.cinder('show', params='TestVolumeShow')
         volume = self._get_property_from_output(output)
         self.assertEqual('TestVolumeShow', volume['name'])
-        self.assert_object_details(self.VOLUME_PROPERTY, volume.keys())
+        self.assert_object_details(self.SHOW_VOLUME_PROPERTY, volume.keys())
 
         self.object_delete('volume', volume['id'])
         self.check_object_deleted('volume', volume['id'])
diff --git a/cinderclient/tests/functional/test_volume_create_cli.py b/cinderclient/tests/functional/test_volume_create_cli.py
index c93a31b6f..536851015 100644
--- a/cinderclient/tests/functional/test_volume_create_cli.py
+++ b/cinderclient/tests/functional/test_volume_create_cli.py
@@ -27,7 +27,7 @@ class CinderVolumeNegativeTests(base.ClientTestBase):
     @ddt.data(
         ('', (r'Size is a required parameter')),
         ('-1', (r'Invalid volume size provided for create request')),
-        ('0', (r'Invalid input received')),
+        ('0', (r"Volume size '0' must be an integer and greater than 0")),
         ('size', (r'invalid int value')),
         ('0.2', (r'invalid int value')),
         ('2 GB', (r'unrecognized arguments')),
diff --git a/tox.ini b/tox.ini
index f60267f59..631455c26 100644
--- a/tox.ini
+++ b/tox.ini
@@ -66,7 +66,7 @@ commands = ostestr {posargs}
 setenv =
   {[testenv]setenv}
   OS_TEST_PATH = ./cinderclient/tests/functional
-  OS_VOLUME_API_VERSION = 2
+  OS_VOLUME_API_VERSION = 3
 # The OS_CACERT environment variable should be passed to the test
 # environments to specify a CA bundle file to use in verifying a
 # TLS (https) server certificate.