openstack/python-cinderclient
Code Issues Proposed changes

Use api version 3 for functional test

Browse Source 
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
This commit is contained in:
junboli
2018-06-19 09:01:42 +08:00
parent 36275be1c1
commit 9aa1c9a485
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cinderclient/tests/functional/test_cli.py
View File

@@ -17,7 +17,14 @@ from cinderclient.tests.functional import base
class CinderVolumeTests(base.ClientTestBase): class CinderVolumeTests(base.ClientTestBase):
"""Check of base cinder volume commands.""" """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', 'availability_zone', 'bootable',
'created_at', 'description', 'encrypted', 'id', 'created_at', 'description', 'encrypted', 'id',
'metadata', 'name', 'size', 'status', 'metadata', 'name', 'size', 'status',
@@ -26,7 +33,7 @@ class CinderVolumeTests(base.ClientTestBase):
def test_volume_create_delete_id(self): def test_volume_create_delete_id(self):
"""Create and delete a volume by ID.""" """Create and delete a volume by ID."""
volume = self.object_create('volume', params='1') 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.object_delete('volume', volume['id'])
self.check_object_deleted('volume', volume['id']) self.check_object_deleted('volume', volume['id'])
@@ -44,7 +51,7 @@ class CinderVolumeTests(base.ClientTestBase):
output = self.cinder('show', params='TestVolumeShow') output = self.cinder('show', params='TestVolumeShow')
volume = self._get_property_from_output(output) volume = self._get_property_from_output(output)
self.assertEqual('TestVolumeShow', volume['name']) 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.object_delete('volume', volume['id'])
self.check_object_deleted('volume', volume['id']) self.check_object_deleted('volume', volume['id'])

2
cinderclient/tests/functional/test_volume_create_cli.py
View File

@@ -27,7 +27,7 @@ class CinderVolumeNegativeTests(base.ClientTestBase):
@ddt.data( @ddt.data(
('', (r'Size is a required parameter')), ('', (r'Size is a required parameter')),
('-1', (r'Invalid volume size provided for create request')), ('-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')), ('size', (r'invalid int value')),
('0.2', (r'invalid int value')), ('0.2', (r'invalid int value')),
('2 GB', (r'unrecognized arguments')), ('2 GB', (r'unrecognized arguments')),

2
tox.ini
View File

@@ -66,7 +66,7 @@ commands = ostestr {posargs}
setenv = setenv =
{[testenv]setenv} {[testenv]setenv}
OS_TEST_PATH = ./cinderclient/tests/functional 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 # The OS_CACERT environment variable should be passed to the test
# environments to specify a CA bundle file to use in verifying a # environments to specify a CA bundle file to use in verifying a
# TLS (https) server certificate. # TLS (https) server certificate.