Merge lp:~fginther/core-image-watcher/edge-support into lp:core-image-watcher

[Francis Ginther]

Add support for release and ubuntu-device-flash 0.20snappy7-0ubuntu1.

[Celso Providelo (cprov)]

Francis,

Wouldn't it be easier to simply have "channel = ubuntu-core/rolling/edge" ?

review: Needs Information

[Francis Ginther (fginther)]

Rejecting as a different solution was implemented that only required modifications to the publisher.

Unmerged revisions

17. By Francis Ginther on 2015-04-22

Add support for release and ubuntu-device-flash 0.20snappy7-0ubuntu1.

=== modified file 'core-service.conf'
--- core-service.conf	2015-03-31 14:27:00 +0000
+++ core-service.conf	2015-04-22 19:35:13 +0000
@@ -4,7 +4,8 @@
 uris = amqp://guest:guest@localhost:5672//
 
 [image]
-channel = ubuntu-core/devel-proposed
+channel = edge
+release = rolling
 device = generic_amd64
 location = /tmp/latest-core-image-version
 poll_period = 60

=== modified file 'core_image_watcher/__init__.py'
--- core_image_watcher/__init__.py	2015-04-08 01:59:01 +0000
+++ core_image_watcher/__init__.py	2015-04-22 19:35:13 +0000
@@ -57,13 +57,13 @@
         logger.info('Done!', extra=extra)
 
 
-def _get_version_string_output(channel, device):
+def _get_version_string_output(release, channel, device):
     """Obtains a bytestring of the images info from the core image server"""
     cmd = [
         'ubuntu-device-flash',
         'query',
         '--list-images',
-        '--channel={}'.format(channel),
+        '--channel=ubuntu-core/{}/{}'.format(release, channel),
         '--device={}'.format(device),
     ]
     images = b''
@@ -75,11 +75,12 @@
         return images
 
 
-def _get_latest_image_version(channel,
+def _get_latest_image_version(release,
+                              channel,
                               device,
                               get_output=_get_version_string_output):
     """Returns largest image version"""
-    images = get_output(channel, device).split()
+    images = get_output(release, channel, device).split()
     if (len(images) >= 2):
         return images[-2].decode('utf-8').replace(':', '')
 
@@ -110,12 +111,13 @@
 
 
 def _check_for_new_image(location,
+                         release,
                          channel,
                          device,
                          latest_image_version=_get_latest_image_version,
                          cached_version=_cache_version_to_disk):
     """Check if a new image is present in the core image server"""
-    latest_version = latest_image_version(channel, device)
+    latest_version = latest_image_version(release, channel, device)
     try:
         ret = cached_version(location, latest_version)
         if not ret:
@@ -127,6 +129,7 @@
         return None
     body = {
         'image_name': latest_version,
+        'release': release,
         'channel': channel,
         'device': device,
         'request_id': uuid(),
@@ -156,6 +159,7 @@
 
     amqp_uris = config.get('amqp', 'uris').split()
     location = config.get('image', 'location')
+    release = config.get('image', 'release')
     channel = config.get('image', 'channel')
     device = config.get('image', 'device')
     poll_period = float(config.get('image', 'poll_period'))
@@ -163,6 +167,7 @@
     try:
         while True:
             message_body = _check_for_new_image(location,
+                                                release,
                                                 channel,
                                                 device)
             if message_body:

=== modified file 'core_image_watcher/tests/test_image_watcher.py'
--- core_image_watcher/tests/test_image_watcher.py	2015-04-07 23:58:33 +0000
+++ core_image_watcher/tests/test_image_watcher.py	2015-04-22 19:35:13 +0000
@@ -65,32 +65,35 @@
         self.assertEqual(return_value, '112')
 
     def test_get_latest_version(self):
-        def get_output(channel, device):
+        def get_output(release, channel, device):
             return b"295: description='fake295'\n\
                    296: description='fake296'\n\
                    297: description='fake297'\n\
                    298: description='fake338'\n"
-        observed = _get_latest_image_version('fakechannel',
+        observed = _get_latest_image_version('fakerelease',
+                                             'fakechannel',
                                              'fakedevice',
                                              get_output)
         self.assertEqual(observed, '298')
 
     def test_dont_get_latest_version(self):
-        def get_output(channel, device):
+        def get_output(release, channel, device):
             return b"100: description='fake100'\n"
-        observed = _get_latest_image_version('fakechannel',
+        observed = _get_latest_image_version('fakerelease',
+                                             'fakechannel',
                                              'fakedevice',
                                              get_output)
         self.assertEqual(observed, '100')
 
     def test_check_for_new_image(self):
-        def _get_latest_image_version(channel, device):
+        def _get_latest_image_version(release, channel, device):
             return '100'
 
         def _cache_version_to_disk(location, latest_version):
             return '99'
 
         body = _check_for_new_image('fakelocation',
+                                    'fakerelease',
                                     'fakechannel',
                                     'fakedevice',
                                     _get_latest_image_version,
@@ -101,6 +104,7 @@
                 {
                     'device': Equals('fakedevice'),
                     'image_name': Equals('100'),
+                    'release': Equals('fakerelease'),
                     'channel': Equals('fakechannel'),
                     'request_id': NotEquals(''),
                 }
@@ -108,13 +112,14 @@
         )
 
     def test_check_for_no_new_image(self):
-        def _get_latest_image_version(channel, device):
+        def _get_latest_image_version(release, channel, device):
             return '100'
 
         def _cache_version_to_disk(location, latest_version):
             return None
 
         body = _check_for_new_image('fakelocation',
+                                    'fakerelease',
                                     'fakechannel',
                                     'fakedevice',
                                     _get_latest_image_version,