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.test_plc.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH'],
- self.login_base)
+ return "%s.%s"%(self.auth_hrn(),self.login_base)
# something in the site (users typically)
def qualified_hrn (self, name):
# 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")
else: return "-r sfa"
def sfi_path (self):
- return "/root/sfi/%s"%self.slicename
+ return "/root/sfi/%s%s"%(self.slicename,self.rspec_style())
def locate_key(self):
for username,keyname in self.sfa_slice_spec['usernames']:
# 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):
+ def sfi_configure (self,dir_name):
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'),
+ # fetch keys in config spec and expose to sfi
+ for (key_key,name) in [ ('pi_private_key', self.piuser+'.pkey'),
+ ('pi_public_key', self.piuser+'.pub'),
+ ('user_private_key', self.regularuser+'.pkey'),
+ ('user_public_key', self.regularuser+'.pub'),
]:
file_name=os.path.join(dir_name,self.qualified_hrn(name))
fileconf=open(file_name,'w')
+ contents=self.sfa_slice_spec[key_key]
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(sfa_slice_spec['person_record'])
- fileconf.write('\n')
- fileconf.close()
- utils.header ("(Over)wrote %s"%file_name)
- #
file_name=dir_name + os.sep + 'sfi_config'
fileconf=open(file_name,'w')
SFI_AUTH="%s"%(self.site_hrn())
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
# user management
def sfa_add_user (self, options):
+ "add a regular user using sfi 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 update"
return TestUserSfa(self.test_plc, self.sfa_slice_spec, self).update_user()
def sfa_delete_user (self, options):
+ "run sfi 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
+ return "sfi -d %s -u %s %s"%(self.sfi_path(),self.qualified_hrn(self.piuser), command,)
+ # the sfi 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,)
+ return "sfi -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 sfa_view (self, options):
- "run (as regular user) sfi list and sfi show (both on Registry) and sfi slices (on SM)"
- root_auth=self.test_plc.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH']
+
+ 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("list %s"%(self.site_hrn())))==0 and \
- self.test_plc.run_in_guest(self.sfi_user("show %s"%(self.site_hrn())))==0 and \
- self.test_plc.run_in_guest(self.sfi_user("slices"))==0
+ 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(self.sfi_pi("add %s"%(self.addslicefile())))==0
+ "run sfi add (on Registry) from slice.xml"
+ sfi_options="add"
+ for (k,v) in self.sfa_slice_spec['slice_sfi_options'].items():
+ sfi_options += " %s %s"%(k,v)
+ return self.test_plc.run_in_guest(self.sfi_pi("%s"%(sfi_options)))==0
# run as user
def sfa_discover(self,options):
+ "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 create (on SM) - 1st time"
commands=[
"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"%\
# all local nodes in slice ?
def sfa_check_slice_plc (self,options):
+ "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]
# actually the same for now
def sfa_update_slice(self,options):
+ "run sfi create (on SM) on existing object"
return self.sfa_create_slice(options)
# run as pi
def sfa_delete_slice(self,options):
+ "run sfi 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
git://git.onelab.eu / tests.git / blobdiff