X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fshared%2Finterfaces.robot;h=3d2b70d065cfcda528831d08920b24ef5c26a376;hp=29698dddb04b682647194fae17b375d4fb79b377;hb=d68951ac245150eeefa6e0f4156e4c1b5c9e9325;hpb=3e664d4a46aecf847659df2fe3d2572697b582a7

diff --git a/resources/libraries/robot/shared/interfaces.robot b/resources/libraries/robot/shared/interfaces.robot
index 29698dddb0..3d2b70d065 100644
--- a/resources/libraries/robot/shared/interfaces.robot
+++ b/resources/libraries/robot/shared/interfaces.robot
@@ -13,18 +13,19 @@
 *** Settings ***
 | Library | resources.libraries.python.InterfaceUtil
 | Library | resources.libraries.python.NodePath
+| Library | resources.libraries.python.VhostUser
 
 *** Keywords ***
 | Set interfaces in path up
 | | [Documentation]
 | | ... | *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}
+| | FOR | ${dut} | IN | @{duts}
 | | | ${if1_status} | ${value}= | Run Keyword And Ignore Error
 | | | ... | Variable Should Exist | ${${dut}_if1}
 | | | Run Keyword If | '${if1_status}' == 'PASS'
@@ -41,7 +42,8 @@
 | | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if2_1} | up
 | | | Run Keyword Unless | '${if2_status}' == 'PASS'
 | | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if2_2} | up
-| | :FOR | ${dut} | IN | @{duts}
+| | END
+| | FOR | ${dut} | IN | @{duts}
 | | | ${if1_status} | ${value}= | Run Keyword And Ignore Error
 | | | ... | Variable Should Exist | ${${dut}_if1}
 | | | Run Keyword If | '${if1_status}' == 'PASS'
@@ -58,18 +60,19 @@
 | | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if2_1}
 | | | Run Keyword Unless | '${if2_status}' == 'PASS'
 | | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if2_2}
+| | END
 | | All VPP Interfaces Ready Wait | ${nodes} | retries=${300}
 
 | Set single interfaces in path up
 | | [Documentation]
 | | ... | *Set UP state on single 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}
+| | FOR | ${dut} | IN | @{duts}
 | | | ${if1_status} | ${value}= | Run Keyword And Ignore Error
 | | | ... | Variable Should Exist | ${${dut}_if1}
 | | | Run Keyword If | '${if1_status}' == 'PASS'
@@ -78,7 +81,8 @@
 | | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if1_1} | up
 | | | Run Keyword Unless | '${if1_status}' == 'PASS'
 | | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if1_2} | up
-| | :FOR | ${dut} | IN | @{duts}
+| | END
+| | FOR | ${dut} | IN | @{duts}
 | | | ${if1_status} | ${value}= | Run Keyword And Ignore Error
 | | | ... | Variable Should Exist | ${${dut}_if1}
 | | | Run Keyword If | '${if1_status}' == 'PASS'
@@ -87,70 +91,157 @@
 | | | ... | 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}
 
 | 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
 | | [Documentation]
 | | ... | Baseline interfaces variables to be created.
-| | ...
+| |
 | | ... | *Arguments:*
 | | ... | - dut - DUT node. Type: string
 | | ... | - count - Number of baseline interface variables. Type: integer
-| | ...
+| |
 | | ... | *Example:*
-| | ...
+| |
 | | ... | \| Initialize layer interface on node \| DUT1 \| 1 \|
-| | ...
+| |
 | | [Arguments] | ${dut} | ${count}=${1}
-| | ...
+| |
 | | ${dut_str}= | Convert To Lowercase | ${dut}
-| | :FOR | ${id} | IN RANGE | 1 | ${count} + 1
+| | 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}
+| | END
 
 | Initialize layer interface
 | | [Documentation]
 | | ... | 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}
+| |
+| | FOR | ${dut} | IN | @{duts}
 | | | Initialize layer interface on node | ${dut} | count=${count}
+| | END
 | | Set Test Variable | ${prev_layer} | if
