Hunt Xu has uploaded a new change for review.

Change subject: vdsm_reg: make the registration process IPv6 capable ......................................................................

vdsm_reg: make the registration process IPv6 capable

Change-Id: I86b805015bdca2805d3da3bf3309fb21f973d795 Signed-off-by: huntxu mhuntxu@gmail.com --- M vds_bootstrap/vds_bootstrap.py M vdsm_reg/deployUtil.py.in M vdsm_reg/vdsm-reg-setup.in 3 files changed, 62 insertions(+), 108 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/43/11743/1

diff --git a/vds_bootstrap/vds_bootstrap.py b/vds_bootstrap/vds_bootstrap.py index c286ae7..cb43d78 100755 --- a/vds_bootstrap/vds_bootstrap.py +++ b/vds_bootstrap/vds_bootstrap.py @@ -748,6 +748,7 @@ try: fReturn = deployUtil.makeBridge( vdcName, + vdcPort, VDSM_DIR, bridgeName=self._bridgeName ) diff --git a/vdsm_reg/deployUtil.py.in b/vdsm_reg/deployUtil.py.in index 7a305d2..191cce6 100644 --- a/vdsm_reg/deployUtil.py.in +++ b/vdsm_reg/deployUtil.py.in @@ -426,63 +426,6 @@ return strReturn

-def _getIfaceByIP(addr): - remote = struct.unpack('I', socket.inet_aton(addr))[0] - for line in file('/proc/net/route').readlines()[1:]: - iface, dest, gateway, flags, refcnt, use, metric, \ - mask, mtu, window, irtt = line.split() - dest = int(dest, 16) - mask = int(mask, 16) - if remote & mask == dest & mask: - return iface - - return None # Should never get here w/ default gw - - -def _getMGTIface(vdcHostName): - strVDCIP = "None" - strReturn = None - strVDCName = vdcHostName - - try: - if vdcHostName != "None": - logging.debug("_getMGTIface: read host name: " + strVDCName) - #Now find the IP. Note that gethostbyname(IP) == IP - strVDCIP = socket.gethostbyname(strVDCName) - except: - strVDCIP = "None" - logging.debug("_getMGTIface: error trying to figure out IP") - - logging.debug("_getMGTIface: using host name " + strVDCName + " strIP= " + - strVDCIP) - - # Find the interface of the management IP - if strVDCIP != "None": - strReturn = _getIfaceByIP(strVDCIP) - - logging.debug("_getMGTIface IP=" + str(strVDCIP) + " strIface=" + - str(strReturn)) - return strReturn - - -def getMGTIP(vdsmDir, vdcHostName): - strReturn = "None" - - try: - netinfo = vdsmImport("netinfo", vdsmDir) - except: - logging.error("getMGTIP: Failed to find vdsm modules!") - return strReturn - - strIface = _getMGTIface(vdcHostName) - - if strIface is not None: - strReturn = netinfo.getaddr(strIface) - - logging.debug("getMGTIP: Host MGT IP=" + strReturn) - return strReturn - - def getRemoteSock(IP, port): """ Return a tcp stream socket connect to ip:port """ try: @@ -496,6 +439,21 @@ logging.error("getRemoteSock: Could not connect to %s port %s.(%s)" % IP, port, e) return None + + +def getMGTIP(vdcHostName, vdcPORT): + strReturn = "None" + + sock = getRemoteSock(vdcHostName, vdcPORT) + if sock is not None: + strReturn = sock.getsockname()[0] + sock.close() + else: + logging.error("getMGTIP: Failed to get Management IP!") + return strReturn + + logging.debug("getMGTIP: Host MGT IP=" + strReturn) + return strReturn

def httpGETRequest(conn, uri): @@ -1008,6 +966,7 @@ fIsBridgeDevice = False lstReturn = [] fileName = IFACE_CONFIG + bridgeName + ipv6addrs = []

try: for line in file(fileName): @@ -1021,6 +980,24 @@ elif line.startswith("TYPE="): t = line.split("=", 1)[1].strip() fIsBridgeDevice = (t == "Bridge") + elif line.startswith("IPV6INIT="): + ipv6 = ''.join(shlex.split(line)).split("=", 1)[1].strip() + lstReturn.append("ipv6=%s" % (str(ipv6) == "yes")) + elif line.startswith("IPV6ADDR="): + addr = ''.join(shlex.split(line)).split("=", 1)[1].strip() + ipv6addrs.append(addr) + elif line.startswith("IPV6ADDR_SECONDARIES="): + addrs = ''.join(shlex.split(line)).split("=", 1)[1].strip() + ipv6addrs += addrs.split(' ') + elif line.startswith("IPV6_DEFAULTGW="): + v6gateway = ''.join(shlex.split(line)).split("=", 1)[1].strip() + lstReturn.append("ipv6gateway=%s" % v6gateway) + elif line.startswith("DHCPV6C="): + dhcpv6 = ''.join(shlex.split(line)).split("=", 1)[1].strip() + lstReturn.append("dhcpv6=%s" % (str(dhcpv6) == "yes")) + elif line.startswith("IPV6"): + # ignore other IPv6 parameters + continue else: try: line = ''.join(shlex.split(line)) @@ -1028,6 +1005,8 @@ logging.warn("_getBridgeParams: failed to read parse line " "%s", line) lstReturn.append(line) + if len(ipv6addrs) > 0: + lstReturn.append("ipv6addrs=%s" % ','.join(ipv6addrs)) except Exception as e: logging.error("_getBridgeParams: failed to read params of file " + fileName + ".\n Error:" + str(e)) @@ -1109,7 +1088,7 @@ os.remove(f)

