Merge "run ha test case in compass pod"

[yardstick.git] / tests / opnfv / test_suites / opnfv_os-nosdn-nofeature-ha_daily.yaml

diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-ha_daily.yaml
index 44c8494..d18a4e6 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-ha_daily.yaml
@@ -1,3 +1,11 @@
+##############################################################################
+# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
 ---
 # os-nosdn-nofeature-ha daily task suite
 
@@ -28,10 +36,22 @@ test_cases:
     task_args:
         huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
         "host": "node4.LF","target": "node5.LF"}'
+-
+    file_name: opnfv_yardstick_tc019.yaml
+    constraint:
+        installer: compass,fuel
+        pod: huawei-pod2,ericsson-pod1
+    task_args:
+        huawei-pod2: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml"}'
+        ericsson-pod1: '{"file": "etc/yardstick/nodes/fuel_baremetal/pod.yaml"}'
 -
     file_name: opnfv_yardstick_tc045.yaml
     constraint:
-        installer: fuel
+        installer: compass,fuel
+        pod: huawei-pod2,ericsson-pod1
+    task_args:
+        huawei-pod2: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml"}'
+        ericsson-pod1: '{"file": "etc/yardstick/nodes/fuel_baremetal/pod.yaml"}'
 -
     file_name: opnfv_yardstick_tc046.yaml
     constraint:
@@ -39,11 +59,19 @@ test_cases:
 -
     file_name: opnfv_yardstick_tc047.yaml
     constraint:
-        installer: fuel
+        installer: compass,fuel
+        pod: huawei-pod2,ericsson-pod1
+    task_args:
+        huawei-pod2: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml"}'
+        ericsson-pod1: '{"file": "etc/yardstick/nodes/fuel_baremetal/pod.yaml"}'
 -
     file_name: opnfv_yardstick_tc048.yaml
     constraint:
-        installer: fuel
+        installer: compass,fuel
+        pod: huawei-pod2,ericsson-pod1
+    task_args:
+        huawei-pod2: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml"}'
+        ericsson-pod1: '{"file": "etc/yardstick/nodes/fuel_baremetal/pod.yaml"}'
 -
     file_name: opnfv_yardstick_tc049.yaml
     constraint:
@@ -55,7 +83,11 @@ test_cases:
 -
     file_name: opnfv_yardstick_tc051.yaml
     constraint:
-        installer: fuel
+        installer: compass,fuel
+        pod: huawei-pod2,ericsson-pod1
+    task_args:
+        huawei-pod2: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml"}'
+        ericsson-pod1: '{"file": "etc/yardstick/nodes/fuel_baremetal/pod.yaml"}'
 -
     file_name: opnfv_yardstick_tc052.yaml
     constraint: