Add boot id to “gnt-node list”.

Reviewed-by: iustinp

diff --git a/lib/backend.py b/lib/backend.py
index 396b59d..068f964 100644 (file)
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -170,6 +170,12 @@ def GetNodeInfo(vgname):
   if hyp_info is not None:
     outputarray.update(hyp_info)
 
+  f = open("/proc/sys/kernel/random/boot_id", 'r')
+  try:
+    outputarray["bootid"] = f.read(128).rstrip("\n")
+  finally:
+    f.close()
+
   return outputarray
 
 

diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index cf84943..dff9f73 100644 (file)
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -1198,7 +1198,8 @@ class LUQueryNodes(NoHooksLU):
 
     """
     self.dynamic_fields = frozenset(["dtotal", "dfree",
-                                     "mtotal", "mnode", "mfree"])
+                                     "mtotal", "mnode", "mfree",
+                                     "bootid"])
 
     _CheckOutputFields(static=["name", "pinst_cnt", "sinst_cnt",
                                "pinst_list", "sinst_list",
@@ -1229,6 +1230,7 @@ class LUQueryNodes(NoHooksLU):
             "mfree": utils.TryConvert(int, nodeinfo['memory_free']),
             "dtotal": utils.TryConvert(int, nodeinfo['vg_size']),
             "dfree": utils.TryConvert(int, nodeinfo['vg_free']),
+            "bootid": nodeinfo['bootid'],
             }
         else:
           live_data[name] = {}

diff --git a/scripts/gnt-node b/scripts/gnt-node
index e32d456..a22c2d8 100755 (executable)
--- a/scripts/gnt-node
+++ b/scripts/gnt-node
@@ -58,7 +58,8 @@ def ListNodes(opts, args):
                "pinst_list": "PriInstances", "sinst_list": "SecInstances",
                "pip": "PrimaryIP", "sip": "SecondaryIP",
                "dtotal": "DTotal", "dfree": "DFree",
-               "mtotal": "MTotal", "mnode": "MNode", "mfree": "MFree"}
+               "mtotal": "MTotal", "mnode": "MNode", "mfree": "MFree",
+               "bootid": "BootID"}
   else:
     headers = None