4 files changed, 83 insertions, 94 deletions
diff --git a/test_cases/dell_santa_clara/storage/fio_2.yaml b/test_cases/dell_santa_clara/storage/fio_2.yaml
deleted file mode 100644
index 46368cd2..00000000
--- a/test_cases/dell_santa_clara/storage/fio_2.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-Scenario:
-  benchmark: fio
-  host: machine_1, machine_2
-  server: blakc
-
-Context:
-  Host_Machines:
-    machine_1:
-      ip: 10.20.0.4
-      pw: r00tme
-
-    machine_2:
-        ip: 10.20.0.5
-        pw: r00tme
-  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: "Compute"
-  Benchmark: "dhrystone"
-  Overview: >
-        '''This test will run the dhrystone benchmark in parallel on machine_1 and machine_2.\n
-         if you wish to add a virtual machine add the following information under the Virtual_Machine tag
-         machine_1:
-         ip: 172.18.0.16
-         pw: Op3nStack
-         role: host
-         machine_2:
-         ip: 172.18.0.15
-         pw: Op3nStack
-         role: host
-
-        virtualmachine_1:
-          availability_zone:
-          public_network:
-          OS_image:
-          flavor:
-          role:
-        '''
-
diff --git a/test_cases/dell_santa_clara/storage/fio_baremetal.yaml b/test_cases/dell_santa_clara/storage/fio_baremetal.yaml
new file mode 100644
index 00000000..4778c385
--- /dev/null
+++ b/test_cases/dell_santa_clara/storage/fio_baremetal.yaml
@@ -0,0 +1,39 @@
+Scenario:
+  benchmark: fio
+  host: machine_1, machine_2
+  server: blakc
+
+Context:
+  Host_Machines:
+    machine_1:
+      ip: 10.20.0.7
+      pw: r00tme
+      role: host
+    machine_2:
+      ip: 10.20.0.6
+      pw: r00tme
+      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/test_cases/dell_santa_clara/storage/fio_parallel.yaml b/test_cases/dell_santa_clara/storage/fio_parallel.yaml
deleted file mode 100644
index 9f11af05..00000000
--- a/test_cases/dell_santa_clara/storage/fio_parallel.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-Scenario:
-  benchmark: fio
-  host: machine_1, machine_2
-  server: blakc
-
-Context:
-  Host_Machines:
-    machine_1:
-      ip: 10.20.0.6
-      pw: r00tme
-      role: host
-    machine_2:
-      ip: 10.20.0.7
-      pw: r00tme
-      role: host
-
-
-  Virtual_Machines:
-
-
-Test_Description:
-  Test_category: "Compute"
-  Benchmark: "dhrystone"
-  Overview: >
-        '''This test will run the dhrystone benchmark in parallel on machine_1 and machine_2.\n
-         if you wish to add a virtual machine add the following information under the Virtual_Machine tag
-         machine_1:
-         ip: 172.18.0.16
-         pw: Op3nStack
-         role: host
-         machine_2:
-         ip: 172.18.0.15
-         pw: Op3nStack
-         role: host
-
-        virtualmachine_1:
-          availability_zone:
-          public_network:
-          OS_image:
-          flavor:
-          role:
-        '''
-
diff --git a/test_cases/dell_santa_clara/storage/fio_vm.yaml b/test_cases/dell_santa_clara/storage/fio_vm.yaml
new file mode 100644
index 00000000..dcd27252
--- /dev/null
+++ b/test_cases/dell_santa_clara/storage/fio_vm.yaml
@@ -0,0 +1,44 @@
+Scenario:
+  benchmark: fio
+  host: machine_1, machine_2
+  server: blakc
+
+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:
+        '''
+