+
+| Pre-initialize layer driver
+| | [Documentation]
+| | ... | Pre-initialize driver based interfaces on each DUT.
+| |
+| | ... | *Arguments:*
+| | ... | - driver - NIC driver used in test [vfio-pci|avf|rdma-core].
+| | ... | Type: string
+| |
+| | ... | *Example:*
+| |
+| | ... | \| Pre-initialize layer driver \| vfio-pci \|
+| |
+| | [Arguments] | ${driver}
+| |
+| | Run Keyword | Pre-initialize layer ${driver} on all DUTs
+
+| Pre-initialize layer vfio-pci on all DUTs
+| | [Documentation]
+| | ... | 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 No Tx Checksum Offload
+| | | Run Keyword | ${dut}.Add DPDK Log Level | debug
+| | | Run Keyword | ${dut}.Add DPDK Uio Driver | vfio-pci
+| | | Run Keyword | ${dut}.Add DPDK Dev Default RXQ | ${rxq_count_int}
+| | | Run Keyword If | not ${jumbo}
+| | | ... | ${dut}.Add DPDK No Multi Seg
+| | | Run Keyword If | ${rxd_count_int}
+| | | ... | ${dut}.Add DPDK Dev Default RXD | ${rxd_count_int}
+| | | Run Keyword If | ${txd_count_int}
+| | | ... | ${dut}.Add DPDK Dev Default TXD | ${txd_count_int}
+| | | Run Keyword If | '${crypto_type}' != '${None}'
+| | | ... | ${dut}.Add DPDK Cryptodev | ${thr_count_int}
+| | END
+
+| Pre-initialize layer avf on all DUTs
+| | [Documentation]
+| | ... | Pre-initialize avf driver. Currently no operation.
+| |
+| | No operation
+
+| Pre-initialize layer rdma-core on all DUTs
+| | [Documentation]
+| | ... | Pre-initialize rdma-core driver. Currently no operation.
+| |
+| | No operation
+
+| Initialize layer driver
+| | [Documentation]
+| | ... | Initialize driver based interfaces on each DUT. Interfaces are
+| | ... | brought up.
+| |
+| | ... | *Arguments:*
+| | ... | - driver - NIC driver used in test [vfio-pci|avf|rdma-core].
+| | ... | Type: string
+| |
+| | ... | *Example:*
+| |
+| | ... | \| Initialize layer driver \| vfio-pci \|
+| |
+| | [Arguments] | ${driver}
+| |
+| | FOR | ${dut} | IN | @{duts}
+| | | Run Keyword | Initialize layer ${driver} on node | ${dut}
+| | END
+| | Set Test Variable | ${prev_layer} | vf
 | | Set interfaces in path up
 
+| Initialize layer vfio-pci on node
+| | [Documentation]
+| | ... | Initialize vfio-pci interfaces on DUT. Currently no operation.
+| |
+| | ... | *Arguments:*
+| | ... | - dut - DUT node. Type: string
+| |
+| | ... | *Example:*
+| |
+| | ... | \| Initialize layer vfio-pci on node \| DUT1 \|
+| |
+| | [Arguments] | ${dut}
+| |
+| | No operation
+
 | Initialize layer avf on node
 | | [Documentation]
-| | ... | Initialize AVF interfaces on DUT. Interfaces are brought up.
-| | ...
+| | ... | Initialize AVF interfaces on DUT.
+| |
 | | ... | *Arguments:*
 | | ... | - dut - DUT node. Type: string
-| | ...
+| |
 | | ... | *Example:*
-| | ...
+| |
 | | ... | \| Initialize layer avf on node \| DUT1 \|
-| | ...
+| |
 | | [Arguments] | ${dut}
-| | ...
+| |
 | | ${dut_str}= | Convert To Lowercase | ${dut}
 | | ${if1_vlan}= | Get Interface Vlan | ${nodes['${dut}']} | ${${dut}_if1}
 | | ${if2_vlan}= | Get Interface Vlan | ${nodes['${dut}']} | ${${dut}_if2}
@@ -160,45 +251,71 @@
 | | ... | ${${dut}_if1_vf0}
 | | ${if2_pci}= | Get Interface PCI Addr | ${nodes['${dut}']}
 | | ... | ${${dut}_if2_vf0}
