Merge lp:~thomir-deactivatedaccount/autopkgtest-result-checker/snappy-image-tests-queues-in-code into lp:autopkgtest-result-checker/snappy-image-tests

[Thomi Richards]

Move queue names into constants module.

Move queue names into constants module.

[Paul Larson (pwlars)]

This looks good. Was this discussed as something we want to move to doing on all the services, or was this specific to the needs of autopkgtest-result-checker?

review: Approve

[Celso Providelo (cprov)]

It looks very nice and explores contstants.py to our benefit, because currently we know that most service context changes will imply only in different constants (logic remains the same).

As we see the need to deploy other services in different contexts the their original one, we should probably execute land a similar patch to isolate queue names in constants.py.

[]

review: Approve

[Para Siva (psivaa)]

+1, This is a very justifiable middle ground which is even better than the other two extremes.

review: Approve

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve

[Para Siva (psivaa)]

It's a little confusing to have the queue names not matching the branch name. I realize it will be more work to change the queue names to include 'snappy' in it.

I'd prefer the name of the branch to lp:autopkgtest-result-checker/core-image-tests or some sort to include 'core' in it.

review: Needs Fixing

=== modified file 'core_result_checker/__init__.py'
--- core_result_checker/__init__.py	2015-04-07 21:45:33 +0000
+++ core_result_checker/__init__.py	2015-05-21 21:55:04 +0000
@@ -170,7 +170,7 @@
         if retry_count < self.max_retries:
             payload['test_run_retry_count'] = retry_count + 1
             self._insert_payload_into_queue(
-                "core.tests.{}".format(constants.API_VERSION),
+                constants.TEST_RETRY_QUEUE,
                 payload
             )
         else:
@@ -180,7 +180,7 @@
                 "letter queue"
             )
             self._insert_payload_into_queue(
-                "core.deadletters.{}".format(constants.API_VERSION),
+                constants.DEAD_LETTER_QUEUE,
                 payload
             )
 
@@ -209,7 +209,7 @@
                 "Requeueing message since swift is not yet consistent"
             )
             self._insert_payload_into_queue(
-                "core.result.{}".format(constants.API_VERSION),
+                constants.INPUT_QUEUE,
                 payload
             )
         else:
@@ -219,7 +219,7 @@
                 self.swift_retry_seconds
             )
             self._insert_payload_into_queue(
-                "core.deadletters.{}".format(constants.API_VERSION),
+                constants.DEAD_LETTER_QUEUE,
                 payload
             )
 
@@ -241,7 +241,7 @@
     amqp_uris = config.get('amqp', 'uris').split()
     retry_policy = DefaultRetryPolicy(
         max_retries=3,
-        dead_queue='core.deadletters.{}'.format(constants.API_VERSION)
+        dead_queue=constants.DEAD_LETTER_QUEUE
     )
     try:
         with kombu.Connection(amqp_uris) as connection:
@@ -250,7 +250,7 @@
             worker = Worker(swift_manager, retry_publisher)
             queue_monitor = SimpleRabbitQueueWorker(
                 connection,
-                "core.result.{}".format(constants.API_VERSION),
+                constants.INPUT_QUEUE,
                 worker,
                 retry_policy,
             )

=== modified file 'core_result_checker/constants.py'
--- core_result_checker/constants.py	2015-04-01 02:02:29 +0000
+++ core_result_checker/constants.py	2015-05-21 21:55:04 +0000
@@ -17,7 +17,17 @@
 
 """Constants for this service."""
 
-API_VERSION = "v1"
+# 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"
+
+# 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"
+
 
 SOLUTION_NAME = "core-image-testing"