From e48f94fcd37387275cb63891fb9440e988d86a8a Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 22 Oct 2010 10:36:01 +0200 Subject: [PATCH] cosmetic --- sfa/client/sfi.py | 8 +++++--- sfa/util/xmlrpcprotocol.py | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py index ceb790a4..81902035 100755 --- a/sfa/client/sfi.py +++ b/sfa/client/sfi.py @@ -375,6 +375,7 @@ class Sfi: gid = GID(filename=file) return gid + # xxx opts unused def get_gid(self, opts, args): """ Get the specify gid and save it to file @@ -498,6 +499,7 @@ class Sfi: return key_string + # xxx opts undefined def get_component_server_from_hrn(self, hrn): # direct connection to the nodes component manager interface user_cred = self.get_user_cred().save_to_string(save_parents=True) @@ -507,12 +509,11 @@ class Sfi: self.logger.warning("No such component:%r"% opts.component) record = records[0] - return self.get_server(record['hostname'], CM_PORT, self.key_file, \ - self.cert_file, self.options) + return self.get_server(record['hostname'], CM_PORT, self.key_file, self.cert_file) def get_server(self, host, port, keyfile, certfile): """ - Return an instnace of an xmlrpc server connection + Return an instance of an xmlrpc server connection """ # port is appended onto the domain, before the path. Should look like: # http://domain:port/path @@ -521,6 +522,7 @@ class Sfi: url = "http://%s" % "/".join(host_parts) return xmlrpcprotocol.get_server(url, keyfile, certfile, self.options) + # xxx opts could be retrieved in self.options def get_server_from_opts(self, opts): """ Return instance of an xmlrpc connection to a slice manager, aggregate diff --git a/sfa/util/xmlrpcprotocol.py b/sfa/util/xmlrpcprotocol.py index 43c957af..6c9918b9 100644 --- a/sfa/util/xmlrpcprotocol.py +++ b/sfa/util/xmlrpcprotocol.py @@ -49,14 +49,14 @@ class XMLRPCTransport(xmlrpclib.Transport): class XMLRPCServerProxy(xmlrpclib.ServerProxy): def __init__(self, url, transport, allow_none=True, options=None): - self.options = options verbose = False - if self.options and self.options.debug: + if options and options.debug: verbose = True + sfa_logger().info ("Connecting to xmlrpcserver at %s (with verbose=%s)"%(url,verbose)) xmlrpclib.ServerProxy.__init__(self, url, transport, allow_none=allow_none, verbose=verbose) def __getattr__(self, attr): - sfa_logger().debug("Calling xml-rpc method:%s"%attr) + sfa_logger().info ("Calling xml-rpc method:%s"%attr) return xmlrpclib.ServerProxy.__getattr__(self, attr) -- 2.47.0