Merge lp:~cprov/adt-cloud-worker/initial-tweaks into lp:adt-cloud-worker

[Celso Providelo]

Fixing adt-run arguments builder, results stored in a temporary directory (properly removed when the result is passed over) and also replacing isolated arch + platform arguments by 'tag' one (combination of both is obscure)

Fixing adt-run arguments builder, results stored in a temporary directory (properly removed when the result is passed over) and also replacing isolated arch + platform arguments by 'tag' one (combination of both is obscure)

=== modified file 'adt-cloud-worker.py'
--- adt-cloud-worker.py	2015-03-03 00:30:40 +0000
+++ adt-cloud-worker.py	2015-03-03 01:23:21 +0000
@@ -27,9 +27,10 @@
 from kombu.log import get_logger
 from kombu.mixins import ConsumerMixin
 from kombu.utils.debug import setup_logging
-import yaml
+import os
+import shutil
 import subprocess
-
+import tempfile
 
 logger = get_logger(__name__)
 
@@ -45,12 +46,19 @@
         return [Consumer(queues=self.queues, callbacks=[self.process])]
 
     def process(self, body, message):
-        # TODO: is 'body' guaranteed to
+        logger.info('Got: {}'.format(body))
+        # TODO: body validation
+        # Ack message once it's valid or message.reject()
+        message.ack()
+
+        result_dir = tempfile.mkdtemp(
+            prefix='adt-{}'.format(body['request_id']))
+
         try:
             # what information do we need from the message?
             adt_run_args = [
                 '--apt-source', body['package_name'],
-                '--output-dir', 'tmp/adt-cloud-worker', # TODO: replace me
+                '--output-dir', result_dir, # TODO: replace me
             ]
             if 'apt_pocket' in body:
                 adt_run_args += [
@@ -58,7 +66,8 @@
                     '--apt-upgrade',
                 ]
             adt_ssh_nova_args = [
-                '--flavour', body['nova_flavour'],
+                '--', 
+                '--flavor', body['nova_flavor'],
                 '--image', body['nova_image'],
             ]
 
@@ -82,22 +91,23 @@
             # 16   testbed failure
             # 20   other unexpected failures including bad usage
 
-            swift_container = body['swift_container']
-
             # TODO: tar/gzip the output directory.
             # TODO: upload to swift instance at 'swift_container'
 
-            # we can ack the message now, build the result message, then
-            # we're done.
-            message.ack()
+        except Exception as e:
+            logger.error(e, exc_info=True)
+        finally:
+            # build the result message
             body['worker'] = self.name
+            body['exit_code'] = exit_code
+            # TODO: send error logging to result-checker in the message
+
             queue = self.connection.SimpleQueue('adt.results')
             queue.put(body)
             queue.close()
-
-        except Exception as e:
-            message.reject()
-            logger.error(e)
+            # Drop the result directory
+            # TODO: it could be possibly useful for clients.
+            shutil.rmtree(result_dir)
 
 
 def run_adt(arguments):
@@ -120,20 +130,17 @@
 
     parser = argparse.ArgumentParser(description='ADT worker ...')
     parser.add_argument('name', help='Worker name')
-    parser.add_argument('-a', '--arch', dest='architectures',
-                        default=['i386'], action='append',
-                        help='Target architectures')
-    parser.add_argument('-p', '--platform', default='default',
-                        help='Target platform')
+    parser.add_argument('-t', '--tags', dest='tags',
+                        default=['i386.nova'], action='append',
+                        help='Target tag (<arch>.<platform>)')
     args = parser.parse_args()
 
     adt_exchange = kombu.Exchange("adt.exchange", type="topic")
     queues = []
-    for arch in set(args.architectures):
-        routing_key = '{}.{}'.format(arch, args.platform)
+    for tag in set(args.tags):
         queues.append(
-            kombu.Queue('adt.requests.{}'.format(routing_key) ,
-                        adt_exchange, routing_key=routing_key)
+            kombu.Queue('adt.requests.{}'.format(tag) ,
+                        adt_exchange, routing_key=tag)
         )
 
     with kombu.Connection('amqp://guest:guest@localhost:5672//') as conn: