Hunt Xu has uploaded a new change for review.

Change subject: vdsm_reg: make getRemoteFile IPv6-capable ......................................................................

vdsm_reg: make getRemoteFile IPv6-capable

This patch also tidies the getRemoteFile function's codes, making some of the helper functions reusable.

Change-Id: I50cc10f3d5c5baef343fe2456c775001f712da6c Signed-off-by: huntxu mhuntxu@gmail.com --- M vdsm_reg/deployUtil.py.in 1 file changed, 94 insertions(+), 57 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/42/11742/1

diff --git a/vdsm_reg/deployUtil.py.in b/vdsm_reg/deployUtil.py.in index f2bef9d..7a305d2 100644 --- a/vdsm_reg/deployUtil.py.in +++ b/vdsm_reg/deployUtil.py.in @@ -483,6 +483,97 @@ return strReturn

+def getRemoteSock(IP, port): + """ Return a tcp stream socket connect to ip:port """ + try: + af, socktype, proto, canonname, sockaddr = \ + socket.getaddrinfo(IP, port, 0, + socket.SOCK_STREAM, socket.SOL_TCP)[0] + sock = socket.socket(af, socket.SOCK_STREAM, socket.SOL_TCP) + sock.connect(sockaddr) + return sock + except IOError as e: + logging.error("getRemoteSock: Could not connect to %s port %s.(%s)" % + IP, port, e) + return None + + +def httpGETRequest(conn, uri): + response = None + + # N.B.: for python version < 2.7, http://bugs.python.org/issue5111 + httpHeaders = {} + + try: + if conn.sock.family == socket.AF_INET6: + httpHeaders = {'Host': '[%s]:%d' % conn.sock.getpeername()[:2]} + conn.request("GET", uri, None, httpHeaders) + response = conn.getresponse() + except: + pass + return response + + +def getHTTPResource(IP, port, uri, timeout=None, certPath=None): + data = None + response = None + conn = None + + fOK = True + + try: + nPort = 443 + if port is not None: + nPort = int(port) + + sock = getRemoteSock(IP, nPort) + sock.settimeout(timeout) + conn = httplib.HTTPSConnection(IP, nPort) + conn.sock = getSSLSocket(sock, certPath) + response = httpGETRequest(conn, uri) + except: + logging.debug("Getting %s from %s:%s failed in HTTPS. Retrying using" + " HTTP.", uri, IP, port, exc_info=True) + nPort = 80 + if port is not None: + nPort = int(port) + + try: + conn = httplib.HTTPConnection(IP, nPort) + conn.sock = getRemoteSock(IP, nPort) + response = httpGETRequest(conn, uri) + except: + logging.error("Failed to get %s from %s:%s using http.", uri, + IP, port, exc_info=True) + fOK = False + else: + logging.debug("Getting %s from %s:%s status: %s reason: %s", + uri, IP, port, str(response.status), response.reason) + + if response is None or response.status != 200: + status = "" + if response is not None: + status = str(response.status) + if conn is not None: + conn.close() + fOK = False + logging.error("Failed to GET %s from %s:%s status %s", + uri, IP, port, status) + + if fOK: + try: + try: + data = str(response.read()) + except: + logging.error("Failed to read %s from %s:%s", + uri, IP, port, exc_info=True) + finally: + if conn is not None: + conn.close() + + return data + + def preventDuplicate(bridgeName=None): """ This function checks if the needed bridge (@VDSMBRIDGE@) already exist. @@ -1567,63 +1658,9 @@ def getRemoteFile(IP, port, fileName, timeout=None, certPath=None): logging.debug("getRemoteFile start. IP = %s port = %s fileName = "%s"" % (IP, port, fileName)) - data = None - response = None - conn = None - sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - sock.settimeout(timeout) - fOK = True - - try: - nPort = 443 - if port is not None: - nPort = int(port) - - sock.connect((IP, nPort)) - conn = httplib.HTTPSConnection(IP, nPort) - conn.sock = getSSLSocket(sock, certPath) - conn.request("GET", fileName) - response = conn.getresponse() - except: - logging.debug("%s failed in HTTPS. Retrying using HTTP.", fileName, - exc_info=True) - strPort = ":" - if port is None: - strPort += "80" - else: - strPort += port - - try: - conn = httplib.HTTPConnection(IP + strPort) - conn.request("GET", fileName) - response = conn.getresponse() - except: - logging.error("Failed to fetch %s using http.", fileName, - exc_info=True) - fOK = False - else: - logging.debug("%s status: %s reason: %s", - fileName, str(response.status), response.reason) - - if response is None or response.status != 200: - status = "" - if response is not None: - status = str(response.status) - if conn is not None: - conn.close() - fOK = False - logging.error("Failed to fetch %s status %s", fileName, status) - - if fOK: - try: - try: - data = str(response.read()) - except: - logging.error("Failed to read %s", fileName, exc_info=True) - finally: - if conn is not None: - conn.close() - + data = getHTTPResource(IP, port, fileName, timeout, certPath) + if data is None: + logging.error("getRemoteFile: Failed to get %s." % fileName) logging.debug('getRemoteFile end.') return data

-- To view, visit http://gerrit.ovirt.org/11742 To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange Gerrit-Change-Id: I50cc10f3d5c5baef343fe2456c775001f712da6c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Hunt Xu mhuntxu@gmail.com