From: Thierry Parmentelat Date: Fri, 11 Mar 2011 11:18:34 +0000 (+0100) Subject: cosmetic X-Git-Tag: sfa-1.0-19~3 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5cf0c1c8c08621a2c5bf7f78c781baa2af8a05d1;hp=e2a321317b760f56f4169fd5a4aa82c08342bfc4;p=sfa.git cosmetic --- diff --git a/sfa/server/aggregate.py b/sfa/server/aggregate.py index f4f380ce..dc1a61cf 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.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,7 +24,8 @@ 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 + # 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() diff --git a/sfa/server/interface.py b/sfa/server/interface.py index e923057f..32f10150 100644 --- a/sfa/server/interface.py +++ b/sfa/server/interface.py @@ -1,7 +1,3 @@ -# -### $Id: interface.py 17583 2010-04-06 15:01:08Z tmack $ -### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/server/interface.py $ -# from sfa.util.faults import * from sfa.util.storage import *