class TestUserSfa:
- def __init__ (self,test_plc):
+ def __init__ (self,test_plc,sfa_slice_spec,test_slice_sfa):
self.test_plc=test_plc
+ self.sfa_slice_spec=sfa_slice_spec
+ self.test_slice_sfa=test_slice_sfa
# shortcuts
self.sfa_spec=test_plc.plc_spec['sfa']
- self.piuser=self.sfa_spec['piuser']
- self.regularuser=self.sfa_spec['regularuser']
- self.login_base=self.sfa_spec['login_base']
+ self.piuser=self.sfa_slice_spec['piuser']
+ self.regularuser=self.sfa_slice_spec['regularuser']
+ self.login_base=self.sfa_slice_spec['login_base']
+ def sfi_path(self): return self.test_slice_sfa.sfi_path()
+
+ # xxx todo - not the right place any longer - or is it ?
def add_user (self):
- return self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ add person.xml")==0
+ sfi_add_options = self.sfa_slice_spec['user_sfi_options']
+ user_hrn = self.sfa_slice_spec['user_hrn']
+ command="sfi -d %s add"%(self.sfi_path())
+ for opt in sfi_add_options:
+ command += " %s"%(opt,)
+ # handle key separately because of embedded whitespace
+ # hack - the user's pubkey is avail from his hrn
+ command += " -k %s/%s.pub"%(self.sfi_path(),user_hrn)
+ return self.test_plc.run_in_guest(command)==0
def update_user (self):
- return self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ update person.xml")==0
+ # xxx TODO now that we use sfi arguments
+ utils.header ("WARNING: TestUserSfa.update_user needs more work")
+ return True
def delete_user(self):
auth=self.sfa_spec['SFA_REGISTRY_ROOT_AUTH']
return \
- self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ remove -t user %s.%s.%s"%(auth,self.login_base,self.regularuser))==0
-
+ self.test_plc.run_in_guest("sfi -d %s remove -t user %s.%s.%s"%(
+ self.sfi_path(),auth,self.login_base,self.regularuser))==0