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

diff --git a/system/TestUserSfa.py b/system/TestUserSfa.py
index 6408b3e..28762c9 100644
--- a/system/TestUserSfa.py
+++ b/system/TestUserSfa.py
@@ -2,28 +2,52 @@
 # Copyright (C) 2010 INRIA 
 #
 import os, sys, time
-import xmlrpclib
 
 import utils
 
 class TestUserSfa:
 
-    def __init__ (self,test_plc):
-	self.test_plc=test_plc
+    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_spec['piuser']
-        self.regularuser=self.sfa_spec['regularuser']
-        self.login_base=self.sfa_spec['login_base']
+        self.test_plc = self.test_auth_sfa.test_plc
+        self.login_base = self.test_auth_sfa.login_base
 
-    def add_user (self):
-	return self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ add person.xml")==0
+    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)
 
-    def update_user (self):
-	return self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ update person.xml")==0
+    # xxx todo - not the right place any longer - or is it ?
+    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
+        command += " -k {}/{}.pub".format(self.sfi_path(), user_hrn)
+        return self.test_plc.run_in_guest(self.sfi_pi(command)) == 0
 
-    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
+    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