error handling for the files being input to the framework.

iperf bug fix for the bare metal testing, renamed all the iperf
config files. added more detail to the help.

Change-Id: I16cfb1c05599cd0b803e735e6a75083e3e6733ec
Signed-off-by: MofassirArif <Mofassir_Arif@dellteam.com>
(cherry picked from commit 4c06a4ed3b3b22e3dbcddb33dda33ca773dfae11)

17 files changed, 250 insertions, 407 deletions

diff --git a/test_cases/default/network/iperf_bm.yaml b/test_cases/default/network/iperf_bm.yaml
new file mode 100644
index 00000000..4fd3d7f5
--- /dev/null
+++ b/test_cases/default/network/iperf_bm.yaml
@@ -0,0 +1,50 @@
+Scenario:
+  benchmark: iperf
+  topology: Client and Server on different baremetal Compute nodes
+  server: machine_1
+  client: machine_2
+  benchmark_details:
+    duration: 20
+    protocol: tcp
+    bandwidthGbps: 10
+
+Context:
+  Host_Machines:
+    machine_1:
+        ip: 10.20.0.5
+        pw:
+        role: 1-server
+    machine_2:
+        ip: 10.20.0.6
+        pw:
+        role: 2-host
+
+  Virtual_Machines:
+    
+Test_Description:
+  Test_category: "network"
+  Benchmark: "iperf"
+  Overview: >
+        '''This test will run the IPERF benchmark  on virutalmachine_1 and virtualmachine_2. On the\n
+         same compute node
+         if you wish to add a host machine add the following information under the Host_Machine tag
+        virtualmachine_1:
+          availability_zone: compute1
+          OS_image: QTIP_CentOS
+          public_network: 'net04_ext'
+          role: 1-server
+          flavor: m1.large   
+
+        virtualmachine_2:
+          availability_zone: compute2
+          OS_image: QTIP_CentOS
+          public_network: 'net04_ext'
+          role: 2-host
+          flavor: m1.large
+    
+        machine_1:
+          ip:
+          pw:
+          role:
+          '''
+
diff --git a/test_cases/default/network/iperf_topology_2.yaml b/test_cases/default/network/iperf_topology_2.yaml
deleted file mode 100644
index 301a9916..00000000
--- a/test_cases/default/network/iperf_topology_2.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-Scenario:
-  benchmark: iperf
-  topology: Client and Server on different Compute nodes
-  server: virtualmachine_1
-  client: virtualmachine_2
-  benchmark_details:
-    duration: 20
-    protocol: tcp
-    bandwidthGbps: 10
-
-Context:
-  Host_Machines:
-
-
-  Virtual_Machines:
-    virtualmachine_1:
-      availability_zone: compute1
-      OS_image: QTIP_CentOS
-      public_network: 'net04_ext'
-      role: 1-server
-      flavor: m1.large   
-
-    virtualmachine_2:
-      availability_zone: compute2
-      OS_image: QTIP_CentOS
-      public_network: 'net04_ext'
-      role: 2-host
-      flavor: m1.large
-    
-Test_Description:
-  Test_category: "network"
-  Benchmark: "iperf"
-  Overview: >
-        '''This test will run the IPERF benchmark  on virutalmachine_1 and virtualmachine_2. On the\n
-         same compute node
-         if you wish to add a host machine add the following information under the Host_Machine tag
-
-        machine_1:
-          ip:
-          pw:
-          role:
-          '''
-
diff --git a/test_cases/default/network/iperf_topology_3.yaml b/test_cases/default/network/iperf_topology_3.yaml
deleted file mode 100644
index 9e7b73e7..00000000
--- a/test_cases/default/network/iperf_topology_3.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-Scenario:
-  benchmark: iperf
-  topology: 2 Client on one compute and 2 servers on another machine
-  1Run : virtualmachine_1, virtualmachine_2
-  2Run:
-  benchmark_details:
-    duration: 20
-    protocol: udp
-    bandwidthGbps: 1
-
-Context:
-  Host_Machines:
-
-
-  Virtual_Machines:
-    virtualmachine_1:
-      availability_zone: compute1
-      OS_image: QTIP_CentOS
-      public_network: 'provider_network'
-      role: 1-server
-      flavor: m1.large   
-
-    virtualmachine_2:
-      availability_zone: compute2
-      OS_image: QTIP_CentOS
-      public_network: 'provider_network'
-      role: 1-server
-      flavor: m1.large
-
-    virtualmachine_3:
-      availability_zone: compute3
-      OS_image: QTIP_CentOS
-      public_network: 'provider_network'
-      role: 1-server
-      flavor: m1.large
-
-    virtualmachine_4:
-      availability_zone: compute4
-      OS_image: QTIP_CentOS
-      public_network: 'provider_network'
-      role: 1-server
-      flavor: m1.large
-
-
-
-   
-Test_Description:
-  Test_category: "network"
-  Benchmark: "iperf"
-  Overview: >
-        '''This test will run the IPERF benchmark  on virutalmachine_1 and virtualmachine_2. On the\n
-         same compute node
-         if you wish to add a host machine add the following information under the Host_Machine tag
-
-        machine_1:
-          ip:
-          pw:
-          role:
-          '''
-
diff --git a/test_cases/dell-us-deploying-bm3/network/iperf_topology_1.yaml b/test_cases/default/network/iperf_vm.yaml
index 18eba8ac..ebe1deac 100644
--- a/test_cases/dell-us-deploying-bm3/network/iperf_topology_1.yaml
+++ b/test_cases/default/network/iperf_vm.yaml
@@ -3,15 +3,15 @@ Scenario:
   topology: Client and Server on ONE compute
   server : virtualmachine_1
   client: virtualmachine_2
