From dfcb6c6d9d67041c36d2901d27b7b4d1111f4952 Mon Sep 17 00:00:00 2001 From: "wu.zhihui" Date: Sun, 9 Oct 2016 09:34:31 +0800 Subject: remove test_cases/zte-pod1 Now zte pods run test cases under test_cases/default instead of test_cases/zte-pod1. So remove it. Change-Id: Ie8731347185f455029defeb4c67a6761e4f74939 Signed-off-by: wu.zhihui --- test_cases/zte-pod1/compute/dhrystone_bm.yaml | 33 ------------------ test_cases/zte-pod1/compute/dhrystone_vm.yaml | 45 ------------------------ test_cases/zte-pod1/compute/dpi_bm.yaml | 36 ------------------- test_cases/zte-pod1/compute/dpi_vm.yaml | 35 ------------------- test_cases/zte-pod1/compute/ramspeed_bm.yaml | 36 ------------------- test_cases/zte-pod1/compute/ramspeed_vm.yaml | 46 ------------------------ test_cases/zte-pod1/compute/ssl_bm.yaml | 30 ---------------- test_cases/zte-pod1/compute/ssl_vm.yaml | 36 ------------------- test_cases/zte-pod1/compute/whetstone_bm.yaml | 32 ----------------- test_cases/zte-pod1/compute/whetstone_vm.yaml | 44 ----------------------- test_cases/zte-pod1/network/iperf_bm.yaml | 50 --------------------------- test_cases/zte-pod1/network/iperf_vm.yaml | 43 ----------------------- test_cases/zte-pod1/network/iperf_vm_2.yaml | 45 ------------------------ test_cases/zte-pod1/storage/fio_bm.yaml | 40 --------------------- test_cases/zte-pod1/storage/fio_vm.yaml | 45 ------------------------ 15 files changed, 596 deletions(-) delete mode 100644 test_cases/zte-pod1/compute/dhrystone_bm.yaml delete mode 100644 test_cases/zte-pod1/compute/dhrystone_vm.yaml delete mode 100644 test_cases/zte-pod1/compute/dpi_bm.yaml delete mode 100644 test_cases/zte-pod1/compute/dpi_vm.yaml delete mode 100644 test_cases/zte-pod1/compute/ramspeed_bm.yaml delete mode 100644 test_cases/zte-pod1/compute/ramspeed_vm.yaml delete mode 100644 test_cases/zte-pod1/compute/ssl_bm.yaml delete mode 100644 test_cases/zte-pod1/compute/ssl_vm.yaml delete mode 100644 test_cases/zte-pod1/compute/whetstone_bm.yaml delete mode 100644 test_cases/zte-pod1/compute/whetstone_vm.yaml delete mode 100644 test_cases/zte-pod1/network/iperf_bm.yaml delete mode 100644 test_cases/zte-pod1/network/iperf_vm.yaml delete mode 100644 test_cases/zte-pod1/network/iperf_vm_2.yaml delete mode 100644 test_cases/zte-pod1/storage/fio_bm.yaml delete mode 100644 test_cases/zte-pod1/storage/fio_vm.yaml diff --git a/test_cases/zte-pod1/compute/dhrystone_bm.yaml b/test_cases/zte-pod1/compute/dhrystone_bm.yaml deleted file mode 100644 index 15a40d42..00000000 --- a/test_cases/zte-pod1/compute/dhrystone_bm.yaml +++ /dev/null @@ -1,33 +0,0 @@ - -Scenario: - benchmark: dhrystone - host: machine_1, machine_2 - server: - -Context: - Host_Machines: - machine_1: - ip: 10.20.0.23 - pw: - role: host - machine_2: - ip: 10.20.0.24 - 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/zte-pod1/compute/dhrystone_vm.yaml b/test_cases/zte-pod1/compute/dhrystone_vm.yaml deleted file mode 100644 index 9e3f2113..00000000 --- a/test_cases/zte-pod1/compute/dhrystone_vm.yaml +++ /dev/null @@ -1,45 +0,0 @@ -Scenario: - benchmark: dhrystone - host: virtualmachine_1, virtualmachine_2 - server: blakc - -Context: - Host_Machines: - - Virtual_Machines: - virtualmachine_1: - availability_zone: compute1 - public_network: 'admin-floating_net' - OS_image: QTIP_CentOS - flavor: m1.large - role: host - virtualmachine_2: - availability_zone: compute2 - public_network: 'admin-floating_net' - 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/zte-pod1/compute/dpi_bm.yaml b/test_cases/zte-pod1/compute/dpi_bm.yaml deleted file mode 100644 index 940307c3..00000000 --- a/test_cases/zte-pod1/compute/dpi_bm.yaml +++ /dev/null @@ -1,36 +0,0 @@ -Scenario: - benchmark: dpi - host: machine_1,machine_2 - -Context: - Host_Machines: - machine_1: - ip: 10.20.0.23 - pw: - role: host - machine_2: - ip: 10.20.0.24 - pw: - role: host - 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/zte-pod1/compute/dpi_vm.yaml b/test_cases/zte-pod1/compute/dpi_vm.yaml deleted file mode 100644 index e61bf79f..00000000 --- a/test_cases/zte-pod1/compute/dpi_vm.yaml +++ /dev/null @@ -1,35 +0,0 @@ -Scenario: - benchmark: dpi - 1Run : virtualmachine_1, virtualmachine_2 - -Context: - Host_Machines: - - - Virtual_Machines: - virtualmachine_1: - availability_zone: compute1 - OS_image: QTIP_CentOS - public_network: 'admin-floating_net' - role: 1Run - flavor: m1.large - virtualmachine_2: - availability_zone: compute2 - OS_image: QTIP_CentOS - public_network: 'admin-floating_net' - 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/zte-pod1/compute/ramspeed_bm.yaml b/test_cases/zte-pod1/compute/ramspeed_bm.yaml deleted file mode 100644 index f126a19d..00000000 --- a/test_cases/zte-pod1/compute/ramspeed_bm.yaml +++ /dev/null @@ -1,36 +0,0 @@ - -Scenario: - benchmark: ramspeed - host: machine_1, machine_2 - server: - -Context: - Host_Machines: - machine_1: - ip: 10.20.0.23 - pw: - role: host - machine_2: - ip: 10.20.0.24 - 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/zte-pod1/compute/ramspeed_vm.yaml b/test_cases/zte-pod1/compute/ramspeed_vm.yaml deleted file mode 100644 index 7a2ef849..00000000 --- a/test_cases/zte-pod1/compute/ramspeed_vm.yaml +++ /dev/null @@ -1,46 +0,0 @@ -Scenario: - benchmark: ramspeed - host: virtualmachine_1, virtualmachine_2 - server: blakc - -Context: - Host_Machines: - - Virtual_Machines: - virtualmachine_1: - availability_zone: compute1 - public_network: 'admin-floating_net' - OS_image: QTIP_CentOS - flavor: m1.large - role: host - virtualmachine_2: - availability_zone: compute2 - public_network: 'admin-floating_net' - 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/zte-pod1/compute/ssl_bm.yaml b/test_cases/zte-pod1/compute/ssl_bm.yaml deleted file mode 100644 index 95d53840..00000000 --- a/test_cases/zte-pod1/compute/ssl_bm.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Scenario: - benchmark: ssl - host: machine_1,machine_2 - -Context: - Host_Machines: - machine_1: - ip: 10.20.0.23 - pw: - role: host - machine_2: - ip: 10.20.0.24 - pw: - role: host - 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/zte-pod1/compute/ssl_vm.yaml b/test_cases/zte-pod1/compute/ssl_vm.yaml deleted file mode 100644 index 60045903..00000000 --- a/test_cases/zte-pod1/compute/ssl_vm.yaml +++ /dev/null @@ -1,36 +0,0 @@ -Scenario: - benchmark: ssl - host: virtualmachine_1, virtualmachine_2 - -Context: - Host_Machines: - - Virtual_Machines: - virtualmachine_1: - availability_zone: compute1 - public_network: 'admin-floating_net' - OS_image: 'QTIP_CentOS' - flavor: 'm1.large' - role: host - virtualmachine_2: - availability_zone: compute2 - public_network: 'admin-floating_net' - 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/zte-pod1/compute/whetstone_bm.yaml b/test_cases/zte-pod1/compute/whetstone_bm.yaml deleted file mode 100644 index bf14ea3a..00000000 --- a/test_cases/zte-pod1/compute/whetstone_bm.yaml +++ /dev/null @@ -1,32 +0,0 @@ - -Scenario: - benchmark: whetstone - host: machine_1, machine_2 - - -Context: - Host_Machines: - machine_1: - ip: 10.20.0.23 - pw: - role: host - machine_2: - ip: 10.20.0.24 - 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/zte-pod1/compute/whetstone_vm.yaml b/test_cases/zte-pod1/compute/whetstone_vm.yaml deleted file mode 100644 index 9f12597f..00000000 --- a/test_cases/zte-pod1/compute/whetstone_vm.yaml +++ /dev/null @@ -1,44 +0,0 @@ -Scenario: - benchmark: whetstone - host: virtualmachine_1, virtualmachine_1 - server: - -Context: - Host_Machines: - - Virtual_Machines: - virtualmachine_1: - availability_zone: compute1 - public_network: 'admin-floating_net' - OS_image: QTIP_CentOS - flavor: m1.large - role: host - virtualmachine_2: - availability_zone: compute2 - public_network: 'admin-floating_net' - 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/zte-pod1/network/iperf_bm.yaml b/test_cases/zte-pod1/network/iperf_bm.yaml deleted file mode 100644 index e022d4a4..00000000 --- a/test_cases/zte-pod1/network/iperf_bm.yaml +++ /dev/null @@ -1,50 +0,0 @@ -Scenario: - benchmark: iperf - topology: Client and Server on different baremetal Compute nodes - server: machine_1 - client: machine_2 - benchmark_details: - duration: 20 - protocol: tcp - bandwidthGbps: 10 - -Context: - Host_Machines: - machine_1: - ip: 10.20.0.23 - pw: - role: 1-server - machine_2: - ip: 10.20.0.24 - pw: - role: 2-host - - Virtual_Machines: - -Test_Description: - Test_category: "network" - Benchmark: "iperf" - Overview: > - '''This test will run the IPERF benchmark on virutalmachine_1 and virtualmachine_2. On the\n - same compute node - if you wish to add a host machine add the following information under the Host_Machine tag - virtualmachine_1: - availability_zone: compute1 - OS_image: QTIP_CentOS - public_network: 'net04_ext' - role: 1-server - flavor: m1.large - - virtualmachine_2: - availability_zone: compute2 - OS_image: QTIP_CentOS - public_network: 'net04_ext' - role: 2-host - flavor: m1.large - - machine_1: - ip: - pw: - role: - ''' - diff --git a/test_cases/zte-pod1/network/iperf_vm.yaml b/test_cases/zte-pod1/network/iperf_vm.yaml deleted file mode 100644 index 57e09e02..00000000 --- a/test_cases/zte-pod1/network/iperf_vm.yaml +++ /dev/null @@ -1,43 +0,0 @@ -Scenario: - benchmark: iperf - topology: Client and Server on ONE compute - server : virtualmachine_1 - client: virtualmachine_2 - description: 'Leave the bandwidth as 0 to throttle maximum traffic' - benchmark_details: - duration: 20 - protocol: tcp - bandwidthGbps: 0 - -Context: - Host_Machines: - - Virtual_Machines: - virtualmachine_1: - availability_zone: compute1 - OS_image: QTIP_CentOS - public_network: 'admin-floating_net' - role: 1-server - flavor: m1.large - - virtualmachine_2: - availability_zone: compute1 - OS_image: QTIP_CentOS - public_network: 'admin-floating_net' - 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/zte-pod1/network/iperf_vm_2.yaml b/test_cases/zte-pod1/network/iperf_vm_2.yaml deleted file mode 100644 index c3cd6b35..00000000 --- a/test_cases/zte-pod1/network/iperf_vm_2.yaml +++ /dev/null @@ -1,45 +0,0 @@ -Scenario: - benchmark: iperf - topology: Client and Server on two different compute nodes - server : virtualmachine_1 - client: virtualmachine_2 - description: 'Leave the bandwidth as 0 to throttle maximum traffic' - benchmark_details: - duration: 20 - protocol: tcp - bandwidthGbps: 0 - -Context: - Host_Machines: - - - Virtual_Machines: - virtualmachine_1: - availability_zone: compute1 - OS_image: QTIP_CentOS - public_network: 'admin-floating_net' - role: 1-server - flavor: m1.large - - virtualmachine_2: - availability_zone: compute2 - OS_image: QTIP_CentOS - public_network: 'admin-floating_net' - 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/zte-pod1/storage/fio_bm.yaml b/test_cases/zte-pod1/storage/fio_bm.yaml deleted file mode 100644 index e940e9ba..00000000 --- a/test_cases/zte-pod1/storage/fio_bm.yaml +++ /dev/null @@ -1,40 +0,0 @@ -Scenario: - benchmark: fio - host: machine_1, machine_2 - server: - -Context: - Host_Machines: - machine_1: - ip: 10.20.0.23 - pw: - role: host - machine_2: - ip: 10.20.0.24 - pw: - role: host - - - Virtual_Machines: - - - -Test_Description: - Test_category: "Storage" - Benchmark: "FIO" - Overview: > - '''This test will run the FIO benchmark in parallel on host machines "machine_1" and "machine_2".\n - The fio job specifications can be found in qtip/benchmarks/fio_jobs/test_job. - The job conists of an fio load of: - 1.50% rand read 50% rand write - 2.Asynch engine - 3.Direct IO. - 4.Queing depth of 2 - - if you wish to add another machine add the following information under the Host_Machines tag - machine_3: - ip: 172.18.0.16 - pw: Op3nStack - role: host - ''' - diff --git a/test_cases/zte-pod1/storage/fio_vm.yaml b/test_cases/zte-pod1/storage/fio_vm.yaml deleted file mode 100644 index 65a1e67b..00000000 --- a/test_cases/zte-pod1/storage/fio_vm.yaml +++ /dev/null @@ -1,45 +0,0 @@ -Scenario: - benchmark: fio - host: machine_1, machine_2 - server: - -Context: - Host_Machines: - - Virtual_Machines: - virtualmachine_1: - availability_zone: computer1 - public_network: 'admin_floating_net' - OS_image: QTIP_CentOS - flavor: m1.large - role: host - virtualmachine_2: - availability_zone: computer2 - public_network: 'admin-floating_net' - 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