check_initscripts no longer a warning

[tests.git] / system / TestAuthSfa.py

diff --git a/system/TestAuthSfa.py b/system/TestAuthSfa.py
index d8aa1c9..6d3d542 100644 (file)
--- 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,10 +100,10 @@ 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()
@@ -186,12 +186,24 @@ class TestAuthSfa:
     @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