X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=blobdiff_plain;f=clean_policy.py;h=d2bde412ff511dc99648d5bd54e6fc5c35e2bd6f;hp=f1249cf29a289c2ee09d04ec05ccbd564d195ef3;hb=944d143a6528c4157b71f51ed480aec806cbaa06;hpb=94cd174f6ce0bb3b2c8bceda0346e332037c6d8a

diff --git a/clean_policy.py b/clean_policy.py
index f1249cf..d2bde41 100644
--- a/clean_policy.py
+++ b/clean_policy.py
@@ -2,12 +2,11 @@ import config
 import database 
 import time
 import mailer
-from www.printbadnodes import cmpCategoryVal
+from unified_model import cmpCategoryVal
 import sys
 import emailTxt
 import string
 
-from policy import get_ticket_id, print_stats, close_rt_backoff, reboot_node
 from rt import is_host_in_rt_tickets
 import plc
 
@@ -21,6 +20,16 @@ from const import *
 
 from unified_model import *
 
+def get_ticket_id(record):
+	if 'ticket_id' in record and record['ticket_id'] is not "" and record['ticket_id'] is not None:
+		return record['ticket_id']
+	elif 		'found_rt_ticket' in record and \
+		 record['found_rt_ticket'] is not "" and \
+		 record['found_rt_ticket'] is not None:
+		return record['found_rt_ticket']
+	else:
+		return None
+
 class MonitorMergeDiagnoseSendEscellate:
 	def __init__(self, hostname, act):
 		self.hostname = hostname