+# Thierry Parmentelat <thierry.parmentelat@inria.fr>
+# Copyright (C) 2010 INRIA
+#
import utils
import os, os.path
import datetime
def __init__ (self,test_plc,test_site,slice_spec):
self.test_plc=test_plc
self.test_site=test_site
- #self.slice_spec=plc_spec_sfa['slices_sfa'][0]
self.slice_spec=slice_spec
self.test_ssh=TestSsh(self.test_plc.test_ssh)
+ # shortcuts
+ self.sfa_spec=test_plc.plc_spec['sfa']
+ self.piuser=self.sfa_spec['piuser']
+ self.regularuser=self.sfa_spec['regularuser']
+ self.slicename=self.sfa_spec['slicename']
+ self.login_base=self.sfa_spec['login_base']
def name(self):
return self.slice_spec['slice_fields']['name']
found=True
return (found,privatekey)
- def add_slice(self):
- return \
- self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ add slice.xml")==0
+ # those are step names exposed as methods of TestPlc, hence the _sfa
+ def sfa_add_slice(self,options):
+ return self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ add slice.xml")==0
- def create_slice(self):
+ def sfa_discover(self,options):
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
+ return self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ resources -o /root/.sfi/resources_in.rspec")==0
- def update_slice(self):
+ def sfa_create_slice(self,options):
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
+ commands=[
+ "sfiListNodes.py -i /root/.sfi/resources_in.rspec -o /root/.sfi/all_nodes.txt",
+ "sfiAddSliver.py -i /root/.sfi/resources_in.rspec -n /root/.sfi/all_nodes.txt -o /root/.sfi/resources_out.rspec",
+ "sfi.py -d /root/.sfi/ create %s.%s.%s resources_out.rspec"%(auth,self.login_base,self.slicename),
+ ]
+ for command in commands:
+ if self.test_plc.run_in_guest(command)!=0: return False
+ return True
+
+ # actually the same for now
+ def sfa_update_slice(self,options):
+ return self.sfa_create_slice(options)
- def delete_slice(self):
+ def sfa_delete_slice(self,options):
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.%s.%s"%(auth,self.login_base,self.slicename))
+ return self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ remove -t slice %s.%s.%s"%(auth,self.login_base,self.slicename))==0
- def check_slice_sfa(self,options,timeout_minutes=40,silent_minutes=4,period=15):
+ # check the resulting sliver
+ def ssh_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: