aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/robot/shared/interfaces.robot
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2020-02-21 22:09:02 +0000
committerPeter Mikus <pmikus@cisco.com>2020-04-06 08:27:39 +0000
commit14a71b74b414df7616ccb5ada3d50ecb90d96bae (patch)
treebfee617c9a4b20ce4c6467ffbbe6c0a15199ba52 /resources/libraries/robot/shared/interfaces.robot
parent8e601d0f37f715ca4ce55dded8bc27cadfe175c2 (diff)
Improve pf layer
+ Merge single/double link + Introduce _pf{n}[0] variables so we can access physical function same way as virtual function + Cleanup code by moving complex logic to python + Prepare code for multiple vf functions Signed-off-by: Peter Mikus <pmikus@cisco.com> Change-Id: Ic2e74a38bfa146441357de8f0916aeb638941c49
Diffstat (limited to 'resources/libraries/robot/shared/interfaces.robot')
-rw-r--r--resources/libraries/robot/shared/interfaces.robot666
1 files changed, 369 insertions, 297 deletions
diff --git a/resources/libraries/robot/shared/interfaces.robot b/resources/libraries/robot/shared/interfaces.robot
index 18bb0d3568..f1dc89d300 100644
--- a/resources/libraries/robot/shared/interfaces.robot
+++ b/resources/libraries/robot/shared/interfaces.robot
@@ -19,147 +19,79 @@
| ${dpdk_no_tx_checksum_offload}= | ${True}
*** Keywords ***
-| Set interfaces in path up
+| Set single interfaces in path up
| | [Documentation]
-| | ... | *Set UP state on VPP interfaces in path on all DUT nodes and set
-| | ... | maximal MTU.*
-| |
-| | FOR | ${dut} | IN | @{duts}
-| | | Set interfaces in path up on DUT | ${dut}
-| | END
-| | All VPP Interfaces Ready Wait | ${nodes} | retries=${300}
-
-| Set interfaces in path up on DUT
-| | [Documentation]
-| | ... | *Set UP state on VPP interfaces in path on specified DUT node and
-| | ... | set maximal MTU.*
+| | ... | *Set UP state on single physical VPP interfaces in path on all DUT
+| | ... | nodes and set maximal MTU.*
| |
| | ... | *Arguments:*
-| | ... | - dut - DUT node on which to set the interfaces up.
-| | ... | Type: string
+| | ... | - pf - NIC physical function (physical port).
+| | ... | Type: integer
| |
| | ... | *Example:*
| |
-| | ... | \| Set interfaces in path up on DUT \| DUT1 \|
+| | ... | \| Set single interfaces in path \| 1 \|
| |
-| | [Arguments] | ${dut}
-# 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 "functional" configuration. This will allow modularity of this
-# library
-| | ${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
-| | ${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}
+| | [Arguments] | ${pf}=${1}
+| |
+| | FOR | ${dut} | IN | @{duts}
+| | | Set interfaces in path up on node on PF | ${dut} | ${pf}
+| | END
+| | All VPP Interfaces Ready Wait | ${nodes} | retries=${60}
-| Set single interfaces in path up
+| Set interfaces in path up
| | [Documentation]
-| | ... | *Set UP state on single VPP interfaces in path on all DUT nodes and set
+| | ... | *Set UP state on VPP interfaces in path on all DUT nodes and set
| | ... | maximal MTU.*
| |
-# 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 "functional" configuration. This will allow modularity of this
-# library
| | FOR | ${dut} | IN | @{duts}
-| | | ${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
+| | | Set interfaces in path up on node | ${dut}
| | END
-| | FOR | ${dut} | IN | @{duts}
-| | | ${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}
-| | END
-| | All VPP Interfaces Ready Wait | ${nodes}
+| | All VPP Interfaces Ready Wait | ${nodes} | retries=${60}
-| Get Vhost dump
-| | [Documentation] | Get vhost-user dump.
-| |
-| | ... | *Arguments:*
-| | ... | - node - DUT node data. Type: dictionary
-| |
-| | [Arguments] | ${dut_node}
-| |
-| | [Return] | ${vhost_dump}
-| |
-| | ${vhost_dump}= | Vhost User Dump | ${dut_node}
-
-| Initialize layer interface on node
+| Set interfaces in path up on node
| | [Documentation]
-| | ... | Baseline interfaces variables to be created.
+| | ... | *Set UP state on VPP interfaces in path on specified DUT node and
+| | ... | set maximal MTU.*
| |
| | ... | *Arguments:*
-| | ... | - dut - DUT node. Type: string
-| | ... | - count - Number of baseline interface variables. Type: integer
+| | ... | - dut - DUT node on which to set the interfaces up.
+| | ... | Type: string
| |
| | ... | *Example:*
| |
-| | ... | \| Initialize layer interface on node \| DUT1 \| 1 \|
+| | ... | \| Set interfaces in path up on node \| DUT1 \|
| |
-| | [Arguments] | ${dut} | ${count}=${1}
+| | [Arguments] | ${dut}
| |
-| | ${dut_str}= | Convert To Lowercase | ${dut}
-| | FOR | ${id} | IN RANGE | 1 | ${count} + 1
-| | | Set Test Variable | ${${dut_str}_if_${id}_1} | ${${dut_str}_if1}
-| | | Set Test Variable | ${${dut_str}_if_${id}_2} | ${${dut_str}_if2}
+| | FOR | ${pf} | IN RANGE | 1 | ${nic_pfs} + 1
+| | | Set interfaces in path up on node on PF | ${dut} | ${pf}
| | END
-| Initialize layer interface
+| Set interfaces in path up on node on PF
| | [Documentation]
-| | ... | Physical interfaces variables to be created on all DUTs.
+| | ... | *Set UP state on VPP interfaces in path on specified DUT node and
+| | ... | set maximal MTU.*
| |
| | ... | *Arguments:*
-| | ... | - count - Number of untagged interfaces variables. Type: integer
+| | ... | - dut - DUT node on which to set the interfaces up.
+| | ... | Type: string
+| | ... | - pf - NIC physical function (physical port).
+| | ... | Type: integer
| |
| | ... | *Example:*
| |
-| | ... | \| Initialize layer interface \| 1 \|
+| | ... | \| Set interfaces in path up on node on PF \| DUT1 \| 1 \|
| |
-| | [Arguments] | ${count}=${1}
+| | [Arguments] | ${dut} | ${pf}
| |
-| | FOR | ${dut} | IN | @{duts}
-| | | Initialize layer interface on node | ${dut} | count=${count}
+| | ${_chains} | ${value}= | Run Keyword And Ignore Error
+| | ... | Variable Should Exist | @{${dut}_${int}${pf}_1}
+| | ${_id}= | Set Variable If | '${_chains}' == 'PASS' | _1 | ${EMPTY}
+| | FOR | ${if} | IN | @{${dut}_${int}${pf}${_id}}
+| | | Set Interface State | ${nodes['${dut}']} | ${if} | up
+| | | VPP Set Interface MTU | ${nodes['${dut}']} | ${if}
| | END
-| | Set Test Variable | ${prev_layer} | if
| Pre-initialize layer driver
| | [Documentation]
@@ -182,8 +114,8 @@
| | ... | Pre-initialize vfio-pci driver by adding related sections to startup
| | ... | config on all DUTs.
| |
-| | Add DPDK pci devices to all DUTs
| | FOR | ${dut} | IN | @{duts}
+| | | Run keyword | ${dut}.Add DPDK Dev | @{${dut}_pf_pci}
| | | Run Keyword If | ${dpdk_no_tx_checksum_offload}
| | | ... | ${dut}.Add DPDK No Tx Checksum Offload
| | | Run Keyword | ${dut}.Add DPDK Log Level | debug
@@ -198,6 +130,10 @@
| | | Run Keyword If | '${crypto_type}' != '${None}'
| | | ... | ${dut}.Add DPDK Cryptodev | ${thr_count_int}
| | END
+| | ${_vlan_strip} | ${value}= | Run Keyword And Ignore Error
+| | ... | Variable Should Exist | ${vlan_strip_off}
+| | Run keyword If | '${_vlan_strip}' == 'PASS' and ${duts_count} == 2
+| | ... | Add DPDK VLAN strip offload switch off between DUTs
| Pre-initialize layer avf on all DUTs
| | [Documentation]
@@ -213,7 +149,7 @@
| Initialize layer driver
| | [Documentation]
-| | ... | Initialize driver based interfaces on each DUT. Interfaces are
+| | ... | Initialize driver based interfaces on all DUT. Interfaces are
| | ... | brought up.
| |
| | ... | *Arguments:*
@@ -227,91 +163,205 @@
| | [Arguments] | ${driver}
| |
| | FOR | ${dut} | IN | @{duts}
-| | | Run Keyword | Initialize layer ${driver} on node | ${dut}
+| | | Initialize layer driver on node | ${dut} | ${driver}
| | END
-| | Set Test Variable | ${prev_layer} | vf
+| | Set Test Variable | ${int} | vf
| | Set interfaces in path up
+| Initialize layer driver on node
+| | [Documentation]
+| | ... | Initialize driver based interfaces on DUT.
+| |
+| | ... | *Arguments:*
+| | ... | - dut - DUT node.
+| | ... | Type: string
+| | ... | - driver - NIC driver used in test [vfio-pci|avf|rdma-core].
+| | ... | Type: string
+| |
+| | ... | *Example:*
+| |
+| | ... | \| Initialize layer driver \| DUT1 \| vfio-pci \|
+| |
+| | [Arguments] | ${dut} | ${driver}
+| |
+| | FOR | ${pf} | IN RANGE | 1 | ${nic_pfs} + 1
+| | | ${_vf}=
+| | | ... | Copy List | ${${dut}_${int}${pf}}
+| | | ${_ip4_addr}=
+| | | ... | Copy List | ${${dut}_${int}${pf}_ip4_addr}
+| | | ${_ip4_prefix}=
+| | | ... | Copy List | ${${dut}_${int}${pf}_ip4_prefix}
+| | | ${_mac}=
+| | | ... | Copy List | ${${dut}_${int}${pf}_mac}
+| | | ${_pci}=
+| | | ... | Copy List | ${${dut}_${int}${pf}_pci}
+| | | ${_vlan}=
+| | | ... | Copy List | ${${dut}_${int}${pf}_vlan}
+| | | Set Test Variable
+| | | ... | ${${dut}_vf${pf}} | ${_vf}
+| | | Set Test Variable
+| | | ... | ${${dut}_vf${pf}_ip4_addr} | ${_ip4_addr}
+| | | Set Suite Variable
+| | | ... | ${${dut}_vf${pf}_ip4_prefix} | ${_ip4_prefix}
+| | | Set Test Variable
+| | | ... | ${${dut}_vf${pf}_mac} | ${_mac}
+| | | Set Test Variable
+| | | ... | ${${dut}_vf${pf}_pci} | ${_pci}
+| | | Set Test Variable
+| | | ... | ${${dut}_vf${pf}_vlan} | ${_vlan}
+| | | Run Keyword | Initialize layer ${driver} on node | ${dut} | ${pf}
+| | END
+
| Initialize layer vfio-pci on node
| | [Documentation]
-| | ... | Initialize vfio-pci interfaces on DUT. Currently no operation.
+| | ... | Initialize vfio-pci interfaces on DUT on NIC PF.
+| | ... | Currently no operation.
| |
| | ... | *Arguments:*
| | ... | - dut - DUT node. Type: string
+| | ... | - pf - NIC physical function (physical port). Type: integer
| |
| | ... | *Example:*
| |
-| | ... | \| Initialize layer vfio-pci on node \| DUT1 \|
+| | ... | \| Initialize layer vfio-pci on node \| DUT1 \| 1 \|
| |
-| | [Arguments] | ${dut}
+| | [Arguments] | ${dut} | ${pf}
| |
| | No operation
| Initialize layer avf on node
| | [Documentation]
-| | ... | Initialize AVF interfaces on DUT.
+| | ... | Initialize AVF (Intel) interfaces on DUT on NIC PF.
| |
| | ... | *Arguments:*
| | ... | - dut - DUT node. Type: string
+| | ... | - pf - NIC physical function (physical port). Type: integer
| |
| | ... | *Example:*
| |
-| | ... | \| Initialize layer avf on node \| DUT1 \|
+| | ... | \| Initialize layer avf on node \| DUT1 \| 1 \|
+| |
+| | [Arguments] | ${dut} | ${pf}
+| |
+| | FOR | ${vf} | IN RANGE | 0 | ${nic_vfs}
+| | | ${_avf}= | VPP Create AVF Interface
+| | | ... | ${nodes['${dut}']} | ${${dut}_vf${pf}}[${vf}]
+| | | ... | num_rx_queues=${rxq_count_int}
+| | | ... | rxq_size=${nic_rxq_size} | txq_size=${nic_txq_size}
+| | | ${_ip4}=
+| | | ... | Get Interface IP4 | ${nodes['${dut}']} | ${_avf}
+| | | ${_ip4_prefix}=
+| | | ... | Get Interface IP4 Prefix Length | ${nodes['${dut}']} | ${_avf}
+| | | ${_mac}=
+| | | ... | Get Interface MAC | ${nodes['${dut}']} | ${_avf}
+| | | ${_pci}=
+| | | ... | Get Interface PCI Addr | ${nodes['${dut}']} | ${_avf}
+| | | ${_vlan}=
+| | | ... | Get Interface VLAN | ${nodes['${dut}']} | ${_avf}
+| | | Set List Value | ${${dut}_vf${pf}} | ${vf} | ${_avf}
+| | | Set List Value | ${${dut}_vf${pf}_ip4_addr} | ${vf} | ${_ip4}
+| | | Set List Value | ${${dut}_vf${pf}_ip4_prefix} | ${vf} | ${_ip4_prefix}
+| | | Set List Value | ${${dut}_vf${pf}_mac} | ${vf} | ${_mac}
+| | | Set List Value | ${${dut}_vf${pf}_pci} | ${vf} | ${_pci}
+| | | Set List Value | ${${dut}_vf${pf}_vlan} | ${vf} | ${_vlan}
+| | END
+
+| Initialize layer rdma-core on node
+| | [Documentation]
+| | ... | Initialize rdma-core (Mellanox VPP) interfaces on DUT on NIC PF.
| |
-| | [Arguments] | ${dut}
+| | ... | *Arguments:*
+| | ... | - dut - DUT node. Type: string
+| | ... | - pf - NIC physical function (physical port). Type: integer
| |
-| | ${dut_str}= | Convert To Lowercase | ${dut}
-| | ${if1_vlan}= | Get Interface Vlan | ${nodes['${dut}']} | ${${dut}_if1}
-| | ${if2_vlan}= | Get Interface Vlan | ${nodes['${dut}']} | ${${dut}_if2}
-| | Set Test Variable | ${${dut_str}_vlan1} | ${if1_vlan}
-| | Set Test Variable | ${${dut_str}_vlan2} | ${if2_vlan}
-| | ${dut_new_if1}= | VPP Create AVF Interface | ${nodes['${dut}']}
-| | ... | ${${dut}_if1_vf0} | num_rx_queues=${rxq_count_int}
-| | ... | rxq_size=${nic_rxq_size} | txq_size=${nic_txq_size}
-| | ${dut_new_if1_mac}= | Get Interface MAC | ${nodes['${dut}']}
-| | ... | ${dut_new_if1}
-| | ${dut_new_if2}= | VPP Create AVF Interface | ${nodes['${dut}']}
-| | ... | ${${dut}_if2_vf0} | num_rx_queues=${rxq_count_int}
+| | ... | *Example:*
+| |
+| | ... | \| Initialize layer rdma-core on node \| DUT1 \| 1 \|
+| |
+| | [Arguments] | ${dut} | ${pf}
+| |
+| | ${_rdma}= | VPP Create Rdma Interface
+| | ... | ${nodes['${dut}']} | ${${dut}_vf${pf}}[0]
+| | ... | num_rx_queues=${rxq_count_int}
| | ... | rxq_size=${nic_rxq_size} | txq_size=${nic_txq_size}
-| | ${dut_new_if2_mac}= | Get Interface MAC | ${nodes['${dut}']}
-| | ... | ${dut_new_if2}
-| | Set Test Variable | ${${dut_str}_if1} | ${dut_new_if1}
-| | Set Test Variable | ${${dut_str}_if2} | ${dut_new_if2}
-| | Set Test Variable | ${${dut_str}_if1_mac} | ${dut_new_if1_mac}
-| | Set Test Variable | ${${dut_str}_if2_mac} | ${dut_new_if2_mac}
+| | Set List Value | ${${dut}_vf${pf}} | 0 | ${_rdma}
-| Initialize layer rdma-core on node
+| Initialize layer interface
| | [Documentation]
-| | ... | Initialize rdma-core (MLX) interfaces on DUT.
+| | ... | Physical interfaces variables to be created on all DUTs.
+| |
+| | ... | *Arguments:*
+| | ... | - count - Number of untagged interfaces variables. Type: integer
+| |
+| | ... | *Example:*
+| |
+| | ... | \| Initialize layer interface \| 1 \|
+| |
+| | [Arguments] | ${count}=${1}
+| |
+| | FOR | ${dut} | IN | @{duts}
+| | | Initialize layer interface on node | ${dut} | count=${count}
+| | END
+
+| Initialize layer interface on node
+| | [Documentation]
+| | ... | Physical interfaces variables to be created on all DUTs.
| |
| | ... | *Arguments:*
| | ... | - dut - DUT node. Type: string
+| | ... | - count - Number of baseline interface variables. Type: integer
| |
| | ... | *Example:*
| |
-| | ... | \| Initialize layer rdma-core on node \| DUT1 \|
+| | ... | \| Initialize layer interface on node \| DUT1 \| 1 \|
| |
-| | [Arguments] | ${dut}
+| | [Arguments] | ${dut} | ${count}=${1}
| |
-| | ${dut_str}= | Convert To Lowercase | ${dut}
-| | ${if1_vlan}= | Get Interface Vlan | ${nodes['${dut}']} | ${${dut}_if1}
-| | ${if2_vlan}= | Get Interface Vlan | ${nodes['${dut}']} | ${${dut}_if2}
-| | Set Test Variable | ${${dut_str}_vlan1} | ${if1_vlan}
-| | Set Test Variable | ${${dut_str}_vlan2} | ${if2_vlan}
-| | ${dut_new_if1}= | VPP Create Rdma Interface | ${nodes['${dut}']}
-| | ... | ${${dut}_if1} | num_rx_queues=${rxq_count_int}
-| | ... | rxq_size=${nic_rxq_size} | txq_size=${nic_txq_size}
-| | ${dut_new_if1_mac}= | Get Interface MAC | ${nodes['${dut}']}
-| | ... | ${dut_new_if1}
-| | ${dut_new_if2}= | VPP Create Rdma Interface | ${nodes['${dut}']}
-| | ... | ${${dut}_if2} | num_rx_queues=${rxq_count_int}
-| | ... | rxq_size=${nic_rxq_size} | txq_size=${nic_txq_size}
-| | ${dut_new_if2_mac}= | Get Interface MAC | ${nodes['${dut}']}
-| | ... | ${dut_new_if2}
-| | Set Test Variable | ${${dut_str}_if1} | ${dut_new_if1}
-| | Set Test Variable | ${${dut_str}_if2} | ${dut_new_if2}
-| | Set Test Variable | ${${dut_str}_if1_mac} | ${dut_new_if1_mac}
-| | Set Test Variable | ${${dut_str}_if2_mac} | ${dut_new_if2_mac}
+| | FOR | ${pf} | IN RANGE | 1 | ${nic_pfs} + 1
+| | | Initialize layer interface on node on PF | ${dut} | ${pf} | count=${count}
+| | END
+
+| Initialize layer interface on node on PF
+| | [Documentation]
+| | ... | Baseline interfaces variables to be created.
+| |
+| | ... | *Arguments:*
+| | ... | - dut - DUT node. Type: string
+| | ... | - pf - NIC physical function (physical port). Type: integer
+| | ... | - count - Number of baseline interface variables. Type: integer
+| |
+| | ... | *Example:*
+| |
+| | ... | \| Initialize layer interface on node on PF \| DUT1 \| 1 \| 1 \|
+| |
+| | [Arguments] | ${dut} | ${pf} | ${count}=${1}
+| |
+| | FOR | ${id} | IN RANGE | 1 | ${count} + 1
+| | | Set Test Variable
+| | | ... | ${${dut}_${int}${pf}_${id}} | ${${dut}_${int}${pf}}
+| | END
+
+| Initialize layer bonding
+| | [Documentation]
+| | ... | Bonded interfaces and variables to be created on all DUT's interfaces.
+| |
+| | ... | *Arguments:*
+| | ... | - bond_mode - Link bonding mode. Type: string
+| | ... | - lb_mode - Load balance mode. Type: string
+| | ... | - count - Number of bond interface variables. Type: integer
+| |
+| | ... | *Example:*
+| |
+| | ... | \| Initialize layer bonding \| xor \| l34 \| 1 \|
+| |
+| | [Arguments] | ${bond_mode}=xor | ${lb_mode}=l34 | ${count}=${1}
+| |
+| | FOR | ${dut} | IN | @{duts}
+| | | Initialize layer bonding on node
+| | | ... | ${dut} | bond_mode=${bond_mode} | lb_mode=${lb_mode}
+| | | ... | count=${count}
+| | END
+| | Set Test Variable | ${int} | bond
| Initialize layer bonding on node
| | [Documentation]
@@ -330,101 +380,80 @@
| |
| | [Arguments] | ${dut} | ${bond_mode}=xor | ${lb_mode}=l34 | ${count}=${1}
| |
-| | ${dut_str}= | Convert To Lowercase | ${dut}
| | ${if_index}= | VPP Create Bond Interface
| | ... | ${nodes['${dut}']} | ${bond_mode} | load_balance=${lb_mode}
| | ... | mac=00:00:00:01:01:01
| | Set Interface State | ${nodes['${dut}']} | ${if_index} | up
| | VPP Enslave Physical Interface
-| | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_1_1} | ${if_index}
+| | ... | ${nodes['${dut}']} | ${${dut}_${int}1_1} | ${if_index}
| | VPP Enslave Physical Interface
-| | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_1_2} | ${if_index}
+| | ... | ${nodes['${dut}']} | ${${dut}_${int}2_1} | ${if_index}
| | FOR | ${id} | IN RANGE | 1 | ${count} + 1
-| | | Set Test Variable | ${${dut_str}_bond_${id}_1} | ${if_index}
-| | | Set Test Variable | ${${dut_str}_bond_${id}_2} | ${if_index}
+| | | Set Test Variable | ${${dut}_bond1_${id}} | ${if_index}
+| | | Set Test Variable | ${${dut}_bond2_${id}} | ${if_index}
| | END
-| Initialize layer bonding
+| Initialize layer dot1q
| | [Documentation]
-| | ... | Bonded interfaces and variables to be created on all DUT's interfaces.
+| | ... | Dot1q interfaces and variables to be created on all DUTs.
| |
| | ... | *Arguments:*
-| | ... | - bond_mode - Link bonding mode. Type: string
-| | ... | - lb_mode - Load balance mode. Type: string
-| | ... | - count - Number of bond interface variables. Type: integer
+| | ... | - count - Number of chains.
+| | ... | Type: integer
+| | ... | - vlan_per_chain - Whether to create vlan subinterface for each chain.
+| | ... | Type: boolean
+| | ... | - start - Id of first chain, allows adding chains during test.
+| | ... | Type: integer
| |
-| | ... | *Example:*
+| | ... | \| Initialize layer dot1q \| 1 \| True \| 1 \|
| |
-| | ... | \| Initialize layer bonding \| xor \| l34 \| 1 \|
-| |
-| | [Arguments] | ${bond_mode}=xor | ${lb_mode}=l34 | ${count}=${1}
+| | [Arguments] | ${count}=${1} | ${vlan_per_chain}=${True} | ${start}=${1}
| |
| | FOR | ${dut} | IN | @{duts}
-| | | Initialize layer bonding on node
-| | | ... | ${dut} | bond_mode=${bond_mode} | lb_mode=${lb_mode}
-| | | ... | count=${count}
+| | | Initialize layer dot1q on node
+| | | ... | ${dut} | count=${count} | vlan_per_chain=${vlan_per_chain}
+| | | ... | start=${start}
| | END
-| | Set Test Variable | ${prev_layer} | bond
+| | Set Test Variable | ${int} | dot1q
-| Initialize layer dot1q on node for chain
+| Initialize layer dot1q on node
| | [Documentation]
-| | ... | Optionally create tag popping subinterface per chain.
-| | ... | Return interface indices for dot1q layer interfaces,
-| | ... | or Nones if subinterfaces are not created.
+| | ... | Dot1q interfaces and variables to be created on all DUT's node.
| |
| | ... | *Arguments:*
-| | ... | - dut - DUT node. Type: string
-| | ... | - id - Positive index of the chain. Type: integer
+| | ... | - dut - DUT node.
+| | ... | Type: string
+| | ... | - count - Number of chains.
+| | ... | Type: integer
| | ... | - vlan_per_chain - Whether to create vlan subinterface for each chain.
| | ... | Type: boolean
+| | ... | - start - Id of first chain, allows adding chains during test.
+| | ... | Type: integer
| |
| | ... | *Example:*
| |
-| | ... | \| Initialize layer dot1q on node for chain \| DUT1 \| 1 \| True \|
+| | ... | \| Initialize layer dot1q on node \| DUT1 \| 1 \| True \| 1 \|
| |
-| | [Arguments] | ${dut} | ${id} | ${vlan_per_chain}=${True}
+| | [Arguments] | ${dut} | ${count}=${1} | ${vlan_per_chain}=${True}
+| | ... | ${start}=${1}
| |
-| | ${dut_str}= | Convert To Lowercase | ${dut}
-| | Return From Keyword If | ${id} != ${1} and not ${vlan_per_chain}
-| | ... | ${NONE} | ${NONE}
-| | # TODO: Is it worth creating Get Variable Value If Not None keyword?
-| | ${default}= | Evaluate | ${100} + ${id} - ${1}
-| | ${if1_vlan}= | Get Variable Value | \${${dut_str}_vlan1}
-| | ${if1_vlan}= | Set Variable If | '${if1_vlan}' != '${NONE}'
-| | ... | ${if1_vlan} | ${default}
-| | ${default}= | Evaluate | ${200} + ${id} - ${1}
-| | ${if2_vlan}= | Get Variable Value | \${${dut_str}_vlan2}
-| | ${if2_vlan}= | Set Variable If | '${if2_vlan}' != '${NONE}'
-| | ... | ${if2_vlan} | ${default}
-| | ${if1_name} | ${if1_index}= | Create Vlan Subinterface
-| | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_${id}_1}
-| | ... | ${if1_vlan}
-| | ${if2_name} | ${if2_index}= | Create Vlan Subinterface
-| | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_${id}_2}
-| | ... | ${if2_vlan}
-| | Set Interface State | ${nodes['${dut}']} | ${if1_index} | up
-| | Set Interface State | ${nodes['${dut}']} | ${if2_index} | up
-| | Configure L2 tag rewrite method on interfaces
-| | ... | ${nodes['${dut}']} | ${if1_index} | TAG_REWRITE_METHOD=pop-1
-| | Configure L2 tag rewrite method on interfaces
-| | ... | ${nodes['${dut}']} | ${if2_index} | TAG_REWRITE_METHOD=pop-1
-| | Return From Keyword | ${if1_index} | ${if2_index}
+| | FOR | ${pf} | IN RANGE | 1 | ${nic_pfs} + 1
+| | | Initialize layer dot1q on node on PF | ${dut} | pf=${pf} | count=${count}
+| | | ... | vlan_per_chain=${vlan_per_chain} | start=${start}
+| | END
-| Initialize layer dot1q on node
+| Initialize layer dot1q on node on PF
| | [Documentation]
| | ... | Dot1q interfaces and variables to be created on all DUT's node
| | ... | interfaces.
| |
-| | ... | TODO: Unify names for number of chains/pipelines/instances/interfaces.
-| | ... | Chose names and descriptions that makes sense for both
-| | ... | nf_density and older tests.
-| | ... | Note that with vlan_per_chain=False it is not a number of interfaces.
-| | ... | At least not number of real interfaces, just number of aliases.
-| | ... | This TODO applies also to all keywords with nf_chains argument.
-| |
| | ... | *Arguments:*
-| | ... | - dut - DUT node. Type: string
-| | ... | - count - Number of chains. Type: integer
+| | ... | - dut - DUT node.
+| | ... | Type: string
+| | ... | - pf - NIC physical function (physical port).
+| | ... | Type: integer
+| | ... | - count - Number of chains.
+| | ... | Type: integer
| | ... | - vlan_per_chain - Whether to create vlan subinterface for each chain.
| | ... | Type: boolean
| | ... | - start - Id of first chain, allows adding chains during test.
@@ -432,44 +461,76 @@
| |
| | ... | *Example:*
| |
-| | ... | \| Initialize layer dot1q on node \| DUT1 \| 3 \| True \| 2 \|
+| | ... | \| Initialize layer dot1q on node on PF \| DUT1 \| 3 \| True \| 2 \|
| |
-| | [Arguments] | ${dut} | ${count}=${1} | ${vlan_per_chain}=${True}
-| | ... | ${start}=${1}
+| | [Arguments] | ${dut} | ${pf}=${1} | ${count}=${1}
+| | ... | ${vlan_per_chain}=${True} | ${start}=${1}
| |
-| | ${dut_str}= | Convert To Lowercase | ${dut}
| | FOR | ${id} | IN RANGE | ${start} | ${count} + 1
-| | | ${if1_index} | ${if2_index}= | Initialize layer dot1q on node for chain
-| | | ... | dut=${dut} | id=${id} | vlan_per_chain=${vlan_per_chain}
+| | | ${_dot1q} | Initialize layer dot1q on node on PF for chain
+| | | ... | dut=${dut} | pf=${pf} | id=${id} | vlan_per_chain=${vlan_per_chain}
| | | # First id results in non-None indices, after that _1_ are defined.
-| | | ${if1_index}= | Set Variable If | '${if1_index}' == '${NONE}'
-| | | ... | ${${dut_str}_dot1q_1_1} | ${if1_index}
-| | | ${if2_index}= | Set Variable If | '${if2_index}' == '${NONE}'
-| | | ... | ${${dut_str}_dot1q_1_2} | ${if2_index}
-| | | Set Test Variable | ${${dut_str}_dot1q_${id}_1} | ${if1_index}
-| | | Set Test Variable | ${${dut_str}_dot1q_${id}_2} | ${if2_index}
+| | | ${_dot1q}= | Set Variable If | '${_dot1q}' == '${NONE}'
+| | | ... | ${${dut}_dot1q${pf}_1} | ${_dot1q}
+| | | ${_dot1q}= | Create List | ${_dot1q}
+| | | Set Test Variable | ${${dut}_dot1q${pf}_${id}} | ${_dot1q}
| | END
-| Initialize layer dot1q
+| Initialize layer dot1q on node on PF for chain
| | [Documentation]
-| | ... | Dot1q interfaces and variables to be created on all DUT's interfaces.
+| | ... | Optionally create tag popping subinterface per chain.
+| | ... | Return interface indices for dot1q layer interfaces,
+| | ... | or Nones if subinterfaces are not created.
| |
| | ... | *Arguments:*
-| | ... | - count - Number of chains. Type: integer
+| | ... | - dut - DUT node.
+| | ... | Type: string
+| | ... | - pf - NIC physical function (physical port).
+| | ... | Type: integer
+| | ... | - id - Positive index of the chain.
+| | ... | Type: integer
| | ... | - vlan_per_chain - Whether to create vlan subinterface for each chain.
| | ... | Type: boolean
+| |
+| | ... | *Example:*
+| |
+| | ... | \| Initialize layer dot1q on node on PF for chain \| DUT1 \
+| | ... | \| 1 \| 1 \| True \|
+| |
+| | [Arguments] | ${dut} | ${pf} | ${id} | ${vlan_per_chain}=${True}
+| |
+| | Return From Keyword If | ${id} != ${1} and not ${vlan_per_chain}
+| | ... | ${NONE} | ${NONE}
+| | ${_default}= | Evaluate | ${pf} * ${100} + ${id} - ${1}
+| | ${_vlan}= | Get Variable Value | \${${dut}_pf${pf}_vlan}
+| | ${_vlan}= | Set Variable If | '${_vlan}[0]' != '${NONE}'
+| | ... | ${_vlan}[0] | ${_default}
+| | ${_name} | ${_index}= | Create Vlan Subinterface
+| | ... | ${nodes['${dut}']} | ${${dut}_${int}${pf}_${id}}[0] | ${_vlan}
+| | Set Interface State | ${nodes['${dut}']} | ${_index} | up
+| | Configure L2 tag rewrite method on interfaces
+| | ... | ${nodes['${dut}']} | ${_index} | TAG_REWRITE_METHOD=pop-1
+| | Return From Keyword | ${_index}
+
+| Initialize layer ip4vxlan
+| | [Documentation]
+| | ... | VXLAN interfaces and variables to be created on all DUT's interfaces.
+| |
+| | ... | *Arguments:*
+| | ... | - count - Number of vxlan interfaces.
+| | ... | Type: integer
| | ... | - start - Id of first chain, allows adding chains during test.
| | ... | Type: integer
| |
-| | ... | \| Initialize layer dot1q \| 3 \| True \| 2 \|
+| | ... | \| Initialize layer ip4vxlan \| 3 \| 2 \|
| |
-| | [Arguments] | ${count}=${1} | ${vlan_per_chain}=${True} | ${start}=${1}
+| | [Arguments] | ${count}=${1} | ${start}=${1}
| |
| | FOR | ${dut} | IN | @{duts}
-| | | Initialize layer dot1q on node | ${dut} | count=${count}
-| | | ... | vlan_per_chain=${vlan_per_chain} | start=${start}
+| | | Initialize layer ip4vxlan on node | ${dut} | count=${count}
+| | | ... | start=${start}
| | END
-| | Set Test Variable | ${prev_layer} | dot1q
+| | Set Test Variable | ${int} | ip4vxlan
| Initialize layer ip4vxlan on node
| | [Documentation]
@@ -479,8 +540,10 @@
| | ... | towards TG. VXLAN sub-interfaces has same IPv4 address as interfaces.
| |
| | ... | *Arguments:*
-| | ... | - dut - DUT node. Type: string
-| | ... | - count - Number of vxlan interfaces. Type: integer
+| | ... | - dut - DUT node.
+| | ... | Type: string
+| | ... | - count - Number of vxlan interfaces.
+| | ... | Type: integer
| | ... | - start - Id of first chain, allows adding chains during test.
| | ... | Type: integer
| |
@@ -490,75 +553,75 @@
| |
| | [Arguments] | ${dut} | ${count}=${1} | ${start}=${1}
| |
-| | ${dut_str}= | Convert To Lowercase | ${dut}
-| | Run Keyword If | "${start}" == "1" | VPP Interface Set IP Address
-| | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_1_1}
-| | ... | 172.16.0.1 | 24
-| | Run Keyword If | "${start}" == "1" | VPP Interface Set IP Address
-| | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_1_2}
-| | ... | 172.26.0.1 | 24
-| | FOR | ${id} | IN RANGE | ${start} | ${count} + 1
-| | | ${subnet}= | Evaluate | ${id} - 1
-| | | ${vni}= | Evaluate | ${id} - 1
-| | | ${ip4vxlan_1}= | Create VXLAN interface
-| | | ... | ${nodes['${dut}']} | ${vni} | 172.16.0.1 | 172.17.${subnet}.2
-| | | ${ip4vxlan_2}= | Create VXLAN interface
-| | | ... | ${nodes['${dut}']} | ${vni} | 172.26.0.1 | 172.27.${subnet}.2
-| | | ${prev_mac}= | Set Variable If | '${dut}' == 'DUT1'
-| | | ... | ${tg_if1_mac} | ${dut1_if2_mac}
-| | | ${next_mac}= | Set Variable If | '${dut}' == 'DUT1' and ${duts_count} == 2
-| | | ... | ${dut2_if1_mac} | ${tg_if2_mac}
-| | | VPP Add IP Neighbor
-| | | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_${id}_1}
-| | | ... | 172.16.${subnet}.2 | ${prev_mac}
-| | | VPP Add IP Neighbor
-| | | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_${id}_2}
-| | | ... | 172.26.${subnet}.2 | ${next_mac}
-| | | VPP Route Add
-| | | ... | ${nodes['${dut}']} | 172.17.${subnet}.0 | 24
-| | | ... | gateway=172.16.${subnet}.2
-| | | ... | interface=${${dut_str}_${prev_layer}_${id}_1}
-| | | VPP Route Add
-| | | ... | ${nodes['${dut}']} | 172.27.${subnet}.0 | 24
-| | | ... | gateway=172.26.${subnet}.2
-| | | ... | interface=${${dut_str}_${prev_layer}_${id}_2}
-| | | Set VXLAN Bypass
-| | | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_${id}_1}
-| | | Set VXLAN Bypass
-| | | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_${id}_2}
-| | | Set Test Variable
-| | | ... | ${${dut_str}_ip4vxlan_${id}_1} | ${ip4vxlan_1}
-| | | Set Test Variable
-| | | ... | ${${dut_str}_ip4vxlan_${id}_2} | ${ip4vxlan_2}
+| | FOR | ${pf} | IN RANGE | 1 | ${nic_pfs} + 1
+| | | Initialize layer ip4vxlan on node on PF | ${dut} | pf=${pf}
+| | | ... | count=${count} | start=${start}
| | END
-| Initialize layer ip4vxlan
+| Initialize layer ip4vxlan on node on PF
| | [Documentation]
-| | ... | VXLAN interfaces and variables to be created on all DUT's interfaces.
+| | ... | Setup VXLANoIPv4 between TG and DUTs and DUT to DUT by connecting
+| | ... | physical and vxlan interfaces on each DUT. All interfaces are brought
+| | ... | up. IPv4 addresses with prefix /24 are configured on interfaces
+| | ... | towards TG. VXLAN sub-interfaces has same IPv4 address as interfaces.
| |
| | ... | *Arguments:*
-| | ... | - count - Number of vxlan interfaces. Type: integer
+| | ... | - dut - DUT node.
+| | ... | Type: string
+| | ... | - pf - NIC physical function (physical port).
+| | ... | Type: integer
+| | ... | - count - Number of vxlan interfaces.
+| | ... | Type: integer
| | ... | - start - Id of first chain, allows adding chains during test.
| | ... | Type: integer
| |
-| | ... | \| Initialize layer ip4vxlan \| 3 \| 2 \|
+| | ... | *Example:*
| |
-| | [Arguments] | ${count}=${1} | ${start}=${1}
+| | ... | \| Initialize layer ip4vxlan on node on PF \| DUT1 \| 3 \| 2 \|
| |
-| | FOR | ${dut} | IN | @{duts}
-| | | Initialize layer ip4vxlan on node | ${dut} | count=${count}
-| | ... | start=${start}
+| | [Arguments] | ${dut} | ${pf}=${1} | ${count}=${1} | ${start}=${1}
+| |
+| | Run Keyword If | "${start}" == "1" | VPP Interface Set IP Address
+| | ... | ${nodes['${dut}']} | ${${dut}_${int}${pf}_1}[0]
+| | ... | 172.${pf}6.0.1 | 24
+| | FOR | ${id} | IN RANGE | ${start} | ${count} + 1
+| | | ${_subnet}= | Evaluate | ${id} - 1
+| | | ${_vni}= | Evaluate | ${id} - 1
+| | | ${_ip4vxlan}= | Create VXLAN interface
+| | | ... | ${nodes['${dut}']} | ${_vni}
+| | | ... | 172.${pf}6.0.1 | 172.${pf}7.${_subnet}.2
+| | | ${_prev_mac}= | Set Variable If | '${dut}' == 'DUT1'
+| | | ... | ${tg_if1_mac} | ${dut1_if2_mac}
+| | | ${_next_mac}= | Set Variable If | '${dut}' == 'DUT1' and ${duts_count} == 2
+| | | ... | ${dut2_if1_mac} | ${tg_if2_mac}
+| | | ${_even}= | Evaluate | ${pf} % 2
+| | | ${_mac}= | Set Variable If | ${_even}
+| | | ... | ${_prev_mac} | ${_next_mac}
+| | | VPP Add IP Neighbor
+| | | ... | ${nodes['${dut}']} | ${${dut}_${int}${pf}_${id}}[0]
+| | | ... | 172.${pf}6.${_subnet}.2 | ${_mac}
+| | | VPP Route Add
+| | | ... | ${nodes['${dut}']} | 172.${pf}7.${_subnet}.0 | 24
+| | | ... | gateway=172.${pf}6.${_subnet}.2
+| | | ... | interface=${${dut}_${int}${pf}_${id}}[0]
+| | | Set VXLAN Bypass
+| | | ... | ${nodes['${dut}']} | ${${dut}_${int}${pf}_${id}}[0]
+| | | ${_ip4vxlan}= | Create List | ${_ip4vxlan}
+| | | Set Test Variable
+| | | ... | ${${dut}_ip4vxlan${pf}_${id}} | ${_ip4vxlan}
| | END
-| | Set Test Variable | ${prev_layer} | ip4vxlan
| Configure vhost interfaces
| | [Documentation]
| | ... | Create two Vhost-User interfaces on defined VPP node.
| |
| | ... | *Arguments:*
-| | ... | - ${dut_node} - DUT node. Type: dictionary
-| | ... | - ${sock1} - Socket path for first Vhost-User interface. Type: string
-| | ... | - ${sock2} - Socket path for second Vhost-User interface. Type: string
+| | ... | - ${dut_node} - DUT node.
+| | ... | Type: dictionary
+| | ... | - ${sock1} - Socket path for first Vhost-User interface.
+| | ... | Type: string
+| | ... | - ${sock2} - Socket path for second Vhost-User interface.
+| | ... | Type: string
| | ... | - ${vhost_if1} - Name of the first Vhost-User interface (Optional).
| | ... | Type: string
| | ... | - ${vhost_if2} - Name of the second Vhost-User interface (Optional).
@@ -576,9 +639,6 @@
| |
| | ... | \| Configure vhost interfaces \
| | ... | \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \|
-| | ... | \| Configure vhost interfaces \
-| | ... | \| ${nodes['DUT2']} \| /tmp/sock1 \| /tmp/sock2 \| dut2_vhost_if1 \
-| | ... | \| dut2_vhost_if2 \|
| |
| | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${vhost_if1}=vhost_if1
| | ... | ${vhost_if2}=vhost_if2 | ${is_server}=${False}
@@ -600,3 +660,15 @@
| | Set Test Variable | ${${vhost_if2}} | ${vhost_2}
| | Set Test Variable | ${${vhost_if1}_mac} | ${vhost_1_mac}
| | Set Test Variable | ${${vhost_if2}_mac} | ${vhost_2_mac}
+
+| Get Vhost dump
+| | [Documentation] | Get vhost-user dump.
+| |
+| | ... | *Arguments:*
+| | ... | - dut - DUT node data.
+| | ... | Type: dictionary
+| |
+| | [Arguments] | ${dut}
+| |
+| | ${vhost_dump}= | Vhost User Dump | ${dut}
+| | Return From Keyword | ${vhost_dump}