Don't use tempest special_fields

This has been removed, which now causes these
tests to fail.

Tempest change: https://review.openstack.org/#/c/448869/

Change-Id: I31310dc9b3834e0bf16618db3e473f17eab2b610

cinder/tests/tempest/api/volume/test_consistencygroups.py

@@ -79,8 +79,7 @@ class ConsistencyGroupsV2Test(base.BaseVolumeAdminTest):
         cg = create_consistencygroup(volume_type['id'],
                                      name=cg_name)['consistencygroup']
         vol_name = data_utils.rand_name("volume")
-        self.name_field = self.special_fields['name_field']
-        params = {self.name_field: vol_name,
+        params = {'name': vol_name,
                   'volume_type': volume_type['id'],
                   'consistencygroup_id': cg['id'],
                   'size': CONF.volume.volume_size}
@@ -123,8 +122,7 @@ class ConsistencyGroupsV2Test(base.BaseVolumeAdminTest):
         cg = create_consistencygroup(volume_type['id'],
                                      name=cg_name)['consistencygroup']
         vol_name = data_utils.rand_name("volume")
-        self.name_field = self.special_fields['name_field']
-        params = {self.name_field: vol_name,
+        params = {'name': vol_name,
                   'volume_type': volume_type['id'],
                   'consistencygroup_id': cg['id'],
                   'size': CONF.volume.volume_size}
@@ -183,8 +181,7 @@ class ConsistencyGroupsV2Test(base.BaseVolumeAdminTest):
         cg = create_consistencygroup(volume_type['id'],
                                      name=cg_name)['consistencygroup']
         vol_name = data_utils.rand_name("volume")
-        self.name_field = self.special_fields['name_field']
-        params = {self.name_field: vol_name,
+        params = {'name': vol_name,
                   'volume_type': volume_type['id'],
                   'consistencygroup_id': cg['id'],
                   'size': CONF.volume.volume_size}
@@ -249,8 +246,7 @@ class ConsistencyGroupsV2Test(base.BaseVolumeAdminTest):
         cg = create_consistencygroup(volume_type['id'],
                                      name=cg_name)['consistencygroup']
         vol_name = data_utils.rand_name("volume")
-        self.name_field = self.special_fields['name_field']
-        params = {self.name_field: vol_name,
+        params = {'name': vol_name,
                   'volume_type': volume_type['id'],
                   'consistencygroup_id': cg['id'],
                   'size': CONF.volume.volume_size}

cinder/tests/tempest/api/volume/test_volume_unicode.py

@@ -36,10 +36,9 @@ class CinderUnicodeTest(volume_base.BaseVolumeTest):
 
     @classmethod
     def create_volume_with_args(cls, **kwargs):
-        name = kwargs['name'] or data_utils.rand_name('Volume')
+        if 'name' not in kwargs:
+            kwargs['name'] = data_utils.rand_name('Volume')
 
-        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']
@@ -56,5 +55,5 @@ class CinderUnicodeTest(volume_base.BaseVolumeTest):
 
         result = self.volumes_client.show_volume(self.volumes[0]['id'])
         fetched_volume = result['volume']
-        self.assertEqual(fetched_volume[self.special_fields['name_field']],
+        self.assertEqual(fetched_volume['name'],
                          self.volume_name)