diff options
| -rw-r--r-- | client/test_func.py | 3 | ||||
| -rwxr-xr-x | modules/virt.py | 19 |
2 files changed, 11 insertions, 11 deletions
diff --git a/client/test_func.py b/client/test_func.py index a108c47..19ec3af 100644 --- a/client/test_func.py +++ b/client/test_func.py @@ -30,7 +30,8 @@ if TEST_VIRT: print "list of virtual instances = %s" % vms for vm in vms: status = s.virt_status(vm) - if status == "stopped": + print status + if status == "shutdown": s.virt_start(vm) # add more tests here diff --git a/modules/virt.py b/modules/virt.py index 00eeb98..dc9a13a 100755 --- a/modules/virt.py +++ b/modules/virt.py @@ -81,7 +81,7 @@ class FuncLibvirtConnection(): return vms for vm in vms: - if vm.name() == needle: + if vm.name() == vmid: return vm raise FuncException(comment="virtual machine %s not found" % needle) @@ -190,7 +190,7 @@ class Virt(func_module.FuncModule): rc = subprocess.call(koan_args,shell=False) if rc == 0: - return success(0) + return 0 else: raise FuncException(comment="koan returned %d" % rc) @@ -202,7 +202,7 @@ class Virt(func_module.FuncModule): """ self.get_conn() self.conn.shutdown(vmid) - return success() + return 0 def pause(self, vmid): @@ -212,7 +212,7 @@ class Virt(func_module.FuncModule): """ self.get_conn() self.conn.suspend(vmid) - return success() + return 0 def unpause(self, vmid): @@ -223,7 +223,7 @@ class Virt(func_module.FuncModule): self.get_conn() self.conn.resume(vmid) - return success() + return 0 def create(self, vmid): @@ -233,7 +233,7 @@ class Virt(func_module.FuncModule): """ self.get_conn() self.conn.create(vmid) - return success() + return 0 def destroy(self, vmid): @@ -244,8 +244,7 @@ class Virt(func_module.FuncModule): """ self.get_conn() self.conn.destroy(vmid) - return success() - + return 0 def undefine(self, vmid): @@ -257,7 +256,7 @@ class Virt(func_module.FuncModule): self.get_conn() self.conn.undefine(vmid) - return success() + return 0 def get_status(self, vmid): @@ -267,7 +266,7 @@ class Virt(func_module.FuncModule): """ self.get_conn() - return success("STATE=%s" % self.conn.get_status(vmid)) + return self.conn.get_status(vmid) methods = Virt() |