From ffa0be2adf6e9e44e2317f89dd5832aff96772ad Mon Sep 17 00:00:00 2001 From: Nauman_Ahad Date: Mon, 11 Jan 2016 16:23:29 +0500 Subject: Changed name for lab of dell-us-deploying-bm-3 Changed name from dell-us-deploying-bm-3 to dell-us-deploying-bm3 in testcases. Removed duplicate ramspeed playbook file "ramspeedbench.yaml" Change-Id: Ieb49a0466e6f86bb02990962b382696cc7ae3e31 Signed-off-by: Nauman_Ahad --- benchmarks/playbooks/ramspeed.yaml | 7 +-- benchmarks/playbooks/ramspeedbench.yaml | 38 ------------- .../default/compute/.whetstone_serial.yaml.swp | Bin 12288 -> 0 bytes test_cases/default/compute/dhrystone_bm.yaml | 35 ++++++++++++ test_cases/default/compute/dhrystone_parallel.yaml | 45 ---------------- test_cases/default/compute/dhrystone_serial.yaml | 35 ------------ test_cases/default/compute/dhrystone_vm.yaml | 45 ++++++++++++++++ test_cases/default/compute/dpi_bm.yaml | 34 ++++++++++++ test_cases/default/compute/dpi_parallel.yaml | 36 ------------- test_cases/default/compute/dpi_serial.yaml | 35 ------------ test_cases/default/compute/dpi_vm.yaml | 35 ++++++++++++ test_cases/default/compute/ramspeed_bm.yaml | 35 ++++++++++++ test_cases/default/compute/ssl_bm.yaml | 31 +++++++++++ test_cases/default/compute/ssl_parallel.yaml | 37 ------------- test_cases/default/compute/ssl_serial.yaml | 33 ------------ test_cases/default/compute/ssl_vm.yaml | 36 +++++++++++++ test_cases/default/compute/whetstone_bm.yaml | 34 ++++++++++++ test_cases/default/compute/whetstone_parallel.yaml | 45 ---------------- test_cases/default/compute/whetstone_serial.yaml | 35 ------------ test_cases/default/compute/whetstone_vm.yaml | 44 +++++++++++++++ test_cases/default/storage/fio_baremetal.yaml | 39 -------------- test_cases/default/storage/fio_bm.yaml | 39 ++++++++++++++ .../compute/dhrystone_bm.yaml | 35 ------------ .../compute/dhrystone_vm.yaml | 45 ---------------- .../dell-us-deploying-bm-3/compute/dpi_bm.yaml | 34 ------------ .../dell-us-deploying-bm-3/compute/dpi_vm.yaml | 35 ------------ .../dell-us-deploying-bm-3/compute/ssl_bm.yaml | 31 ----------- .../dell-us-deploying-bm-3/compute/ssl_vm.yaml | 36 ------------- .../compute/whetstone_bm.yaml | 34 ------------ .../compute/whetstone_vm.yaml | 44 --------------- .../network/iperf_topology_1.yaml | 43 --------------- .../network/iperf_topology_2.yaml | 43 --------------- .../network/iperf_topology_3.yaml | 60 --------------------- .../dell-us-deploying-bm-3/network/netperf.yaml | 42 --------------- .../dell-us-deploying-bm-3/network/pktgen.yaml | 44 --------------- .../dell-us-deploying-bm-3/storage/fio_bm.yaml | 39 -------------- .../dell-us-deploying-bm-3/storage/fio_vm.yaml | 44 --------------- .../compute/dhrystone_bm.yaml | 35 ++++++++++++ .../compute/dhrystone_vm.yaml | 45 ++++++++++++++++ .../dell-us-deploying-bm3/compute/dpi_bm.yaml | 34 ++++++++++++ .../dell-us-deploying-bm3/compute/dpi_vm.yaml | 35 ++++++++++++ .../dell-us-deploying-bm3/compute/ssl_bm.yaml | 31 +++++++++++ .../dell-us-deploying-bm3/compute/ssl_vm.yaml | 36 +++++++++++++ .../compute/whetstone_bm.yaml | 34 ++++++++++++ .../compute/whetstone_vm.yaml | 44 +++++++++++++++ .../network/iperf_topology_1.yaml | 43 +++++++++++++++ .../network/iperf_topology_2.yaml | 43 +++++++++++++++ .../network/iperf_topology_3.yaml | 60 +++++++++++++++++++++ .../dell-us-deploying-bm3/network/netperf.yaml | 42 +++++++++++++++ .../dell-us-deploying-bm3/network/pktgen.yaml | 44 +++++++++++++++ .../dell-us-deploying-bm3/storage/fio_bm.yaml | 39 ++++++++++++++ .../dell-us-deploying-bm3/storage/fio_vm.yaml | 44 +++++++++++++++ 52 files changed, 978 insertions(+), 993 deletions(-) delete mode 100644 benchmarks/playbooks/ramspeedbench.yaml delete mode 100644 test_cases/default/compute/.whetstone_serial.yaml.swp create mode 100644 test_cases/default/compute/dhrystone_bm.yaml delete mode 100644 test_cases/default/compute/dhrystone_parallel.yaml delete mode 100644 test_cases/default/compute/dhrystone_serial.yaml create mode 100644 test_cases/default/compute/dhrystone_vm.yaml create mode 100644 test_cases/default/compute/dpi_bm.yaml delete mode 100644 test_cases/default/compute/dpi_parallel.yaml delete mode 100644 test_cases/default/compute/dpi_serial.yaml create mode 100644 test_cases/default/compute/dpi_vm.yaml create mode 100644 test_cases/default/compute/ramspeed_bm.yaml create mode 100644 test_cases/default/compute/ssl_bm.yaml delete mode 100644 test_cases/default/compute/ssl_parallel.yaml delete mode 100644 test_cases/default/compute/ssl_serial.yaml create mode 100644 test_cases/default/compute/ssl_vm.yaml create mode 100644 test_cases/default/compute/whetstone_bm.yaml delete mode 100644 test_cases/default/compute/whetstone_parallel.yaml delete mode 100644 test_cases/default/compute/whetstone_serial.yaml create mode 100644 test_cases/default/compute/whetstone_vm.yaml delete mode 100644 test_cases/default/storage/fio_baremetal.yaml create mode 100644 test_cases/default/storage/fio_bm.yaml delete mode 100644 test_cases/dell-us-deploying-bm-3/compute/dhrystone_bm.yaml delete mode 100644 test_cases/dell-us-deploying-bm-3/compute/dhrystone_vm.yaml delete mode 100644 test_cases/dell-us-deploying-bm-3/compute/dpi_bm.yaml delete mode 100644 test_cases/dell-us-deploying-bm-3/compute/dpi_vm.yaml delete mode 100644 test_cases/dell-us-deploying-bm-3/compute/ssl_bm.yaml delete mode 100644 test_cases/dell-us-deploying-bm-3/compute/ssl_vm.yaml delete mode 100644 test_cases/dell-us-deploying-bm-3/compute/whetstone_bm.yaml delete mode 100644 test_cases/dell-us-deploying-bm-3/compute/whetstone_vm.yaml delete mode 100644 test_cases/dell-us-deploying-bm-3/network/iperf_topology_1.yaml delete mode 100644 test_cases/dell-us-deploying-bm-3/network/iperf_topology_2.yaml delete mode 100644 test_cases/dell-us-deploying-bm-3/network/iperf_topology_3.yaml delete mode 100644 test_cases/dell-us-deploying-bm-3/network/netperf.yaml delete mode 100644 test_cases/dell-us-deploying-bm-3/network/pktgen.yaml delete mode 100644 test_cases/dell-us-deploying-bm-3/storage/fio_bm.yaml delete mode 100644 test_cases/dell-us-deploying-bm-3/storage/fio_vm.yaml create mode 100644 test_cases/dell-us-deploying-bm3/compute/dhrystone_bm.yaml create mode 100644 test_cases/dell-us-deploying-bm3/compute/dhrystone_vm.yaml create mode 100644 test_cases/dell-us-deploying-bm3/compute/dpi_bm.yaml create mode 100644 test_cases/dell-us-deploying-bm3/compute/dpi_vm.yaml create mode 100644 test_cases/dell-us-deploying-bm3/compute/ssl_bm.yaml create mode 100644 test_cases/dell-us-deploying-bm3/compute/ssl_vm.yaml create mode 100644 test_cases/dell-us-deploying-bm3/compute/whetstone_bm.yaml create mode 100644 test_cases/dell-us-deploying-bm3/compute/whetstone_vm.yaml create mode 100644 test_cases/dell-us-deploying-bm3/network/iperf_topology_1.yaml create mode 100644 test_cases/dell-us-deploying-bm3/network/iperf_topology_2.yaml create mode 100644 test_cases/dell-us-deploying-bm3/network/iperf_topology_3.yaml create mode 100644 test_cases/dell-us-deploying-bm3/network/netperf.yaml create mode 100644 test_cases/dell-us-deploying-bm3/network/pktgen.yaml create mode 100644 test_cases/dell-us-deploying-bm3/storage/fio_bm.yaml create mode 100644 test_cases/dell-us-deploying-bm3/storage/fio_vm.yaml diff --git a/benchmarks/playbooks/ramspeed.yaml b/benchmarks/playbooks/ramspeed.yaml index 0321eb43..3ca4b14d 100644 --- a/benchmarks/playbooks/ramspeed.yaml +++ b/benchmarks/playbooks/ramspeed.yaml @@ -63,11 +63,6 @@ fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest=../../{{Dest_dir}}/ramspeed/ramspeed_temp with_items: copy_log_results.stdout_lines - - - name: copy results - fetch: src=/root/results/{{item}} dest=../../{{Dest_dir}}/ssl - with_items: files_to_copy.stdout_lines - - hosts: 127.0.0.1 connection: local tasks: @@ -78,4 +73,4 @@ - name: extracting_log shell: ( find ../../{{Dest_dir}}/ramspeed/ramspeed_temp/ -name "*.log" | xargs cp -t ../../{{Dest_dir}}/ramspeed/logs) - name: removing ramspeed_log - shell: rm -rf ../../{{Dest_dir}}/ramspeed/ramspeed_temp \ No newline at end of file + shell: rm -rf ../../{{Dest_dir}}/ramspeed/ramspeed_temp diff --git a/benchmarks/playbooks/ramspeedbench.yaml b/benchmarks/playbooks/ramspeedbench.yaml deleted file mode 100644 index d8136b08..00000000 --- a/benchmarks/playbooks/ramspeedbench.yaml +++ /dev/null @@ -1,38 +0,0 @@ - - - hosts: "{{ role }}" - - tasks: - - name: clean - shell: rm -rf /usr/bin/phoronix-test-suite - shell: rm -rf /usr/share/doc/phoronix-test-suite/ - shell: rm -rf /usr/share/phoronix-test-suite - shell: rm -rf /root/photmp/ - - name: clean previous results - file: path=/root/results path=absent - - name: make direc - file: path=/root/photmp/ state=directory - - name: Fetch Phornonix - shell: cd /root/photmp/ && wget https://www.dropbox.com/s/5kks513ozxy7vvs/phoronix-suite.tar.gz - - name: unarchive Phoronix - shell: cd /root/photmp/ && tar -zxvf phoronix-suite.tar.gz - - name: Phornonix Dependencies - shell: yum install php php-xml php-client php-process -y - - name: Install Phornonix - shell: cd /root/photmp/phoronix-test-suite-master/&&./install-sh - - name: batchSetup - shell: phoronix-test-suite batch-setup - - name: install - shell: phoronix-test-suite batch-install ramspeed - - name: run - shell: phoronix-test-suite batch-run ramspeed - - name: making directory - file: path=/root/results state=directory - - name: copying result to temp directory - shell: cp -r /var/lib/phoronix-test-suite/test-results/* /root/results/ - - name: registering files - shell: (cd /root/results/; find . -maxdepth 1 -type f) | cut -d'/' -f2 - register: files_to_copy - - name: copy results - fetch: src=/root/results/{{item}} dest={{Dest_dir}}/dhrystone - with_items: files_to_copy.stdout_lines - diff --git a/test_cases/default/compute/.whetstone_serial.yaml.swp b/test_cases/default/compute/.whetstone_serial.yaml.swp deleted file mode 100644 index bbfd3be2..00000000 Binary files a/test_cases/default/compute/.whetstone_serial.yaml.swp and /dev/null differ diff --git a/test_cases/default/compute/dhrystone_bm.yaml b/test_cases/default/compute/dhrystone_bm.yaml new file mode 100644 index 00000000..022cf5ee --- /dev/null +++ b/test_cases/default/compute/dhrystone_bm.yaml @@ -0,0 +1,35 @@ + +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/test_cases/default/compute/dhrystone_parallel.yaml b/test_cases/default/compute/dhrystone_parallel.yaml deleted file mode 100644 index 29de6d6f..00000000 --- a/test_cases/default/compute/dhrystone_parallel.yaml +++ /dev/null @@ -1,45 +0,0 @@ -Scenario: - benchmark: dhrystone - 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: "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/test_cases/default/compute/dhrystone_serial.yaml b/test_cases/default/compute/dhrystone_serial.yaml deleted file mode 100644 index e15e8ecc..00000000 --- a/test_cases/default/compute/dhrystone_serial.yaml +++ /dev/null @@ -1,35 +0,0 @@ - -Scenario: - benchmark: dhrystone - host: machine_1, machine_2, virtualmachine_1 - server: - -Context: - Host_Machines: - machine_1: - ip: 172.18.0.16 - pw: Op3nStack - role: host - Virtual_Machines: - virtualmachine_1: - availability_zone: nova - public_network: 'net04_ext' - OS_image: QTIP_CentOS - flavor: m1.large - role: server - -Test_Description: - Test_category: "Compute" - Benchmark: "dhrystone" - Overview: > - ''' This test will run the dhrystone benchmark in serial 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/test_cases/default/compute/dhrystone_vm.yaml b/test_cases/default/compute/dhrystone_vm.yaml new file mode 100644 index 00000000..c14399b1 --- /dev/null +++ b/test_cases/default/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/test_cases/default/compute/dpi_bm.yaml b/test_cases/default/compute/dpi_bm.yaml new file mode 100644 index 00000000..f161aa3f --- /dev/null +++ b/test_cases/default/compute/dpi_bm.yaml @@ -0,0 +1,34 @@ +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/test_cases/default/compute/dpi_parallel.yaml b/test_cases/default/compute/dpi_parallel.yaml deleted file mode 100644 index 0f6afdce..00000000 --- a/test_cases/default/compute/dpi_parallel.yaml +++ /dev/null @@ -1,36 +0,0 @@ -Scenario: - benchmark: dpi - 1Run : virtualmachine_1, virtualmachine_2 - 2Run: - -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/test_cases/default/compute/dpi_serial.yaml b/test_cases/default/compute/dpi_serial.yaml deleted file mode 100644 index b39597a2..00000000 --- a/test_cases/default/compute/dpi_serial.yaml +++ /dev/null @@ -1,35 +0,0 @@ -Scenario: - benchmark: dpi - host: virtualmachine_1 - server: virtualmachine_2 - -Context: - Host_Machines: - machine_1: - ip: 172.18.0.17 - pw: Op3nStack - role: 1host - machine_2: - ip: 172.18.0.16 - 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/test_cases/default/compute/dpi_vm.yaml b/test_cases/default/compute/dpi_vm.yaml new file mode 100644 index 00000000..8a157e7a --- /dev/null +++ b/test_cases/default/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/test_cases/default/compute/ramspeed_bm.yaml b/test_cases/default/compute/ramspeed_bm.yaml new file mode 100644 index 00000000..47b933b8 --- /dev/null +++ b/test_cases/default/compute/ramspeed_bm.yaml @@ -0,0 +1,35 @@ + +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/test_cases/default/compute/ssl_bm.yaml b/test_cases/default/compute/ssl_bm.yaml new file mode 100644 index 00000000..bded6d2d --- /dev/null +++ b/test_cases/default/compute/ssl_bm.yaml @@ -0,0 +1,31 @@ +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/test_cases/default/compute/ssl_parallel.yaml b/test_cases/default/compute/ssl_parallel.yaml deleted file mode 100644 index eb46d8d8..00000000 --- a/test_cases/default/compute/ssl_parallel.yaml +++ /dev/null @@ -1,37 +0,0 @@ -Scenario: - benchmark: ssl - host: machine_1, machine_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: "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/test_cases/default/compute/ssl_serial.yaml b/test_cases/default/compute/ssl_serial.yaml deleted file mode 100644 index 4d92526e..00000000 --- a/test_cases/default/compute/ssl_serial.yaml +++ /dev/null @@ -1,33 +0,0 @@ -Scenario: - benchmark: ssl - 1Run: machine_1 - 2Run: virtualmachine_1 - -Context: - Host_Machines: - machine_1: - ip: 10.20.0.7 - pw: r00tme - role: 1Run - Virtual_Machines: - virtualmachine_1: - availability_zone: compute1 - public_network: net04_ext - OS_image: QTIP_Centos - flavor: m1.large - role: 1Run -Test_Description: - Test_category: "Compute" - Benchmark: "ssl" - Overview: > - '''This test will run the SSL benchmark in serial on virtualmachine_1 and machine_1. - The Test will run first on the Host_Machine and then on the Virtual Machine. - 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/test_cases/default/compute/ssl_vm.yaml b/test_cases/default/compute/ssl_vm.yaml new file mode 100644 index 00000000..cbacf088 --- /dev/null +++ b/test_cases/default/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/test_cases/default/compute/whetstone_bm.yaml b/test_cases/default/compute/whetstone_bm.yaml new file mode 100644 index 00000000..136ac2b0 --- /dev/null +++ b/test_cases/default/compute/whetstone_bm.yaml @@ -0,0 +1,34 @@ + +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/test_cases/default/compute/whetstone_parallel.yaml b/test_cases/default/compute/whetstone_parallel.yaml deleted file mode 100644 index 48bc7230..00000000 --- a/test_cases/default/compute/whetstone_parallel.yaml +++ /dev/null @@ -1,45 +0,0 @@ -Scenario: - benchmark: whetstone - host: machine_1, virtualmachine_1 - server: - -Context: - Host_Machines: - machine_1: - ip: 172.18.0.76 - pw: r00tme - role: host - machine_2: - ip: 172.18.0.75 - pw: r00tme - role: host - - Virtual_Machines: - virtualmachine_1: - availability_zone: compute1 - 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/test_cases/default/compute/whetstone_serial.yaml b/test_cases/default/compute/whetstone_serial.yaml deleted file mode 100644 index 25cefbf8..00000000 --- a/test_cases/default/compute/whetstone_serial.yaml +++ /dev/null @@ -1,35 +0,0 @@ - -Scenario: - benchmark: whetstone - host: machine_1, - server: virtualmachine_1 - -Context: - Host_Machines: - machine_1: - ip: 172.18.0.16 - pw: Op3nStack - role: host - Virtual_Machines: - virtualmachine_1: - availability_zone: nova - public_network: 'net04_ext' - OS_image: QTIP_CentOS - flavor: m1.large - role: server - -Test_Description: - Test_category: "Compute" - Benchmark: "whetstone" - Overview: > - ''' This test will run the whetstone benchmark in serial 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/test_cases/default/compute/whetstone_vm.yaml b/test_cases/default/compute/whetstone_vm.yaml new file mode 100644 index 00000000..17928fa1 --- /dev/null +++ b/test_cases/default/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/test_cases/default/storage/fio_baremetal.yaml b/test_cases/default/storage/fio_baremetal.yaml deleted file mode 100644 index 4778c385..00000000 --- a/test_cases/default/storage/fio_baremetal.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.7 - pw: r00tme - role: host - machine_2: - ip: 10.20.0.6 - 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/test_cases/default/storage/fio_bm.yaml b/test_cases/default/storage/fio_bm.yaml new file mode 100644 index 00000000..4778c385 --- /dev/null +++ b/test_cases/default/storage/fio_bm.yaml @@ -0,0 +1,39 @@ +Scenario: + benchmark: fio + host: machine_1, machine_2 + server: blakc + +Context: + Host_Machines: + machine_1: + ip: 10.20.0.7 + pw: r00tme + role: host + machine_2: + ip: 10.20.0.6 + 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/test_cases/dell-us-deploying-bm-3/compute/dhrystone_bm.yaml b/test_cases/dell-us-deploying-bm-3/compute/dhrystone_bm.yaml deleted file mode 100644 index 022cf5ee..00000000 --- a/test_cases/dell-us-deploying-bm-3/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/test_cases/dell-us-deploying-bm-3/compute/dhrystone_vm.yaml b/test_cases/dell-us-deploying-bm-3/compute/dhrystone_vm.yaml deleted file mode 100644 index c14399b1..00000000 --- a/test_cases/dell-us-deploying-bm-3/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/test_cases/dell-us-deploying-bm-3/compute/dpi_bm.yaml b/test_cases/dell-us-deploying-bm-3/compute/dpi_bm.yaml deleted file mode 100644 index f161aa3f..00000000 --- a/test_cases/dell-us-deploying-bm-3/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/test_cases/dell-us-deploying-bm-3/compute/dpi_vm.yaml b/test_cases/dell-us-deploying-bm-3/compute/dpi_vm.yaml deleted file mode 100644 index 8a157e7a..00000000 --- a/test_cases/dell-us-deploying-bm-3/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/test_cases/dell-us-deploying-bm-3/compute/ssl_bm.yaml b/test_cases/dell-us-deploying-bm-3/compute/ssl_bm.yaml deleted file mode 100644 index bded6d2d..00000000 --- a/test_cases/dell-us-deploying-bm-3/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/test_cases/dell-us-deploying-bm-3/compute/ssl_vm.yaml b/test_cases/dell-us-deploying-bm-3/compute/ssl_vm.yaml deleted file mode 100644 index cbacf088..00000000 --- a/test_cases/dell-us-deploying-bm-3/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/test_cases/dell-us-deploying-bm-3/compute/whetstone_bm.yaml b/test_cases/dell-us-deploying-bm-3/compute/whetstone_bm.yaml deleted file mode 100644 index 136ac2b0..00000000 --- a/test_cases/dell-us-deploying-bm-3/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/test_cases/dell-us-deploying-bm-3/compute/whetstone_vm.yaml b/test_cases/dell-us-deploying-bm-3/compute/whetstone_vm.yaml deleted file mode 100644 index 17928fa1..00000000 --- a/test_cases/dell-us-deploying-bm-3/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/test_cases/dell-us-deploying-bm-3/network/iperf_topology_1.yaml b/test_cases/dell-us-deploying-bm-3/network/iperf_topology_1.yaml deleted file mode 100644 index 18eba8ac..00000000 --- a/test_cases/dell-us-deploying-bm-3/network/iperf_topology_1.yaml +++ /dev/null @@ -1,43 +0,0 @@ -Scenario: - benchmark: iperf - topology: Client and Server on ONE compute - 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: 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/test_cases/dell-us-deploying-bm-3/network/iperf_topology_2.yaml b/test_cases/dell-us-deploying-bm-3/network/iperf_topology_2.yaml deleted file mode 100644 index 301a9916..00000000 --- a/test_cases/dell-us-deploying-bm-3/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-deploying-bm-3/network/iperf_topology_3.yaml b/test_cases/dell-us-deploying-bm-3/network/iperf_topology_3.yaml deleted file mode 100644 index 9e7b73e7..00000000 --- a/test_cases/dell-us-deploying-bm-3/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-bm-3/network/netperf.yaml b/test_cases/dell-us-deploying-bm-3/network/netperf.yaml deleted file mode 100644 index 267b288d..00000000 --- a/test_cases/dell-us-deploying-bm-3/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/test_cases/dell-us-deploying-bm-3/network/pktgen.yaml b/test_cases/dell-us-deploying-bm-3/network/pktgen.yaml deleted file mode 100644 index 13fae68f..00000000 --- a/test_cases/dell-us-deploying-bm-3/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-bm-3/storage/fio_bm.yaml b/test_cases/dell-us-deploying-bm-3/storage/fio_bm.yaml deleted file mode 100644 index 4778c385..00000000 --- a/test_cases/dell-us-deploying-bm-3/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.7 - pw: r00tme - role: host - machine_2: - ip: 10.20.0.6 - 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/test_cases/dell-us-deploying-bm-3/storage/fio_vm.yaml b/test_cases/dell-us-deploying-bm-3/storage/fio_vm.yaml deleted file mode 100644 index dcd27252..00000000 --- a/test_cases/dell-us-deploying-bm-3/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/test_cases/dell-us-deploying-bm3/compute/dhrystone_bm.yaml b/test_cases/dell-us-deploying-bm3/compute/dhrystone_bm.yaml new file mode 100644 index 00000000..022cf5ee --- /dev/null +++ b/test_cases/dell-us-deploying-bm3/compute/dhrystone_bm.yaml @@ -0,0 +1,35 @@ + +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/test_cases/dell-us-deploying-bm3/compute/dhrystone_vm.yaml b/test_cases/dell-us-deploying-bm3/compute/dhrystone_vm.yaml new file mode 100644 index 00000000..c14399b1 --- /dev/null +++ b/test_cases/dell-us-deploying-bm3/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/test_cases/dell-us-deploying-bm3/compute/dpi_bm.yaml b/test_cases/dell-us-deploying-bm3/compute/dpi_bm.yaml new file mode 100644 index 00000000..f161aa3f --- /dev/null +++ b/test_cases/dell-us-deploying-bm3/compute/dpi_bm.yaml @@ -0,0 +1,34 @@ +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/test_cases/dell-us-deploying-bm3/compute/dpi_vm.yaml b/test_cases/dell-us-deploying-bm3/compute/dpi_vm.yaml new file mode 100644 index 00000000..8a157e7a --- /dev/null +++ b/test_cases/dell-us-deploying-bm3/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/test_cases/dell-us-deploying-bm3/compute/ssl_bm.yaml b/test_cases/dell-us-deploying-bm3/compute/ssl_bm.yaml new file mode 100644 index 00000000..bded6d2d --- /dev/null +++ b/test_cases/dell-us-deploying-bm3/compute/ssl_bm.yaml @@ -0,0 +1,31 @@ +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/test_cases/dell-us-deploying-bm3/compute/ssl_vm.yaml b/test_cases/dell-us-deploying-bm3/compute/ssl_vm.yaml new file mode 100644 index 00000000..cbacf088 --- /dev/null +++ b/test_cases/dell-us-deploying-bm3/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/test_cases/dell-us-deploying-bm3/compute/whetstone_bm.yaml b/test_cases/dell-us-deploying-bm3/compute/whetstone_bm.yaml new file mode 100644 index 00000000..136ac2b0 --- /dev/null +++ b/test_cases/dell-us-deploying-bm3/compute/whetstone_bm.yaml @@ -0,0 +1,34 @@ + +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/test_cases/dell-us-deploying-bm3/compute/whetstone_vm.yaml b/test_cases/dell-us-deploying-bm3/compute/whetstone_vm.yaml new file mode 100644 index 00000000..17928fa1 --- /dev/null +++ b/test_cases/dell-us-deploying-bm3/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/test_cases/dell-us-deploying-bm3/network/iperf_topology_1.yaml b/test_cases/dell-us-deploying-bm3/network/iperf_topology_1.yaml new file mode 100644 index 00000000..18eba8ac --- /dev/null +++ b/test_cases/dell-us-deploying-bm3/network/iperf_topology_1.yaml @@ -0,0 +1,43 @@ +Scenario: + benchmark: iperf + topology: Client and Server on ONE compute + 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: 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/test_cases/dell-us-deploying-bm3/network/iperf_topology_2.yaml b/test_cases/dell-us-deploying-bm3/network/iperf_topology_2.yaml new file mode 100644 index 00000000..301a9916 --- /dev/null +++ b/test_cases/dell-us-deploying-bm3/network/iperf_topology_2.yaml @@ -0,0 +1,43 @@ +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-deploying-bm3/network/iperf_topology_3.yaml b/test_cases/dell-us-deploying-bm3/network/iperf_topology_3.yaml new file mode 100644 index 00000000..9e7b73e7 --- /dev/null +++ b/test_cases/dell-us-deploying-bm3/network/iperf_topology_3.yaml @@ -0,0 +1,60 @@ +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/netperf.yaml b/test_cases/dell-us-deploying-bm3/network/netperf.yaml new file mode 100644 index 00000000..267b288d --- /dev/null +++ b/test_cases/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: + ''' + diff --git a/test_cases/dell-us-deploying-bm3/network/pktgen.yaml b/test_cases/dell-us-deploying-bm3/network/pktgen.yaml new file mode 100644 index 00000000..13fae68f --- /dev/null +++ b/test_cases/dell-us-deploying-bm3/network/pktgen.yaml @@ -0,0 +1,44 @@ +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/storage/fio_bm.yaml b/test_cases/dell-us-deploying-bm3/storage/fio_bm.yaml new file mode 100644 index 00000000..4778c385 --- /dev/null +++ b/test_cases/dell-us-deploying-bm3/storage/fio_bm.yaml @@ -0,0 +1,39 @@ +Scenario: + benchmark: fio + host: machine_1, machine_2 + server: blakc + +Context: + Host_Machines: + machine_1: + ip: 10.20.0.7 + pw: r00tme + role: host + machine_2: + ip: 10.20.0.6 + 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/test_cases/dell-us-deploying-bm3/storage/fio_vm.yaml b/test_cases/dell-us-deploying-bm3/storage/fio_vm.yaml new file mode 100644 index 00000000..dcd27252 --- /dev/null +++ b/test_cases/dell-us-deploying-bm3/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