Merge branch 'master' into eucalyptus-devel

[sfa.git] / sfa / server / aggregate.py

diff --git a/sfa/server/aggregate.py b/sfa/server/aggregate.py
index 81d8705..1a96e15 100644 (file)
--- a/sfa/server/aggregate.py
+++ b/sfa/server/aggregate.py
@@ -1,14 +1,7 @@
-### $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):
 
@@ -20,8 +13,7 @@ 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
@@ -32,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())