changes for 3.0

[monitor.git] / nodecommon.py

diff --git a/nodecommon.py b/nodecommon.py
index cbbc2c4..2250492 100644 (file)
--- a/nodecommon.py
+++ b/nodecommon.py
@@ -75,6 +75,7 @@ def color_boot_state(l):
        elif  l == "down": return red(l)
        elif  l == "boot": return green(l)
        elif  l == "rins": return blue(l)
+       elif  l == "reinstall": return blue(l)
        else:
                return l
 
@@ -182,7 +183,7 @@ def get_nodeset(config):
                f_nodes = [config.node]
                l_nodes = filter(lambda x: x['hostname'] in f_nodes, l_nodes)
        elif config.nodegroup:
-               ng = api.GetNodeGroups({'name' : config.nodegroup})
+               ng = api.GetNodeGroups({'groupname' : config.nodegroup})
                l_nodes = api.GetNodes(ng[0]['node_ids'], ['hostname'])
        elif config.site:
                site = api.GetSites(config.site)
@@ -198,3 +199,13 @@ def get_nodeset(config):
 
        return l_nodes
        
+def email_exception(content=None):
+       import config
+       from unified_model import Message
+       import traceback
+       msg=traceback.format_exc() 
+       if content:
+               msg = content + "\n" + msg
+       m=Message("exception running monitor", msg, False)
+       m.send([config.cc_email])
+       return