From 7efc6d8997a3e20e2478c286b692af074d2a4ba7 Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Tue, 6 Sep 2016 08:05:51 -0500 Subject: [PATCH] Provide volume size for tempest volume creation The tempest volume client used to provide a default volume size. This was changed in I2a0f5841fe82ab003562749a63bc4894225699c5. Tempest tests now need to provide a size when creating a volume using this client. Change-Id: Id1a646cfbd11803a796205af8baa0ac783e9ec3a Closes-bug: #1620613 --- .../tempest/api/volume/test_consistencygroups.py | 12 ++++++++---- .../tests/tempest/api/volume/test_volume_unicode.py | 4 ++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/cinder/tests/tempest/api/volume/test_consistencygroups.py b/cinder/tests/tempest/api/volume/test_consistencygroups.py index 09dd84e..5f3af2e 100644 --- a/cinder/tests/tempest/api/volume/test_consistencygroups.py +++ b/cinder/tests/tempest/api/volume/test_consistencygroups.py @@ -84,7 +84,8 @@ class ConsistencyGroupsV2Test(base.BaseVolumeAdminTest): self.name_field = self.special_fields['name_field'] params = {self.name_field: vol_name, 'volume_type': volume_type['id'], - 'consistencygroup_id': cg['id']} + 'consistencygroup_id': cg['id'], + 'size': CONF.volume.volume_size} # Create volume volume = self.admin_volume_client.create_volume(**params)['volume'] @@ -127,7 +128,8 @@ class ConsistencyGroupsV2Test(base.BaseVolumeAdminTest): self.name_field = self.special_fields['name_field'] params = {self.name_field: vol_name, 'volume_type': volume_type['id'], - 'consistencygroup_id': cg['id']} + 'consistencygroup_id': cg['id'], + 'size': CONF.volume.volume_size} # Create volume volume = self.admin_volume_client.create_volume(**params)['volume'] @@ -186,7 +188,8 @@ class ConsistencyGroupsV2Test(base.BaseVolumeAdminTest): self.name_field = self.special_fields['name_field'] params = {self.name_field: vol_name, 'volume_type': volume_type['id'], - 'consistencygroup_id': cg['id']} + 'consistencygroup_id': cg['id'], + 'size': CONF.volume.volume_size} # Create volume volume = self.admin_volume_client.create_volume(**params)['volume'] @@ -251,7 +254,8 @@ class ConsistencyGroupsV2Test(base.BaseVolumeAdminTest): self.name_field = self.special_fields['name_field'] params = {self.name_field: vol_name, 'volume_type': volume_type['id'], - 'consistencygroup_id': cg['id']} + 'consistencygroup_id': cg['id'], + 'size': CONF.volume.volume_size} # Create volume volume = self.admin_volume_client.create_volume(**params)['volume'] diff --git a/cinder/tests/tempest/api/volume/test_volume_unicode.py b/cinder/tests/tempest/api/volume/test_volume_unicode.py index 8436699..d2615d1 100644 --- a/cinder/tests/tempest/api/volume/test_volume_unicode.py +++ b/cinder/tests/tempest/api/volume/test_volume_unicode.py @@ -17,6 +17,9 @@ from tempest.api.volume import base as volume_base from tempest.common.utils import data_utils from tempest.common import waiters +from tempest import config + +CONF = config.CONF class CinderUnicodeTest(volume_base.BaseVolumeTest): @@ -37,6 +40,7 @@ class CinderUnicodeTest(volume_base.BaseVolumeTest): name_field = cls.special_fields['name_field'] kwargs[name_field] = name + kwargs['size'] = CONF.volume.volume_size volume = cls.volumes_client.create_volume(**kwargs)['volume'] cls.volumes.append(volume)