From 1f629174b4ee2bc9e6aba453719ba5f450cea5ee Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 29 Jul 2011 10:34:55 +0530 Subject: Fixed bug while resolving server ip address. Fixed KeyError bug in NetworkUtils.py at line number 316 --- .../src/NetworkUtils.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/com.gluster.storage.management.server.scripts/src/NetworkUtils.py b/src/com.gluster.storage.management.server.scripts/src/NetworkUtils.py index 1463ed72..4ac20f0b 100755 --- a/src/com.gluster.storage.management.server.scripts/src/NetworkUtils.py +++ b/src/com.gluster.storage.management.server.scripts/src/NetworkUtils.py @@ -312,9 +312,18 @@ def getNetDeviceList(root=""): netDevice["link"] = getLinkStatus(deviceName) netDevice["mode"] = getBondMode(deviceName, root + Globals.MODPROBE_CONF_FILE) deviceDetail = getNetDeviceDetail(deviceName) - netDevice["model"] = deviceDetail['Model'] - netDevice["ipaddr"] = deviceDetail['Ip'] - netDevice["netmask"] = deviceDetail['Mask'] + if deviceDetail.has_key('Model'): + netDevice["model"] = deviceDetail['Model'] + else: + netDevice["model"] = None + if deviceDetail.has_key('Ip'): + netDevice["ipaddr"] = deviceDetail['Ip'] + else: + netDevice["ipaddr"] = None + if deviceDetail.has_key('Mask'): + netDevice["netmask"] = deviceDetail['Mask'] + else: + netDevice["netmask"] = None netDevice["speed"] = getNetSpeed(deviceName) try: netDevice["hwaddr"] = open("/sys/class/net/%s/address" % deviceName).read().strip() -- cgit