Merge lp:~joetalbott/snappy-proposed-image-builder/rename_queues into lp:snappy-proposed-image-builder

[Joe Talbott]

Rename queues to match convention and move to constants.

Rename queues to match convention and move to constants.

[Paul Larson (pwlars)]

This one seems to be just about queue names. Is there another one for all the other bits?
One suggestion below, but not a blocker for me. Otherwise +1

review: Approve

[Francis Ginther (fginther)]

This matches the naming proposal AFIACT. Also interesting approach of using a table.

review: Approve

=== modified file 'core_image_builder/__init__.py'
--- core_image_builder/__init__.py	2015-05-21 19:00:39 +0000
+++ core_image_builder/__init__.py	2015-05-27 13:40:52 +0000
@@ -70,11 +70,10 @@
             builder = CoreImageBuilder(connection)
             retry_policy = DefaultRetryPolicy(
                 max_retries=3,
-                dead_queue='core.deadletters.{}'.format(constants.API_VERSION)
+                dead_queue=constants.QUEUES['deadletters']
             )
             monitor = SimpleRabbitQueueWorker(
-                connection,
-                'core.package.{}'.format(constants.API_VERSION),
+                connection, constants.QUEUES['packages'],
                 worker.ImageBuilderWorker(config, builder),
                 retry_policy,
             )

=== modified file 'core_image_builder/constants.py'
--- core_image_builder/constants.py	2015-05-19 21:37:40 +0000
+++ core_image_builder/constants.py	2015-05-27 13:40:52 +0000
@@ -52,3 +52,10 @@
     'service': SERVICE_NAME,
     'hostname': HOSTNAME,
 }
+
+QUEUE_PREFIX = 'snappy-proposed'
+QUEUES = {
+    'deadletters': '{}.deadletters.{}'.format(QUEUE_PREFIX, API_VERSION),
+    'packages': '{}.packages.{}'.format(QUEUE_PREFIX, API_VERSION),
+    'tests': '{}.tests.{}'.format(QUEUE_PREFIX, API_VERSION),
+}

=== modified file 'core_image_builder/queue.py'
--- core_image_builder/queue.py	2015-05-21 19:00:39 +0000
+++ core_image_builder/queue.py	2015-05-27 13:40:52 +0000
@@ -53,8 +53,6 @@
 
     def __call__(self, payload):
         """Take 'payload' and enqueue it on the rabbit queue."""
-        queue = self.connection.SimpleQueue(
-            "core.tests.{}".format(constants.API_VERSION)
-        )
+        queue = self.connection.SimpleQueue(constants.QUEUES['tests'])
         queue.put(payload)
         queue.close()