11 files changed, 106 insertions, 78 deletions
diff --git a/test_cases/default/compute/.whetstone_serial.yaml.swp b/test_cases/default/compute/.whetstone_serial.yaml.swp
deleted file mode 100644
index bbfd3be2..00000000
--- a/test_cases/default/compute/.whetstone_serial.yaml.swp
+++ /dev/null
diff --git a/test_cases/default/compute/dhrystone_serial.yaml b/test_cases/default/compute/dhrystone_bm.yaml
index e15e8ecc..022cf5ee 100644
--- a/test_cases/default/compute/dhrystone_serial.yaml
+++ b/test_cases/default/compute/dhrystone_bm.yaml
@@ -1,28 +1,28 @@
   
 Scenario:
   benchmark: dhrystone
-  host: machine_1, machine_2, virtualmachine_1
+  host: machine_1, machine_2
   server: 
 
 Context:
   Host_Machines:
     machine_1:
-      ip: 172.18.0.16
-      pw: Op3nStack
+      ip: 10.20.0.4
+      pw: 
       role: host
+    machine_2:
+      ip: 10.20.0.5
+      pw:
+      role: host
+
   Virtual_Machines:  
-    virtualmachine_1:
-      availability_zone: nova
-      public_network: 'net04_ext'
-      OS_image: QTIP_CentOS
-      flavor: m1.large
-      role: server
+    
 
 Test_Description:
   Test_category: "Compute"
   Benchmark: "dhrystone"
   Overview: >
-        ''' This test will run the dhrystone benchmark in serial on machine_1 and machine_2.\n
+        ''' 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
 
         virtualmachine_1:
diff --git a/test_cases/default/compute/dhrystone_parallel.yaml b/test_cases/default/compute/dhrystone_vm.yaml
index 29de6d6f..c14399b1 100644
--- a/test_cases/default/compute/dhrystone_parallel.yaml
+++ b/test_cases/default/compute/dhrystone_vm.yaml
@@ -1,6 +1,6 @@
 Scenario:
   benchmark: dhrystone
-  host: machine_1, machine_2
+  host: virtualmachine_1, virtualmachine_2
   server: blakc
 
 Context:
diff --git a/test_cases/default/compute/dpi_serial.yaml b/test_cases/default/compute/dpi_bm.yaml
index b39597a2..f161aa3f 100644
--- a/test_cases/default/compute/dpi_serial.yaml
+++ b/test_cases/default/compute/dpi_bm.yaml
@@ -1,18 +1,17 @@
 Scenario:
   benchmark: dpi
-  host: virtualmachine_1
-  server: virtualmachine_2
+  host: machine_1,machine_2
 
 Context:
   Host_Machines:
      machine_1:
-      ip: 172.18.0.17
-      pw: Op3nStack
-      role: 1host
+       ip: 10.20.0.4
+       pw: Op3nStack
+       role: 1host
      machine_2:
-      ip: 172.18.0.16
-      pw: Op3nStack
-      role: 1host
+       ip: 10.20.0.5
+       pw: Op3nStack
+       role: 1host
   Virtual_Machines:
 Test_Description:
   Test_category: "Compute"
diff --git a/test_cases/default/compute/dpi_parallel.yaml b/test_cases/default/compute/dpi_vm.yaml
index 0f6afdce..8a157e7a 100644
--- a/test_cases/default/compute/dpi_parallel.yaml
+++ b/test_cases/default/compute/dpi_vm.yaml
@@ -1,7 +1,6 @@
 Scenario:
   benchmark: dpi
   1Run : virtualmachine_1, virtualmachine_2
-  2Run:
 
 Context:
   Host_Machines:
diff --git a/test_cases/default/compute/whetstone_serial.yaml b/test_cases/default/compute/ramspeed_bm.yaml
index 25cefbf8..47b933b8 100644
--- a/test_cases/default/compute/whetstone_serial.yaml
+++ b/test_cases/default/compute/ramspeed_bm.yaml
@@ -1,28 +1,28 @@
   
 Scenario:
-  benchmark: whetstone
-  host: machine_1,
-  server: virtualmachine_1
+  benchmark: ramspeed
+  host: machine_1, machine_2
+  server: 
 
 Context:
   Host_Machines:
     machine_1:
-      ip: 172.18.0.16
-      pw: Op3nStack
+      ip: 10.20.0.4
+      pw: 
       role: host
+    machine_2:
+      ip: 10.20.0.5
+      pw:
+      role: host
+
   Virtual_Machines:  
-    virtualmachine_1:
-      availability_zone: nova
-      public_network: 'net04_ext'
-      OS_image: QTIP_CentOS
-      flavor: m1.large
-      role: server
+    
 
 Test_Description:
   Test_category: "Compute"
-  Benchmark: "whetstone"
+  Benchmark: "dhrystone"
   Overview: >
