commit b171d65e52a5517183cfe47df5c988f976ef9719
author David Burger <dburger@chromium.org> Mon May 13 16:07:00 2019 -0600
committer Commit Bot <commit-bot@chromium.org> Tue May 14 00:42:49 2019 +0000
tree 71189c535dbbf9ee8e963196976e4d57654d95ec
parent a5b7536b59984b586033f9d1c63bf90290f10c2e

Use common image types in image controller.

Switch to using the common image types in the image controller as
the enum is being moved there to be shared with BuilderConfigs.

TEST=./run_tests
BUG=None

Change-Id: I5caebc034ce51b6becb83dcfb47e123ce5645121
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1611004
Reviewed-by: Alex Klein <saklein@chromium.org>
Commit-Queue: David Burger <dburger@chromium.org>
Tested-by: David Burger <dburger@chromium.org>

api/controller/image.py

diff --git a/api/controller/image.py b/api/controller/image.py
index 0dda2c4..16a01f7 100644
--- a/api/controller/image.py
+++ b/api/controller/image.py
@@ -12,7 +12,7 @@
 
 import os
 
-from chromite.api.gen.chromite.api import image_pb2
+from chromite.api.gen.chromiumos import common_pb2
 from chromite.api.controller import controller_util
 from chromite.lib import cros_build_lib
 from chromite.lib import constants
@@ -20,9 +20,9 @@
 from chromite.service import image
 
 # The image.proto ImageType enum ids.
-_BASE_ID = image_pb2.Image.BASE
-_DEV_ID = image_pb2.Image.DEV
-_TEST_ID = image_pb2.Image.TEST
+_BASE_ID = common_pb2.BASE
+_DEV_ID = common_pb2.DEV
+_TEST_ID = common_pb2.TEST
 
 # Dict to allow easily translating names to enum ids and vice versa.
 _IMAGE_MAPPING = {