Merge lp:~thomir-deactivatedaccount/core-image-watcher/trunk-use-request-id into lp:core-image-watcher

[Thomi Richards]

Add the request_id payload key.

Create and return a uuid in the request payload.

[Celso Providelo (cprov)]

Let's use the kombu UUIDv4 accessor for peace of mind here.

I will pre-approved it because I probably won't be here when you come from lunch.

review: Approve

[lp:~thomir-deactivatedaccount/core-image-watcher/trunk-use-request-id]

17. By Thomi Richards on 2015-04-08

Use kombu uuid.

=== modified file 'core_image_watcher/__init__.py'
--- core_image_watcher/__init__.py	2015-04-03 02:05:16 +0000
+++ core_image_watcher/__init__.py	2015-04-08 01:59:17 +0000
@@ -25,6 +25,7 @@
 import time
 
 import kombu
+from kombu.common import uuid
 from uservice_utils.logging import configure_service_logging
 
 from core_image_watcher import constants
@@ -128,6 +129,7 @@
         'image_name': latest_version,
         'channel': channel,
         'device': device,
+        'request_id': uuid(),
     }
     return body
 

=== modified file 'core_image_watcher/tests/test_image_watcher.py'
--- core_image_watcher/tests/test_image_watcher.py	2015-03-26 20:44:05 +0000
+++ core_image_watcher/tests/test_image_watcher.py	2015-04-08 01:59:17 +0000
@@ -16,6 +16,11 @@
 import os
 import tempfile
 import testtools
+from testtools.matchers import (
+    Equals,
+    MatchesDict,
+    NotEquals,
+)
 
 from core_image_watcher import (
     _cache_version_to_disk,
@@ -90,10 +95,17 @@
                                     'fakedevice',
                                     _get_latest_image_version,
                                     _cache_version_to_disk)
-        self.assertEqual(body,
-                         {'device': 'fakedevice',
-                          'image_name': '100',
-                          'channel': 'fakechannel'})
+        self.assertThat(
+            body,
+            MatchesDict(
+                {
+                    'device': Equals('fakedevice'),
+                    'image_name': Equals('100'),
+                    'channel': Equals('fakechannel'),
+                    'request_id': NotEquals(''),
+                }
+            )
+        )
 
     def test_check_for_no_new_image(self):
         def _get_latest_image_version(channel, device):