X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fnsh_sfc%2Ffunc%2Fsff%2Feth2p-ethip4-sfc-sff-func.robot;h=e86c659f8ce1d2dbd1b0a63ac0804b54ac8da5bb;hp=1356c8c2dac03bb405d892dc4ffe54562ff828ee;hb=1108807740e6c7d0b154ad8bb391bf0f35c550b9;hpb=6721e7f09aa95bff6622068332a3f56afad9c87b

diff --git a/tests/nsh_sfc/func/sff/eth2p-ethip4-sfc-sff-func.robot b/tests/nsh_sfc/func/sff/eth2p-ethip4-sfc-sff-func.robot
index 1356c8c2da..e86c659f8c 100644
--- a/tests/nsh_sfc/func/sff/eth2p-ethip4-sfc-sff-func.robot
+++ b/tests/nsh_sfc/func/sff/eth2p-ethip4-sfc-sff-func.robot
@@ -25,11 +25,11 @@
 | ... | Update All Interface Data On All Nodes | ${nodes} | AND
 | ... | Setup DUT nodes for 'SFF' 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 SFF test cases*
 | ...
@@ -47,39 +47,39 @@
 | | ... | Make TG send 152 Bytes VxLAN-GPE+NSH packet to DUT ingress interface.\
 | | ... | Make TG verify SFC SFF 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 "SFF" test
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "SFF" test
 
 | TC02: NSH SFC SFF functional test with 256B frame size
 | | [Documentation]
 | | ... | Make TG send 256 Bytes VxLAN-GPE+NSH packet to DUT ingress interface.\
 | | ... | Make TG verify SFC SFF 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 "SFF" test
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "SFF" test
 
 | TC03: NSH SFC SFF functional test with 512B frame size
 | | [Documentation]
 | | ... | Make TG send 512 Bytes VxLAN-GPE+NSH packet to DUT ingress interface.\
 | | ... | Make TG verify SFC SFF 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 "SFF" test
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "SFF" test
 
 | TC04: NSH SFC SFF functional test with 1024B frame size
 | | [Documentation]
 | | ... | Make TG send 1024 Bytes VxLAN-GPE+NSH packet to DUT ingress interface.\
 | | ... | Make TG verify SFC SFF 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 "SFF" test
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "SFF" test
 
 | TC05: NSH SFC SFF functional test with 1280B frame size
 | | [Documentation]
 | | ... | Make TG send 1280 Bytes VxLAN-GPE+NSH packet to DUT ingress interface.\
 | | ... | Make TG verify SFC SFF 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 "SFF" test
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "SFF" test
 
 | TC06: NSH SFC SFF functional test with 1518B frame size
 | | [Documentation]
 | | ... | Make TG send 1518 Bytes VxLAN-GPE+NSH packet to DUT ingress interface.\
 | | ... | Make TG verify SFC SFF 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 "SFF" test
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "SFF" test