Codebase list cinder-tempest-plugin / 28f3904
Merge "Don't use tempest special_fields" Jenkins authored 9 years ago Gerrit Code Review committed 9 years ago
2 changed file(s) with 7 addition(s) and 12 deletion(s). Raw diff Collapse all Expand all
+4
-8
cinder/tests/tempest/api/volume/test_consistencygroups.py less more
7878 cg = create_consistencygroup(volume_type['id'],
7979 name=cg_name)['consistencygroup']
8080 vol_name = data_utils.rand_name("volume")
81 self.name_field = self.special_fields['name_field']
82 params = {self.name_field: vol_name,
81 params = {'name': vol_name,
8382 'volume_type': volume_type['id'],
8483 'consistencygroup_id': cg['id'],
8584 'size': CONF.volume.volume_size}
122121 cg = create_consistencygroup(volume_type['id'],
123122 name=cg_name)['consistencygroup']
124123 vol_name = data_utils.rand_name("volume")
125 self.name_field = self.special_fields['name_field']
126 params = {self.name_field: vol_name,
124 params = {'name': vol_name,
127125 'volume_type': volume_type['id'],
128126 'consistencygroup_id': cg['id'],
129127 'size': CONF.volume.volume_size}
182180 cg = create_consistencygroup(volume_type['id'],
183181 name=cg_name)['consistencygroup']
184182 vol_name = data_utils.rand_name("volume")
185 self.name_field = self.special_fields['name_field']
186 params = {self.name_field: vol_name,
183 params = {'name': vol_name,
187184 'volume_type': volume_type['id'],
188185 'consistencygroup_id': cg['id'],
189186 'size': CONF.volume.volume_size}
248245 cg = create_consistencygroup(volume_type['id'],
249246 name=cg_name)['consistencygroup']
250247 vol_name = data_utils.rand_name("volume")
251 self.name_field = self.special_fields['name_field']
252 params = {self.name_field: vol_name,
248 params = {'name': vol_name,
253249 'volume_type': volume_type['id'],
254250 'consistencygroup_id': cg['id'],
255251 'size': CONF.volume.volume_size}
+3
-4
cinder/tests/tempest/api/volume/test_volume_unicode.py less more
3535
3636 @classmethod
3737 def create_volume_with_args(cls, **kwargs):
38 name = kwargs['name'] or data_utils.rand_name('Volume')
38 if 'name' not in kwargs:
39 kwargs['name'] = data_utils.rand_name('Volume')
3940
40 name_field = cls.special_fields['name_field']
41 kwargs[name_field] = name
4241 kwargs['size'] = CONF.volume.volume_size
4342
4443 volume = cls.volumes_client.create_volume(**kwargs)['volume']
5554
5655 result = self.volumes_client.show_volume(self.volumes[0]['id'])
5756 fetched_volume = result['volume']
58 self.assertEqual(fetched_volume[self.special_fields['name_field']],
57 self.assertEqual(fetched_volume['name'],
5958 self.volume_name)