merge from:

[monitor.git] / nodecommon.py

diff --git a/nodecommon.py b/nodecommon.py
index f318949..334bc3e 100644 (file)
--- a/nodecommon.py
+++ b/nodecommon.py
@@ -1,12 +1,15 @@
 
-import struct
-import reboot
 import time
+import struct
+from monitor.pcu import reboot
+
 from monitor import util
-import plc
-from datetime import datetime 
 from monitor import database
+from monitor.wrapper import plc
+
+from datetime import datetime 
 from unified_model import PersistFlags
+
 esc = struct.pack('i', 27)
 RED    = esc + "[1;31m"
 GREEN  = esc + "[1;32m"
@@ -109,6 +112,16 @@ def diff_time(timestamp, abstime=True):
                t_str = "%s mnths ago" % int(t)
        return t_str
 
+def getvalue(fb, path):
+    indexes = path.split("/")
+    values = fb
+    for index in indexes:
+        if index in values:
+            values = values[index]
+        else:
+            return None
+    return values
+
 def nodegroup_display(node, fb, conf=None):
        if node['hostname'] in fb['nodes']:
                node['current'] = get_current_state(fb['nodes'][node['hostname']]['values'])