Put more information into device status json output.

build/android/buildbot/bb_device_status_check.py

 #!/usr/bin/env python
 #
 # Copyright 2013 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.
 
 """A class to keep track of devices across builds and report state."""
 import json
 import logging
 import optparse
@@ skipping 51 matching lines @@
       return 'Unknown'
     found = re.findall(re_expression, line)
     if found and len(found):
       return lambda_function(found[0])
     return 'Unknown'
 
   battery_level = int(battery_info.get('level', 100))
   imei_slice = _GetData(r'Device ID = (\d+)',
                         device_adb.old_interface.GetSubscriberInfo(),
                         lambda x: x[-6:])
+  json_data = {
+    'serial': serial,
+    'type': device_type,
+    'build': device_build,
+    'build_detail': device_adb.GetProp('ro.build.fingerprint'),
+    'battery': battery_info,
+    'imei_slice': imei_slice,
+    'wifi_ip': device_adb.GetProp('dhcp.wlan0.ipaddress'),
+  }
   report = ['Device %s (%s)' % (serial, device_type),
             '  Build: %s (%s)' %
-              (device_build, device_adb.build_fingerprint),
+              (device_build, json_data['build_detail']),
             '  Current Battery Service state: ',
             '\n'.join(['    %s: %s' % (k, v)
                        for k, v in battery_info.iteritems()]),
             '  IMEI slice: %s' % imei_slice,
-            '  Wifi IP: %s' % device_adb.GetProp('dhcp.wlan0.ipaddress'),
+            '  Wifi IP: %s' % json_data['wifi_ip'],
             '']
 
   errors = []
   dev_good = True
   if battery_level < 15:
     errors += ['Device critically low in battery. Will add to blacklist.']
     dev_good = False
     if not device_adb.old_interface.IsDeviceCharging():
       if device_adb.old_interface.CanControlUsbCharging():
         device_adb.old_interface.EnableUsbCharging()
       else:
         logging.error('Device %s is not charging' % serial)
   if not options.no_provisioning_check:
     setup_wizard_disabled = (
         device_adb.GetProp('ro.setupwizard.mode') == 'DISABLED')
     if not setup_wizard_disabled and device_build_type != 'user':
       errors += ['Setup wizard not disabled. Was it provisioned correctly?']
   if (device_product_name == 'mantaray' and
       battery_info.get('AC powered', None) != 'true'):
     errors += ['Mantaray device not connected to AC power.']
 
   full_report = '\n'.join(report)
-  return device_type, device_build, battery_level, full_report, errors, dev_good
+
+  return (device_type, device_build, battery_level, full_report, errors,
+    dev_good, json_data)
 
 
 def CheckForMissingDevices(options, adb_online_devs):
   """Uses file of previous online devices to detect broken phones.
 
   Args:
     options: out_dir parameter of options argument is used as the base
              directory to load and update the cache file.
     adb_online_devs: A list of serial numbers of the currently visible
                      and online attached devices.
@@ skipping 199 matching lines @@
       if not usb_restarted and devices:
         # The USB wasn't restarted, but there's at least one device online.
         # No point in trying to wait for all devices.
         break
       retries -= 1
 
   # TODO(navabi): Test to make sure this fails and then fix call
   offline_devices = android_commands.GetAttachedDevices(
       hardware=False, emulator=False, offline=True)
 
-  types, builds, batteries, reports, errors = [], [], [], [], []
+  types, builds, batteries, reports, errors, json_data = [], [], [], [], [], []
   fail_step_lst = []
   if devices:
-    types, builds, batteries, reports, errors, fail_step_lst = (
+    types, builds, batteries, reports, errors, fail_step_lst, json_data = (
         zip(*[DeviceInfo(dev, options) for dev in devices]))
 
   err_msg = CheckForMissingDevices(options, devices) or []
 
   unique_types = list(set(types))
   unique_builds = list(set(builds))
 
   bb_annotations.PrintMsg('Online devices: %d. Device types %s, builds %s'
                            % (len(devices), unique_types, unique_builds))
   print '\n'.join(reports)
@@ skipping 20 matching lines @@
     perf_tests_results_helper.PrintPerfResult('BotDevices', 'OfflineDevices',
                                               [len(offline_devices)], 'devices',
                                               'unimportant')
     for serial, battery in zip(devices, batteries):
       perf_tests_results_helper.PrintPerfResult('DeviceBattery', serial,
                                                 [battery], '%',
                                                 'unimportant')
 
   if options.json_output:
     with open(options.json_output, 'wb') as f:
-      f.write(json.dumps({
-        'online_devices': devices,
-        'offline_devices': offline_devices,
-        'expected_devices': expected_devices,
-        'unique_types': unique_types,
-        'unique_builds': unique_builds,
-      }))
+      f.write(json.dumps(json_data, indent=4))
 
   num_failed_devs = 0
   for fail_status, device in zip(fail_step_lst, devices):
     if not fail_status:
       device_blacklist.ExtendBlacklist([str(device)])
       num_failed_devs += 1
 
   if num_failed_devs == len(devices):
     return 2
 
   if not devices:
     return 1
 
 
 if __name__ == '__main__':
   sys.exit(main())