diff options
| author |   Ace Lee <liyin11@huawei.com> | 2017-12-04 08:59:59 +0000 |
|---|---|---|
| committer | Ace Lee <liyin11@huawei.com> | 2017-12-15 06:13:29 +0000 |
| commit | ea7c865700a777f6b99206d3f00fc6ed54001d2d (patch) | |
| tree | b644fc1653eb530508c5877e4027f8a676dd7bd9 /utils | |
| parent | 1baf04d3b5f2348977dc3481fd2dd5fac181d84c (diff) | |
VNF scale-out testcase
JIRA: BOTTLENECK-214
Bottlenecks VNF scale out testcase
Change-Id: I05c4dec483062dd59c4b062516c8a6c1bc83ad6e
Signed-off-by: Ace Lee <liyin11@huawei.com>
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/env_prepare/stack_prepare.py | 10 | ||||
| -rw-r--r-- | utils/infra_setup/runner/docker_env.py | 4 |
2 files changed, 2 insertions, 12 deletions
diff --git a/utils/env_prepare/stack_prepare.py b/utils/env_prepare/stack_prepare.py index 5de6218f..25c2a29b 100644 --- a/utils/env_prepare/stack_prepare.py +++ b/utils/env_prepare/stack_prepare.py @@ -37,16 +37,6 @@ def _prepare_env_daemon(test_yardstick): config.bottlenecks_config["yardstick_rc_dir"]) 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 '13s/http/file/g' /etc/yardstick/yardstick.conf" - docker_env.docker_exec_cmd(yardstick_contain, - cmd) # update the external_network _source_file(rc_file) diff --git a/utils/infra_setup/runner/docker_env.py b/utils/infra_setup/runner/docker_env.py index 64d049ba..438d3d19 100644 --- a/utils/infra_setup/runner/docker_env.py +++ b/utils/infra_setup/runner/docker_env.py @@ -45,13 +45,13 @@ def env_yardstick(docker_name): volume = get_self_volume() yardstick_tag = os.getenv("Yardstick_TAG") if yardstick_tag is None: - yardstick_tag = "danube.3.1" + yardstick_tag = "latest" env_docker = client.containers.run(image="opnfv/yardstick:%s" % yardstick_tag, privileged=True, tty=True, detach=True, - ports={'5000': '8888'}, + # ports={'5000': '8888'}, volumes=volume, name=docker_name) yardstick_info["container"] = env_docker |