| ... | Update All Interface Data On All Nodes | ${nodes} | AND
| ... | Setup DUT nodes for 'Proxy Inbound' functional testing
| Test Setup | Run Keywords | Save VPP PIDs | AND
-| ... | Reset VAT History On All DUTs | ${nodes} | AND
-| ... | Clear interface counters on all vpp nodes in topology | ${nodes}
+| ... | Reset PAPI History On All DUTs | ${nodes} | AND
+| ... | Clear Interface Counters on all DUTs | ${nodes}
| Test Teardown | Run Keywords
| ... | Show packet trace on all DUTs | ${nodes} | AND
-| ... | Show VAT History On All DUTs | ${nodes} | AND
+| ... | Show PAPI History On All DUTs | ${nodes} | AND
| ... | Verify VPP PID in Teardown
| Documentation | *NSH SFC Proxy Inbound test cases*
| ...
| | ... | Make TG send 152 Bytes VxLAN-GPE+NSH packet to DUT ingress interface.\
| | ... | Make TG verify SFC Proxy Inbound functional is correct.
| | ${frame_size}= | Set Variable | ${152}
-| | Node "${src_node}" interface "${src_port}" send "${frame_size}" Bytes packet to node "${dst_node}" interface "${dst_port}" for "Proxy Inbound" test
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "Proxy Inbound" test
| TC02: NSH SFC Proxy Inbound functional test with 256B frame size
| | [Documentation]
| | ... | Make TG send 256 Bytes VxLAN-GPE+NSH packet to DUT ingress interface.\
| | ... | Make TG verify SFC Proxy Inbound functional is correct.
| | ${frame_size}= | Set Variable | ${256}
-| | Node "${src_node}" interface "${src_port}" send "${frame_size}" Bytes packet to node "${dst_node}" interface "${dst_port}" for "Proxy Inbound" test
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "Proxy Inbound" test
| TC03: NSH SFC Proxy Inbound functional test with 512B frame size
| | [Documentation]
| | ... | Make TG send 512 Bytes VxLAN-GPE+NSH packet to DUT ingress interface.\
| | ... | Make TG verify SFC Proxy Inbound functional is correct.
| | ${frame_size}= | Set Variable | ${512}
-| | Node "${src_node}" interface "${src_port}" send "${frame_size}" Bytes packet to node "${dst_node}" interface "${dst_port}" for "Proxy Inbound" test
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "Proxy Inbound" test
| TC04: NSH SFC Proxy Inbound functional test with 1024B frame size
| | [Documentation]
| | ... | Make TG send 1024 Bytes VxLAN-GPE+NSH packet to DUT ingress interface.\
| | ... | Make TG verify SFC Proxy Inbound functional is correct.
| | ${frame_size}= | Set Variable | ${1024}
-| | Node "${src_node}" interface "${src_port}" send "${frame_size}" Bytes packet to node "${dst_node}" interface "${dst_port}" for "Proxy Inbound" test
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "Proxy Inbound" test
| TC05: NSH SFC Proxy Inbound functional test with 1280B frame size
| | [Documentation]
| | ... | Make TG send 1280 Bytes VxLAN-GPE+NSH packet to DUT ingress interface.\
| | ... | Make TG verify SFC Proxy Inbound functional is correct.
| | ${frame_size}= | Set Variable | ${1280}
-| | Node "${src_node}" interface "${src_port}" send "${frame_size}" Bytes packet to node "${dst_node}" interface "${dst_port}" for "Proxy Inbound" test
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "Proxy Inbound" test
| TC06: NSH SFC Proxy Inbound functional test with 1518B frame size
| | [Documentation]
| | ... | Make TG send 1518 Bytes VxLAN-GPE+NSH packet to DUT ingress interface.\
| | ... | Make TG verify SFC Proxy Inbound functional is correct.
| | ${frame_size}= | Set Variable | ${1518}
-| | Node "${src_node}" interface "${src_port}" send "${frame_size}" Bytes packet to node "${dst_node}" interface "${dst_port}" for "Proxy Inbound" test
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "Proxy Inbound" test