commit c55d631148fa7c75ec05324e86f521870a402060
author George Engelbrecht <engeg@google.com> Wed May 05 12:11:13 2021 -0600
committer Commit Bot <commit-bot@chromium.org> Thu May 06 05:24:06 2021 +0000
tree c74d4daba03f480535f8703139b106026cdab4ff
parent a57f230358e52918da177b3ecb8e74656267ec74

refactor: change to IMAGE_TYPE prefix

Refactor chromite code that uses the image type enum without
the prefix.

BUG=b:187214166
TEST=./run_tests.py

Change-Id: I8e8645e6e968bc799a3c8666bab2a64258fb46bd
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2874492
Reviewed-by: LaMont Jones <lamontjones@chromium.org>
Reviewed-by: Mike Nichols <mikenichols@chromium.org>
Commit-Queue: George Engelbrecht <engeg@google.com>
Tested-by: George Engelbrecht <engeg@google.com>

api/controller/image.py

diff --git a/api/controller/image.py b/api/controller/image.py
index a28bb0c..8406f66 100644
--- a/api/controller/image.py
+++ b/api/controller/image.py
@@ -27,16 +27,16 @@
 from chromite.utils import metrics
 
 # The image.proto ImageType enum ids.
-_BASE_ID = common_pb2.BASE
-_DEV_ID = common_pb2.DEV
-_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
-_BASE_GUEST_VM_ID = common_pb2.BASE_GUEST_VM
-_TEST_GUEST_VM_ID = common_pb2.TEST_GUEST_VM
+_BASE_ID = common_pb2.IMAGE_TYPE_BASE
+_DEV_ID = common_pb2.IMAGE_TYPE_DEV
+_TEST_ID = common_pb2.IMAGE_TYPE_TEST
+_BASE_VM_ID = common_pb2.IMAGE_TYPE_BASE_VM
+_TEST_VM_ID = common_pb2.IMAGE_TYPE_TEST_VM
+_RECOVERY_ID = common_pb2.IMAGE_TYPE_RECOVERY
+_FACTORY_ID = common_pb2.IMAGE_TYPE_FACTORY
+_FIRMWARE_ID = common_pb2.IMAGE_TYPE_FIRMWARE
+_BASE_GUEST_VM_ID = common_pb2.IMAGE_TYPE_BASE_GUEST_VM
+_TEST_GUEST_VM_ID = common_pb2.IMAGE_TYPE_TEST_GUEST_VM
 
 # Dict to allow easily translating names to enum ids and vice versa.
 _IMAGE_MAPPING = {

api/controller/image_unittest.py

diff --git a/api/controller/image_unittest.py b/api/controller/image_unittest.py
index 478e07c..c808c17 100644
--- a/api/controller/image_unittest.py
+++ b/api/controller/image_unittest.py
@@ -95,7 +95,7 @@
 
   def testSingleTypeSpecified(self):
     """Test it's properly using a specified type."""
-    request = self._GetRequest(board='board', types=[common_pb2.DEV])
+    request = self._GetRequest(board='board', types=[common_pb2.IMAGE_TYPE_DEV])
 
     # Failed result to avoid the success handling logic.
     result = image_service.BuildResult(1, [])
@@ -108,7 +108,7 @@
   def testMultipleAndImpliedTypes(self):
     """Test multiple types and implied type handling."""
     # The TEST_VM type should force it to build the test image.
-    types = [common_pb2.BASE, common_pb2.TEST_VM]
+    types = [common_pb2.IMAGE_TYPE_BASE, common_pb2.IMAGE_TYPE_TEST_VM]
     expected_images = [constants.IMAGE_TYPE_BASE, constants.IMAGE_TYPE_TEST]
 
     request = self._GetRequest(board='board', types=types)