From 39342467e5e647ae605f40bed04c5a3b3bc50f5e Mon Sep 17 00:00:00 2001 From: Mofassir Arif Date: Tue, 22 Dec 2015 04:17:57 -0800 Subject: Restructured QTIP directories and CLI I have changed the arguments for the CLI and now QTIP takes a file along withthe name of the lab to run on Right now only the config files for the dell lab have been added, These will increase when we make QTIP available for other labs. I have also added the provision of changing the public network from the config file and some leftover files from previous verisons have been remove Change-Id: Ifeb01d80099eab06dc77a7b2e07097ebb17a13a2 Signed-off-by: Mofassir Arif --- test_cases/SampleHeat.yaml | 103 --------------------- test_cases/TESTER.yaml | 36 ------- test_cases/compute/.whetstone_serial.yaml.swp | Bin 12288 -> 0 bytes test_cases/compute/dhrystone_parallel.yaml | 45 --------- test_cases/compute/dhrystone_serial.yaml | 35 ------- test_cases/compute/dpi_parallel.yaml | 36 ------- test_cases/compute/dpi_serial.yaml | 43 --------- test_cases/compute/ssl_parallel.yaml | 37 -------- test_cases/compute/ssl_serial.yaml | 34 ------- test_cases/compute/whetstone_parallel.yaml | 45 --------- test_cases/compute/whetstone_serial.yaml | 35 ------- .../compute/.whetstone_serial.yaml.swp | Bin 0 -> 12288 bytes .../compute/dhrystone_parallel.yaml | 45 +++++++++ .../dell_santa_clara/compute/dhrystone_serial.yaml | 35 +++++++ .../dell_santa_clara/compute/dpi_parallel.yaml | 36 +++++++ .../dell_santa_clara/compute/dpi_serial.yaml | 35 +++++++ .../dell_santa_clara/compute/ssl_parallel.yaml | 37 ++++++++ .../dell_santa_clara/compute/ssl_serial.yaml | 34 +++++++ .../compute/whetstone_parallel.yaml | 45 +++++++++ .../dell_santa_clara/compute/whetstone_serial.yaml | 35 +++++++ .../dell_santa_clara/network/iperf_topology_1.yaml | 43 +++++++++ .../dell_santa_clara/network/iperf_topology_2.yaml | 43 +++++++++ .../dell_santa_clara/network/iperf_topology_3.yaml | 60 ++++++++++++ test_cases/dell_santa_clara/network/netperf.yaml | 42 +++++++++ test_cases/dell_santa_clara/network/pktgen.yaml | 44 +++++++++ test_cases/dell_santa_clara/storage/fio_2.yaml | 51 ++++++++++ .../dell_santa_clara/storage/fio_parallel.yaml | 43 +++++++++ test_cases/network/iperf_topology_1.yaml | 43 --------- test_cases/network/iperf_topology_2.yaml | 43 --------- test_cases/network/iperf_topology_3.yaml | 60 ------------ test_cases/network/netperf.yaml | 42 --------- test_cases/network/pktgen.yaml | 44 --------- test_cases/storage/fio_2.yaml | 51 ---------- test_cases/storage/fio_parallel.yaml | 43 --------- 34 files changed, 628 insertions(+), 775 deletions(-) delete mode 100644 test_cases/SampleHeat.yaml delete mode 100644 test_cases/TESTER.yaml delete mode 100644 test_cases/compute/.whetstone_serial.yaml.swp delete mode 100644 test_cases/compute/dhrystone_parallel.yaml delete mode 100644 test_cases/compute/dhrystone_serial.yaml delete mode 100644 test_cases/compute/dpi_parallel.yaml delete mode 100644 test_cases/compute/dpi_serial.yaml delete mode 100644 test_cases/compute/ssl_parallel.yaml delete mode 100644 test_cases/compute/ssl_serial.yaml delete mode 100644 test_cases/compute/whetstone_parallel.yaml delete mode 100644 test_cases/compute/whetstone_serial.yaml create mode 100644 test_cases/dell_santa_clara/compute/.whetstone_serial.yaml.swp create mode 100644 test_cases/dell_santa_clara/compute/dhrystone_parallel.yaml create mode 100644 test_cases/dell_santa_clara/compute/dhrystone_serial.yaml create mode 100644 test_cases/dell_santa_clara/compute/dpi_parallel.yaml create mode 100644 test_cases/dell_santa_clara/compute/dpi_serial.yaml create mode 100644 test_cases/dell_santa_clara/compute/ssl_parallel.yaml create mode 100644 test_cases/dell_santa_clara/compute/ssl_serial.yaml create mode 100644 test_cases/dell_santa_clara/compute/whetstone_parallel.yaml create mode 100644 test_cases/dell_santa_clara/compute/whetstone_serial.yaml create mode 100644 test_cases/dell_santa_clara/network/iperf_topology_1.yaml create mode 100644 test_cases/dell_santa_clara/network/iperf_topology_2.yaml create mode 100644 test_cases/dell_santa_clara/network/iperf_topology_3.yaml create mode 100644 test_cases/dell_santa_clara/network/netperf.yaml create mode 100644 test_cases/dell_santa_clara/network/pktgen.yaml create mode 100644 test_cases/dell_santa_clara/storage/fio_2.yaml create mode 100644 test_cases/dell_santa_clara/storage/fio_parallel.yaml delete mode 100644 test_cases/network/iperf_topology_1.yaml delete mode 100644 test_cases/network/iperf_topology_2.yaml delete mode 100644 test_cases/network/iperf_topology_3.yaml delete mode 100644 test_cases/network/netperf.yaml delete mode 100644 test_cases/network/pktgen.yaml delete mode 100644 test_cases/storage/fio_2.yaml delete mode 100644 test_cases/storage/fio_parallel.yaml (limited to 'test_cases') diff --git a/test_cases/SampleHeat.yaml b/test_cases/SampleHeat.yaml deleted file mode 100644 index 95b9a137..00000000 --- a/test_cases/SampleHeat.yaml +++ /dev/null @@ -1,103 +0,0 @@ - heat_template_version: 2014-10-16 - - description: Test10 - - parameters: - - public_network: - type: string - label: Public Network name or ID - description: Public network with floating IPs - default: "provider_network" - - private_net_name: - type: string - default: "private_network" - - flavor: - type: string - label: Flavor - default: m1.large - - image: - type: string - label: Image name - default: CentOS - - availability_zone: - type: string - description: The Availability Zone to launch the instance. - default: compute1 - - resources: - - private_network: - type: OS::Neutron::Net - - - private_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: private_network } - cidr: 10.10.17.0/24 - dns_nameservers: - - 8.8.8.8 - - router_1: - type: OS::Neutron::Router - properties: - external_gateway_info: - network: { get_param: public_network } - - router_interface: - type: OS::Neutron::RouterInterface - properties: - router_id: { get_resource: router_1 } - subnet: { get_resource: private_subnet } - - public_port: - type: OS::Neutron::Port - properties: - network: { get_resource: private_network } - security_groups: [{ get_resource: demo1_security_Group }] - - floating_ip: - type: OS::Neutron::FloatingIP - properties: - floating_network: { get_param: public_network } - - floating_ip_assoc: - type: OS::Neutron::FloatingIPAssociation - properties: - floatingip_id: { get_resource: floating_ip } - port_id: { get_resource: public_port } - - demo1_security_Group: - type: OS::Neutron::SecurityGroup - properties: - name: demo1_security_Group - rules: - - protocol: tcp - port_range_min: 22 - port_range_max: 22 - - protocol: icmp - - my_instance: - type: OS::Nova::Server - properties: - image: { get_param: image} - flavor: { get_param: flavor} - availability_zone: { get_param: availability_zone } - networks: - - port: { get_resource: public_port } - - - - outputs: - instance_ip: - description: IP address of the instance - value: { get_attr: [floating_ip, floating_ip_address] } - - - - diff --git a/test_cases/TESTER.yaml b/test_cases/TESTER.yaml deleted file mode 100644 index 5a3f2d33..00000000 --- a/test_cases/TESTER.yaml +++ /dev/null @@ -1,36 +0,0 @@ -Scenario: - benchmark: dpi - host: virtualmachine_1 - server: virtualmachine_2 - pointless: -Context: - Host_Machines: - - - Virtual_Machines: - virtualmachine_1: - availability_zone: nova - OS_image: QTIP_CentOS - public_network: 'provider_network' - role: iiihost - flavor: m1.large - virtualmachine_2: - availability_zone: nova - OS_image: QTIP_CentOS - public_network: 'provider_network' - role: server - flavor: m1.large - -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 - - machine_1: - ip: - pw: - role: - ''' - diff --git a/test_cases/compute/.whetstone_serial.yaml.swp b/test_cases/compute/.whetstone_serial.yaml.swp deleted file mode 100644 index bbfd3be2..00000000 Binary files a/test_cases/compute/.whetstone_serial.yaml.swp and /dev/null differ diff --git a/test_cases/compute/dhrystone_parallel.yaml b/test_cases/compute/dhrystone_parallel.yaml deleted file mode 100644 index 29de6d6f..00000000 --- a/test_cases/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/compute/dhrystone_serial.yaml b/test_cases/compute/dhrystone_serial.yaml deleted file mode 100644 index e15e8ecc..00000000 --- a/test_cases/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/compute/dpi_parallel.yaml b/test_cases/compute/dpi_parallel.yaml deleted file mode 100644 index 01905f57..00000000 --- a/test_cases/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: 'provider_network' - role: 1Run - flavor: m1.large - virtualmachine_2: - availability_zone: compute4 - OS_image: QTIP_CentOS - public_network: 'provider_network' - 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/compute/dpi_serial.yaml b/test_cases/compute/dpi_serial.yaml deleted file mode 100644 index e8f34627..00000000 --- a/test_cases/compute/dpi_serial.yaml +++ /dev/null @@ -1,43 +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' - - Virtual_Machines: - virtualmachine_1: - availability_zone: compute1 - OS_image: QTIP_CentOS - public_network: 'provider_network' - role: 2host - flavor: m1.large - - role: 1host - flavor: m1.large - machine_1: - ip: - pw: - role: - ''' - diff --git a/test_cases/compute/ssl_parallel.yaml b/test_cases/compute/ssl_parallel.yaml deleted file mode 100644 index eb46d8d8..00000000 --- a/test_cases/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/compute/ssl_serial.yaml b/test_cases/compute/ssl_serial.yaml deleted file mode 100644 index 756951bf..00000000 --- a/test_cases/compute/ssl_serial.yaml +++ /dev/null @@ -1,34 +0,0 @@ -Scenario: - benchmark: ssl - 1Run: machine_1 - 2Run: virtualmachine_1 - -Context: - Host_Machines: - machine_1: - ip: 172.18.0.16 - pw: Op3nStack - role: 1Run - Virtual_Machines: - virtualmachine_1: - availability_zone: compute1 - public_network: 'net04_ext' - OS_image: QTIP_CentOS - flavor: m1.large - role: 2Run - -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/compute/whetstone_parallel.yaml b/test_cases/compute/whetstone_parallel.yaml deleted file mode 100644 index 48bc7230..00000000 --- a/test_cases/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/compute/whetstone_serial.yaml b/test_cases/compute/whetstone_serial.yaml deleted file mode 100644 index 25cefbf8..00000000 --- a/test_cases/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/dell_santa_clara/compute/.whetstone_serial.yaml.swp b/test_cases/dell_santa_clara/compute/.whetstone_serial.yaml.swp new file mode 100644 index 00000000..bbfd3be2 Binary files /dev/null and b/test_cases/dell_santa_clara/compute/.whetstone_serial.yaml.swp differ diff --git a/test_cases/dell_santa_clara/compute/dhrystone_parallel.yaml b/test_cases/dell_santa_clara/compute/dhrystone_parallel.yaml new file mode 100644 index 00000000..29de6d6f --- /dev/null +++ b/test_cases/dell_santa_clara/compute/dhrystone_parallel.yaml @@ -0,0 +1,45 @@ +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/dell_santa_clara/compute/dhrystone_serial.yaml b/test_cases/dell_santa_clara/compute/dhrystone_serial.yaml new file mode 100644 index 00000000..e15e8ecc --- /dev/null +++ b/test_cases/dell_santa_clara/compute/dhrystone_serial.yaml @@ -0,0 +1,35 @@ + +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/dell_santa_clara/compute/dpi_parallel.yaml b/test_cases/dell_santa_clara/compute/dpi_parallel.yaml new file mode 100644 index 00000000..0f6afdce --- /dev/null +++ b/test_cases/dell_santa_clara/compute/dpi_parallel.yaml @@ -0,0 +1,36 @@ +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/dell_santa_clara/compute/dpi_serial.yaml b/test_cases/dell_santa_clara/compute/dpi_serial.yaml new file mode 100644 index 00000000..b39597a2 --- /dev/null +++ b/test_cases/dell_santa_clara/compute/dpi_serial.yaml @@ -0,0 +1,35 @@ +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/dell_santa_clara/compute/ssl_parallel.yaml b/test_cases/dell_santa_clara/compute/ssl_parallel.yaml new file mode 100644 index 00000000..eb46d8d8 --- /dev/null +++ b/test_cases/dell_santa_clara/compute/ssl_parallel.yaml @@ -0,0 +1,37 @@ +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/dell_santa_clara/compute/ssl_serial.yaml b/test_cases/dell_santa_clara/compute/ssl_serial.yaml new file mode 100644 index 00000000..756951bf --- /dev/null +++ b/test_cases/dell_santa_clara/compute/ssl_serial.yaml @@ -0,0 +1,34 @@ +Scenario: + benchmark: ssl + 1Run: machine_1 + 2Run: virtualmachine_1 + +Context: + Host_Machines: + machine_1: + ip: 172.18.0.16 + pw: Op3nStack + role: 1Run + Virtual_Machines: + virtualmachine_1: + availability_zone: compute1 + public_network: 'net04_ext' + OS_image: QTIP_CentOS + flavor: m1.large + role: 2Run + +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_santa_clara/compute/whetstone_parallel.yaml b/test_cases/dell_santa_clara/compute/whetstone_parallel.yaml new file mode 100644 index 00000000..48bc7230 --- /dev/null +++ b/test_cases/dell_santa_clara/compute/whetstone_parallel.yaml @@ -0,0 +1,45 @@ +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/dell_santa_clara/compute/whetstone_serial.yaml b/test_cases/dell_santa_clara/compute/whetstone_serial.yaml new file mode 100644 index 00000000..25cefbf8 --- /dev/null +++ b/test_cases/dell_santa_clara/compute/whetstone_serial.yaml @@ -0,0 +1,35 @@ + +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/dell_santa_clara/network/iperf_topology_1.yaml b/test_cases/dell_santa_clara/network/iperf_topology_1.yaml new file mode 100644 index 00000000..20a433a9 --- /dev/null +++ b/test_cases/dell_santa_clara/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: 10 + protocol: udp + bandwidthGbps: 10 + +Context: + Host_Machines: + + + Virtual_Machines: + virtualmachine_1: + availability_zone: compute2 + 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: 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_santa_clara/network/iperf_topology_2.yaml b/test_cases/dell_santa_clara/network/iperf_topology_2.yaml new file mode 100644 index 00000000..4392f32b --- /dev/null +++ b/test_cases/dell_santa_clara/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: 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: 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_santa_clara/network/iperf_topology_3.yaml b/test_cases/dell_santa_clara/network/iperf_topology_3.yaml new file mode 100644 index 00000000..9e7b73e7 --- /dev/null +++ b/test_cases/dell_santa_clara/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_santa_clara/network/netperf.yaml b/test_cases/dell_santa_clara/network/netperf.yaml new file mode 100644 index 00000000..60ee4a13 --- /dev/null +++ b/test_cases/dell_santa_clara/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: 'provider_network' + role: 1-server + flavor: m1.large + + virtualmachine_2: + availability_zone: compute2 + OS_image: QTIP_CentOS + public_network: 'provider_network' + 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_santa_clara/network/pktgen.yaml b/test_cases/dell_santa_clara/network/pktgen.yaml new file mode 100644 index 00000000..13fae68f --- /dev/null +++ b/test_cases/dell_santa_clara/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_santa_clara/storage/fio_2.yaml b/test_cases/dell_santa_clara/storage/fio_2.yaml new file mode 100644 index 00000000..46368cd2 --- /dev/null +++ b/test_cases/dell_santa_clara/storage/fio_2.yaml @@ -0,0 +1,51 @@ +Scenario: + benchmark: fio + host: machine_1, machine_2 + server: blakc + +Context: + Host_Machines: + machine_1: + ip: 10.20.0.4 + pw: r00tme + + machine_2: + ip: 10.20.0.5 + pw: r00tme + 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_santa_clara/storage/fio_parallel.yaml b/test_cases/dell_santa_clara/storage/fio_parallel.yaml new file mode 100644 index 00000000..e058af24 --- /dev/null +++ b/test_cases/dell_santa_clara/storage/fio_parallel.yaml @@ -0,0 +1,43 @@ +Scenario: + benchmark: fio + host: machine_1, machine_2 + server: blakc + +Context: + Host_Machines: + machine_1: + ip: 10.20.0.4 + pw: r00tme + role: host + machine_2: + ip: 10.20.0.5 + pw: r00tme + 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 + 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/network/iperf_topology_1.yaml b/test_cases/network/iperf_topology_1.yaml deleted file mode 100644 index 20a433a9..00000000 --- a/test_cases/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: 10 - protocol: udp - bandwidthGbps: 10 - -Context: - Host_Machines: - - - Virtual_Machines: - virtualmachine_1: - availability_zone: compute2 - 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: 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/network/iperf_topology_2.yaml b/test_cases/network/iperf_topology_2.yaml deleted file mode 100644 index 4392f32b..00000000 --- a/test_cases/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: 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: 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/network/iperf_topology_3.yaml b/test_cases/network/iperf_topology_3.yaml deleted file mode 100644 index 9e7b73e7..00000000 --- a/test_cases/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/network/netperf.yaml b/test_cases/network/netperf.yaml deleted file mode 100644 index 60ee4a13..00000000 --- a/test_cases/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: 'provider_network' - role: 1-server - flavor: m1.large - - virtualmachine_2: - availability_zone: compute2 - OS_image: QTIP_CentOS - public_network: 'provider_network' - 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/network/pktgen.yaml b/test_cases/network/pktgen.yaml deleted file mode 100644 index 13fae68f..00000000 --- a/test_cases/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/storage/fio_2.yaml b/test_cases/storage/fio_2.yaml deleted file mode 100644 index 46368cd2..00000000 --- a/test_cases/storage/fio_2.yaml +++ /dev/null @@ -1,51 +0,0 @@ -Scenario: - benchmark: fio - host: machine_1, machine_2 - server: blakc - -Context: - Host_Machines: - machine_1: - ip: 10.20.0.4 - pw: r00tme - - machine_2: - ip: 10.20.0.5 - pw: r00tme - 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/storage/fio_parallel.yaml b/test_cases/storage/fio_parallel.yaml deleted file mode 100644 index e058af24..00000000 --- a/test_cases/storage/fio_parallel.yaml +++ /dev/null @@ -1,43 +0,0 @@ -Scenario: - benchmark: fio - host: machine_1, machine_2 - server: blakc - -Context: - Host_Machines: - machine_1: - ip: 10.20.0.4 - pw: r00tme - role: host - machine_2: - ip: 10.20.0.5 - pw: r00tme - 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 - 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: - ''' - -- cgit 1.2.3-korg