Revert "delete the code which will not included in Fraser"

This reverts commit b34030013f9af4c40fd79850a85957c842e76595.

Change-Id: Ief09eaa4b009a47d7509f548fc1117bb4839d2ba
Signed-off-by: zhihui wu <wu.zhihui1@zte.com.cn>

5 files changed, 260 insertions, 0 deletions

diff --git a/legacy/assets/testplan/default/network/iperf_bm.yaml b/legacy/assets/testplan/default/network/iperf_bm.yaml
new file mode 100644
index 00000000..3b10a383
--- /dev/null
+++ b/legacy/assets/testplan/default/network/iperf_bm.yaml
@@ -0,0 +1,58 @@
+##############################################################################
+# Copyright (c) 2017 ZTE Corporation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+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:
+        pw:
+        role: 1-server
+    machine_2:
+        ip:
+        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/legacy/assets/testplan/default/network/iperf_vm.yaml b/legacy/assets/testplan/default/network/iperf_vm.yaml
new file mode 100644
index 00000000..e42dc0bb
--- /dev/null
+++ b/legacy/assets/testplan/default/network/iperf_vm.yaml
@@ -0,0 +1,51 @@
+##############################################################################
+# Copyright (c) 2017 ZTE Corporation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+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/legacy/assets/testplan/default/network/iperf_vm_2.yaml b/legacy/assets/testplan/default/network/iperf_vm_2.yaml
new file mode 100644
index 00000000..8a1d1a0d
--- /dev/null
+++ b/legacy/assets/testplan/default/network/iperf_vm_2.yaml
@@ -0,0 +1,52 @@
+##############################################################################
+# Copyright (c) 2017 ZTE Corporation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+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/legacy/assets/testplan/default/storage/fio_bm.yaml b/legacy/assets/testplan/default/storage/fio_bm.yaml
new file mode 100644
index 00000000..d226b1af
--- /dev/null
+++ b/legacy/assets/testplan/default/storage/fio_bm.yaml
@@ -0,0 +1,47 @@
+##############################################################################
+# Copyright (c) 2017 ZTE Corporation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+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/legacy/assets/testplan/default/storage/fio_vm.yaml b/legacy/assets/testplan/default/storage/fio_vm.yaml
new file mode 100644
index 00000000..b1cf3142
--- /dev/null
+++ b/legacy/assets/testplan/default/storage/fio_vm.yaml
@@ -0,0 +1,52 @@
+##############################################################################
+# Copyright (c) 2017 ZTE Corporation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+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:
+        '''
+