X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Fsfa-server.py;h=134b44aed936eebb598635a6770696bd30ea8a03;hb=3d7237fa0b5f2b4a60cb97c7fb3b6aecfd94558a;hp=de65a8da7ee2630c1816cbb37f8f957ac94084d3;hpb=1a8ad69ff49ee44faf18f64dcff0430962c67200;p=sfa.git

diff --git a/sfa/server/sfa-server.py b/sfa/server/sfa-server.py
index de65a8da..134b44ae 100755
--- 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
@@ -33,19 +33,13 @@
 registry_port=12345
 aggregate_port=12346
 slicemgr_port=12347
-component_port=12348
+component_port=12346
 
 import os, os.path
 import sys
 from optparse import OptionParser
-
 from sfa.trust.trustedroot import TrustedRootList
 from sfa.trust.certificate import Keypair, Certificate
-
-from sfa.server.registry import Registry
-from sfa.server.aggregate import Aggregate
-from sfa.server.slicemgr import SliceMgr
-from sfa.server.component import Component
 from sfa.trust.hierarchy import Hierarchy
 from sfa.util.config import Config
 from sfa.util.report import trace
@@ -94,7 +88,7 @@ def init_server_key(server_key_file, server_cert_file, config, hierarchy):
             cert.set_issuer(key=key, subject=subject)
             cert.set_pubkey(key)
             cert.sign()
-            cert.save_to_file(server_cert_file)
+            cert.save_to_file(server_cert_file, save_parents=True)
 
         else:
             # the pkey was found in the authorites directory. lets 
@@ -106,7 +100,7 @@ def init_server_key(server_key_file, server_cert_file, config, hierarchy):
             cert.set_issuer(key=key, subject=subject)
             cert.set_pubkey(key)
             cert.sign()
-            cert.save_to_file(server_cert_file)
+            cert.save_to_file(server_cert_file, save_parents=True)
 
 
     # If private key exists and cert doesnt, recreate cert
@@ -118,6 +112,41 @@ def init_server_key(server_key_file, server_cert_file, config, hierarchy):
         cert.sign()
         cert.save_to_file(server_cert_file)
 
+def init_server(options, config):
+    """
+    Execute the init method defined in the manager file 
+    """
+    manager_base = 'sfa.managers'
+    if options.registry:
+        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 = 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 = 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 = config.SFA_CM_TYPE
+        manager_module = manager_base + ".component_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()    
+            
+
 def main():
     # xxx get rid of globals - name consistently CamelCase or under_score
     global AuthHierarchy
@@ -134,7 +163,7 @@ def main():
          help="run slice manager", default=False)
     parser.add_option("-a", "--aggregate", dest="am", action="store_true",
          help="run aggregate manager", default=False)
-    parser.add_option("-c", "--component", dest="component", action="store_true",
+    parser.add_option("-c", "--component", dest="cm", action="store_true",
          help="run component server", default=False)
     parser.add_option("-v", "--verbose", dest="verbose", action="store_true", 
          help="verbose mode", default=False)
@@ -151,23 +180,28 @@ def main():
     server_cert_file = os.path.join(hierarchy.basedir, "server.cert")
 
     init_server_key(server_key_file, server_cert_file, config, hierarchy)
-    
+    init_server(options, config)   
+ 
     # start registry server
     if (options.registry):
+        from sfa.server.registry import Registry
         r = Registry("", registry_port, server_key_file, server_cert_file)
         r.start()
 
     # start aggregate manager
     if (options.am):
+        from sfa.server.aggregate import Aggregate
         a = Aggregate("", aggregate_port, server_key_file, server_cert_file)
         a.start()
 
     # start slice manager
     if (options.sm):
+        from sfa.server.slicemgr import SliceMgr
         s = SliceMgr("", slicemgr_port, server_key_file, server_cert_file)
         s.start()
 
     if (options.cm):
+        from sfa.server.component import Component
         c = Component("", component_port, server_key_file, server_cert_file)
         c.start()