From a6018da33d315b25274d80816d8050ba66ea7901 Mon Sep 17 00:00:00 2001 From: Jan Gelety Date: Tue, 21 Aug 2018 15:04:01 +0200 Subject: VPP link bonding perf tests with two links between DUTs Jira: CSIT-1247 Change-Id: Ia6a3f7682eb9a35040682913c0e33a1d61d1e6fa Signed-off-by: Jan Gelety --- .../performance/performance_configuration.robot | 153 ++++++++++++++++++--- .../robot/performance/performance_setup.robot | 115 ++++++++++++++-- 2 files changed, 239 insertions(+), 29 deletions(-) (limited to 'resources/libraries/robot/performance') diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot index 30500964d7..2e7274b0a9 100644 --- a/resources/libraries/robot/performance/performance_configuration.robot +++ b/resources/libraries/robot/performance/performance_configuration.robot @@ -45,17 +45,45 @@ | | ... # TODO: Rework KW to set all interfaces in path UP and set MTU (including # software interfaces. Run KW at the start phase of VPP setup to split -# from other "functial" configuration. This will allow modularity of this +# from other "functional" configuration. This will allow modularity of this # library | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} -| | | Set Interface State | ${nodes['${dut}']} | ${${dut}_if1} | up -| | | Set Interface State | ${nodes['${dut}']} | ${${dut}_if2} | up +| | | ${if1_status} | ${value}= | Run Keyword And Ignore Error +| | | ... | Variable Should Exist | ${${dut}_if1} +| | | Run Keyword If | '${if1_status}' == 'PASS' +| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if1} | up +| | | ... | ELSE +| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if1_1} | up +| | | Run Keyword Unless | '${if1_status}' == 'PASS' +| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if1_2} | up +| | | ${if2_status} | ${value}= | Run Keyword And Ignore Error +| | | ... | Variable Should Exist | ${${dut}_if2} +| | | Run Keyword If | '${if2_status}' == 'PASS' +| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if2} | up +| | | ... | ELSE +| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if2_1} | up +| | | Run Keyword Unless | '${if2_status}' == 'PASS' +| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if2_2} | up | | All VPP Interfaces Ready Wait | ${nodes} | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} -| | | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if1} -| | | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if2} +| | | ${if1_status} | ${value}= | Run Keyword And Ignore Error +| | | ... | Variable Should Exist | ${${dut}_if1} +| | | Run Keyword If | '${if1_status}' == 'PASS' +| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if1} +| | | ... | ELSE +| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if1_1} +| | | Run Keyword Unless | '${if1_status}' == 'PASS' +| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if1_2} +| | | ${if2_status} | ${value}= | Run Keyword And Ignore Error +| | | ... | Variable Should Exist | ${${dut}_if2} +| | | Run Keyword If | '${if2_status}' == 'PASS' +| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if2} +| | | ... | ELSE +| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if2_1} +| | | Run Keyword Unless | '${if2_status}' == 'PASS' +| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if2_2} | | All VPP Interfaces Ready Wait | ${nodes} | Initialize IPSec in 3-node circular topology @@ -984,13 +1012,31 @@ | | ... | ${lb_mode} | | Set Interface State | ${dut1} | ${dut1_eth_bond_if1} | up | | VPP Set interface MTU | ${dut1} | ${dut1_eth_bond_if1} -| | VPP Enslave Physical Interface | ${dut1} | ${dut1_if2} +| | ${if2_status} | ${value}= | Run Keyword And Ignore Error +| | ... | Variable Should Exist | ${dut1_if2} +| | Run Keyword If | '${if2_status}' == 'PASS' +| | ... | VPP Enslave Physical Interface | ${dut1} | ${dut1_if2} +| | ... | ${dut1_eth_bond_if1} +| | ... | ELSE +| | ... | VPP Enslave Physical Interface | ${dut1} | ${dut1_if2_1} +| | ... | ${dut1_eth_bond_if1} +| | Run Keyword Unless | '${if2_status}' == 'PASS' +| | ... | VPP Enslave Physical Interface | ${dut1} | ${dut1_if2_2} | | ... | ${dut1_eth_bond_if1} | | ${dut2_eth_bond_if1}= | VPP Create Bond Interface | ${dut2} | ${bond_mode} | | ... | ${lb_mode} | | Set Interface State | ${dut2} | ${dut2_eth_bond_if1} | up | | VPP Set interface MTU | ${dut1} | ${dut1_eth_bond_if1} -| | VPP Enslave Physical Interface | ${dut2} | ${dut2_if1} +| | ${if1_status} | ${value}= | Run Keyword And Ignore Error +| | ... | Variable Should Exist | ${dut2_if1} +| | Run Keyword If | '${if1_status}' == 'PASS' +| | ... | VPP Enslave Physical Interface | ${dut2} | ${dut2_if1} +| | ... | ${dut2_eth_bond_if1} +| | ... | ELSE +| | ... | VPP Enslave Physical Interface | ${dut2} | ${dut2_if1_1} +| | ... | ${dut2_eth_bond_if1} +| | Run Keyword Unless | '${if2_status}' == 'PASS' +| | ... | VPP Enslave Physical Interface | ${dut2} | ${dut2_if1_2} | | ... | ${dut2_eth_bond_if1} | | VPP Show Bond Data On All Nodes | ${nodes} | details=${TRUE} | | Initialize VLAN dot1q sub-interfaces in 3-node circular topology @@ -1704,13 +1750,31 @@ | | ... | ${lb_mode} | | Set Interface State | ${dut1} | ${dut1_eth_bond_if1} | up | | VPP Set interface MTU | ${dut1} | ${dut1_eth_bond_if1} -| | VPP Enslave Physical Interface | ${dut1} | ${dut1_if2} +| | ${if2_status} | ${value}= | Run Keyword And Ignore Error +| | ... | Variable Should Exist | ${dut1_if2} +| | Run Keyword If | '${if2_status}' == 'PASS' +| | ... | VPP Enslave Physical Interface | ${dut1} | ${dut1_if2} +| | ... | ${dut1_eth_bond_if1} +| | ... | ELSE +| | ... | VPP Enslave Physical Interface | ${dut1} | ${dut1_if2_1} +| | ... | ${dut1_eth_bond_if1} +| | Run Keyword Unless | '${if2_status}' == 'PASS' +| | ... | VPP Enslave Physical Interface | ${dut1} | ${dut1_if2_2} | | ... | ${dut1_eth_bond_if1} | | ${dut2_eth_bond_if1}= | VPP Create Bond Interface | ${dut2} | ${bond_mode} | | ... | ${lb_mode} | | Set Interface State | ${dut2} | ${dut2_eth_bond_if1} | up | | VPP Set interface MTU | ${dut2} | ${dut2_eth_bond_if1} -| | VPP Enslave Physical Interface | ${dut2} | ${dut2_if1} +| | ${if1_status} | ${value}= | Run Keyword And Ignore Error +| | ... | Variable Should Exist | ${dut2_if1} +| | Run Keyword If | '${if1_status}' == 'PASS' +| | ... | VPP Enslave Physical Interface | ${dut2} | ${dut2_if1} +| | ... | ${dut2_eth_bond_if1} +| | ... | ELSE +| | ... | VPP Enslave Physical Interface | ${dut2} | ${dut2_if1_1} +| | ... | ${dut2_eth_bond_if1} +| | Run Keyword Unless | '${if2_status}' == 'PASS' +| | ... | VPP Enslave Physical Interface | ${dut2} | ${dut2_if1_2} | | ... | ${dut2_eth_bond_if1} | | VPP Show Bond Data On All Nodes | ${nodes} | details=${TRUE} | | Initialize VLAN dot1q sub-interfaces in 3-node circular topology @@ -1738,11 +1802,43 @@ | | ... | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} -| | | ${if1_pci}= | Get Interface PCI Addr | ${nodes['${dut}']} | ${${dut}_if1} -| | | ${if2_pci}= | Get Interface PCI Addr | ${nodes['${dut}']} | ${${dut}_if2} -| | | Run keyword | ${dut}.Add DPDK Dev | ${if1_pci} | ${if2_pci} -| | | Set Test Variable | ${${dut}_if1_pci} | ${if1_pci} -| | | Set Test Variable | ${${dut}_if2_pci} | ${if2_pci} +| | | ${if1_status} | ${value}= | Run Keyword And Ignore Error +| | | ... | Variable Should Exist | ${${dut}_if1} +| | | ${if1_pci}= | Run Keyword If | '${if1_status}' == 'PASS' +| | | ... | Get Interface PCI Addr | ${nodes['${dut}']} | ${${dut}_if1} +| | | ${if1_1_pci}= | Run Keyword Unless | '${if1_status}' == 'PASS' +| | | ... | Get Interface PCI Addr | ${nodes['${dut}']} | ${${dut}_if1_1} +| | | ${if1_2_pci}= | Run Keyword Unless | '${if1_status}' == 'PASS' +| | | ... | Get Interface PCI Addr | ${nodes['${dut}']} | ${${dut}_if1_2} +| | | ${if2_status} | ${value}= | Run Keyword And Ignore Error +| | | ... | Variable Should Exist | ${${dut}_if2} +| | | ${if2_pci}= | Run Keyword If | '${if2_status}' == 'PASS' +| | | ... | Get Interface PCI Addr | ${nodes['${dut}']} | ${${dut}_if2} +| | | ${if2_1_pci}= | Run Keyword Unless | '${if2_status}' == 'PASS' +| | | ... | Get Interface PCI Addr | ${nodes['${dut}']} | ${${dut}_if2_1} +| | | ${if2_2_pci}= | Run Keyword Unless | '${if2_status}' == 'PASS' +| | | ... | Get Interface PCI Addr | ${nodes['${dut}']} | ${${dut}_if2_2} +| | | @{pci_devs}= | Run Keyword If | '${if1_status}' == 'PASS' +| | | ... | Create List | ${if1_pci} +| | | ... | ELSE +| | | ... | Create List | ${if1_1_pci} | ${if1_2_pci} +| | | Run Keyword If | '${if2_status}' == 'PASS' +| | | ... | Append To List | ${pci_devs} | ${if2_pci} +| | | ... | ELSE +| | | ... | Append To List | ${pci_devs} | ${if2_1_pci} | ${if2_2_pci} +| | | Run keyword | ${dut}.Add DPDK Dev | @{pci_devs} +| | | Run Keyword If | '${if1_status}' == 'PASS' +| | | ... | Set Test Variable | ${${dut}_if1_pci} | ${if1_pci} +| | | Run Keyword Unless | '${if1_status}' == 'PASS' +| | | ... | Set Test Variable | ${${dut}_if1_1_pci} | ${if1_1_pci} +| | | Run Keyword Unless | '${if1_status}' == 'PASS' +| | | ... | Set Test Variable | ${${dut}_if1_2_pci} | ${if1_2_pci} +| | | Run Keyword If | '${if2_status}' == 'PASS' +| | | ... | Set Test Variable | ${${dut}_if2_pci} | ${if2_pci} +| | | Run Keyword Unless | '${if2_status}' == 'PASS' +| | | ... | Set Test Variable | ${${dut}_if2_1_pci} | ${if2_1_pci} +| | | Run Keyword Unless | '${if2_status}' == 'PASS' +| | | ... | Set Test Variable | ${${dut}_if2_2_pci} | ${if2_2_pci} | Add single PCI device to all DUTs | | [Documentation] @@ -1757,7 +1853,7 @@ | | | Run keyword | ${dut}.Add DPDK Dev | ${if1_pci} | | | Set Test Variable | ${${dut}_if1_pci} | ${if1_pci} -| Add VLAN Strip Offload switch off between DUTs in 3-node single link topology +| Add VLAN strip offload switch off between DUTs in 3-node single link topology | | [Documentation] | | ... | Add VLAN Strip Offload switch off on PCI devices between DUTs to VPP | | ... | configuration file. @@ -1767,6 +1863,20 @@ | | Run keyword | DUT2.Add DPDK Dev Parameter | ${dut2_if1_pci} | | ... | vlan-strip-offload | off +| Add VLAN strip offload switch off between DUTs in 3-node double link topology +| | [Documentation] +| | ... | Add VLAN Strip Offload switch off on PCI devices between DUTs to VPP +| | ... | configuration file. +| | ... +| | Run keyword | DUT1.Add DPDK Dev Parameter | ${dut1_if2_1_pci} +| | ... | vlan-strip-offload | off +| | Run keyword | DUT1.Add DPDK Dev Parameter | ${dut1_if2_2_pci} +| | ... | vlan-strip-offload | off +| | Run keyword | DUT2.Add DPDK Dev Parameter | ${dut2_if1_1_pci} +| | ... | vlan-strip-offload | off +| | Run keyword | DUT2.Add DPDK Dev Parameter | ${dut2_if1_2_pci} +| | ... | vlan-strip-offload | off + | Add DPDK bonded ethernet interfaces to DUTs in 3-node single link topology | | [Documentation] | | ... | Add DPDK bonded Ethernet interfaces with mode XOR and transmit policy @@ -1819,8 +1929,17 @@ | | Run keyword | ${vm_name}.Qemu Set Serial Port | ${serial_port} | | ${ssh_fwd_port}= | Evaluate | ${qemu_id} + ${10021} | | Run keyword | ${vm_name}.Qemu Set Ssh Fwd Port | ${ssh_fwd_port} -| | ${dut_numa}= | Get interfaces numa node | ${nodes['${dut}']} -| | ... | ${${dut}_if1} | ${${dut}_if2} +| | ${if1_status} | ${value}= | Run Keyword And Ignore Error +| | ... | Variable Should Exist | ${${dut}_if1} +| | @{if_list}= | Run Keyword If | '${if1_status}' == 'PASS' +| | ... | Create List | ${${dut}_if1} +| | ... | ELSE | Create List | ${${dut}_if1_1} | ${${dut}_if1_2} +| | ${if2_status} | ${value}= | Run Keyword And Ignore Error +| | ... | Variable Should Exist | ${${dut}_if2} +| | Run Keyword If | '${if2_status}' == 'PASS' +| | ... | Append To List | ${if_list} | ${${dut}_if2} +| | ... | ELSE | Append To List | ${if_list} | ${${dut}_if2_1} | ${${dut}_if2_2} +| | ${dut_numa}= | Get interfaces numa node | ${nodes['${dut}']} | @{if_list} # Compute CPU placement for VM based on expected DUT placement. | | ${os_cpus}= | Set Variable | ${1} | | ${dut_main_cpus}= | Set Variable | ${1} diff --git a/resources/libraries/robot/performance/performance_setup.robot b/resources/libraries/robot/performance/performance_setup.robot index eef624e50c..0a1eeec955 100644 --- a/resources/libraries/robot/performance/performance_setup.robot +++ b/resources/libraries/robot/performance/performance_setup.robot @@ -142,8 +142,8 @@ | | ... | - dut1_if1 - DUT1 interface towards TG. | | ... | - dut1_if2 - DUT1 interface towards DUT2. | | ... | - dut2 - DUT2 node -| | ... | - dut2_if1 - DUT2 interface towards TG. -| | ... | - dut2_if2 - DUT2 interface towards DUT1. +| | ... | - dut2_if1 - DUT2 interface towards DUT1. +| | ... | - dut2_if2 - DUT2 interface towards TG. | | ... | | ... | *Example:* | | ... @@ -174,6 +174,74 @@ | | Set Suite Variable | ${dut2_if1} | | Set Suite Variable | ${dut2_if2} +| Set variables in 3-node circular topology with DUT interface model with double link between DUTs +| | [Documentation] +| | ... | Compute path for testing on three given nodes in circular topology +| | ... | with double link between DUTs based on interface model provided as an +| | ... | argument and set corresponding suite variables. +| | ... +| | ... | *Arguments:* +| | ... | - iface_model - Interface model. Type: string +| | ... +| | ... | _NOTE:_ This KW sets following suite variables: +| | ... | - tg - TG node +| | ... | - tg_if1 - TG interface towards DUT1. +| | ... | - tg_if2 - TG interface towards DUT2. +| | ... | - dut1 - DUT1 node +| | ... | - dut1_if1 - DUT1 interface towards TG. +| | ... | - dut1_if2_1 - DUT1 interface 1 towards DUT2. +| | ... | - dut1_if2_2 - DUT1 interface 2 towards DUT2. +| | ... | - dut2 - DUT2 node +| | ... | - dut2_if1_1 - DUT2 interface 1 towards DUT1. +| | ... | - dut2_if1_2 - DUT2 interface 2 towards DUT1. +| | ... | - dut2_if2 - DUT2 interface towards TG. +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Set variables in 3-node circular topology with DUT interface model\ +| | ... | with double link between DUTs \| Intel-X520-DA2 \| +| | ... +| | [Arguments] | ${iface_model} +| | ... +| | ${iface_model_list}= | Create list | ${iface_model} +| | # Compute path TG - DUT1 with single link in between +| | Append Node | ${nodes['TG']} +| | Append Node | ${nodes['DUT1']} | filter_list=${iface_model_list} +| | Append Node | ${nodes['TG']} +| | Compute Path +| | ${tg_if1} | ${tg}= | Next Interface +| | ${dut1_if1} | ${dut1}= | Next Interface +| | # Compute path TG - DUT2 with single link in between +| | Clear Path +| | Append Node | ${nodes['TG']} +| | Append Node | ${nodes['DUT2']} | filter_list=${iface_model_list} +| | Append Node | ${nodes['TG']} +| | Compute Path +| | ${tg_if2} | ${tg}= | Next Interface +| | ${dut2_if2} | ${dut2}= | Next Interface +| | # Compute path DUT1 - DUT2 with double link in between +| | Clear Path +| | Append Node | ${nodes['DUT1']} | filter_list=${iface_model_list} +| | Append Node | ${nodes['DUT2']} | filter_list=${iface_model_list} +| | Append Node | ${nodes['DUT1']} | filter_list=${iface_model_list} +| | Compute Path | always_same_link=${FALSE} +| | ${dut1_if2_1} | ${dut1}= | First Interface +| | ${dut1_if2_2} | ${dut1}= | Last Interface +| | ${dut2_if1_1} | ${dut2}= | First Ingress Interface +| | ${dut2_if1_2} | ${dut2}= | Last Egress Interface +| | # Set suite variables +| | Set Suite Variable | ${tg} +| | Set Suite Variable | ${tg_if1} +| | Set Suite Variable | ${tg_if2} +| | Set Suite Variable | ${dut1} +| | Set Suite Variable | ${dut1_if1} +| | Set Suite Variable | ${dut1_if2_1} +| | Set Suite Variable | ${dut1_if2_2} +| | Set Suite Variable | ${dut2} +| | Set Suite Variable | ${dut2_if1_1} +| | Set Suite Variable | ${dut2_if1_2} +| | Set Suite Variable | ${dut2_if2} + | Tear down guest VM with dpdk-testpmd | | [Documentation] | | ... | Stop all qemu processes with dpdk-testpmd running on ${dut_node}. @@ -228,8 +296,8 @@ | Set up 2-node performance topology with DUT's NIC model | | [Documentation] -| | ... | Suite preparation phase that setup default startup configuration of -| | ... | VPP on all DUTs. Updates interfaces on all nodes and setup global +| | ... | Suite preparation phase that sets the default startup configuration of +| | ... | VPP on all DUTs. Updates interfaces on all nodes and sets the global | | ... | variables used in test cases based on interface model provided as an | | ... | argument. Initializes traffic generator. | | ... @@ -250,8 +318,8 @@ | Set up 2-node-switched performance topology with DUT's NIC model | | [Documentation] -| | ... | Suite preparation phase that setup default startup configuration of -| | ... | VPP on all DUTs. Updates interfaces on all nodes and setup global +| | ... | Suite preparation phase that sets the default startup configuration of +| | ... | VPP on all DUTs. Updates interfaces on all nodes and sets the global | | ... | variables used in test cases based on interface model provided as an | | ... | argument. Initializes traffic generator. | | ... @@ -277,8 +345,8 @@ | Set up 3-node performance topology with DUT's NIC model | | [Documentation] -| | ... | Suite preparation phase that setup default startup configuration of -| | ... | VPP on all DUTs. Updates interfaces on all nodes and setup global +| | ... | Suite preparation phase that sets the default startup configuration of +| | ... | VPP on all DUTs. Updates interfaces on all nodes and sets the global | | ... | variables used in test cases based on interface model provided as an | | ... | argument. Initializes traffic generator. | | ... @@ -298,9 +366,32 @@ | | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2} | | ... | ${dut1} | ${dut1_if1} | ${dut2} | ${dut2_if2} | ${topology_type} +| Set up 3-node performance topology with DUT's NIC model with double link between DUTs +| | [Documentation] +| | ... | Suite preparation phase that sets the default startup configuration of +| | ... | VPP on all DUTs. Updates interfaces on all nodes and sets the global +| | ... | variables used in test cases based on interface model provided as an +| | ... | argument. Initializes traffic generator. +| | ... +| | ... | *Arguments:* +| | ... | - topology_type - Topology type. Type: string +| | ... | - nic_model - Interface model. Type: string +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Set up 3-node performance topology with DUT's NIC model with \ +| | ... | double link between DUTs \| L2 \| Intel-X520-DA2 \| +| | ... +| | [Arguments] | ${topology_type} | ${nic_model} +| | ... +| | Set variables in 3-node circular topology with DUT interface model with double link between DUTs +| | ... | ${nic_model} +| | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2} +| | ... | ${dut1} | ${dut1_if1} | ${dut2} | ${dut2_if2} | ${topology_type} + | Set up DPDK 2-node performance topology with DUT's NIC model | | [Documentation] -| | ... | Updates interfaces on all nodes and setup global +| | ... | Updates interfaces on all nodes and sets the global | | ... | variables used in test cases based on interface model provided as an | | ... | argument. Initializes traffic generator. Initializes DPDK test | | ... | environment. @@ -324,7 +415,7 @@ | Set up DPDK 3-node performance topology with DUT's NIC model | | [Documentation] -| | ... | Updates interfaces on all nodes and setup global +| | ... | Updates interfaces on all nodes and sets the global | | ... | variables used in test cases based on interface model provided as an | | ... | argument. Initializes traffic generator. Initializes DPDK test | | ... | environment. @@ -438,8 +529,8 @@ | Set up 3-node performance topology with wrk and DUT's NIC model | | [Documentation] -| | ... | Suite preparation phase that setup default startup configuration of -| | ... | VPP on all DUTs. Updates interfaces on all nodes and setup global +| | ... | Suite preparation phase that sets the default startup configuration of +| | ... | VPP on all DUTs. Updates interfaces on all nodes and sets the global | | ... | variables used in test cases based on interface model provided as an | | ... | argument. Installs the traffic generator. | | ... -- cgit 1.2.3-korg