X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=sfa%2Fserver%2Faggregate.py;h=9295e3f51477dce5fc3e74b32ccd5e59f8690cae;hp=478a5ac0d98b5584908ebc1bfb58fcb5c4922b18;hb=3d7237fa0b5f2b4a60cb97c7fb3b6aecfd94558a;hpb=7c1cf48e3a60344e3c381d1edac89d81659655f3 diff --git a/sfa/server/aggregate.py b/sfa/server/aggregate.py index 478a5ac0..9295e3f5 100644 --- a/sfa/server/aggregate.py +++ b/sfa/server/aggregate.py @@ -8,7 +8,7 @@ import time import xmlrpclib from types import StringTypes, ListType -from sfa.util.geniserver import GeniServer +from sfa.util.server import SfaServer from sfa.util.storage import * from sfa.util.faults import * import sfa.util.xmlrpcprotocol as xmlrpcprotocol @@ -21,7 +21,7 @@ except ImportError: GeniClientLight = None -class Aggregate(GeniServer): +class Aggregate(SfaServer): ## # Create a new aggregate object. @@ -31,7 +31,7 @@ class Aggregate(GeniServer): # @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): - GeniServer.__init__(self, ip, port, key_file, cert_file) + SfaServer.__init__(self, ip, port, key_file, cert_file) self.server.interface = 'aggregate' ##