return (found,privatekey)
def add_slice(self):
- return \
- self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ add slice.xml")==0
+ return self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ add slice.xml")==0
def create_slice(self):
auth=self.test_plc.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH']
- return \
- self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ create %s.main.sfaslicea1 slice.rspec"%auth)==0
+ self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ resources -o /root/.sfi/resources_in.rspec")
+ self.test_plc.run_in_guest(
+ "sfiListNodes.py -i /root/.sfi/resources_in.rspec -o /root/.sfi/all_nodes.txt")
+ self.test_plc.run_in_guest(
+ "sfiAddSliver.py -i /root/.sfi/resources_in.rspec -n /root/.sfi/all_nodes.txt -o /root/.sfi/resources_out.rspec")
+ return self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ create %s.main.fslc1 resources_out.rspec"%auth)==0
def update_slice(self):
auth=self.test_plc.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH']
- return \
- self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ create %s.main.sfaslicea1 slice.rspec"%auth)==0
+ self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ resources -o /root/.sfi/resources_in.rspec")
+ self.test_plc.run_in_guest(
+ "sfiListNodes.py -i /root/.sfi/resources_in.rspec -o /root/.sfi/all_nodes.txt")
+ self.test_plc.run_in_guest(
+ "sfiAddSliver.py -i /root/.sfi/resources_in.rspec -n /root/.sfi/all_nodes.txt -o /root/.sfi/resources_out.rspec")
+ return self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ create %s.main.fslc1 resources_out.rspec"%auth)==0
def delete_slice(self):
auth=self.test_plc.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH']
- self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ delete %s.main.sfaslicea1"%auth)
- return \
- self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ remove -t slice %s.main.sfaslicea1"%auth)==0
+ self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ delete %s.main.fslc1"%auth)
+ return self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ remove -t slice %s.main.fslc1"%auth)==0
- def check_slice_sfa(self,options,timeout_minutes=40,silent_minutes=4,period=15):
+ def check_slice_sfa(self,options,timeout_minutes=40,silent_minutes=30,period=15):
timeout = datetime.datetime.now()+datetime.timedelta(minutes=timeout_minutes)
graceout = datetime.datetime.now()+datetime.timedelta(minutes=silent_minutes)
# locate a key
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())
- if datetime.datetime.now() >= graceout:
- utils.header('Trying to enter into slice %s@%s'%(self.name(),hostname))
- # this can be ran locally as we have the key
- date = date_test_ssh.run("echo hostname ; hostname; echo id; id; echo uname -a ; uname -a")==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: