Hello Bing Bu Cao,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/8597
to review the following change.
Change subject: make vdsm/kaxmlrpclib.py PEP 8 clean
......................................................................
make vdsm/kaxmlrpclib.py PEP 8 clean
Change-Id: I7e8d011a0b74d70e3b6609ed380cef8f5b67ec9c
Signed-off-by: Cao,Bing Bu <[email protected]>
---
M Makefile.am
M vdsm/kaxmlrpclib.py
2 files changed, 21 insertions(+), 10 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/97/8597/1
diff --git a/Makefile.am b/Makefile.am
index 7548f42..5d7fbea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,6 +60,7 @@
vdsm/gluster/hostname.py \
vdsm/guestIF.py \
vdsm/hooks.py \
+ vdsm/kaxmlrpclib.py \
vdsm/libvirtev.py \
vdsm/libvirtvm.py \
vdsm/md_utils.py \
diff --git a/vdsm/kaxmlrpclib.py b/vdsm/kaxmlrpclib.py
index ad53bf4..dffd405 100644
--- a/vdsm/kaxmlrpclib.py
+++ b/vdsm/kaxmlrpclib.py
@@ -32,7 +32,8 @@
needs to set up a connection.
"""
-import xmlrpclib, httplib
+import xmlrpclib
+import httplib
import socket
# It would have been nicer to make these server-specific and not module-wide
@@ -43,6 +44,7 @@
CONNECTTIMEOUT = 160
+
def Server(url, *args, **kwargs):
kwargs['transport'] = TcpkeepTransport()
server = xmlrpclib.Server(url, *args, **kwargs)
@@ -50,13 +52,15 @@
ServerProxy = Server
+
class TcpkeepTransport(xmlrpclib.Transport):
def make_connection(self, host):
- if hasattr(xmlrpclib.Transport, "single_request"): # Python 2.7
+ if hasattr(xmlrpclib.Transport, "single_request"): # Python 2.7
return TcpkeepHTTPConnection(host)
else:
return TcpkeepHTTP(host)
+
class TcpkeepHTTPConnection(httplib.HTTPConnection):
def connect(self):
@@ -79,9 +83,9 @@
print "connect: (%s, %s)" % (self.host, self.port)
oldtimeout = self.sock.gettimeout() # added
- self.sock.settimeout(CONNECTTIMEOUT) # added
+ self.sock.settimeout(CONNECTTIMEOUT) # added
self.sock.connect(sa)
- self.sock.settimeout(oldtimeout) # added
+ self.sock.settimeout(oldtimeout) # added
except socket.error, msg:
if self.debuglevel > 0:
print 'connect fail:', (self.host, self.port)
@@ -92,10 +96,15 @@
break
if not self.sock:
raise socket.error, msg
- self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
# added
- self.sock.setsockopt(socket.SOL_TCP, socket.TCP_KEEPIDLE, KEEPIDLE)
# added
- self.sock.setsockopt(socket.SOL_TCP, socket.TCP_KEEPINTVL, KEEPINTVL)
# added
- self.sock.setsockopt(socket.SOL_TCP, socket.TCP_KEEPCNT, KEEPCNT)
# added
+ self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
+ # added
+ self.sock.setsockopt(socket.SOL_TCP, socket.TCP_KEEPIDLE, KEEPIDLE)
+ # added
+ self.sock.setsockopt(socket.SOL_TCP, socket.TCP_KEEPINTVL, KEEPINTVL)
+ # added
+ self.sock.setsockopt(socket.SOL_TCP, socket.TCP_KEEPCNT, KEEPCNT)
+ # added
+
class TcpkeepHTTP(httplib.HTTP):
_connection_class = TcpkeepHTTPConnection
@@ -105,6 +114,7 @@
from vdsm import SecureXMLRPCServer
import ssl
+
def SslServer(url, ctx, *args, **kwargs):
kwargs['transport'] = TcpkeepSafeTransport(ctx)
server = xmlrpclib.Server(url, *args, **kwargs)
@@ -112,11 +122,12 @@
SslServerProxy = SslServer
+
class TcpkeepSafeTransport(SecureXMLRPCServer.VerifyingSafeTransport):
def make_connection(self, host):
chost, self._extra_headers, x509 = self.get_host_info(host)
- if hasattr(xmlrpclib.SafeTransport, "single_request"): # Python 2.7
+ if hasattr(xmlrpclib.SafeTransport, "single_request"): # Python 2.7
return TcpkeepHTTPSConnection(
chost, None, key_file=self.key_file, strict=None,
timeout=CONNECTTIMEOUT,
@@ -152,4 +163,3 @@
class TcpkeepHTTPS(SecureXMLRPCServer.VerifyingHTTPS):
_connection_class = TcpkeepHTTPSConnection
-
--
To view, visit http://gerrit.ovirt.org/8597
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e8d011a0b74d70e3b6609ed380cef8f5b67ec9c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Zhou Zheng Sheng <[email protected]>
Gerrit-Reviewer: Bing Bu Cao <[email protected]>
_______________________________________________
vdsm-patches mailing list
[email protected]
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
