diff options
Diffstat (limited to 'tempest/api/orchestration/stacks')
9 files changed, 1 insertions, 32 deletions
diff --git a/tempest/api/orchestration/stacks/test_environment.py b/tempest/api/orchestration/stacks/test_environment.py index df67ef2eb..ecb824b15 100644 --- a/tempest/api/orchestration/stacks/test_environment.py +++ b/tempest/api/orchestration/stacks/test_environment.py @@ -25,7 +25,6 @@ LOG = logging.getLogger(__name__) class StackEnvironmentTest(base.BaseOrchestrationTest): - @test.attr(type='gate') @test.idempotent_id('37d4346b-1abd-4442-b7b1-2a4e5749a1e3') def test_environment_parameter(self): """Test passing a stack parameter via the environment.""" @@ -43,7 +42,6 @@ class StackEnvironmentTest(base.BaseOrchestrationTest): random_value = self.get_stack_output(stack_identifier, 'random_value') self.assertEqual(20, len(random_value)) - @test.attr(type='gate') @test.idempotent_id('73bce717-ad22-4853-bbef-6ed89b632701') def test_environment_provider_resource(self): """Test passing resource_registry defining a provider resource.""" @@ -73,7 +71,6 @@ outputs: 'random_length']['default'] self.assertEqual(expected_length, len(random_value)) - @test.attr(type='gate') @test.idempotent_id('9d682e5a-f4bb-47d5-8472-9d3cacb855df') def test_files_provider_resource(self): """Test untyped defining of a provider resource via "files".""" diff --git a/tempest/api/orchestration/stacks/test_limits.py b/tempest/api/orchestration/stacks/test_limits.py index c49b040d4..4291d76da 100644 --- a/tempest/api/orchestration/stacks/test_limits.py +++ b/tempest/api/orchestration/stacks/test_limits.py @@ -26,7 +26,6 @@ LOG = logging.getLogger(__name__) class TestServerStackLimits(base.BaseOrchestrationTest): - @test.attr(type='gate') @test.idempotent_id('ec9bed71-c460-45c9-ab98-295caa9fd76b') def test_exceed_max_template_size_fails(self): stack_name = data_utils.rand_name('heat') @@ -40,7 +39,6 @@ Outputs: stack_name, template) self.assertIn('Template exceeds maximum allowed size', str(ex)) - @test.attr(type='gate') @test.idempotent_id('d1b83e73-7cad-4a22-9839-036548c5387c') def test_exceed_max_resources_per_stack(self): stack_name = data_utils.rand_name('heat') diff --git a/tempest/api/orchestration/stacks/test_neutron_resources.py b/tempest/api/orchestration/stacks/test_neutron_resources.py index 81e6e8274..a0706ff9f 100644 --- a/tempest/api/orchestration/stacks/test_neutron_resources.py +++ b/tempest/api/orchestration/stacks/test_neutron_resources.py @@ -94,7 +94,6 @@ class NeutronResourcesTestJSON(base.BaseOrchestrationTest): for resource in resources: cls.test_resources[resource['logical_resource_id']] = resource - @test.attr(type='gate') @test.idempotent_id('f9e2664c-bc44-4eef-98b6-495e4f9d74b3') def test_created_resources(self): """Verifies created neutron resources.""" @@ -113,7 +112,6 @@ class NeutronResourcesTestJSON(base.BaseOrchestrationTest): self.assertEqual(resource_type, resource['resource_type']) self.assertEqual('CREATE_COMPLETE', resource['resource_status']) - @test.attr(type='gate') @test.idempotent_id('c572b915-edb1-4e90-b196-c7199a6848c0') @test.services('network') def test_created_network(self): @@ -126,7 +124,6 @@ class NeutronResourcesTestJSON(base.BaseOrchestrationTest): self.assertEqual(self.neutron_basic_template['resources'][ 'Network']['properties']['name'], network['name']) - @test.attr(type='gate') @test.idempotent_id('e8f84b96-f9d7-4684-ad5f-340203e9f2c2') @test.services('network') def test_created_subnet(self): @@ -145,7 +142,6 @@ class NeutronResourcesTestJSON(base.BaseOrchestrationTest): 'Subnet']['properties']['ip_version'], subnet['ip_version']) self.assertEqual(str(self.subnet_cidr), subnet['cidr']) - @test.attr(type='gate') @test.idempotent_id('96af4c7f-5069-44bc-bdcf-c0390f8a67d1') @test.services('network') def test_created_router(self): @@ -159,7 +155,6 @@ class NeutronResourcesTestJSON(base.BaseOrchestrationTest): router['external_gateway_info']['network_id']) self.assertEqual(True, router['admin_state_up']) - @test.attr(type='gate') @test.idempotent_id('89f605bd-153e-43ee-a0ed-9919b63423c5') @test.services('network') def test_created_router_interface(self): @@ -183,7 +178,6 @@ class NeutronResourcesTestJSON(base.BaseOrchestrationTest): self.assertEqual(str(self.subnet_cidr.iter_hosts().next()), router_interface_ip) - @test.attr(type='gate') @test.idempotent_id('75d85316-4ac2-4c0e-a1a9-edd2148fc10e') @test.services('compute', 'network') def test_created_server(self): diff --git a/tempest/api/orchestration/stacks/test_non_empty_stack.py b/tempest/api/orchestration/stacks/test_non_empty_stack.py index 5f96de327..bffc3066a 100644 --- a/tempest/api/orchestration/stacks/test_non_empty_stack.py +++ b/tempest/api/orchestration/stacks/test_non_empty_stack.py @@ -54,7 +54,6 @@ class StacksTestJSON(base.BaseOrchestrationTest): self.assertEqual(expected_num, len(stacks)) return stacks - @test.attr(type='gate') @test.idempotent_id('065c652a-720d-4760-9132-06aedeb8e3ab') def test_stack_list(self): """Created stack should be in the list of existing stacks.""" @@ -62,7 +61,6 @@ class StacksTestJSON(base.BaseOrchestrationTest): stacks_names = map(lambda stack: stack['stack_name'], stacks) self.assertIn(self.stack_name, stacks_names) - @test.attr(type='gate') @test.idempotent_id('992f96e3-41ee-4ff6-91c7-bcfb670c0919') def test_stack_show(self): """Getting details about created stack should be possible.""" @@ -82,7 +80,6 @@ class StacksTestJSON(base.BaseOrchestrationTest): self.assertEqual(self.stack_id, stack['id']) self.assertEqual('fluffy', stack['outputs'][0]['output_key']) - @test.attr(type='gate') @test.idempotent_id('fe719f7a-305a-44d8-bbb5-c91e93d9da17') def test_suspend_resume_stack(self): """Suspend and resume a stack.""" @@ -93,7 +90,6 @@ class StacksTestJSON(base.BaseOrchestrationTest): self.client.wait_for_stack_status(self.stack_identifier, 'RESUME_COMPLETE') - @test.attr(type='gate') @test.idempotent_id('c951d55e-7cce-4c1f-83a0-bad735437fa6') def test_list_resources(self): """Getting list of created resources for the stack should be possible. @@ -101,7 +97,6 @@ class StacksTestJSON(base.BaseOrchestrationTest): resources = self.list_resources(self.stack_identifier) self.assertEqual({self.resource_name: self.resource_type}, resources) - @test.attr(type='gate') @test.idempotent_id('2aba03b3-392f-4237-900b-1f5a5e9bd962') def test_show_resource(self): """Getting details about created resource should be possible.""" @@ -116,7 +111,6 @@ class StacksTestJSON(base.BaseOrchestrationTest): self.assertEqual(self.resource_name, resource['logical_resource_id']) self.assertEqual(self.resource_type, resource['resource_type']) - @test.attr(type='gate') @test.idempotent_id('898070a9-eba5-4fae-b7d6-cf3ffa03090f') def test_resource_metadata(self): """Getting metadata for created resources should be possible.""" @@ -126,7 +120,6 @@ class StacksTestJSON(base.BaseOrchestrationTest): self.assertIsInstance(metadata, dict) self.assertEqual(['Tom', 'Stinky'], metadata.get('kittens', None)) - @test.attr(type='gate') @test.idempotent_id('46567533-0a7f-483b-8942-fa19e0f17839') def test_list_events(self): """Getting list of created events for the stack should be possible.""" @@ -142,7 +135,6 @@ class StacksTestJSON(base.BaseOrchestrationTest): self.assertIn('CREATE_IN_PROGRESS', resource_statuses) self.assertIn('CREATE_COMPLETE', resource_statuses) - @test.attr(type='gate') @test.idempotent_id('92465723-1673-400a-909d-4773757a3f21') def test_show_event(self): """Getting details about an event should be possible.""" diff --git a/tempest/api/orchestration/stacks/test_nova_keypair_resources.py b/tempest/api/orchestration/stacks/test_nova_keypair_resources.py index acdd4c716..c79c3c3cf 100644 --- a/tempest/api/orchestration/stacks/test_nova_keypair_resources.py +++ b/tempest/api/orchestration/stacks/test_nova_keypair_resources.py @@ -49,7 +49,6 @@ class NovaKeyPairResourcesYAMLTest(base.BaseOrchestrationTest): for resource in resources: cls.test_resources[resource['logical_resource_id']] = resource - @test.attr(type='gate') @test.idempotent_id('b476eac2-a302-4815-961f-18c410a2a537') def test_created_resources(self): """Verifies created keypair resource.""" @@ -70,7 +69,6 @@ class NovaKeyPairResourcesYAMLTest(base.BaseOrchestrationTest): self.assertEqual(resource_type, resource['resource_type']) self.assertEqual('CREATE_COMPLETE', resource['resource_status']) - @test.attr(type='gate') @test.idempotent_id('8d77dec7-91fd-45a6-943d-5abd45e338a4') def test_stack_keypairs_output(self): stack = self.client.show_stack(self.stack_name) diff --git a/tempest/api/orchestration/stacks/test_swift_resources.py b/tempest/api/orchestration/stacks/test_swift_resources.py index 6884c6b18..d4fd3f9d5 100644 --- a/tempest/api/orchestration/stacks/test_swift_resources.py +++ b/tempest/api/orchestration/stacks/test_swift_resources.py @@ -16,7 +16,6 @@ from tempest_lib.common.utils import data_utils from tempest.api.orchestration import base -from tempest import clients from tempest import config from tempest import test @@ -32,11 +31,6 @@ class SwiftResourcesTestJSON(base.BaseOrchestrationTest): raise cls.skipException("Swift support is required") @classmethod - def setup_credentials(cls): - super(SwiftResourcesTestJSON, cls).setup_credentials() - cls.os = clients.Manager() - - @classmethod def setup_clients(cls): super(SwiftResourcesTestJSON, cls).setup_clients() cls.account_client = cls.os.account_client diff --git a/tempest/api/orchestration/stacks/test_templates.py b/tempest/api/orchestration/stacks/test_templates.py index 8c07adeb0..5ccfdfb76 100644 --- a/tempest/api/orchestration/stacks/test_templates.py +++ b/tempest/api/orchestration/stacks/test_templates.py @@ -36,13 +36,11 @@ Resources: cls.stack_id = cls.stack_identifier.split('/')[1] cls.parameters = {} - @test.attr(type='gate') @test.idempotent_id('47430699-c368-495e-a1db-64c26fd967d7') def test_show_template(self): """Getting template used to create the stack.""" self.client.show_template(self.stack_identifier) - @test.attr(type='gate') @test.idempotent_id('ed53debe-8727-46c5-ab58-eba6090ec4de') def test_validate_template(self): """Validating template passing it content.""" diff --git a/tempest/api/orchestration/stacks/test_templates_negative.py b/tempest/api/orchestration/stacks/test_templates_negative.py index ebba69464..4bd0f333b 100644 --- a/tempest/api/orchestration/stacks/test_templates_negative.py +++ b/tempest/api/orchestration/stacks/test_templates_negative.py @@ -35,7 +35,7 @@ Resources: super(TemplateYAMLNegativeTestJSON, cls).resource_setup() cls.parameters = {} - @test.attr(type=['gate', 'negative']) + @test.attr(type=['negative']) @test.idempotent_id('5586cbca-ddc4-4152-9db8-fa1ce5fc1876') def test_validate_template_url(self): """Validating template passing url to it.""" diff --git a/tempest/api/orchestration/stacks/test_volumes.py b/tempest/api/orchestration/stacks/test_volumes.py index 2b1ec12b5..f40ca0244 100644 --- a/tempest/api/orchestration/stacks/test_volumes.py +++ b/tempest/api/orchestration/stacks/test_volumes.py @@ -54,7 +54,6 @@ class CinderResourcesTest(base.BaseOrchestrationTest): self.assertEqual(template['resources']['volume']['properties'][ 'name'], self.get_stack_output(stack_identifier, 'display_name')) - @test.attr(type='gate') @test.idempotent_id('c3243329-7bdd-4730-b402-4d19d50c41d8') @test.services('volume') def test_cinder_volume_create_delete(self): @@ -84,7 +83,6 @@ class CinderResourcesTest(base.BaseOrchestrationTest): self.volumes_client.delete_volume(volume_id) self.volumes_client.wait_for_resource_deletion(volume_id) - @test.attr(type='gate') @test.idempotent_id('ea8b3a46-b932-4c18-907a-fe23f00b33f8') @test.services('volume') def test_cinder_volume_create_delete_retain(self): |