Merge "Refactor userguide "Yardstick Installation""

[yardstick.git] / tests / opnfv / test_cases / opnfv_yardstick_tc006.yaml

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml
index a35629f..fe244e8 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml
@@ -13,7 +13,9 @@ description: >
     Yardstick TC006 config file;
     Measure volume storage IOPS, throughput and latency using fio with job file.
 
-{% set directory = directory or "/FIO_Test" %}
+{% set job_file_config = job_file_config or '["[random-writers]", ioengine=libaio, rw=randwrite, size=128m, bs=32k, direct=0, size=64m, numjobs=4]' %}
+{% 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 %}
@@ -24,7 +26,10 @@ scenarios:
 -
   type: Fio
   options:
-    job_file: "job_file.ini"
+    # input the content of a fio job file directly
+    job_file_config: {{ job_file_config }}
+    # or input the job file name
+    #job_file: "job_file.ini"
     directory: {{ directory }}
 
   host: fio.yardstick-TC006
@@ -53,7 +58,7 @@ context:
       floating_ip: true
       volume:
         name: test-volume
-        size: 200
+        size: {{volume_size}}
       volume_mountpoint: /dev/vdb
 
   networks: