From 971a7c98515a9d83661f5e423f7e8390f35dca59 Mon Sep 17 00:00:00 2001 From: MofassirArif Date: Thu, 21 Jan 2016 06:42:23 -0800 Subject: bug fix: result collection bug fix for docker images Change-Id: Ia4ea09b90c7a4f4e3699af456c6d66e85661cc0b Signed-off-by: MofassirArif --- test_cases/default/compute/dhrystone_vm.yaml | 4 ++-- test_cases/default/compute/dpi_bm.yaml | 2 +- test_cases/default/compute/dpi_vm.yaml | 2 +- test_cases/default/compute/ramspeed_vm.yaml | 4 ++-- test_cases/default/compute/ssl_bm.yaml | 6 +++--- test_cases/default/compute/ssl_vm.yaml | 4 ++-- test_cases/default/compute/whetstone_bm.yaml | 14 +++++++------- test_cases/default/compute/whetstone_vm.yaml | 8 ++++---- test_cases/default/network/iperf_vm_2.yaml | 6 +++--- test_cases/default/network/netperf.yaml | 6 +++--- test_cases/default/storage/fio_bm.yaml | 2 +- test_cases/default/storage/fio_vm.yaml | 6 +++--- test_cases/dell-us-deploying-bm3/compute/dhrystone_bm.yaml | 14 +++++++------- test_cases/dell-us-deploying-bm3/compute/dhrystone_vm.yaml | 4 ++-- test_cases/dell-us-deploying-bm3/compute/dpi_bm.yaml | 2 +- test_cases/dell-us-deploying-bm3/compute/dpi_vm.yaml | 2 +- test_cases/dell-us-deploying-bm3/compute/ramspeed_bm.yaml | 14 +++++++------- test_cases/dell-us-deploying-bm3/compute/ramspeed_vm.yaml | 4 ++-- test_cases/dell-us-deploying-bm3/compute/ssl_bm.yaml | 6 +++--- test_cases/dell-us-deploying-bm3/compute/ssl_vm.yaml | 4 ++-- test_cases/dell-us-deploying-bm3/compute/whetstone_bm.yaml | 14 +++++++------- test_cases/dell-us-deploying-bm3/compute/whetstone_vm.yaml | 8 ++++---- test_cases/dell-us-deploying-bm3/network/iperf_bm.yaml | 6 +++--- test_cases/dell-us-deploying-bm3/network/iperf_vm.yaml | 6 +++--- test_cases/dell-us-deploying-bm3/network/iperf_vm_2.yaml | 6 +++--- test_cases/dell-us-deploying-bm3/network/netperf.yaml | 6 +++--- test_cases/dell-us-deploying-bm3/storage/fio_bm.yaml | 2 +- test_cases/dell-us-deploying-bm3/storage/fio_vm.yaml | 6 +++--- test_cases/dell-us-testing-bm-1/compute/dhrystone_bm.yaml | 14 +++++++------- test_cases/dell-us-testing-bm-1/compute/dhrystone_vm.yaml | 4 ++-- test_cases/dell-us-testing-bm-1/compute/dpi_bm.yaml | 6 +++--- test_cases/dell-us-testing-bm-1/compute/ramspeed_bm.yaml | 14 +++++++------- test_cases/dell-us-testing-bm-1/compute/ramspeed_vm.yaml | 4 ++-- test_cases/dell-us-testing-bm-1/compute/ssl_bm.yaml | 6 +++--- test_cases/dell-us-testing-bm-1/compute/ssl_vm.yaml | 4 ++-- test_cases/dell-us-testing-bm-1/compute/whetstone_bm.yaml | 14 +++++++------- test_cases/dell-us-testing-bm-1/compute/whetstone_vm.yaml | 8 ++++---- test_cases/dell-us-testing-bm-1/network/iperf_bm.yaml | 6 +++--- test_cases/dell-us-testing-bm-1/network/iperf_vm.yaml | 6 +++--- test_cases/dell-us-testing-bm-1/network/iperf_vm_2.yaml | 6 +++--- test_cases/dell-us-testing-bm-1/network/netperf.yaml | 6 +++--- test_cases/dell-us-testing-bm-1/storage/fio_bm.yaml | 6 +++--- test_cases/dell-us-testing-bm-1/storage/fio_vm.yaml | 6 +++--- 43 files changed, 139 insertions(+), 139 deletions(-) (limited to 'test_cases') diff --git a/test_cases/default/compute/dhrystone_vm.yaml b/test_cases/default/compute/dhrystone_vm.yaml index c14399b1..8f5a4165 100644 --- a/test_cases/default/compute/dhrystone_vm.yaml +++ b/test_cases/default/compute/dhrystone_vm.yaml @@ -6,7 +6,7 @@ Scenario: Context: Host_Machines: - Virtual_Machines: + Virtual_Machines: virtualmachine_1: availability_zone: compute1 public_network: 'net04_ext' @@ -19,7 +19,7 @@ Context: OS_image: QTIP_CentOS flavor: m1.large role: host - + Test_Description: Test_category: "Compute" Benchmark: "dhrystone" diff --git a/test_cases/default/compute/dpi_bm.yaml b/test_cases/default/compute/dpi_bm.yaml index f161aa3f..1bc534b3 100644 --- a/test_cases/default/compute/dpi_bm.yaml +++ b/test_cases/default/compute/dpi_bm.yaml @@ -31,4 +31,4 @@ Test_Description: pw: role: ''' - + diff --git a/test_cases/default/compute/dpi_vm.yaml b/test_cases/default/compute/dpi_vm.yaml index 8a157e7a..10e86993 100644 --- a/test_cases/default/compute/dpi_vm.yaml +++ b/test_cases/default/compute/dpi_vm.yaml @@ -14,7 +14,7 @@ Context: role: 1Run flavor: m1.large virtualmachine_2: - availability_zone: compute4 + availability_zone: compute2 OS_image: QTIP_CentOS public_network: 'net04_ext' role: 1Run diff --git a/test_cases/default/compute/ramspeed_vm.yaml b/test_cases/default/compute/ramspeed_vm.yaml index b79f4443..a6a4363f 100644 --- a/test_cases/default/compute/ramspeed_vm.yaml +++ b/test_cases/default/compute/ramspeed_vm.yaml @@ -6,7 +6,7 @@ Scenario: Context: Host_Machines: - Virtual_Machines: + Virtual_Machines: virtualmachine_1: availability_zone: compute1 public_network: 'net04_ext' @@ -19,7 +19,7 @@ Context: OS_image: QTIP_CentOS flavor: m1.large role: host - + Test_Description: Test_category: "Compute" Benchmark: "dhrystone" diff --git a/test_cases/default/compute/ssl_bm.yaml b/test_cases/default/compute/ssl_bm.yaml index bded6d2d..dc038822 100644 --- a/test_cases/default/compute/ssl_bm.yaml +++ b/test_cases/default/compute/ssl_bm.yaml @@ -6,14 +6,14 @@ Context: Host_Machines: machine_1: ip: 10.20.0.4 - pw: + pw: role: 1Run machine_2: ip: 10.20.0.5 pw: role: 1Run Virtual_Machines: - + Test_Description: Test_category: "Compute" @@ -28,4 +28,4 @@ Test_Description: OS_image: flavor: role: - ''' + ''' diff --git a/test_cases/default/compute/ssl_vm.yaml b/test_cases/default/compute/ssl_vm.yaml index cbacf088..37824896 100644 --- a/test_cases/default/compute/ssl_vm.yaml +++ b/test_cases/default/compute/ssl_vm.yaml @@ -5,7 +5,7 @@ Scenario: Context: Host_Machines: - Virtual_Machines: + Virtual_Machines: virtualmachine_1: availability_zone: compute1 public_network: 'net04_ext' @@ -33,4 +33,4 @@ Test_Description: OS_image: flavor: role: - ''' + ''' diff --git a/test_cases/default/compute/whetstone_bm.yaml b/test_cases/default/compute/whetstone_bm.yaml index 136ac2b0..180d4e51 100644 --- a/test_cases/default/compute/whetstone_bm.yaml +++ b/test_cases/default/compute/whetstone_bm.yaml @@ -1,4 +1,4 @@ - + Scenario: benchmark: whetstone host: machine_1, machine_2 @@ -8,15 +8,15 @@ Context: Host_Machines: machine_1: ip: 10.20.0.4 - pw: + pw: role: host machine_2: ip: 10.20.0.5 pw: role: host - Virtual_Machines: - - + Virtual_Machines: + + Test_Description: Test_category: "Compute" @@ -30,5 +30,5 @@ Test_Description: pw: role: ''' - - + + diff --git a/test_cases/default/compute/whetstone_vm.yaml b/test_cases/default/compute/whetstone_vm.yaml index 17928fa1..0f1e8748 100644 --- a/test_cases/default/compute/whetstone_vm.yaml +++ b/test_cases/default/compute/whetstone_vm.yaml @@ -1,12 +1,12 @@ Scenario: benchmark: whetstone host: virtualmachine_1, virtualmachine_1 - server: + server: Context: Host_Machines: - - Virtual_Machines: + + Virtual_Machines: virtualmachine_1: availability_zone: compute1 public_network: 'net04_ext' @@ -19,7 +19,7 @@ Context: OS_image: QTIP_CentOS flavor: m1.large role: host - + Test_Description: Test_category: "Compute" diff --git a/test_cases/default/network/iperf_vm_2.yaml b/test_cases/default/network/iperf_vm_2.yaml index 90fd334d..c5b94715 100644 --- a/test_cases/default/network/iperf_vm_2.yaml +++ b/test_cases/default/network/iperf_vm_2.yaml @@ -5,7 +5,7 @@ Scenario: client: virtualmachine_2 description: 'Leave the bandwidth as 0 to throttle maximum traffic' benchmark_details: - duration: 20 + duration: 20 protocol: tcp bandwidthGbps: 0 @@ -19,7 +19,7 @@ Context: OS_image: QTIP_CentOS public_network: 'net04_ext' role: 1-server - flavor: m1.large + flavor: m1.large virtualmachine_2: availability_zone: compute2 @@ -27,7 +27,7 @@ Context: public_network: 'net04_ext' role: 2-host flavor: m1.large - + Test_Description: Test_category: "network" Benchmark: "iperf" diff --git a/test_cases/default/network/netperf.yaml b/test_cases/default/network/netperf.yaml index 267b288d..f4ce396b 100644 --- a/test_cases/default/network/netperf.yaml +++ b/test_cases/default/network/netperf.yaml @@ -4,7 +4,7 @@ Scenario: server : virtualmachine_1 client: virtualmachine_2 benchmark_details: - duration: 10 + duration: 10 teststream: udp_stream Context: @@ -17,7 +17,7 @@ Context: OS_image: QTIP_CentOS public_network: 'net04_ext' role: 1-server - flavor: m1.large + flavor: m1.large virtualmachine_2: availability_zone: compute2 @@ -25,7 +25,7 @@ Context: public_network: 'net04_ext' role: 2-host flavor: m1.large - + Test_Description: Test_category: "network" Benchmark: "netperf" diff --git a/test_cases/default/storage/fio_bm.yaml b/test_cases/default/storage/fio_bm.yaml index 4778c385..5c5309e7 100644 --- a/test_cases/default/storage/fio_bm.yaml +++ b/test_cases/default/storage/fio_bm.yaml @@ -27,7 +27,7 @@ Test_Description: The job conists of an fio load of: 1.50% rand read 50% rand write 2.Asynch engine - 3.Direct IO. + 3.Direct IO. 4.Queing depth of 2 if you wish to add another machine add the following information under the Host_Machines tag diff --git a/test_cases/default/storage/fio_vm.yaml b/test_cases/default/storage/fio_vm.yaml index dcd27252..5ae90d2c 100644 --- a/test_cases/default/storage/fio_vm.yaml +++ b/test_cases/default/storage/fio_vm.yaml @@ -5,7 +5,7 @@ Scenario: Context: Host_Machines: - + Virtual_Machines: virtualmachine_1: availability_zone: compute1 @@ -29,11 +29,11 @@ Test_Description: The job conists of an fio load of: 1.50% rand read 50% rand write 2.Asynch engine - 3.Direct IO. + 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: diff --git a/test_cases/dell-us-deploying-bm3/compute/dhrystone_bm.yaml b/test_cases/dell-us-deploying-bm3/compute/dhrystone_bm.yaml index 022cf5ee..4c1fc962 100644 --- a/test_cases/dell-us-deploying-bm3/compute/dhrystone_bm.yaml +++ b/test_cases/dell-us-deploying-bm3/compute/dhrystone_bm.yaml @@ -1,22 +1,22 @@ - + Scenario: benchmark: dhrystone host: machine_1, machine_2 - server: + server: Context: Host_Machines: machine_1: ip: 10.20.0.4 - pw: + pw: role: host machine_2: ip: 10.20.0.5 pw: role: host - Virtual_Machines: - + Virtual_Machines: + Test_Description: Test_category: "Compute" @@ -31,5 +31,5 @@ Test_Description: 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 index c14399b1..8f5a4165 100644 --- a/test_cases/dell-us-deploying-bm3/compute/dhrystone_vm.yaml +++ b/test_cases/dell-us-deploying-bm3/compute/dhrystone_vm.yaml @@ -6,7 +6,7 @@ Scenario: Context: Host_Machines: - Virtual_Machines: + Virtual_Machines: virtualmachine_1: availability_zone: compute1 public_network: 'net04_ext' @@ -19,7 +19,7 @@ Context: OS_image: QTIP_CentOS flavor: m1.large role: host - + Test_Description: Test_category: "Compute" Benchmark: "dhrystone" diff --git a/test_cases/dell-us-deploying-bm3/compute/dpi_bm.yaml b/test_cases/dell-us-deploying-bm3/compute/dpi_bm.yaml index f161aa3f..1bc534b3 100644 --- a/test_cases/dell-us-deploying-bm3/compute/dpi_bm.yaml +++ b/test_cases/dell-us-deploying-bm3/compute/dpi_bm.yaml @@ -31,4 +31,4 @@ Test_Description: 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 index 8a157e7a..10e86993 100644 --- a/test_cases/dell-us-deploying-bm3/compute/dpi_vm.yaml +++ b/test_cases/dell-us-deploying-bm3/compute/dpi_vm.yaml @@ -14,7 +14,7 @@ Context: role: 1Run flavor: m1.large virtualmachine_2: - availability_zone: compute4 + availability_zone: compute2 OS_image: QTIP_CentOS public_network: 'net04_ext' role: 1Run diff --git a/test_cases/dell-us-deploying-bm3/compute/ramspeed_bm.yaml b/test_cases/dell-us-deploying-bm3/compute/ramspeed_bm.yaml index 47b933b8..a63df3e2 100644 --- a/test_cases/dell-us-deploying-bm3/compute/ramspeed_bm.yaml +++ b/test_cases/dell-us-deploying-bm3/compute/ramspeed_bm.yaml @@ -1,22 +1,22 @@ - + Scenario: benchmark: ramspeed host: machine_1, machine_2 - server: + server: Context: Host_Machines: machine_1: ip: 10.20.0.4 - pw: + pw: role: host machine_2: ip: 10.20.0.5 pw: role: host - Virtual_Machines: - + Virtual_Machines: + Test_Description: Test_category: "Compute" @@ -31,5 +31,5 @@ Test_Description: OS_image: flavor: role: ''' - - + + diff --git a/test_cases/dell-us-deploying-bm3/compute/ramspeed_vm.yaml b/test_cases/dell-us-deploying-bm3/compute/ramspeed_vm.yaml index b79f4443..a6a4363f 100644 --- a/test_cases/dell-us-deploying-bm3/compute/ramspeed_vm.yaml +++ b/test_cases/dell-us-deploying-bm3/compute/ramspeed_vm.yaml @@ -6,7 +6,7 @@ Scenario: Context: Host_Machines: - Virtual_Machines: + Virtual_Machines: virtualmachine_1: availability_zone: compute1 public_network: 'net04_ext' @@ -19,7 +19,7 @@ Context: OS_image: QTIP_CentOS flavor: m1.large role: host - + Test_Description: Test_category: "Compute" Benchmark: "dhrystone" diff --git a/test_cases/dell-us-deploying-bm3/compute/ssl_bm.yaml b/test_cases/dell-us-deploying-bm3/compute/ssl_bm.yaml index bded6d2d..dc038822 100644 --- a/test_cases/dell-us-deploying-bm3/compute/ssl_bm.yaml +++ b/test_cases/dell-us-deploying-bm3/compute/ssl_bm.yaml @@ -6,14 +6,14 @@ Context: Host_Machines: machine_1: ip: 10.20.0.4 - pw: + pw: role: 1Run machine_2: ip: 10.20.0.5 pw: role: 1Run Virtual_Machines: - + Test_Description: Test_category: "Compute" @@ -28,4 +28,4 @@ Test_Description: 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 index cbacf088..37824896 100644 --- a/test_cases/dell-us-deploying-bm3/compute/ssl_vm.yaml +++ b/test_cases/dell-us-deploying-bm3/compute/ssl_vm.yaml @@ -5,7 +5,7 @@ Scenario: Context: Host_Machines: - Virtual_Machines: + Virtual_Machines: virtualmachine_1: availability_zone: compute1 public_network: 'net04_ext' @@ -33,4 +33,4 @@ Test_Description: 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 index 136ac2b0..180d4e51 100644 --- a/test_cases/dell-us-deploying-bm3/compute/whetstone_bm.yaml +++ b/test_cases/dell-us-deploying-bm3/compute/whetstone_bm.yaml @@ -1,4 +1,4 @@ - + Scenario: benchmark: whetstone host: machine_1, machine_2 @@ -8,15 +8,15 @@ Context: Host_Machines: machine_1: ip: 10.20.0.4 - pw: + pw: role: host machine_2: ip: 10.20.0.5 pw: role: host - Virtual_Machines: - - + Virtual_Machines: + + Test_Description: Test_category: "Compute" @@ -30,5 +30,5 @@ Test_Description: 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 index 17928fa1..0f1e8748 100644 --- a/test_cases/dell-us-deploying-bm3/compute/whetstone_vm.yaml +++ b/test_cases/dell-us-deploying-bm3/compute/whetstone_vm.yaml @@ -1,12 +1,12 @@ Scenario: benchmark: whetstone host: virtualmachine_1, virtualmachine_1 - server: + server: Context: Host_Machines: - - Virtual_Machines: + + Virtual_Machines: virtualmachine_1: availability_zone: compute1 public_network: 'net04_ext' @@ -19,7 +19,7 @@ Context: OS_image: QTIP_CentOS flavor: m1.large role: host - + Test_Description: Test_category: "Compute" diff --git a/test_cases/dell-us-deploying-bm3/network/iperf_bm.yaml b/test_cases/dell-us-deploying-bm3/network/iperf_bm.yaml index 3d2862bf..0a5be9af 100644 --- a/test_cases/dell-us-deploying-bm3/network/iperf_bm.yaml +++ b/test_cases/dell-us-deploying-bm3/network/iperf_bm.yaml @@ -20,7 +20,7 @@ Context: role: 2-host Virtual_Machines: - + Test_Description: Test_category: "network" Benchmark: "iperf" @@ -33,7 +33,7 @@ Test_Description: OS_image: QTIP_CentOS public_network: 'net04_ext' role: 1-server - flavor: m1.large + flavor: m1.large virtualmachine_2: availability_zone: compute2 @@ -41,7 +41,7 @@ Test_Description: public_network: 'net04_ext' role: 2-host flavor: m1.large - + machine_1: ip: pw: diff --git a/test_cases/dell-us-deploying-bm3/network/iperf_vm.yaml b/test_cases/dell-us-deploying-bm3/network/iperf_vm.yaml index 14d50890..d7079e99 100644 --- a/test_cases/dell-us-deploying-bm3/network/iperf_vm.yaml +++ b/test_cases/dell-us-deploying-bm3/network/iperf_vm.yaml @@ -5,7 +5,7 @@ Scenario: client: virtualmachine_2 description: 'Leave the bandwidth as 0 to throttle maximum traffic' benchmark_details: - duration: 20 + duration: 20 protocol: tcp bandwidthGbps: 0 @@ -19,7 +19,7 @@ Context: OS_image: QTIP_CentOS public_network: 'net04_ext' role: 1-server - flavor: m1.large + flavor: m1.large virtualmachine_2: availability_zone: compute1 @@ -27,7 +27,7 @@ Context: public_network: 'net04_ext' role: 2-host flavor: m1.large - + Test_Description: Test_category: "network" Benchmark: "iperf" diff --git a/test_cases/dell-us-deploying-bm3/network/iperf_vm_2.yaml b/test_cases/dell-us-deploying-bm3/network/iperf_vm_2.yaml index 90fd334d..c5b94715 100644 --- a/test_cases/dell-us-deploying-bm3/network/iperf_vm_2.yaml +++ b/test_cases/dell-us-deploying-bm3/network/iperf_vm_2.yaml @@ -5,7 +5,7 @@ Scenario: client: virtualmachine_2 description: 'Leave the bandwidth as 0 to throttle maximum traffic' benchmark_details: - duration: 20 + duration: 20 protocol: tcp bandwidthGbps: 0 @@ -19,7 +19,7 @@ Context: OS_image: QTIP_CentOS public_network: 'net04_ext' role: 1-server - flavor: m1.large + flavor: m1.large virtualmachine_2: availability_zone: compute2 @@ -27,7 +27,7 @@ Context: public_network: 'net04_ext' role: 2-host flavor: m1.large - + Test_Description: Test_category: "network" Benchmark: "iperf" diff --git a/test_cases/dell-us-deploying-bm3/network/netperf.yaml b/test_cases/dell-us-deploying-bm3/network/netperf.yaml index 267b288d..f4ce396b 100644 --- a/test_cases/dell-us-deploying-bm3/network/netperf.yaml +++ b/test_cases/dell-us-deploying-bm3/network/netperf.yaml @@ -4,7 +4,7 @@ Scenario: server : virtualmachine_1 client: virtualmachine_2 benchmark_details: - duration: 10 + duration: 10 teststream: udp_stream Context: @@ -17,7 +17,7 @@ Context: OS_image: QTIP_CentOS public_network: 'net04_ext' role: 1-server - flavor: m1.large + flavor: m1.large virtualmachine_2: availability_zone: compute2 @@ -25,7 +25,7 @@ Context: public_network: 'net04_ext' role: 2-host flavor: m1.large - + Test_Description: Test_category: "network" Benchmark: "netperf" diff --git a/test_cases/dell-us-deploying-bm3/storage/fio_bm.yaml b/test_cases/dell-us-deploying-bm3/storage/fio_bm.yaml index 4778c385..5c5309e7 100644 --- a/test_cases/dell-us-deploying-bm3/storage/fio_bm.yaml +++ b/test_cases/dell-us-deploying-bm3/storage/fio_bm.yaml @@ -27,7 +27,7 @@ Test_Description: The job conists of an fio load of: 1.50% rand read 50% rand write 2.Asynch engine - 3.Direct IO. + 3.Direct IO. 4.Queing depth of 2 if you wish to add another machine add the following information under the Host_Machines tag diff --git a/test_cases/dell-us-deploying-bm3/storage/fio_vm.yaml b/test_cases/dell-us-deploying-bm3/storage/fio_vm.yaml index dcd27252..5ae90d2c 100644 --- a/test_cases/dell-us-deploying-bm3/storage/fio_vm.yaml +++ b/test_cases/dell-us-deploying-bm3/storage/fio_vm.yaml @@ -5,7 +5,7 @@ Scenario: Context: Host_Machines: - + Virtual_Machines: virtualmachine_1: availability_zone: compute1 @@ -29,11 +29,11 @@ Test_Description: The job conists of an fio load of: 1.50% rand read 50% rand write 2.Asynch engine - 3.Direct IO. + 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: diff --git a/test_cases/dell-us-testing-bm-1/compute/dhrystone_bm.yaml b/test_cases/dell-us-testing-bm-1/compute/dhrystone_bm.yaml index ffe7b7ff..6824a6d3 100644 --- a/test_cases/dell-us-testing-bm-1/compute/dhrystone_bm.yaml +++ b/test_cases/dell-us-testing-bm-1/compute/dhrystone_bm.yaml @@ -1,22 +1,22 @@ - + Scenario: benchmark: dhrystone host: machine_1, machine_2 - server: + server: Context: Host_Machines: machine_1: ip: 10.20.0.6 - pw: + pw: role: host machine_2: ip: 10.20.0.5 pw: role: host - Virtual_Machines: - + Virtual_Machines: + Test_Description: Test_category: "Compute" @@ -31,5 +31,5 @@ Test_Description: OS_image: flavor: role: ''' - - + + diff --git a/test_cases/dell-us-testing-bm-1/compute/dhrystone_vm.yaml b/test_cases/dell-us-testing-bm-1/compute/dhrystone_vm.yaml index c14399b1..8f5a4165 100644 --- a/test_cases/dell-us-testing-bm-1/compute/dhrystone_vm.yaml +++ b/test_cases/dell-us-testing-bm-1/compute/dhrystone_vm.yaml @@ -6,7 +6,7 @@ Scenario: Context: Host_Machines: - Virtual_Machines: + Virtual_Machines: virtualmachine_1: availability_zone: compute1 public_network: 'net04_ext' @@ -19,7 +19,7 @@ Context: OS_image: QTIP_CentOS flavor: m1.large role: host - + Test_Description: Test_category: "Compute" Benchmark: "dhrystone" diff --git a/test_cases/dell-us-testing-bm-1/compute/dpi_bm.yaml b/test_cases/dell-us-testing-bm-1/compute/dpi_bm.yaml index 810224bc..6de46387 100644 --- a/test_cases/dell-us-testing-bm-1/compute/dpi_bm.yaml +++ b/test_cases/dell-us-testing-bm-1/compute/dpi_bm.yaml @@ -6,11 +6,11 @@ Context: Host_Machines: machine_1: ip: 10.20.0.6 - pw: + pw: role: 1host machine_2: ip: 10.20.0.5 - pw: + pw: role: 1host Virtual_Machines: Test_Description: @@ -31,4 +31,4 @@ Test_Description: pw: role: ''' - + diff --git a/test_cases/dell-us-testing-bm-1/compute/ramspeed_bm.yaml b/test_cases/dell-us-testing-bm-1/compute/ramspeed_bm.yaml index a8d2cbfe..ce6d8921 100644 --- a/test_cases/dell-us-testing-bm-1/compute/ramspeed_bm.yaml +++ b/test_cases/dell-us-testing-bm-1/compute/ramspeed_bm.yaml @@ -1,22 +1,22 @@ - + Scenario: benchmark: ramspeed host: machine_1, machine_2 - server: + server: Context: Host_Machines: machine_1: ip: 10.20.0.6 - pw: + pw: role: host machine_2: ip: 10.20.0.5 pw: role: host - Virtual_Machines: - + Virtual_Machines: + Test_Description: Test_category: "Compute" @@ -31,5 +31,5 @@ Test_Description: OS_image: flavor: role: ''' - - + + diff --git a/test_cases/dell-us-testing-bm-1/compute/ramspeed_vm.yaml b/test_cases/dell-us-testing-bm-1/compute/ramspeed_vm.yaml index b79f4443..a6a4363f 100644 --- a/test_cases/dell-us-testing-bm-1/compute/ramspeed_vm.yaml +++ b/test_cases/dell-us-testing-bm-1/compute/ramspeed_vm.yaml @@ -6,7 +6,7 @@ Scenario: Context: Host_Machines: - Virtual_Machines: + Virtual_Machines: virtualmachine_1: availability_zone: compute1 public_network: 'net04_ext' @@ -19,7 +19,7 @@ Context: OS_image: QTIP_CentOS flavor: m1.large role: host - + Test_Description: Test_category: "Compute" Benchmark: "dhrystone" diff --git a/test_cases/dell-us-testing-bm-1/compute/ssl_bm.yaml b/test_cases/dell-us-testing-bm-1/compute/ssl_bm.yaml index 50c2f622..e3f336b3 100644 --- a/test_cases/dell-us-testing-bm-1/compute/ssl_bm.yaml +++ b/test_cases/dell-us-testing-bm-1/compute/ssl_bm.yaml @@ -6,14 +6,14 @@ Context: Host_Machines: machine_1: ip: 10.20.0.6 - pw: + pw: role: 1Run machine_2: ip: 10.20.0.5 pw: role: 1Run Virtual_Machines: - + Test_Description: Test_category: "Compute" @@ -28,4 +28,4 @@ Test_Description: OS_image: flavor: role: - ''' + ''' diff --git a/test_cases/dell-us-testing-bm-1/compute/ssl_vm.yaml b/test_cases/dell-us-testing-bm-1/compute/ssl_vm.yaml index cbacf088..37824896 100644 --- a/test_cases/dell-us-testing-bm-1/compute/ssl_vm.yaml +++ b/test_cases/dell-us-testing-bm-1/compute/ssl_vm.yaml @@ -5,7 +5,7 @@ Scenario: Context: Host_Machines: - Virtual_Machines: + Virtual_Machines: virtualmachine_1: availability_zone: compute1 public_network: 'net04_ext' @@ -33,4 +33,4 @@ Test_Description: OS_image: flavor: role: - ''' + ''' diff --git a/test_cases/dell-us-testing-bm-1/compute/whetstone_bm.yaml b/test_cases/dell-us-testing-bm-1/compute/whetstone_bm.yaml index d4d2b244..d75dee64 100644 --- a/test_cases/dell-us-testing-bm-1/compute/whetstone_bm.yaml +++ b/test_cases/dell-us-testing-bm-1/compute/whetstone_bm.yaml @@ -1,4 +1,4 @@ - + Scenario: benchmark: whetstone host: machine_1, machine_2 @@ -8,15 +8,15 @@ Context: Host_Machines: machine_1: ip: 10.20.0.6 - pw: + pw: role: host machine_2: ip: 10.20.0.5 pw: role: host - Virtual_Machines: - - + Virtual_Machines: + + Test_Description: Test_category: "Compute" @@ -30,5 +30,5 @@ Test_Description: pw: role: ''' - - + + diff --git a/test_cases/dell-us-testing-bm-1/compute/whetstone_vm.yaml b/test_cases/dell-us-testing-bm-1/compute/whetstone_vm.yaml index 17928fa1..0f1e8748 100644 --- a/test_cases/dell-us-testing-bm-1/compute/whetstone_vm.yaml +++ b/test_cases/dell-us-testing-bm-1/compute/whetstone_vm.yaml @@ -1,12 +1,12 @@ Scenario: benchmark: whetstone host: virtualmachine_1, virtualmachine_1 - server: + server: Context: Host_Machines: - - Virtual_Machines: + + Virtual_Machines: virtualmachine_1: availability_zone: compute1 public_network: 'net04_ext' @@ -19,7 +19,7 @@ Context: OS_image: QTIP_CentOS flavor: m1.large role: host - + Test_Description: Test_category: "Compute" diff --git a/test_cases/dell-us-testing-bm-1/network/iperf_bm.yaml b/test_cases/dell-us-testing-bm-1/network/iperf_bm.yaml index 4fd3d7f5..6f0cf3b7 100644 --- a/test_cases/dell-us-testing-bm-1/network/iperf_bm.yaml +++ b/test_cases/dell-us-testing-bm-1/network/iperf_bm.yaml @@ -20,7 +20,7 @@ Context: role: 2-host Virtual_Machines: - + Test_Description: Test_category: "network" Benchmark: "iperf" @@ -33,7 +33,7 @@ Test_Description: OS_image: QTIP_CentOS public_network: 'net04_ext' role: 1-server - flavor: m1.large + flavor: m1.large virtualmachine_2: availability_zone: compute2 @@ -41,7 +41,7 @@ Test_Description: public_network: 'net04_ext' role: 2-host flavor: m1.large - + machine_1: ip: pw: diff --git a/test_cases/dell-us-testing-bm-1/network/iperf_vm.yaml b/test_cases/dell-us-testing-bm-1/network/iperf_vm.yaml index 14d50890..d7079e99 100644 --- a/test_cases/dell-us-testing-bm-1/network/iperf_vm.yaml +++ b/test_cases/dell-us-testing-bm-1/network/iperf_vm.yaml @@ -5,7 +5,7 @@ Scenario: client: virtualmachine_2 description: 'Leave the bandwidth as 0 to throttle maximum traffic' benchmark_details: - duration: 20 + duration: 20 protocol: tcp bandwidthGbps: 0 @@ -19,7 +19,7 @@ Context: OS_image: QTIP_CentOS public_network: 'net04_ext' role: 1-server - flavor: m1.large + flavor: m1.large virtualmachine_2: availability_zone: compute1 @@ -27,7 +27,7 @@ Context: public_network: 'net04_ext' role: 2-host flavor: m1.large - + Test_Description: Test_category: "network" Benchmark: "iperf" diff --git a/test_cases/dell-us-testing-bm-1/network/iperf_vm_2.yaml b/test_cases/dell-us-testing-bm-1/network/iperf_vm_2.yaml index 90fd334d..c5b94715 100644 --- a/test_cases/dell-us-testing-bm-1/network/iperf_vm_2.yaml +++ b/test_cases/dell-us-testing-bm-1/network/iperf_vm_2.yaml @@ -5,7 +5,7 @@ Scenario: client: virtualmachine_2 description: 'Leave the bandwidth as 0 to throttle maximum traffic' benchmark_details: - duration: 20 + duration: 20 protocol: tcp bandwidthGbps: 0 @@ -19,7 +19,7 @@ Context: OS_image: QTIP_CentOS public_network: 'net04_ext' role: 1-server - flavor: m1.large + flavor: m1.large virtualmachine_2: availability_zone: compute2 @@ -27,7 +27,7 @@ Context: public_network: 'net04_ext' role: 2-host flavor: m1.large - + Test_Description: Test_category: "network" Benchmark: "iperf" diff --git a/test_cases/dell-us-testing-bm-1/network/netperf.yaml b/test_cases/dell-us-testing-bm-1/network/netperf.yaml index 267b288d..f4ce396b 100644 --- a/test_cases/dell-us-testing-bm-1/network/netperf.yaml +++ b/test_cases/dell-us-testing-bm-1/network/netperf.yaml @@ -4,7 +4,7 @@ Scenario: server : virtualmachine_1 client: virtualmachine_2 benchmark_details: - duration: 10 + duration: 10 teststream: udp_stream Context: @@ -17,7 +17,7 @@ Context: OS_image: QTIP_CentOS public_network: 'net04_ext' role: 1-server - flavor: m1.large + flavor: m1.large virtualmachine_2: availability_zone: compute2 @@ -25,7 +25,7 @@ Context: public_network: 'net04_ext' role: 2-host flavor: m1.large - + Test_Description: Test_category: "network" Benchmark: "netperf" diff --git a/test_cases/dell-us-testing-bm-1/storage/fio_bm.yaml b/test_cases/dell-us-testing-bm-1/storage/fio_bm.yaml index 4b78f084..3346e398 100644 --- a/test_cases/dell-us-testing-bm-1/storage/fio_bm.yaml +++ b/test_cases/dell-us-testing-bm-1/storage/fio_bm.yaml @@ -7,11 +7,11 @@ Context: Host_Machines: machine_1: ip: 10.20.0.7 - pw: + pw: role: host machine_2: ip: 10.20.0.6 - pw: + pw: role: host @@ -27,7 +27,7 @@ Test_Description: The job conists of an fio load of: 1.50% rand read 50% rand write 2.Asynch engine - 3.Direct IO. + 3.Direct IO. 4.Queing depth of 2 if you wish to add another machine add the following information under the Host_Machines tag diff --git a/test_cases/dell-us-testing-bm-1/storage/fio_vm.yaml b/test_cases/dell-us-testing-bm-1/storage/fio_vm.yaml index dcd27252..5ae90d2c 100644 --- a/test_cases/dell-us-testing-bm-1/storage/fio_vm.yaml +++ b/test_cases/dell-us-testing-bm-1/storage/fio_vm.yaml @@ -5,7 +5,7 @@ Scenario: Context: Host_Machines: - + Virtual_Machines: virtualmachine_1: availability_zone: compute1 @@ -29,11 +29,11 @@ Test_Description: The job conists of an fio load of: 1.50% rand read 50% rand write 2.Asynch engine - 3.Direct IO. + 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: -- cgit 1.2.3-korg