diff options
author | Jenkins <jenkins@review.openstack.org> | 2014-10-15 10:16:55 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2014-10-15 10:16:55 +0000 |
commit | 7aecb4665e7cbc0b6e2fc869ab68e610eec8d601 (patch) | |
tree | dea930274e0c93b14ae6f78e91feec20559b38ce | |
parent | 04ad4b0d1dde2fb39bc673348e31a4bc8f1250d6 (diff) | |
parent | 1e0a9f8f643b193a7bb49401fcee747d840e7b01 (diff) | |
download | tempest-7aecb4665e7cbc0b6e2fc869ab68e610eec8d601.tar.gz |
Merge "Fix duplicate ref of volume_types_client in vol tests"
-rw-r--r-- | tempest/api/volume/admin/test_multi_backend.py | 4 | ||||
-rw-r--r-- | tempest/api/volume/admin/test_volume_types.py | 29 | ||||
-rw-r--r-- | tempest/api/volume/admin/test_volume_types_extra_specs.py | 19 | ||||
-rw-r--r-- | tempest/api/volume/admin/test_volume_types_extra_specs_negative.py | 85 | ||||
-rw-r--r-- | tempest/api/volume/admin/test_volume_types_negative.py | 8 | ||||
-rw-r--r-- | tempest/api/volume/base.py | 1 |
6 files changed, 81 insertions, 65 deletions
diff --git a/tempest/api/volume/admin/test_multi_backend.py b/tempest/api/volume/admin/test_multi_backend.py index db2aab53c..6f2ee0660 100644 --- a/tempest/api/volume/admin/test_multi_backend.py +++ b/tempest/api/volume/admin/test_multi_backend.py @@ -60,7 +60,7 @@ class VolumeMultiBackendTest(base.BaseVolumeV1AdminTest): extra_specs = {spec_key_with_prefix: backend_name_key} else: extra_specs = {spec_key_without_prefix: backend_name_key} - _, self.type = self.client.create_volume_type( + _, self.type = self.volume_types_client.create_volume_type( type_name, extra_specs=extra_specs) self.volume_type_id_list.append(self.type['id']) @@ -90,7 +90,7 @@ class VolumeMultiBackendTest(base.BaseVolumeV1AdminTest): # volume types deletion volume_type_id_list = getattr(cls, 'volume_type_id_list', []) for volume_type_id in volume_type_id_list: - cls.client.delete_volume_type(volume_type_id) + cls.volume_types_client.delete_volume_type(volume_type_id) super(VolumeMultiBackendTest, cls).resource_cleanup() diff --git a/tempest/api/volume/admin/test_volume_types.py b/tempest/api/volume/admin/test_volume_types.py index 070d38f7e..a0792f125 100644 --- a/tempest/api/volume/admin/test_volume_types.py +++ b/tempest/api/volume/admin/test_volume_types.py @@ -29,12 +29,12 @@ class VolumeTypesTest(base.BaseVolumeV1AdminTest): self.volumes_client.wait_for_resource_deletion(volume_id) def _delete_volume_type(self, volume_type_id): - self.client.delete_volume_type(volume_type_id) + self.volume_types_client.delete_volume_type(volume_type_id) @test.attr(type='smoke') def test_volume_type_list(self): # List Volume types. - _, body = self.client.list_volume_types() + _, body = self.volume_types_client.list_volume_types() self.assertIsInstance(body, list) @test.attr(type='smoke') @@ -48,7 +48,7 @@ class VolumeTypesTest(base.BaseVolumeV1AdminTest): extra_specs = {"storage_protocol": proto, "vendor_name": vendor} body = {} - _, body = self.client.create_volume_type( + _, body = self.volume_types_client.create_volume_type( vol_type_name, extra_specs=extra_specs) self.assertIn('id', body) @@ -87,7 +87,7 @@ class VolumeTypesTest(base.BaseVolumeV1AdminTest): vendor = CONF.volume.vendor_name extra_specs = {"storage_protocol": proto, "vendor_name": vendor} - _, body = self.client.create_volume_type( + _, body = self.volume_types_client.create_volume_type( name, extra_specs=extra_specs) self.assertIn('id', body) @@ -98,7 +98,8 @@ class VolumeTypesTest(base.BaseVolumeV1AdminTest): "to the requested name") self.assertTrue(body['id'] is not None, "Field volume_type id is empty or not found.") - _, fetched_volume_type = self.client.get_volume_type(body['id']) + _, fetched_volume_type = self.volume_types_client.get_volume_type( + body['id']) self.assertEqual(name, fetched_volume_type['name'], 'The fetched Volume_type is different ' 'from the created Volume_type') @@ -115,11 +116,11 @@ class VolumeTypesTest(base.BaseVolumeV1AdminTest): provider = "LuksEncryptor" control_location = "front-end" name = data_utils.rand_name("volume-type-") - _, body = self.client.create_volume_type(name) + _, body = self.volume_types_client.create_volume_type(name) self.addCleanup(self._delete_volume_type, body['id']) # Create encryption type - _, encryption_type = self.client.create_encryption_type( + _, encryption_type = self.volume_types_client.create_encryption_type( body['id'], provider=provider, control_location=control_location) self.assertIn('volume_type_id', encryption_type) @@ -131,8 +132,9 @@ class VolumeTypesTest(base.BaseVolumeV1AdminTest): "equal to the requested control_location") # Get encryption type - _, fetched_encryption_type = self.client.get_encryption_type( - encryption_type['volume_type_id']) + _, fetched_encryption_type = ( + self.volume_types_client.get_encryption_type( + encryption_type['volume_type_id'])) self.assertEqual(provider, fetched_encryption_type['provider'], 'The fetched encryption_type provider is different ' @@ -143,11 +145,12 @@ class VolumeTypesTest(base.BaseVolumeV1AdminTest): 'different from the created encryption_type') # Delete encryption type - self.client.delete_encryption_type( + self.volume_types_client.delete_encryption_type( encryption_type['volume_type_id']) resource = {"id": encryption_type['volume_type_id'], "type": "encryption-type"} - self.client.wait_for_resource_deletion(resource) - _, deleted_encryption_type = self.client.get_encryption_type( - encryption_type['volume_type_id']) + self.volume_types_client.wait_for_resource_deletion(resource) + _, deleted_encryption_type = ( + self.volume_types_client.get_encryption_type( + encryption_type['volume_type_id'])) self.assertEmpty(deleted_encryption_type) diff --git a/tempest/api/volume/admin/test_volume_types_extra_specs.py b/tempest/api/volume/admin/test_volume_types_extra_specs.py index 2d72dd259..a154821cd 100644 --- a/tempest/api/volume/admin/test_volume_types_extra_specs.py +++ b/tempest/api/volume/admin/test_volume_types_extra_specs.py @@ -25,22 +25,23 @@ class VolumeTypesExtraSpecsTest(base.BaseVolumeV1AdminTest): def resource_setup(cls): super(VolumeTypesExtraSpecsTest, cls).resource_setup() vol_type_name = data_utils.rand_name('Volume-type-') - _, cls.volume_type = cls.client.create_volume_type(vol_type_name) + _, cls.volume_type = cls.volume_types_client.create_volume_type( + vol_type_name) @classmethod def resource_cleanup(cls): - cls.client.delete_volume_type(cls.volume_type['id']) + cls.volume_types_client.delete_volume_type(cls.volume_type['id']) super(VolumeTypesExtraSpecsTest, cls).resource_cleanup() @test.attr(type='smoke') def test_volume_type_extra_specs_list(self): # List Volume types extra specs. extra_specs = {"spec1": "val1"} - _, body = self.client.create_volume_type_extra_specs( + _, body = self.volume_types_client.create_volume_type_extra_specs( self.volume_type['id'], extra_specs) self.assertEqual(extra_specs, body, "Volume type extra spec incorrectly created") - _, body = self.client.list_volume_types_extra_specs( + _, body = self.volume_types_client.list_volume_types_extra_specs( self.volume_type['id']) self.assertIsInstance(body, dict) self.assertIn('spec1', body) @@ -49,13 +50,13 @@ class VolumeTypesExtraSpecsTest(base.BaseVolumeV1AdminTest): def test_volume_type_extra_specs_update(self): # Update volume type extra specs extra_specs = {"spec2": "val1"} - _, body = self.client.create_volume_type_extra_specs( + _, body = self.volume_types_client.create_volume_type_extra_specs( self.volume_type['id'], extra_specs) self.assertEqual(extra_specs, body, "Volume type extra spec incorrectly created") extra_spec = {"spec2": "val2"} - _, body = self.client.update_volume_type_extra_specs( + _, body = self.volume_types_client.update_volume_type_extra_specs( self.volume_type['id'], extra_spec.keys()[0], extra_spec) @@ -67,18 +68,18 @@ class VolumeTypesExtraSpecsTest(base.BaseVolumeV1AdminTest): def test_volume_type_extra_spec_create_get_delete(self): # Create/Get/Delete volume type extra spec. extra_specs = {"spec3": "val1"} - _, body = self.client.create_volume_type_extra_specs( + _, body = self.volume_types_client.create_volume_type_extra_specs( self.volume_type['id'], extra_specs) self.assertEqual(extra_specs, body, "Volume type extra spec incorrectly created") - self.client.get_volume_type_extra_specs( + self.volume_types_client.get_volume_type_extra_specs( self.volume_type['id'], extra_specs.keys()[0]) self.assertEqual(extra_specs, body, "Volume type extra spec incorrectly fetched") - self.client.delete_volume_type_extra_specs( + self.volume_types_client.delete_volume_type_extra_specs( self.volume_type['id'], extra_specs.keys()[0]) diff --git a/tempest/api/volume/admin/test_volume_types_extra_specs_negative.py b/tempest/api/volume/admin/test_volume_types_extra_specs_negative.py index f3eee0061..8734b168d 100644 --- a/tempest/api/volume/admin/test_volume_types_extra_specs_negative.py +++ b/tempest/api/volume/admin/test_volume_types_extra_specs_negative.py @@ -29,104 +29,115 @@ class ExtraSpecsNegativeTest(base.BaseVolumeV1AdminTest): super(ExtraSpecsNegativeTest, cls).resource_setup() vol_type_name = data_utils.rand_name('Volume-type-') cls.extra_specs = {"spec1": "val1"} - _, cls.volume_type = cls.client.create_volume_type( + _, cls.volume_type = cls.volume_types_client.create_volume_type( vol_type_name, extra_specs=cls.extra_specs) @classmethod def resource_cleanup(cls): - cls.client.delete_volume_type(cls.volume_type['id']) + cls.volume_types_client.delete_volume_type(cls.volume_type['id']) super(ExtraSpecsNegativeTest, cls).resource_cleanup() @test.attr(type='gate') def test_update_no_body(self): # Should not update volume type extra specs with no body extra_spec = {"spec1": "val2"} - self.assertRaises(exceptions.BadRequest, - self.client.update_volume_type_extra_specs, - self.volume_type['id'], extra_spec.keys()[0], None) + self.assertRaises( + exceptions.BadRequest, + self.volume_types_client.update_volume_type_extra_specs, + self.volume_type['id'], extra_spec.keys()[0], None) @test.attr(type='gate') def test_update_nonexistent_extra_spec_id(self): # Should not update volume type extra specs with nonexistent id. extra_spec = {"spec1": "val2"} - self.assertRaises(exceptions.BadRequest, - self.client.update_volume_type_extra_specs, - self.volume_type['id'], str(uuid.uuid4()), - extra_spec) + self.assertRaises( + exceptions.BadRequest, + self.volume_types_client.update_volume_type_extra_specs, + self.volume_type['id'], str(uuid.uuid4()), + extra_spec) @test.attr(type='gate') def test_update_none_extra_spec_id(self): # Should not update volume type extra specs with none id. extra_spec = {"spec1": "val2"} - self.assertRaises(exceptions.BadRequest, - self.client.update_volume_type_extra_specs, - self.volume_type['id'], None, extra_spec) + self.assertRaises( + exceptions.BadRequest, + self.volume_types_client.update_volume_type_extra_specs, + self.volume_type['id'], None, extra_spec) @test.attr(type='gate') def test_update_multiple_extra_spec(self): # Should not update volume type extra specs with multiple specs as # body. extra_spec = {"spec1": "val2", 'spec2': 'val1'} - self.assertRaises(exceptions.BadRequest, - self.client.update_volume_type_extra_specs, - self.volume_type['id'], extra_spec.keys()[0], - extra_spec) + self.assertRaises( + exceptions.BadRequest, + self.volume_types_client.update_volume_type_extra_specs, + self.volume_type['id'], extra_spec.keys()[0], + extra_spec) @test.attr(type='gate') def test_create_nonexistent_type_id(self): # Should not create volume type extra spec for nonexistent volume # type id. extra_specs = {"spec2": "val1"} - self.assertRaises(exceptions.NotFound, - self.client.create_volume_type_extra_specs, - str(uuid.uuid4()), extra_specs) + self.assertRaises( + exceptions.NotFound, + self.volume_types_client.create_volume_type_extra_specs, + str(uuid.uuid4()), extra_specs) @test.attr(type='gate') def test_create_none_body(self): # Should not create volume type extra spec for none POST body. - self.assertRaises(exceptions.BadRequest, - self.client.create_volume_type_extra_specs, - self.volume_type['id'], None) + self.assertRaises( + exceptions.BadRequest, + self.volume_types_client.create_volume_type_extra_specs, + self.volume_type['id'], None) @test.attr(type='gate') def test_create_invalid_body(self): # Should not create volume type extra spec for invalid POST body. - self.assertRaises(exceptions.BadRequest, - self.client.create_volume_type_extra_specs, - self.volume_type['id'], ['invalid']) + self.assertRaises( + exceptions.BadRequest, + self.volume_types_client.create_volume_type_extra_specs, + self.volume_type['id'], ['invalid']) @test.attr(type='gate') def test_delete_nonexistent_volume_type_id(self): # Should not delete volume type extra spec for nonexistent # type id. extra_specs = {"spec1": "val1"} - self.assertRaises(exceptions.NotFound, - self.client.delete_volume_type_extra_specs, - str(uuid.uuid4()), extra_specs.keys()[0]) + self.assertRaises( + exceptions.NotFound, + self.volume_types_client.delete_volume_type_extra_specs, + str(uuid.uuid4()), extra_specs.keys()[0]) @test.attr(type='gate') def test_list_nonexistent_volume_type_id(self): # Should not list volume type extra spec for nonexistent type id. - self.assertRaises(exceptions.NotFound, - self.client.list_volume_types_extra_specs, - str(uuid.uuid4())) + self.assertRaises( + exceptions.NotFound, + self.volume_types_client.list_volume_types_extra_specs, + str(uuid.uuid4())) @test.attr(type='gate') def test_get_nonexistent_volume_type_id(self): # Should not get volume type extra spec for nonexistent type id. extra_specs = {"spec1": "val1"} - self.assertRaises(exceptions.NotFound, - self.client.get_volume_type_extra_specs, - str(uuid.uuid4()), extra_specs.keys()[0]) + self.assertRaises( + exceptions.NotFound, + self.volume_types_client.get_volume_type_extra_specs, + str(uuid.uuid4()), extra_specs.keys()[0]) @test.attr(type='gate') def test_get_nonexistent_extra_spec_id(self): # Should not get volume type extra spec for nonexistent extra spec # id. - self.assertRaises(exceptions.NotFound, - self.client.get_volume_type_extra_specs, - self.volume_type['id'], str(uuid.uuid4())) + self.assertRaises( + exceptions.NotFound, + self.volume_types_client.get_volume_type_extra_specs, + self.volume_type['id'], str(uuid.uuid4())) class ExtraSpecsNegativeTestXML(ExtraSpecsNegativeTest): diff --git a/tempest/api/volume/admin/test_volume_types_negative.py b/tempest/api/volume/admin/test_volume_types_negative.py index c18e15db7..a4d6431b1 100644 --- a/tempest/api/volume/admin/test_volume_types_negative.py +++ b/tempest/api/volume/admin/test_volume_types_negative.py @@ -35,18 +35,20 @@ class VolumeTypesNegativeTest(base.BaseVolumeV1AdminTest): def test_create_with_empty_name(self): # Should not be able to create volume type with an empty name. self.assertRaises(exceptions.BadRequest, - self.client.create_volume_type, '') + self.volume_types_client.create_volume_type, '') @test.attr(type='gate') def test_get_nonexistent_type_id(self): # Should not be able to get volume type with nonexistent type id. - self.assertRaises(exceptions.NotFound, self.client.get_volume_type, + self.assertRaises(exceptions.NotFound, + self.volume_types_client.get_volume_type, str(uuid.uuid4())) @test.attr(type='gate') def test_delete_nonexistent_type_id(self): # Should not be able to delete volume type with nonexistent type id. - self.assertRaises(exceptions.NotFound, self.client.delete_volume_type, + self.assertRaises(exceptions.NotFound, + self.volume_types_client.delete_volume_type, str(uuid.uuid4())) diff --git a/tempest/api/volume/base.py b/tempest/api/volume/base.py index 78fd61d4d..5815f6868 100644 --- a/tempest/api/volume/base.py +++ b/tempest/api/volume/base.py @@ -165,7 +165,6 @@ class BaseVolumeAdminTest(BaseVolumeTest): cls.qos_specs = [] - cls.client = cls.os_adm.volume_types_client cls.hosts_client = cls.os_adm.volume_hosts_client cls.quotas_client = cls.os_adm.volume_quotas_client cls.volume_types_client = cls.os_adm.volume_types_client |