another step of moving stuff around where it belongs

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

diff --git a/sfa/server/sfa-start.py b/sfa/server/sfa-start.py
index 379c72d..d4a3131 100755 (executable)
--- a/sfa/server/sfa-start.py
+++ b/sfa/server/sfa-start.py
@@ -34,21 +34,21 @@ component_port=12346
 import os, os.path
 import traceback
 import sys
-import sfa.util.xmlrpcprotocol as xmlrpcprotocol
 from optparse import OptionParser
 
 from sfa.util.sfalogging import logger
+from sfa.util.xrn import get_authority, hrn_to_urn
+from sfa.util.config import Config
+import sfa.client.xmlrpcprotocol as xmlrpcprotocol
+
 from sfa.trust.certificate import Keypair, Certificate
 from sfa.trust.hierarchy import Hierarchy
 from sfa.trust.gid import GID
-from sfa.util.config import Config
-from sfa.plc.api import SfaAPI
+
+from sfa.server.sfaapi import SfaApi
+
 from sfa.server.registry import Registries
 from sfa.server.aggregate import Aggregates
-from sfa.util.xrn import get_authority, hrn_to_urn
-from sfa.util.sfalogging import logger
-
-from sfa.managers.import_manager import import_manager
 
 # after http://www.erlenstar.demon.co.uk/unix/faq_2.html
 def daemon():
@@ -136,28 +136,6 @@ def init_self_signed_cert(hrn, key, server_cert_file):
     cert.sign()
     cert.save_to_file(server_cert_file)
 
-def init_server(options, config):
-    """
-    Locate the manager based on config.*TYPE
-    Execute the init_server method (well in fact function, sigh) if defined in that module
-    In order to migrate to a more generic approach:
-    * search for <>_manager_<type>.py
-    * if not found, try <>_manager.py (and issue a warning if <type>!='pl')
-    """
-    if options.registry:
-        manager=import_manager ("registry",       config.SFA_REGISTRY_TYPE)
-        if manager and hasattr(manager, 'init_server'): manager.init_server()
-    if options.am:      
-        manager=import_manager ("aggregate",      config.SFA_AGGREGATE_TYPE)
-        if manager and hasattr(manager, 'init_server'): manager.init_server()
-    if options.sm:
-        manager=import_manager ("slice",          config.SFA_SM_TYPE)
-        if manager and hasattr(manager, 'init_server'): manager.init_server()
-    if options.cm:
-        manager=import_manager ("component",      config.SFA_CM_TYPE)
-        if manager and hasattr(manager, 'init_server'): manager.init_server()
-
-
 def install_peer_certs(server_key_file, server_cert_file):
     """
     Attempt to install missing trusted gids and db records for 
@@ -167,7 +145,7 @@ def install_peer_certs(server_key_file, server_cert_file):
     # There should be a gid file in /etc/sfa/trusted_roots for every
     # peer registry found in in the registries.xml config file. If there
     # are any missing gids, request a new one from the peer registry.
-    api = SfaAPI(key_file = server_key_file, cert_file = server_cert_file)
+    api = SfaApi(key_file = server_key_file, cert_file = server_cert_file)
     registries = Registries()
     aggregates = Aggregates()
     interfaces = dict(registries.items() + aggregates.items())
@@ -188,7 +166,7 @@ def install_peer_certs(server_key_file, server_cert_file):
         try:
             # get gid from the registry
             url = interfaces[new_hrn].get_url()
-            interface = interfaces[new_hrn].get_server(server_key_file, server_cert_file, timeout=30)
+            interface = interfaces[new_hrn].server_proxy(server_key_file, server_cert_file, timeout=30)
             # skip non sfa aggregates
             server_version = api.get_cached_server_version(interface)
             if 'sfa' not in server_version:
@@ -224,7 +202,7 @@ def update_cert_records(gids):
     Make sure there is a record in the registry for the specified gids. 
     Removes old records from the db.
     """
-    # import SfaTable here so this module can be loaded by ComponentAPI
+    # import SfaTable here so this module can be loaded by PlcComponentApi
     from sfa.util.table import SfaTable
     from sfa.util.record import SfaRecord
     if not gids:
@@ -280,8 +258,7 @@ 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)
- 
+
     if (options.daemon):  daemon()
     
     if options.trusted_certs: