commit b0dfe557cf1b6366f35b8b88746c75a06bb5aa83
author joychen <joychen@google.com> Tue Jul 30 10:02:06 2013 -0700
committer ChromeBot <chrome-bot@google.com> Thu Aug 01 13:22:57 2013 -0700
tree 0c534c23a7e0143e441d133dc937b0ff129a4a38
parent 7c2054ae50f6980f50eb9604c3b610640b889808

XBuddy path rewrites.

Set up default path rewrites.
Rewrites can be overridden by changing xbuddy_lookup_table.py

BUG=chromium:265917
TEST=manual
Attempt some of the default lookup paths defined in
xbuddy_lookup_table.py.
http://host:port/xbuddy/ --> serves latest local test image if it exists
http://host:port/xbuddy/ld --> serves latest local dev image if it exists
http://host:port/xbuddy/stable-update
http://host:port/xbuddy/paladin

Change-Id: I925ba37f3bfe6e61675aa35e0d89b837c8d5f0f3
Reviewed-on: https://gerrit.chromium.org/gerrit/63772
Commit-Queue: Joy Chen <joychen@chromium.org>
Reviewed-by: Joy Chen <joychen@chromium.org>
Tested-by: Joy Chen <joychen@chromium.org>

xbuddy.py

diff --git a/xbuddy.py b/xbuddy.py
index 3e7c54b..f9c274b 100644
--- a/xbuddy.py
+++ b/xbuddy.py
@@ -18,6 +18,7 @@
 import downloader
 import gsutil_util
 import log_util
+import xbuddy_lookup_table
 
 # Module-local log function.
 def _Log(message, *args):
@@ -146,9 +147,17 @@
   # Lock used to lock increasing/decreasing count.
   _staging_thread_count_lock = threading.Lock()
 
-  def __init__(self, manage_builds=False,  **kwargs):
+  def __init__(self, manage_builds=False, board=None, **kwargs):
     super(XBuddy, self).__init__(**kwargs)
     self._manage_builds = manage_builds
+
+    # Choose a default board, using the --board flag if given, or
+    # src/scripts/.default_board if it exists.
+    # Default to x86-generic, if that isn't set.
+    self._board = (board or self.GetDefaultBoardID())
+    _Log("Default board used by xBuddy: %s", self._board)
+    self._path_lookup_table = xbuddy_lookup_table.paths(self._board)
+
     self._timestamp_folder = os.path.join(self.static_dir,
                                           Timestamp.XBUDDY_TIMESTAMP_DIR)
     common_util.MkDirP(self._timestamp_folder)
@@ -281,7 +290,7 @@
       found - True if file was found
     """
     latest_local_dir = self.GetLatestImageDir(board)
-    if not latest_local_dir and os.path.exists(latest_local_dir):
+    if not latest_local_dir or not os.path.exists(latest_local_dir):
       raise XBuddyException('No builds found for %s. Did you run build_image?' %
                             board)
 
@@ -319,11 +328,9 @@
         is_local = True
       elif path_list[0] == REMOTE:
         path_list.pop(0)
-      _Log(str(path_list))
 
       # Set board
       board = path_list.pop(0)
-      _Log(str(path_list))
 
       # Set defaults
       version = LATEST
@@ -475,6 +482,10 @@
     Raises:
     XBuddyException if the path could not be translated
     """
+    # Rewrite the path if there is an appropriate default.
+    path = self._path_lookup_table.get('/'.join(path), path)
+
+    # Parse the path
     image_type, board, version, is_local = self._InterpretPath(path)
 
     found = False