-def makeBridge(vdcName, vdsmDir, bridgeName=None): +def makeBridge(vdcName, vdcPORT, vdsmDir, bridgeName=None): """ Create (for RHEL) or rename (oVirt default bridge) to @VDSMBRIDGE@ bridge. @@ -1119,7 +1098,7 @@ bridgeName = MGT_BRIDGE_NAME

try: - vdsmImport("netinfo", vdsmDir) + netinfo = vdsmImport("netinfo", vdsmDir) except ImportError: logging.error("makeBridge Failed to find vdsm modules!") return False @@ -1131,11 +1110,17 @@ nic = None fIsOvirt = isOvirt()

+ mgtIface = '' # get current management interface - mgtIface = _getMGTIface(vdcName) - if mgtIface is None: + sock = getRemoteSock(vdcName, vdcPORT) + if sock is not None: + mgtip = sock.getsockname()[0] + sock.close() + mgtIface = netinfo.getIfaceByIP(mgtip) + + if mgtIface == '': fReturn = False - logging.debug("makeBridge got mgtIface None. This is a routing or " + logging.debug("makeBridge got no mgtIface. This is a routing or " "resolution issue.") else: mgtBridge = mgtIface diff --git a/vdsm_reg/vdsm-reg-setup.in b/vdsm_reg/vdsm-reg-setup.in index 7141278..0d766b3 100644 --- a/vdsm_reg/vdsm-reg-setup.in +++ b/vdsm_reg/vdsm-reg-setup.in @@ -13,12 +13,10 @@ import getopt import os import socket -import httplib import time import logging import logging.config import urllib -import ssl from config import config import deployUtil import createDaemon @@ -38,16 +36,21 @@ self.registered = False self.fInitOK = True self.vdcURL = "None" + self.vdcPORT = config.get('vars', 'vdc_host_port') self.vdcName = config.get('vars', 'vdc_host_name') if self.vdcName != "None": - try: self.vdcURL = socket.gethostbyname(self.vdcName) - except: self.vdcURL = "None" + try: + af, socktype, proto, canonname, sockaddr = \ + socket.getaddrinfo(self.vdcName, self.vdcPORT)[0] + self.vdcURL = sockaddr[0] + except: + self.vdcURL = "None" else: self.vdcURL = config.get('vars', 'vdc_host_ip')

self.vdsmDir = config.get('vars', 'vdsm_dir') if self.vdcURL != "None": - self.ovirtURL = deployUtil.getMGTIP(self.vdsmDir, self.vdcName) + self.ovirtURL = deployUtil.getMGTIP(self.vdcName, self.vdcPORT) self.ovirtName = socket.gethostname() self.ovirtUID = deployUtil.getHostID() else: @@ -55,7 +58,6 @@ self.ovirtName = "None" self.ovirtUID = "None"

- self.vdcPORT = config.get('vars', 'vdc_host_port') self.vdcURI = config.get('vars', 'vdc_reg_uri') self.vdcRegPort = config.get('vars', 'vdc_reg_port') self.ticket = ticket @@ -81,7 +83,7 @@ fReturn = True

#Rename existing bridge - fReturn = deployUtil.makeBridge(self.vdcName, self.vdsmDir) + fReturn = deployUtil.makeBridge(self.vdcName, self.vdcPORT, self.vdsmDir) if not fReturn: logging.error("renameBridge Failed to rename existing bridge!")

@@ -126,49 +128,15 @@ logging.warn("WARNING! registering RHEV-H with no UUID and no unique host-name!")

fReturn = True - res = None nTimeout = int(config.get('vars', 'test_socket_timeout')) old_timeout = socket.getdefaulttimeout() - socket.setdefaulttimeout(nTimeout) - sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - - try: - sock.connect((self.vdcURL, int(self.vdcPORT))) - conn = httplib.HTTPSConnection(self.vdcURL + ":" + self.vdcPORT) - conn.sock = ssl.wrap_socket(sock) - conn.request("GET", strFullURI) - res = conn.getresponse() - except: - logging.debug("registerVDS failed in HTTPS. Retrying using HTTP.") - try: - conn = None - conn = httplib.HTTPConnection(self.vdcURL + ":" + self.vdcPORT) - conn.request("GET", strFullURI) - res = conn.getresponse() - logging.debug("registerVDS succeeded using HTTP.") - except: - fReturn = False - logging.error("registerVDS failed using HTTP!", exc_info=True) - + self.VDCTime = deployUtil.getHTTPResource(self.vdcURL, self.vdcPORT, + strFullURI, nTimeout) + if self.VDCTime is not None: + logging.debug("registerVDS time read: %s", self.VDCTime) else: - logging.debug("registerVDS status: %d reason: %s", res.status, - res.reason) - - if res == None or res.status != 200: - if conn != None: conn.close() fReturn = False - - if fReturn: - try: - try: - self.VDCTime = res.read() - logging.debug("registerVDS time read: %s", self.VDCTime) - except: - fReturn = False - logging.error("registerVDS time read failed", - exc_info=True) - finally: - if conn != None: conn.close() + logging.error("registerVDS time read failed", exc_info=True)

socket.setdefaulttimeout(old_timeout) logging.debug("registerVDS end.")

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

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