use xmlrpcprotocol instead of geniclient

diff --git a/sfa/server/aggregate.py b/sfa/server/aggregate.py
index 89849c3..5a7034b 100644 (file)
--- a/sfa/server/aggregate.py
+++ b/sfa/server/aggregate.py
@@ -9,9 +9,10 @@ import xmlrpclib
 from types import StringTypes, ListType
 
 from sfa.util.geniserver import GeniServer
-from sfa.util.geniclient import GeniClient
 from sfa.util.storage import *
 from sfa.util.faults import *
+import sfa.util.xmlrpcprotocol as xmlrpcprotocol
+import sfa.util.soapprotocol as soapprotocol
 
 # GeniLight client support is optional
 try:
@@ -100,7 +101,7 @@ class Aggregates(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
@@ -109,6 +110,6 @@ class Aggregates(dict):
         url = 'http://%(address)s:%(port)s' % locals()
         local_aggregate = {'hrn': self.api.hrn, 'addr': address, 'port': port}
         self.interfaces.append(local_aggregate) 
-        self[self.api.hrn] = GeniClient(url, self.api.key_file, self.api.cert_file)
+        self[self.api.hrn] = xmlrpcprotocol.get_server(url, self.api.key_file, self.api.cert_file)
 
 

diff --git a/sfa/server/registry.py b/sfa/server/registry.py
index 7e8e3b2..1b82b52 100644 (file)
--- 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 *
@@ -109,7 +110,7 @@ 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
@@ -118,5 +119,5 @@ class Registries(dict):
         url = 'http://%(address)s:%(port)s' % locals()
         local_registry = {'hrn': self.api.hrn, 'addr': address, 'port': port}
         self.interfaces.append(local_registry)
-        self[self.api.hrn] = GeniClient(url, self.api.key_file, self.api.cert_file)            
+        self[self.api.hrn] = xmlrpcprotocol.get_server(url, self.api.key_file, self.api.cert_file)