CompleterTask used to have a failure_message mechanism, then we added failure_epilogu...

[tests.git] / system / TestNode.py

diff --git a/system/TestNode.py b/system/TestNode.py
index c9d31f8..c8ca1e8 100644 (file)
--- a/system/TestNode.py
+++ b/system/TestNode.py
@@ -7,6 +7,25 @@ import utils
 from TestUser import TestUser
 from TestBoxQemu import TestBoxQemu
 from TestSsh import TestSsh
+from Completer import CompleterTask
+
+class CompleterTaskNodeSsh (CompleterTask):
+    def __init__ (self, hostname, qemuname, local_key, command=None, boot_state="boot", expected=True, dry_run=False):
+        self.hostname=hostname
+        self.qemuname=qemuname
+        self.boot_state=boot_state
+        self.local_key=local_key
+        self.command=command if command is not None else "hostname;uname -a"
+        self.expected=expected
+        self.dry_run = dry_run
+        self.test_ssh =  TestSsh (self.hostname,key=self.local_key)
+    def run (self, silent):
+        command = self.test_ssh.actual_command(self.command)
+        retcod=utils.system (command, silent=silent, dry_run=self.dry_run)
+        if self.expected:       return retcod==0
+        else:                   return retcod !=0
+    def failure_epilogue (self):
+        print "Cannot reach %s in %s mode"%(self.hostname, self.boot_state)
 
 class TestNode:
 
@@ -227,7 +246,7 @@ class TestNode:
             utils.header("TestNode.qemu_start : %s model %s taken as real node"%(self.name(),model))
         return True
 
-    def timestamp_qemu (self):
+    def qemu_timestamp (self):
         "all nodes: start the qemu instance (also runs qemu-bridge-init start)"
         test_box = self.test_box()
         test_box.run_in_buildname("mkdir -p %s"%self.nodedir(), dry_run=self.dry_run())
@@ -308,7 +327,7 @@ class TestNode:
         return test_ssh.run ("rpm -q --quiet libvirt-client")==0
 
     def _check_system_slice (self, slicename,dry_run=False):
-        sitename=self.test_plc.plc_spec['PLC_SLICE_PREFIX']
+        sitename=self.test_plc.plc_spec['settings']['PLC_SLICE_PREFIX']
         vservername="%s_%s"%(sitename,slicename)
         test_ssh=self.create_test_ssh()
         if self.has_libvirt():