git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge Master in geni-v3 conflict resolution
[sfa.git]
/
sfa
/
federica
/
fdshell.py
diff --git
a/sfa/federica/fdshell.py
b/sfa/federica/fdshell.py
index
7195b56
..
42ec030
100644
(file)
--- a/
sfa/federica/fdshell.py
+++ b/
sfa/federica/fdshell.py
@@
-18,27
+18,23
@@
class FdShell:
]
def __init__ ( self, config ) :
]
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)
# xxx turn on verbosity
self.proxy = xmlrpclib.Server(url, verbose = True)
# xxx not sure if java xmlrpc has support for None
# self.proxy = xmlrpclib.Server(url, verbose = False, allow_none = True)
# xxx turn on verbosity
self.proxy = xmlrpclib.Server(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)
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'
logger.info("Issuing %s args=%s kwds=%s to federica"%\
(name,args,kwds))
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
logger.debug('FdShell %s (%s) returned ... '%(name,name))
return result
return func