+  description: 'Leave the bandwidth as 0 to throttle maximum traffic'
   benchmark_details:
     duration: 20 
     protocol: tcp
-    bandwidthGbps: 10
+    bandwidthGbps: 0
 
 Context:
   Host_Machines:
 
-
   Virtual_Machines:
     virtualmachine_1:
       availability_zone: compute1
@@ -26,7 +26,7 @@ Context:
       public_network: 'net04_ext'
       role: 2-host
       flavor: m1.large
-    
+
 Test_Description:
   Test_category: "network"
   Benchmark: "iperf"
diff --git a/test_cases/dell-us-deploying-bm3/network/iperf_topology_2.yaml b/test_cases/default/network/iperf_vm_2.yaml
index 301a9916..90fd334d 100644
--- a/test_cases/dell-us-deploying-bm3/network/iperf_topology_2.yaml
+++ b/test_cases/default/network/iperf_vm_2.yaml
@@ -1,12 +1,13 @@
 Scenario:
   benchmark: iperf
-  topology: Client and Server on different Compute nodes
-  server: virtualmachine_1
+  topology: Client and Server on two different  compute nodes
+  server : virtualmachine_1
   client: virtualmachine_2
+  description: 'Leave the bandwidth as 0 to throttle maximum traffic'
   benchmark_details:
-    duration: 20
+    duration: 20 
     protocol: tcp
-    bandwidthGbps: 10
+    bandwidthGbps: 0
 
 Context:
   Host_Machines:
