X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Faggregate.py;h=3dee18498e08573d44766ec8faad9e17379ce8a6;hb=cb83b38f6586314d51e23dad227047d126bd4b76;hp=515b9e97f4108bef538e28ebbc696b4a7b5516ba;hpb=a172efc1d44254684c1d17a0d8beae2debef6350;p=sfa.git diff --git a/sfa/server/aggregate.py b/sfa/server/aggregate.py index 515b9e97..3dee1849 100644 --- a/sfa/server/aggregate.py +++ b/sfa/server/aggregate.py @@ -2,8 +2,9 @@ ### $URL$ -from sfa.util.server import SfaServer from sfa.util.faults import * +from sfa.util.server import SfaServer +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 @@ -19,8 +20,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 @@ -35,7 +35,11 @@ class Aggregates(Interfaces): 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} + 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