add pcu_name to pcufailed_notice

[monitor.git] / nodegroups.py

diff --git a/nodegroups.py b/nodegroups.py
index 9e14e2f..999902f 100755 (executable)
--- a/nodegroups.py
+++ b/nodegroups.py
@@ -14,7 +14,7 @@
 #  * 
 
 from monitor import database
 #  * 
 
 from monitor import database

-from monitor.database import FindbadNodeRecord
+from monitor.database.info.model import FindbadNodeRecord

 from monitor import util
 from monitor.wrapper import plc
 from monitor import parser as parsermodule
 from monitor import util
 from monitor.wrapper import plc
 from monitor import parser as parsermodule


@@ -22,7 +22,7 @@ from monitor import parser as parsermodule
 api = plc.getAuthAPI()
 
 from nodequery import verify,query_to_dict,node_select
 api = plc.getAuthAPI()
 
 from nodequery import verify,query_to_dict,node_select

-from nodecommon import *
+from monitor.common import *

 from sets import Set
 
 def main():
 from sets import Set
 
 def main():


@@ -59,16 +59,15 @@ def main():
                # given to GetNodes
                nodelist = []
                for h in hostlist:
                # 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.GetNodes(site['node_ids'])
+                       nodelist = plccache.GetNodesByIds(site['node_ids'])

                else:
                        nodelist = []
 
                else:
                        nodelist = []
 


@@ -76,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.GetNodes(ng[0]['node_ids'])
+               nodelist = plccache.GetNodesByIds(ng[0]['node_ids'])

 
                group_str = config.nodegroup
 
 
                group_str = config.nodegroup
 


@@ -91,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 ]


@@ -121,7 +120,7 @@ def main():
                i = 1
                for node in nodelist:
                        print "%-2d" % i, 
                i = 1
                for node in nodelist:
                        print "%-2d" % i, 

-                       fbrec = FindbadNodeRecord.query.filter(FindbadNodeRecord.hostname==node['hostname']).order_by(FindbadNodeRecord.date_checked.desc()).first()
+                       fbrec = FindbadNodeRecord.get_latest_by(hostname=node['hostname'])

                        fbdata = fbrec.to_dict()
                        print nodegroup_display(node, fbdata, config)
                        i += 1
                        fbdata = fbrec.to_dict()
                        print nodegroup_display(node, fbdata, config)
                        i += 1