Add multiple device/os filtering and a config file.

build/android/pylib/remote/device/remote_device_environment.py

Index: build/android/pylib/remote/device/remote_device_environment.py
diff --git a/build/android/pylib/remote/device/remote_device_environment.py b/build/android/pylib/remote/device/remote_device_environment.py
index a701d9541e6bae2b07497e1e6937339266d2ba81..7edc59f7e46fee30dda7a0e807794f28bc03c07a 100644
--- a/build/android/pylib/remote/device/remote_device_environment.py
+++ b/build/android/pylib/remote/device/remote_device_environment.py
@@ -4,6 +4,8 @@
 
 """Environment setup and teardown for remote devices."""
 
+import distutils.version
+import json
 import logging
 import os
 import random
@@ -28,50 +30,167 @@ class RemoteDeviceEnvironment(environment.Environment):
       error_func: error to show when using bad command line arguments.
     """
     super(RemoteDeviceEnvironment, self).__init__()
+    self._access_token = None
+    self._device = None
+    self._device_type = args.device_type
+    self._verbose_count = args.verbose_count
+    self._timeouts = {
+        'queueing': 60 * 10,
+        'installing': 60 * 10,
+        'in-progress': 60 * 30,
+        'unknown': 60 * 5
+    }
+    # Example config file:
+    # {
+    #   "remote_device": ["Galaxy S4", "Galaxy S3"],
+    #   "remote_device_os": ["4.4.2", "4.4.4"],
+    #   "remote_device_minimum_os": "4.4.2",
+    #   "api_address": "www.example.com",
+    #   "api_port": "80",
+    #   "api_protocol": "http",
+    #   "api_secret": "apisecret",
+    #   "api_key": "apikey",
+    #   "timeouts": {
+    #     "queueing": 600,
+    #     "installing": 600,
+    #     "in-progress": 1800,
+    #     "unknown": 300
+    #   }
+    # }
+    if args.remote_device_file:
+      with open(args.remote_device_file) as device_file:
+        device_json = json.load(device_file)
+    else:
+      device_json = {}
+
+    self._api_address = device_json.get('api_address', None)
+    self._api_key = device_json.get('api_key', None)
+    self._api_port = device_json.get('api_port', None)
+    self._api_protocol = device_json.get('api_protocol', None)
+    self._api_secret = device_json.get('api_secret', None)
+    self._remote_device = device_json.get('remote_device', None)
+    self._remote_device_minimum_os = device_json.get(
+        'remote_device_minimum_os', None)
+    self._remote_device_os = device_json.get('remote_device_os', None)
+    self._device_oem = device_json.get('device_oem', None)
+    self._device_type = device_json.get('device_type', 'Android')
+    self._results_path = device_json.get('results_path', None)
+    self._runner_package = device_json.get('runner_package', None)
+    self._runner_type = device_json.get('runner_type', None)
+    if 'timeouts' in device_json:
+      for key in device_json['timeouts']:
+        self._timeouts[key] = device_json['timeouts'][key]
 
     if args.api_key_file:
       with open(args.api_key_file) as api_key_file:
-        self._api_key = api_key_file.read().strip()
+        temp_key = api_key_file.read().strip()
+        if self._api_key and temp_key != self._api_key:
+          logging.info('Overriding api key.')
+          self._api_key = temp_key
     elif args.api_key:
-      self._api_key = args.api_key
-    else:
-      error_func('Must set api key with --api-key or --api-key-file')
+      if self._api_key and self._api_key != args.api_key:
+        logging.info('Overriding api key.')
+        self._api_key = args.api_key
 
     if args.api_secret_file:
       with open(args.api_secret_file) as api_secret_file:
-        self._api_secret = api_secret_file.read().strip()
+        temp_secret = api_secret_file.read().strip()
+        if self._api_secret and temp_secret != self._api_secret:
+          logging.info('Overriding api secret.')
+          self._api_secret = temp_secret
     elif args.api_secret:
-      self._api_secret = args.api_secret
-    else:
-      error_func('Must set api secret with --api-secret or --api-secret-file')
-
-    if not args.api_protocol:
-      error_func('Must set api protocol with --api-protocol. Example: http')
-    self._api_protocol = args.api_protocol
-
-    if not args.api_address:
-      error_func('Must set api address with --api-address')
-    self._api_address = args.api_address
-
-    if not args.api_port:
-      error_func('Must set api port with --api-port.')
-    self._api_port = args.api_port
-
-    self._access_token = ''
-    self._results_path = args.results_path
-    self._remote_device = args.remote_device
-    self._remote_device_os = args.remote_device_os
-    self._runner_package = args.runner_package
-    self._runner_type = args.runner_type
-    self._device = ''
-    self._verbose_count = args.verbose_count
-    self._device_type = args.device_type
-    self._timeouts = {
-        'queueing': 60 * 10,
-        'installing': 60 * 10,
-        'in-progress': 60 * 30,
-        'unknown': 60 * 5
-    }
+      if self._api_secret and self._api_secret != args.api_secret:
+        logging.info('Overriding api secret.')
+        self._api_secret = args.api_secret
+
+    if args.api_address:

[rnephew (Wrong account), 2015/01/29 22:12:00]

Fixing these to only be one if statement.

[rnephew (Wrong account), 2015/01/29 22:52:49]

Actually I had incorrect up logic and the self._blah = args.blah shouldn't be
with the logging statement.

+      if self._api_address and self._api_address != args.api_address:
+        logging.info('Overriding api address from %s to %s.',
+                     self._api_address, args.api_address)
+        self._api_address = args.api_address
+    if args.api_port:
+      if self._api_port and self._api_port != args.api_port:
+        logging.info('Overriding api port from %s to %s.',
+                     self._api_port, args.api_port)
+        self._api_port = args.api_port
+    if args.api_protocol:
+      if self._api_protocol and self._api_protocol != args.api_protocol:
+        logging.info('Overriding api protocol from %s to %s.',
+                     self._api_protocol, args.api_protocol)
+        self._api_protocol = args.api_protocol
+    if args.remote_device:
+      if self._remote_device and self._remote_device != args.remote_device:
+        logging.info('Overriding remote device from %s to %s.',
+                     self._remote_device, args.remote_device)
+        self._remote_device = args.remote_device
+    if args.remote_device_minimum_os:
+      if (self._remote_device_minimum_os
+          and self._remote_device_minimum_os != args.remote_device_minimum_os):
+        logging.info('Overriding remote device minimum os from %s '
+                     'to %s.', self._remote_device_minimum_os,
+                     args.remote_device_minimum_os)
+        self._remote_device_minimum_os = args.remote_device_minimum_os
+    if args.remote_device_os:
+      if( self._remote_device_os
+          and self._remote_device_os != args.remote_device_os):
+        logging.info('Overriding remote device os from %s to %s.',
+                     self._remote_device_os, args.remote_device_os)
+        self._remote_device_os = args.remote_device_os
+    if args.device_oem:
+      if self._device_oem and self._device_oem != args.device_oem:
+        logging.info('Overriding device oem from  %s to %s.',
+                     self._device_oem, args.device_oem)
+        self._device_oem = args.device_oem
+    if args.device_type:
+      if self._device_type and self._device_type != args.device_type:
+        logging.info('Overriding device type from %s to %s.',
+                     self._device_type, args.device_type)
+        self._device_type = args.device_type
+    if args.results_path:
+      if self._results_path and self._results_path != args.results_path:
+        logging.info('Overriding results path from %s to %s.',
+                     self._results_path, args.results_path)
+        self._results_path = args.results_path
+    if args.runner_package:
+      if self._runner_package and self._runner_package != args.runner_package:
+        logging.info('Overriding runner package from %s to %s.',
+                     self._runner_package, args.runner_package)
+        self._runner_package = args.runner_package
+    if args.runner_type:
+      if self._runner_type and self._runner_type != args.runner_type:
+        logging.info('Overriding runner type from %s to %s.',
+                     self._runner_type, args.runner_type)
+        self._runner_type = args.runner_type
+
+    if not self._api_address:
+      error_func('Must set api address with --api-address'
+                 ' or in --remote-device-file.')
+    if not self._api_key:
+      error_func('Must set api key with --api-key, --api-key-file'
+                 ' or in --remote-device-file')
+    if not self._api_port:
+      error_func('Must set api port with --api-port'
+                 ' or in --remote-device-file')
+    if not self._api_protocol:
+      error_func('Must set api protocol with --api-protocol'
+                 ' or in --remote-device-file. Example: http')
+    if not self._api_secret:
+      error_func('Must set api secret with --api-secret, --api-secret-file'
+                 ' or in --remote-device-file')
+
+    logging.info('Api address: %s', self._api_address)
+    logging.info('Api port: %s', self._api_port)
+    logging.info('Api protocol: %s', self._api_protocol)
+    logging.info('Remote device: %s', self._remote_device)
+    logging.info('Remote device minimum os: %s',
+                 self._remote_device_minimum_os)
+    logging.info('Remote device os: %s', self._remote_device_os)
+    logging.info('Remote device OEM: %s', self._device_oem)
+    logging.info('Remote device type: %s', self._device_type)
+    logging.info('Results Path: %s', self._results_path)
+    logging.info('Runner package: %s', self._runner_package)
+    logging.info('Runner type: %s', self._runner_type)
+    logging.info('Timeouts: %s', self._timeouts)
 
     if not args.trigger and not args.collect:
       self._trigger = True
@@ -150,10 +269,16 @@ class RemoteDeviceEnvironment(environment.Environment):
     for device in device_list:
       if device['os_name'] != self._device_type:
         continue
-      if self._remote_device and device['name'] != self._remote_device:
+      if self._remote_device and device['name'] not in self._remote_device:
         continue
       if (self._remote_device_os
-          and device['os_version'] != self._remote_device_os):
+          and device['os_version'] not in self._remote_device_os):
+        continue
+      if self._device_oem and device['brand'] not in self._device_oem:
+        continue
+      if (self._remote_device_minimum_os
+          and distutils.version.LooseVersion(device['os_version'])
+          < distutils.version.LooseVersion(self._remote_device_minimum_os)):
         continue
       if ((self._remote_device and self._remote_device_os)
           or device['available_devices_count']):