rename TestQemu into TestQemuBox

[tests.git] / system / TestNode.py

diff --git a/system/TestNode.py b/system/TestNode.py
index d1aa107..4b499e7 100644 (file)
--- a/system/TestNode.py
+++ b/system/TestNode.py
@@ -1,9 +1,12 @@
+# Thierry Parmentelat <thierry.parmentelat@inria.fr>
+# Copyright (C) 2010 INRIA 
+#
 import sys, os, os.path, time, base64
 import xmlrpclib
 
 import utils
 from TestUser import TestUser
-from TestBox import TestBox
+from TestBoxQemu import TestBoxQemu
 from TestSsh import TestSsh
 
 class TestNode:
@@ -48,12 +51,12 @@ class TestNode:
                 utils.header("WARNING : qemu nodes need a host box")
                 return 'localhost'
 
-    # this returns a TestBox instance - cached in .test_box_value
+    # this returns a TestBoxQemu instance - cached in .test_box_value
     def test_box (self):
         try:
             return self.test_box_value
         except:
-            self.test_box_value = TestBox (self.host_box(),self.buildname())
+            self.test_box_value = TestBoxQemu (self.host_box(),self.buildname())
             return self.test_box_value
 
     def create_node (self):
@@ -105,7 +108,7 @@ class TestNode:
         self.test_plc.apiserver.DeleteNode(auth,self.name())
 
     # Do most of the stuff locally - will be pushed on host_box - *not* the plc - later if needed
-    def init_node(self):
+    def qemu_local_init(self):
         utils.system("rm -rf %s"%self.nodedir())
         utils.system("mkdir %s"%self.nodedir())
         if not self.is_qemu():
@@ -132,12 +135,30 @@ class TestNode:
             file(filename,'w').write(base64.b64decode(encoded))
             return True
 
-    def reinstall_node (self):
+    def nodestate_reinstall (self):
         self.test_plc.apiserver.UpdateNode(self.test_plc.auth_root(),
                                            self.name(),{'boot_state':'reinstall'})
         return True
     
-    def configure_qemu(self):
+    def nodestate_safeboot (self):
+        self.test_plc.apiserver.UpdateNode(self.test_plc.auth_root(),
+                                           self.name(),{'boot_state':'safeboot'})
+        return True
+    
+    def nodestate_boot (self):
+        self.test_plc.apiserver.UpdateNode(self.test_plc.auth_root(),
+                                           self.name(),{'boot_state':'boot'})
+        return True
+
+    def nodestate_show (self):
+        if self.test_plc.options.dry_run:
+            print "Dry_run: skipped getting current node state"
+            return True
+        state=self.test_plc.apiserver.GetNodes(self.test_plc.auth_root(), self.name(), ['boot_state'])[0]['boot_state']
+        print self.name(),':',state
+        return True
+    
+    def qemu_local_config(self):
         if not self.is_qemu():
             return
         mac=self.node_spec['interface_fields']['mac']
@@ -159,7 +180,7 @@ class TestNode:
         file.close()
         return True
 
-    def export_qemu (self):
+    def qemu_export (self):
         # if relevant, push the qemu area onto the host box
         if self.test_box().is_local():
             return True
@@ -168,13 +189,13 @@ class TestNode:
         utils.header ("Transferring configuration files for node %s onto %s"%(self.name(),self.host_box()))
         return self.test_box().copy(self.nodedir(),recursive=True)==0
             
-    def start_node (self):
+    def qemu_start (self):
         model=self.node_spec['node_fields']['model']
         #starting the Qemu nodes before 
         if self.is_qemu():
             self.start_qemu()
         else:
-            utils.header("TestNode.start_node : %s model %s taken as real node"%(self.name(),model))
+            utils.header("TestNode.qemu_start : %s model %s taken as real node"%(self.name(),model))
         return True
 
     def start_qemu (self):
@@ -205,18 +226,20 @@ class TestNode:
         if not self.is_qemu():
             return True
         remote_log="%s/log.txt"%self.nodedir()
-        local_log="logs/node.qemu.%s.log"%self.name()
+        local_log="logs/node.qemu.%s.txt"%self.name()
         self.test_box().test_ssh.fetch(remote_log,local_log)
 
-    def clear_known_hosts (self):
+    def keys_clear_known_hosts (self):
         TestSsh(self.name()).clear_known_hosts()
         return True
 
     def create_test_ssh(self):
         # get the plc's keys for entering the node
         vservername=self.test_plc.vservername
-        # assuming we've run testplc.fetch_keys()
-        key = "keys/%(vservername)s.rsa"%locals()
+###        # assuming we've run testplc.fetch_keys()
+###        key = "keys/%(vservername)s.rsa"%locals()
+        # fetch_keys doesn't grab the root key anymore
+        key = "keys/key1.rsa"
         return TestSsh(self.name(), buildname=self.buildname(), key=key)
 
     def check_hooks (self):