From 87ba2876ecad2c9b643660d116f41a61d03fbf9b Mon Sep 17 00:00:00 2001 From: Jordan Pittier Date: Tue, 8 Mar 2016 11:43:11 +0100 Subject: [PATCH] common/compute.py: remove some useless code * Removed useless variable (re)definition * Removes useless handling of `preserve_server_on_error` in kwargs: it's never used in Tempest Change-Id: I51051089fc795c6942a52aa3d5ff944321b6e0d1 --- tempest/common/compute.py | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/tempest/common/compute.py b/tempest/common/compute.py index b14012efa3..b4a74a4162 100644 --- a/tempest/common/compute.py +++ b/tempest/common/compute.py @@ -49,10 +49,6 @@ def create_test_server(clients, validatable=False, validation_resources=None, # TODO(jlanoux) add support of wait_until PINGABLE/SSHABLE - name = name - flavor = flavor - image_id = image_id - if name is None: name = data_utils.rand_name(__name__ + "-instance") if flavor is None: @@ -152,14 +148,12 @@ def create_test_server(clients, validatable=False, validation_resources=None, except Exception: with excutils.save_and_reraise_exception(): - if ('preserve_server_on_error' not in kwargs - or kwargs['preserve_server_on_error'] is False): - for server in servers: - try: - clients.servers_client.delete_server( - server['id']) - except Exception: - LOG.exception('Deleting server %s failed' - % server['id']) + for server in servers: + try: + clients.servers_client.delete_server( + server['id']) + except Exception: + LOG.exception('Deleting server %s failed' + % server['id']) return body, servers