convert slice hrn to pl slicename

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

diff --git a/sfa/server/sfa-server.py b/sfa/server/sfa-server.py
index de65a8d..ec0532b 100755 (executable)
--- a/sfa/server/sfa-server.py
+++ b/sfa/server/sfa-server.py
@@ -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
@@ -134,7 +128,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)
@@ -154,20 +148,24 @@ def main():
     
     # 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()