Merge lp:~cprov/adt-cloud-worker/kill-adt-config into lp:adt-cloud-worker

[Celso Providelo]

Getting rid of [adt] configuration section and spinning testbeds in their restricted security groups.

Getting rid of [adt] configuration section, tags (message topics) are hardcoded and worker name is derived from the hostname (dropping annoying '-machine' term from juju hostnames).

Also spinning testbeds in the restricted security group (charm and adt-run already support this).

[Thomi Richards (thomir-deactivatedaccount)]

LGTM

review: Approve

=== modified file '.adt-service.conf'
--- .adt-service.conf	2015-03-03 16:27:28 +0000
+++ .adt-service.conf	2015-03-11 00:20:11 +0000
@@ -1,9 +1,4 @@
 # `adt-cloud-worker` configuration file.
-[adt]
-name = foo
-# <arch>.<platform>[ ...]
-tags = i386.nova amd64.nova
-
 [amqp]
 uris = amqp://guest:guest@localhost:5672//
 

=== modified file 'adt_cloud_worker/__init__.py'
--- adt_cloud_worker/__init__.py	2015-03-10 14:58:42 +0000
+++ adt_cloud_worker/__init__.py	2015-03-11 00:20:11 +0000
@@ -27,6 +27,7 @@
 from kombu.mixins import ConsumerMixin
 from kombu.utils.debug import setup_logging
 import os
+import socket
 import subprocess
 import tarfile
 import tempfile
@@ -36,7 +37,10 @@
     set_config_dict,
     upload_tarball_to_swift_container,
 )
-
+ROUTING_KEYS = (
+    'amd64.nova',
+    'i386.nova'
+)
 API_VERSION = "v1"
 
 logger = get_logger(__name__)
@@ -49,7 +53,11 @@
         self.config = config
         # Set the nova configuration env vars:
         _set_nova_environment_variables(self.config.items('nova'))
-        self.name = self.config.get('adt', 'name')
+        # Worker is named after the machine hostname created by juju:
+        # juju-<env_name>-machine-<machine_number>
+        # By getting rid of the '-machine' term, the worker name is
+        # identical to its corresponding security-group.
+        self.worker_name = socket.gethostname().replace('-machine', '')
 
     def get_consumers(self, Consumer, channel):
         """Return consumers instances for all configured queues."""
@@ -57,8 +65,8 @@
         queues = [
             kombu.Queue(
                 'adt.requests.{}.{}'.format(
-                    tag, API_VERSION), exchange, routing_key=tag)
-            for tag in self.config.get('adt', 'tags').split()
+                    key, API_VERSION), exchange, routing_key=key)
+            for key in ROUTING_KEYS
         ]
         return [Consumer(queues=queues, callbacks=[self.process])]
 
@@ -71,12 +79,13 @@
         logger.info('Got: {}'.format(body))
         _validate_request_contents(body)
 
-        body['worker'] = self.name
+        body['worker'] = self.worker_name
         # Run requested tests safely.
         tarball_path = None
         try:
             # Create and temporary directory for storing adt results.
-            dir_prefix = 'adt-{}-{}'.format(self.name, body['request_id'])
+            dir_prefix = 'adt-{}-{}'.format(
+                self.worker_name, body['request_id'])
             with tempfile.TemporaryDirectory(prefix=dir_prefix) as result_dir:
                 # Run `adt-run`.
                 adt_kwargs = body.copy()
@@ -162,8 +171,10 @@
         ]
     adt_ssh_nova_args = [
         '--',
-        # Deployment (charm) creates a keypair named after the worker.
+        # Deployment (charm) creates a keypair named after the worker and
+        # a restricted security-group named as '<worker_name>-testbed'.
         '-k', request_configuration['worker'],
+        '-s', '{}-testbed'.format(request_configuration['worker']),
         '--flavor', request_configuration['nova_flavor'],
         '--image', request_configuration['nova_image'],
     ]

=== modified file 'adt_cloud_worker/tests/test_cloud_worker.py'
--- adt_cloud_worker/tests/test_cloud_worker.py	2015-03-08 22:30:42 +0000
+++ adt_cloud_worker/tests/test_cloud_worker.py	2015-03-11 00:20:11 +0000
@@ -67,6 +67,7 @@
                 '-s', 'nova',
                 '--',
                 '-k', 'worker-foo',
+                '-s', 'worker-foo-testbed',
                 '--flavor', 'some-nova-flavour',
                 '--image', 'some-nova-image',
             ],
@@ -86,6 +87,7 @@
                 '-s', 'nova',
                 '--',
                 '-k', 'worker-foo',
+                '-s', 'worker-foo-testbed',
                 '--flavor', 'some-nova-flavour',
                 '--image', 'some-nova-image',
             ],