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

[Thomi Richards]

Add some skeleton code.

Add some skeleton code.

[Paul Larson (pwlars)]

A couple of small questions, otherwise it looks fine to me.

review: Needs Information

[Paul Larson (pwlars)]

+1

review: Approve

[Ubuntu CI Bot (uci-bot)]

The attempt to merge lp:~thomir/core-image-publisher/trunk-skeleton into lp:core-image-publisher failed. Below is the output from the failed tests.

Using base prefix '/usr'
New python executable in /tmp/venv-core-image-publisherpy50c6da/bin/python3
Also creating executable in /tmp/venv-core-image-publisherpy50c6da/bin/python
Installing setuptools, pip...done.
Running virtualenv with interpreter /usr/bin/python3
Ignoring indexes: https://pypi.python.org/simple/
Downloading/unpacking kombu==3.0.24 (from -r requirements.txt (line 1))
Downloading/unpacking python-logstash==0.4.2 (from -r requirements.txt (line 2))
  Running setup.py (path:/tmp/venv-core-image-publisherpy50c6da/build/python-logstash/setup.py) egg_info for package python-logstash

Downloading/unpacking anyjson>=0.3.3 (from kombu==3.0.24->-r requirements.txt (line 1))
  Running setup.py (path:/tmp/venv-core-image-publisherpy50c6da/build/anyjson/setup.py) egg_info for package anyjson

Downloading/unpacking amqp>=1.4.5,<2.0 (from kombu==3.0.24->-r requirements.txt (line 1))
  Running setup.py (path:/tmp/venv-core-image-publisherpy50c6da/build/amqp/setup.py) egg_info for package amqp

Installing collected packages: kombu, python-logstash, anyjson, amqp
  Running setup.py install for python-logstash

  Running setup.py install for anyjson
    Fixing build/lib/anyjson/__init__.py
    Skipping implicit fixer: buffer
    Skipping implicit fixer: idioms
    Skipping implicit fixer: set_literal
    Skipping implicit fixer: ws_comma
    Fixing build/lib/anyjson/__init__.py
    Skipping implicit fixer: buffer
    Skipping implicit fixer: idioms
    Skipping implicit fixer: set_literal
    Skipping implicit fixer: ws_comma

  Running setup.py install for amqp

Successfully installed kombu python-logstash anyjson amqp
Cleaning up...
Downloading/unpacking testtools==1.7.1 (from -r test_requirements.txt (line 1))
Downloading/unpacking python-mimeparse (from testtools==1.7.1->-r test_requirements.txt (line 1))
  Downloading python-mimeparse-0.1.4.tar.gz
  Running setup.py (path:/tmp/venv-core-image-publisherpy50c6da/build/python-mimeparse/setup.py) egg_info for package python-mimeparse

Downloading/unpacking extras (from testtools==1.7.1->-r test_requirements.txt (line 1))
  Downloading extras-0.0.3.tar.gz
  Running setup.py (path:/tmp/venv-core-image-publisherpy50c6da/build/extras/setup.py) egg_info for package extras

Downloading/unpacking unittest2>=1.0.0 (from testtools==1.7.1->-r test_requirements.txt (line 1))
Downloading/unpacking traceback2 (from testtools==1.7.1->-r test_requirements.txt (line 1))
  Downloading traceback2-1.4.0-py2.py3-none-any.whl
Downloading/unpacking argparse (from unittest2>=1.0.0->testtools==1.7.1->-r test_requirements.txt (line 1))
  Downloading argparse-1.3.0-py2.py3-none-any.whl
Downloading/unpacking six>=1.4 (from unittest2>=1.0.0->testtools==1.7.1->-r test_requirements.txt (line 1))
  Downloading six-1.9.0-py2.py3-none-any.whl
Downloading/unpacking linecache2 (from traceback2->testtools==1.7.1->-r test_requirements.txt (line 1))
  Downloading linecache2-1.0.0-py2.py3-none-any.whl
Installing collected packages: testtools, python-mi...

[lp:~thomir-deactivatedaccount/core-image-publisher/trunk-skeleton]

10. By Thomi Richards on 2015-03-26

Fix import.

=== modified file 'core_image_publisher/__init__.py'
--- core_image_publisher/__init__.py	2015-03-25 23:51:59 +0000
+++ core_image_publisher/__init__.py	2015-03-26 22:26:38 +0000
@@ -26,6 +26,7 @@
     create_connection_from_config,
     CoreImagePublisherQueueMonitor,
 )
+from core_image_publisher import worker
 
 logger = logging.getLogger(__name__)
 
@@ -77,18 +78,16 @@
         )
 
 
-def logging_worker(message):
-    logger.info("Got %r", message.payload, extra=message.payload)
-    message.ack()
-
-
 def main():
     config = read_config()
     configure_logging(config)
     connection = create_connection_from_config(config)
     try:
         with connection:
-            worker = CoreImagePublisherQueueMonitor(connection, logging_worker)
+            worker = CoreImagePublisherQueueMonitor(
+                connection,
+                worker.logging_worker
+            )
             worker.run()
     except KeyboardInterrupt:
         print("Bye!")

=== modified file 'core_image_publisher/queue.py'
--- core_image_publisher/queue.py	2015-03-25 23:51:59 +0000
+++ core_image_publisher/queue.py	2015-03-26 22:26:38 +0000
@@ -27,6 +27,7 @@
 __all__ = [
     'CoreImagePublisherQueueMonitor',
     'create_connection_from_config',
+    'enqueue_message',
 ]
 
 
@@ -87,3 +88,7 @@
     """
     amqp_uris = config.get('amqp', 'uris').split()
     return kombu.Connection(amqp_uris)
+
+
+def enqueue_message(payload):
+    """Enqueue 'payload' for the core-image-tester."""

=== added file 'core_image_publisher/worker.py'
--- core_image_publisher/worker.py	1970-01-01 00:00:00 +0000
+++ core_image_publisher/worker.py	2015-03-26 22:26:38 +0000
@@ -0,0 +1,58 @@
+# core-image-publisher
+# Copyright (C) 2015 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+"""Business logic or the service lives here."""
+
+from core_image_publisher.queue import enqueue_message
+
+
+def logging_worker(message):
+    logger.info("Got %r", message.payload, extra=message.payload)
+    payload = message.payload
+    try:
+        image_name = payload['image_name']
+        channel = payload['channel']
+        device = payload['device']
+    except KeyError as e:
+        logger.error(
+            "Unable to deserialize message payload - rejecting message: %s",
+            s,
+            extra=payload
+        )
+        message.reject()
+        return
+
+    image_path = download_image(image_name, channel, device)
+    nova_image_path = convert_nova_image(image_path)
+    glance_image_name = upload_image_to_glance(nova_image_path)
+
+    payload['nova_image'] = glance_image_name
+    enqueue_message(payload)
+    message.ack()
+
+
+def download_image(name, channel, device):
+    """Download the ubuntu code image, return a path to it on disk."""
+
+
+def convert_nova_image(image_path):
+    """Convert a core image to a nova image, return path to the converted image."""
+
+
+def upload_image_to_glance(nova_image_path):
+    """Upload the nova image to glance, returning the name of the image in glance."""
+