From 8356024faa0840408bc2265ac37ed1b566aef59e Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Thu, 24 Nov 2016 15:44:39 +0800 Subject: Fix test failing - skip several failure cases, to be fixed in future - rename `test_plan` to hide from test discovering - add pep8 check by default - fix errors in pep8 check Change-Id: If4451999a1f4ed1339dfdf8271cc58f11de72b3e Signed-off-by: Yujun Zhang --- .../testplan/dell-pod1/compute/dhrystone_bm.yaml | 35 +++++++++++++++ .../testplan/dell-pod1/compute/dhrystone_vm.yaml | 45 +++++++++++++++++++ benchmarks/testplan/dell-pod1/compute/dpi_bm.yaml | 34 +++++++++++++++ benchmarks/testplan/dell-pod1/compute/dpi_vm.yaml | 35 +++++++++++++++ .../testplan/dell-pod1/compute/ramspeed_bm.yaml | 35 +++++++++++++++ .../testplan/dell-pod1/compute/ramspeed_vm.yaml | 45 +++++++++++++++++++ benchmarks/testplan/dell-pod1/compute/ssl_bm.yaml | 31 ++++++++++++++ benchmarks/testplan/dell-pod1/compute/ssl_vm.yaml | 36 ++++++++++++++++ .../testplan/dell-pod1/compute/whetstone_bm.yaml | 34 +++++++++++++++ .../testplan/dell-pod1/compute/whetstone_vm.yaml | 44 +++++++++++++++++++ .../testplan/dell-pod1/network/iperf_bm.yaml | 50 ++++++++++++++++++++++ .../testplan/dell-pod1/network/iperf_vm.yaml | 44 +++++++++++++++++++ .../testplan/dell-pod1/network/iperf_vm_2.yaml | 44 +++++++++++++++++++ benchmarks/testplan/dell-pod1/network/netperf.yaml | 42 ++++++++++++++++++ benchmarks/testplan/dell-pod1/storage/fio_bm.yaml | 39 +++++++++++++++++ benchmarks/testplan/dell-pod1/storage/fio_vm.yaml | 44 +++++++++++++++++++ 16 files changed, 637 insertions(+) create mode 100644 benchmarks/testplan/dell-pod1/compute/dhrystone_bm.yaml create mode 100644 benchmarks/testplan/dell-pod1/compute/dhrystone_vm.yaml create mode 100644 benchmarks/testplan/dell-pod1/compute/dpi_bm.yaml create mode 100644 benchmarks/testplan/dell-pod1/compute/dpi_vm.yaml create mode 100644 benchmarks/testplan/dell-pod1/compute/ramspeed_bm.yaml create mode 100644 benchmarks/testplan/dell-pod1/compute/ramspeed_vm.yaml create mode 100644 benchmarks/testplan/dell-pod1/compute/ssl_bm.yaml create mode 100644 benchmarks/testplan/dell-pod1/compute/ssl_vm.yaml create mode 100644 benchmarks/testplan/dell-pod1/compute/whetstone_bm.yaml create mode 100644 benchmarks/testplan/dell-pod1/compute/whetstone_vm.yaml create mode 100644 benchmarks/testplan/dell-pod1/network/iperf_bm.yaml create mode 100644 benchmarks/testplan/dell-pod1/network/iperf_vm.yaml create mode 100644 benchmarks/testplan/dell-pod1/network/iperf_vm_2.yaml create mode 100644 benchmarks/testplan/dell-pod1/network/netperf.yaml create mode 100644 benchmarks/testplan/dell-pod1/storage/fio_bm.yaml create mode 100644 benchmarks/testplan/dell-pod1/storage/fio_vm.yaml (limited to 'benchmarks/testplan/dell-pod1') diff --git a/benchmarks/testplan/dell-pod1/compute/dhrystone_bm.yaml b/benchmarks/testplan/dell-pod1/compute/dhrystone_bm.yaml new file mode 100644 index 00000000..2f8d0ec9 --- /dev/null +++ b/benchmarks/testplan/dell-pod1/compute/dhrystone_bm.yaml @@ -0,0 +1,35 @@ + +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 new file mode 100644 index 00000000..8f5a4165 --- /dev/null +++ b/benchmarks/testplan/dell-pod1/compute/dhrystone_vm.yaml @@ -0,0 +1,45 @@ +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 new file mode 100644 index 00000000..45324184 --- /dev/null +++ b/benchmarks/testplan/dell-pod1/compute/dpi_bm.yaml @@ -0,0 +1,34 @@ +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 new file mode 100644 index 00000000..8a157e7a --- /dev/null +++ b/benchmarks/testplan/dell-pod1/compute/dpi_vm.yaml @@ -0,0 +1,35 @@ +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 new file mode 100644 index 00000000..af220b80 --- /dev/null +++ b/benchmarks/testplan/dell-pod1/compute/ramspeed_bm.yaml @@ -0,0 +1,35 @@ + +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 new file mode 100644 index 00000000..a6a4363f --- /dev/null +++ b/benchmarks/testplan/dell-pod1/compute/ramspeed_vm.yaml @@ -0,0 +1,45 @@ +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 new file mode 100644 index 00000000..6b14c4e6 --- /dev/null +++ b/benchmarks/testplan/dell-pod1/compute/ssl_bm.yaml @@ -0,0 +1,31 @@ +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 new file mode 100644 index 00000000..37824896 --- /dev/null +++ b/benchmarks/testplan/dell-pod1/compute/ssl_vm.yaml @@ -0,0 +1,36 @@ +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 new file mode 100644 index 00000000..128075a1 --- /dev/null +++ b/benchmarks/testplan/dell-pod1/compute/whetstone_bm.yaml @@ -0,0 +1,34 @@ + +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 new file mode 100644 index 00000000..0f1e8748 --- /dev/null +++ b/benchmarks/testplan/dell-pod1/compute/whetstone_vm.yaml @@ -0,0 +1,44 @@ +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 new file mode 100644 index 00000000..b2d2a958 --- /dev/null +++ b/benchmarks/testplan/dell-pod1/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: 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 new file mode 100644 index 00000000..d7079e99 --- /dev/null +++ b/benchmarks/testplan/dell-pod1/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/testplan/dell-pod1/network/iperf_vm_2.yaml b/benchmarks/testplan/dell-pod1/network/iperf_vm_2.yaml new file mode 100644 index 00000000..c5b94715 --- /dev/null +++ b/benchmarks/testplan/dell-pod1/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/testplan/dell-pod1/network/netperf.yaml b/benchmarks/testplan/dell-pod1/network/netperf.yaml new file mode 100644 index 00000000..f4ce396b --- /dev/null +++ b/benchmarks/testplan/dell-pod1/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: + ''' + diff --git a/benchmarks/testplan/dell-pod1/storage/fio_bm.yaml b/benchmarks/testplan/dell-pod1/storage/fio_bm.yaml new file mode 100644 index 00000000..755bb730 --- /dev/null +++ b/benchmarks/testplan/dell-pod1/storage/fio_bm.yaml @@ -0,0 +1,39 @@ +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 new file mode 100644 index 00000000..5ae90d2c --- /dev/null +++ b/benchmarks/testplan/dell-pod1/storage/fio_vm.yaml @@ -0,0 +1,44 @@ +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: + ''' + -- cgit 1.2.3-korg