summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliang gao <jean.gaoliang@huawei.com>2016-09-21 02:30:13 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-21 02:30:13 +0000
commit601c4126e2acd34d0f5ac7d5e159703e525b3f7d (patch)
tree81828d22963fb3b89f2d1e23358f1b5bb0df288b
parentad8e0f8b2203d837e5f9fa46ae34496751aa42d3 (diff)
parent880ff27e9854eff0df389a1c0468da6223ca285c (diff)
Merge "bugfix: ipv6 testcase ping6 command wrong"
-rw-r--r--yardstick/benchmark/scenarios/networking/ping6.py4
-rw-r--r--yardstick/benchmark/scenarios/networking/ping6_benchmark.bash2
2 files changed, 3 insertions, 3 deletions
diff --git a/yardstick/benchmark/scenarios/networking/ping6.py b/yardstick/benchmark/scenarios/networking/ping6.py
index dc896b2c6..817f3e278 100644
--- a/yardstick/benchmark/scenarios/networking/ping6.py
+++ b/yardstick/benchmark/scenarios/networking/ping6.py
@@ -86,7 +86,7 @@ class Ping6(base.Scenario): # pragma: no cover
options = self.scenario_cfg['options']
self.ping_options = "-s %s" % \
options.get("packetsize", '56') + \
- "-c %s" % \
+ " -c %s" % \
options.get("ping_count", '5')
host_str = options.get("host", 'host1')
self.host_list = host_str.split(',')
@@ -133,7 +133,7 @@ class Ping6(base.Scenario): # pragma: no cover
options = self.scenario_cfg['options']
self.ping_options = "-s %s" % \
options.get("packetsize", '56') + \
- "-c %s" % \
+ " -c %s" % \
options.get("ping_count", '5')
host_str = options.get("host", 'host1')
self.host_list = host_str.split(',')
diff --git a/yardstick/benchmark/scenarios/networking/ping6_benchmark.bash b/yardstick/benchmark/scenarios/networking/ping6_benchmark.bash
index 9a08b098a..bf730eb65 100644
--- a/yardstick/benchmark/scenarios/networking/ping6_benchmark.bash
+++ b/yardstick/benchmark/scenarios/networking/ping6_benchmark.bash
@@ -11,7 +11,7 @@
# Run a single ping6 command towards a ipv6 router
set -e
-ping6_options=$1
+ping6_options=$*
source /opt/admin-openrc.sh
chmod 600 vRouterKey
# TODO find host