commit cdec090d2a527e57f0df2d1ced8d1d022ba9f928
author Tony Mack <tmack@paris.CS.Princeton.EDU> Mon Apr 15 00:38:49 2013 -0400
committer Tony Mack <tmack@paris.CS.Princeton.EDU> Mon Apr 15 00:38:49 2013 -0400
tree bbdca8b0d39f824f8ca5db960d8815feae75a948
parent 4ecbb2a2feb4f017e2fece9f20571261088d65bf

update Sliver admin

plstackapi/openstack/driver.py

diff --git a/plstackapi/openstack/driver.py b/plstackapi/openstack/driver.py
index 876d089..67b5280 100644
--- a/plstackapi/openstack/driver.py
+++ b/plstackapi/openstack/driver.py
@@ -208,12 +208,7 @@
                                             scheduler_hints=hints)
         return server
           
-    def destroy_instance(self, name, id=None):
-        args = {'name': name}
-        if id:
-            args['id'] = id
-        servers = self.shell.nova.servers.findall(**args)
+    def destroy_instance(self, id):
+        servers = self.shell.nova.servers.findall(id=id)
         for server in servers:
-            if name == server.name:
-                if not id or id == server.id:
-                    self.shell.nova.servers.delete(server)
+            self.shell.nova.servers.delete(server)