openstack
/
tempest
Code Issues Proposed changes

Merge "Remove unnecessary name definition"

This commit is contained in:
Jenkins 2016-10-14 08:09:52 +00:00 committed by Gerrit Code Review
parent 0cb0f9bc48 152e4c7782
commit a0afc533bc
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tempest/api/volume/admin/test_volume_types.py
View File

@ -43,10 +43,7 @@ class VolumeTypesV2Test(base.BaseVolumeAdminTest):
"vendor_name": vendor}
# Create two volume_types
for i in range(2):
vol_type_name = data_utils.rand_name(
self.__class__.__name__ + '-volume-type')
vol_type = self.create_volume_type(
name=vol_type_name,
extra_specs=extra_specs)
volume_types.append(vol_type)
params = {self.name_field: vol_name,
@ -124,8 +121,7 @@ class VolumeTypesV2Test(base.BaseVolumeAdminTest):
# Create/get/delete encryption type.
provider = "LuksEncryptor"
control_location = "front-end"
name = data_utils.rand_name(self.__class__.__name__ + '-volume-type')
body = self.create_volume_type(name=name)
body = self.create_volume_type()
# Create encryption type
encryption_type = \
self.admin_encryption_types_client.create_encryption_type(

4
tempest/api/volume/admin/test_volume_types_extra_specs.py
View File

@ -14,7 +14,6 @@
# under the License.
from tempest.api.volume import base
from tempest.common.utils import data_utils
from tempest.lib import exceptions as lib_exc
from tempest import test
@ -24,8 +23,7 @@ class VolumeTypesExtraSpecsV2Test(base.BaseVolumeAdminTest):
@classmethod
def resource_setup(cls):
super(VolumeTypesExtraSpecsV2Test, cls).resource_setup()
vol_type_name = data_utils.rand_name(cls.__name__ + '-Volume-type')
cls.volume_type = cls.create_volume_type(name=vol_type_name)
cls.volume_type = cls.create_volume_type()
@test.idempotent_id('b42923e9-0452-4945-be5b-d362ae533e60')
def test_volume_type_extra_specs_list(self):

4
tempest/api/volume/admin/test_volume_types_extra_specs_negative.py
View File

@ -24,10 +24,8 @@ class ExtraSpecsNegativeV2Test(base.BaseVolumeAdminTest):
@classmethod
def resource_setup(cls):
super(ExtraSpecsNegativeV2Test, cls).resource_setup()
vol_type_name = data_utils.rand_name(cls.__name__ + '-Volume-type')
cls.extra_specs = {"spec1": "val1"}
cls.volume_type = cls.create_volume_type(name=vol_type_name,
extra_specs=cls.extra_specs)
cls.volume_type = cls.create_volume_type(extra_specs=cls.extra_specs)
@test.idempotent_id('08961d20-5cbb-4910-ac0f-89ad6dbb2da1')
def test_update_no_body(self):