X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Finterface.py;h=2f4614618d9810918321438302b483f01a8f2067;hb=02a4a59a4a49183ec8c631cc03243b97f4602d50;hp=94302ecf446e4954d5e0a335e7cc0505a501ebbd;hpb=60aa3b05ea153607d916a3a754193c4b486765bc;p=sfa.git

diff --git a/sfa/server/interface.py b/sfa/server/interface.py
index 94302ecf..2f461461 100644
--- a/sfa/server/interface.py
+++ b/sfa/server/interface.py
@@ -1,5 +1,4 @@
-#from sfa.util.faults import *
-import sfa.util.xmlrpcprotocol as xmlrpcprotocol
+from sfa.client.sfaserverproxy import SfaServerProxy
 from sfa.util.xml import XML
 
 # GeniLight client support is optional
@@ -25,13 +24,13 @@ class Interface:
         url =  "http://%s" %  "/".join(address_parts)
         return url
 
-    def get_server(self, key_file, cert_file, timeout=30):
+    def server_proxy(self, key_file, cert_file, timeout=30):
         server = None 
         if  self.client_type ==  'geniclientlight' and GeniClientLight:
             # xxx url and self.api are undefined
             server = GeniClientLight(url, self.api.key_file, self.api.cert_file)
         else:
-            server = xmlrpcprotocol.get_server(self.get_url(), key_file, cert_file, timeout) 
+            server = SfaServerProxy(self.get_url(), key_file, cert_file, timeout) 
  
         return server       
 ##
@@ -72,5 +71,5 @@ class Interfaces(dict):
                         interface = Interface(hrn, address, port)
                         self[hrn] = interface   
 
-    def get_server(self, hrn, key_file, cert_file, timeout=30):
-        return self[hrn].get_server(key_file, cert_file, timeout)
+    def server_proxy(self, hrn, key_file, cert_file, timeout=30):
+        return self[hrn].server_proxy(key_file, cert_file, timeout)