Improve the command line interface for perf dashboard upload.

mojo/devtools/common/devtoolslib/perf_dashboard.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.
 
 # Disable the line-too-long warning.
 # pylint: disable=C0301
 """This module implements the Chromium Performance Dashboard JSON v1.0 data
 format.
 
 See http://www.chromium.org/developers/speed-infra/performance-dashboard/sending-data-to-the-performance-dashboard.
@@ skipping 41 matching lines @@
 
 def add_argparse_server_arguments(parser):
   """Adds argparse arguments needed to upload the chart data to a performance
   dashboard to the given parser.
   """
   dashboard_group = parser.add_argument_group('Performance dashboard server',
       'These arguments allow to specify the performance dashboard server '
       'to upload the results to.')
 
   dashboard_group.add_argument(
+      '--upload', action='store_true',
+      help='Upload the results to performance dashboard. Further arguments '
+           'in this group are relevant only if --upload is passed.')
+  dashboard_group.add_argument(
       '--server-url',
       help='Url of the server instance to upload the results to. By default a '
            'local instance is assumed to be running on port 8080.')
   dashboard_group.add_argument(
       '--master-name',
       help='Buildbot master name, used to construct link to buildbot log by '
            'the dashboard, and also as the top-level category for the data.')
   dashboard_group.add_argument(
-      '--perf-id',
-      help='Used as the second-level category for the data, usually the '
-           'platform type.')
+      '--bot-name',
+      help='Used as the second-level category for the data.')
   dashboard_group.add_argument(
       '--test-name',
       help='Name of the test that the perf data was generated from.')
   dashboard_group.add_argument(
       '--builder-name',
       help='Buildbot builder name, used to construct link to buildbot log by '
            'the dashboard.')
   dashboard_group.add_argument(
       '--build-number', type=int,
       help='Build number, used to construct link to buildbot log by the '
            'dashboard.')
   dashboard_group.add_argument(
       '--dry-run', action='store_true', default=False,
       help='Display the server URL and the data to upload, but do not actually '
            'upload the data.')
 
 
-def upload_chart_data(master_name, perf_id, test_name, builder_name,
+def upload_chart_data(master_name, bot_name, test_name, builder_name,
                       build_number, revision, chart_data, point_id,
                       server_url=None, dry_run=False):
   """Uploads the provided chart data to an instance of performance dashboard.
   See the argparse help above for description of the arguments.
 
 
   Returns:
     A boolean value indicating whether the operation succeeded or not.
   """
   class _UploadException(Exception):
@@ skipping 20 matching lines @@
                              "JSON: %s\n" % (e.code, e.read(), json_data))
     except urllib2.URLError as e:
       raise _UploadException("URLError: %s for JSON %s\n" %
                              (str(e.reason), json_data))
     except httplib.HTTPException as e:
       raise _UploadException("HTTPException for JSON %s\n" % json_data)
 
   # Wrap the |chart_data| with meta data as required by the spec.
   formatted_data = {
       "master": master_name,
-      "bot": perf_id,
+      "bot": bot_name,
       "masterid": master_name,
       "buildername": builder_name,
       "buildnumber": build_number,
       "versions": {
           "mojo": revision
       },
       "point_id": point_id,
       "supplemental": {},
       "chart_data": chart_data
   }
@@ skipping 10 matching lines @@
     try:
       _upload(upload_url, json.dumps(formatted_data))
     except _UploadException as e:
       print e
       return False
 
     print "Done."
 
     dashboard_params = urllib.urlencode({
         "masters": master_name,
-        "bots": perf_id,
+        "bots": bot_name,
         "tests": test_name,
         "rev": point_id
     })
     print "Results Dashboard: %s/report?%s" % (upload_url, dashboard_params)
 
   return True