rename rebaseline_server JSON constants to be more consistent

gm/rebaseline_server/compare_configs.py

 #!/usr/bin/python
 
 """
 Copyright 2014 Google Inc.
 
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 
 Compare GM results for two configs, across all builders.
 """
@@ skipping 83 matching lines @@
     logging.info('Comparing configs %s and %s...' % (configA, configB))
 
     all_image_pairs = imagepairset.ImagePairSet(
         descriptions=configs,
         diff_base_url=self._diff_base_url)
     failing_image_pairs = imagepairset.ImagePairSet(
         descriptions=configs,
         diff_base_url=self._diff_base_url)
 
     all_image_pairs.ensure_extra_column_values_in_summary(
-        column_id=results.KEY__EXTRACOLUMN__RESULT_TYPE, values=[
+        column_id=results.KEY__EXTRACOLUMNS__RESULT_TYPE, values=[
             results.KEY__RESULT_TYPE__FAILED,
             results.KEY__RESULT_TYPE__NOCOMPARISON,
             results.KEY__RESULT_TYPE__SUCCEEDED,
         ])
     failing_image_pairs.ensure_extra_column_values_in_summary(
-        column_id=results.KEY__EXTRACOLUMN__RESULT_TYPE, values=[
+        column_id=results.KEY__EXTRACOLUMNS__RESULT_TYPE, values=[
             results.KEY__RESULT_TYPE__FAILED,
             results.KEY__RESULT_TYPE__NOCOMPARISON,
         ])
 
     builders = sorted(actual_builder_dicts.keys())
     num_builders = len(builders)
     builder_num = 0
     for builder in builders:
       builder_num += 1
       logging.info('Generating pixel diffs for builder #%d of %d, "%s"...' %
@@ skipping 27 matching lines @@
             if configA_image_relative_url == configB_image_relative_url:
               result_type = results.KEY__RESULT_TYPE__SUCCEEDED
             elif not configA_image_relative_url:
               result_type = results.KEY__RESULT_TYPE__NOCOMPARISON
             elif not configB_image_relative_url:
               result_type = results.KEY__RESULT_TYPE__NOCOMPARISON
             else:
               result_type = results.KEY__RESULT_TYPE__FAILED
 
             extra_columns_dict = {
-                results.KEY__EXTRACOLUMN__RESULT_TYPE: result_type,
-                results.KEY__EXTRACOLUMN__BUILDER: builder,
-                results.KEY__EXTRACOLUMN__TEST: test,
+                results.KEY__EXTRACOLUMNS__RESULT_TYPE: result_type,
+                results.KEY__EXTRACOLUMNS__BUILDER: builder,
+                results.KEY__EXTRACOLUMNS__TEST: test,
                 # TODO(epoger): Right now, the client UI crashes if it receives
                 # results that do not include a 'config' column.
                 # Until we fix that, keep the client happy.
-                results.KEY__EXTRACOLUMN__CONFIG: 'TODO',
+                results.KEY__EXTRACOLUMNS__CONFIG: 'TODO',
             }
 
             try:
               image_pair = imagepair.ImagePair(
                   image_diff_db=self._image_diff_db,
                   base_url=gm_json.GM_ACTUALS_ROOT_HTTP_URL,
                   imageA_relative_url=configA_image_relative_url,
                   imageB_relative_url=configB_image_relative_url,
                   extra_columns=extra_columns_dict)
               all_image_pairs.add_image_pair(image_pair)
@@ skipping 39 matching lines @@
   results_obj = ConfigComparisons(configs=args.config,
                                   actuals_root=args.actuals,
                                   generated_images_root=args.workdir)
   gm_json.WriteToFile(
       results_obj.get_packaged_results_of_type(results_type=args.results),
       args.outfile)
 
 
 if __name__ == '__main__':
   main()