convert GetNodeNetworks to GetInterfaces and nodenetwork_ids to interface_ids

[monitor.git] / nodeconfig.py

diff --git a/nodeconfig.py b/nodeconfig.py
index 2327ec0..bb66176 100755 (executable)
--- a/nodeconfig.py
+++ b/nodeconfig.py
@@ -1,14 +1,13 @@
 #!/usr/bin/python
 
 
-import plc
+from monitor.wrapper import plc
 api = plc.getAuthAPI()
 
-import parser as parsermodule
+from monitor import parser as parsermodule
 from sets import Set
 
-from nodecommon import *
-import database
+from monitor.database.info.model import FindbadNodeRecord
 
 def network_config_to_str(net):
 
@@ -21,7 +20,6 @@ def network_config_to_str(net):
        
 
 def main():
-       fb = database.dbLoad("findbad")
 
        parser = parsermodule.getParser()
        parser.set_defaults(nodelist=None,
@@ -41,13 +39,14 @@ def main():
                try:
                        n = api.GetNodes(node)[0]
                        #print n
-                       net = api.GetNodeNetworks(n['nodenetwork_ids'])[0]
+                       net = api.GetInterfaces(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 "%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])
 
@@ -56,7 +55,9 @@ def main():
                        #for k in net.keys():
                        #       print k, "==" , net[k]
                except:
+                       #from monitor.common import email_exception
                        print "Error with %s" % node
+                       #email_exception()
                        import traceback; print traceback.print_exc()
                        pass
 
@@ -67,7 +68,8 @@ def main():
                        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: