Merge lp:~thomir-deactivatedaccount/autopkgtest-result-checker/snappy-proposed-migration-add-missing-payload-keys into lp:autopkgtest-result-checker/snappy-proposed-migration

[Thomi Richards]

Update result-checker service with new required payloads.

Update result-checker service with new required payloads.

[lp:~thomir-deactivatedaccount/autopkgtest-result-checker/snappy-proposed-migration-add-missing-payload-keys]

20. By Thomi Richards on 2015-05-27

Fix pep8 issue.

[Francis Ginther (fginther)]

Approved.

review: Approve

=== modified file 'core_result_checker/__init__.py'
--- core_result_checker/__init__.py	2015-05-25 21:23:51 +0000
+++ core_result_checker/__init__.py	2015-05-27 22:28:49 +0000
@@ -49,10 +49,16 @@
         logger = get_logger(__name__, message)
         logger.info("Got: %r", message)
         try:
-            channel = message['channel']
-            device = message['device']
-            image_name = message['image_name']
             exit_code = message['exit_code']
+            container_name = message['swift_container_name']
+            tarball_name = message['swift_tarball_filename']
+            # Additionally unpack values we're required to output, so we
+            # catch upstream errors as soon as possible:
+            message['source_name']
+            message['source_version']
+            message['series']
+            message['distribution']
+            message['test_name']
         except KeyError as e:
             logger.error("Unable to unpack incoming message: %s", str(e))
             return MessageActions.Retry
@@ -65,12 +71,6 @@
             )
             self.queue_manager.retry_test_run(message)
             return MessageActions.Acknowledge
-        container_name = "core-{}-{}-{}".format(
-            channel,
-            device,
-            image_name,
-        ).replace('/', '_')
-        tarball_name = container_name + "-results.tgz"
 
         # check to see if swift is consistent yet:
         if not self.swift_manager.container_contains_file(
@@ -81,8 +81,15 @@
             self.queue_manager.retry_for_swift(message)
             return MessageActions.Acknowledge
 
+        # Make the swift container public, add the public url to the tarball
+        # to the result payload:
         try:
-            self.swift_manager.make_container_public(container_name)
+            public_container_url = self.swift_manager.make_container_public(
+                container_name
+            )
+            message['test_url'] = '/'.join(
+                (public_container_url, tarball_name)
+            )
         except RuntimeError as e:
             logger.error(
                 "Unable to publish swift container '%s'. Error: %s.",
@@ -91,6 +98,9 @@
             )
             return MessageActions.Retry
         logger.info("Swift container made public OK.")
+
+        # Update message payload with additional data:
+        message['test_status'] = 'PASS' if exit_code == 0 else 'FAIL'
         self.queue_manager.complete_test(message)
         return MessageActions.Acknowledge
 
@@ -125,14 +135,17 @@
 
     """A class that knows how to interact with swift."""
 
-    def __init__(self, nova_config):
+    def __init__(self, nova_config, public_endpoint):
         self.config = nova_config
+        self.public_endpoint = public_endpoint.rstrip('/')
 
     def make_container_public(self, container_name):
         """Make a swift contianer public.
 
         Raises RuntimeError on failure, returns None otherwise.
 
+        Returns the public http url for the container in swift.
+
         """
         swift = SwiftService(self.config)
         result = swift.post(
@@ -146,6 +159,7 @@
                     result['error']
                 )
             )
+        return '/'.join((self.public_endpoint, container_name))
 
     def container_contains_file(self, container_name, file_name):
         swift = SwiftService(self.config)
@@ -281,7 +295,10 @@
                 complete_payload,
                 3
             )
-            swift_manager = SwiftManager(config['nova'])
+            swift_manager = SwiftManager(
+                config['nova'],
+                config['swift']['public_url']
+            )
             worker = Worker(swift_manager, queue_manager)
             queue_monitor = SimpleRabbitQueueWorker(
                 connection,