X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Ffederica%2Ffdshell.py;h=1e7349c53a186110e6a3e2f0fed1f85192ceb797;hb=06768bd605e5d47fadfc90a35c74e30f267226a5;hp=7195b5650e562eb005d15fcef7dc105294d833bf;hpb=2cf6d0e7089437ec8ad8e5fdfac26760e0c7a331;p=sfa.git

diff --git a/sfa/federica/fdshell.py b/sfa/federica/fdshell.py
index 7195b565..1e7349c5 100644
--- a/sfa/federica/fdshell.py
+++ b/sfa/federica/fdshell.py
@@ -1,6 +1,5 @@
-import xmlrpclib
-
 from sfa.util.sfalogging import logger
+from sfa.util.py23 import xmlrpc_client
 
 class FdShell:
     """
@@ -18,27 +17,23 @@ class FdShell:
                     ]
 
     def __init__ ( self, config ) :
-        # xxx to be configurable
-        SFA_FEDERICA_URL = "http://%s:%s@%s:%s/"%\
-            (config.SFA_FEDERICA_USER,config.SFA_FEDERICA_PASSWORD,
-             config.SFA_FEDERICA_HOSTNAME,config.SFA_FEDERICA_PORT)
-        url=SFA_FEDERICA_URL
+        url=config.SFA_FEDERICA_URL
         # xxx not sure if java xmlrpc has support for None
-        # self.proxy = xmlrpclib.Server(url, verbose = False, allow_none = True)
+        # self.proxy = xmlrpc_client.ServerProxy(url, verbose = False, allow_none = True)
         # xxx turn on verbosity
-        self.proxy = xmlrpclib.Server(url, verbose = True)
+        self.proxy = xmlrpc_client.ServerProxy(url, verbose = True)
 
+    # xxx get credentials from the config ?
+    # right now basic auth data goes into the URL
+    # so do *not* add any credential at that point
     def __getattr__(self, name):
         def func(*args, **kwds):
             if name not in FdShell.direct_calls:
-                raise Exception, "Illegal method call %s for FEDERICA driver"%(name)
-            # xxx get credentials from the config ?
-            # right now basic auth data goes into the URL
-            # the API still provides for a first credential arg though
-            credential='xxx-unused-xxx'
+                raise Exception("Illegal method call %s for FEDERICA driver"%(name))
             logger.info("Issuing %s args=%s kwds=%s to federica"%\
                             (name,args,kwds))
-            result=getattr(self.proxy, "AggregateManager.%s"%name)(credential, *args, **kwds)
+#            result=getattr(self.proxy, "AggregateManager.%s"%name)(credential, *args, **kwds)
+            result=getattr(self.proxy, "AggregateManager.%s"%name)(*args, **kwds)
             logger.debug('FdShell %s (%s) returned ... '%(name,name))
             return result
         return func