Conform with latest Neutron rally job 21/68021/1
authorCédric Ollivier <cedric.ollivier@orange.com>
Sun, 9 Jun 2019 09:17:12 +0000 (11:17 +0200)
committerCédric Ollivier <cedric.ollivier@orange.com>
Sun, 9 Jun 2019 09:17:12 +0000 (11:17 +0200)
The last commit requires two additional task args [1][2].

[1] https://github.com/openstack/neutron/commit/ccef17605d1e28c418821c2235ba24c15893fff2#diff-720114afabbecd64333f4586a338f749
[2] https://build.opnfv.org/ci/job/functest-opnfv-functest-benchmarking-latest-rally_jobs-run/145/console

Change-Id: I4943f737be29bcadfead427a7852964e6438a018
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
functest/opnfv_tests/openstack/rally/rally.py

index 61352c1..06bb85f 100644 (file)
@@ -431,7 +431,7 @@ class RallyBase(singlevm.VmReady2):
         LOGGER.debug('task_id : %s', task_id)
         if task_id is None:
             LOGGER.error("Failed to retrieve task_id")
-            LOGGER.error("Result:\n%s", output)
+            LOGGER.error("Result:\n%s", output.decode("utf-8"))
             raise Exception("Failed to retrieve task id")
         self._save_results(test_name, task_id)
 
@@ -796,6 +796,8 @@ class RallyJobs(RallyBase):
             task_args['floating_network'] = str(self.ext_net.name)
         else:
             task_args['floating_network'] = ''
+        task_args['image_name'] = str(self.image.name)
+        task_args['flavor_name'] = str(self.flavor.name)
         return task_args
 
     @staticmethod