server.UpdateNode(userauth, self.name(), {'boot_state':'reinstall'})
# populate network interfaces - primary
server.AddInterface(userauth,self.name(),
- self.node_spec['network_fields'])
+ 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.AddInterface(userauth,self.name(),
- interface['network_fields'])
+ interface['interface_fields'])
if interface.has_key('settings'):
for (attribute,value) in interface['settings'].iteritems():
# locate node network
- nn = server.GetInterfaces(userauth,{'ip':interface['network_fields']['ip']})[0]
+ nn = server.GetInterfaces(userauth,{'ip':interface['interface_fields']['ip']})[0]
nnid=nn['interface_id']
# locate or create node network attribute type
try:
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())
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()),True)
def list_qemu (self):
utils.header("Listing qemu for host %s on box %s"%(self.name(),self.test_box().hostname()))
def gather_qemu_logs (self):
if not self.is_qemu():
return True
- remote_log="%s/qemu.log"%self.nodedir()
+ 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)
TestSsh(self.name()).clear_known_hosts()
return True
- def check_sanity_node_script (self,local_script):
+ 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 = TestSsh(self.name(),
- buildname=self.buildname(),
- key=key)
+ ssh_handle=self.create_test_ssh()
ssh_handle.copy_home(local_script)
- if ssh_handle.run("./"+os.path.basename(local_script)) != 0:
- print "WARNING: sanity check script %s FAILED"
+ 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
-
- def check_sanity_node (self):
- # locate the relevant scripts - xxx
- scripts = [ 'tests/qaapi/qa/tests/node/vsys_launch.pl' ]
- overall = True
- for script in scripts:
- if not self.check_sanity_node_script (script):
- overall = False
- return overall