X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Fregistry.py;h=edf071172c1694968ab2f74207458b6cca6c44c3;hb=713d58df0baa1f9739eec9bfa30ceb41d7149e23;hp=13a75fc72b860f888f29fb2881b20c984db0db66;hpb=2cf6d0e7089437ec8ad8e5fdfac26760e0c7a331;p=sfa.git diff --git a/sfa/server/registry.py b/sfa/server/registry.py index 13a75fc7..edf07117 100644 --- a/sfa/server/registry.py +++ b/sfa/server/registry.py @@ -3,12 +3,14 @@ # from sfa.server.sfaserver import SfaServer from sfa.server.interface import Interfaces, Interface -from sfa.util.config import Config +from sfa.util.config import Config # # Registry is a SfaServer that serves registry and slice operations at PLC. # this truly is a server-side object # + + class Registry(SfaServer): ## # Create a new registry object. @@ -17,11 +19,11 @@ class Registry(SfaServer): # @param port the port to listen on # @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,'registry') - sfa_config=Config() - if Config().SFA_REGISTRY_ENABLED: + SfaServer.__init__(self, ip, port, key_file, cert_file, 'registry') + sfa_config = Config() + if Config().SFA_REGISTRY_ENABLED: from sfa.storage.alchemy import engine from sfa.storage.dbschema import DBSchema DBSchema().init_or_upgrade() @@ -30,13 +32,15 @@ class Registry(SfaServer): # Registries is a dictionary of registry connections keyed on the registry hrn # as such it's more of a client-side thing for registry servers to reach their peers # + + class Registries(Interfaces): - + default_dict = {'registries': {'registry': [Interfaces.default_fields]}} - def __init__(self, conf_file = "/etc/sfa/registries.xml"): - Interfaces.__init__(self, conf_file) - sfa_config = Config() + def __init__(self, conf_file="/etc/sfa/registries.xml"): + Interfaces.__init__(self, conf_file) + sfa_config = Config() if sfa_config.SFA_REGISTRY_ENABLED: addr = sfa_config.SFA_REGISTRY_HOST port = sfa_config.SFA_REGISTRY_PORT