Merge lp:~thomir-deactivatedaccount/autopkgtest-result-checker/snappy-proposed-migration-fix-queue-names into lp:autopkgtest-result-checker/snappy-proposed-migration

[Thomi Richards]

Update queue & exchange names, fix a few lint issues.

Update queue & exchange names, fix a few lint issues.

[Kit Randel (blr)]

Lacking some context, but looks correct.

review: Approve (code)

=== modified file 'core_result_checker/__init__.py'
--- core_result_checker/__init__.py	2015-05-21 01:53:57 +0000
+++ core_result_checker/__init__.py	2015-05-25 21:25:00 +0000
@@ -23,6 +23,7 @@
 import os
 
 import kombu
+from kombu.pools import producers
 from swiftclient.service import SwiftService
 from uservice_utils.logging import (
     configure_service_logging,
@@ -221,9 +222,20 @@
 
 
 def insert_payload_into_queue(connection, queue, payload):
-        q = connection.SimpleQueue(queue)
-        q.put(payload)
-        q.close()
+    q = connection.SimpleQueue(queue)
+    q.put(payload)
+    q.close()
+
+
+def insert_payload_into_fanout_exchange(connection, exchange_name, payload):
+    with producers[connection].acquire(block=True) as producer:
+        publisher = connection.ensure(
+            producer,
+            producer.publish,
+            max_retries=3
+        )
+        exchange = kombu.Exchange(exchange_name, type="fanout")
+        publisher(payload, exchange=exchange, declare=[exchange])
 
 
 def main():
@@ -258,9 +270,9 @@
                 constants.INPUT_QUEUE
             )
             complete_payload = partial(
-                insert_payload_into_queue,
+                insert_payload_into_fanout_exchange,
                 connection,
-                constants.DONE_QUEUE
+                constants.DONE_EXCHANGE,
             )
             queue_manager = QueueManager(
                 retry_payload,
 
=== modified file 'core_result_checker/constants.py'
--- core_result_checker/constants.py	2015-05-21 01:44:53 +0000
+++ core_result_checker/constants.py	2015-05-25 21:25:00 +0000
@@ -20,21 +20,21 @@
 # Queue names are constant, rather than being defined in the config.
 
 # The queue we listen to for new payloads to check:
-INPUT_QUEUE = "core.result.v1"
+INPUT_QUEUE = "snappy-proposed-migration.result"
 
 # The queue we put fatally error'd payloads into:
 DEAD_LETTER_QUEUE = "core.deadletters.v1"
 
 # The queue we put payloads on to re-run the test:
-TEST_RETRY_QUEUE = "core.tests.v1"
-
-# The queue we put results on:
-DONE_QUEUE = "pm.results"
-
-
-SOLUTION_NAME = "core-image-testing"
-
-SERVICE_NAME = "core-result-checker"
+TEST_RETRY_QUEUE = "snappy-proposed-migration.package"
+
+# The exchange we put results on:
+DONE_EXCHANGE = "results.exchange"
+
+
+SOLUTION_NAME = "snappy-proposed-migration"
+
+SERVICE_NAME = "result-checker"
 
 
 def _get_hostname():