commit eefe89513262c543b52e3305a35e57e9ec5f0cc8
author Michael Mortensen <mmortensen@google.com> Mon Aug 12 15:37:15 2019 -0600
committer Commit Bot <commit-bot@chromium.org> Thu Aug 15 17:04:02 2019 +0000
tree 0a94a08bd15f74f93ded2f0846a5bca72c73e95b
parent 87531182b1816a5a0be04c772b54c0f613336d95

Extend image service to support building factory image.

Run api/compile_build_api_proto to generate common_pb2.py based on
src/chromiumos/common.proto. Modify BuildFactoryInstallImage in commands.py
to use the image_service.

BUG=chromium:992349
TEST=manual, run_tests

Change-Id: I995b78cbfe36993cade15151dcbe2909cdeeab4c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1753550
Reviewed-by: Alex Klein <saklein@chromium.org>
Tested-by: Michael Mortensen <mmortensen@google.com>
Commit-Queue: Michael Mortensen <mmortensen@google.com>

api/controller/image.py

diff --git a/api/controller/image.py b/api/controller/image.py
index 3905da9..88d2d52 100644
--- a/api/controller/image.py
+++ b/api/controller/image.py
@@ -26,6 +26,9 @@
 _TEST_ID = common_pb2.TEST
 _BASE_VM_ID = common_pb2.BASE_VM
 _TEST_VM_ID = common_pb2.TEST_VM
+_RECOVERY_ID = common_pb2.RECOVERY
+_FACTORY_ID = common_pb2.FACTORY
+_FIRMWARE_ID = common_pb2.FIRMWARE
 
 # Dict to allow easily translating names to enum ids and vice versa.
 _IMAGE_MAPPING = {
@@ -35,6 +38,12 @@
     constants.IMAGE_TYPE_DEV: _DEV_ID,
     _TEST_ID: constants.IMAGE_TYPE_TEST,
     constants.IMAGE_TYPE_TEST: _TEST_ID,
+    _RECOVERY_ID: constants.IMAGE_TYPE_RECOVERY,
+    constants.IMAGE_TYPE_RECOVERY: _RECOVERY_ID,
+    _FACTORY_ID: constants.IMAGE_TYPE_FACTORY,
+    constants.IMAGE_TYPE_FACTORY: _FACTORY_ID,
+    _FIRMWARE_ID: constants.IMAGE_TYPE_FIRMWARE,
+    constants.IMAGE_TYPE_FIRMWARE: _FIRMWARE_ID,
 }
 
 _VM_IMAGE_MAPPING = {