X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestSliceSfa.py;h=7874818b2ae6929c641dc645ef8d39e92aa65c2c;hb=bff621ccbeef0899bdbf1c9d082ad4c67d4e4661;hp=a220c0b08a1ffa35e822222ac952fb64a170f3fc;hpb=6db8d43fc7b0fc421c2de478acd2b665c6244870;p=tests.git diff --git a/system/TestSliceSfa.py b/system/TestSliceSfa.py index a220c0b..7874818 100644 --- a/system/TestSliceSfa.py +++ b/system/TestSliceSfa.py @@ -10,41 +10,59 @@ from TestKey import TestKey from TestUser import TestUser from TestNode import TestNode from TestSsh import TestSsh +from TestUserSfa import TestUserSfa class TestSliceSfa: - def __init__ (self,test_plc,test_site,slice_spec): + def __init__ (self,test_plc,sfa_slice_spec): self.test_plc=test_plc - self.test_site=test_site - self.slice_spec=slice_spec + self.sfa_slice_spec=sfa_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.slice_spec['slicename'] - self.login_base=self.sfa_spec['login_base'] + self.piuser=self.sfa_slice_spec['piuser'] + self.regularuser=self.sfa_slice_spec['regularuser'] + self.slicename=self.sfa_slice_spec['slicename'] + self.login_base=self.sfa_slice_spec['login_base'] def name(self): - return self.slice_spec['slice_fields']['name'] + return self.sfa_slice_spec['slice_fields']['name'] - def mode (self): return self.slice_spec['mode'] - - def hrn(self): - root_auth=self.test_plc.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH'] - return "%s.%s.%s"%(root_auth,self.login_base,self.slicename) - def addslicefile (self): - return self.resname("addslice","xml") - def resname (self,name,ext): return "%s_%s.%s"%(self.slicename,name,ext) - def adfile (self): return self.resname("ad","xml") - def reqfile (self): return self.resname("req","xml") + def rspec_style (self): return self.sfa_slice_spec['rspec_style'] + + # the hrn for the site + def auth_hrn (self): + return self.test_plc.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH'] + + # the hrn for the site + def site_hrn (self): + return "%s.%s"%(self.auth_hrn(),self.login_base) + + # something in the site (users typically) + def qualified_hrn (self, name): + return "%s.%s"%(self.site_hrn(),name) + + # the slice hrn + def hrn(self): return self.qualified_hrn (self.slicename) + + # result name + def resname (self,name,ext): return "%s.%s"%(name,ext) + + def addslicefile (self): return self.resname("slice_record","xml") + def addpersonfile (self): return self.resname("person_record","xml") + def adfile (self): return self.resname("ad","rspec") + def reqfile (self): return self.resname("req","rspec") def nodefile (self): return self.resname("nodes","txt") + # xxx this needs tweaks with more recent versions of sfa that have pgv2 as the default ? def discover_option(self): - if self.mode()=='pg': return "-r protogeni" - else: return "" + if self.rspec_style()=='pg': return "-r protogeni" + else: return "-r sfa" + + def sfi_path (self): + return "/root/sfi/%s%s"%(self.slicename,self.rspec_style()) def locate_key(self): - for username,keyname in self.slice_spec['usernames']: + for username,keyname in self.sfa_slice_spec['usernames']: key_spec=self.test_plc.locate_key(keyname) test_key=TestKey(self.test_plc,key_spec) publickey=test_key.publicpath() @@ -53,34 +71,128 @@ class TestSliceSfa: found=True return (found,privatekey) - # dir_name is local and will be pushed later on + # dir_name is local and will be pushed later on by TestPlc + # by default set SFI_USER to the pi, we'll overload this + # on the command line when needed def sfi_config (self,dir_name): - # TODO this needs to be done remotely - file_name=dir_name + os.sep + self.addslicefile() + plc_spec=self.test_plc.plc_spec + sfa_spec=self.sfa_spec + sfa_slice_spec=self.sfa_slice_spec + keys=plc_spec['keys'] + for (contents,name) in [ (keys[0]['private'], self.piuser+'.pkey'), + (keys[0]['key_fields']['key'], self.piuser+'.pub'), + (keys[1]['private'], self.regularuser+'.pkey'), + (keys[0]['key_fields']['key'], self.regularuser+'.pub'), + ]: + file_name=os.path.join(dir_name,self.qualified_hrn(name)) + fileconf=open(file_name,'w') + fileconf.write (contents) + fileconf.close() + utils.header ("(Over)wrote %s"%file_name) + # + file_name=dir_name + os.sep + self.addpersonfile() fileconf=open(file_name,'w') - fileconf.write(self.slice_spec['slice_add_xml']) + fileconf.write(sfa_slice_spec['person_record']) fileconf.write('\n') - utils.header ("(Over)wrote %s"%file_name) fileconf.close() - file_name=dir_name + os.sep + 'person.xml' + utils.header ("(Over)wrote %s"%file_name) + # + file_name=dir_name + os.sep + 'sfi_config' fileconf=open(file_name,'w') - fileconf.write(self.slice_spec['slice_person_xml']) + SFI_AUTH="%s"%(self.site_hrn()) + fileconf.write ("SFI_AUTH='%s'"%SFI_AUTH) + fileconf.write('\n') + SFI_USER=SFI_AUTH + '.' + self.piuser + fileconf.write ("SFI_USER='%s'"%SFI_USER) + fileconf.write('\n') + SFI_REGISTRY='http://' + sfa_spec['SFA_REGISTRY_HOST'] + ':12345/' + fileconf.write ("SFI_REGISTRY='%s'"%SFI_REGISTRY) + fileconf.write('\n') + SFI_SM='http://' + sfa_spec['SFA_SM_HOST'] + ':12347/' + fileconf.write ("SFI_SM='%s'"%SFI_SM) fileconf.write('\n') fileconf.close() utils.header ("(Over)wrote %s"%file_name) - + # + file_name=dir_name + os.sep + self.addslicefile() + fileconf=open(file_name,'w') + fileconf.write(sfa_slice_spec['slice_record']) + fileconf.write('\n') + utils.header ("(Over)wrote %s"%file_name) + fileconf.close() + + # using sfaadmin to bootstrap + def sfa_add_site (self, options): + "bootstrap a site using sfaadmin" + command="sfaadmin reg register -t authority -x %s"%self.site_hrn() + return self.test_plc.run_in_guest(command)==0 + + def sfa_add_pi (self, options): + "bootstrap a PI user for that site" + pi_hrn=self.qualified_hrn(self.piuser) + pi_mail=self.sfa_slice_spec['pimail'] + # as installed by sfi_config + pi_key=os.path.join(self.sfi_path(),self.qualified_hrn(self.piuser+'.pub')) + command="sfaadmin reg register -t user -x %s --email %s --key %s"%(pi_hrn,pi_mail,pi_key) + if self.test_plc.run_in_guest(command)!=0: return False + command="sfaadmin reg update -t authority -x %s --pi %s"%(self.site_hrn(),pi_hrn) + return self.test_plc.run_in_guest(command)==0 + + # user management + def sfa_add_user (self, options): + "add a regular user using sfi.py add" + return TestUserSfa(self.test_plc, self.sfa_slice_spec, self).add_user() + def sfa_update_user (self, options): + "update a user record using sfi.py update" + return TestUserSfa(self.test_plc, self.sfa_slice_spec, self).update_user() + def sfa_delete_user (self, options): + "run sfi.py delete" + return TestUserSfa(self.test_plc, self.sfa_slice_spec, self).delete_user() + + # run as pi + def sfi_pi (self, command): + return "sfi.py -d %s -u %s %s"%(self.sfi_path(),self.qualified_hrn(self.piuser), command,) + # the sfi.py command line option to run as a regular user + def sfi_user (self, command): + return "sfi.py -d %s -u %s %s"%(self.sfi_path(),self.qualified_hrn(self.regularuser), command,) + # those are step names exposed as methods of TestPlc, hence the _sfa + + def sfi_list (self, options): + "run (as regular user) sfi list (on Registry)" + return \ + self.test_plc.run_in_guest(self.sfi_user("list -r %s"%self.auth_hrn()))==0 and \ + self.test_plc.run_in_guest(self.sfi_user("list %s"%(self.site_hrn())))==0 + + def sfi_show (self, options): + "run (as regular user) sfi show (on Registry)" + return \ + self.test_plc.run_in_guest(self.sfi_user("show %s"%(self.site_hrn())))==0 + + def sfi_slices (self, options): + "run (as regular user) sfi slices (on SM)" + return \ + self.test_plc.run_in_guest(self.sfi_user("slices"))==0 + + # needs to be run as pi def sfa_add_slice(self,options): - return self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ add slice.xml")==0 + "run sfi.py add (on Registry) from slice.xml" + return self.test_plc.run_in_guest(self.sfi_pi("add %s"%(self.addslicefile())))==0 + # run as user def sfa_discover(self,options): - return self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ %s resources -o /root/.sfi/%s"%(self.discover_option(),self.adfile()))==0 + "discover resources into resouces_in.rspec" + return self.test_plc.run_in_guest(self.sfi_user(\ + "resources %s -o %s/%s"% (self.discover_option(),self.sfi_path(),self.adfile())))==0 + # run sfi create as a regular user def sfa_create_slice(self,options): + "run sfi.py create (on SM) - 1st time" commands=[ - "sfiListNodes.py -i /root/.sfi/%s -o /root/.sfi/%s"%(self.adfile(),self.nodefile()), - "sfiAddSliver.py -i /root/.sfi/%s -n /root/.sfi/%s -o /root/.sfi/%s"%(self.adfile(),self.nodefile(),self.reqfile()), - "sfi.py -d /root/.sfi/ create %s %s"%(self.hrn(),self.reqfile()), + "sfiListNodes.py -i %s/%s -o %s/%s"%(self.sfi_path(),self.adfile(),self.sfi_path(),self.nodefile()), + "sfiAddSliver.py -i %s/%s -n %s/%s -o %s/%s"%\ + (self.sfi_path(),self.adfile(),self.sfi_path(),self.nodefile(),self.sfi_path(),self.reqfile()), + self.sfi_user("create %s %s"%(self.hrn(),self.reqfile())), ] for command in commands: if self.test_plc.run_in_guest(command)!=0: return False @@ -88,7 +200,8 @@ class TestSliceSfa: # all local nodes in slice ? def sfa_check_slice_plc (self,options): - slice_fields = self.slice_spec['slice_fields'] + "check sfa_create_slice at the plcs - all local nodes should be in slice" + slice_fields = self.sfa_slice_spec['slice_fields'] slice_name = slice_fields['name'] slice=self.test_plc.apiserver.GetSlices(self.test_plc.auth_root(), slice_name)[0] nodes=self.test_plc.apiserver.GetNodes(self.test_plc.auth_root(), {'peer_id':None}) @@ -103,14 +216,18 @@ class TestSliceSfa: # actually the same for now def sfa_update_slice(self,options): + "run sfi.py create (on SM) on existing object" return self.sfa_create_slice(options) + # run as pi def sfa_delete_slice(self,options): - self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ delete %s.%s.%s"%(root_auth,self.login_base,self.slicename)) - return self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ remove -t slice %s"%(self.hrn()))==0 + "run sfi.py delete" + self.test_plc.run_in_guest(self.sfi_pi("delete %s"%(self.hrn(),))) + return self.test_plc.run_in_guest(self.sfi_pi("remove -t slice %s"%(self.hrn(),)))==0 # check the resulting sliver def ssh_slice_sfa(self,options,timeout_minutes=40,silent_minutes=30,period=15): + "tries to ssh-enter the SFA slice" timeout = datetime.datetime.now()+datetime.timedelta(minutes=timeout_minutes) graceout = datetime.datetime.now()+datetime.timedelta(minutes=silent_minutes) # locate a key @@ -120,10 +237,10 @@ class TestSliceSfa: return False # convert nodenames to real hostnames - slice_spec = self.slice_spec + sfa_slice_spec = self.sfa_slice_spec restarted=[] tocheck=[] - for nodename in slice_spec['nodenames']: + for nodename in sfa_slice_spec['nodenames']: (site_spec,node_spec) = self.test_plc.locate_node(nodename) tocheck.append(node_spec['node_fields']['hostname']) @@ -165,3 +282,4 @@ class TestSliceSfa: time.sleep (period) # for an empty slice return True +