aboutsummaryrefslogtreecommitdiffstats
path: root/tests/opnfv
diff options
context:
space:
mode:
Diffstat (limited to 'tests/opnfv')
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml3
-rw-r--r--tests/opnfv/test_cases/ping_lxd_test.yaml44
-rw-r--r--tests/opnfv/test_suites/opnfv_os-nosdn-lxd-ha_daily.yaml9
-rw-r--r--tests/opnfv/test_suites/opnfv_os-nosdn-lxd-noha_daily.yaml6
-rw-r--r--tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-ha_daily.yaml4
5 files changed, 16 insertions, 50 deletions
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml
index 93d6ac018..3c7b988c0 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml
@@ -2,6 +2,7 @@
# measure network latency using ping
schema: "yardstick:task:0.1"
+{% set image = image or "cirros-0.3.3" %}
scenarios:
{% for i in range(2) %}
-
@@ -23,7 +24,7 @@ scenarios:
context:
name: demo
- image: cirros-0.3.3
+ image: {{image}}
flavor: yardstick-flavor
user: cirros
diff --git a/tests/opnfv/test_cases/ping_lxd_test.yaml b/tests/opnfv/test_cases/ping_lxd_test.yaml
deleted file mode 100644
index d20035690..000000000
--- a/tests/opnfv/test_cases/ping_lxd_test.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-# measure network latency using ping
-# this tc is dedicated for os-nosdn-lxd scenario
-
-schema: "yardstick:task:0.1"
-scenarios:
-{% for i in range(2) %}
--
- type: Ping
- options:
- packetsize: 100
- host: athena.demo
- target: ares.demo
-
- runner:
- type: Duration
- duration: 60
- interval: 10
-
- sla:
- max_rtt: 10
- action: monitor
-{% endfor %}
-
-context:
- name: demo
- image: Cirros LXC 0.3
- flavor: yardstick-flavor
- user: cirros
-
- placement_groups:
- pgrp1:
- policy: "availability"
-
- servers:
- athena:
- floating_ip: true
- placement: "pgrp1"
- ares:
- placement: "pgrp1"
-
- networks:
- test:
- cidr: '10.0.1.0/24'
diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-ha_daily.yaml
index 730284b9f..01591b9d2 100644
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-ha_daily.yaml
@@ -7,12 +7,13 @@ name: "os-nosdn-lxd-ha"
test_cases_dir: "tests/opnfv/test_cases/"
test_cases:
-
- file_name: ping_lxd_test.yaml
+ file_name: opnfv_yardstick_tc002.yaml
constraint:
installer: joid
- pod: intel-pod5
--
- file_name: opnfv_yardstick_tc002.yaml
+ pod: intel-pod5,intel-pod6
+ task_args:
+ intel-pod5: '{"image": "Cirros LXC 0.3"}'
+ intel-pod6: '{"image": "Cirros LXC 0.3"}'
-
file_name: opnfv_yardstick_tc005.yaml
-
diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-noha_daily.yaml
index ac8535e81..e1f945b9c 100644
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-noha_daily.yaml
@@ -8,6 +8,12 @@ test_cases_dir: "tests/opnfv/test_cases/"
test_cases:
-
file_name: opnfv_yardstick_tc002.yaml
+ constraint:
+ installer: joid
+ pod: intel-pod5,intel-pod6
+ task_args:
+ intel-pod5: '{"image": "Cirros LXC 0.3"}'
+ intel-pod6: '{"image": "Cirros LXC 0.3"}'
-
file_name: opnfv_yardstick_tc005.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 67445f051..d6a0533f4 100644
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-ha_daily.yaml
@@ -22,10 +22,12 @@ test_cases:
file_name: opnfv_yardstick_tc027.yaml
constraint:
installer: compass,fuel
- pod: huawei-pod1,lf-pod2
+ pod: huawei-pod1,lf-pod2,ericsson-pod3,ericsson-pod4
task_args:
huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml"}'
lf-pod2: '{"pod_info": "etc/yardstick/nodes/fuel_baremetal/pod.yaml", "openrc":"/root/openrc", "external_network":"admin_floating_net"}'
+ ericsson-pod3: '{"pod_info": "etc/yardstick/nodes/fuel_baremetal/pod.yaml", "openrc":"/root/openrc", "external_network":"admin_floating_net"}'
+ ericsson-pod4: '{"pod_info": "etc/yardstick/nodes/fuel_baremetal/pod.yaml", "openrc":"/root/openrc", "external_network":"admin_floating_net"}'
-
file_name: opnfv_yardstick_tc037.yaml
-