Merge "Provide volume size for tempest volume creation"

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']

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)