X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Faggregate.py;h=3793a83b0ecd972f2be9d573b5931f0e8edb8cf6;hb=34fb4a40d65264e12875a5579483042e74ba2c74;hp=ce66048888b537e244c77ced484f88d8abe0031f;hpb=84839602450f57e26f2f6e07ac099d7c22befc85;p=sfa.git diff --git a/sfa/server/aggregate.py b/sfa/server/aggregate.py index ce660488..3793a83b 100644 --- a/sfa/server/aggregate.py +++ b/sfa/server/aggregate.py @@ -31,20 +31,12 @@ class Aggregates(Interfaces): 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 + self.interfaces[self.api.hrn] = local_aggregate + # get connections + self.update(self.get_connections())