aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2016-08-29 15:40:52 +0200
committerJose Lausuch <jose.lausuch@ericsson.com>2016-09-05 15:41:09 +0000
commita5b3d7298251a4170b8a2329fec43af27c9b7437 (patch)
tree730cf62be7ab4a94ef7b434e11b29a990fbd3f8e
parent8c8e7a1667e5dc31aca29e15f0b2579943765f07 (diff)
Change executed test cases for bgpvpn scenarios
Due to lacking support for floating IPs in ODL VPNService, the default test cases fail. The replaced test cases are: opnfv_yardstick_tc043.yaml(Node ping test) opnfv_yardstick_tc019.yaml(Node HA test) Change-Id: Ib829430e00488697dc7543ea7143026dc68ff834 Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com> (cherry picked from commit 3cb19c7b5c64fb3d3fc136f1f1bbf32f92399312)
-rw-r--r--etc/yardstick/nodes/fuel_baremetal/pod.yaml43
-rwxr-xr-xtests/ci/prepare_env.sh26
-rw-r--r--tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-ha_daily.yaml40
-rw-r--r--tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-noha_daily.yaml32
4 files changed, 78 insertions, 63 deletions
diff --git a/etc/yardstick/nodes/fuel_baremetal/pod.yaml b/etc/yardstick/nodes/fuel_baremetal/pod.yaml
new file mode 100644
index 000000000..7392ae1a4
--- /dev/null
+++ b/etc/yardstick/nodes/fuel_baremetal/pod.yaml
@@ -0,0 +1,43 @@
+---
+# sample config file about the POD information, including the
+# name/IP/user/ssh key of Bare Metal 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
+# ipX: the ips of the nodes will be fetched by prepare_env.sh and replaced here
+
+nodes:
+-
+ name: node1
+ role: Controller
+ ip: ip1
+ user: root
+ password: root
+-
+ name: node2
+ role: Controller
+ ip: ip2
+ user: root
+ password: root
+-
+ name: node3
+ role: Controller
+ ip: ip3
+ user: root
+ password: root
+-
+ name: node4
+ role: Compute
+ ip: ip4
+ user: root
+ password: root
+-
+ name: node5
+ role: Compute
+ ip: ip5
+ user: root
+ password: root
diff --git a/tests/ci/prepare_env.sh b/tests/ci/prepare_env.sh
index d9f8257ae..8c0a8badc 100755
--- a/tests/ci/prepare_env.sh
+++ b/tests/ci/prepare_env.sh
@@ -83,5 +83,29 @@ if [ "$INSTALLER_TYPE" == "fuel" ]; then
echo "Fetching id_rsa file from jump_server $INSTALLER_IP..."
sshpass -p r00tme scp 2>/dev/null $ssh_options \
root@${INSTALLER_IP}:~/.ssh/id_rsa /root/.ssh/id_rsa &> /dev/null
-fi
+ sshpass -p r00tme ssh 2>/dev/null $ssh_options \
+ root@${INSTALLER_IP} fuel node>fuel_node
+
+ controller_ips=($(cat fuel_node|grep controller|awk '{print $10}'))
+ compute_ips=($(cat fuel_node|grep compute|awk '{print $10}'))
+
+ pod_yaml="/etc/yardstick/nodes/fuel_baremetal/pod.yaml"
+
+ if [[ ${controller_ips[0]} ]]; then
+ sed -i "s/ip1/${controller_ips[0]}/" $pod_yaml;
+ fi
+ if [[ ${controller_ips[1]} ]]; then
+ sed -i "s/ip2/${controller_ips[1]}/" $pod_yaml;
+ fi
+ if [[ ${controller_ips[2]} ]]; then
+ sed -i "s/ip3/${controller_ips[2]}/" $pod_yaml;
+ fi
+ if [[ ${compute_ips[0]} ]]; then
+ sed -i "s/ip4/${compute_ips[0]}/" $pod_yaml;
+ fi
+ if [[ ${compute_ips[1]} ]]; then
+ sed -i "s/ip5/${compute_ips[1]}/" $pod_yaml;
+ fi
+
+fi
diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-ha_daily.yaml
index 639e18e85..84d630cc1 100644
--- a/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-ha_daily.yaml
@@ -7,40 +7,10 @@ name: "os-odl_l2-bgpvpn-ha"
test_cases_dir: "tests/opnfv/test_cases/"
test_cases:
-
- file_name: opnfv_yardstick_tc002.yaml
--
- file_name: opnfv_yardstick_tc005.yaml
--
- file_name: opnfv_yardstick_tc010.yaml
--
- file_name: opnfv_yardstick_tc011.yaml
--
- file_name: opnfv_yardstick_tc012.yaml
--
- file_name: opnfv_yardstick_tc014.yaml
--
- file_name: opnfv_yardstick_tc037.yaml
--
- file_name: opnfv_yardstick_tc055.yaml
- constraint:
- installer: compass
- pod: huawei-pod1
- task_args:
- huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
- "host": "node5.yardstick-TC055"}'
--
- file_name: opnfv_yardstick_tc063.yaml
- constraint:
- installer: compass
- pod: huawei-pod1
- task_args:
- huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
- "host": "node5.yardstick-TC063"}'
--
- file_name: opnfv_yardstick_tc075.yaml
+ file_name: opnfv_yardstick_tc043.yaml
constraint:
- installer: compass
- pod: huawei-pod1
+ installer: fuel
+ pod: ericsson-pod2
task_args:
- huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
- "host": "node1.LF"}'
+ ericsson-pod2: '{"pod_info": "etc/yardstick/nodes/fuel_baremetal/pod.yaml",
+ "host": "node1.LF","target": "node2.LF"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-noha_daily.yaml
index 372041fd6..a9e272aa6 100644
--- a/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-noha_daily.yaml
@@ -7,32 +7,10 @@ name: "os-odl_l2-bgpvpn-noha"
test_cases_dir: "tests/opnfv/test_cases/"
test_cases:
-
- file_name: opnfv_yardstick_tc002.yaml
--
- file_name: opnfv_yardstick_tc005.yaml
--
- file_name: opnfv_yardstick_tc010.yaml
--
- file_name: opnfv_yardstick_tc011.yaml
--
- file_name: opnfv_yardstick_tc012.yaml
--
- file_name: opnfv_yardstick_tc014.yaml
--
- file_name: opnfv_yardstick_tc037.yaml
--
- file_name: opnfv_yardstick_tc055.yaml
- constraint:
- installer: compass
- pod: huawei-pod1
- task_args:
- huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
- "host": "node5.yardstick-TC055"}'
--
- file_name: opnfv_yardstick_tc063.yaml
+ file_name: opnfv_yardstick_tc043.yaml
constraint:
- installer: compass
- pod: huawei-pod1
+ installer: fuel
+ pod: ericsson-pod2
task_args:
- huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
- "host": "node5.yardstick-TC063"}'
+ ericsson-pod2: '{"pod_info": "etc/yardstick/nodes/fuel_baremetal/pod.yaml",
+ "host": "node1.LF","target": "node2.LF"}'