Merge pull request #288 from TimothyAsir/master

Fixed bugs in NetworkUtils.py and get_server_details.py where some variables were not initialized before use.

3 files changed, 10 insertions, 2 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 2b28a00c..ff73af6f 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
@@ -88,9 +88,11 @@ def getNetDeviceList(root=""):
         netDevice["nmcontrolled"] = None
         netDevice["link"] = None
         netDevice["mode"] = None
-
+        netDevice["speed"] = None
         netDevice["device"] = deviceName
         netDevice["description"] = deviceName
+        netDevice["ipaddr"] = None
+        netDevice["netmask"] = None
         netDevice["hwaddr"] = Utils.readFile("/sys/class/net/%s/address" % deviceName).strip()
 
         rv = Utils.runCommand("ifconfig %s" % deviceName, output=True)
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 853b5887..b3181111 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
@@ -28,6 +28,7 @@ def getDiskDom():
     diskDom = XmlHandler.XDOM()
     disksTag = diskDom.createTag("disks", None)
     diskTagDict = {}
+    raidDisksTag = diskDom.createTag("raidDisks", None)  # raid members tag
     for raidDiskName, raidDisk in procMdstat.iteritems():
         raidDiskTag = diskDom.createTag("disk", None)
         raidDiskTag.appendChild(diskDom.createTag("name", raidDiskName))
@@ -44,7 +45,6 @@ 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 = diskDom.createTag("raidDisks", None)  # raid members tag
         raidDiskTag.appendChild(raidDisksTag)
         disksTag.appendChild(raidDiskTag)
         for raidMember in raidDisk['Member']:
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/update-rrd.sh b/src/com.gluster.storage.management.gateway.scripts/src/backend/update-rrd.sh
new file mode 100755
index 00000000..b081d6db
--- /dev/null
+++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/update-rrd.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+/usr/bin/rrd_cpu.pl &
+/usr/bin/rrd_mem.pl &
+/usr/bin/rrd_net.pl &
+wait