Merge remote branch 'cros/upstream' into tempbranch3

frontend/tko/rpc_interface.py

 import os, pickle, datetime, itertools, operator
 from django.db import models as dbmodels
 from autotest_lib.frontend.afe import rpc_utils, model_logic
 from autotest_lib.frontend.afe import models as afe_models, readonly_connection
 from autotest_lib.frontend.tko import models, tko_rpc_utils, graphing_utils
 from autotest_lib.frontend.tko import preconfigs
 
 # table/spreadsheet view support
 
 def get_test_views(**filter_data):
@@ skipping 155 matching lines @@
 
     all_iterations = iteration_attr.keys() + iteration_perf.keys()
     max_iterations = max(all_iterations + [0])
 
     # merge the iterations into a single list of attr & perf dicts
     return [{'attr': iteration_attr.get(index, {}),
              'perf': iteration_perf.get(index, {})}
             for index in xrange(1, max_iterations + 1)]
 
 
+def _job_keyvals_to_dict(keyvals):
+    return dict((keyval.key, keyval.value) for keyval in keyvals)
+
+
 def get_detailed_test_views(**filter_data):
     test_views = models.TestView.list_objects(filter_data)
+
     tests_by_id = models.Test.objects.in_bulk([test_view['test_idx']
                                                for test_view in test_views])
     tests = tests_by_id.values()
     models.Test.objects.populate_relationships(tests, models.TestAttribute,
                                                'attributes')
     models.Test.objects.populate_relationships(tests, models.IterationAttribute,
                                                'iteration_attributes')
     models.Test.objects.populate_relationships(tests, models.IterationResult,
                                                'iteration_results')
     models.Test.objects.populate_relationships(tests, models.TestLabel,
                                                'labels')
+
+    jobs_by_id = models.Job.objects.in_bulk([test_view['job_idx']
+                                             for test_view in test_views])
+    jobs = jobs_by_id.values()
+    models.Job.objects.populate_relationships(jobs, models.JobKeyval,
+                                              'keyvals')
+
     for test_view in test_views:
         test = tests_by_id[test_view['test_idx']]
         test_view['attributes'] = _attributes_to_dict(test.attributes)
         test_view['iterations'] = _format_iteration_keyvals(test)
         test_view['labels'] = [label.name for label in test.labels]
+
+        job = jobs_by_id[test_view['job_idx']]
+        test_view['job_keyvals'] = _job_keyvals_to_dict(job.keyvals)
+
     return rpc_utils.prepare_for_serialization(test_views)
 
 # graphing view support
 
 def get_hosts_and_tests():
     """\
     Gets every host that has had a benchmark run on it. Additionally, also
     gets a dictionary mapping the host names to the benchmarks.
     """
 
@@ skipping 215 matching lines @@
     result['test_labels'] = get_test_labels(sort_by=['name'])
     result['current_user'] = rpc_utils.prepare_for_serialization(
             afe_models.User.current_user().get_object_dict())
     result['benchmark_key'] = benchmark_key
     result['tko_perf_view'] = tko_perf_view
     result['tko_test_view'] = model_fields
     result['preconfigs'] = preconfigs.manager.all_preconfigs()
     result['motd'] = rpc_utils.get_motd()
 
     return result