git://git.onelab.eu
/
monitor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
run external checks on hosts to determine their boot state.
[monitor.git]
/
nodegroups.py
diff --git
a/nodegroups.py
b/nodegroups.py
index
e96e7b4
..
9e14e2f
100755
(executable)
--- a/
nodegroups.py
+++ b/
nodegroups.py
@@
-13,18
+13,19
@@
# Given a nodelist, it could tag each one with a nodegroup name.
# *
# Given a nodelist, it could tag each one with a nodegroup name.
# *
-import plc
+from monitor import database
+from monitor.database import FindbadNodeRecord
+from monitor import util
+from monitor.wrapper import plc
+from monitor import parser as parsermodule
+
api = plc.getAuthAPI()
api = plc.getAuthAPI()
-import parser as parsermodule
-from sets import Set
from nodequery import verify,query_to_dict,node_select
from nodequery import verify,query_to_dict,node_select
-
from nodecommon import *
from nodecommon import *
-import database
+from sets import Set
def main():
def main():
- fb = database.dbLoad("findbad")
parser = parsermodule.getParser(['nodesets'])
parser.set_defaults( list=True,
parser = parsermodule.getParser(['nodesets'])
parser.set_defaults( list=True,
@@
-52,7
+53,7
@@
def main():
if config.node:
hostlist = [ config.node ]
else:
if config.node:
hostlist = [ config.node ]
else:
- hostlist =
config
.getListFromFile(config.nodelist)
+ hostlist =
util.file
.getListFromFile(config.nodelist)
# NOTE: preserve order given in file. Otherwise, return values are not in order
# given to GetNodes
# NOTE: preserve order given in file. Otherwise, return values are not in order
# given to GetNodes
@@
-120,7
+121,9
@@
def main():
i = 1
for node in nodelist:
print "%-2d" % i,
i = 1
for node in nodelist:
print "%-2d" % i,
- print nodegroup_display(node, fb, config)
+ fbrec = FindbadNodeRecord.query.filter(FindbadNodeRecord.hostname==node['hostname']).order_by(FindbadNodeRecord.date_checked.desc()).first()
+ fbdata = fbrec.to_dict()
+ print nodegroup_display(node, fbdata, config)
i += 1
else:
i += 1
else: