X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Faggregate.py;h=1a96e157f41ff57fd48387f0a131c9b94dfe59c6;hb=7841ee3ce022c84fcf9a8ea17ce12d52e36b3aaa;hp=3dee18498e08573d44766ec8faad9e17379ce8a6;hpb=99e9f96209b9ebfd1853e7b8902a1a0fe893eaa2;p=sfa.git

diff --git a/sfa/server/aggregate.py b/sfa/server/aggregate.py
index 3dee1849..1a96e157 100644
--- a/sfa/server/aggregate.py
+++ b/sfa/server/aggregate.py
@@ -1,14 +1,7 @@
-### $Id$
-### $URL$
-
-
 from sfa.util.faults import *
 from sfa.util.server import SfaServer
-from sfa.util.namespace import hrn_to_urn
+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):
 
@@ -31,16 +24,17 @@ class Aggregates(Interfaces):
  
     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,
-                           'urn': hrn_to_urn(self.api.hrn, 'authority'),
-                           'addr': address,
-                           'port': port,
-                           'url': url}
-        self.interfaces[self.api.hrn] = local_aggregate
+        # set up a connection to the local aggregate
+        if self.api.config.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())