[Findit] A huge refactoring and some bug fixing.

appengine/findit/waterfall/identify_culprit_pipeline.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from datetime import datetime
 
-from model import wf_analysis_result_status
-from model import wf_analysis_status
+from model import result_status
+from model import analysis_status
 from model.wf_analysis import WfAnalysis
 from pipeline_wrapper import BasePipeline
 from waterfall import build_failure_analysis
 
 
 def _GetResultAnalysisStatus(analysis_result):
   """Returns the status of the analysis result.
 
   We can decide the status based on:
     1. whether we found any suspected CL(s).
     2. whether we have triaged the failure.
     3. whether our analysis result is the same as triaged result.
   """
   # Now we can only set the status based on if we found any suspected CL(s).
   # TODO: Add logic to decide the status after comparing with culprit CL(s).
   if not analysis_result or not analysis_result['failures']:
     return None
 
   for failure in analysis_result['failures']:
     if failure['suspected_cls']:
-      return wf_analysis_result_status.FOUND_UNTRIAGED
+      return result_status.FOUND_UNTRIAGED
 
-  return wf_analysis_result_status.NOT_FOUND_UNTRIAGED
+  return result_status.NOT_FOUND_UNTRIAGED
 
 
 def _GetSuspectedCLs(analysis_result):
   """Returns the suspected CLs we found in analysis."""
   suspected_cls = []
   if not analysis_result or not analysis_result['failures']:
     return suspected_cls
 
   for failure in analysis_result['failures']:
     for suspected_cl in failure['suspected_cls']:
@@ skipping 26 matching lines @@
     """
     master_name = failure_info['master_name']
     builder_name = failure_info['builder_name']
     build_number = failure_info['build_number']
 
     analysis_result = build_failure_analysis.AnalyzeBuildFailure(
         failure_info, change_logs, deps_info, signals)
     analysis = WfAnalysis.Get(master_name, builder_name, build_number)
     analysis.build_completed = build_completed
     analysis.result = analysis_result
-    analysis.status = wf_analysis_status.ANALYZED
+    analysis.status = analysis_status.COMPLETED
     analysis.result_status = _GetResultAnalysisStatus(analysis_result)
     analysis.suspected_cls = _GetSuspectedCLs(analysis_result)
     analysis.end_time = datetime.utcnow()
     analysis.put()
 
     return analysis_result