Merge lp:~psivaa/core-image-watcher/channel-release-for-image-publisher into lp:core-image-watcher

[Para Siva]

Separating channel and release for the 'old' core-image-watcher for agreeing to core-image-publisher API contract.

Separating channel and release for the 'old' core-image-watcher for providing the payload that the new core-image-publisher uses. Same changes as was done for lp:core-image-watcher/15.04-edge-core-image-watcher. This is being proposed in preparation for changes to be done in core-image-publisher to use the channel and release data from the payload it receives from the watcher.

[lp:~psivaa/core-image-watcher/channel-release-for-image-publisher]

18. By Para Siva on 2015-06-04

correct output queue

[Francis Ginther (fginther)]

Looks good.

review: Approve

=== modified file 'core-service.conf'
--- core-service.conf	2015-03-31 14:27:00 +0000
+++ core-service.conf	2015-06-04 11:20:36 +0000
@@ -3,12 +3,6 @@
 [amqp]
 uris = amqp://guest:guest@localhost:5672//
 
-[image]
-channel = ubuntu-core/devel-proposed
-device = generic_amd64
-location = /tmp/latest-core-image-version
-poll_period = 60
-
 [logstash]
 host = 127.0.0.1
 port = 5959

=== 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-06-04 11:20:36 +0000
@@ -49,7 +49,7 @@
         logger.info('Triggering request: %s', body, extra=extra)
         try:
             queue = connection.SimpleQueue(
-                'core.image.{}'.format(constants.API_VERSION))
+                constants.OUTPUT_QUEUE)
             queue.put(body)
             queue.close()
         except Exception as exc:
@@ -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(),
@@ -155,14 +158,16 @@
     logger.info('Started!', extra=logging_extra)
 
     amqp_uris = config.get('amqp', 'uris').split()
-    location = config.get('image', 'location')
-    channel = config.get('image', 'channel')
-    device = config.get('image', 'device')
-    poll_period = float(config.get('image', 'poll_period'))
+    location = constants.LOCATION
+    release = constants.RELEASE
+    channel = constants.CHANNEL
+    device = constants.DEVICE
+    poll_period = float(constants.POLL_PERIOD)
 
     try:
         while True:
             message_body = _check_for_new_image(location,
+                                                release,
                                                 channel,
                                                 device)
             if message_body:

=== modified file 'core_image_watcher/constants.py'
--- core_image_watcher/constants.py	2015-04-01 01:14:59 +0000
+++ core_image_watcher/constants.py	2015-06-04 11:20:36 +0000
@@ -14,34 +14,25 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """Constants for this service."""
 
+import socket
 
-API_VERSION = "v1"
 
 SOLUTION_NAME = "core-image-testing"
 
 SERVICE_NAME = "core-image-watcher"
 
-
-def _get_hostname():
-    """Return sanitized contents of /etc/hostname.
-
-    It is necessary because current juju hostnames (juju-<env-name>-machine-#)
-    are too big due to our long environment names ('<spec_name>-<MD5>').
-    Linux (DNS for RFC1035, really) only supports labels up to 64 chars and
-    the fallback varies from tool to tool, `cloud-init` chokes on longer
-    names and sets 'ubuntu' (which is the value considered by socket.get*),
-    `hostnamectl` (systemd) would truncate the given data.
-
-    None of this is ideal to our applications, that's why we will operate
-    on the pristine /etc/hostname and remove the 'juju-' and '-machine' terms
-    added by juju.
-    """
-    with open('/etc/hostname') as fd:
-        hostname = fd.read()
-    return hostname.replace('juju-', '').replace('-machine', '').strip()
-
-
-HOSTNAME = _get_hostname()
+OUTPUT_QUEUE = 'core.image.v1'
+
+HOSTNAME = socket.gethostname()
+
+RELEASE = "rolling"
+
+CHANNEL = 'edge'
+
+DEVICE = "generic_amd64"
+
+LOCATION = "/tmp/latest-image-version"
+
+POLL_PERIOD = 60

=== 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-06-04 11:20:36 +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,