diff options
| author |   kubi <jean.gaoliang@huawei.com> | 2016-01-16 18:31:42 +0800 |
|---|---|---|
| committer |   qi liang <liangqi1@huawei.com> | 2016-01-16 13:28:21 +0000 |
| commit | f0dbb7d2dd25880dbd73df82f9f6830cb2655b6b (patch) | |
| tree | c9aee44287ad791f67ac8ab8e138e904ff4435a5 /yardstick | |
| parent | d0236479452e507248f7c60b61a71139a11e0483 (diff) | |
modify sc lab pod yaml as real configure
Change-Id: I6587794b7206cb3d5f13b6c448670d1c97ecd596
Signed-off-by: kubi <jean.gaoliang@huawei.com>
(cherry picked from commit cfbefd9ad48e07a1890e022e94cbae117e04f87a)
Diffstat (limited to 'yardstick')
4 files changed, 11 insertions, 5 deletions
diff --git a/yardstick/benchmark/scenarios/networking/ping6.py b/yardstick/benchmark/scenarios/networking/ping6.py index 067b8893e..5364cdf26 100644 --- a/yardstick/benchmark/scenarios/networking/ping6.py +++ b/yardstick/benchmark/scenarios/networking/ping6.py @@ -116,7 +116,13 @@ class Ping6(base.Scenario): # pragma: no cover status, stdout, stderr = self.client.execute(cmd) host_name = stdout.strip() print host_name + self.client.run("cat ~/vRouterKey", + stdout=open("/tmp/vRouterKey", "w")) self._ssh_host(host_name) + + self.client.run("cat > ~/vRouterKey", + stdin=open("/tmp/vRouterKey", "rb")) + self.client.run("cat > ~/ping6.sh", stdin=open(self.ping6_script, "rb")) cmd = "sudo bash ping6.sh" diff --git a/yardstick/benchmark/scenarios/networking/ping6_benchmark.bash b/yardstick/benchmark/scenarios/networking/ping6_benchmark.bash index bd02be76e..16cb0f07e 100644 --- a/yardstick/benchmark/scenarios/networking/ping6_benchmark.bash +++ b/yardstick/benchmark/scenarios/networking/ping6_benchmark.bash @@ -23,10 +23,10 @@ wait_vm_ok() { if [ $retry -ge 40 ]; then echo "vm ssh start timeout !!!" - exit 0 + exit 0 fi done } wait_vm_ok -sleep 600 -sudo ip netns exec qdhcp-$(neutron net-list | grep -w ipv4-int-network1 | awk '{print $2}') ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i vRouterKey fedora@20.0.0.4 "ping6 -c 1 2001:db8:0:1::1 | grep ttl | awk -F [=\ ] '{printf \$10}'" +sleep 360 +sudo ip netns exec qdhcp-$(neutron net-list | grep -w ipv4-int-network1 | awk '{print $2}') ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i vRouterKey fedora@20.0.0.4 "ping6 -c 1 2001:db8:0:1::1 | grep ttl | awk -F [=\ ] '{printf \$10}'"
\ No newline at end of file diff --git a/yardstick/benchmark/scenarios/networking/ping6_find_host.bash b/yardstick/benchmark/scenarios/networking/ping6_find_host.bash index a1d50d418..85c4b3898 100644 --- a/yardstick/benchmark/scenarios/networking/ping6_find_host.bash +++ b/yardstick/benchmark/scenarios/networking/ping6_find_host.bash @@ -11,5 +11,4 @@ source /opt/admin-openrc.sh host_num=$(neutron dhcp-agent-list-hosting-net ipv4-int-network1 | grep True | awk -F [=\ ] '{printf $4}') > /tmp/ipv6.log -scp vRouterKey $host_num:~ echo $host_num
\ No newline at end of file diff --git a/yardstick/benchmark/scenarios/networking/ping6_setup.bash b/yardstick/benchmark/scenarios/networking/ping6_setup.bash index ddb6c1cd9..658e1d3cf 100644 --- a/yardstick/benchmark/scenarios/networking/ping6_setup.bash +++ b/yardstick/benchmark/scenarios/networking/ping6_setup.bash @@ -12,7 +12,8 @@ # download and create image source /opt/admin-openrc.sh -wget https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-22-20150521.x86_64.qcow2 +wget https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-22-20150521.x86_64.qcow2 >/dev/null 2>&1 + glance image-create --name 'Fedora22' --disk-format qcow2 \ --container-format bare --file ./Fedora-Cloud-Base-22-20150521.x86_64.qcow2 |