diff options
author | Nauman_Ahad <Nauman_Ahad@dell.com> | 2016-01-11 16:23:29 +0500 |
---|---|---|
committer | Nauman_Ahad <Nauman_Ahad@dell.com> | 2016-01-11 16:23:29 +0500 |
commit | ffa0be2adf6e9e44e2317f89dd5832aff96772ad (patch) | |
tree | 835cd20c4ad958c7a8b5cb6f9c46b15eab96831c /test_cases | |
parent | 3c194a8bf95ab68d440b68587ba7f36a921116de (diff) |
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 <Nauman_Ahad@dell.com>
Diffstat (limited to 'test_cases')
-rw-r--r-- | test_cases/default/compute/.whetstone_serial.yaml.swp | bin | 12288 -> 0 bytes | |||
-rw-r--r-- | test_cases/default/compute/dhrystone_bm.yaml (renamed from test_cases/dell-us-deploying-bm-3/compute/dhrystone_bm.yaml) | 0 | ||||
-rw-r--r-- | test_cases/default/compute/dhrystone_vm.yaml (renamed from test_cases/dell-us-deploying-bm-3/compute/dhrystone_vm.yaml) | 0 | ||||
-rw-r--r-- | test_cases/default/compute/dpi_bm.yaml (renamed from test_cases/dell-us-deploying-bm-3/compute/dpi_bm.yaml) | 0 | ||||
-rw-r--r-- | test_cases/default/compute/dpi_vm.yaml (renamed from test_cases/dell-us-deploying-bm-3/compute/dpi_vm.yaml) | 0 | ||||
-rw-r--r-- | test_cases/default/compute/ramspeed_bm.yaml (renamed from test_cases/default/compute/whetstone_serial.yaml) | 26 | ||||
-rw-r--r-- | test_cases/default/compute/ssl_bm.yaml (renamed from test_cases/dell-us-deploying-bm-3/compute/ssl_bm.yaml) | 0 | ||||
-rw-r--r-- | test_cases/default/compute/ssl_serial.yaml | 33 | ||||
-rw-r--r-- | test_cases/default/compute/ssl_vm.yaml (renamed from test_cases/dell-us-deploying-bm-3/compute/ssl_vm.yaml) | 0 | ||||
-rw-r--r-- | test_cases/default/compute/whetstone_bm.yaml (renamed from test_cases/dell-us-deploying-bm-3/compute/whetstone_bm.yaml) | 0 | ||||
-rw-r--r-- | test_cases/default/compute/whetstone_vm.yaml (renamed from test_cases/dell-us-deploying-bm-3/compute/whetstone_vm.yaml) | 0 | ||||
-rw-r--r-- | test_cases/default/storage/fio_bm.yaml (renamed from test_cases/dell-us-deploying-bm-3/storage/fio_bm.yaml) | 0 | ||||
-rw-r--r-- | test_cases/dell-us-deploying-bm3/compute/dhrystone_bm.yaml (renamed from test_cases/default/compute/dhrystone_serial.yaml) | 20 | ||||
-rw-r--r-- | test_cases/dell-us-deploying-bm3/compute/dhrystone_vm.yaml (renamed from test_cases/default/compute/dhrystone_parallel.yaml) | 2 | ||||
-rw-r--r-- | test_cases/dell-us-deploying-bm3/compute/dpi_bm.yaml (renamed from test_cases/default/compute/dpi_serial.yaml) | 15 | ||||
-rw-r--r-- | test_cases/dell-us-deploying-bm3/compute/dpi_vm.yaml (renamed from test_cases/default/compute/dpi_parallel.yaml) | 1 | ||||
-rw-r--r-- | test_cases/dell-us-deploying-bm3/compute/ssl_bm.yaml | 31 | ||||
-rw-r--r-- | test_cases/dell-us-deploying-bm3/compute/ssl_vm.yaml (renamed from test_cases/default/compute/ssl_parallel.yaml) | 3 | ||||
-rw-r--r-- | test_cases/dell-us-deploying-bm3/compute/whetstone_bm.yaml | 34 | ||||
-rw-r--r-- | test_cases/dell-us-deploying-bm3/compute/whetstone_vm.yaml (renamed from test_cases/default/compute/whetstone_parallel.yaml) | 19 | ||||
-rw-r--r-- | test_cases/dell-us-deploying-bm3/network/iperf_topology_1.yaml (renamed from test_cases/dell-us-deploying-bm-3/network/iperf_topology_1.yaml) | 0 | ||||
-rw-r--r-- | test_cases/dell-us-deploying-bm3/network/iperf_topology_2.yaml (renamed from test_cases/dell-us-deploying-bm-3/network/iperf_topology_2.yaml) | 0 | ||||
-rw-r--r-- | test_cases/dell-us-deploying-bm3/network/iperf_topology_3.yaml (renamed from test_cases/dell-us-deploying-bm-3/network/iperf_topology_3.yaml) | 0 | ||||
-rw-r--r-- | test_cases/dell-us-deploying-bm3/network/netperf.yaml (renamed from test_cases/dell-us-deploying-bm-3/network/netperf.yaml) | 0 | ||||
-rw-r--r-- | test_cases/dell-us-deploying-bm3/network/pktgen.yaml (renamed from test_cases/dell-us-deploying-bm-3/network/pktgen.yaml) | 0 | ||||
-rw-r--r-- | test_cases/dell-us-deploying-bm3/storage/fio_bm.yaml (renamed from test_cases/default/storage/fio_baremetal.yaml) | 0 | ||||
-rw-r--r-- | test_cases/dell-us-deploying-bm3/storage/fio_vm.yaml (renamed from test_cases/dell-us-deploying-bm-3/storage/fio_vm.yaml) | 0 |
27 files changed, 106 insertions, 78 deletions
diff --git a/test_cases/default/compute/.whetstone_serial.yaml.swp b/test_cases/default/compute/.whetstone_serial.yaml.swp Binary files differdeleted file mode 100644 index bbfd3be2..00000000 --- a/test_cases/default/compute/.whetstone_serial.yaml.swp +++ /dev/null diff --git a/test_cases/dell-us-deploying-bm-3/compute/dhrystone_bm.yaml b/test_cases/default/compute/dhrystone_bm.yaml index 022cf5ee..022cf5ee 100644 --- a/test_cases/dell-us-deploying-bm-3/compute/dhrystone_bm.yaml +++ b/test_cases/default/compute/dhrystone_bm.yaml diff --git a/test_cases/dell-us-deploying-bm-3/compute/dhrystone_vm.yaml b/test_cases/default/compute/dhrystone_vm.yaml index c14399b1..c14399b1 100644 --- a/test_cases/dell-us-deploying-bm-3/compute/dhrystone_vm.yaml +++ b/test_cases/default/compute/dhrystone_vm.yaml diff --git a/test_cases/dell-us-deploying-bm-3/compute/dpi_bm.yaml b/test_cases/default/compute/dpi_bm.yaml index f161aa3f..f161aa3f 100644 --- a/test_cases/dell-us-deploying-bm-3/compute/dpi_bm.yaml +++ b/test_cases/default/compute/dpi_bm.yaml diff --git a/test_cases/dell-us-deploying-bm-3/compute/dpi_vm.yaml b/test_cases/default/compute/dpi_vm.yaml index 8a157e7a..8a157e7a 100644 --- a/test_cases/dell-us-deploying-bm-3/compute/dpi_vm.yaml +++ b/test_cases/default/compute/dpi_vm.yaml diff --git a/test_cases/default/compute/whetstone_serial.yaml b/test_cases/default/compute/ramspeed_bm.yaml index 25cefbf8..47b933b8 100644 --- a/test_cases/default/compute/whetstone_serial.yaml +++ b/test_cases/default/compute/ramspeed_bm.yaml @@ -1,28 +1,28 @@ Scenario: - benchmark: whetstone - host: machine_1, - server: virtualmachine_1 + benchmark: ramspeed + host: machine_1, machine_2 + server: Context: Host_Machines: machine_1: - ip: 172.18.0.16 - pw: Op3nStack + ip: 10.20.0.4 + pw: role: host + machine_2: + ip: 10.20.0.5 + pw: + 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" + Benchmark: "dhrystone" Overview: > - ''' This test will run the whetstone benchmark in serial on machine_1 and machine_2.\n + ''' 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: diff --git a/test_cases/dell-us-deploying-bm-3/compute/ssl_bm.yaml b/test_cases/default/compute/ssl_bm.yaml index bded6d2d..bded6d2d 100644 --- a/test_cases/dell-us-deploying-bm-3/compute/ssl_bm.yaml +++ b/test_cases/default/compute/ssl_bm.yaml 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/dell-us-deploying-bm-3/compute/ssl_vm.yaml b/test_cases/default/compute/ssl_vm.yaml index cbacf088..cbacf088 100644 --- a/test_cases/dell-us-deploying-bm-3/compute/ssl_vm.yaml +++ b/test_cases/default/compute/ssl_vm.yaml diff --git a/test_cases/dell-us-deploying-bm-3/compute/whetstone_bm.yaml b/test_cases/default/compute/whetstone_bm.yaml index 136ac2b0..136ac2b0 100644 --- a/test_cases/dell-us-deploying-bm-3/compute/whetstone_bm.yaml +++ b/test_cases/default/compute/whetstone_bm.yaml diff --git a/test_cases/dell-us-deploying-bm-3/compute/whetstone_vm.yaml b/test_cases/default/compute/whetstone_vm.yaml index 17928fa1..17928fa1 100644 --- a/test_cases/dell-us-deploying-bm-3/compute/whetstone_vm.yaml +++ b/test_cases/default/compute/whetstone_vm.yaml diff --git a/test_cases/dell-us-deploying-bm-3/storage/fio_bm.yaml b/test_cases/default/storage/fio_bm.yaml index 4778c385..4778c385 100644 --- a/test_cases/dell-us-deploying-bm-3/storage/fio_bm.yaml +++ b/test_cases/default/storage/fio_bm.yaml diff --git a/test_cases/default/compute/dhrystone_serial.yaml b/test_cases/dell-us-deploying-bm3/compute/dhrystone_bm.yaml index e15e8ecc..022cf5ee 100644 --- a/test_cases/default/compute/dhrystone_serial.yaml +++ b/test_cases/dell-us-deploying-bm3/compute/dhrystone_bm.yaml @@ -1,28 +1,28 @@ Scenario: benchmark: dhrystone - host: machine_1, machine_2, virtualmachine_1 + host: machine_1, machine_2 server: Context: Host_Machines: machine_1: - ip: 172.18.0.16 - pw: Op3nStack + ip: 10.20.0.4 + pw: role: host + machine_2: + ip: 10.20.0.5 + pw: + 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 + ''' 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: diff --git a/test_cases/default/compute/dhrystone_parallel.yaml b/test_cases/dell-us-deploying-bm3/compute/dhrystone_vm.yaml index 29de6d6f..c14399b1 100644 --- a/test_cases/default/compute/dhrystone_parallel.yaml +++ b/test_cases/dell-us-deploying-bm3/compute/dhrystone_vm.yaml @@ -1,6 +1,6 @@ Scenario: benchmark: dhrystone - host: machine_1, machine_2 + host: virtualmachine_1, virtualmachine_2 server: blakc Context: diff --git a/test_cases/default/compute/dpi_serial.yaml b/test_cases/dell-us-deploying-bm3/compute/dpi_bm.yaml index b39597a2..f161aa3f 100644 --- a/test_cases/default/compute/dpi_serial.yaml +++ b/test_cases/dell-us-deploying-bm3/compute/dpi_bm.yaml @@ -1,18 +1,17 @@ Scenario: benchmark: dpi - host: virtualmachine_1 - server: virtualmachine_2 + host: machine_1,machine_2 Context: Host_Machines: machine_1: - ip: 172.18.0.17 - pw: Op3nStack - role: 1host + ip: 10.20.0.4 + pw: Op3nStack + role: 1host machine_2: - ip: 172.18.0.16 - pw: Op3nStack - role: 1host + ip: 10.20.0.5 + pw: Op3nStack + role: 1host Virtual_Machines: Test_Description: Test_category: "Compute" diff --git a/test_cases/default/compute/dpi_parallel.yaml b/test_cases/dell-us-deploying-bm3/compute/dpi_vm.yaml index 0f6afdce..8a157e7a 100644 --- a/test_cases/default/compute/dpi_parallel.yaml +++ b/test_cases/dell-us-deploying-bm3/compute/dpi_vm.yaml @@ -1,7 +1,6 @@ Scenario: benchmark: dpi 1Run : virtualmachine_1, virtualmachine_2 - 2Run: Context: Host_Machines: 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/default/compute/ssl_parallel.yaml b/test_cases/dell-us-deploying-bm3/compute/ssl_vm.yaml index eb46d8d8..cbacf088 100644 --- a/test_cases/default/compute/ssl_parallel.yaml +++ b/test_cases/dell-us-deploying-bm3/compute/ssl_vm.yaml @@ -1,7 +1,6 @@ Scenario: benchmark: ssl - host: machine_1, machine_2 - server: + host: virtualmachine_1, virtualmachine_2 Context: Host_Machines: 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/default/compute/whetstone_parallel.yaml b/test_cases/dell-us-deploying-bm3/compute/whetstone_vm.yaml index 48bc7230..17928fa1 100644 --- a/test_cases/default/compute/whetstone_parallel.yaml +++ b/test_cases/dell-us-deploying-bm3/compute/whetstone_vm.yaml @@ -1,19 +1,11 @@ Scenario: benchmark: whetstone - host: machine_1, virtualmachine_1 + host: virtualmachine_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 @@ -21,6 +13,13 @@ Context: 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" diff --git a/test_cases/dell-us-deploying-bm-3/network/iperf_topology_1.yaml b/test_cases/dell-us-deploying-bm3/network/iperf_topology_1.yaml index 18eba8ac..18eba8ac 100644 --- a/test_cases/dell-us-deploying-bm-3/network/iperf_topology_1.yaml +++ b/test_cases/dell-us-deploying-bm3/network/iperf_topology_1.yaml diff --git a/test_cases/dell-us-deploying-bm-3/network/iperf_topology_2.yaml b/test_cases/dell-us-deploying-bm3/network/iperf_topology_2.yaml index 301a9916..301a9916 100644 --- a/test_cases/dell-us-deploying-bm-3/network/iperf_topology_2.yaml +++ b/test_cases/dell-us-deploying-bm3/network/iperf_topology_2.yaml diff --git a/test_cases/dell-us-deploying-bm-3/network/iperf_topology_3.yaml b/test_cases/dell-us-deploying-bm3/network/iperf_topology_3.yaml index 9e7b73e7..9e7b73e7 100644 --- a/test_cases/dell-us-deploying-bm-3/network/iperf_topology_3.yaml +++ b/test_cases/dell-us-deploying-bm3/network/iperf_topology_3.yaml diff --git a/test_cases/dell-us-deploying-bm-3/network/netperf.yaml b/test_cases/dell-us-deploying-bm3/network/netperf.yaml index 267b288d..267b288d 100644 --- a/test_cases/dell-us-deploying-bm-3/network/netperf.yaml +++ b/test_cases/dell-us-deploying-bm3/network/netperf.yaml diff --git a/test_cases/dell-us-deploying-bm-3/network/pktgen.yaml b/test_cases/dell-us-deploying-bm3/network/pktgen.yaml index 13fae68f..13fae68f 100644 --- a/test_cases/dell-us-deploying-bm-3/network/pktgen.yaml +++ b/test_cases/dell-us-deploying-bm3/network/pktgen.yaml diff --git a/test_cases/default/storage/fio_baremetal.yaml b/test_cases/dell-us-deploying-bm3/storage/fio_bm.yaml index 4778c385..4778c385 100644 --- a/test_cases/default/storage/fio_baremetal.yaml +++ b/test_cases/dell-us-deploying-bm3/storage/fio_bm.yaml diff --git a/test_cases/dell-us-deploying-bm-3/storage/fio_vm.yaml b/test_cases/dell-us-deploying-bm3/storage/fio_vm.yaml index dcd27252..dcd27252 100644 --- a/test_cases/dell-us-deploying-bm-3/storage/fio_vm.yaml +++ b/test_cases/dell-us-deploying-bm3/storage/fio_vm.yaml |