commit b60c31387d7408dba0bc2203fd1620865a037918
author Amin Hassani <ahassani@chromium.org> Tue Dec 03 13:26:04 2019 -0800
committer Commit Bot <commit-bot@chromium.org> Fri Dec 06 02:16:26 2019 +0000
tree df313eb07e582b8af55361276169ca3f1900905e
parent 64ee2a18f5ba312fa18a26ad4933542dbc6ffd18

nebraska: Distinguish between platform and DLC request

We need this difference to respond to an update/install with parameters
that should only be available for platform vs DLC APP tags in the
response. For example, requesting a rollback should only return response
for platform App request. Same as what Omaha/GE will do.

BUG=chromium:999047
TEST=nebraska_unittest.py

Change-Id: Ied173e71407fec49b163818c7ce1cb2401c6bd85
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/1951505
Tested-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Jae Hoon Kim <kimjae@chromium.org>
Commit-Queue: Amin Hassani <ahassani@chromium.org>

nebraska/nebraska.py

diff --git a/nebraska/nebraska.py b/nebraska/nebraska.py
index 579fbc1..4bc1a29 100755
--- a/nebraska/nebraska.py
+++ b/nebraska/nebraska.py
@@ -239,6 +239,7 @@
       self.event_type = None
       self.event_result = None
       self.previous_version = None
+      self.is_platform = None
 
       self.ParseApp(app)
 
@@ -278,6 +279,11 @@
       if None in (self.request_type, self.appid, self.version):
         raise InvalidRequestError('Invalid app request.')
 
+      # This is a weak indication of whether a request is for a platform update
+      # (platform App IDs don't have underscore, but DLCs have). But for now it
+      # robustly gets what we want.
+      self.is_platform = '_' not in self.appid
+
     def MatchAppData(self, app_data, partial_match_appid=False):
       """Returns true iff the app matches a given client request.
 

nebraska/nebraska_unittest.py

diff --git a/nebraska/nebraska_unittest.py b/nebraska/nebraska_unittest.py
index 278259a..54ec8ff 100755
--- a/nebraska/nebraska_unittest.py
+++ b/nebraska/nebraska_unittest.py
@@ -857,6 +857,20 @@
     self.assertEqual(app_requests[0].event_result, 1)
     self.assertEqual(app_requests[0].previous_version, '1')
 
+  def testDetectingPlatformAppRequest(self):
+    """Tests we correctly identify platform VS. DLC requests"""
+    request = GenerateAppRequest(appid='foo-platform')
+    self.assertTrue(request.is_platform)
+
+    request = GenerateAppRequest(appid='')
+    self.assertTrue(request.is_platform)
+
+    request = GenerateAppRequest(appid='foo-platform_dlc')
+    self.assertFalse(request.is_platform)
+
+    request = GenerateAppRequest(appid='_dlc')
+    self.assertFalse(request.is_platform)
+
 
 class ResponseTest(unittest.TestCase):
   """Tests for Response class."""