X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Fcomponent.py;h=9baa6c22eca969caa1a819ea8948294f1b13dd97;hb=68bc84ae53c3f5a319c78f48191205ae24694de7;hp=ab76961dfeac82a7df812a1265f6db66ff67914d;hpb=5614016f9bbcf3bb597fcede399f3ad987c3bf18;p=sfa.git diff --git a/sfa/server/component.py b/sfa/server/component.py index ab76961d..9baa6c22 100644 --- a/sfa/server/component.py +++ b/sfa/server/component.py @@ -1,17 +1,12 @@ # -# Component is a GeniServer that implements the Component interface +# Component is a SfaServer that implements the Component interface # -### $Id: -### $URL: -# - import tempfile import os import time import sys -from sfa.util.geniserver import GeniServer -from sfacomponent.plc.api import ComponentAPI +from sfa.server.sfaserver import SfaServer # GeniLight client support is optional try: @@ -20,9 +15,9 @@ except ImportError: GeniClientLight = None ## -# Component is a GeniServer that serves component operations. +# Component is a SfaServer that serves component operations. -class Component(GeniServer): +class Component(SfaServer): ## # Create a new registry object. # @@ -32,7 +27,4 @@ class Component(GeniServer): # @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) - # re-initialize the servers api as Component api - self.server.api = ComponentAPI(interface='component', key_file=key_file, cert_file=cert_file) - self.server.interface = 'component' + SfaServer.__init__(self, ip, port, key_file, cert_file, interface='component')