controllers should allow refreshes while findall is running.

[monitor.git] / monitor / common.py

diff --git a/monitor/common.py b/monitor/common.py
index d082dbb..da174d8 100644 (file)
--- a/monitor/common.py
+++ b/monitor/common.py
@@ -4,7 +4,7 @@ import struct
 from monitor import reboot
 from monitor import util
 from monitor import database
 from monitor import reboot
 from monitor import util
 from monitor import database

-from monitor.wrapper import plc, plccache
+from monitor.wrapper import plc

 
 from datetime import datetime, timedelta
 from monitor.model import Message
 
 from datetime import datetime, timedelta
 from monitor.model import Message


@@ -58,26 +58,26 @@ def color_pcu_state(fbnode):
                rb = values['reboot']
                if rb == 0 or rb == "0":
                        return fbnode['pcu'] + "OK  "
                rb = values['reboot']
                if rb == 0 or rb == "0":
                        return fbnode['pcu'] + "OK  "

-                       #return fbnode['pcu'] + "OK  "
-                       #return green(fbnode['pcu'])

                elif "NetDown" == rb  or "Not_Run" == rb:
                        return fbnode['pcu'] + "DOWN"
                elif "NetDown" == rb  or "Not_Run" == rb:
                        return fbnode['pcu'] + "DOWN"

-                       #return yellow(fbnode['pcu'])

                else:
                        return fbnode['pcu'] + "BAD "
                else:
                        return fbnode['pcu'] + "BAD "

-                       #return red(fbnode['pcu'])

        else:
        else:

-               #return red(fbnode['pcu'])

                return fbnode['pcu'] + "BAD "
 
 def color_boot_state(l):
        if    l == "dbg": return yellow("debg")
        elif  l == "dbg ": return yellow("debg")
                return fbnode['pcu'] + "BAD "
 
 def color_boot_state(l):
        if    l == "dbg": return yellow("debg")
        elif  l == "dbg ": return yellow("debg")

+       elif  l == "failboot": return yellow("debg")

        elif  l == "diag": return lightblue(l)
        elif  l == "diag": return lightblue(l)

+       elif  l == "diagnose": return lightblue(l)
+       elif  l == "safeboot": return lightblue(l)

        elif  l == "disable": return red("dsbl")
        elif  l == "disable": return red("dsbl")

+       elif  l == "disabled": return red("dsbl")

        elif  l == "down": return red(l)
        elif  l == "boot": return green(l)
        elif  l == "rins": return blue(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
 
        else:
                return l
 


@@ -187,6 +187,7 @@ def get_nodeset(config):
                Given the config values passed in, return the set of hostnames that it
                evaluates to.
        """
                Given the config values passed in, return the set of hostnames that it
                evaluates to.
        """

+       from monitor.wrapper import plccache

        api = plc.getAuthAPI()
        l_nodes = plccache.l_nodes
 
        api = plc.getAuthAPI()
        l_nodes = plccache.l_nodes