cleanup configs
diff --git a/wally/suits/io/check_distribution.cfg b/wally/suits/io/check_distribution.cfg
index 7c06813..4743946 100644
--- a/wally/suits/io/check_distribution.cfg
+++ b/wally/suits/io/check_distribution.cfg
@@ -1,10 +1,11 @@
[global]
-include defaults.cfg
+include defaults_qd.cfg
[distrubution_test_{TEST_SUMM}]
blocksize=4k
rw=randwrite
direct=1
-sync=1
-ramp_time=5
-runtime=30
+sync=0
+ramp_time=30
+runtime=1800
+iodepth=4
diff --git a/wally/suits/io/check_linearity.cfg b/wally/suits/io/check_linearity.cfg
index 42618d4..04d5f97 100644
--- a/wally/suits/io/check_linearity.cfg
+++ b/wally/suits/io/check_linearity.cfg
@@ -1,6 +1,5 @@
[global]
-include defaults.cfg
-
+include defaults_qd.cfg
direct=1
ramp_time=5
runtime=30
@@ -12,6 +11,7 @@
[linearity_test_{TEST_SUMM}]
blocksize={BLOCK_SIZES}
rw=randread
+iodepth=4
# ---------------------------------------------------------------------
# check sync write linearity. oper_time = func(size)
@@ -21,4 +21,3 @@
blocksize={BLOCK_SIZES}
rw=randwrite
sync=1
-
diff --git a/wally/suits/io/check_th_count.cfg b/wally/suits/io/check_th_count.cfg
deleted file mode 100644
index 745f189..0000000
--- a/wally/suits/io/check_th_count.cfg
+++ /dev/null
@@ -1,37 +0,0 @@
-[global]
-include defaults.cfg
-
-ramp_time=5
-runtime=30
-direct=1
-
-numjobs={% 1, 2, 5, 10, 15, 20, 25, 30, 35, 40 %}
-
-# ---------------------------------------------------------------------
-# check different thread count. (latency, bw) = func(th_count)
-#
-# RANDOM R IOPS, DIRECT, should act same as AS (4k + randread + sync)
-# just faster. Not sure, that we need it
-# 4k + randread + direct
-#
-# RANDOM R/W IOPS
-# 4k + randread + sync
-# 4k + randwrite + sync
-#
-# LINEAR BW
-# 1m + write + direct
-# 1m + read + direct
-#
-# ---------------------------------------------------------------------
-[concurrence_{TEST_SUMM}]
-blocksize=4k
-rw=randwrite
-
-[concurrence_{TEST_SUMM}]
-blocksize=4k
-rw={% randread, randwrite %}
-sync=1
-
-[concurrence_{TEST_SUMM}]
-blocksize=1m
-rw={% write, read %}
diff --git a/wally/suits/io/check_warmup.cfg b/wally/suits/io/check_warmup.cfg
deleted file mode 100644
index 415e3ce..0000000
--- a/wally/suits/io/check_warmup.cfg
+++ /dev/null
@@ -1,36 +0,0 @@
-[defaults]
-NUM_ROUNDS=7
-
-# this is critical for correct results in multy-node run
-randrepeat=0
-
-ramp_time=5
-buffered=0
-wait_for_previous
-filename={FILENAME}
-iodepth=1
-size=10G
-time_based
-runtime=30
-
-# ---------------------------------------------------------------------
-# check test time, no warmup time. iops = func(rune_time)
-# ---------------------------------------------------------------------
-[runtime_test_wo_wu_{TEST_SUMM}_{UNIQ} * {NUM_ROUNDS}]
-startdelay=10
-blocksize={% 4k, 1m %}
-rw=randwrite
-direct=1
-ramp_time=0
-runtime={% 10, 15, 20, 30, 60, 120 %}
-
-# ---------------------------------------------------------------------
-# check test time, with warmup time. iops = func(rune_time)
-# ---------------------------------------------------------------------
-[runtime_test_w_wu_{TEST_SUMM}_{UNIQ} * {NUM_ROUNDS}]
-startdelay=10
-blocksize={% 4k, 1m %}
-rw=randwrite
-direct=1
-ramp_time={% 5, 10, 15 %}
-runtime={% 15, 30 %}
diff --git a/wally/suits/io/cinder_iscsi.cfg b/wally/suits/io/cinder_iscsi.cfg
index b0f575b..e4f5b60 100644
--- a/wally/suits/io/cinder_iscsi.cfg
+++ b/wally/suits/io/cinder_iscsi.cfg
@@ -1,9 +1,10 @@
[global]
-include defaults.cfg
+include defaults_qd.cfg
ramp_time=30
-runtime=120
+runtime=180
direct=1
-NUMJOBS={% 1, 5, 10, 15, 25, 40 %}
+sync=0
+QD={% 1, 5, 10, 15, 25, 40 %}
# ---------------------------------------------------------------------
# check different thread count, sync mode. (latency, iops) = func(th_count)
@@ -11,8 +12,7 @@
[cinder_iscsi_{TEST_SUMM}]
blocksize=4k
rw=randwrite
-sync=1
-numjobs={NUMJOBS}
+iodepth={QD}
# ---------------------------------------------------------------------
# check different thread count, direct read mode. (latency, iops) = func(th_count)
@@ -21,15 +21,16 @@
[cinder_iscsi_{TEST_SUMM}]
blocksize=4k
rw=randread
-numjobs={NUMJOBS}
+iodepth={QD}
# ---------------------------------------------------------------------
# Read always sync, with large request latency linear write
# ......
# ---------------------------------------------------------------------
[cinder_iscsi_{TEST_SUMM}]
-blocksize=64m
-rw=randread
+blocksize=8m
+rw=read
+iodepth=1
# ---------------------------------------------------------------------
# No reason for th count > 1 in case of sequantial operations
@@ -38,13 +39,4 @@
[cinder_iscsi_{TEST_SUMM}]
blocksize=8m
rw=write
-
-# ---------------------------------------------------------------------
-# check IOPS randwrite. This test MUST BE THE LAST ONE
-# 240 seconds needs to clean caches
-# ---------------------------------------------------------------------
-[cinder_iscsi_{TEST_SUMM}]
-ramp_time=240
-runtime=240
-blocksize=4k
-rw=randwrite
+iodepth=1
diff --git a/wally/suits/io/lat_vs_iops.cfg b/wally/suits/io/lat_vs_iops.cfg
index 8dfa6d2..cb26b7d 100644
--- a/wally/suits/io/lat_vs_iops.cfg
+++ b/wally/suits/io/lat_vs_iops.cfg
@@ -1,38 +1,38 @@
[global]
-include defaults.cfg
+include defaults_qd.cfg
ramp_time=5
runtime=30
blocksize=4k
rw=randwrite
-sync=1
+sync=0
direct=1
# ---------------------------------------------------------------------
# latency as function from IOPS
# ---------------------------------------------------------------------
[latVSiops{rate_iops}_{TEST_SUMM}]
-numjobs=1
+iodepth=1
rate_iops={% 20, 40, 60, 80, 100, 120, 160, 200, 250, 300 %}
# ---------------------------------------------------------------------
# latency as function from IOPS
# ---------------------------------------------------------------------
[latVSiops{rate_iops}_{TEST_SUMM}]
-numjobs=3
+iodepth=3
rate_iops={% 10, 20, 40, 60, 80, 100, 120, 160 %}
# ---------------------------------------------------------------------
# latency as function from IOPS
# ---------------------------------------------------------------------
[latVSiops{rate_iops}_{TEST_SUMM}]
-numjobs=7
+iodepth=7
rate_iops={% 5, 10, 20, 40, 50, 60, 70 %}
# ---------------------------------------------------------------------
# latency as function from IOPS
# ---------------------------------------------------------------------
[latVSiops{rate_iops}_{TEST_SUMM}]
-numjobs=10
+iodepth=10
rate_iops={% 5, 10, 20, 40, 50 %}
diff --git a/wally/suits/io/long_test.cfg b/wally/suits/io/long_test.cfg
deleted file mode 100644
index a304b8b..0000000
--- a/wally/suits/io/long_test.cfg
+++ /dev/null
@@ -1,22 +0,0 @@
-[global]
-include defaults.cfg
-
-# 24h test
-NUM_ROUNDS1=270
-NUM_ROUNDS2=261
-
-direct=1
-blocksize=128k
-rw=randwrite
-
-# ---------------------------------------------------------------------
-# check read and write linearity. oper_time = func(size)
-# ---------------------------------------------------------------------
-[24h_test]
-runtime=30
-NUM_ROUND={NUM_ROUNDS1}
-
-[24h_test]
-runtime=300
-NUM_ROUND={NUM_ROUNDS2}
-
diff --git a/wally/suits/io/mixed_hdd.cfg b/wally/suits/io/mixed_hdd.cfg
index be8b1ab..248fbbc 100644
--- a/wally/suits/io/mixed_hdd.cfg
+++ b/wally/suits/io/mixed_hdd.cfg
@@ -1,12 +1,12 @@
[global]
-include defaults.cfg
+include defaults_qd.cfg
ramp_time=5
runtime=30
blocksize=4k
rw=randrw
-sync=1
+sync=0
direct=1
[mixed-hdd-r{rwmixread}_{TEST_SUMM}]
rwmixread={% 0,20,40,60,80,100 %}
-numjobs={% 1,8,16 %}
+iodepth={% 1,8,16 %}
diff --git a/wally/suits/io/mixed_ssd.cfg b/wally/suits/io/mixed_ssd.cfg
index 2e9f04c..be2b3fc 100644
--- a/wally/suits/io/mixed_ssd.cfg
+++ b/wally/suits/io/mixed_ssd.cfg
@@ -1,12 +1,12 @@
[global]
-include defaults.cfg
+include defaults_qd.cfg
ramp_time=5
runtime=30
blocksize=4k
rw=randrw
-sync=1
+sync=0
direct=1
[mixed-ssd-r{rwmixread}_{TEST_SUMM}]
rwmixread={% 0,20,40,60,80,85,90,95,100 %}
-numjobs={% 1,16,64,128 %}
+iodepth={% 1,16,64,128 %}
diff --git a/wally/suits/io/test.cfg b/wally/suits/io/test.cfg
deleted file mode 100644
index 0280fd4..0000000
--- a/wally/suits/io/test.cfg
+++ /dev/null
@@ -1,20 +0,0 @@
-[test1]
-#ioengine=libaio
-ioengine=rbd
-rbdname=foo
-pool=rbd
-buffered=0
-group_reporting=1
-iodepth=16
-unified_rw_reporting=1
-norandommap=1
-thread=1
-time_based=1
-wait_for_previous=1
-randrepeat=0
-size=4G
-ramp_time=0
-runtime=10
-direct=1
-blocksize=60k
-rw=randread
diff --git a/wally/suits/io/vm_count_ec2.cfg b/wally/suits/io/vm_count_ec2.cfg
deleted file mode 100644
index 3efcf00..0000000
--- a/wally/suits/io/vm_count_ec2.cfg
+++ /dev/null
@@ -1,26 +0,0 @@
-[global]
-include defaults.cfg
-
-ramp_time=5
-runtime=30
-
-BW_LIMIT=60m
-IOPS_LIMIT=100
-
-direct=1
-NUMJOBS=1
-
-# ---------------------------------------------------------------------
-# check different thread count. (latency, bw) = func(th_count)
-# ---------------------------------------------------------------------
-[vmcount_{TEST_SUMM}]
-blocksize=4m
-rw={% randwrite, randread %}
-numjobs={NUMJOBS}
-rate={BW_LIMIT}
-
-[vmcount_{TEST_SUMM}]
-blocksize=4k
-rw={% randwrite,randread %}
-numjobs={NUMJOBS}
-rate_iops={IOPS_LIMIT}