Merge "Fix test failing"

2 files changed, 83 insertions, 0 deletions

diff --git a/benchmarks/testplan/default/storage/fio_bm.yaml b/benchmarks/testplan/default/storage/fio_bm.yaml
new file mode 100644
index 00000000..d0001ea2
--- /dev/null
+++ b/benchmarks/testplan/default/storage/fio_bm.yaml
@@ -0,0 +1,39 @@
+Scenario:
+  benchmark: fio
+  host: machine_1, machine_2
+  server:
+
+Context:
+  Host_Machines:
+    machine_1:
+      ip:
+      pw:
+      role: host
+    machine_2:
+      ip:
+      pw:
+      role: host
+
+
+  Virtual_Machines:
+
+
+Test_Description:
+  Test_category: "Storage"
+  Benchmark: "FIO"
+  Overview: >
+        '''This test will run the FIO  benchmark in parallel on host machines "machine_1" and "machine_2".\n
+         The fio job specifications can be found in qtip/benchmarks/fio_jobs/test_job.
+         The job conists of an fio load of:
+          1.50% rand read 50% rand write
+          2.Asynch engine
+          3.Direct IO.
+          4.Queing depth of 2
+
+         if you wish to add another  machine add the following information under the Host_Machines tag
+         machine_3:
+         ip: 172.18.0.16
+         pw: Op3nStack
+         role: host
+         '''
+
diff --git a/benchmarks/testplan/default/storage/fio_vm.yaml b/benchmarks/testplan/default/storage/fio_vm.yaml
new file mode 100644
index 00000000..0e7f121b
--- /dev/null
+++ b/benchmarks/testplan/default/storage/fio_vm.yaml
@@ -0,0 +1,44 @@
+Scenario:
+  benchmark: fio
+  host: virtualmachine_1, virtualmachine_2
+  server:
+
+Context:
+  Host_Machines:
+
+  Virtual_Machines:
+    virtualmachine_1:
+      availability_zone: compute1
+      public_network: 'net04_ext'
+      OS_image: QTIP_CentOS
+      flavor: m1.large
+      role: host
+    virtualmachine_2:
+      availability_zone: compute2
+      public_network: 'net04_ext'
+      OS_image: QTIP_CentOS
+      flavor: m1.large
+      role: host
+
+Test_Description:
+  Test_category: "Storage"
+  Benchmark: "FIO"
+  Overview: >
+        '''This test will run the FIO  benchmark in parallel on virtualmachine_1 and virtualmachine_2.\n
+         The fio job specifications can be found in qtip/benchmarks/fio_jobs/test_job.
+         The job conists of an fio load of:
+          1.50% rand read 50% rand write
+          2.Asynch engine
+          3.Direct IO.
+          4.Queing depth of 2
+
+         if you wish to add a virtual machine add the following information under the Virtual_Machine tag
+
+        virtualmachine_3:
+          availability_zone:
+          public_network:
+          OS_image:
+          flavor:
+          role:
+        '''
+