X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestAuthSfa.py;h=6d3d542e9df2e9d7c1f4dce3584bfd587faeb28d;hb=127cb9ef78ef452eddd84541b0f6a7cf2c11c262;hp=d792e3350c3f64b118cd3dc03374a023d97a8dd6;hpb=ebd8fa86b09d7c9527c3b1cccb96803ad3e0f87e;p=tests.git

diff --git a/system/TestAuthSfa.py b/system/TestAuthSfa.py
index d792e33..6d3d542 100644
--- a/system/TestAuthSfa.py
+++ b/system/TestAuthSfa.py
@@ -54,7 +54,7 @@ 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 auth_hrn (self):
@@ -100,22 +100,22 @@ class TestAuthSfa:
 	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://%s:%s/'%(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://%s:%s/'%(sfa_spec['settings']['SFA_SM_HOST'],sfa_spec['sfi-connects-to-port'])
         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.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.obj_hrn(pi_spec['name'])
@@ -138,7 +138,7 @@ class TestAuthSfa:
 
     # 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
@@ -182,16 +182,28 @@ class TestAuthSfa:
 
     # 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
+    def sfa_get_expires (self, *args, **kwds): pass
+    @slice_sfa_mapper
     def sfa_discover (self, *args, **kwds): pass
     @slice_sfa_mapper
-    def sfa_create_slice (self, *args, **kwds): pass
+    def sfa_rspec (self, *args, **kwds): pass
+    @slice_sfa_mapper
+    def sfa_allocate (self, *args, **kwds): pass
+    @slice_sfa_mapper
+    def sfa_allocate_empty (self, *args, **kwds): pass
+    @slice_sfa_mapper
+    def sfa_provision (self, *args, **kwds): pass
+    @slice_sfa_mapper
+    def sfa_provision_empty (self, *args, **kwds): pass
     @slice_sfa_mapper
     def sfa_check_slice_plc (self, *args, **kwds): pass
     @slice_sfa_mapper
+    def sfa_check_slice_plc_empty (self, *args, **kwds): pass
+    @slice_sfa_mapper
     def sfa_update_slice (self, *args, **kwds): pass
     @slice_sfa_mapper
     def sfa_delete_slice (self, *args, **kwds): pass