Merge "common/compute.py: remove some useless code"
This commit is contained in:
commit
dcc5597923
|
@ -49,10 +49,6 @@ def create_test_server(clients, validatable=False, validation_resources=None,
|
||||||
|
|
||||||
# TODO(jlanoux) add support of wait_until PINGABLE/SSHABLE
|
# TODO(jlanoux) add support of wait_until PINGABLE/SSHABLE
|
||||||
|
|
||||||
name = name
|
|
||||||
flavor = flavor
|
|
||||||
image_id = image_id
|
|
||||||
|
|
||||||
if name is None:
|
if name is None:
|
||||||
name = data_utils.rand_name(__name__ + "-instance")
|
name = data_utils.rand_name(__name__ + "-instance")
|
||||||
if flavor is None:
|
if flavor is None:
|
||||||
|
@ -152,14 +148,12 @@ def create_test_server(clients, validatable=False, validation_resources=None,
|
||||||
|
|
||||||
except Exception:
|
except Exception:
|
||||||
with excutils.save_and_reraise_exception():
|
with excutils.save_and_reraise_exception():
|
||||||
if ('preserve_server_on_error' not in kwargs
|
for server in servers:
|
||||||
or kwargs['preserve_server_on_error'] is False):
|
try:
|
||||||
for server in servers:
|
clients.servers_client.delete_server(
|
||||||
try:
|
server['id'])
|
||||||
clients.servers_client.delete_server(
|
except Exception:
|
||||||
server['id'])
|
LOG.exception('Deleting server %s failed'
|
||||||
except Exception:
|
% server['id'])
|
||||||
LOG.exception('Deleting server %s failed'
|
|
||||||
% server['id'])
|
|
||||||
|
|
||||||
return body, servers
|
return body, servers
|
||||||
|
|
Loading…
Reference in New Issue