X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodecommon.py;h=cbbc2c43cb8f8e63f8815fb99888f2dd7a113af0;hb=1fe8e24fa4180892d0dd6aa30135ce9f137dec03;hp=cef1247951494f7514fcdb69068f40b4c0128a98;hpb=944d143a6528c4157b71f51ed480aec806cbaa06;p=monitor.git

diff --git a/nodecommon.py b/nodecommon.py
index cef1247..cbbc2c4 100644
--- a/nodecommon.py
+++ b/nodecommon.py
@@ -2,6 +2,9 @@
 import struct
 import reboot
 import time
+import util.file
+import plc
+from datetime import datetime 
 from monitor import database
 from unified_model import PersistFlags
 esc = struct.pack('i', 27)
@@ -37,7 +40,6 @@ def get_current_state(fbnode):
 	return l
 
 def color_pcu_state(fbnode):
-	import plc
 
 	if 'plcnode' in fbnode and 'pcu_ids' in fbnode['plcnode'] and len(fbnode['plcnode']['pcu_ids']) > 0 :
 		values = reboot.get_pcu_values(fbnode['plcnode']['pcu_ids'][0])
@@ -107,6 +109,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'])
@@ -131,13 +143,16 @@ def nodegroup_display(node, fb, conf=None):
 	node['pcu'] = fb['nodes'][node['hostname']]['values']['pcu']
 	node['lastupdate'] = diff_time(node['last_contact'])
 	pf = PersistFlags(node['hostname'], 1, db='node_persistflags')
-	node['lc'] = diff_time(pf.last_changed)
+	try:
+		node['lc'] = diff_time(pf.last_changed)
+	except:
+		node['lc'] = "err"
 	ut = fb['nodes'][node['hostname']]['values']['comonstats']['uptime']
 	if ut != "null":
 		ut = diff_time(float(fb['nodes'][node['hostname']]['values']['comonstats']['uptime']), False)
 	node['uptime'] = ut
 
-	return "%(hostname)-42s %(boot_state)8s %(current)5s %(pcu)6s %(key)10.10s... %(kernel)33s %(lastupdate)12s, %(lc)s, %(uptime)s" % node
+	return "%(hostname)-42s %(boot_state)8s %(current)5s %(pcu)6s %(key)10.10s... %(kernel)35.35s %(lastupdate)12s, %(lc)s, %(uptime)s" % node
 
 def datetime_fromstr(str):
 	if '-' in str:
@@ -151,3 +166,35 @@ def datetime_fromstr(str):
 		tup = time.strptime(str, "%m/%d/%Y")
 	ret = datetime.fromtimestamp(time.mktime(tup))
 	return ret
+
+def get_nodeset(config):
+	"""
+		Given the config values passed in, return the set of hostnames that it
+		evaluates to.
+	"""
+	api = plc.getAuthAPI()
+	l_nodes = database.dbLoad("l_plcnodes")
+
+	if config.nodelist:
+		f_nodes = util.file.getListFromFile(config.nodelist)
+		l_nodes = filter(lambda x: x['hostname'] in f_nodes, l_nodes)
+	elif config.node:
+		f_nodes = [config.node]
+		l_nodes = filter(lambda x: x['hostname'] in f_nodes, l_nodes)
+	elif config.nodegroup:
+		ng = api.GetNodeGroups({'name' : config.nodegroup})
+		l_nodes = api.GetNodes(ng[0]['node_ids'], ['hostname'])
+	elif config.site:
+		site = api.GetSites(config.site)
+		l_nodes = api.GetNodes(site[0]['node_ids'], ['hostname'])
+		
+	l_nodes = [node['hostname'] for node in l_nodes]
+
+	# perform this query after the above options, so that the filter above
+	# does not break.
+	if config.nodeselect:
+		fb = database.dbLoad("findbad")
+		l_nodes = node_select(config.nodeselect, fb['nodes'].keys(), fb)
+
+	return l_nodes
+