Merge lp:~thomir-deactivatedaccount/core-image-publisher/trunk-publish-messages into lp:core-image-publisher

[Thomi Richards]

Publish result messages to the next micro-service.

Publish result messages to the next micro-service.

[Francis Ginther (fginther)]

Approve.

review: Approve

=== modified file 'core_image_publisher/__init__.py'
--- core_image_publisher/__init__.py	2015-03-30 03:51:14 +0000
+++ core_image_publisher/__init__.py	2015-03-30 20:35:37 +0000
@@ -26,6 +26,7 @@
 from core_image_publisher.queue import (
     create_connection_from_config,
     CoreImagePublisherQueueMonitor,
+    CoreImageResultPublisher,
 )
 from core_image_publisher import worker
 
@@ -93,9 +94,10 @@
     connection = create_connection_from_config(config)
     try:
         with connection:
+            publisher = CoreImageResultPublisher(connection)
             monitor = CoreImagePublisherQueueMonitor(
                 connection,
-                worker.ImagePublisherWorker(config)
+                worker.ImagePublisherWorker(config, publisher)
             )
             monitor.run()
     except KeyboardInterrupt:

=== modified file 'core_image_publisher/queue.py'
--- core_image_publisher/queue.py	2015-03-30 20:05:16 +0000
+++ core_image_publisher/queue.py	2015-03-30 20:35:37 +0000
@@ -28,8 +28,8 @@
 
 __all__ = [
     'CoreImagePublisherQueueMonitor',
+    'CoreImageResultPublisher',
     'create_connection_from_config',
-    'enqueue_message',
 ]
 
 
@@ -153,5 +153,23 @@
     return kombu.Connection(amqp_uris)
 
 
-def enqueue_message(payload):
-    """Enqueue 'payload' for the core-image-tester."""
+class CoreImageResultPublisher(object):
+
+    """A callable that knows how to publish results from this service.
+
+    For now we're using a simple queue, but this can easily be extended to use
+    a full-blown topic exchange in the future.
+
+    """
+
+    def __init__(self, connection):
+        self.connection = connection
+
+    def __call__(self, payload):
+        """Take 'payload' and enqueue it on the rabbit queue."""
+        queue = self.connection.SimpleQueue(
+            "core.tests.{}".format(constants.API_VERSION)
+        )
+        queue.put(payload)
+        queue.close()
+

=== modified file 'core_image_publisher/worker.py'
--- core_image_publisher/worker.py	2015-03-30 04:04:49 +0000
+++ core_image_publisher/worker.py	2015-03-30 20:35:37 +0000
@@ -22,10 +22,7 @@
 import subprocess
 import tempfile
 
-from core_image_publisher.queue import (
-    enqueue_message,
-    MessageActions,
-)
+from core_image_publisher.queue import MessageActions
 from core_image_publisher.cloud import get_glance_client
 from core_image_publisher.utils import check_call
 
@@ -36,8 +33,9 @@
 
     """A worker callable that contains all our main logic."""
 
-    def __init__(self, config):
+    def __init__(self, config, publisher):
         self._config = config
+        self.publish_results = publisher
 
     def __call__(self, payload):
         logger.info("Got %r", payload, extra=payload)
@@ -83,7 +81,7 @@
             logger.info("Image uploaded to glance OK.", extra=payload)
 
         payload['nova_image'] = glance_image_name
-        enqueue_message(payload)
+        self.publish_results(payload)
         logger.info("Processing completed.", extra=payload)
         return MessageActions.Acknowledge
 
@@ -126,7 +124,7 @@
     """
     glance = get_glance_client(config)
     image_name = os.path.basename(nova_image_path)
-    image = glance.images.create(
+    glance.images.create(
         name=image_name,
         data=open(nova_image_path, 'rb'),
         disk_format='qcow2',