summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkubi <jean.gaoliang@huawei.com>2016-01-16 18:31:42 +0800
committerkubi <jean.gaoliang@huawei.com>2016-01-16 13:06:58 +0000
commitcfbefd9ad48e07a1890e022e94cbae117e04f87a (patch)
treec9aee44287ad791f67ac8ab8e138e904ff4435a5
parent6636ef456c6be5b330b84308d74a1f3ea6fa43da (diff)
modify sc lab pod yaml as real configure
Change-Id: I6587794b7206cb3d5f13b6c448670d1c97ecd596 Signed-off-by: kubi <jean.gaoliang@huawei.com>
-rw-r--r--etc/yardstick/nodes/compass_sclab_physical/pod.yaml14
-rw-r--r--etc/yardstick/nodes/compass_sclab_virtual/pod.yaml42
-rw-r--r--samples/ping6.yaml2
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc027.yaml3
-rw-r--r--yardstick/benchmark/scenarios/networking/ping6.py6
-rw-r--r--yardstick/benchmark/scenarios/networking/ping6_benchmark.bash6
-rw-r--r--yardstick/benchmark/scenarios/networking/ping6_find_host.bash1
-rw-r--r--yardstick/benchmark/scenarios/networking/ping6_setup.bash3
8 files changed, 59 insertions, 18 deletions
diff --git a/etc/yardstick/nodes/compass_sclab_physical/pod.yaml b/etc/yardstick/nodes/compass_sclab_physical/pod.yaml
index e062988c4..01881f7a7 100644
--- a/etc/yardstick/nodes/compass_sclab_physical/pod.yaml
+++ b/etc/yardstick/nodes/compass_sclab_physical/pod.yaml
@@ -11,32 +11,26 @@
nodes:
-
- name: node1
- role: Controller
- ip: 10.1.0.50
- user: root
- password: root
--
name: node2
role: Controller
- ip: 10.1.0.51
+ ip: 192.168.10.10
user: root
password: root
-
name: node3
role: Controller
- ip: 10.1.0.52
+ ip: 192.168.10.11
user: root
password: root
-
name: node4
role: Compute
- ip: 10.1.0.53
+ ip: 192.168.10.12
user: root
password: root
-
name: node5
role: Compute
- ip: 10.1.0.54
+ ip: 192.168.10.13
user: root
password: root
diff --git a/etc/yardstick/nodes/compass_sclab_virtual/pod.yaml b/etc/yardstick/nodes/compass_sclab_virtual/pod.yaml
new file mode 100644
index 000000000..b5f5ff760
--- /dev/null
+++ b/etc/yardstick/nodes/compass_sclab_virtual/pod.yaml
@@ -0,0 +1,42 @@
+---
+# sample config file about the POD information, including the
+# name/IP/user/ssh key and Controllers/Computes
+#
+# The options of this config file include:
+# name: the name of this node
+# role: node's role, support role: Master/Controller/Comupte/BareMetal
+# ip: the node's IP address
+# user: the username for login
+# key_filename:the path of the private key file for login
+
+nodes:
+-
+ name: node1
+ role: Controller
+ ip: 10.1.0.50
+ user: root
+ password: root
+-
+ name: node2
+ role: Controller
+ ip: 10.1.0.51
+ user: root
+ password: root
+-
+ name: node3
+ role: Controller
+ ip: 10.1.0.52
+ user: root
+ password: root
+-
+ name: node4
+ role: Compute
+ ip: 10.1.0.53
+ user: root
+ password: root
+-
+ name: node5
+ role: Compute
+ ip: 10.1.0.54
+ user: root
+ password: root
diff --git a/samples/ping6.yaml b/samples/ping6.yaml
index 773d1be69..6f2c93d05 100644
--- a/samples/ping6.yaml
+++ b/samples/ping6.yaml
@@ -28,6 +28,6 @@ scenarios:
context:
type: Node
name: IPV6
- file: /root/yardstick/etc/yardstick/nodes/compass_sclab_physical/pod.yaml
+ file: /root/yardstick/etc/yardstick/nodes/compass_sclab_virtual/pod.yaml
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc027.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc027.yaml
index badf26065..e360b4bd0 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc027.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc027.yaml
@@ -9,9 +9,8 @@ scenarios:
type: Ping6
options:
packetsize: 200
- host: host1,host2,host3,host4,host5
+ host: host2,host3,host4,host5
nodes:
- host1: node1.IPV6
host2: node2.IPV6
host3: node3.IPV6
host4: node4.IPV6
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