diff --git a/test_cases/default/network/pktgen.yaml b/test_cases/default/network/pktgen.yaml
deleted file mode 100644
index 13fae68f..00000000
--- a/test_cases/default/network/pktgen.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-Scenario:
-  benchmark: pktgen
-  topology: Client and Server on ONE compute
-  server : virtualmachine_1
-  client: virtualmachine_2
-  benchmark_details:
-    duration: "10" 
-    packetsize: "64"
-    ipaddr: "10.10.17.4"
-    numberofports: "10"
-
-Context:
-  Host_Machines:
-
-
-  Virtual_Machines:
-    virtualmachine_1:
-      availability_zone: compute2
-      OS_image: pktgenready
-      public_network: 'provider_network'
-      role: 1-server
-      flavor: m1.large   
-
-    virtualmachine_2:
-      availability_zone: compute2
-      OS_image: pktgenready
-      public_network: 'provider_network'
-      role: 2-host
-      flavor: m1.large
-    
-Test_Description:
-  Test_category: "network"
-  Benchmark: "iperf"
-  Overview: >
-        '''This test will run the IPERF benchmark  on virutalmachine_1 and virtualmachine_2. On the\n
-         same compute node
-         if you wish to add a host machine add the following information under the Host_Machine tag
-
-        machine_1:
-          ip:
-          pw:
-          role:
-          '''
-
diff --git a/test_cases/dell-us-deploying-bm3/network/iperf_bm.yaml b/test_cases/dell-us-deploying-bm3/network/iperf_bm.yaml
new file mode 100644
index 00000000..4fd3d7f5
--- /dev/null
+++ b/test_cases/dell-us-deploying-bm3/network/iperf_bm.yaml
@@ -0,0 +1,50 @@
+Scenario:
+  benchmark: iperf
+  topology: Client and Server on different baremetal Compute nodes
+  server: machine_1
+  client: machine_2
+  benchmark_details:
+    duration: 20
+    protocol: tcp
+    bandwidthGbps: 10
+
+Context:
+  Host_Machines:
+    machine_1:
+        ip: 10.20.0.5
+        pw:
+        role: 1-server
+    machine_2:
+        ip: 10.20.0.6
+        pw:
+        role: 2-host
+
+  Virtual_Machines:
+    
+Test_Description:
+  Test_category: "network"
+  Benchmark: "iperf"
+  Overview: >
+        '''This test will run the IPERF benchmark  on virutalmachine_1 and virtualmachine_2. On the\n
+         same compute node
+         if you wish to add a host machine add the following information under the Host_Machine tag
+        virtualmachine_1:
+          availability_zone: compute1
+          OS_image: QTIP_CentOS
+          public_network: 'net04_ext'
+          role: 1-server
+          flavor: m1.large   
+
+        virtualmachine_2:
+          availability_zone: compute2
+          OS_image: QTIP_CentOS
+          public_network: 'net04_ext'
+          role: 2-host
+          flavor: m1.large
+    
+        machine_1:
+          ip:
+          pw:
+          role:
+          '''
+
diff --git a/test_cases/dell-us-deploying-bm3/network/iperf_topology_3.yaml b/test_cases/dell-us-deploying-bm3/network/iperf_topology_3.yaml
deleted file mode 100644
index 9e7b73e7..00000000
--- a/test_cases/dell-us-deploying-bm3/network/iperf_topology_3.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-Scenario:
-  benchmark: iperf
-  topology: 2 Client on one compute and 2 servers on another machine
-  1Run : virtualmachine_1, virtualmachine_2
-  2Run:
-  benchmark_details:
-    duration: 20
-    protocol: udp
-    bandwidthGbps: 1
-
-Context:
-  Host_Machines:
-
-
-  Virtual_Machines:
-    virtualmachine_1:
-      availability_zone: compute1
-      OS_image: QTIP_CentOS
-      public_network: 'provider_network'
-      role: 1-server
-      flavor: m1.large   
-
-    virtualmachine_2:
-      availability_zone: compute2
-      OS_image: QTIP_CentOS
-      public_network: 'provider_network'
-      role: 1-server
-      flavor: m1.large
-
-    virtualmachine_3:
-      availability_zone: compute3
-      OS_image: QTIP_CentOS
-      public_network: 'provider_network'
-      role: 1-server
-      flavor: m1.large
-
-    virtualmachine_4:
-      availability_zone: compute4
-      OS_image: QTIP_CentOS
-      public_network: 'provider_network'
-      role: 1-server
-      flavor: m1.large
-
-
-
-   
-Test_Description:
-  Test_category: "network"
-  Benchmark: "iperf"
-  Overview: >
-        '''This test will run the IPERF benchmark  on virutalmachine_1 and virtualmachine_2. On the\n
-         same compute node
-         if you wish to add a host machine add the following information under the Host_Machine tag
-
-        machine_1:
-          ip:
-          pw:
-          role:
-          '''
-
diff --git a/test_cases/default/network/iperf_topology_1.yaml b/test_cases/dell-us-deploying-bm3/network/iperf_vm.yaml
index 18eba8ac..14d50890 100644
--- a/test_cases/default/network/iperf_topology_1.yaml
+++ b/test_cases/dell-us-deploying-bm3/network/iperf_vm.yaml
@@ -3,10 +3,11 @@ Scenario:
   topology: Client and Server on ONE compute
   server : virtualmachine_1
   client: virtualmachine_2
