summaryrefslogtreecommitdiffstats
path: root/tests/opnfv/test_cases
diff options
context:
space:
mode:
authorJingLu5 <lvjing5@huawei.com>2016-10-09 12:25:34 +0800
committerJingLu5 <lvjing5@huawei.com>2016-10-11 10:52:11 +0800
commit1cdc3d7ac2949ffbf21851773314fa73c4ac7a05 (patch)
tree873d8af7a835038351c29fb94eb0d790d679c6b7 /tests/opnfv/test_cases
parent04547421604c8f30152d1947500988c2081fd54a (diff)
Provide yardstick-trusty-server.tar.gz for lxd scenario
JIRA: YARDSTICK-325 This patch removes ping_lxd_test.yaml and changes vm image used for lxd senarios. In the *-lxd-* scenariois, Cirros LXC 0.3 image will be used for Ping test case. For yardstick generic test, a dedicated yardstick vm image will be used. Change-Id: I5f9e7a92e3e5dded0014baec77085d80cc904b52 Signed-off-by: JingLu5 <lvjing5@huawei.com>
Diffstat (limited to 'tests/opnfv/test_cases')
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml3
-rw-r--r--tests/opnfv/test_cases/ping_lxd_test.yaml44
2 files changed, 2 insertions, 45 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'