-| | ${dut_eth_vf_if1}= | VPP Create AVF Interface | ${nodes['${dut}']}
+| | ${dut_new_if1}= | VPP Create AVF Interface | ${nodes['${dut}']}
 | | ... | ${if1_pci} | ${rxq_count_int}
-| | ${dut_eth_vf_if1_mac}= | Get Interface MAC | ${nodes['${dut}']}
-| | ... | ${dut_eth_vf_if1}
-| | ${dut_eth_vf_if2}= | VPP Create AVF Interface | ${nodes['${dut}']}
+| | ${dut_new_if1_mac}= | Get Interface MAC | ${nodes['${dut}']}
+| | ... | ${dut_new_if1}
+| | ${dut_new_if2}= | VPP Create AVF Interface | ${nodes['${dut}']}
 | | ... | ${if2_pci} | ${rxq_count_int}
-| | ${dut_eth_vf_if2_mac}= | Get Interface MAC | ${nodes['${dut}']}
-| | ... | ${dut_eth_vf_if2}
-| | Set Test Variable | ${${dut_str}_if1} | ${dut_eth_vf_if1}
-| | Set Test Variable | ${${dut_str}_if2} | ${dut_eth_vf_if2}
-| | Set Test Variable | ${${dut_str}_if1_mac} | ${dut_eth_vf_if1_mac}
-| | Set Test Variable | ${${dut_str}_if2_mac} | ${dut_eth_vf_if2_mac}
+| | ${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}
 
-| Initialize AVF interfaces
+| Initialize layer rdma-core on node
 | | [Documentation]
-| | ... | Initialize AVF interfaces on each DUT. Interfaces are brought up.
-| | ...
-| | :FOR | ${dut} | IN | @{duts}
-| | | Initialize layer avf on node | ${dut}
-| | Set Test Variable | ${prev_layer} | vf
-| | Set interfaces in path up
+| | ... | Initialize rdma-core (MLX) interfaces on DUT.
+| |
+| | ... | *Arguments:*
+| | ... | - dut - DUT node. Type: string
+| |
+| | ... | *Example:*
+| |
+| | ... | \| Initialize layer rdma-core on node \| DUT1 \|
+| |
+| | [Arguments] | ${dut}
+| |
+| | ${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}
+| | ${if1_pci}= | Get Interface PCI Addr | ${nodes['${dut}']}
+| | ... | ${${dut}_if1}
+| | ${if2_pci}= | Get Interface PCI Addr | ${nodes['${dut}']}
+| | ... | ${${dut}_if2}
+| | ${dut_new_if1}= | VPP Create Rdma Interface | ${nodes['${dut}']}
+| | ... | ${if1_pci} | ${rxq_count_int}
+| | ${dut_new_if1_mac}= | Get Interface MAC | ${nodes['${dut}']}
+| | ... | ${dut_new_if1}
+| | ${dut_new_if2}= | VPP Create Rdma Interface | ${nodes['${dut}']}
+| | ... | ${if2_pci} | ${rxq_count_int}
+| | ${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}
 
 | Initialize layer bonding on node
 | | [Documentation]
 | | ... | Bonded interface and variables to be created on across east and
 | | ... | west DUT's node interfaces.
-| | ...
+| |
 | | ... | *Arguments:*
 | | ... | - dut - DUT node. Type: string
 | | ... | - 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 on node \| DUT1 \| xor \| l34 \| 1 \|
-| | ...
+| |
 | | [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}
@@ -208,100 +325,136 @@
 | | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_1_1} | ${if_index}
 | | VPP Enslave Physical Interface
 | | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_1_2} | ${if_index}
-| | :FOR | ${id} | IN RANGE | 1 | ${count} + 1
+| | 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}
+| | 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}
+| |
+| | FOR | ${dut} | IN | @{duts}
 | | | Initialize layer bonding on node
 | | | ... | ${dut} | bond_mode=${bond_mode} | lb_mode=${lb_mode}
 | | | ... | count=${count}
+| | END
 | | Set Test Variable | ${prev_layer} | bond
 
+| Initialize layer dot1q on node for chain
+| | [Documentation]
+| | ... | Optionally create tag popping subinterface per chain.
+| | ... | Return interface indices for dot1q layer interfaces,
+| | ... | or Nones if subinterfaces are not created.
+| |
+| | ... | *Arguments:*
+| | ... | - dut - DUT node. Type: string
+| | ... | - 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 for chain \| DUT1 \| 1 \| True \|
+| |
+| | [Arguments] | ${dut} | ${id} | ${vlan_per_chain}=${True}
+| |
+| | ${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}
+
 | Initialize layer dot1q on node
 | | [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 tagged interfaces. Type: integer
-| | ... | - create - Whether to create vlan subinterface for each chain.
-| | ... |     Type: boolean
-| | ...
+| | ... | - 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 \| DUT1 \| 1 \| True \|
-| | ...
-| | [Arguments] | ${dut} | ${count}=${1} | ${create}=${True}
-| | ...
+| |
+| | ... | \| Initialize layer dot1q on node \| DUT1 \| 3 \| True \| 2 \|
+| |
+| | [Arguments] | ${dut} | ${count}=${1} | ${vlan_per_chain}=${True}
+| | ... | ${start}=${1}
+| |
 | | ${dut_str}= | Convert To Lowercase | ${dut}
-| | :FOR | ${id} | IN RANGE | 1 | ${count} + 1
-| | | ${if1_vlan}= | Run Keyword If | ${${dut_str}_vlan1}
-| | | ... | Set Variable | ${${dut_str}_vlan1}
-| | | ... | ELSE
-| | | ... | Evaluate | ${100} + ${id} - ${1}
-| | | ${if2_vlan}= | Run Keyword If | ${${dut_str}_vlan2}
-| | | ... | Set Variable | ${${dut_str}_vlan2}
-| | | ... | ELSE
-| | | ... | Evaluate | ${200} + ${id} - ${1}
-| | | ${if1_name} | ${if1_index}= | Run Keyword If
-| | | ... | ${create} or ${id} == ${1}
-| | | ... | Create Vlan Subinterface
-| | | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_${id}_1}
-| | | ... | ${if1_vlan}
-| | | ${if2_name} | ${if2_index}= | Run Keyword If
-| | | ... | ${create} or ${id} == ${1}
-| | | ... | Create Vlan Subinterface
-| | | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_${id}_2}
-| | | ... | ${if2_vlan}
-| | | Run Keyword If | ${create} or ${id} == ${1}
-| | | ... | Set Interface State | ${nodes['${dut}']} | ${if1_index} | up
-| | | Run Keyword If | ${create} or ${id} == ${1}
-| | | ... | Set Interface State | ${nodes['${dut}']} | ${if2_index} | up
-| | | Run Keyword If | ${create} or ${id} == ${1}
-| | | ... | Configure L2 tag rewrite method on interfaces
-| | | ... | ${nodes['${dut}']} | ${if1_index} | TAG_REWRITE_METHOD=pop-1
-| | | Run Keyword If | ${create} or ${id} == ${1}
-| | | ... | Configure L2 tag rewrite method on interfaces
-| | | ... | ${nodes['${dut}']} | ${if2_index} | TAG_REWRITE_METHOD=pop-1
+| | 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}
+| | | # 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}
+| | END
 
 | Initialize layer dot1q
 | | [Documentation]
 | | ... | Dot1q interfaces and variables to be created on all DUT's interfaces.
-| | ...
+| |
 | | ... | *Arguments:*
-| | ... | - count - Number of tagged interfaces. Type: integer
-| | ... | - create - Whether to create vlan for each chain. Type: boolean
-| | ...
-| | ... | \| Initialize layer dot1q \| 1 \| True \|
-| | ...
-| | [Arguments] | ${count}=${1} | ${create}=${True}
-| | ...
-| | :FOR | ${dut} | IN | @{duts}
+| | ... | - 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
+| |
+| | ... | \| Initialize layer dot1q \| 3 \| True \| 2 \|
+| |
+| | [Arguments] | ${count}=${1} | ${vlan_per_chain}=${True} | ${start}=${1}
+| |
+| | FOR | ${dut} | IN | @{duts}
 | | | Initialize layer dot1q on node | ${dut} | count=${count}
-| | | ... | create=${create}
+| | | ... | vlan_per_chain=${vlan_per_chain} | start=${start}
+| | END
 | | Set Test Variable | ${prev_layer} | dot1q
 
 | Initialize layer ip4vxlan on node
