X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodecommon.py;h=f318949ccc3e04ebf8b6e1a7d58ceb78dfb4e4e1;hb=bc5910f95a3f037ffdc0e66c4e8dd0a1436847eb;hp=b9027d86b5679aafba15c946520b778fbc3b9ee6;hpb=c3f2afdc81c6711c3825c82e2cd4970671575438;p=monitor.git

diff --git a/nodecommon.py b/nodecommon.py
index b9027d8..f318949 100644
--- a/nodecommon.py
+++ b/nodecommon.py
@@ -1,6 +1,11 @@
 
 import struct
 import reboot
+import time
+from monitor import util
+import plc
+from datetime import datetime 
+from monitor import database
 from unified_model import PersistFlags
 esc = struct.pack('i', 27)
 RED  	= esc + "[1;31m"
@@ -35,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])
@@ -129,42 +133,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
-
-from model import *
-import database
-
-def node_end_record(node):
-	act_all = database.dbLoad("act_all")
-	if node not in act_all:
-		del act_all
-		return False
-
-	if len(act_all[node]) == 0:
-		del act_all
-		return False
-
-	a = Action(node, act_all[node][0])
-	a.delField('rt')
-	a.delField('found_rt_ticket')
-	a.delField('second-mail-at-oneweek')
-	a.delField('second-mail-at-twoweeks')
-	a.delField('first-found')
-	rec = a.get()
-	rec['action'] = ["close_rt"]
-	rec['category'] = "UNKNOWN"
-	rec['stage'] = "monitor-end-record"
-	rec['time'] = time.time() - 7*60*60*24
-	act_all[node].insert(0,rec)
-	database.dbDump("act_all", act_all)
-	del act_all
-	return True
+	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:
@@ -178,3 +156,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
+