-        ''' This test will run the whetstone benchmark in serial on machine_1 and machine_2.\n
+        ''' 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
 
         virtualmachine_1:
diff --git a/test_cases/default/compute/ssl_bm.yaml b/test_cases/default/compute/ssl_bm.yaml
new file mode 100644
index 00000000..bded6d2d
--- /dev/null
+++ b/test_cases/default/compute/ssl_bm.yaml
@@ -0,0 +1,31 @@
+Scenario:
+  benchmark: ssl
+  1Run: machine_1,machine_2
+
+Context:
+  Host_Machines:
+    machine_1:
+      ip: 10.20.0.4
+      pw: 
+      role: 1Run
+    machine_2:
+      ip: 10.20.0.5
+      pw:
+      role: 1Run
+  Virtual_Machines:
+      
+
+Test_Description:
+  Test_category: "Compute"
+  Benchmark: "ssl"
+  Overview: >
+        '''This test will run the SSL benchmark in parallel on machine_1 and machine_1.
+           If you wish to add a virtual machine add the following information under the Virtual_Machine tag
+
+        virtualmachine_1:
+          availability_zone:
+          public_network:
+          OS_image:
+          flavor:
+          role:
+          '''   
diff --git a/test_cases/default/compute/ssl_serial.yaml b/test_cases/default/compute/ssl_serial.yaml
deleted file mode 100644
index 4d92526e..00000000
--- a/test_cases/default/compute/ssl_serial.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-Scenario:
-  benchmark: ssl
-  1Run: machine_1
-  2Run: virtualmachine_1 
-
-Context:
-  Host_Machines:
-    machine_1:
-      ip: 10.20.0.7
-      pw: r00tme
-      role: 1Run
-  Virtual_Machines:  
-    virtualmachine_1:
-      availability_zone: compute1
-      public_network: net04_ext
-      OS_image: QTIP_Centos
-      flavor: m1.large
-      role: 1Run
-Test_Description:
-  Test_category: "Compute"
-  Benchmark: "ssl"
-  Overview: >
-        '''This test will run the SSL benchmark in serial on virtualmachine_1 and machine_1.
-           The Test will run first on the Host_Machine and then on the Virtual Machine.
-           if you wish to add a virtual machine add the following information under the Virtual_Machine tag
-
-        virtualmachine_1:
-          availability_zone:
-          public_network:
-          OS_image:
-          flavor:
-          role:
-          '''   
diff --git a/test_cases/default/compute/ssl_parallel.yaml b/test_cases/default/compute/ssl_vm.yaml
index eb46d8d8..cbacf088 100644
--- a/test_cases/default/compute/ssl_parallel.yaml
+++ b/test_cases/default/compute/ssl_vm.yaml
@@ -1,7 +1,6 @@
 Scenario:
   benchmark: ssl
-  host: machine_1, machine_2
-  server: 
+  host: virtualmachine_1, virtualmachine_2
 
 Context:
   Host_Machines:
diff --git a/test_cases/default/compute/whetstone_bm.yaml b/test_cases/default/compute/whetstone_bm.yaml
new file mode 100644
index 00000000..136ac2b0
--- /dev/null
+++ b/test_cases/default/compute/whetstone_bm.yaml
@@ -0,0 +1,34 @@
+  
+Scenario:
+  benchmark: whetstone
+  host: machine_1, machine_2
+
+
+Context:
+  Host_Machines:
+    machine_1:
+      ip: 10.20.0.4
+      pw: 
+      role: host
+    machine_2:
+      ip: 10.20.0.5
+      pw:
+      role: host
+  Virtual_Machines:  
+   
+      
+
+Test_Description:
+  Test_category: "Compute"
+  Benchmark: "whetstone"
+  Overview: >
+        ''' This test will run the whetstone benchmark in parallel  on machine_1 and machine_2.\n
+         if you wish to add a baremetal  machine add the following information under the Virtual_Machine tag
+
+        machine_3:
+          ip:
+          pw:
+          role:
+           '''
+  
+ 
diff --git a/test_cases/default/compute/whetstone_parallel.yaml b/test_cases/default/compute/whetstone_vm.yaml
index 48bc7230..17928fa1 100644
--- a/test_cases/default/compute/whetstone_parallel.yaml
+++ b/test_cases/default/compute/whetstone_vm.yaml
@@ -1,19 +1,11 @@
 Scenario:
   benchmark: whetstone
-  host: machine_1, virtualmachine_1
+  host: virtualmachine_1, virtualmachine_1
   server: 
 
 Context:
   Host_Machines:
-    machine_1:
-      ip: 172.18.0.76
-      pw: r00tme
-      role: host
-    machine_2:
-      ip: 172.18.0.75
-      pw: r00tme
-      role: host
-
+    
   Virtual_Machines:  
     virtualmachine_1:
       availability_zone: compute1
@@ -21,6 +13,13 @@ Context:
       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"