[Findit] A huge refactoring and some bug fixing.

appengine/findit/waterfall/trigger_swarming_task_pipeline.py

 # Copyright 2016 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.
 
 import copy
 from datetime import datetime
 import logging
 import time
 
 from google.appengine.ext import ndb
 
 from common.http_client_appengine import HttpClientAppengine as HttpClient
-from model import wf_analysis_status
+from model import analysis_status
 from model.wf_swarming_task import WfSwarmingTask
 from pipeline_wrapper import BasePipeline
 from waterfall import swarming_util
 from waterfall import waterfall_config
 
 
 def _GetSwarmingTaskName(ref_task_id):  # pragma: no cover.
   """Returns a unique task name.
 
   Have this separate function in order to mock for testing purpose.
@@ skipping 44 matching lines @@
 
 
 @ndb.transactional
 def _NeedANewSwarmingTask(master_name, builder_name, build_number, step_name):
   swarming_task = WfSwarmingTask.Get(
       master_name, builder_name, build_number, step_name)
 
   if not swarming_task:
     swarming_task = WfSwarmingTask.Create(
         master_name, builder_name, build_number, step_name)
-    swarming_task.status = wf_analysis_status.PENDING
+    swarming_task.status = analysis_status.PENDING
     swarming_task.put()
     return True
   else:
     # TODO(http://crbug.com/585676): Rerun the Swarming task if it runs into
     # unexpected infra errors.
     return False
 
 
 def _GetSwarmingTaskId(master_name, builder_name, build_number, step_name):
   deadline = time.time() + 5 * 60  # Wait for 5 minutes.
@@ skipping 68 matching lines @@
         master_name, builder_name, build_number, step_name)
     swarming_task.task_id = task_id
     swarming_task.parameters['tests'] = tests
     swarming_task.parameters['iterations_to_rerun'] = iterations_to_rerun
     swarming_task.parameters['ref_name'] = swarming_util.GetTagValue(
         new_request.tags, 'ref_name')
     swarming_task.put()
 
     logging.info('A Swarming task was triggered:%s', task_id)
     return task_id