Merge lp:~thomir-deactivatedaccount/adt-cloud-worker/trunk-fix-versions into lp:adt-cloud-worker

[Thomi Richards]

Version the routing key, not the queue names.

Version the routing key, not the queue names.

[Celso Providelo (cprov)]

review: Needs Fixing

[lp:~thomir-deactivatedaccount/adt-cloud-worker/trunk-fix-versions]

23. By Thomi Richards on 2015-03-17

Fix from code review.

[Celso Providelo (cprov)]

review: Approve

=== modified file 'adt_cloud_worker/__init__.py'
--- adt_cloud_worker/__init__.py	2015-03-16 20:50:34 +0000
+++ adt_cloud_worker/__init__.py	2015-03-17 03:06:09 +0000
@@ -37,9 +37,10 @@
     set_config_dict,
     upload_tarball_to_swift_container,
 )
-ROUTING_KEYS = (
-    'amd64.nova',
-    'i386.nova'
+
+ARCHITECTURES = (
+    'amd64',
+    'i386'
 )
 API_VERSION = "v1"
 
@@ -64,9 +65,11 @@
         exchange = kombu.Exchange("adt.exchange", type="topic")
         queues = [
             kombu.Queue(
-                'adt.requests.{}.{}'.format(
-                    key, API_VERSION), exchange, routing_key=key)
-            for key in ROUTING_KEYS
+                'adt.requests.{}.nova'.format(arch),
+                exchange,
+                routing_key="{}.nova.{}".format(arch, API_VERSION)
+            )
+            for arch in ARCHITECTURES
         ]
         return [Consumer(queues=queues, callbacks=[self.process])]