server.AddNode(userauth,
self.test_site.site_spec['site_fields']['login_base'],
self.node_spec['node_fields'])
- server.SetNodePlainBootstrapfs(self.node_spec['node_fields']['hostname'],'YES')
+ 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
# 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.
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
def check_sanity_script (self,local_script):
# push the script on the node's root context
+ script_name=os.path.basename(local_script)
+ utils.header ("NODE %s : running sanity check script %s"%(self.name(),script_name))
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 ("WARNING: node sanity check script %s FAILED"%script_name)
+ print 'temporary : ignoring result and always return true for now'
#return False
- return True
+ return True
+ else:
+ utils.header ("SUCCESS: node sanity check script %s OK"%script_name)
+ return True