X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Faggregate.py;h=1a96e157f41ff57fd48387f0a131c9b94dfe59c6;hb=cc799d820c7107c55137ee31dc0208c3c579634d;hp=ce66048888b537e244c77ced484f88d8abe0031f;hpb=3dbfdba5db3921a563c0e153c554c755b9dd494f;p=sfa.git

diff --git a/sfa/server/aggregate.py b/sfa/server/aggregate.py
index ce660488..1a96e157 100644
--- a/sfa/server/aggregate.py
+++ b/sfa/server/aggregate.py
@@ -1,13 +1,7 @@
-### $Id$
-### $URL$
-
-
-from sfa.util.server import SfaServer
 from sfa.util.faults import *
+from sfa.util.server import SfaServer
+from sfa.util.xrn import hrn_to_urn
 from sfa.server.interface import Interfaces
-import sfa.util.xmlrpcprotocol as xmlrpcprotocol
-import sfa.util.soapprotocol as soapprotocol
-
 
 class Aggregate(SfaServer):
 
@@ -19,8 +13,7 @@ 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
@@ -30,21 +23,18 @@ class Aggregates(Interfaces):
     default_dict = {'aggregates': {'aggregate': [Interfaces.default_fields]}}
  
     def __init__(self, api, conf_file = "/etc/sfa/aggregates.xml"):
-        Interfaces.__init__(self, api, conf_file, 'ma')
-
-    def get_connections(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[self.api.hrn] = local_aggregate 
-        connections[self.api.hrn] = xmlrpcprotocol.get_server(url, self.api.key_file, self.api.cert_file)
-        return connections
-
+        Interfaces.__init__(self, api, conf_file)
+        # set up a connection to the local aggregate
+        if self.api.config.SFA_AGGREGATE_ENABLED:
+            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,
+                               'urn': hrn_to_urn(self.api.hrn, 'authority'),
+                               'addr': address,
+                               'port': port,
+                               'url': url}
+            self.interfaces[self.api.hrn] = local_aggregate
+
+        # get connections
+        self.update(self.get_connections())