+# Thierry Parmentelat <thierry.parmentelat@inria.fr>
+# Copyright (C) 2010 INRIA
+#
import utils
import os, os.path
import datetime
hostnames += [test_node.name()]
utils.header("Adding %r in %s"%(hostnames,slice_name))
self.test_plc.apiserver.AddSliceToNodes(auth, slice_name, hostnames)
- if self.slice_spec.has_key('initscriptname'):
+ # add initscript body or name as appropriate
+ if self.slice_spec.has_key('initscriptbody'):
+ isbody=self.slice_spec['initscriptbody']
+ utils.header("Adding initscript body %s in %s"%(isbody,slice_name))
+ self.test_plc.apiserver.AddSliceTag(self.test_plc.auth_root(), slice_name,'initscript_body',isbody)
+ elif self.slice_spec.has_key('initscriptname'):
isname=self.slice_spec['initscriptname']
- utils.header("Adding initscript %s in %s"%(isname,slice_name))
- self.test_plc.apiserver.AddSliceAttribute(self.test_plc.auth_root(), slice_name,'initscript',isname)
+ utils.header("Adding initscript name %s in %s"%(isname,slice_name))
+ self.test_plc.apiserver.AddSliceTag(self.test_plc.auth_root(), slice_name,'initscript',isname)
if self.slice_spec.has_key ('vref'):
vref_value=self.slice_spec['vref']
- self.test_plc.apiserver.AddSliceAttribute(self.test_plc.auth_root(), slice_name,'vref',vref_value)
+ self.test_plc.apiserver.AddSliceTag(self.test_plc.auth_root(), slice_name,'vref',vref_value)
def locate_key(self):
# locate the first avail. key
found=True
return (found,privatekey)
- def check_slice(self,options,minutes=6,gracetime=3,period=30):
- timeout = datetime.datetime.now()+datetime.timedelta(minutes=minutes)
- graceout = datetime.datetime.now()+datetime.timedelta(minutes=gracetime)
+ def ssh_slice(self,options,timeout_minutes=20,silent_minutes=10,period=15):
+ timeout = datetime.datetime.now()+datetime.timedelta(minutes=timeout_minutes)
+ graceout = datetime.datetime.now()+datetime.timedelta(minutes=silent_minutes)
# locate a key
(found,remote_privatekey)=self.locate_key()
if not found :
(site_spec,node_spec) = self.test_plc.locate_node(nodename)
tocheck.append(node_spec['node_fields']['hostname'])
+ utils.header("checking ssh access into slice %s on nodes %r"%(self.name(),tocheck))
+ utils.header("max timeout is %d minutes, silent for %d minutes (period is %s)"%\
+ (timeout_minutes,silent_minutes,period))
while tocheck:
for hostname in tocheck:
(site_spec,node_spec) = self.test_plc.locate_hostname(hostname)
date_test_ssh = TestSsh (hostname,key=remote_privatekey,username=self.name())
- # this can be ran locally as we have the key
- utils.header('Trying to enter into slice %s@%s'%(self.name(),hostname))
- date = date_test_ssh.run("id;hostname")==0
- if date:
+ command = date_test_ssh.actual_command("echo hostname ; hostname; echo id; id; echo uname -a ; uname -a")
+ date = utils.system (command, silent=datetime.datetime.now() < graceout)
+ if date==0:
utils.header("Successfuly entered slice %s on %s"%(self.name(),hostname))
tocheck.remove(hostname)
else:
# nm restart after first failure, if requested
if options.forcenm and hostname not in restarted:
utils.header ("forcenm option : restarting nm on %s"%hostname)
- restart_test_ssh=TestSsh(hostname,key="/etc/planetlab/root_ssh_key.rsa")
- access=self.test_plc.run_in_guest(restart_test_ssh.actual_command('service nm restart'))
+ restart_test_ssh=TestSsh(hostname,key="keys/key1.rsa")
+ access=restart_test_ssh.actual_command('service nm restart')
if (access==0):
utils.header('nm restarted on %s'%hostname)
else:
for hostname in tocheck:
utils.header("FAILURE to ssh into %s@%s"%(self.name(),hostname))
return False
- #freezing ,slice don't get created before at least 3 minutes after sshd is started
- if datetime.datetime.now() < graceout:
- utils.header ("The Slice %s under the Node %s is not created yet"%(self.name(),hostname))
- time.sleep(gracetime*60)
- else : time.sleep (period)
+ # wait for the period
+ time.sleep (period)
# for an empty slice
return True