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
svn merge -r 12308:13112 https://svn.planet-lab.org/svn/Monitor/branches/2.0/
[monitor.git]
/
nodeconfig.py
diff --git
a/nodeconfig.py
b/nodeconfig.py
index
2327ec0
..
788d7f8
100755
(executable)
--- a/
nodeconfig.py
+++ b/
nodeconfig.py
@@
-1,14
+1,14
@@
#!/usr/bin/python
#!/usr/bin/python
-import plc
+
from monitor.wrapper
import plc
api = plc.getAuthAPI()
api = plc.getAuthAPI()
-import parser as parsermodule
+
from monitor
import parser as parsermodule
from sets import Set
from sets import Set
-from
node
common import *
-import database
+from
monitor.
common import *
+from monitor.database.info.model import FindbadNodeRecord
def network_config_to_str(net):
def network_config_to_str(net):
@@
-21,7
+21,6
@@
def network_config_to_str(net):
def main():
def main():
- fb = database.dbLoad("findbad")
parser = parsermodule.getParser()
parser.set_defaults(nodelist=None,
parser = parsermodule.getParser()
parser.set_defaults(nodelist=None,
@@
-67,7
+66,8
@@
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)
+ fbdata = FindbadNodeRecord.get_latest_by(hostname=node['hostname'])
+ print nodegroup_display(node, fbdata.to_dict())
i += 1
elif config.add and config.nodegroup:
i += 1
elif config.add and config.nodegroup: