From 1cdc3d7ac2949ffbf21851773314fa73c4ac7a05 Mon Sep 17 00:00:00 2001
From: JingLu5 <lvjing5@huawei.com>
Date: Sun, 9 Oct 2016 12:25:34 +0800
Subject: 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>
---
 tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml  |  3 +-
 tests/opnfv/test_cases/ping_lxd_test.yaml          | 44 ----------------------
 .../test_suites/opnfv_os-nosdn-lxd-ha_daily.yaml   |  9 +++--
 .../test_suites/opnfv_os-nosdn-lxd-noha_daily.yaml |  6 +++
 4 files changed, 13 insertions(+), 49 deletions(-)
 delete mode 100644 tests/opnfv/test_cases/ping_lxd_test.yaml

(limited to 'tests/opnfv')

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
 -
-- 
cgit 1.2.3-korg