3 files changed, 12 insertions, 7 deletions

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml
index a35629f81..81b42dc4d 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml
@@ -14,6 +14,7 @@ description: >
     Measure volume storage IOPS, throughput and latency using fio with job file.
 
 {% set directory = directory or "/FIO_Test" %}
+{% set volume_size = volume_size or 200 %}
 {% set provider = provider or none %}
 {% set physical_network = physical_network or 'physnet1' %}
 {% set segmentation_id = segmentation_id or none %}
@@ -53,7 +54,7 @@ context:
       floating_ip: true
       volume:
         name: test-volume
-        size: 200
+        size: {{volume_size}}
       volume_mountpoint: /dev/vdb
 
   networks:
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc011.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc011.yaml
index eef1a7a62..b2077d59e 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc011.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc011.yaml
@@ -13,6 +13,10 @@ description: >
     Yardstick TC011 config file;
     Measure packet delay variation (jitter) using iperf3.
 
+{% set udp = udp or "udp" %}
+{% set bandwidth = bandwidth or "20m" %}
+{% set length = length or "8K" %}
+{% set window = window or 29200 %}
 {% set provider = provider or none %}
 {% set physical_network = physical_network or 'physnet1' %}
 {% set segmentation_id = segmentation_id or none %}
@@ -21,10 +25,10 @@ scenarios:
 -
   type: Iperf3
   options:
-    udp: udp
-    bandwidth: 20m
-    length: 8K
-    window: 29200
+    udp: {{udp}}
+    bandwidth: {{bandwidth}}
+    length: {{length}}
+    window: {{window}}
   host: zeus.demo
   target: hera.demo
 
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc063.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc063.yaml
index 48288ef62..254c214d2 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc063.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc063.yaml
@@ -13,8 +13,8 @@ description: >
     Yardstick TC063 config file;
     Measure disk size, block size and disk utilization using fdisk and iostat.
 
-{% set host = host or "node5.yardstick-TC063" %}
 {% set file = file or '/etc/yardstick/pod.yaml' %}
+{% set node = node or "node5" %}
 
 scenarios:
 -
@@ -22,7 +22,7 @@ scenarios:
   options:
     test_type: "disk_size"
 
-  host: {{host}}
+  host: {{node}}.yardstick-TC063
 
   runner:
     type: Iteration