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
convert GetNodeNetworks to GetInterfaces and nodenetwork_ids to interface_ids
[monitor.git]
/
nodegroups.py
diff --git
a/nodegroups.py
b/nodegroups.py
index
e96e7b4
..
999902f
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.info.model 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 *
-import database
+from monitor.common import *
+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,22
+53,21
@@
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
nodelist = []
for h in hostlist:
# NOTE: preserve order given in file. Otherwise, return values are not in order
# given to GetNodes
nodelist = []
for h in hostlist:
- nodelist
+= api.GetNodes(h
)
+ nodelist
.append( plccache.GetNodeByName(h)
)
- #nodelist = api.GetNodes(hostlist)
group_str = "Given"
elif config.site:
group_str = "Given"
elif config.site:
- site =
api.GetSites(config.site
)
+ site =
plccache.GetSitesByName([config.site]
)
if len (site) > 0:
site = site[0]
if len (site) > 0:
site = site[0]
- nodelist =
api.GetNode
s(site['node_ids'])
+ nodelist =
plccache.GetNodesById
s(site['node_ids'])
else:
nodelist = []
else:
nodelist = []
@@
-75,13
+75,13
@@
def main():
elif config.nodeselect:
hostlist = node_select(config.nodeselect)
elif config.nodeselect:
hostlist = node_select(config.nodeselect)
- nodelist =
api.GetNodes(hostlist)
+ nodelist =
[ plccache.GetNodeByName(h) for h in hostlist ]
group_str = "selection"
else:
ng = api.GetNodeGroups({'name' : config.nodegroup})
group_str = "selection"
else:
ng = api.GetNodeGroups({'name' : config.nodegroup})
- nodelist =
api.GetNode
s(ng[0]['node_ids'])
+ nodelist =
plccache.GetNodesById
s(ng[0]['node_ids'])
group_str = config.nodegroup
group_str = config.nodegroup
@@
-90,7
+90,7
@@
def main():
ng_nodes = nodelist
# Get all nodes
ng_nodes = nodelist
# Get all nodes
- all_nodes =
api.GetNodes({'peer_id': None})
+ all_nodes =
plccache.l_nodes
# remove ngnodes from all node list
ng_list = [ x['hostname'] for x in ng_nodes ]
# remove ngnodes from all node list
ng_list = [ x['hostname'] for x in ng_nodes ]
@@
-120,7
+120,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.get_latest_by(hostname=node['hostname'])
+ fbdata = fbrec.to_dict()
+ print nodegroup_display(node, fbdata, config)
i += 1
else:
i += 1
else: