diff --git a/tempest/api/compute/flavors/test_flavors.py b/tempest/api/compute/flavors/test_flavors.py index 6c71c94616..c1c87f90c3 100644 --- a/tempest/api/compute/flavors/test_flavors.py +++ b/tempest/api/compute/flavors/test_flavors.py @@ -38,7 +38,6 @@ class FlavorsV2TestJSON(base.BaseComputeTest): 'name': flavor['name']} self.assertIn(flavor_min_detail, flavors) - @test.attr(type='smoke') @test.idempotent_id('6e85fde4-b3cd-4137-ab72-ed5f418e8c24') def test_list_flavors_with_detail(self): # Detailed list of all flavors should contain the expected flavor diff --git a/tempest/api/compute/images/test_images_oneserver.py b/tempest/api/compute/images/test_images_oneserver.py index 29682084bc..a92048f5d3 100644 --- a/tempest/api/compute/images/test_images_oneserver.py +++ b/tempest/api/compute/images/test_images_oneserver.py @@ -73,7 +73,6 @@ class ImagesOneServerTestJSON(base.BaseV2ComputeTest): flavor = self.flavors_client.get_flavor_details(flavor_id) return flavor['disk'] - @test.attr(type='smoke') @test.idempotent_id('3731d080-d4c5-4872-b41a-64d0d0021314') def test_create_delete_image(self): diff --git a/tempest/api/compute/images/test_list_images.py b/tempest/api/compute/images/test_list_images.py index 7a7a363525..95f49c92e5 100644 --- a/tempest/api/compute/images/test_list_images.py +++ b/tempest/api/compute/images/test_list_images.py @@ -34,14 +34,12 @@ class ListImagesTestJSON(base.BaseV2ComputeTest): super(ListImagesTestJSON, cls).setup_clients() cls.client = cls.images_client - @test.attr(type='smoke') @test.idempotent_id('490d0898-e12a-463f-aef0-c50156b9f789') def test_get_image(self): # Returns the correct details for a single image image = self.client.get_image(self.image_ref) self.assertEqual(self.image_ref, image['id']) - @test.attr(type='smoke') @test.idempotent_id('fd51b7f4-d4a3-4331-9885-866658112a6f') def test_list_images(self): # The list of all images should contain the image @@ -49,7 +47,6 @@ class ListImagesTestJSON(base.BaseV2ComputeTest): found = any([i for i in images if i['id'] == self.image_ref]) self.assertTrue(found) - @test.attr(type='smoke') @test.idempotent_id('9f94cb6b-7f10-48c5-b911-a0b84d7d4cd6') def test_list_images_with_detail(self): # Detailed list of all images should contain the expected images diff --git a/tempest/api/compute/security_groups/test_security_group_rules.py b/tempest/api/compute/security_groups/test_security_group_rules.py index 70394d88b5..ff3f25be3b 100644 --- a/tempest/api/compute/security_groups/test_security_group_rules.py +++ b/tempest/api/compute/security_groups/test_security_group_rules.py @@ -78,7 +78,6 @@ class SecurityGroupRulesTestJSON(base.BaseSecurityGroupsTest): self.expected['ip_range'] = {'cidr': '0.0.0.0/0'} self._check_expected_response(rule) - @test.attr(type='smoke') @test.idempotent_id('7a01873e-3c38-4f30-80be-31a043cfe2fd') @test.services('network') def test_security_group_rules_create_with_optional_cidr(self): @@ -102,7 +101,6 @@ class SecurityGroupRulesTestJSON(base.BaseSecurityGroupsTest): self.expected['ip_range'] = {'cidr': cidr} self._check_expected_response(rule) - @test.attr(type='smoke') @test.idempotent_id('7f5d2899-7705-4d4b-8458-4505188ffab6') @test.services('network') def test_security_group_rules_create_with_optional_group_id(self): @@ -167,7 +165,6 @@ class SecurityGroupRulesTestJSON(base.BaseSecurityGroupsTest): self.assertTrue(any([i for i in rules if i['id'] == rule1_id])) self.assertTrue(any([i for i in rules if i['id'] == rule2_id])) - @test.attr(type='smoke') @test.idempotent_id('fc5c5acf-2091-43a6-a6ae-e42760e9ffaf') @test.services('network') def test_security_group_rules_delete_when_peer_group_deleted(self): diff --git a/tempest/api/compute/security_groups/test_security_groups.py b/tempest/api/compute/security_groups/test_security_groups.py index 16e7acfee9..0ce26a3c3d 100644 --- a/tempest/api/compute/security_groups/test_security_groups.py +++ b/tempest/api/compute/security_groups/test_security_groups.py @@ -60,7 +60,6 @@ class SecurityGroupsTestJSON(base.BaseSecurityGroupsTest): "list" % ', '.join(m_group['name'] for m_group in deleted_sgs)) - @test.attr(type='smoke') @test.idempotent_id('ecc0da4a-2117-48af-91af-993cca39a615') @test.services('network') def test_security_group_create_get_delete(self): @@ -83,7 +82,6 @@ class SecurityGroupsTestJSON(base.BaseSecurityGroupsTest): self.client.delete_security_group(securitygroup['id']) self.client.wait_for_resource_deletion(securitygroup['id']) - @test.attr(type='smoke') @test.idempotent_id('fe4abc0d-83f5-4c50-ad11-57a1127297a2') @test.services('network') def test_server_security_groups(self): @@ -127,7 +125,6 @@ class SecurityGroupsTestJSON(base.BaseSecurityGroupsTest): self.client.delete_security_group(sg['id']) self.client.delete_security_group(sg2['id']) - @test.attr(type='smoke') @test.idempotent_id('7d4e1d3c-3209-4d6d-b020-986304ebad1f') @test.services('network') def test_update_security_groups(self): diff --git a/tempest/api/compute/servers/test_attach_interfaces.py b/tempest/api/compute/servers/test_attach_interfaces.py index 42a61daa21..7ce62695d7 100644 --- a/tempest/api/compute/servers/test_attach_interfaces.py +++ b/tempest/api/compute/servers/test_attach_interfaces.py @@ -118,7 +118,6 @@ class AttachInterfacesTestJSON(base.BaseV2ComputeTest): self.assertEqual(sorted(list1), sorted(list2)) - @test.attr(type='smoke') @test.idempotent_id('73fe8f02-590d-4bf1-b184-e9ca81065051') @test.services('network') def test_create_list_show_delete_interfaces(self): diff --git a/tempest/api/compute/servers/test_create_server.py b/tempest/api/compute/servers/test_create_server.py index ee756f4c61..c62ff8955b 100644 --- a/tempest/api/compute/servers/test_create_server.py +++ b/tempest/api/compute/servers/test_create_server.py @@ -85,7 +85,6 @@ class ServersTestJSON(base.BaseV2ComputeTest): found = any([i for i in servers if i['id'] == self.server['id']]) self.assertTrue(found) - @test.attr(type='smoke') @test.idempotent_id('585e934c-448e-43c4-acbf-d06a9b899997') def test_list_servers_with_detail(self): # The created server should be in the detailed list of all servers diff --git a/tempest/api/compute/servers/test_server_actions.py b/tempest/api/compute/servers/test_server_actions.py index 8b6d9d6c9e..3871db135f 100644 --- a/tempest/api/compute/servers/test_server_actions.py +++ b/tempest/api/compute/servers/test_server_actions.py @@ -105,13 +105,11 @@ class ServerActionsTestJSON(base.BaseV2ComputeTest): self._test_reboot_server('HARD') @decorators.skip_because(bug="1014647") - @test.attr(type='smoke') @test.idempotent_id('4640e3ef-a5df-482e-95a1-ceeeb0faa84d') def test_reboot_server_soft(self): # The server should be signaled to reboot gracefully self._test_reboot_server('SOFT') - @test.attr(type='smoke') @test.idempotent_id('aaa6cdf3-55a7-461a-add9-1c8596b9a07c') def test_rebuild_server(self): # The server should be rebuilt using the provided image and data @@ -220,14 +218,12 @@ class ServerActionsTestJSON(base.BaseV2ComputeTest): @test.idempotent_id('1499262a-9328-4eda-9068-db1ac57498d2') @testtools.skipUnless(CONF.compute_feature_enabled.resize, 'Resize not available.') - @test.attr(type='smoke') def test_resize_server_confirm(self): self._test_resize_server_confirm(stop=False) @test.idempotent_id('138b131d-66df-48c9-a171-64f45eb92962') @testtools.skipUnless(CONF.compute_feature_enabled.resize, 'Resize not available.') - @test.attr(type='smoke') def test_resize_server_confirm_from_stopped(self): self._test_resize_server_confirm(stop=True) diff --git a/tempest/api/compute/servers/test_server_rescue.py b/tempest/api/compute/servers/test_server_rescue.py index 4b1e8f01ec..4e3ce47d89 100644 --- a/tempest/api/compute/servers/test_server_rescue.py +++ b/tempest/api/compute/servers/test_server_rescue.py @@ -77,7 +77,6 @@ class ServerRescueTestJSON(base.BaseV2ComputeTest): self.servers_client.unrescue_server(server_id) self.servers_client.wait_for_server_status(server_id, 'ACTIVE') - @test.attr(type='smoke') @test.idempotent_id('fd032140-714c-42e4-a8fd-adcd8df06be6') def test_rescue_unrescue_instance(self): self.servers_client.rescue_server( diff --git a/tempest/api/compute/test_quotas.py b/tempest/api/compute/test_quotas.py index 86bf5fa2fd..a6e877ceca 100644 --- a/tempest/api/compute/test_quotas.py +++ b/tempest/api/compute/test_quotas.py @@ -43,7 +43,6 @@ class QuotasTestJSON(base.BaseV2ComputeTest): 'instances', 'security_group_rules', 'cores', 'security_groups')) - @test.attr(type='smoke') @test.idempotent_id('f1ef0a97-dbbb-4cca-adc5-c9fbc4f76107') def test_get_quotas(self): # User can get the quota set for it's tenant @@ -60,7 +59,6 @@ class QuotasTestJSON(base.BaseV2ComputeTest): for quota in expected_quota_set: self.assertIn(quota, quota_set.keys()) - @test.attr(type='smoke') @test.idempotent_id('9bfecac7-b966-4f47-913f-1a9e2c12134a') def test_get_default_quotas(self): # User can get the default quota set for it's tenant @@ -70,7 +68,6 @@ class QuotasTestJSON(base.BaseV2ComputeTest): for quota in expected_quota_set: self.assertIn(quota, quota_set.keys()) - @test.attr(type='smoke') @test.idempotent_id('cd65d997-f7e4-4966-a7e9-d5001b674fdc') def test_compare_tenant_quotas_with_default_quotas(self): # Tenants are created with the default quota values diff --git a/tempest/api/compute/volumes/test_volumes_get.py b/tempest/api/compute/volumes/test_volumes_get.py index 1c11128fdd..d96dcc2154 100644 --- a/tempest/api/compute/volumes/test_volumes_get.py +++ b/tempest/api/compute/volumes/test_volumes_get.py @@ -38,7 +38,6 @@ class VolumesGetTestJSON(base.BaseV2ComputeTest): super(VolumesGetTestJSON, cls).setup_clients() cls.client = cls.volumes_extensions_client - @test.attr(type='smoke') @test.idempotent_id('f10f25eb-9775-4d9d-9cbe-1cf54dae9d5f') def test_volume_create_get_delete(self): # CREATE, GET, DELETE Volume