Merge "Bottlenecks testpmd scale-up testcase."

2 files changed, 13 insertions, 2 deletions

diff --git a/utils/infra_setup/runner/docker_env.py b/utils/infra_setup/runner/docker_env.py
index 64d049ba..6e9c78a0 100644
--- a/utils/infra_setup/runner/docker_env.py
+++ b/utils/infra_setup/runner/docker_env.py
@@ -46,8 +46,7 @@ def env_yardstick(docker_name):
     yardstick_tag = os.getenv("Yardstick_TAG")
     if yardstick_tag is None:
         yardstick_tag = "danube.3.1"
-    env_docker = client.containers.run(image="opnfv/yardstick:%s"
-                                             % yardstick_tag,
+    env_docker = client.containers.run(image="yardstick_pmd",
                                        privileged=True,
                                        tty=True,
                                        detach=True,
diff --git a/utils/infra_setup/runner/yardstick.py b/utils/infra_setup/runner/yardstick.py
index 35b89ae8..559b9c10 100644
--- a/utils/infra_setup/runner/yardstick.py
+++ b/utils/infra_setup/runner/yardstick.py
@@ -24,6 +24,18 @@ headers = {"Content-Type": "application/json"}
 LOG = logger.Logger(__name__).getLogger()
 
 
+def yardstick_command_parser(debug, cidr, outfile, parameter):
+    cmd = "yardstick"
+    if debug:
+        cmd += " -d"
+    cmd += " task start "
+    cmd += str(cidr)
+    cmd += " --output-file " + outfile
+    if parameter is not None:
+        cmd += " --task-args " + '"' + str(parameter) + '"'
+    return cmd
+
+
 def Get_Reply(test_config, task_id, time_test=1):
     reply_url = ("http://%s/yardstick/results?task_id=%s"
                  % (test_config['yardstick_test_ip'], task_id))