Cleanup and bug fixes in NetworkUtils.py, get_server_details.py

2 files changed, 8 insertions, 6 deletions

diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/NetworkUtils.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/NetworkUtils.py
index 5bc6f1f9..2b28a00c 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/NetworkUtils.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/NetworkUtils.py
@@ -102,8 +102,9 @@ def getNetDeviceList(root=""):
                 if line.find("inet addr:") != -1:
                     tokens = line.split("inet addr:")[1].split()
                     netDevice["ipaddr"] = tokens[0]
+                    if line.find("Mask:") != -1:
+                        netDevice["netmask"] = line.split("Mask:")[1].split()[0]
                     #print tokens[1].split(":")[1]
-                    netDevice["netmask"] = tokens[2].split(":")[1]
 
         rv = Utils.runCommand("ethtool %s" % deviceName, output=True, root=True)
         if rv["Status"] == 0:
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py
index 498fdcfd..f446b99f 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py
@@ -17,7 +17,7 @@ import Utils
 import Protocol
 import DiskUtils
 import NetworkUtils
-rom XmlHandler import ResponseXml
+from XmlHandler import ResponseXml
 from optparse import OptionParser
 
 
@@ -29,7 +29,6 @@ def getDiskDom():
     diskDom = Protocol.XDOM()
     disksTag = diskDom.createTag("disks", None)
     diskTagDict = {}
-    raidDisksTag = diskDom.createTag("raidDisks", None)
     for raidDiskName, raidDisk in procMdstat.iteritems():
         raidDiskTag = diskDom.createTag("disk", None)
         raidDiskTag.appendChild(diskDom.createTag("name", raidDiskName))
@@ -46,7 +45,9 @@ def getDiskDom():
         raidDiskTag.appendChild(diskDom.createTag("fsVersion"))
         raidDiskTag.appendChild(diskDom.createTag("size", diskInfo[raidDiskName]['Size'] / 1024.0))
         raidDiskTag.appendChild(diskDom.createTag("spaceInUse", diskInfo[raidDiskName]['SpaceInUse']))
-        raidDisksTag.appendChild(raidDiskTag)
+        raidDisksTag = diskDom.createTag("raidDisks", None)  # raid members tag
+        raidDiskTag.appendChild(raidDisksTag)
+        disksTag.appendChild(raidDiskTag)
         for raidMember in raidDisk['Member']:
             # Case1: Raid array member is a disk. The following code will add the disk details under a disk tag
             if diskInfo.has_key(raidMember):
@@ -71,7 +72,7 @@ def getDiskDom():
                 diskTag.appendChild(diskDom.createTag("fsVersion", diskInfo[raidMember]["FsVersion"]))
                 diskTag.appendChild(diskDom.createTag("size", diskInfo[raidMember]["Size"] / 1024.0))
                 diskTag.appendChild(diskDom.createTag("spaceInUse", diskInfo[raidMember]["SpaceInUse"]))
-                raidDiskTag.appendChild(diskTag)
+                raidDisksTag.appendChild(diskTag)
                 del diskInfo[raidMember]
                 continue
             # Case2: Raid array member is a partition. The following code will add the partition and its corresponding disk its belong to.
@@ -93,7 +94,7 @@ def getDiskDom():
                     diskTag.appendChild(diskDom.createTag("spaceInUse", item["SpaceInUse"]))
                     partitionsTag = diskDom.createTag("partitions", None)
                     diskTag.appendChild(partitionsTag)
-                    raidDiskTag.appendChild(diskTag)
+                    raidDisksTag.appendChild(diskTag)
                     # Constructed disk tag will be added to the dictonary.
                     # This will be used to keep add all the corresponding partitions tags of the disk to the disk tag.
                     diskTagDict[disk] = {'diskTag': diskTag, 'partitionsTag': partitionsTag}