-| | VPP Interface Set IP Address | ${dut1} | ${dut1_if2} | 172.16.0.1
-| | ... | 24
-| | VPP Interface Set IP Address | ${dut2} | ${dut2_if1} | 172.16.0.2
-| | ... | 24
-| | VPP Add IP Neighbor | ${dut1} | ${dut1_if2} | 172.16.0.2 | ${dut2_if1_mac}
-| | VPP Add IP Neighbor | ${dut2} | ${dut2_if1} | 172.16.0.1 | ${dut1_if2_mac}
-| | ${dut1s_vxlan}= | Create VXLAN interface | ${dut1} | 24
-| | ... | 172.16.0.1 | 172.16.0.2
-| | ${dut2s_vxlan}= | Create VXLAN interface | ${dut2} | 24
-| | ... | 172.16.0.2 | 172.16.0.1
-| | VPP Add L2 Bridge Domain | ${dut1} | ${1} | ${dut1_if1} | ${dut1s_vxlan}
-| | Set Interface State | ${dut1} | ${dut1s_vxlan} | up
-| | VPP Add L2 Bridge Domain | ${dut2} | ${1} | ${dut2_if2} | ${dut2s_vxlan}
-| | Set Interface State | ${dut2} | ${dut2s_vxlan} | up
+| | VPP Interface Set IP Address
+| | ... | ${dut1} | ${DUT1_${int}2}[0] | 172.16.0.1 | 24
+| | VPP Interface Set IP Address
+| | ... | ${dut2} | ${DUT2_${int}1}[0] | 172.16.0.2 | 24
+| | VPP Add IP Neighbor
+| | ... | ${dut1} | ${DUT1_${int}2}[0] | 172.16.0.2
+| | ... | ${DUT2_${int}1_mac}[0]
+| | VPP Add IP Neighbor
+| | ... | ${dut2} | ${DUT2_${int}1}[0] | 172.16.0.1
+| | ... | ${DUT1_${int}2_mac}[0]
+| | ${dut1s_vxlan}= | Create VXLAN interface
+| | ... | ${dut1} | 24 | 172.16.0.1 | 172.16.0.2
+| | ${dut2s_vxlan}= | Create VXLAN interface
+| | ... | ${dut2} | 24 | 172.16.0.2 | 172.16.0.1
+| | VPP Add L2 Bridge Domain
+| | ... | ${dut1} | ${1} | ${DUT1_${int}1}[0] | ${dut1s_vxlan}
+| | Set Interface State
+| | ... | ${dut1} | ${dut1s_vxlan} | up
+| | VPP Add L2 Bridge Domain
+| | ... | ${dut2} | ${1} | ${DUT2_${int}2}[0] | ${dut2s_vxlan}
+| | Set Interface State
+| | ... | ${dut2} | ${dut2s_vxlan} | up