openstack
/
tempest
Code Issues Proposed changes

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
This commit is contained in:
Jordan Pittier 2016-03-08 11:43:11 +01:00
parent 22dd1c9d94
commit 87ba2876ec
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tempest/common/compute.py
View File

@ -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