X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Faggregate.py;h=81d870518c45ab9ddbc9eb1d48aedaec201be707;hb=ff6db6c1a9e815d694d68619e94df04c2d0fd463;hp=0ecc01d22212c1076a398ee7b9a33a47ca06eeb7;hpb=7ed77623e59802a63f5891fc2b16d5910191928b;p=sfa.git

diff --git a/sfa/server/aggregate.py b/sfa/server/aggregate.py
index 0ecc01d2..81d87051 100644
--- a/sfa/server/aggregate.py
+++ b/sfa/server/aggregate.py
@@ -4,6 +4,7 @@
 
 from sfa.util.server import SfaServer
 from sfa.util.faults import *
+from sfa.util.namespace import hrn_to_urn
 from sfa.server.interface import Interfaces
 import sfa.util.xmlrpcprotocol as xmlrpcprotocol
 import sfa.util.soapprotocol as soapprotocol
@@ -30,21 +31,17 @@ 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)
-
+        Interfaces.__init__(self, api, conf_file)
         # 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
-
+        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())