NFVBENCH-200 Cleanup refactoring

Change-Id: I380a9efecdce8d525a9ae41949828c73e9cdac5f
Signed-off-by: fmenguy <francoisregis.menguy@orange.com>

1 files changed, 11 insertions, 1 deletions

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."""