X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Fregistry.py;h=1b82b52b818878f2dfb6d5b5170893c6369e31b9;hb=ad10d933b09314da37b07efbb4420de12fc2449e;hp=3b209ea80567ed58db0cff9bd8b75a1c322f3ce0;hpb=f13173726f8382eef380f1e754f24dd2b126a77b;p=sfa.git

diff --git a/sfa/server/registry.py b/sfa/server/registry.py
index 3b209ea8..1b82b52b 100644
--- a/sfa/server/registry.py
+++ b/sfa/server/registry.py
@@ -11,11 +11,12 @@ import time
 import sys
 
 from sfa.util.geniserver import GeniServer
-from sfa.util.geniclient import GeniClient
 from sfa.util.genitable import GeniTable
 from sfa.util.faults import *
 from sfa.util.storage import *
-
+import sfa.util.xmlrpcprotocol as xmlrpcprotocol
+import sfa.util.soapprotocol as soapprotocol
+ 
 # GeniLight client support is optional
 try:
     from egeni.geniLight_client import *
@@ -50,7 +51,8 @@ class Registries(dict):
     def __init__(self, api, file = "/etc/sfa/registries.xml"):
         dict.__init__(self, {})
         self.api = api
-    
+        self.interfaces = []
+       
         # create default connection dict
         connection_dict = {}
         for field in self.required_fields:
@@ -93,7 +95,7 @@ class Registries(dict):
                 hrn, address, port = registry['hrn'], registry['addr'], registry['port']
                 if not hrn or not address or not port:
                     continue
-
+                self.interfaces.append(registry)
                 # check which client we should use
                 # geniclient is default
                 client_type = 'geniclient'
@@ -108,12 +110,14 @@ class Registries(dict):
                 if client_type in ['geniclientlight'] and GeniClientLight:
                     self[hrn] = GeniClientLight(url, self.api.key_file, self.api.cert_file) 
                 else:    
-                    self[hrn] = GeniClient(url, self.api.key_file, self.api.cert_file)
+                    self[hrn] = xmlrpcprotocol.get_server(url, self.api.key_file, self.api.cert_file)
 
         # set up a connection to the local registry
         # connect to registry using GeniClient
-        address = self.api.config.GENI_REGISTRY_HOST
-        port = self.api.config.GENI_REGISTRY_PORT
+        address = self.api.config.SFA_REGISTRY_HOST
+        port = self.api.config.SFA_REGISTRY_PORT
         url = 'http://%(address)s:%(port)s' % locals()
-        self[self.api.hrn] = GeniClient(url, self.api.key_file, self.api.cert_file)            
+        local_registry = {'hrn': self.api.hrn, 'addr': address, 'port': port}
+        self.interfaces.append(local_registry)
+        self[self.api.hrn] = xmlrpcprotocol.get_server(url, self.api.key_file, self.api.cert_file)