Merge lp:~psivaa/core-selftest-agent/add-test-branch-conf into lp:core-selftest-agent

[Para Siva]

Adding test_branch config option to the agent.

Adding test_branch config option to the agent.

Unmerged revisions

8. By Para Siva on 2015-05-26

pep8 and pyflakes

7. By Para Siva on 2015-05-26

Adding test_branch as config parameter

=== added file 'core-service.conf'
--- core-service.conf	1970-01-01 00:00:00 +0000
+++ core-service.conf	2015-05-26 19:15:37 +0000
@@ -0,0 +1,12 @@
+[amqp]
+uris = amqp://guest:guest@localhost:5672//
+
+[nova]
+os_username = foo
+os_password = <redacted>
+os_tenant_name = foo_project
+os_auth_url = http://172.20.161.138:5000/v2.0/
+
+[snappy]
+test_branch = lp:snappy/selftest
+

=== modified file 'core_selftest_agent/__init__.py'
--- core_selftest_agent/__init__.py	2015-05-22 19:49:10 +0000
+++ core_selftest_agent/__init__.py	2015-05-26 19:15:37 +0000
@@ -29,6 +29,7 @@
 from core_selftest_agent import constants
 from core_selftest_agent.worker import CoreSelftestAgentWorker
 
+logger = get_logger(__name__)
 
 class CoreImageResultPublisher(object):
     """A callable that can notify a results exchange that the test is running
@@ -45,6 +46,7 @@
 
     def __call__(self, payload):
         """Take 'payload' and enqueue it on the rabbit exchange."""
+        check_payload(payload)
         queue = self.connection.SimpleQueue(self.queue)
         queue.put(payload)
         queue.close()
@@ -62,11 +64,24 @@
 
     def __call__(self, payload):
         """Take 'payload' and enqueue it on the rabbit queue."""
+        check_payload(payload)
         queue = self.connection.SimpleQueue(constants.IMAGE_BUILD_QUEUE)
         queue.put(payload)
         queue.close()
 
 
+def check_payload(payload):
+    extra = constants.LOGGING_EXTRA.copy()
+    extra.update(payload)
+    try:
+        nova_image_id = payload['source_name']
+        image_name = payload['source_version']
+        device = payload['series']
+        test_branch = payload['test_branch']
+    except KeyError as e:
+        logger.error("Message does not contain required ", extra=extra)
+
+
 def read_config():
     parser = argparse.ArgumentParser(description='Core Selftest Agent.')
     parser.add_argument(

=== modified file 'core_selftest_agent/worker.py'
--- core_selftest_agent/worker.py	2015-05-22 19:49:10 +0000
+++ core_selftest_agent/worker.py	2015-05-26 19:15:37 +0000
@@ -48,5 +48,7 @@
         For now, just blindly post messages for these
         """
 
+        test_branch = self.config['snappy']['test_branch']
+        body['test_branch'] = test_branch
         self.build_worker(body)
         self.result_worker(body)