+# Thierry Parmentelat <thierry.parmentelat@inria.fr>
+# Copyright (C) 2010 INRIA
+#
import sys, os, os.path, time, base64
import xmlrpclib
# 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.
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():
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']
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
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):
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()))
#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
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_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