commit cb06f3b87636b73b5e23030af7fd3b9a521853bf
author Garry Wang <xianuowang@chromium.org> Thu Oct 08 20:56:21 2020 -0700
committer Commit Bot <commit-bot@chromium.org> Wed Oct 14 02:55:06 2020 +0000
tree 783e4d3e0177e28d696685feb1f9f58ff899557b
parent 6f903618afc11f0a9158c3c662ad0299ad7cf67a

autotest: Make get servo_setup via standard process

We no longer need to start servod with dual_v4 for select
pools, as we provided that config at per DUT level.

BUG=b:170267557
TEST=Run repair locally with dual V4 setup.

Change-Id: Ib6dfb64887d4afc6335c46fde2e4734c6c6f7406
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2462872
Tested-by: Garry Wang <xianuowang@chromium.org>
Reviewed-by: Otabek Kasimov <otabek@google.com>
Commit-Queue: Garry Wang <xianuowang@chromium.org>

server/hosts/servo_constants.py

diff --git a/server/hosts/servo_constants.py b/server/hosts/servo_constants.py
index 1a02c23..e2cf6ad 100644
--- a/server/hosts/servo_constants.py
+++ b/server/hosts/servo_constants.py
@@ -14,11 +14,15 @@
 # Model is inferred from host labels.
 SERVO_MODEL_ATTR = 'servo_model'
 SERVO_SERIAL_ATTR = 'servo_serial'
+# Indicates what type of servo setup, example value: REGULAR or DUAL_V4.
+SERVO_SETUP_ATTR = 'servo_setup'
+SERVO_SETUP_VALUE_DUAL_V4 = 'DUAL_V4'
 SERVO_ATTR_KEYS = (
         SERVO_BOARD_ATTR,
         SERVO_HOST_ATTR,
         SERVO_PORT_ATTR,
         SERVO_SERIAL_ATTR,
+        SERVO_SETUP_ATTR,
 )
 
 # Timeout value for stop/start servod process.
@@ -26,11 +30,6 @@
 SERVOD_QUICK_STARTUP_TIMEOUT = 20
 SERVOD_STARTUP_TIMEOUT = 60
 
-# pools that support dual v4. (go/cros-fw-lab-strategy)
-POOLS_SUPPORT_DUAL_V4 = {'faft_cr50_debug'
-                         'faft-pd-debug',
-                         'faft_pd_debug'}
-
 # Prefix of pools that require servod cr50 config.
 CR50_CONFIG_POOL_PREFIX = 'faft-cr50'