X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=nfvbench%2Fcompute.py;h=883dc2826d37260c11dac0e52c1e6b891d8e08dc;hb=1c686977d9146f1b2dbbf0085c98897311c46789;hp=f6f179d62a311a87454e25e144d1fa54c0ff31cc;hpb=9f451d6e57d8aab489ee33123abca70300cc268b;p=nfvbench.git diff --git a/nfvbench/compute.py b/nfvbench/compute.py index f6f179d..883dc28 100644 --- a/nfvbench/compute.py +++ b/nfvbench/compute.py @@ -23,8 +23,10 @@ except ImportError: from glanceclient.v1.apiclient.exceptions import NotFound as GlanceImageNotFound import keystoneauth1 import novaclient +from novaclient.exceptions import NotFound from .log import LOG +from . import utils class Compute(object): @@ -147,9 +149,17 @@ class Compute(object): servers_list = self.novaclient.servers.list() return servers_list + def instance_exists(self, server): + try: + self.novaclient.servers.get(server) + except NotFound: + return False + return True + def delete_server(self, server): """Delete a server from its object reference.""" - self.novaclient.servers.delete(server) + utils.delete_server(self.novaclient, server) + utils.waiting_servers_deletion(self.novaclient, [server]) def find_flavor(self, flavor_type): """Find a flavor by name."""