X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Faggregate.py;h=a8f0a0a48146ad7afb0333a24641feaa04099756;hb=HEAD;hp=59a3e6b80357d09ff98bfe5a5fa5d98641412033;hpb=db88e8be755e4a4c17fcd65eec98ca420eff91a4;p=sfa.git

diff --git a/sfa/server/aggregate.py b/sfa/server/aggregate.py
index 59a3e6b8..a8f0a0a4 100644
--- a/sfa/server/aggregate.py
+++ b/sfa/server/aggregate.py
@@ -1,8 +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, Interface
-from sfa.util.config import Config     
+from sfa.util.config import Config
+
+# this truly is a server-side object
+
 
 class Aggregate(SfaServer):
 
@@ -12,20 +14,23 @@ 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, conf_file = "/etc/sfa/aggregates.xml"):
+
+    def __init__(self, conf_file="/etc/sfa/aggregates.xml"):
         Interfaces.__init__(self, conf_file)
-        sfa_config = Config() 
+        sfa_config = Config()
         # set up a connection to the local aggregate
         if sfa_config.SFA_AGGREGATE_ENABLED:
             addr = sfa_config.SFA_AGGREGATE_HOST