removed another bunch of references to geni

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

diff --git a/sfa/server/aggregate.py b/sfa/server/aggregate.py
index 9aee864..9295e3f 100644 (file)
--- a/sfa/server/aggregate.py
+++ b/sfa/server/aggregate.py
@@ -8,7 +8,7 @@ import time
 import xmlrpclib
 from types import StringTypes, ListType
 
-from sfa.util.geniserver import GeniServer
+from sfa.util.server import SfaServer
 from sfa.util.storage import *
 from sfa.util.faults import *
 import sfa.util.xmlrpcprotocol as xmlrpcprotocol
@@ -21,7 +21,7 @@ except ImportError:
     GeniClientLight = None
 
 
-class Aggregate(GeniServer):
+class Aggregate(SfaServer):
 
     ##
     # Create a new aggregate object.
@@ -31,7 +31,7 @@ class Aggregate(GeniServer):
     # @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):
-        GeniServer.__init__(self, ip, port, key_file, cert_file)
+        SfaServer.__init__(self, ip, port, key_file, cert_file)
         self.server.interface = 'aggregate'
 
 ##
@@ -73,7 +73,7 @@ class Aggregates(dict):
     def connectAggregates(self):
         """
         Get connection details for the trusted peer aggregates from file and 
-        create an GeniClient connection to each. 
+        create an connection to each. 
         """
         aggregates = self.aggregate_info['aggregates']['aggregate']
         if isinstance(aggregates, dict):
@@ -88,8 +88,8 @@ class Aggregates(dict):
                     continue
                 self.interfaces.append(aggregate)
                 # check which client we should use
-                # geniclient is default
-                client_type = 'geniclient'
+                # sfa.util.xmlrpcprotocol is default
+                client_type = 'xmlrpcprotocol'
                 if aggregate.has_key('client') and aggregate['client'] in ['geniclientlight']:
                     client_type = 'geniclientlight'
                 
@@ -104,7 +104,6 @@ class Aggregates(dict):
                     self[hrn] = xmlrpcprotocol.get_server(url, self.api.key_file, self.api.cert_file)
 
         # set up a connection to the local registry
-        # connect to registry using GeniClient
         address = self.api.config.SFA_AGGREGATE_HOST
         port = self.api.config.SFA_AGGREGATE_PORT
         url = 'http://%(address)s:%(port)s' % locals()