X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Fregistry.py;h=72d4abb304c6b9cd7020fb274e64002ddbb551df;hb=68bc84ae53c3f5a319c78f48191205ae24694de7;hp=fb4f04344d176a424c6649b39037186dd29f8328;hpb=95aaadd69f701b9cc39e8a8484f9dbd755636ccc;p=sfa.git

diff --git a/sfa/server/registry.py b/sfa/server/registry.py
index fb4f0434..72d4abb3 100644
--- a/sfa/server/registry.py
+++ b/sfa/server/registry.py
@@ -1,20 +1,14 @@
 #
 # Registry is a SfaServer that implements the Registry interface
 #
-### $Id$
-### $URL$
-#
-
-from sfa.util.server import SfaServer
-from sfa.util.faults import *
-from sfa.util.namespace import hrn_to_urn
-from sfa.server.interface import Interfaces
-import sfa.util.xmlrpcprotocol as xmlrpcprotocol
-import sfa.util.soapprotocol as soapprotocol
- 
+from sfa.server.sfaserver import SfaServer
+from sfa.server.interface import Interfaces, Interface
+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.
@@ -25,29 +19,25 @@ class Registry(SfaServer):
     # @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 = 'registry' 
-
-
-##
-# Registries is a dictionary of registry connections keyed on the registry
-# hrn
+        SfaServer.__init__(self, ip, port, key_file, cert_file,'registry')
+        # initialize db schema
+        from sfa.storage.persistentobjs import init_tables
+        init_tables()
 
+#
+# 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, api, conf_file = "/etc/sfa/registries.xml"):
-        Interfaces.__init__(self, api, conf_file) 
-        address = self.api.config.SFA_REGISTRY_HOST
-        port = self.api.config.SFA_REGISTRY_PORT
-        url = 'http://%(address)s:%(port)s' % locals()
-        local_registry = {'hrn': self.api.hrn,
-                           'urn': hrn_to_urn(self.api.hrn, 'authority'),
-                           'addr': address,
-                           'port': port,
-                           'url': url}
-        self.interfaces[self.api.hrn] = local_registry
-       
-        # get connections
-        self.update(self.get_connections()) 
+    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
+            hrn = sfa_config.SFA_INTERFACE_HRN
+            interface = Interface(hrn, addr, port)
+            self[hrn] = interface