commit 5135b7edf9a015b8999d1648501682a93fd6e114
author Wei-Ning Huang <wnhuang@google.com> Fri Jul 03 17:31:15 2015 +0800
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Fri Jul 03 17:57:04 2015 +0000
tree 7b18987ec3ac84fa7d4ed9d256933628a176ecd0
parent 1a38203a5b1e717097f171630ed1200e3a0f9d1f

installer: add option to set device ID

Allow user to specify device ID when installing factory toolkit. This is
useful in fixture-based testing where we need to set an ID to identify
fixture host.

BUG=chromium:506788
TEST=`./install_factory_toolkit.sh -- --device_id DeviceID`

Change-Id: Ie1c6c39aeeb2895c11560f7ddcb1262a9484e303
Reviewed-on: https://chromium-review.googlesource.com/283285
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Commit-Queue: Wei-Ning Huang <wnhuang@chromium.org>
Tested-by: Wei-Ning Huang <wnhuang@chromium.org>

py/toolkit/installer.py

diff --git a/py/toolkit/installer.py b/py/toolkit/installer.py
index 7ff36be..7bc9996 100755
--- a/py/toolkit/installer.py
+++ b/py/toolkit/installer.py
@@ -20,6 +20,7 @@
 import tempfile
 
 import factory_common  # pylint: disable=W0611
+from cros.factory.test import event_log
 from cros.factory.test import factory
 from cros.factory.test import utils
 from cros.factory.tools import install_symlinks
@@ -114,7 +115,7 @@
   _sudo = True
 
   def __init__(self, src, dest, no_enable, enable_presenter,
-               enable_device, non_cros=False, system_root='/'):
+               enable_device, non_cros=False, device_id=None, system_root='/'):
     self._src = src
     self._system_root = system_root
     if dest == self._system_root:
@@ -164,6 +165,7 @@
     self._enable_device = enable_device
     self._device_tag_file = os.path.join(self._usr_local_dest, 'factory',
                                          'init', 'run_goofy_device')
+    self._device_id = device_id
 
     if (not os.path.exists(self._usr_local_src) or
         not os.path.exists(self._var_src)):
@@ -209,6 +211,11 @@
       print '*** Removing %s enabled tag...' % name
       Spawn(['rm', '-f', path], sudo=True, log=True, check_call=True)
 
+  def _SetDeviceID(self):
+    if self._device_id is not None:
+      with open(os.path.join(event_log.DEVICE_ID_PATH), 'w') as f:
+        f.write(self._device_id)
+
   def Install(self):
     print '*** Installing factory toolkit...'
     for src, dest in ((self._usr_local_src, self._usr_local_dest),
@@ -253,6 +260,8 @@
                      self._enable_presenter)
     self._SetTagFile('device', self._device_tag_file, self._enable_device)
 
+    self._SetDeviceID()
+
     print '*** Installation completed.'
 
 
@@ -403,6 +412,9 @@
                       action='store_false', help=argparse.SUPPRESS)
   parser.set_defaults(enable_device=True)
 
+  parser.add_argument('--device-id', dest='device_id', type=str, default=None,
+                      help='Set device ID for this device')
+
   parser.add_argument('--init-umpire-board', dest='umpire_board',
                       nargs='?', default=None,
                       help='Locally install Umpire server for specific board')
@@ -466,8 +478,10 @@
   with (MountPartition(args.dest, 1, rw=True) if patch_test_image
         else DummyContext(args.dest)) as dest:
     installer = FactoryToolkitInstaller(
-        src_root, dest, args.no_enable, args.enable_presenter,
-        args.enable_device, args.non_cros)
+        src=src_root, dest=dest, no_enable=args.no_enable,
+        enable_presenter=args.enable_presenter,
+        enable_device=args.enable_device, non_cros=args.non_cros,
+        device_id=args.device_id)
 
     print installer.WarningMessage(args.dest if patch_test_image else None)