no more separate interface for geni aggregate

diff --git a/sfa/init.d/sfa b/sfa/init.d/sfa
index 6e81c63..b3b041c 100755 (executable)
--- a/sfa/init.d/sfa
+++ b/sfa/init.d/sfa
@@ -75,10 +75,6 @@ start() {
         action "SFA SliceMgr" daemon /usr/bin/sfa-server.py -s -d $OPTIONS
     fi
 
-               if [ "$SFA_GENI_AGGREGATE_ENABLED" ]; then
-                               action $"SFA GENI Aggregate" daemon /usr/bin/sfa-server.py -g -d $OPTIONS
-               fi
-
     RETVAL=$?
     [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sfa
 

diff --git a/sfa/server/geni_aggregate.py b/sfa/server/geni_aggregate.py
deleted file mode 100644 (file)
index c4c3a02..0000000
--- a/sfa/server/geni_aggregate.py
+++ /dev/null
@@ -1,36 +0,0 @@
-### $Id: aggregate.py 16477 2010-01-05 16:31:37Z thierry $
-### $URL: svn+ssh://svn.planet-lab.org/svn/sfa/branches/geni-api/sfa/server/aggregate.py $
-
-import os
-import sys
-import datetime
-import time
-import xmlrpclib
-from types import StringTypes, ListType
-
-from sfa.util.server import SfaServer
-from sfa.util.storage import *
-from sfa.util.faults import *
-import sfa.util.xmlrpcprotocol as xmlrpcprotocol
-import sfa.util.soapprotocol as soapprotocol
-
-# GeniLight client support is optional
-try:
-    from egeni.geniLight_client import *
-except ImportError:
-    GeniClientLight = None
-
-
-class GENIAggregate(SfaServer):
-
-    ##
-    # Create a new aggregate object.
-    #
-    # @param ip the ip address to listen on
-    # @param port the port to listen on
-    # @param key_file private key filename of registry
-    # @param cert_file certificate filename containing public key (could be a GID file)     
-    def __init__(self, ip, port, key_file, cert_file):
-        SfaServer.__init__(self, ip, port, key_file, cert_file)
-        self.server.interface = 'geni_am'
-        self.server.method_map = {'Resolve': 'ResolveGENI'}

diff --git a/sfa/server/sfa-server.py b/sfa/server/sfa-server.py
index 06393ce..326258e 100755 (executable)
--- a/sfa/server/sfa-server.py
+++ b/sfa/server/sfa-server.py
@@ -34,7 +34,6 @@ registry_port=12345
 aggregate_port=12346
 slicemgr_port=12347
 component_port=12346
-geni_am_port=12348
 import os, os.path
 import sys
 from optparse import OptionParser
@@ -148,14 +147,6 @@ def init_server(options, config):
         except: manager = None
         if manager and hasattr(manager, 'init_server'):
             manager.init_server()
-    if options.gam:
-        mgr_type = config.SFA_GENI_AGGREGATE_TYPE
-        manager_module = manager_base + ".geni_am_%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 sync_interfaces(server_key_file, server_cert_file):
     """
@@ -186,8 +177,6 @@ def main():
          help="run aggregate manager", default=False)
     parser.add_option("-c", "--component", dest="cm", action="store_true",
          help="run component server", default=False)
-    parser.add_option("-g", "--geniam", dest="gam", action="store_true",
-         help="run GENI aggregate manager", default=False)
     parser.add_option("-v", "--verbose", dest="verbose", action="store_true", 
          help="verbose mode", default=False)
     parser.add_option("-d", "--daemon", dest="daemon", action="store_true",
@@ -228,11 +217,5 @@ def main():
         c = Component("", component_port, server_key_file, server_cert_file)
         c.start()
 
-    # start GENI aggregate manager
-    if (options.gam):
-        from sfa.server.geni_aggregate import GENIAggregate
-        g = GENIAggregate("", geni_am_port, server_key_file, server_cert_file)
-        g.start()
-
 if __name__ == "__main__":
     main()