changes for 3.0

[monitor.git] / unified_model.py

diff --git a/unified_model.py b/unified_model.py
index 86c415b..df4024e 100755 (executable)
--- a/unified_model.py
+++ b/unified_model.py
@@ -40,7 +40,7 @@ def cmpCategoryVal(v1, v2):
        if v1 == 'ALPHA': v1 = "PROD"
        if v2 == 'ALPHA': v2 = "PROD"
        #map = array_to_priority_map([ None, 'PROD', 'ALPHA', 'OLDBOOTCD', 'UNKNOWN', 'FORCED', 'ERROR', ])
-       map = array_to_priority_map([ None, 'ALPHA', 'PROD', 'OLDBOOTCD', 'UNKNOWN', 'FORCED', 'ERROR', ])
+       map = array_to_priority_map([ None, 'ALPHA', 'PROD', 'OLDPROD', 'OLDBOOTCD', 'UNKNOWN', 'FORCED', 'ERROR', ])
        return cmpValMap(v1,v2,map)
 
 
@@ -355,7 +355,7 @@ class PersistSitePenalty(SitePenalty):
 
                #print pm
                if id in pm:
-                       print "Using existing object"
+                       print "PersistSitePenalty Using existing object"
                        obj = pm[id]
                else:
                        print "creating new object"
@@ -428,7 +428,11 @@ class Record(object):
        def severity(self):
                category = self.data['category']
                prev_category = self.data['prev_category']
-               #print "SEVERITY: ", category, prev_category
+               print "SEVERITY: ", category, prev_category
+               try:
+                       print "SEVERITY state: ", self.data['state'], self.data['prev_state']
+               except:
+                       print "SEVERITY state: unknown unknown"
                val = cmpCategoryVal(category, prev_category)
                return val 
 
@@ -514,6 +518,7 @@ class Record(object):
                else:
                        print "takeAction: increasing penalty for %s"%self.hostname
                        pp.increase()
+               print "takeAction: applying penalty to %s as index %s"% (self.hostname, index)
                pp.index = index
                pp.apply(self.hostname)
                pp.save()
@@ -567,7 +572,7 @@ class Record(object):
                        contacts += plc.getTechEmails(self.loginbase)
                if PI & roles:
                        #contacts += [PIEMAIL % self.loginbase]
-                       contacts += plc.getSliceUserEmails(self.loginbase)
+                       contacts += plc.getPIEmails(self.loginbase)
                if USER & roles:
                        contacts += plc.getSliceUserEmails(self.loginbase)
                        slices = plc.slices(self.loginbase)