-import os, sys, time, base64
+import sys, os, os.path, time, base64
import xmlrpclib
import utils
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':'rins'})
+ server.UpdateNode(userauth, self.name(), {'boot_state':'reinstall'})
# populate network interfaces - primary
- server.AddNodeNetwork(userauth,self.name(),
- self.node_spec['network_fields'])
+ server.AddInterface(userauth,self.name(),
+ self.node_spec['interface_fields'])
# populate network interfaces - others
if self.node_spec.has_key('extra_interfaces'):
for interface in self.node_spec['extra_interfaces']:
- server.AddNodeNetwork(userauth,self.name(),
- interface['network_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.GetNodeNetworks(userauth,{'ip':interface['network_fields']['ip']})[0]
- nnid=nn['nodenetwork_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.GetNodeNetworkSettingTypes(userauth,{'name':attribute})[0]
+ interface_tagtype = server.GetTagTypes(userauth,{'name':attribute})[0]
except:
- nnst = server.AddNodeNetworkSettingType(rootauth,{'category':'test',
- 'name':attribute})
+ interface_tagtype = server.AddTagType(rootauth,{'category':'test',
+ 'tagname':attribute})
# attach value
- server.AddNodeNetworkSetting(userauth,nnid,attribute,value)
+ server.AddInterfaceTag(userauth,interface_id,attribute,value)
def delete_node (self):
# uses the right auth as far as poss.
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 == ''):
def reinstall_node (self):
self.test_plc.apiserver.UpdateNode(self.test_plc.auth_root(),
- self.name(),{'boot_state':'rins'})
+ self.name(),{'boot_state':'reinstall'})
return True
def configure_qemu(self):
if not self.is_qemu():
return
- mac=self.node_spec['network_fields']['mac']
+ mac=self.node_spec['interface_fields']['mac']
hostname=self.node_spec['node_fields']['hostname']
- ip=self.node_spec['network_fields']['ip']
+ ip=self.node_spec['interface_fields']['ip']
auth=self.test_plc.auth_root()
target_arch=self.test_plc.apiserver.GetPlcRelease(auth)['build']['target-arch']
conf_filename="%s/qemu.conf"%(self.nodedir())
file.write('IP=%s\n'%ip)
file.write('TARGET_ARCH=%s\n'%target_arch)
file.close()
+ return True
+ def export_qemu (self):
# if relevant, push the qemu area onto the host box
if self.test_box().is_local():
return True
+ utils.header ("Cleaning any former sequel of %s on %s"%(self.name(),self.host_box()))
+ self.test_box().run_in_buildname("rm -rf %s"%self.nodedir())
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
test_box = self.test_box()
utils.header("Starting qemu node %s on %s"%(self.name(),test_box.hostname()))
- test_box.run_in_buildname("%s/qemu-bridge-init start >> %s/qemu.log"%(self.nodedir(),self.nodedir()))
+ 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/qemu.log"%(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()))
- command="qemu-%s/qemu-kill-node -l %s"%(self.name(),self.name())
+ command="%s/qemu-kill-node -l %s"%(self.nodedir(),self.name())
self.test_box().run_in_buildname(command)
return True
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()))
- command="qemu-%s/qemu-kill-node %s"%(self.name(),self.name())
+ command="%s/qemu-kill-node %s"%(self.nodedir(),self.name())
self.test_box().run_in_buildname(command)
return True
def gather_qemu_logs (self):
if not self.is_qemu():
return True
- remote_log="%s/qemu.log"%self.nodedir()
- local_log="logs/%s-qemu.log"%self.name()
+ remote_log="%s/log.txt"%self.nodedir()
+ local_log="logs/node.qemu.%s.log"%self.name()
self.test_box().test_ssh.fetch(remote_log,local_log)
def 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()
+ return TestSsh(self.name(), buildname=self.buildname(), key=key)
+
+ def check_sanity (self):
+ extensions = [ 'py','pl','sh' ]
+ path='tests/qaapi/qa/tests/node/'
+ scripts=utils.locate_sanity_scripts ('node '+self.name(), path,extensions)
+ overall = True
+ for script in scripts:
+ if not self.check_sanity_script (script):
+ overall = False
+ return overall
+
+ def check_sanity_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
+ #return False
+ return True
+
git://git.onelab.eu / tests.git / blobdiff