X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Fopnfv%2Ftest_cases%2Fopnfv_yardstick_tc006.yaml;h=fe244e81cdf18e86251da1047e32739a5033e429;hb=7085a190cefad8c72774925dab690683d76695da;hp=8b21c5bf11bfee18bbafe5c43f98dfb1a52d44ec;hpb=cd5baa32609687c3ae8acd4b19dbb10cd0bd47ff;p=yardstick.git

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml
index 8b21c5bf1..fe244e81c 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml
@@ -1,26 +1,73 @@
+##############################################################################
+# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
 ---
+
+schema: "yardstick:task:0.1"
+description: >
+    Yardstick TC006 config file;
+    Measure volume storage IOPS, throughput and latency using fio with job file.
+
+{% 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 %}
+
 schema: "yardstick:task:0.1"
 
 scenarios:
 -
-  type: vtc_throughput
-
+  type: Fio
   options:
-    packet_size: 1280
-    vlan_sender: 2033
-    vlan_receiver: 2040
-    default_net_name: management_network
-    default_subnet_name: management_subnet
-    vlan_net_1_name: apexlake_inbound_network
-    vlan_subnet_1_name: apexlake_inbound_subnet
-    vlan_net_2_name: apexlake_outbound_network
-    vlan_subnet_2_name: apexlake_outbound_subnet
-    vnic_type: direct
-    vtc_flavor: m1.large
+    # 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
 
   runner:
     type: Iteration
     iterations: 1
+    interval: 1
+
+  sla:
+    read_bw: 6000
+    read_iops: 1500
+    read_lat: 500.1
+    write_bw: 6000
+    write_iops: 1500
+    write_lat: 500.1
+    action: monitor
 
 context:
-  type: Dummy
+  name: yardstick-TC006
+  image: yardstick-image
+  flavor: yardstick-flavor
+  user: ubuntu
+  servers:
+    fio:
+      floating_ip: true
+      volume:
+        name: test-volume
+        size: {{volume_size}}
+      volume_mountpoint: /dev/vdb
+
+  networks:
+    test:
+      cidr: '10.0.1.0/24'
+      {% if provider == "vlan" %}
+      provider: {{provider}}
+      physical_network: {{physical_network}}
+        {% if segmentation_id %}
+      segmentation_id: {{segmentation_id}}
+        {% endif %}
+      {% endif %}