Replace builder_host and builder_port with builder_type.

tools/auto_bisect/request_build.py

 # Copyright 2014 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.
 
 """This module contains functionality for starting build try jobs via HTTP.
 
 This includes both sending a request to start a job, and also related code
 for querying the status of the job.
 
 This module can be either run as a stand-alone script to send a request to a
 builder, or imported and used by calling the public functions below.
 """
 
 import getpass
 import json
 import optparse
 import os
 import sys
 import urllib
 import urllib2
 
+import fetch_build
+
 # URL template for fetching JSON data about builds.
 BUILDER_JSON_URL = ('%(server_url)s/json/builders/%(bot_name)s/builds/'
                     '%(build_num)s?as_text=1&filter=0')
 
 # URL template for displaying build steps.
 BUILDER_HTML_URL = ('%(server_url)s/builders/%(bot_name)s/builds/%(build_num)s')
 
 # Try server status page for the perf try server.
 PERF_TRY_SERVER_URL = 'http://build.chromium.org/p/tryserver.chromium.perf'
 
@@ skipping 162 matching lines @@
 
   Returns:
     A dictionary with build information if build exists, otherwise None.
   """
   builds_json = _FetchBuilderData(buildbot_url)
   if builds_json:
     return json.loads(builds_json)
   return None
 
 
-def _GetBuildBotUrl(builder_host, builder_port):
+def _GetBuildBotUrl(builder_type):
   """Gets build bot URL for fetching build info.
 
   Bisect builder bots are hosted on tryserver.chromium.perf, though we cannot
   access this tryserver using host and port number directly, so we use another
   tryserver URL for the perf tryserver.
 
   Args:
-    builder_host: Hostname of the server where the builder is hosted.
-    builder_port: Port number of ther server where the builder is hosted.
+    builder_type: Determines what type of builder is used, e.g. "perf".
 
   Returns:
     URL of the buildbot as a string.
   """
-  if (builder_host == PERF_BISECT_BUILDER_HOST and
-      builder_port == PERF_BISECT_BUILDER_PORT):
+  if builder_type == fetch_build.PERF_BUILDER:
     return PERF_TRY_SERVER_URL
   else:
-    return 'http://%s:%s' % (builder_host, builder_port)
+    raise NotImplementedError('Cannot yet get non-perf builds.')
 
 
-def GetBuildStatus(build_num, bot_name, builder_host, builder_port):
+def GetBuildStatus(build_num, bot_name, builder_type):
   """Gets build status from the buildbot status page for a given build number.
 
   Args:
     build_num: A build number on tryserver to determine its status.
     bot_name: Name of the bot where the build information is scanned.
-    builder_host: Hostname of the server where the builder is hosted.
-    builder_port: Port number of the server where the builder is hosted.
+    builder_type: Type of builder, e.g. "perf".
 
   Returns:
     A pair which consists of build status (SUCCESS, FAILED or PENDING) and a
     link to build status page on the waterfall.
   """
   results_url = None
   if build_num:
     # Get the URL for requesting JSON data with status information.
-    server_url = _GetBuildBotUrl(builder_host, builder_port)
+    server_url = _GetBuildBotUrl(builder_type)
     buildbot_url = BUILDER_JSON_URL % {
         'server_url': server_url,
         'bot_name': bot_name,
         'build_num': build_num,
     }
     build_data = _GetBuildData(buildbot_url)
     if build_data:
       # Link to build on the buildbot showing status of build steps.
       results_url = BUILDER_HTML_URL % {
           'server_url': server_url,
           'bot_name': bot_name,
           'build_num': build_num,
       }
       if _IsBuildFailed(build_data):
         return (FAILED, results_url)
 
       elif _IsBuildSuccessful(build_data):
         return (OK, results_url)
   return (PENDING, results_url)
 
 
-def GetBuildNumFromBuilder(build_reason, bot_name, builder_host, builder_port):
+def GetBuildNumFromBuilder(build_reason, bot_name, builder_type):
   """Gets build number on build status page for a given 'build reason'.
 
   This function parses the JSON data from buildbot page and collects basic
   information about the all the builds, and then uniquely identifies the build
   based on the 'reason' attribute in builds's JSON data.
 
   The 'reason' attribute set is when a build request is posted, and it is used
   to identify the build on status page.
 
   Args:
     build_reason: A unique build name set to build on tryserver.
     bot_name: Name of the bot where the build information is scanned.
-    builder_host: Hostname of the server where the builder is hosted.
-    builder_port: Port number of ther server where the builder is hosted.
+    builder_type: Type of builder, e.g. "perf".
 
   Returns:
     A build number as a string if found, otherwise None.
   """
   # Gets the buildbot url for the given host and port.
-  server_url = _GetBuildBotUrl(builder_host, builder_port)
+  server_url = _GetBuildBotUrl(builder_type)
   buildbot_url = BUILDER_JSON_URL % {
       'server_url': server_url,
       'bot_name': bot_name,
       'build_num': '_all',
   }
   builds_json = _FetchBuilderData(buildbot_url)
   if builds_json:
     builds_data = json.loads(builds_json)
     for current_build in builds_data:
       if builds_data[current_build].get('reason') == build_reason:
@@ skipping 66 matching lines @@
   options, _ = parser.parse_args()
   if not options.host or not options.port:
     parser.print_help()
     return 1
   params = _GetRequestParams(options)
   PostTryJob(options.host, options.port, params)
 
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv))