X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Fregistry.py;h=b55f9acdb532f454a6564c544e5ed4aefd74b0f7;hb=00018e8f437f02c99e438f17c57aafc038052171;hp=fe845a36d1275ed23baf75c4a8d1567b49e1d552;hpb=a323a499969331a6ecda06b8b2d23b3d8f07b223;p=sfa.git

diff --git a/sfa/server/registry.py b/sfa/server/registry.py
index fe845a36..b55f9acd 100644
--- a/sfa/server/registry.py
+++ b/sfa/server/registry.py
@@ -1,16 +1,11 @@
 #
 # Registry is a SfaServer that implements the Registry interface
 #
-### $Id$
-### $URL$
-#
-
-from sfa.util.server import SfaServer
+from sfa.server.sfaserver import SfaServer
 from sfa.util.faults import *
-from sfa.server.interface import Interfaces
-import sfa.util.xmlrpcprotocol as xmlrpcprotocol
-import sfa.util.soapprotocol as soapprotocol
- 
+from sfa.util.xrn import hrn_to_urn
+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.
@@ -24,9 +19,7 @@ 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' 
-
+        SfaServer.__init__(self, ip, port, key_file, cert_file,'registry')
 
 ##
 # Registries is a dictionary of registry connections keyed on the registry
@@ -34,22 +27,14 @@ class Registry(SfaServer):
 
 class Registries(Interfaces):
     
-    default_dict = {'registries': {'registry': [default_fields]}}
-
-    def __init__(self, api, conf_file = "/etc/sfa/registries.xml"):
-        Interfaces.__init__(self, conf_file, 'sa') 
-
-    def get_connections(self, interfaces):
-        """
-        read connection details for the trusted peer registries from file return 
-        a dictionary of connections keyed on interface hrn. 
-        """
-        connections = Interfaces.get_connections(self, interfaces)
-
-        # set up a connection to the local registry
-        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, 'addr': address, 'port': port}
-        connections[self.api.hrn] = xmlrpcprotocol.get_server(url, self.api.key_file, self.api.cert_file)            
-        return connections 
+    default_dict = {'registries': {'registry': [Interfaces.default_fields]}}
+
+    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