fetch_keys does not grab the root key anymore

[tests.git] / system / TestNode.py

diff --git a/system/TestNode.py b/system/TestNode.py
index 7c06e65..81a6014 100644 (file)
--- a/system/TestNode.py
+++ b/system/TestNode.py
@@ -67,6 +67,9 @@ class TestNode:
         server.AddNode(userauth,
                        self.test_site.site_spec['site_fields']['login_base'],
                        self.node_spec['node_fields'])
+        server.SetNodePlainBootstrapfs(userauth,
+                                       self.node_spec['node_fields']['hostname'],
+                                       'YES')
         # create as reinstall to avoid user confirmation
         server.UpdateNode(userauth, self.name(), {'boot_state':'reinstall'})
         # populate network interfaces - primary
@@ -75,21 +78,20 @@ class TestNode:
         # populate network interfaces - others
         if self.node_spec.has_key('extra_interfaces'):
             for interface in self.node_spec['extra_interfaces']:
-                server.AddInterface(userauth,self.name(),
-                                                    interface['interface_fields'])
+                server.AddInterface(userauth,self.name(), interface['interface_fields'])
                 if interface.has_key('settings'):
                     for (attribute,value) in interface['settings'].iteritems():
                         # locate node network
-                        nn = server.GetInterfaces(userauth,{'ip':interface['interface_fields']['ip']})[0]
-                        nnid=nn['interface_id']
+                        interface = server.GetInterfaces(userauth,{'ip':interface['interface_fields']['ip']})[0]
+                        interface_id=interface['interface_id']
                         # locate or create node network attribute type
                         try:
-                            nnst = server.GetTagTypes(userauth,{'name':attribute})[0]
+                            interface_tagtype = server.GetTagTypes(userauth,{'name':attribute})[0]
                         except:
-                            nnst = server.AddTagType(rootauth,{'category':'test',
-                                                               'tagname':attribute})
+                            interface_tagtype = server.AddTagType(rootauth,{'category':'test',
+                                                                            'tagname':attribute})
                         # attach value
-                        server.AddInterfaceSetting(userauth,nnid,attribute,value)
+                        server.AddInterfaceTag(userauth,interface_id,attribute,value)
 
     def delete_node (self):
         # uses the right auth as far as poss.
@@ -114,7 +116,8 @@ class TestNode:
         utils.header("Calling GetBootMedium for %s"%self.name())
         options = []
         if self.is_qemu():
-            options=['serial']
+            options.append('serial')
+            options.append('no-hangcheck')
         encoded=self.test_plc.apiserver.GetBootMedium(self.test_plc.auth_root(), 
                                                       self.name(), 'node-iso', '', options)
         if (encoded == ''):
@@ -181,7 +184,7 @@ class TestNode:
 
         test_box.run_in_buildname("%s/qemu-bridge-init start >> %s/log.txt"%(self.nodedir(),self.nodedir()))
         # kick it off in background, as it would otherwise hang
-        test_box.run_in_buildname("%s/qemu-start-node 2>&1 >> %s/log.txt"%(self.nodedir(),self.nodedir()),True)
+        test_box.run_in_buildname("%s/qemu-start-node 2>&1 >> %s/log.txt"%(self.nodedir(),self.nodedir()))
 
     def list_qemu (self):
         utils.header("Listing qemu for host %s on box %s"%(self.name(),self.test_box().hostname()))
@@ -193,7 +196,7 @@ class TestNode:
         #Prepare the log file before killing the nodes
         test_box = self.test_box()
         # kill the right processes 
-        utils.header("Stopping qemu for host %s on box %s"%(self.name(),self.test_box().hostname()))
+        utils.header("Stopping qemu for node %s on box %s"%(self.name(),self.test_box().hostname()))
         command="%s/qemu-kill-node %s"%(self.nodedir(),self.name())
         self.test_box().run_in_buildname(command)
         return True
@@ -212,28 +215,33 @@ class TestNode:
     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_sanity (self):
+    def check_hooks (self):
         extensions = [ 'py','pl','sh' ]
-        path='tests/qaapi/qa/tests/node/'
-        scripts=utils.locate_sanity_scripts ('node '+self.name(), path,extensions)
+        path='hooks/node'
+        scripts=utils.locate_hooks_scripts ('node '+self.name(), path,extensions)
         overall = True
         for script in scripts:
-            if not self.check_sanity_script (script):
+            if not self.check_hooks_script (script):
                 overall = False
         return overall
 
-    def check_sanity_script (self,local_script):
+    def check_hooks_script (self,local_script):
         # push the script on the node's root context
-        ssh_handle=self.create_test_ssh()
-        ssh_handle.copy_home(local_script)
         script_name=os.path.basename(local_script)
-        if ssh_handle.run("./"+script_name) != 0:
-            print "WARNING: sanity check script %s FAILED"%script_name
-            # xxx - temporary : always return true for now
+        utils.header ("NODE hook %s (%s)"%(script_name,self.name()))
+        test_ssh=self.create_test_ssh()
+        test_ssh.copy_home(local_script)
+        if test_ssh.run("./"+script_name) != 0:
+            utils.header ("WARNING: node hooks check script %s FAILED (ignored)"%script_name)
             #return False
-        return True
+            return True
+        else:
+            utils.header ("SUCCESS: node hook %s OK"%script_name)
+            return True