aboutsummaryrefslogtreecommitdiffstats
path: root/benchmarks/testplan
diff options
context:
space:
mode:
authorYujun Zhang <zhang.yujunz@zte.com.cn>2016-12-02 08:12:52 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-12-02 08:12:52 +0000
commitaf69238472907d6b2c42544bee6d12f5c2c612fd (patch)
tree32c701caa902c03ab70d9a42854399e0a824ac04 /benchmarks/testplan
parente0e006a6f626c1c25970d7c2694bb280469b6e96 (diff)
parent7cd9270f8855f4f47051db054d8b71234d0abdd7 (diff)
Merge "Remove dell's directories under testplan/"
Diffstat (limited to 'benchmarks/testplan')
-rw-r--r--benchmarks/testplan/dell-pod1/compute/dhrystone_bm.yaml35
-rw-r--r--benchmarks/testplan/dell-pod1/compute/dhrystone_vm.yaml45
-rw-r--r--benchmarks/testplan/dell-pod1/compute/dpi_bm.yaml34
-rw-r--r--benchmarks/testplan/dell-pod1/compute/dpi_vm.yaml35
-rw-r--r--benchmarks/testplan/dell-pod1/compute/ramspeed_bm.yaml35
-rw-r--r--benchmarks/testplan/dell-pod1/compute/ramspeed_vm.yaml45
-rw-r--r--benchmarks/testplan/dell-pod1/compute/ssl_bm.yaml31
-rw-r--r--benchmarks/testplan/dell-pod1/compute/ssl_vm.yaml36
-rw-r--r--benchmarks/testplan/dell-pod1/compute/whetstone_bm.yaml34
-rw-r--r--benchmarks/testplan/dell-pod1/compute/whetstone_vm.yaml44
-rw-r--r--benchmarks/testplan/dell-pod1/network/iperf_bm.yaml50
-rw-r--r--benchmarks/testplan/dell-pod1/network/iperf_vm.yaml44
-rw-r--r--benchmarks/testplan/dell-pod1/network/iperf_vm_2.yaml44
-rw-r--r--benchmarks/testplan/dell-pod1/network/netperf.yaml42
-rw-r--r--benchmarks/testplan/dell-pod1/storage/fio_bm.yaml39
-rw-r--r--benchmarks/testplan/dell-pod1/storage/fio_vm.yaml44
-rw-r--r--benchmarks/testplan/dell-us-deploying-bm3/compute/dhrystone_bm.yaml35
-rw-r--r--benchmarks/testplan/dell-us-deploying-bm3/compute/dhrystone_vm.yaml45
-rw-r--r--benchmarks/testplan/dell-us-deploying-bm3/compute/dpi_bm.yaml34
-rw-r--r--benchmarks/testplan/dell-us-deploying-bm3/compute/dpi_vm.yaml35
-rw-r--r--benchmarks/testplan/dell-us-deploying-bm3/compute/ramspeed_bm.yaml35
-rw-r--r--benchmarks/testplan/dell-us-deploying-bm3/compute/ramspeed_vm.yaml45
-rw-r--r--benchmarks/testplan/dell-us-deploying-bm3/compute/ssl_bm.yaml31
-rw-r--r--benchmarks/testplan/dell-us-deploying-bm3/compute/ssl_vm.yaml36
-rw-r--r--benchmarks/testplan/dell-us-deploying-bm3/compute/whetstone_bm.yaml34
-rw-r--r--benchmarks/testplan/dell-us-deploying-bm3/compute/whetstone_vm.yaml44
-rw-r--r--benchmarks/testplan/dell-us-deploying-bm3/network/iperf_bm.yaml50
-rw-r--r--benchmarks/testplan/dell-us-deploying-bm3/network/iperf_vm.yaml44
-rw-r--r--benchmarks/testplan/dell-us-deploying-bm3/network/iperf_vm_2.yaml44
-rw-r--r--benchmarks/testplan/dell-us-deploying-bm3/network/netperf.yaml42
-rw-r--r--benchmarks/testplan/dell-us-deploying-bm3/storage/fio_bm.yaml39
-rw-r--r--benchmarks/testplan/dell-us-deploying-bm3/storage/fio_vm.yaml44
32 files changed, 0 insertions, 1274 deletions
diff --git a/benchmarks/testplan/dell-pod1/compute/dhrystone_bm.yaml b/benchmarks/testplan/dell-pod1/compute/dhrystone_bm.yaml
deleted file mode 100644
index 2f8d0ec9..00000000
--- a/benchmarks/testplan/dell-pod1/compute/dhrystone_bm.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-Scenario:
- benchmark: dhrystone
- host: machine_1, machine_2
- server:
-
-Context:
- Host_Machines:
- machine_1:
- ip: 172.16.1.4
- pw:
- role: host
- machine_2:
- ip: 172.16.1.5
- pw:
- 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
-
- virtualmachine_1:
- availability_zone:
- public_network:
- OS_image:
- flavor:
- role: '''
-
-
diff --git a/benchmarks/testplan/dell-pod1/compute/dhrystone_vm.yaml b/benchmarks/testplan/dell-pod1/compute/dhrystone_vm.yaml
deleted file mode 100644
index 8f5a4165..00000000
--- a/benchmarks/testplan/dell-pod1/compute/dhrystone_vm.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-Scenario:
- benchmark: dhrystone
- host: virtualmachine_1, virtualmachine_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: "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/benchmarks/testplan/dell-pod1/compute/dpi_bm.yaml b/benchmarks/testplan/dell-pod1/compute/dpi_bm.yaml
deleted file mode 100644
index 45324184..00000000
--- a/benchmarks/testplan/dell-pod1/compute/dpi_bm.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-Scenario:
- benchmark: dpi
- host: machine_1,machine_2
-
-Context:
- Host_Machines:
- machine_1:
- ip: 172.16.1.4
- pw:
- role: 1host
- machine_2:
- ip: 172.16.1.5
- pw:
- role: 1host
- Virtual_Machines:
-Test_Description:
- Test_category: "Compute"
- Benchmark: "dpi"
- Overview: >
- '''This test will run the DPI benchmark in serial on virutalmachine_1 and virtualmachine_2.\n
- if you wish to add a host machine add the following information under the Host_Machine tag
- virtualmachine_2:
- availability_zone: compute1
- OS_image: QTIP_CentOS
- public_network: 'provider_network'
-
- role: 1host
- flavor: m1.large
- machine_1:
- ip:
- pw:
- role:
- '''
-
diff --git a/benchmarks/testplan/dell-pod1/compute/dpi_vm.yaml b/benchmarks/testplan/dell-pod1/compute/dpi_vm.yaml
deleted file mode 100644
index 8a157e7a..00000000
--- a/benchmarks/testplan/dell-pod1/compute/dpi_vm.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-Scenario:
- benchmark: dpi
- 1Run : virtualmachine_1, virtualmachine_2
-
-Context:
- Host_Machines:
-
-
- Virtual_Machines:
- virtualmachine_1:
- availability_zone: compute1
- OS_image: QTIP_CentOS
- public_network: 'net04_ext'
- role: 1Run
- flavor: m1.large
- virtualmachine_2:
- availability_zone: compute4
- OS_image: QTIP_CentOS
- public_network: 'net04_ext'
- role: 1Run
- flavor: m1.large
-
-Test_Description:
- Test_category: "Compute"
- Benchmark: "dpi"
- Overview: >
- '''This test will run the DPI benchmark in parallel on virutalmachine_1 and virtualmachine_2.\n
- 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/testplan/dell-pod1/compute/ramspeed_bm.yaml b/benchmarks/testplan/dell-pod1/compute/ramspeed_bm.yaml
deleted file mode 100644
index af220b80..00000000
--- a/benchmarks/testplan/dell-pod1/compute/ramspeed_bm.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-Scenario:
- benchmark: ramspeed
- host: machine_1, machine_2
- server:
-
-Context:
- Host_Machines:
- machine_1:
- ip: 172.16.1.4
- pw:
- role: host
- machine_2:
- ip: 172.16.1.5
- pw:
- 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
-
- virtualmachine_1:
- availability_zone:
- public_network:
- OS_image:
- flavor:
- role: '''
-
-
diff --git a/benchmarks/testplan/dell-pod1/compute/ramspeed_vm.yaml b/benchmarks/testplan/dell-pod1/compute/ramspeed_vm.yaml
deleted file mode 100644
index a6a4363f..00000000
--- a/benchmarks/testplan/dell-pod1/compute/ramspeed_vm.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-Scenario:
- benchmark: ramspeed
- host: virtualmachine_1, virtualmachine_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: "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/benchmarks/testplan/dell-pod1/compute/ssl_bm.yaml b/benchmarks/testplan/dell-pod1/compute/ssl_bm.yaml
deleted file mode 100644
index 6b14c4e6..00000000
--- a/benchmarks/testplan/dell-pod1/compute/ssl_bm.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-Scenario:
- benchmark: ssl
- 1Run: machine_1,machine_2
-
-Context:
- Host_Machines:
- machine_1:
- ip: 172.16.1.4
- pw:
- role: 1Run
- machine_2:
- ip: 172.16.1.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/benchmarks/testplan/dell-pod1/compute/ssl_vm.yaml b/benchmarks/testplan/dell-pod1/compute/ssl_vm.yaml
deleted file mode 100644
index 37824896..00000000
--- a/benchmarks/testplan/dell-pod1/compute/ssl_vm.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-Scenario:
- benchmark: ssl
- host: virtualmachine_1, virtualmachine_2
-
-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: "Compute"
- Benchmark: "ssl"
- Overview: >
- '''This test will run the SSL benchmark in parallel on virtualmachine_1 and machine_1.\n
- 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/benchmarks/testplan/dell-pod1/compute/whetstone_bm.yaml b/benchmarks/testplan/dell-pod1/compute/whetstone_bm.yaml
deleted file mode 100644
index 128075a1..00000000
--- a/benchmarks/testplan/dell-pod1/compute/whetstone_bm.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-Scenario:
- benchmark: whetstone
- host: machine_1, machine_2
-
-
-Context:
- Host_Machines:
- machine_1:
- ip: 172.16.1.4
- pw:
- role: host
- machine_2:
- ip: 172.16.1.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/benchmarks/testplan/dell-pod1/compute/whetstone_vm.yaml b/benchmarks/testplan/dell-pod1/compute/whetstone_vm.yaml
deleted file mode 100644
index 0f1e8748..00000000
--- a/benchmarks/testplan/dell-pod1/compute/whetstone_vm.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-Scenario:
- benchmark: whetstone
- host: virtualmachine_1, virtualmachine_1
- 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: "Compute"
- Benchmark: "dhrystone"
- Overview: >
- '''This test will run the whetstone 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:
- availability_zone: nova
- public_network: 'net04_ext'
- OS_image: QTIP_CentOS
- flavor: m1.large
- role: host
-
- virtualmachine_1:
- availability_zone:
- public_network:
- OS_image:
- flavor:
- role:
- '''
-
diff --git a/benchmarks/testplan/dell-pod1/network/iperf_bm.yaml b/benchmarks/testplan/dell-pod1/network/iperf_bm.yaml
deleted file mode 100644
index b2d2a958..00000000
--- a/benchmarks/testplan/dell-pod1/network/iperf_bm.yaml
+++ /dev/null
@@ -1,50 +0,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: 172.16.1.4
- pw:
- role: 1-server
- machine_2:
- ip: 172.16.1.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/testplan/dell-pod1/network/iperf_vm.yaml b/benchmarks/testplan/dell-pod1/network/iperf_vm.yaml
deleted file mode 100644
index d7079e99..00000000
--- a/benchmarks/testplan/dell-pod1/network/iperf_vm.yaml
+++ /dev/null
@@ -1,44 +0,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/benchmarks/testplan/dell-pod1/network/iperf_vm_2.yaml b/benchmarks/testplan/dell-pod1/network/iperf_vm_2.yaml
deleted file mode 100644
index c5b94715..00000000
--- a/benchmarks/testplan/dell-pod1/network/iperf_vm_2.yaml
+++ /dev/null
@@ -1,44 +0,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/benchmarks/testplan/dell-pod1/network/netperf.yaml b/benchmarks/testplan/dell-pod1/network/netperf.yaml
deleted file mode 100644
index f4ce396b..00000000
--- a/benchmarks/testplan/dell-pod1/network/netperf.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-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:
- '''
-
diff --git a/benchmarks/testplan/dell-pod1/storage/fio_bm.yaml b/benchmarks/testplan/dell-pod1/storage/fio_bm.yaml
deleted file mode 100644
index 755bb730..00000000
--- a/benchmarks/testplan/dell-pod1/storage/fio_bm.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-Scenario:
- benchmark: fio
- host: machine_1, machine_2
- server: blakc
-
-Context:
- Host_Machines:
- machine_1:
- ip: 172.16.1.4
- pw:
- role: host
- machine_2:
- ip: 172.16.1.5
- 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/benchmarks/testplan/dell-pod1/storage/fio_vm.yaml b/benchmarks/testplan/dell-pod1/storage/fio_vm.yaml
deleted file mode 100644
index 5ae90d2c..00000000
--- a/benchmarks/testplan/dell-pod1/storage/fio_vm.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-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:
- '''
-
diff --git a/benchmarks/testplan/dell-us-deploying-bm3/compute/dhrystone_bm.yaml b/benchmarks/testplan/dell-us-deploying-bm3/compute/dhrystone_bm.yaml
deleted file mode 100644
index 4c1fc962..00000000
--- a/benchmarks/testplan/dell-us-deploying-bm3/compute/dhrystone_bm.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-Scenario:
- benchmark: dhrystone
- host: machine_1, machine_2
- server:
-
-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: "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
-
- virtualmachine_1:
- availability_zone:
- public_network:
- OS_image:
- flavor:
- role: '''
-
-
diff --git a/benchmarks/testplan/dell-us-deploying-bm3/compute/dhrystone_vm.yaml b/benchmarks/testplan/dell-us-deploying-bm3/compute/dhrystone_vm.yaml
deleted file mode 100644
index 8f5a4165..00000000
--- a/benchmarks/testplan/dell-us-deploying-bm3/compute/dhrystone_vm.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-Scenario:
- benchmark: dhrystone
- host: virtualmachine_1, virtualmachine_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: "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/benchmarks/testplan/dell-us-deploying-bm3/compute/dpi_bm.yaml b/benchmarks/testplan/dell-us-deploying-bm3/compute/dpi_bm.yaml
deleted file mode 100644
index 1bc534b3..00000000
--- a/benchmarks/testplan/dell-us-deploying-bm3/compute/dpi_bm.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-Scenario:
- benchmark: dpi
- host: machine_1,machine_2
-
-Context:
- Host_Machines:
- machine_1:
- ip: 10.20.0.4
- pw: Op3nStack
- role: 1host
- machine_2:
- ip: 10.20.0.5
- pw: Op3nStack
- role: 1host
- Virtual_Machines:
-Test_Description:
- Test_category: "Compute"
- Benchmark: "dpi"
- Overview: >
- '''This test will run the DPI benchmark in serial on virutalmachine_1 and virtualmachine_2.\n
- if you wish to add a host machine add the following information under the Host_Machine tag
- virtualmachine_2:
- availability_zone: compute1
- OS_image: QTIP_CentOS
- public_network: 'provider_network'
-
- role: 1host
- flavor: m1.large
- machine_1:
- ip:
- pw:
- role:
- '''
-
diff --git a/benchmarks/testplan/dell-us-deploying-bm3/compute/dpi_vm.yaml b/benchmarks/testplan/dell-us-deploying-bm3/compute/dpi_vm.yaml
deleted file mode 100644
index 10e86993..00000000
--- a/benchmarks/testplan/dell-us-deploying-bm3/compute/dpi_vm.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-Scenario:
- benchmark: dpi
- 1Run : virtualmachine_1, virtualmachine_2
-
-Context:
- Host_Machines:
-
-
- Virtual_Machines:
- virtualmachine_1:
- availability_zone: compute1
- OS_image: QTIP_CentOS
- public_network: 'net04_ext'
- role: 1Run
- flavor: m1.large
- virtualmachine_2:
- availability_zone: compute2
- OS_image: QTIP_CentOS
- public_network: 'net04_ext'
- role: 1Run
- flavor: m1.large
-
-Test_Description:
- Test_category: "Compute"
- Benchmark: "dpi"
- Overview: >
- '''This test will run the DPI benchmark in parallel on virutalmachine_1 and virtualmachine_2.\n
- 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/testplan/dell-us-deploying-bm3/compute/ramspeed_bm.yaml b/benchmarks/testplan/dell-us-deploying-bm3/compute/ramspeed_bm.yaml
deleted file mode 100644
index a63df3e2..00000000
--- a/benchmarks/testplan/dell-us-deploying-bm3/compute/ramspeed_bm.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-Scenario:
- benchmark: ramspeed
- host: machine_1, machine_2
- server:
-
-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: "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
-
- virtualmachine_1:
- availability_zone:
- public_network:
- OS_image:
- flavor:
- role: '''
-
-
diff --git a/benchmarks/testplan/dell-us-deploying-bm3/compute/ramspeed_vm.yaml b/benchmarks/testplan/dell-us-deploying-bm3/compute/ramspeed_vm.yaml
deleted file mode 100644
index a6a4363f..00000000
--- a/benchmarks/testplan/dell-us-deploying-bm3/compute/ramspeed_vm.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-Scenario:
- benchmark: ramspeed
- host: virtualmachine_1, virtualmachine_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: "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/benchmarks/testplan/dell-us-deploying-bm3/compute/ssl_bm.yaml b/benchmarks/testplan/dell-us-deploying-bm3/compute/ssl_bm.yaml
deleted file mode 100644
index dc038822..00000000
--- a/benchmarks/testplan/dell-us-deploying-bm3/compute/ssl_bm.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-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/benchmarks/testplan/dell-us-deploying-bm3/compute/ssl_vm.yaml b/benchmarks/testplan/dell-us-deploying-bm3/compute/ssl_vm.yaml
deleted file mode 100644
index 37824896..00000000
--- a/benchmarks/testplan/dell-us-deploying-bm3/compute/ssl_vm.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-Scenario:
- benchmark: ssl
- host: virtualmachine_1, virtualmachine_2
-
-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: "Compute"
- Benchmark: "ssl"
- Overview: >
- '''This test will run the SSL benchmark in parallel on virtualmachine_1 and machine_1.\n
- 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/benchmarks/testplan/dell-us-deploying-bm3/compute/whetstone_bm.yaml b/benchmarks/testplan/dell-us-deploying-bm3/compute/whetstone_bm.yaml
deleted file mode 100644
index 180d4e51..00000000
--- a/benchmarks/testplan/dell-us-deploying-bm3/compute/whetstone_bm.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-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/benchmarks/testplan/dell-us-deploying-bm3/compute/whetstone_vm.yaml b/benchmarks/testplan/dell-us-deploying-bm3/compute/whetstone_vm.yaml
deleted file mode 100644
index 0f1e8748..00000000
--- a/benchmarks/testplan/dell-us-deploying-bm3/compute/whetstone_vm.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-Scenario:
- benchmark: whetstone
- host: virtualmachine_1, virtualmachine_1
- 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: "Compute"
- Benchmark: "dhrystone"
- Overview: >
- '''This test will run the whetstone 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:
- availability_zone: nova
- public_network: 'net04_ext'
- OS_image: QTIP_CentOS
- flavor: m1.large
- role: host
-
- virtualmachine_1:
- availability_zone:
- public_network:
- OS_image:
- flavor:
- role:
- '''
-
diff --git a/benchmarks/testplan/dell-us-deploying-bm3/network/iperf_bm.yaml b/benchmarks/testplan/dell-us-deploying-bm3/network/iperf_bm.yaml
deleted file mode 100644
index 4c64dd16..00000000
--- a/benchmarks/testplan/dell-us-deploying-bm3/network/iperf_bm.yaml
+++ /dev/null
@@ -1,50 +0,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: 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/testplan/dell-us-deploying-bm3/network/iperf_vm.yaml b/benchmarks/testplan/dell-us-deploying-bm3/network/iperf_vm.yaml
deleted file mode 100644
index d7079e99..00000000
--- a/benchmarks/testplan/dell-us-deploying-bm3/network/iperf_vm.yaml
+++ /dev/null
@@ -1,44 +0,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/benchmarks/testplan/dell-us-deploying-bm3/network/iperf_vm_2.yaml b/benchmarks/testplan/dell-us-deploying-bm3/network/iperf_vm_2.yaml
deleted file mode 100644
index c5b94715..00000000
--- a/benchmarks/testplan/dell-us-deploying-bm3/network/iperf_vm_2.yaml
+++ /dev/null
@@ -1,44 +0,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/benchmarks/testplan/dell-us-deploying-bm3/network/netperf.yaml b/benchmarks/testplan/dell-us-deploying-bm3/network/netperf.yaml
deleted file mode 100644
index f4ce396b..00000000
--- a/benchmarks/testplan/dell-us-deploying-bm3/network/netperf.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-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:
- '''
-
diff --git a/benchmarks/testplan/dell-us-deploying-bm3/storage/fio_bm.yaml b/benchmarks/testplan/dell-us-deploying-bm3/storage/fio_bm.yaml
deleted file mode 100644
index 12be8c17..00000000
--- a/benchmarks/testplan/dell-us-deploying-bm3/storage/fio_bm.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-Scenario:
- benchmark: fio
- host: machine_1, machine_2
- server: blakc
-
-Context:
- Host_Machines:
- machine_1:
- ip: 10.20.0.4
- pw: r00tme
- role: host
- machine_2:
- ip: 10.20.0.5
- 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/benchmarks/testplan/dell-us-deploying-bm3/storage/fio_vm.yaml b/benchmarks/testplan/dell-us-deploying-bm3/storage/fio_vm.yaml
deleted file mode 100644
index 5ae90d2c..00000000
--- a/benchmarks/testplan/dell-us-deploying-bm3/storage/fio_vm.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-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:
- '''
-