From: liyin <liyin11@huawei.com>
Date: Tue, 18 Jul 2017 06:55:29 +0000 (+0800)
Subject: Bug fix: fit Yardstick 3.1 version.
X-Git-Tag: opnfv-5.0.0~25
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=bottlenecks.git;a=commitdiff_plain;h=962b6269fdee0991251304a2b16cba78961d4b42

Bug fix: fit Yardstick 3.1 version.

JIRA: BOTTLENECK-173

This patch will add a file to create some yardstick conf,
Yardstick will use this file to manage output file type.

Change-Id: I1d265af9f0b9b5132dc63c4d6d95d5bc194c7ff6
Signed-off-by: liyin <liyin11@huawei.com>
---

diff --git a/utils/env_prepare/stack_prepare.py b/utils/env_prepare/stack_prepare.py
index ce8da619..157122ab 100644
--- a/utils/env_prepare/stack_prepare.py
+++ b/utils/env_prepare/stack_prepare.py
@@ -32,9 +32,19 @@ def _prepare_env_daemon(test_yardstick):
     if not os.environ.get("EXTERNAL_NETWORK"):
         _append_external_network(rc_file)
     if test_yardstick:
+        yardstick_contain = docker_env.yardstick_info["container"]
         cmd = "cp %s %s" % (rc_file,
                             config.bottlenecks_config["yardstick_rc_dir"])
-        yardstick_contain = docker_env.yardstick_info["container"]
+        docker_env.docker_exec_cmd(yardstick_contain,
+                                   cmd)
+        file_orig = ("/home/opnfv/repos/yardstick/etc"
+                     "/yardstick/yardstick.conf.sample")
+        file_after = "/etc/yardstick/yardstick.conf"
+        cmd = "cp %s %s" % (file_orig,
+                            file_after)
+        docker_env.docker_exec_cmd(yardstick_contain,
+                                   cmd)
+        cmd = "sed -i ‘12s/http/file/g’ /etc/yardstick/yardstick.conf"
         docker_env.docker_exec_cmd(yardstick_contain,
                                    cmd)