+  description: 'Leave the bandwidth as 0 to throttle maximum traffic'
   benchmark_details:
     duration: 20 
     protocol: tcp
-    bandwidthGbps: 10
+    bandwidthGbps: 0
 
 Context:
   Host_Machines:
diff --git a/test_cases/dell-us-deploying-bm3/network/iperf_vm_2.yaml b/test_cases/dell-us-deploying-bm3/network/iperf_vm_2.yaml
new file mode 100644
index 00000000..90fd334d
--- /dev/null
+++ b/test_cases/dell-us-deploying-bm3/network/iperf_vm_2.yaml
@@ -0,0 +1,44 @@
+Scenario:
+  benchmark: iperf
+  topology: Client and Server on two different  compute nodes
+  server : virtualmachine_1
+  client: virtualmachine_2
+  description: 'Leave the bandwidth as 0 to throttle maximum traffic'
+  benchmark_details:
+    duration: 20 
+    protocol: tcp
+    bandwidthGbps: 0
+
+Context:
+  Host_Machines:
+
+
+  Virtual_Machines:
+    virtualmachine_1:
+      availability_zone: compute1
+      OS_image: QTIP_CentOS
+      public_network: 'net04_ext'
+      role: 1-server
+      flavor: m1.large   
+
+    virtualmachine_2:
+      availability_zone: compute2
+      OS_image: QTIP_CentOS
+      public_network: 'net04_ext'
+      role: 2-host
+      flavor: m1.large
+    
+Test_Description:
+  Test_category: "network"
+  Benchmark: "iperf"
+  Overview: >
+        '''This test will run the IPERF benchmark  on virutalmachine_1 and virtualmachine_2. On the\n
+         same compute node
+         if you wish to add a host machine add the following information under the Host_Machine tag
+
+        machine_1:
+          ip:
+          pw:
+          role:
+          '''
+
diff --git a/test_cases/dell-us-deploying-bm3/network/pktgen.yaml b/test_cases/dell-us-deploying-bm3/network/pktgen.yaml
deleted file mode 100644
index 13fae68f..00000000
--- a/test_cases/dell-us-deploying-bm3/network/pktgen.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-Scenario:
-  benchmark: pktgen
-  topology: Client and Server on ONE compute
-  server : virtualmachine_1
-  client: virtualmachine_2
-  benchmark_details:
-    duration: "10" 
-    packetsize: "64"
-    ipaddr: "10.10.17.4"
-    numberofports: "10"
-
-Context:
-  Host_Machines:
-
-
-  Virtual_Machines:
-    virtualmachine_1:
-      availability_zone: compute2
-      OS_image: pktgenready
-      public_network: 'provider_network'
-      role: 1-server
-      flavor: m1.large   
-
-    virtualmachine_2:
-      availability_zone: compute2
-      OS_image: pktgenready
-      public_network: 'provider_network'
-      role: 2-host
-      flavor: m1.large
-    
-Test_Description:
-  Test_category: "network"
-  Benchmark: "iperf"
-  Overview: >
-        '''This test will run the IPERF benchmark  on virutalmachine_1 and virtualmachine_2. On the\n
-         same compute node
-         if you wish to add a host machine add the following information under the Host_Machine tag
-
-        machine_1:
-          ip:
-          pw:
-          role:
-          '''
-
diff --git a/test_cases/dell-us-testing-bm-1/network/iperf_bm.yaml b/test_cases/dell-us-testing-bm-1/network/iperf_bm.yaml
new file mode 100644
index 00000000..4fd3d7f5
--- /dev/null
+++ b/test_cases/dell-us-testing-bm-1/network/iperf_bm.yaml
@@ -0,0 +1,50 @@
+Scenario:
+  benchmark: iperf
+  topology: Client and Server on different baremetal Compute nodes
+  server: machine_1
+  client: machine_2
+  benchmark_details:
+    duration: 20
+    protocol: tcp
+    bandwidthGbps: 10
+
+Context:
+  Host_Machines:
+    machine_1:
+        ip: 10.20.0.5
+        pw:
+        role: 1-server
+    machine_2:
+        ip: 10.20.0.6
+        pw:
+        role: 2-host
+
+  Virtual_Machines:
+    
+Test_Description:
+  Test_category: "network"
+  Benchmark: "iperf"
+  Overview: >
+        '''This test will run the IPERF benchmark  on virutalmachine_1 and virtualmachine_2. On the\n
+         same compute node
+         if you wish to add a host machine add the following information under the Host_Machine tag
+        virtualmachine_1:
+          availability_zone: compute1
+          OS_image: QTIP_CentOS
+          public_network: 'net04_ext'
+          role: 1-server
+          flavor: m1.large   
+
+        virtualmachine_2:
+          availability_zone: compute2
+          OS_image: QTIP_CentOS
+          public_network: 'net04_ext'
+          role: 2-host
+          flavor: m1.large
+    
+        machine_1:
+          ip:
+          pw:
+          role:
+          '''
+
diff --git a/test_cases/dell-us-testing-bm-1/network/iperf_topology_2.yaml b/test_cases/dell-us-testing-bm-1/network/iperf_topology_2.yaml
deleted file mode 100644
index 301a9916..00000000
--- a/test_cases/dell-us-testing-bm-1/network/iperf_topology_2.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-Scenario:
-  benchmark: iperf
-  topology: Client and Server on different Compute nodes
-  server: virtualmachine_1
-  client: virtualmachine_2
-  benchmark_details:
-    duration: 20
-    protocol: tcp
-    bandwidthGbps: 10
-
-Context:
-  Host_Machines:
-
-
-  Virtual_Machines:
-    virtualmachine_1:
-      availability_zone: compute1
-      OS_image: QTIP_CentOS
-      public_network: 'net04_ext'
-      role: 1-server
-      flavor: m1.large   
-
-    virtualmachine_2:
-      availability_zone: compute2
-      OS_image: QTIP_CentOS
-      public_network: 'net04_ext'
-      role: 2-host
-      flavor: m1.large
-    
-Test_Description:
-  Test_category: "network"
-  Benchmark: "iperf"
-  Overview: >
-        '''This test will run the IPERF benchmark  on virutalmachine_1 and virtualmachine_2. On the\n
-         same compute node
-         if you wish to add a host machine add the following information under the Host_Machine tag
-
-        machine_1:
-          ip:
-          pw:
-          role:
-          '''
-
diff --git a/test_cases/dell-us-testing-bm-1/network/iperf_topology_3.yaml b/test_cases/dell-us-testing-bm-1/network/iperf_topology_3.yaml
deleted file mode 100644
index 9e7b73e7..00000000
--- a/test_cases/dell-us-testing-bm-1/network/iperf_topology_3.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-Scenario:
-  benchmark: iperf
-  topology: 2 Client on one compute and 2 servers on another machine
-  1Run : virtualmachine_1, virtualmachine_2
-  2Run:
-  benchmark_details:
-    duration: 20
-    protocol: udp
-    bandwidthGbps: 1
-
-Context:
-  Host_Machines:
-
-
-  Virtual_Machines:
-    virtualmachine_1:
-      availability_zone: compute1
-      OS_image: QTIP_CentOS
-      public_network: 'provider_network'
-      role: 1-server
-      flavor: m1.large   
-
-    virtualmachine_2:
-      availability_zone: compute2
-      OS_image: QTIP_CentOS
-      public_network: 'provider_network'
-      role: 1-server
-      flavor: m1.large
-
-    virtualmachine_3:
-      availability_zone: compute3
-      OS_image: QTIP_CentOS
-      public_network: 'provider_network'
-      role: 1-server
-      flavor: m1.large
-
-    virtualmachine_4:
-      availability_zone: compute4
-      OS_image: QTIP_CentOS
-      public_network: 'provider_network'
-      role: 1-server
-      flavor: m1.large
-
-
-
-   
-Test_Description:
-  Test_category: "network"
-  Benchmark: "iperf"
-  Overview: >
-        '''This test will run the IPERF benchmark  on virutalmachine_1 and virtualmachine_2. On the\n
-         same compute node
-         if you wish to add a host machine add the following information under the Host_Machine tag
-
-        machine_1:
-          ip:
-          pw:
-          role:
-          '''
-
diff --git a/test_cases/dell-us-testing-bm-1/network/iperf_topology_1.yaml b/test_cases/dell-us-testing-bm-1/network/iperf_vm.yaml
index 18eba8ac..14d50890 100644
--- a/test_cases/dell-us-testing-bm-1/network/iperf_topology_1.yaml
+++ b/test_cases/dell-us-testing-bm-1/network/iperf_vm.yaml
@@ -3,10 +3,11 @@ Scenario:
   topology: Client and Server on ONE compute
   server : virtualmachine_1
   client: virtualmachine_2
