-#
-# $Id$
-# $URL$
+# Thierry Parmentelat <thierry.parmentelat@inria.fr>
+# Copyright (C) 2010 INRIA
#
import utils
import os, os.path
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))
+ 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']
found=True
return (found,privatekey)
- def check_slice(self,options,timeout_minutes=20,silent_minutes=10,period=15):
+ 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
date_test_ssh = TestSsh (hostname,key=remote_privatekey,username=self.name())
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:
+ if date==0:
utils.header("Successfuly entered slice %s on %s"%(self.name(),hostname))
tocheck.remove(hostname)
else: