X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestAuthSfa.py;h=f784796725e6b1cbcf7f480236b0c5f9b8d5380e;hb=900d8dff276a66f782bc0d3b25c8989cc86b544e;hp=7a4b90bb2837f6709c3945eb6ffa6e9bcf124b9c;hpb=07d6d9c2d137dcdc88b789b137d751501469d623;p=tests.git diff --git a/system/TestAuthSfa.py b/system/TestAuthSfa.py index 7a4b90b..f784796 100644 --- a/system/TestAuthSfa.py +++ b/system/TestAuthSfa.py @@ -11,11 +11,12 @@ from TestSliceSfa import TestSliceSfa def slice_sfa_mapper (method): def actual(self,*args, **kwds): + # used to map on several slices... overall=True slice_method = TestSliceSfa.__dict__[method.__name__] - for slice_spec in [ self.auth_sfa_spec['slice_spec'] ]: - test_slice_sfa = TestSliceSfa(self,slice_spec) - if not slice_method(test_slice_sfa, *args, **kwds): overall=False + slice_spec=self.auth_sfa_spec['slice_spec'] + test_slice_sfa = TestSliceSfa(self,slice_spec) + if not slice_method(test_slice_sfa, *args, **kwds): overall=False return overall # restore the doc text actual.__doc__=TestSliceSfa.__dict__[method.__name__].__doc__ @@ -45,10 +46,6 @@ class TestAuthSfa: self.login_base=self.auth_sfa_spec['login_base'] # self.piuser=self.auth_sfa_spec['piuser'] # self.regularuser=self.auth_sfa_spec['regularuser'] -# self.slicename=self.auth_sfa_spec['slicename'] -# -# def plc_name(self): -# return self.auth_sfa_spec['plc_slicename'] def rspec_style (self): return self.auth_sfa_spec['rspec_style'] @@ -57,16 +54,20 @@ class TestAuthSfa: # the hrn for the root authority def root_hrn (self): - return self.test_plc.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH'] + return self.test_plc.plc_spec['sfa']['settings']['SFA_REGISTRY_ROOT_AUTH'] # the hrn for the auth/site - def hrn (self): + def auth_hrn (self): return "%s.%s"%(self.root_hrn(),self.login_base) - # something in this site (users typically) - def qualified (self, name): -# return "%s.%s"%(self.auth_sfa_spec['hrn_prefix'],name) - return "%s.%s"%(self.hrn(),name) + # something in this site (users typically); for use by classes for subobjects + def obj_hrn (self, name): + return "%s.%s"%(self.auth_hrn(),name) + + def regular_user_hrn(self): + return self.obj_hrn(self.auth_sfa_spec['user_spec']['name']) + def slice_hrn(self): + return self.obj_hrn(self.auth_sfa_spec['slice_spec']['name']) # xxx this needs tweaks with more recent versions of sfa that have pgv2 as the default ? # dir_name is local and will be pushed later on by TestPlc @@ -84,7 +85,7 @@ class TestAuthSfa: key_spec = self.test_plc.locate_key (key_name) for (kind,ext) in [ ('private', 'pkey'), ('public', 'pub') ] : contents=key_spec[kind] - file_name=os.path.join(dir_name,self.qualified(user_leaf))+"."+ext + file_name=os.path.join(dir_name,self.obj_hrn(user_leaf))+"."+ext fileconf=open(file_name,'w') fileconf.write (contents) fileconf.close() @@ -92,71 +93,96 @@ class TestAuthSfa: # file_name=dir_name + os.sep + 'sfi_config' fileconf=open(file_name,'w') - SFI_AUTH=self.hrn() + SFI_AUTH=self.auth_hrn() fileconf.write ("SFI_AUTH='%s'"%SFI_AUTH) fileconf.write('\n') # default is to run as a PI - SFI_USER=self.qualified(self.auth_sfa_spec['pi_spec']['name']) + SFI_USER=self.obj_hrn(self.auth_sfa_spec['pi_spec']['name']) fileconf.write ("SFI_USER='%s'"%SFI_USER) fileconf.write('\n') - SFI_REGISTRY='http://' + sfa_spec['SFA_REGISTRY_HOST'] + ':12345/' + SFI_REGISTRY='http://' + sfa_spec['settings']['SFA_REGISTRY_HOST'] + ':12345/' fileconf.write ("SFI_REGISTRY='%s'"%SFI_REGISTRY) fileconf.write('\n') - SFI_SM='http://' + sfa_spec['SFA_SM_HOST'] + ':12347/' + SFI_SM='http://' + sfa_spec['settings']['SFA_SM_HOST'] + ':12347/' fileconf.write ("SFI_SM='%s'"%SFI_SM) fileconf.write('\n') fileconf.close() utils.header ("(Over)wrote %s"%file_name) # using sfaadmin to bootstrap - def sfa_add_site (self, options): + def sfa_register_site (self, options): "bootstrap a site using sfaadmin" - command="sfaadmin reg register -t authority -x %s"%self.hrn() + command="sfaadmin reg register -t authority -x %s"%self.auth_hrn() return self.test_plc.run_in_guest(command)==0 - def sfa_add_pi (self, options): + def sfa_register_pi (self, options): "bootstrap a PI user for that site" pi_spec = self.auth_sfa_spec['pi_spec'] - pi_hrn=self.qualified(pi_spec['name']) + pi_hrn=self.obj_hrn(pi_spec['name']) pi_mail=pi_spec['email'] # as installed by sfi_config - pi_key=os.path.join(self.sfi_path(),self.qualified(pi_spec['name']+'.pub')) + pi_key=os.path.join(self.sfi_path(),self.obj_hrn(pi_spec['name']+'.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.hrn(),pi_hrn) + command="sfaadmin reg update -t authority -x %s --pi %s"%(self.auth_hrn(),pi_hrn) return self.test_plc.run_in_guest(command)==0 # run as pi def sfi_pi (self, command): pi_name=self.auth_sfa_spec['pi_spec']['name'] - return "sfi -d %s -u %s %s"%(self.sfi_path(),self.qualified(pi_name), command,) + return "sfi -d %s -u %s %s"%(self.sfi_path(),self.obj_hrn(pi_name), command,) # the sfi command line option to run as a regular user def sfi_user (self, command): user_name=self.auth_sfa_spec['user_spec']['name'] - return "sfi -d %s -u %s %s"%(self.sfi_path(),self.qualified(user_name), command,) + return "sfi -d %s -u %s %s"%(self.sfi_path(),self.obj_hrn(user_name), command,) # user management @user_sfa_mapper - def sfa_add_user (self, *args, **kwds): pass + def sfa_register_user (self, *args, **kwds): pass @user_sfa_mapper def sfa_update_user (self, *args, **kwds): pass @user_sfa_mapper def sfa_delete_user (self, *args, **kwds): pass + def sfa_remove_user_from_slice (self, options): + "remove regular user from slice" + command="update -t slice -x %s -r none"%(self.slice_hrn()) + # xxx should check result other than visually + return self.test_plc.run_in_guest(self.sfi_pi(command))==0 + + def sfa_insert_user_in_slice (self, options): + "defines regular user as unique user in slice" + command="update -t slice -x %s -r %s"%(self.slice_hrn(),self.regular_user_hrn()) + # xxx should check result other than visually + return self.test_plc.run_in_guest(self.sfi_pi(command))==0 + 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.root_hrn()))==0 and \ - self.test_plc.run_in_guest(self.sfi_user("list %s"%(self.hrn())))==0 + self.test_plc.run_in_guest(self.sfi_user("list %s"%(self.auth_hrn())))==0 - def sfi_show (self, options): + def sfi_show_site (self, options): "run (as regular user) sfi show (on Registry)" return \ - self.test_plc.run_in_guest(self.sfi_user("show %s"%(self.hrn())))==0 + self.test_plc.run_in_guest(self.sfi_user("show %s"%(self.auth_hrn())))==0 + + + def sfi_show_slice (self, options): + "run (as PI) sfi show -n (on Registry)" + return \ + self.test_plc.run_in_guest(self.sfi_pi("show -n %s"%self.slice_hrn()))==0 + + # checks if self.regular_user is found in registry's reg-researchers + def sfi_show_slice_researchers (self, options): + "run (as PI) sfi show -k researcher -k reg-researchers (on Registry)" + return \ + self.test_plc.run_in_guest(self.sfi_pi("show %s -k researcher -k reg-researchers"%self.slice_hrn()))==0 + # those are step names exposed as methods of TestPlc, hence the _sfa @slice_sfa_mapper - def sfa_add_slice (self, *args, **kwds): pass + def sfa_register_slice (self, *args, **kwds): pass @slice_sfa_mapper def sfa_renew_slice (self, *args, **kwds): pass @slice_sfa_mapper