X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Faggregate.py;h=a8f0a0a48146ad7afb0333a24641feaa04099756;hb=713d58df0baa1f9739eec9bfa30ceb41d7149e23;hp=dc1a61cf6ea86a3f03f17cac44dd81a28a0246f1;hpb=5cf0c1c8c08621a2c5bf7f78c781baa2af8a05d1;p=sfa.git

diff --git a/sfa/server/aggregate.py b/sfa/server/aggregate.py
index dc1a61cf..a8f0a0a4 100644
--- a/sfa/server/aggregate.py
+++ b/sfa/server/aggregate.py
@@ -1,7 +1,10 @@
-from sfa.util.faults import *
-from sfa.util.server import SfaServer
+from sfa.server.sfaserver import SfaServer
 from sfa.util.xrn import hrn_to_urn
-from sfa.server.interface import Interfaces
+from sfa.server.interface import Interfaces, Interface
+from sfa.util.config import Config
+
+# this truly is a server-side object
+
 
 class Aggregate(SfaServer):
 
@@ -11,30 +14,27 @@ class Aggregate(SfaServer):
     # @param ip the ip address to listen on
     # @param port the port to listen on
     # @param key_file private key filename of registry
-    # @param cert_file certificate filename containing public key (could be a GID file)     
+    # @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,'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)
+
+    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
-        # 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()
-        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())
+        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