Adjust folder structure

Note: this patchset may break existing features, but it will help
to accelerate the refactoring work.

JIRA: QTIP-131

Change-Id: Ie0cd9d185e6b02316878daef905e26f4e533a66b
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>

4 files changed, 180 insertions, 0 deletions

diff --git a/benchmarks/test_plan/dell-us-deploying-bm3/network/iperf_bm.yaml b/benchmarks/test_plan/dell-us-deploying-bm3/network/iperf_bm.yaml
new file mode 100644
index 00000000..4c64dd16
--- /dev/null
+++ b/benchmarks/test_plan/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.4
+        pw:
+        role: 1-server
+    machine_2:
+        ip: 10.20.0.5
+        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/benchmarks/test_plan/dell-us-deploying-bm3/network/iperf_vm.yaml b/benchmarks/test_plan/dell-us-deploying-bm3/network/iperf_vm.yaml
new file mode 100644
index 00000000..d7079e99
--- /dev/null
+++ b/benchmarks/test_plan/dell-us-deploying-bm3/network/iperf_vm.yaml
@@ -0,0 +1,44 @@
+Scenario:
+  benchmark: iperf
+  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: 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: compute1
+      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/benchmarks/test_plan/dell-us-deploying-bm3/network/iperf_vm_2.yaml b/benchmarks/test_plan/dell-us-deploying-bm3/network/iperf_vm_2.yaml
new file mode 100644
index 00000000..c5b94715
--- /dev/null
+++ b/benchmarks/test_plan/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/benchmarks/test_plan/dell-us-deploying-bm3/network/netperf.yaml b/benchmarks/test_plan/dell-us-deploying-bm3/network/netperf.yaml
new file mode 100644
index 00000000..f4ce396b
--- /dev/null
+++ b/benchmarks/test_plan/dell-us-deploying-bm3/network/netperf.yaml
@@ -0,0 +1,42 @@
+Scenario:
+  benchmark: netperf
+  topology: Client and Server on ONE compute
+  server : virtualmachine_1
+  client: virtualmachine_2
+  benchmark_details:
+    duration: 10
+    teststream: udp_stream
+
+Context:
+  Host_Machines:
+
+
+  Virtual_Machines:
+    virtualmachine_1:
+      availability_zone: compute2
+      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: "netperf"
+  Overview: >
+        '''This test will run the NETPERF 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:
+          '''
+