@@ -310,25 +463,27 @@
 | | ... | 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:*
 | | ... | - dut - DUT node. Type: string
 | | ... | - count - Number of vxlan interfaces. Type: integer
-| | ...
+| | ... | - start - Id of first chain, allows adding chains during test.
+| | ... | Type: integer
+| |
 | | ... | *Example:*
-| | ...
-| | ... | \| Initialize layer ip4vxlan on node \| DUT1 \| 1 \|
-| | ...
-| | [Arguments] | ${dut} | ${count}=${1}
-| | ...
+| |
+| | ... | \| Initialize layer ip4vxlan on node \| DUT1 \| 3 \| 2 \|
+| |
+| | [Arguments] | ${dut} | ${count}=${1} | ${start}=${1}
+| |
 | | ${dut_str}= | Convert To Lowercase | ${dut}
-| | VPP Interface Set IP Address
+| | Run Keyword If | "${start}" == "1" | VPP Interface Set IP Address
 | | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_1_1}
 | | ... | 172.16.0.1 | 24
-| | VPP Interface Set IP Address
+| | 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 | 1 | ${count} + 1
+| | FOR | ${id} | IN RANGE | ${start} | ${count} + 1
 | | | ${subnet}= | Evaluate | ${id} - 1
 | | | ${vni}= | Evaluate | ${id} - 1
 | | | ${ip4vxlan_1}= | Create VXLAN interface
@@ -361,26 +516,31 @@
 | | | ... | ${${dut_str}_ip4vxlan_${id}_1} | ${ip4vxlan_1}
 | | | Set Test Variable
 | | | ... | ${${dut_str}_ip4vxlan_${id}_2} | ${ip4vxlan_2}
+| | END
 
 | Initialize layer ip4vxlan
 | | [Documentation]
 | | ... | VXLAN interfaces and variables to be created on all DUT's interfaces.
-| | ...
+| |
 | | ... | *Arguments:*
 | | ... | - count - Number of vxlan interfaces. Type: integer
-| | ...
-| | ... | \| Initialize layer ip4vxlan \| 1 \|
-| | ...
-| | [Arguments] | ${count}=${1}
-| | ...
-| | :FOR | ${dut} | IN | @{duts}
+| | ... | - start - Id of first chain, allows adding chains during test.
+| | ... | Type: integer
+| |
+| | ... | \| Initialize layer ip4vxlan \| 3 \| 2 \|
+| |
+| | [Arguments] | ${count}=${1} | ${start}=${1}
+| |
+| | FOR | ${dut} | IN | @{duts}
 | | | Initialize layer ip4vxlan on node | ${dut} | count=${count}
+| | ... | start=${start}
+| | 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
@@ -389,25 +549,31 @@
 | | ... | Type: string
 | | ... | - ${vhost_if2} - Name of the second Vhost-User interface (Optional).
 | | ... | Type: string
-| | ...
+| |
 | | ... | _NOTE:_ This KW sets following test case variable:
 | | ... | - ${${vhost_if1}} - First Vhost-User interface.
 | | ... | - ${${vhost_if2}} - Second Vhost-User interface.
-| | ...
+| |
 | | ... | *Example:*
-| | ...
+| |
 | | ... | \| 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
-| | ...
+| |
 | | ${vhost_1}= | Vpp Create Vhost User Interface | ${dut_node} | ${sock1}
 | | ${vhost_2}= | Vpp Create Vhost User Interface | ${dut_node} | ${sock2}
+| | ${vhost_1_key}= | Get Interface By SW Index | ${dut_node} | ${vhost_1}
+| | ${vhost_2_key}= | Get Interface By SW Index | ${dut_node} | ${vhost_2}
+| | ${vhost_1_mac}= | Get Interface MAC | ${dut_node} | ${vhost_1_key}
+| | ${vhost_2_mac}= | Get Interface MAC | ${dut_node} | ${vhost_2_key}
 | | Set Interface State | ${dut_node} | ${vhost_1} | up
 | | Set Interface State | ${dut_node} | ${vhost_2} | up
 | | Set Test Variable | ${${vhost_if1}} | ${vhost_1}
 | | 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}