diff --git a/tempest/tests/compute/floating_ips/test_floating_ips_actions.py b/tempest/tests/compute/floating_ips/test_floating_ips_actions.py index 0ff81e1a76..888481ab18 100644 --- a/tempest/tests/compute/floating_ips/test_floating_ips_actions.py +++ b/tempest/tests/compute/floating_ips/test_floating_ips_actions.py @@ -33,10 +33,7 @@ class FloatingIPsTestJSON(base.BaseComputeTest): cls.servers_client = cls.servers_client #Server creation - resp, server = cls.servers_client.create_server('floating-server', - cls.image_ref, - cls.flavor_ref) - cls.servers_client.wait_for_server_status(server['id'], 'ACTIVE') + resp, server = cls.create_server(wait_until='ACTIVE') cls.server_id = server['id'] resp, body = cls.servers_client.get_server(server['id']) #Floating IP creation @@ -55,10 +52,8 @@ class FloatingIPsTestJSON(base.BaseComputeTest): @classmethod def tearDownClass(cls): - super(FloatingIPsTestJSON, cls).tearDownClass() - #Deleting the server which is created in this method - resp, body = cls.servers_client.delete_server(cls.server_id) #Deleting the floating IP which is created in this method + super(FloatingIPsTestJSON, cls).tearDownClass() resp, body = cls.client.delete_floating_ip(cls.floating_ip_id) @attr(type='positive') diff --git a/tempest/tests/compute/images/test_image_metadata.py b/tempest/tests/compute/images/test_image_metadata.py index 311ee8ea86..918075ca54 100644 --- a/tempest/tests/compute/images/test_image_metadata.py +++ b/tempest/tests/compute/images/test_image_metadata.py @@ -30,14 +30,9 @@ class ImagesMetadataTest(base.BaseComputeTest): cls.servers_client = cls.servers_client cls.client = cls.images_client - name = rand_name('server') - resp, server = cls.servers_client.create_server(name, cls.image_ref, - cls.flavor_ref) + resp, server = cls.create_server(wait_until='ACTIVE') cls.server_id = server['id'] - #Wait for the server to become active - cls.servers_client.wait_for_server_status(cls.server_id, 'ACTIVE') - # Snapshot the server once to save time name = rand_name('image') resp, _ = cls.client.create_image(cls.server_id, name, {}) @@ -49,7 +44,6 @@ class ImagesMetadataTest(base.BaseComputeTest): @classmethod def tearDownClass(cls): cls.client.delete_image(cls.image_id) - cls.servers_client.delete_server(cls.server_id) super(ImagesMetadataTest, cls).tearDownClass() def setUp(self): diff --git a/tempest/tests/compute/images/test_images_whitebox.py b/tempest/tests/compute/images/test_images_whitebox.py index 8af812ca7a..105a38aa4f 100644 --- a/tempest/tests/compute/images/test_images_whitebox.py +++ b/tempest/tests/compute/images/test_images_whitebox.py @@ -36,15 +36,8 @@ class ImagesWhiteboxTest(whitebox.ComputeWhiteboxTest, base.BaseComputeTest): @classmethod def tearDownClass(cls): - """Terminate test instances created after a test is executed.""" - - for server in cls.servers: - cls.update_state(server['id'], "active", None) - resp, body = cls.servers_client.delete_server(server['id']) - if resp['status'] == '204': - cls.servers.remove(server) - cls.servers_client.wait_for_server_termination(server['id']) - + """Delete images after a test is executed.""" + super(ImagesWhiteboxTest, cls).tearDownClass() for image_id in cls.image_ids: cls.client.delete_image(image_id) cls.image_ids.remove(image_id) diff --git a/tempest/tests/compute/servers/test_server_addresses.py b/tempest/tests/compute/servers/test_server_addresses.py index 4807d1e709..cb8e85e238 100644 --- a/tempest/tests/compute/servers/test_server_addresses.py +++ b/tempest/tests/compute/servers/test_server_addresses.py @@ -29,16 +29,7 @@ class ServerAddressesTest(base.BaseComputeTest): super(ServerAddressesTest, cls).setUpClass() cls.client = cls.servers_client - cls.name = rand_name('server') - resp, cls.server = cls.client.create_server(cls.name, - cls.image_ref, - cls.flavor_ref) - cls.client.wait_for_server_status(cls.server['id'], 'ACTIVE') - - @classmethod - def tearDownClass(cls): - cls.client.delete_server(cls.server['id']) - super(ServerAddressesTest, cls).tearDownClass() + resp, cls.server = cls.create_server(wait_until='ACTIVE') @attr(type='negative', category='server-addresses') def test_list_server_addresses_invalid_server_id(self): diff --git a/tempest/tests/compute/servers/test_server_metadata.py b/tempest/tests/compute/servers/test_server_metadata.py index bc523dec57..69c0ad9e6f 100644 --- a/tempest/tests/compute/servers/test_server_metadata.py +++ b/tempest/tests/compute/servers/test_server_metadata.py @@ -32,18 +32,10 @@ class ServerMetadataTestJSON(base.BaseComputeTest): resp, tenants = cls.admin_client.list_tenants() cls.tenant_id = [tnt['id'] for tnt in tenants if tnt['name'] == cls.client.tenant_name][0] - resp, server = cls.create_server(meta={}) + resp, server = cls.create_server(meta={}, wait_until='ACTIVE') cls.server_id = server['id'] - #Wait for the server to become active - cls.client.wait_for_server_status(cls.server_id, 'ACTIVE') - - @classmethod - def tearDownClass(cls): - cls.client.delete_server(cls.server_id) - super(ServerMetadataTestJSON, cls).tearDownClass() - def setUp(self): super(ServerMetadataTestJSON, self).setUp() meta = {'key1': 'value1', 'key2': 'value2'} diff --git a/tempest/tests/compute/servers/test_virtual_interfaces.py b/tempest/tests/compute/servers/test_virtual_interfaces.py index 4c483668d4..476a556e9c 100644 --- a/tempest/tests/compute/servers/test_virtual_interfaces.py +++ b/tempest/tests/compute/servers/test_virtual_interfaces.py @@ -30,20 +30,10 @@ class VirtualInterfacesTestJSON(base.BaseComputeTest): @classmethod def setUpClass(cls): super(VirtualInterfacesTestJSON, cls).setUpClass() - cls.name = rand_name('server') cls.client = cls.servers_client - resp, server = cls.servers_client.create_server(cls.name, - cls.image_ref, - cls.flavor_ref) + resp, server = cls.create_server(wait_until='ACTIVE') cls.server_id = server['id'] - cls.servers_client.wait_for_server_status(cls.server_id, 'ACTIVE') - - @classmethod - def tearDownClass(cls): - cls.servers_client.delete_server(cls.server_id) - super(VirtualInterfacesTestJSON, cls).tearDownClass() - @attr(type='positive') def test_list_virtual_interfaces(self): # Positive test:Should be able to GET the virtual interfaces list diff --git a/tempest/tests/compute/test_authorization.py b/tempest/tests/compute/test_authorization.py index 7bd5c75a74..c958517e01 100644 --- a/tempest/tests/compute/test_authorization.py +++ b/tempest/tests/compute/test_authorization.py @@ -57,10 +57,7 @@ class AuthorizationTest(base.BaseComputeTest): cls.alt_security_client = cls.alt_manager.security_groups_client cls.alt_security_client._set_auth() - name = rand_name('server') - resp, server = cls.client.create_server(name, cls.image_ref, - cls.flavor_ref) - cls.client.wait_for_server_status(server['id'], 'ACTIVE') + resp, server = cls.create_server(wait_until='ACTIVE') resp, cls.server = cls.client.get_server(server['id']) name = rand_name('image') @@ -92,7 +89,6 @@ class AuthorizationTest(base.BaseComputeTest): @classmethod def tearDownClass(cls): if compute.MULTI_USER: - cls.client.delete_server(cls.server['id']) cls.images_client.delete_image(cls.image['id']) cls.keypairs_client.delete_keypair(cls.keypairname) cls.security_client.delete_security_group(cls.security_group['id']) diff --git a/tempest/tests/compute/volumes/test_attach_volume.py b/tempest/tests/compute/volumes/test_attach_volume.py index 7c1a2d13ed..d9abe41254 100644 --- a/tempest/tests/compute/volumes/test_attach_volume.py +++ b/tempest/tests/compute/volumes/test_attach_volume.py @@ -43,24 +43,15 @@ class AttachVolumeTestJSON(base.BaseComputeTest): self.servers_client.detach_volume(server_id, volume_id) self.volumes_client.wait_for_volume_status(volume_id, 'available') - def _delete(self, server, volume): + def _delete(self, volume): if self.volume: self.volumes_client.delete_volume(self.volume['id']) self.volume = None - if self.server: - self.servers_client.delete_server(self.server['id']) - self.server = None def _create_and_attach(self): - name = rand_name('server') - # Start a server and wait for it to become ready - resp, server = self.servers_client.create_server(name, - self.image_ref, - self.flavor_ref, - adminPass='password') - self.server = server - self.servers_client.wait_for_server_status(server['id'], 'ACTIVE') + resp, server = self.create_server(wait_until='ACTIVE', + adminPass='password') # Record addresses so that we can ssh later resp, server['addresses'] = \ @@ -118,7 +109,9 @@ class AttachVolumeTestJSON(base.BaseComputeTest): finally: if self.attached: self._detach(server['id'], volume['id']) - self._delete(self.server, self.volume) + # NOTE(maurosr): here we do the cleanup for volume, servers are + # dealt on BaseComputeTest.tearDownClass + self._delete(self.volume) class AttachVolumeTestXML(AttachVolumeTestJSON):