+  description: 'Leave the bandwidth as 0 to throttle maximum traffic'
   benchmark_details:
     duration: 20 
     protocol: tcp
-    bandwidthGbps: 10
+    bandwidthGbps: 0
 
 Context:
   Host_Machines:
diff --git a/test_cases/dell-us-testing-bm-1/network/iperf_vm_2.yaml b/test_cases/dell-us-testing-bm-1/network/iperf_vm_2.yaml
new file mode 100644
index 00000000..90fd334d
--- /dev/null
+++ b/test_cases/dell-us-testing-bm-1/network/iperf_vm_2.yaml
@@ -0,0 +1,44 @@
+Scenario:
+  benchmark: iperf
+  topology: Client and Server on two different  compute nodes
+  server : virtualmachine_1
+  client: virtualmachine_2
+  description: 'Leave the bandwidth as 0 to throttle maximum traffic'
+  benchmark_details:
+    duration: 20 
+    protocol: tcp
+    bandwidthGbps: 0
+
+Context:
+  Host_Machines:
+
+
+  Virtual_Machines:
+    virtualmachine_1:
+      availability_zone: compute1
+      OS_image: QTIP_CentOS
+      public_network: 'net04_ext'
+      role: 1-server
+      flavor: m1.large   
+
+    virtualmachine_2:
+      availability_zone: compute2
+      OS_image: QTIP_CentOS
+      public_network: 'net04_ext'
+      role: 2-host
+      flavor: m1.large
+    
+Test_Description:
+  Test_category: "network"
+  Benchmark: "iperf"
+  Overview: >
+        '''This test will run the IPERF benchmark  on virutalmachine_1 and virtualmachine_2. On the\n
+         same compute node
+         if you wish to add a host machine add the following information under the Host_Machine tag
+
+        machine_1:
+          ip:
+          pw:
+          role:
+          '''
+
diff --git a/test_cases/dell-us-testing-bm-1/network/pktgen.yaml b/test_cases/dell-us-testing-bm-1/network/pktgen.yaml
deleted file mode 100644
index 13fae68f..00000000
--- a/test_cases/dell-us-testing-bm-1/network/pktgen.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-Scenario:
-  benchmark: pktgen
-  topology: Client and Server on ONE compute
-  server : virtualmachine_1
-  client: virtualmachine_2
-  benchmark_details:
-    duration: "10" 
-    packetsize: "64"
-    ipaddr: "10.10.17.4"
-    numberofports: "10"
-
-Context:
-  Host_Machines:
-
-
-  Virtual_Machines:
-    virtualmachine_1:
-      availability_zone: compute2
-      OS_image: pktgenready
-      public_network: 'provider_network'
-      role: 1-server
-      flavor: m1.large   
-
-    virtualmachine_2:
-      availability_zone: compute2
-      OS_image: pktgenready
-      public_network: 'provider_network'
-      role: 2-host
-      flavor: m1.large
-    
-Test_Description:
-  Test_category: "network"
-  Benchmark: "iperf"
-  Overview: >
-        '''This test will run the IPERF benchmark  on virutalmachine_1 and virtualmachine_2. On the\n
-         same compute node
-         if you wish to add a host machine add the following information under the Host_Machine tag
-
-        machine_1:
-          ip:
-          pw:
-          role:
-          '''
-