commit 08e487d227dac583f4bebcbf42e6ae9dcf3053ab
author Richard Barnette <jrbarnette@chromium.org> Fri Mar 30 18:39:31 2018 -0700
committer chrome-bot <chrome-bot@chromium.org> Tue Apr 03 12:50:34 2018 -0700
tree 6eed8f18ce2117f24a5f70467fea6e0b05c57e03
parent 8a613a62e7d51bd0039355ddeda3e3523a27acc5

[autotest] Simplify `get_firmware_versions()`

This simplifies `assign_stable_images.get_firmware_versions()`
not to require a version_map object.

BUG=chromium:827734
TEST=unit tests, `assign_stable_images -n`

Change-Id: I9ad5b27ebf77a3af6856587e93c1cedcf85a0f35
Reviewed-on: https://chromium-review.googlesource.com/989293
Commit-Ready: Richard Barnette <jrbarnette@chromium.org>
Tested-by: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: Ningning Xia <nxia@chromium.org>

server/frontend.py

diff --git a/server/frontend.py b/server/frontend.py
index 49d1b04..01142a5 100644
--- a/server/frontend.py
+++ b/server/frontend.py
@@ -292,6 +292,22 @@
         return versions
 
 
+def format_cros_image_name(board, version):
+    """
+    Return an image name for a given `board` and `version`.
+
+    This formats `board` and `version` into a string identifying an
+    image file.  The string represents part of a URL for access to
+    the image.
+
+    The returned image name is typically of a form like
+    "falco-release/R55-8872.44.0".
+    """
+    build_pattern = GLOBAL_CONFIG.get_config_value(
+            'CROS', 'stable_build_pattern')
+    return build_pattern % (board, version)
+
+
 class _CrosVersionMap(_OSVersionMap):
     """
     Stable version mapping for Chrome OS release images.
@@ -305,22 +321,6 @@
     def __init__(self, afe):
         super(_CrosVersionMap, self).__init__(afe, False)
 
-    @staticmethod
-    def format_image_name(board, version):
-        """
-        Return an image name for a given `board` and `version`.
-
-        This formats `board` and `version` into a string identifying an
-        image file.  The string represents part of a URL for access to
-        the image.
-
-        The returned image name is typically of a form like
-        "falco-release/R55-8872.44.0".
-        """
-        build_pattern = GLOBAL_CONFIG.get_config_value(
-                'CROS', 'stable_build_pattern')
-        return build_pattern % (board, version)
-
     def get_image_name(self, board):
         """
         Return the full image name of the stable version for `board`.
@@ -332,7 +332,7 @@
         @return A string identifying the image file for the stable
                 image for `board`.
         """
-        return self.format_image_name(board, self.get_version(board))
+        return format_cros_image_name(board, self.get_version(board))
 
 
 class _AndroidVersionMap(_OSVersionMap):