no functional change, but a small cleanup on how sfa users are configured

[tests.git] / system / TestUserSfa.py

diff --git a/system/TestUserSfa.py b/system/TestUserSfa.py
index c95733f..de7092d 100644 (file)
--- a/system/TestUserSfa.py
+++ b/system/TestUserSfa.py
@@ -15,15 +15,19 @@ class TestUserSfa:
         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 qualified(self,name): return self.test_auth_sfa.qualified(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 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 sfa_add_user (self,options):
         "add a regular user using sfi add"
-        user_hrn = self.qualified(self.user_spec['name'])
+        user_hrn = self.hrn()
         command="add"
         command += " --type user"
         command += " --xrn %s"%user_hrn
@@ -36,7 +40,7 @@ class TestUserSfa:
 
     def sfa_update_user (self,options):
         "update a user record using sfi update"
-        user_hrn = self.qualified(self.user_spec['name'])
+        user_hrn = self.hrn()
         command="update"
         command += " --type user"
         command += " --xrn %s"%user_hrn
@@ -45,7 +49,7 @@ class TestUserSfa:
 
     def sfa_delete_user(self,options):
        "run sfi delete on user record"
-        user_hrn = self.qualified(self.user_spec['name'])
+        user_hrn = self.hrn()
         command="remove -t user %s"%user_hrn
        return \
             self.test_plc.run_in_guest(self.sfi_pi(command))==0