-### $Id$
-### $URL$
-
-
-from sfa.util.server import SfaServer
from sfa.util.faults import *
-from sfa.util.namespace import hrn_to_urn
+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):
# @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
def __init__(self, api, conf_file = "/etc/sfa/aggregates.xml"):
Interfaces.__init__(self, api, conf_file)
- # set up a connection to the local registry
+ # set up a connection to the local aggregate
+ # xxx fixme ? - should not we do this only when SFA_AGGREGATE_ENABLED ?
address = self.api.config.SFA_AGGREGATE_HOST
port = self.api.config.SFA_AGGREGATE_PORT
url = 'http://%(address)s:%(port)s' % locals()