Merge lp:~cprov/adt-cloud-service/container-name-prefix into lp:adt-cloud-service

[Celso Providelo]

Fixing result_url returned to clients upon test requests (container name is prefixed with 'adt-')

Fixing result_url returned to clients upon test requests (container name is prefixed with 'adt-')

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve

=== modified file 'adt_cloud_service/tests/test_functional.py'
--- adt_cloud_service/tests/test_functional.py	2015-03-17 14:52:51 +0000
+++ adt_cloud_service/tests/test_functional.py	2015-03-18 20:25:11 +0000
@@ -136,7 +136,7 @@
         data = json.loads(resp.data.decode())
         self.assertThat(
             data['result_url'],
-            Equals('http://swift.test.com/{}/results.tgz'.format(
+            Equals('http://swift.test.com/adt-{}/results.tgz'.format(
                 q.generated_uuids[0]
             ))
         )

=== modified file 'adt_cloud_service/v1.py'
--- adt_cloud_service/v1.py	2015-03-16 03:32:00 +0000
+++ adt_cloud_service/v1.py	2015-03-18 20:25:11 +0000
@@ -50,12 +50,13 @@
     rabbit_request['nova_image'] = image_name
 
     req_id = current_app.extensions['rabbit'].queue_test(rabbit_request)
+    results_path = 'adt-{}/results.tgz'.format(req_id)
     return jsonify(
         {
             'status': 'request processed',
             'request_id': req_id,
             'result_url': urllib.parse.urljoin(
-                current_app.config['SWIFT_URL'], req_id + '/results.tgz'
+                current_app.config['SWIFT_URL'], results_path
             )
         }
     )