Structure output and make it less redundant

Note: this commit replaces:
      https://gerrit.opnfv.org/gerrit/#/c/976/8

Adjusts the JSON output of the runners to follow a different structure,
laid out below. It is based upon the patch above but is not using the
output manager.

The purpose is to provide a unified basic layout (as already existed),
while making long data series much less repetitive and more space
efficient.

OUTPUT FORMAT:

------------------------------------------------------------------------

RUNNER PREP - printed exactly once per runner per scenario.
Runner MUST print this before sending any RUNNER DATA output
{
    runner_id: <int>
    scenario_cfg: {
        <scenario and runner config>
    }
}

where
    runner_id: ID of the runner sending this block
    scenario_cfg: scenario and runner configuration

------------------------------------------------------------------------

RUNNER DATA
runner may print any number of these AFTER having printed a RUNNER PREP
{
    runner_id: <int>
    benchmark: {
        <measurements>
    }
}

------------------------------------------------------------------------

The runner_id currently is not unique across runners as it is assigned
by noting the runner process id in the underlying operating system.

A possible improvement would be to assign runner_id an UUID value
according to RFC 4122 (e.g. uuid.uuid4() in python).

------------------------------------------------------------------------

Other changes/cleanups in this patch:

- Removed the context argument from _worker_process as it was
  redundant. It contained a dictionary with the runner configuration
  but the same dictionary was already in included in the scenario_args argument.

- For clarity renamed scenario_args to scenario_cfg. scenario_cfg was
  the original name used in task.py and it changed name across function calls.

Change-Id: I17d96f37c7d3e24b0747d23fcad7509fa949d662
JIRA: YARDSTICK-59
Signed-off-by: Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/yardstick/benchmark/runners/base.py b/yardstick/benchmark/runners/base.py
index 848322679..d8783f3c1 100644
--- a/yardstick/benchmark/runners/base.py
+++ b/yardstick/benchmark/runners/base.py
@@ -148,7 +148,7 @@ class Runner(object):
             output = "{'post-stop-action-data': %s}" % data
             self.result_queue.put(output)
 
-    def run(self, scenario_type, scenario_args):
+    def run(self, scenario_type, scenario_cfg):
         class_name = base_scenario.Scenario.get(scenario_type)
         path_split = class_name.split(".")
         module_path = ".".join(path_split[:-1])
@@ -177,7 +177,7 @@ class Runner(object):
                       self.result_queue))
             self.periodic_action_process.start()
 
-        self._run_benchmark(cls, "run", scenario_args)
+        self._run_benchmark(cls, "run", scenario_cfg)
 
     def join(self):
         self.process.join()