move sfa.util.server into sfa.server.sfaserver

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

diff --git a/sfa/server/aggregate.py b/sfa/server/aggregate.py
index fd899e8..6d7516d 100644 (file)
--- a/sfa/server/aggregate.py
+++ b/sfa/server/aggregate.py
@@ -1,13 +1,8 @@
-### $Id$
-### $URL$
-
-
-from sfa.util.server import SfaServer
 from sfa.util.faults import *
-from sfa.server.interface import Interfaces
-import sfa.util.xmlrpcprotocol as xmlrpcprotocol
-import sfa.util.soapprotocol as soapprotocol
-
+from sfa.server.sfaserver import SfaServer
+from sfa.util.xrn import hrn_to_urn
+from sfa.server.interface import Interfaces, Interface
+from sfa.util.config import Config     
 
 class Aggregate(SfaServer):
 
@@ -19,32 +14,22 @@ class Aggregate(SfaServer):
     # @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 = 'aggregate'
+        SfaServer.__init__(self, ip, port, key_file, cert_file,'aggregate')
 
 ##
 # Aggregates is a dictionary of aggregate connections keyed on the aggregate hrn
 
-class Aggregates(dict):
+class Aggregates(Interfaces):
 
-    default_dict = {'registries': {'registry': [default_fields]}}
+    default_dict = {'aggregates': {'aggregate': [Interfaces.default_fields]}}
  
-    def __init__(self, api, file = "/etc/sfa/aggregates.xml"):
-        Interfaces.__init__(self, api, conf_file, 'sa')
-
-    def connectAggregates(self, interfaces):
-        """
-        Get connection details for the trusted peer aggregates from file and 
-        create an connection to each. 
-        """
-        connections = Interfaces.get_connections(self, interfaces)
-
-        # set up a connection to the local registry
-        address = self.api.config.SFA_AGGREGATE_HOST
-        port = self.api.config.SFA_AGGREGATE_PORT
-        url = 'http://%(address)s:%(port)s' % locals()
-        local_aggregate = {'hrn': self.api.hrn, 'addr': address, 'port': port}
-        self.interfaces.append(local_aggregate) 
-        connections[self.api.hrn] = xmlrpcprotocol.get_server(url, self.api.key_file, self.api.cert_file)
-        return connetions
-
+    def __init__(self, conf_file = "/etc/sfa/aggregates.xml"):
+        Interfaces.__init__(self, conf_file)
+        sfa_config = Config() 
+        # set up a connection to the local aggregate
+        if sfa_config.SFA_AGGREGATE_ENABLED:
+            addr = sfa_config.SFA_AGGREGATE_HOST
+            port = sfa_config.SFA_AGGREGATE_PORT
+            hrn = sfa_config.SFA_INTERFACE_HRN
+            interface = Interface(hrn, addr, port)
+            self[hrn] = interface