-### $Id$
-### $URL$
-
-
-from sfa.util.server import SfaServer
-from sfa.util.faults import *
-from sfa.server.interface import Interfaces
-import sfa.util.xmlrpcprotocol as xmlrpcprotocol
-import sfa.util.soapprotocol as soapprotocol
-
+from sfa.server.sfaserver import SfaServer
+from sfa.util.xrn import hrn_to_urn
+from sfa.server.interface import Interfaces, Interface
+from sfa.util.config import Config
+# this truly is a server-side object
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
-
+# as such it's more of a client-side thing for aggregate servers to reach their peers
+#
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)
- # 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
-
- # get connections
- self.update(self.get_connections())
+ def __init__(self, conf_file = "/etc/sfa/aggregates.xml"):
+ Interfaces.__init__(self, conf_file)
+ sfa_config = Config()
+ # set up a connection to the local aggregate
+ if sfa_config.SFA_AGGREGATE_ENABLED:
+ addr = sfa_config.SFA_AGGREGATE_HOST
+ port = sfa_config.SFA_AGGREGATE_PORT
+ hrn = sfa_config.SFA_INTERFACE_HRN
+ interface = Interface(hrn, addr, port)
+ self[hrn] = interface