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
add scrappy statistics gathering scripts
[monitor.git]
/
nodeconfig.py
diff --git
a/nodeconfig.py
b/nodeconfig.py
index
401ff83
..
bb66176
100755
(executable)
--- a/
nodeconfig.py
+++ b/
nodeconfig.py
@@
-7,9
+7,7
@@
api = plc.getAuthAPI()
from monitor import parser as parsermodule
from sets import Set
from monitor import parser as parsermodule
from sets import Set
-from monitor.common import *
-from monitor import database
-from monitor.database import FindbadNodeRecord
+from monitor.database.info.model import FindbadNodeRecord
def network_config_to_str(net):
def network_config_to_str(net):
@@
-41,13
+39,14
@@
def main():
try:
n = api.GetNodes(node)[0]
#print n
try:
n = api.GetNodes(node)[0]
#print n
- net = api.Get
NodeNetworks(n['nodenetwork
_ids'])[0]
+ net = api.Get
Interfaces(n['interface
_ids'])[0]
#print net
node_keys = ['boot_state', 'key', 'last_updated', 'last_contact']
for k in node_keys:
if 'last' in k:
#print net
node_keys = ['boot_state', 'key', 'last_updated', 'last_contact']
for k in node_keys:
if 'last' in k:
- print "%15s == %s" % (k, diff_time(n[k]))
+ #print "%15s == %s" % (k, diff_time(n[k]))
+ print "%15s == %s" % (k, n[k])
else:
print "%15s == %s" % (k, n[k])
else:
print "%15s == %s" % (k, n[k])
@@
-56,7
+55,9
@@
def main():
#for k in net.keys():
# print k, "==" , net[k]
except:
#for k in net.keys():
# print k, "==" , net[k]
except:
+ #from monitor.common import email_exception
print "Error with %s" % node
print "Error with %s" % node
+ #email_exception()
import traceback; print traceback.print_exc()
pass
import traceback; print traceback.print_exc()
pass