removed another bunch of references to geni

[sfa.git] / sfa / server / sfa-server.py

diff --git a/sfa/server/sfa-server.py b/sfa/server/sfa-server.py
index 8a3df65..134b44a 100755 (executable)
--- a/sfa/server/sfa-server.py
+++ b/sfa/server/sfa-server.py
@@ -3,9 +3,9 @@
 ### $Id$
 ### $URL$
 #
-# GENI PLC Wrapper
+# SFA PLC Wrapper
 #
-# This wrapper implements the Geni Registry and Slice Interfaces on PLC.
+# This wrapper implements the SFA Registry and Slice Interfaces on PLC.
 # Depending on command line options, it starts some combination of a
 # Registry, an Aggregate Manager, and a Slice Manager.
 #
@@ -18,7 +18,7 @@
 # is up to date and accurate.
 #
 # 1) Import the existing planetlab database, creating the
-#    appropriate geni records. This is done by running the "sfa-import-plc.py" tool.
+#    appropriate SFA records. This is done by running the "sfa-import-plc.py" tool.
 #
 # 2) Create a "trusted_roots" directory and place the certificate of the root
 #    authority in that directory. Given the defaults in sfa-import-plc.py, this
@@ -118,28 +118,28 @@ def init_server(options, config):
     """
     manager_base = 'sfa.managers'
     if options.registry:
-        mgr_type = self.api.config.SFA_REGISTRY_TYPE
+        mgr_type = config.SFA_REGISTRY_TYPE
         manager_module = manager_base + ".registry_manager_%s" % mgr_type
         try: manager = __import__(manager_module, fromlist=[manager_base])
         except: manager = None
         if manager and hasattr(manager, 'init_server'): 
             manager.init_server()    
     if options.am:
-        mgr_type = self.api.config.SFA_AGGREGATE_TYPE
+        mgr_type = config.SFA_AGGREGATE_TYPE
         manager_module = manager_base + ".aggregate_manager_%s" % mgr_type
         try: manager = __import__(manager_module, fromlist=[manager_base])
         except: manager = None
         if manager and hasattr(manager, 'init_server'):
             manager.init_server()    
     if options.sm:
-        mgr_type = self.api.config.SFA_SM_TYPE
+        mgr_type = config.SFA_SM_TYPE
         manager_module = manager_base + ".slice_manager_%s" % mgr_type
         try: manager = __import__(manager_module, fromlist=[manager_base])
         except: manager = None
         if manager and hasattr(manager, 'init_server'):
             manager.init_server()    
     if options.cm:
-        mgr_type = self.api.config.SFA_CM_TYPE
+        mgr_type = config.SFA_CM_TYPE
         manager_module = manager_base + ".component_manager_%s" % mgr_type
         try: manager = __import__(manager_module, fromlist=[manager_base])
         except: manager = None