X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestUserSfa.py;h=28762c91ec75cbc56662e501377c7474574ee4d0;hb=01223f097c1f78208b6935fc0eab0915da5dc1b6;hp=0ab2df6839cc7413efc754a5468c1549406914db;hpb=84c56ab4b28273e9f2a4b318895acb8224945fa9;p=tests.git

diff --git a/system/TestUserSfa.py b/system/TestUserSfa.py
index 0ab2df6..28762c9 100644
--- a/system/TestUserSfa.py
+++ b/system/TestUserSfa.py
@@ -2,46 +2,52 @@
 # Copyright (C) 2010 INRIA 
 #
 import os, sys, time
-import xmlrpclib
 
 import utils
 
 class TestUserSfa:
 
-    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
+    def __init__ (self, test_auth_sfa, user_spec):
+        self.test_auth_sfa = test_auth_sfa
+        self.user_spec = user_spec
         # shortcuts
-        self.sfa_spec=test_plc.plc_spec['sfa']
-        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()
+        self.test_plc = self.test_auth_sfa.test_plc
+        self.login_base = self.test_auth_sfa.login_base
+
+    def sfi_path(self):
+        return self.test_auth_sfa.sfi_path()
+    def hrn(self):
+        return self.test_auth_sfa.obj_hrn(self.user_spec['name'])
+    def sfi_pi(self, *args, **kwds):
+        return self.test_auth_sfa.sfi_pi(*args, **kwds)
+    def sfi_user(self, *args, **kwds):
+        return self.test_auth_sfa.sfi_user(*args, **kwds)
 
     # xxx todo - not the right place any longer - or is it ?
-    def add_user (self):
-        sfi_add_options = self.sfa_slice_spec['person_options']
-        command="sfi -d %s add"%(self.sfi_path())
-        for (opt,val) in sfi_add_options.items():
-            command += " %s %s"%(opt,val)
+    def sfa_register_user (self, options):
+        "add a regular user using sfi register"
+        user_hrn = self.hrn()
+        command = "register"
+        command += " --type user"
+        command += " --xrn {}".format(user_hrn)
+        command += " --email {}".format(self.user_spec['email'])
+        command += " " + " ".join(self.user_spec['register_options'])
         # handle key separately because of embedded whitespace
         # hack - the user's pubkey is avail from his hrn
-        hrn=sfi_add_options['-x']
-        command += " -k %s/%s.pub"%(self.sfi_path(),hrn)
-	return self.test_plc.run_in_guest(command)==0
-
-    def update_user (self):
-        # xxx TODO now that we use sfi arguments
-        utils.header ("WARNING: TestUserSfa.update_user needs more work")
-        return True
-#	return self.test_plc.run_in_guest("sfi.py -d %s update %s"%
-#                                          (self.sfi_path(),self.addpersonfile()))==0
-
-    def delete_user(self):
-	auth=self.sfa_spec['SFA_REGISTRY_ROOT_AUTH']
-	return \
-            self.test_plc.run_in_guest("sfi.py -d %s remove -t user %s.%s.%s"%(
-                self.sfi_path(),auth,self.login_base,self.regularuser))==0
-
+        command += " -k {}/{}.pub".format(self.sfi_path(), user_hrn)
+        return self.test_plc.run_in_guest(self.sfi_pi(command)) == 0
+
+    def sfa_update_user (self,options):
+        "update a user record using sfi update"
+        user_hrn = self.hrn()
+        command="update"
+        command += " --type user"
+        command += " --xrn {}".format(user_hrn)
+        command += " " + " ".join(self.user_spec['update_options'])
+        return self.test_plc.run_in_guest(self.sfi_pi(command)) == 0
+
+    def sfa_delete_user(self,options):
+        "run sfi delete on user record"
+        user_hrn = self.hrn()
+        command = "remove -t user {}".format(user_hrn)
+        return self.test_plc.run_in_guest(self.sfi_pi(command)) == 0