diff options
| author |   Tibor Frank <tifrank@cisco.com> | 2017-06-01 07:00:50 +0200 |
|---|---|---|
| committer | Tibor Frank <tifrank@cisco.com> | 2017-06-08 14:23:08 +0200 |
| commit | 430afafb4cadf503ccee99c09f6de7402f5404c7 (patch) | |
| tree | ef79d59dba8558b85af1b7ad2fe89d3c9c49b5af /tests/func | |
| parent | 7436d8bdf60bca9b80fb76781e1f709bbcd435da (diff) | |
CSIT-662: KWI - KW renaming
- plus: CSIT-656: Script to rename robot keywords.
Change-Id: Ia69917e406a1b346b80e5ea742f6200c1c9e9d21
Signed-off-by: Tibor Frank <tifrank@cisco.com>
Diffstat (limited to 'tests/func')
112 files changed, 2453 insertions, 2452 deletions
diff --git a/tests/func/cop/eth2p-ethip4-ip4base-copblklistbase-func.robot b/tests/func/cop/eth2p-ethip4-ip4base-copblklistbase-func.robot index 37e55c0666..3230dabfae 100644 --- a/tests/func/cop/eth2p-ethip4-ip4base-copblklistbase-func.robot +++ b/tests/func/cop/eth2p-ethip4-ip4base-copblklistbase-func.robot @@ -22,8 +22,8 @@ | Resource | resources/libraries/robot/l2_xconnect.robot | Variables | resources/libraries/python/IPv4NodeAddress.py | ${nodes} | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *COP Security IPv4 Blacklist Tests* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -66,10 +66,10 @@ | | ... | src-addr matching packets generated by TG; on DUT2 configure L2 | | ... | xconnect. [Ver] Make TG send ICMPv4 Echo Req on its interface to | | ... | DUT1; verify no ICMPv4 Echo Req pkts are received. [Ref] -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${tg_node} | ${dut1_node} | ${dut2_node} | ${tg_node} -| | And Interfaces in 3-node path are up -| | And L2 setup xconnect on DUT +| | And Set interfaces in 3-node circular topology up +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And Set Interface Address | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_if1_ip} | ${ip_prefix} @@ -86,7 +86,7 @@ | | When COP Add whitelist Entry | | ... | ${dut1_node} | ${dut1_to_tg} | ip4 | ${fib_table_number} | | And COP interface enable or disable | ${dut1_node} | ${dut1_to_tg} | enable -| | Then Send packet from Port to Port should failed | ${tg_node} +| | Then Packet transmission from port to port should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | ${dut1_to_dut2_mac} | | ... | ${tg_to_dut2_mac} diff --git a/tests/func/cop/eth2p-ethip4-ip4base-copwhlistbase-func.robot b/tests/func/cop/eth2p-ethip4-ip4base-copwhlistbase-func.robot index eb8be688d9..c46a8c9c27 100644 --- a/tests/func/cop/eth2p-ethip4-ip4base-copwhlistbase-func.robot +++ b/tests/func/cop/eth2p-ethip4-ip4base-copwhlistbase-func.robot @@ -22,8 +22,8 @@ | Resource | resources/libraries/robot/l2_xconnect.robot | Variables | resources/libraries/python/IPv4NodeAddress.py | ${nodes} | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *COP Security IPv4 Whitelist Tests* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -66,10 +66,10 @@ | | ... | src-addr matching packets generated by TG; on DUT2 configure L2 | | ... | xconnect. [Ver] Make TG send ICMPv4 Echo Req on its interface to | | ... | DUT1; verify received ICMPv4 Echo Req pkts are correct. [Ref] -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${tg_node} | ${dut1_node} | ${dut2_node} | ${tg_node} -| | And Interfaces in 3-node path are up -| | And L2 setup xconnect on DUT +| | And Set interfaces in 3-node circular topology up +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And Set Interface Address | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_if1_ip} | ${ip_prefix} @@ -86,7 +86,7 @@ | | When COP Add whitelist Entry | | ... | ${dut1_node} | ${dut1_to_tg} | ip4 | ${fib_table_number} | | And COP interface enable or disable | ${dut1_node} | ${dut1_to_tg} | enable -| | Then Send Packet And Check Headers | ${tg_node} +| | Then Send packet and verify headers | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | ${dut1_to_dut2_mac} | | ... | ${tg_to_dut2_mac} diff --git a/tests/func/cop/eth2p-ethip6-ip6base-copblklistbase-func.robot b/tests/func/cop/eth2p-ethip6-ip6base-copblklistbase-func.robot index 7511dfe31b..d0a395cf44 100644 --- a/tests/func/cop/eth2p-ethip6-ip6base-copblklistbase-func.robot +++ b/tests/func/cop/eth2p-ethip6-ip6base-copblklistbase-func.robot @@ -22,8 +22,8 @@ | Resource | resources/libraries/robot/l2_xconnect.robot | Variables | resources/libraries/python/IPv6NodesAddr.py | ${nodes} | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *COP Security IPv6 Blacklist Tests* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -70,10 +70,10 @@ | | ... | src-addr matching packets generated by TG; on DUT2 configure L2 | | ... | xconnect. [Ver] Make TG send ICMPv6 Echo Req on its interface to | | ... | DUT1; verify no ICMPv6 Echo Req pkts are received. [Ref] -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${tg_node} | ${dut1_node} | ${dut2_node} | ${tg_node} -| | And Interfaces in 3-node path are up -| | And L2 setup xconnect on DUT +| | And Set interfaces in 3-node circular topology up +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And VPP Set IF IPv6 Addr | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_if1_ip} | ${ip_prefix} @@ -95,7 +95,7 @@ | | When COP Add whitelist Entry | | ... | ${dut1_node} | ${dut1_to_tg} | ip6 | ${fib_table_number} | | And COP interface enable or disable | ${dut1_node} | ${dut1_to_tg} | enable -| | Then Send packet from Port to Port should failed | ${tg_node} +| | Then Packet transmission from port to port should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | ${dut1_to_dut2_mac} | | ... | ${tg_to_dut2_mac} diff --git a/tests/func/cop/eth2p-ethip6-ip6base-copwhlistbase-func.robot b/tests/func/cop/eth2p-ethip6-ip6base-copwhlistbase-func.robot index f75f4d0dea..3fb80ba308 100644 --- a/tests/func/cop/eth2p-ethip6-ip6base-copwhlistbase-func.robot +++ b/tests/func/cop/eth2p-ethip6-ip6base-copwhlistbase-func.robot @@ -22,8 +22,8 @@ | Resource | resources/libraries/robot/l2_xconnect.robot | Variables | resources/libraries/python/IPv6NodesAddr.py | ${nodes} | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *COP Security IPv6 Whitelist Tests* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -70,10 +70,10 @@ | | ... | src-addr matching packets generated by TG; on DUT2 configure L2 | | ... | xconnect. [Ver] Make TG send ICMPv6 Echo Req on its interface to | | ... | DUT1; verify received ICMPv6 Echo Req pkts are correct. [Ref] -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${tg_node} | ${dut1_node} | ${dut2_node} | ${tg_node} -| | And Interfaces in 3-node path are up -| | And L2 setup xconnect on DUT +| | And Set interfaces in 3-node circular topology up +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And VPP Set IF IPv6 Addr | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_if1_ip} | ${ip_prefix} @@ -95,7 +95,7 @@ | | When COP Add whitelist Entry | ${dut1_node} | ${dut1_to_tg} | ip6 | | | ... | ${fib_table_number} | | And COP interface enable or disable | ${dut1_node} | ${dut1_to_tg} | enable -| | Then Send Packet And Check Headers | ${tg_node} +| | Then Send packet and verify headers | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | ${dut1_to_dut2_mac} | | ... | ${tg_to_dut2_mac} diff --git a/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot b/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot index 5730e0e6b8..cf7b40bef7 100644 --- a/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot +++ b/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot @@ -18,8 +18,8 @@ | Resource | resources/libraries/robot/ipv4.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *DHCPv4 Client related test cases* *** Variables *** @@ -33,84 +33,85 @@ *** Test Cases *** | TC01: VPP sends a DHCP DISCOVER | | [Documentation] | Configure DHCPv4 client on interface to TG without -| | ... | hostname and check if DHCPv4 DISCOVER message contains all -| | ... | required fields with expected values. +| | ... | hostname and check if DHCPv4 DISCOVER message contains all +| | ... | required fields with expected values. | | ... -| | Given Path for 2-node testing is set -| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1} -| | Then Check DHCP DISCOVER header | ${tg_node} -| | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} +| | Given Configure path in 2-node circular topology +| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} +| | And Set interfaces in 2-node circular topology up +| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1} +| | Then Verify DHCP DISCOVER header | ${tg_node} +| | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | TC02: VPP sends a DHCPv4 DISCOVER with hostname | | [Documentation] | Configure DHCPv4 client on interface to TG with hostname -| | ... | and check if DHCPv4 DISCOVER message contains all required -| | ... | fields with expected values. +| | ... | and check if DHCPv4 DISCOVER message contains all required +| | ... | fields with expected values. | | ... -| | Given Path for 2-node testing is set -| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1} -| | ... | ${client_hostname} -| | Then Check DHCP DISCOVER header | ${tg_node} -| | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | ${client_hostname} +| | Given Configure path in 2-node circular topology +| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} +| | And Set interfaces in 2-node circular topology up +| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1} +| | ... | ${client_hostname} +| | Then Verify DHCP DISCOVER header | ${tg_node} +| | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | ${client_hostname} | TC03: VPP sends DHCPv4 REQUEST after OFFER | | [Documentation] | Configure DHCPv4 client on interface to TG and check if -| | ... | DHCPv4 REQUEST message contains all required fields. +| | ... | DHCPv4 REQUEST message contains all required fields. | | ... -| | Given Path for 2-node testing is set -| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local -| | ... | ${FALSE} | ${NONE} -| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1} -| | Then Check DHCP REQUEST after OFFER | ${tg_node} | ${tg_to_dut_if1} -| | ... | ${tg_to_dut_if1_mac} | ${server_ip} -| | ... | ${dut_to_tg_if1_mac} | ${client_ip} | ${client_mask} +| | Given Configure path in 2-node circular topology +| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} +| | And Set interfaces in 2-node circular topology up +| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local +| | ... | ${FALSE} | ${NONE} +| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1} +| | Then Verify DHCP REQUEST after OFFER | ${tg_node} | ${tg_to_dut_if1} +| | ... | ${tg_to_dut_if1_mac} | ${server_ip} +| | ... | ${dut_to_tg_if1_mac} | ${client_ip} | ${client_mask} | TC04: VPP doesn't send DHCPv4 REQUEST after OFFER with wrong XID | | [ Tags ] | EXPECTED_FAILING | | [Documentation] | Configure DHCPv4 client on interface to TG. If server -| | ... | sends DHCPv4 OFFER with different XID as in DHCPv4 -| | ... | DISCOVER, DHCPv4 REQUEST message shouldn't be sent. +| | ... | sends DHCPv4 OFFER with different XID as in DHCPv4 +| | ... | DISCOVER, DHCPv4 REQUEST message shouldn't be sent. | | ... -| | Given Path for 2-node testing is set -| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local -| | ... | ${FALSE} | ${NONE} -| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1} -| | Then Run Keyword And Expect Error | DHCP REQUEST Rx timeout -| | ... | Check DHCP REQUEST after OFFER | ${tg_node} | ${tg_to_dut_if1} -| | ... | ${tg_to_dut_if1_mac} | ${server_ip} -| | ... | ${dut_to_tg_if1_mac} | ${client_ip} | ${client_mask} -| | ... | offer_xid=${own_xid} +| | Given Configure path in 2-node circular topology +| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} +| | And Set interfaces in 2-node circular topology up +| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local +| | ... | ${FALSE} | ${NONE} +| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1} +| | Then Run Keyword And Expect Error | DHCP REQUEST Rx timeout +| | ... | Verify DHCP REQUEST after OFFER | ${tg_node} | ${tg_to_dut_if1} +| | ... | ${tg_to_dut_if1_mac} | ${server_ip} +| | ... | ${dut_to_tg_if1_mac} | ${client_ip} | ${client_mask} +| | ... | offer_xid=${own_xid} | TC05: VPP honors DHCPv4 lease time | | [Documentation] | Send IP configuration to the VPP client via DHCPv4. -| | ... | Address is checked with ICMP echo request and there should -| | ... | be no reply for echo request when lease has expired. +| | ... | Address is checked with ICMP echo request and there should +| | ... | be no reply for echo request when lease has expired. | | ... -| | Given Path for 2-node testing is set -| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local -| | ... | ${FALSE} | ${NONE} -| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1} -| | And Send IP configuration to client via DHCP -| | ... | ${tg_node} | ${tg_to_dut_if1} -| | ... | ${tg_to_dut_if1_mac} | ${server_ip} -| | ... | ${client_ip} | ${client_mask} -| | ... | ${lease_time} -| | And Add Arp On Dut | ${dut_node} | ${dut_to_tg_if1} | ${server_ip} -| | ... | ${tg_to_dut_if1_mac} -| | Then Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut_if1} -| | ... | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac} | ${client_ip} -| | ... | ${server_ip} -| | And Sleep | ${lease_time} -| | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Node replies to ICMP echo request | ${tg_node} -| | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac} -| | ... | ${client_ip} | ${server_ip} +| | Given Configure path in 2-node circular topology +| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} +| | And Set interfaces in 2-node circular topology up +| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local +| | ... | ${FALSE} | ${NONE} +| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1} +| | And Configure IP on client via DHCP +| | ... | ${tg_node} | ${tg_to_dut_if1} +| | ... | ${tg_to_dut_if1_mac} | ${server_ip} +| | ... | ${client_ip} | ${client_mask} +| | ... | ${lease_time} +| | And Add Arp On Dut | ${dut_node} | ${dut_to_tg_if1} | ${server_ip} +| | ... | ${tg_to_dut_if1_mac} +| | Then Send ICMP echo request and verify answer +| | ... | ${tg_node} | ${tg_to_dut_if1} +| | ... | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac} | ${client_ip} +| | ... | ${server_ip} +| | And Sleep | ${lease_time} +| | And Run Keyword And Expect Error | ICMP echo Rx timeout +| | ... | Send ICMP echo request and verify answer | ${tg_node} +| | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac} +| | ... | ${client_ip} | ${server_ip} diff --git a/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot b/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot index 531ed88aa5..de7ae2d4b1 100644 --- a/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot +++ b/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot @@ -18,8 +18,8 @@ | Resource | resources/libraries/robot/ipv4.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *DHCPv4 proxy test cases* | ... | ... | *[Top] Network Topologies:* TG = DUT @@ -50,9 +50,9 @@ | | ... | [Ver] Make TG verify matching DHCPv4 packets between client and DHCPv4 | | ... | server through DHCP proxy. | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local | | ... | ${FALSE} | ${NONE} | | And Set Interface Address | ${dut_node} @@ -63,7 +63,7 @@ | | ... | ${tg_to_dut_if2_mac} | | When DHCP Proxy Config | ${dut_node} | ${dhcp_server_ip} | | ... | ${dut_to_tg_if1_ip} -| | Then Send DHCP Messages | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2} +| | Then Send DHCP messages and check answer | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2} | | ... | ${dhcp_server_ip} | ${tg_to_dut_if2_mac} | ${client_ip} | | ... | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_ip} @@ -74,9 +74,9 @@ | | ... | [Cfg] On DUT setup DHCPv4 proxy. | | ... | [Ver] Make TG verify matching invalid DHCPv4 packets are dropped. | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local | | ... | ${FALSE} | ${NONE} | | And Set Interface Address | ${dut_node} @@ -87,7 +87,7 @@ | | ... | ${tg_to_dut_if2_mac} | | When DHCP Proxy Config | ${dut_node} | ${dhcp_server_ip} | | ... | ${dut_to_tg_if1_ip} -| | Then Send DHCP DISCOVER | ${tg_node} | ${tg_to_dut_if1} +| | Then Send DHCP DISCOVER and check answer | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | ${discover_src_ip} | ${valid_discover_dst_ip} -| | And Send DHCP DISCOVER should fail | ${tg_node} | ${tg_to_dut_if1} +| | And DHCP DISCOVER should fail | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | ${discover_src_ip} | ${invalid_discover_dst_ip} diff --git a/tests/func/dhcp/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot b/tests/func/dhcp/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot index 6fede3e41c..88f0fbdcb5 100644 --- a/tests/func/dhcp/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot +++ b/tests/func/dhcp/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot @@ -18,8 +18,8 @@ | Resource | resources/libraries/robot/ipv6.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *DHCPv6 proxy test cases* | ... | ... | *[Top] Network Topologies:* TG = DUT @@ -47,9 +47,9 @@ | | ... | DHCPv6 server through DHCPv6 proxy. | | ... | [Ref] RFC 3315 | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length} | | And Vpp Set If Ipv6 Addr | ${dut_node} diff --git a/tests/func/fds/eth2p-dot1q-l2bdbasemaclrn-eth-4vhost-2vm-fds-provider-nets-func.robot b/tests/func/fds/eth2p-dot1q-l2bdbasemaclrn-eth-4vhost-2vm-fds-provider-nets-func.robot index bc6f58c698..9656a4a6f7 100644 --- a/tests/func/fds/eth2p-dot1q-l2bdbasemaclrn-eth-4vhost-2vm-fds-provider-nets-func.robot +++ b/tests/func/fds/eth2p-dot1q-l2bdbasemaclrn-eth-4vhost-2vm-fds-provider-nets-func.robot @@ -20,17 +20,17 @@ | Resource | resources/libraries/robot/qemu.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | SKIP_PATCH -| Test Setup | Run Keywords | Setup all DUTs before test +| Test Setup | Run Keywords | Configure all DUTs before test | ... | AND | Save VPP PIDs -| ... | AND | Setup all TGs before traffic script +| ... | AND | Configure all TGs for traffic script | ... | AND | Reset VAT History On All DUTs | ${nodes} | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} -| ... | AND | Qemu Teardown | ${dut1_node} | ${qemu_node1} +| ... | AND | Tear down QEMU | ${dut1_node} | ${qemu_node1} | ... | qemu_node1 -| ... | AND | Qemu Teardown | ${dut2_node} | ${qemu_node2} +| ... | AND | Tear down QEMU | ${dut2_node} | ${qemu_node2} | ... | qemu_node2 -| ... | AND | Check VPP PID in Teardown +| ... | AND | Verify VPP PID in Teardown | Documentation | *Provider network FDS related.* | ... | ... | Test suite uses 3-node topology TG - DUT1 - DUT2 - TG @@ -80,7 +80,7 @@ | | ... | a) test l2 connectivity inside every network | | ... | b) test l2 connectivity between networks | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO | VPP_VM_ENV -| | Given Path for 3-node testing is set | ${nodes['TG']} | ${nodes['DUT1']} +| | Given Configure path in 3-node circular topology | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} | | And Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${dut1_if_ip} | | ... | ${prefix_length} @@ -108,7 +108,7 @@ | | ... | ${dut2_node} | ${sock4} | | ${dut2_vhosts}= | And Create List | ${vhost_if1_DUT2} | ${vhost_if2_DUT2} | | ... | ${vhost_if3_DUT2} | ${vhost_if4_DUT2} -| | When Setup QEMU Vhost and Run | ${dut1_node} +| | When Configure QEMU vhost and run it | ${dut1_node} | | ... | ${sock1} | | ... | ${sock2} | | ... | ${sock3} @@ -120,7 +120,7 @@ | | ... | ${prefix_length} | | ... | qemu_node1 | | ... | 04 -| | And Setup QEMU Vhost and Run | ${dut2_node} +| | And Configure QEMU vhost and run it | ${dut2_node} | | ... | ${sock1} | | ... | ${sock2} | | ... | ${sock3} @@ -163,8 +163,8 @@ | | ... | \| @{vhosts} \| | | ... | | [Arguments] | ${dut_node} | ${interface} | @{vhosts} -| | Bridge domain on DUT node is created | ${dut_node} | ${bid_b} | learn=${TRUE} -| | Bridge domain on DUT node is created | ${dut_node} | ${bid_r} | learn=${TRUE} +| | Create bridge domain | ${dut_node} | ${bid_b} | learn=${TRUE} +| | Create bridge domain | ${dut_node} | ${bid_r} | learn=${TRUE} | | ${interface_name}= | Get interface name | ${dut_node} | ${interface} | | ${vlan1_name} | ${vlan1_index}= | Create Vlan Subinterface | | ... | ${dut_node} | ${interface_name} | ${vlan_blue} @@ -178,17 +178,17 @@ | | ... | tag1_id=${vlan_red} | | L2 Vlan Tag Rewrite | ${dut_node} | @{vhosts}[3] | push-1 | | ... | tag1_id=${vlan_red} -| | Interface is added to bridge domain | ${dut_node} +| | Add interface to bridge domain | ${dut_node} | | ... | ${vlan1_index} | ${bid_b} | 0 -| | Interface is added to bridge domain | ${dut_node} +| | Add interface to bridge domain | ${dut_node} | | ... | @{vhosts}[0] | ${bid_b} | 0 -| | Interface is added to bridge domain | ${dut_node} +| | Add interface to bridge domain | ${dut_node} | | ... | @{vhosts}[1] | ${bid_b} | 0 -| | Interface is added to bridge domain | ${dut_node} +| | Add interface to bridge domain | ${dut_node} | | ... | ${vlan2_index} | ${bid_r} | 0 -| | Interface is added to bridge domain | ${dut_node} +| | Add interface to bridge domain | ${dut_node} | | ... | @{vhosts}[2] | ${bid_r} | 0 -| | Interface is added to bridge domain | ${dut_node} +| | Add interface to bridge domain | ${dut_node} | | ... | @{vhosts}[3] | ${bid_r} | 0 | Positive Scenario Ping From DUT1 - Intra network diff --git a/tests/func/fds/eth2p-ethip4vxlan-l2bdbasemaclrn--eth-4vhost-2vm-fds-tenant-nets-func.robot b/tests/func/fds/eth2p-ethip4vxlan-l2bdbasemaclrn--eth-4vhost-2vm-fds-tenant-nets-func.robot index fae1b0340e..80312fb3f5 100644 --- a/tests/func/fds/eth2p-ethip4vxlan-l2bdbasemaclrn--eth-4vhost-2vm-fds-tenant-nets-func.robot +++ b/tests/func/fds/eth2p-ethip4vxlan-l2bdbasemaclrn--eth-4vhost-2vm-fds-tenant-nets-func.robot @@ -20,17 +20,17 @@ | Resource | resources/libraries/robot/qemu.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | SKIP_PATCH -| Test Setup | Run Keywords | Setup all DUTs before test +| Test Setup | Run Keywords | Configure all DUTs before test | ... | AND | Save VPP PIDs -| ... | AND | Setup all TGs before traffic script +| ... | AND | Configure all TGs for traffic script | ... | AND | Reset VAT History On All DUTs | ${nodes} | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} -| ... | AND | Qemu Teardown | ${dut1_node} | ${qemu_node1} +| ... | AND | Tear down QEMU | ${dut1_node} | ${qemu_node1} | ... | qemu_node1 -| ... | AND | Qemu Teardown | ${dut2_node} | ${qemu_node2} +| ... | AND | Tear down QEMU | ${dut2_node} | ${qemu_node2} | ... | qemu_node2 -| ... | AND | Check VPP PID in Teardown +| ... | AND | Verify VPP PID in Teardown | Documentation | *Tenant network FDS related.* | ... | ... | Test suite uses 3-node topology TG - DUT1 - DUT2 - TG @@ -80,7 +80,7 @@ | | ... | a) test l2 connectivity inside every network | | ... | b) test l2 connectivity between networks | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO | VPP_VM_ENV -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} | | And Set Interface Address | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_if_ip} | ${prefix_length} @@ -108,7 +108,7 @@ | | ... | ${dut2_node} | ${sock4} | | ${dut2_vhosts}= | And Create List | ${vhost_if1_DUT2} | ${vhost_if2_DUT2} | | ... | ${vhost_if3_DUT2} | ${vhost_if4_DUT2} -| | When Setup QEMU Vhost and Run | ${dut1_node} +| | When Configure QEMU vhost and run it | ${dut1_node} | | ... | ${sock1} | | ... | ${sock2} | | ... | ${sock3} @@ -120,7 +120,7 @@ | | ... | ${prefix_length} | | ... | qemu_node1 | | ... | 04 -| | And Setup QEMU Vhost and Run | ${dut2_node} +| | And Configure QEMU vhost and run it | ${dut2_node} | | ... | ${sock1} | | ... | ${sock2} | | ... | ${sock3} @@ -162,25 +162,25 @@ | | ... | \| @{vhosts} \| | | ... | | [Arguments] | ${dut_node} | ${src_ip} | ${dst_ip} | @{vhosts} -| | Bridge domain on DUT node is created +| | Create bridge domain | | ... | ${dut_node} | ${bid_b} | learn=${TRUE} -| | Bridge domain on DUT node is created +| | Create bridge domain | | ... | ${dut_node} | ${bid_r} | learn=${TRUE} | | ${vxlan1_if}= | Create VXLAN interface | ${dut_node} | ${vni_blue} | | | ... | ${src_ip} | ${dst_ip} | | ${vxlan2_if}= | Create VXLAN interface | ${dut_node} | ${vni_red} | | | ... | ${src_ip} | ${dst_ip} -| | Interface is added to bridge domain +| | Add interface to bridge domain | | ... | ${dut_node} | ${vxlan1_if} | ${bid_b} | 0 -| | Interface is added to bridge domain +| | Add interface to bridge domain | | ... | ${dut_node} | @{vhosts}[0] | ${bid_b} | 0 -| | Interface is added to bridge domain +| | Add interface to bridge domain | | ... | ${dut_node} | @{vhosts}[1] | ${bid_b} | 0 -| | Interface is added to bridge domain +| | Add interface to bridge domain | | ... | ${dut_node} | ${vxlan2_if} | ${bid_r} | 0 -| | Interface is added to bridge domain +| | Add interface to bridge domain | | ... | ${dut_node} | @{vhosts}[2] | ${bid_r} | 0 -| | Interface is added to bridge domain +| | Add interface to bridge domain | | ... | ${dut_node} | @{vhosts}[3] | ${bid_r} | 0 | Positive Scenario Ping From DUT1 - Intra network diff --git a/tests/func/gre/eth2p-ethip4gre-ip4base-func.robot b/tests/func/gre/eth2p-ethip4gre-ip4base-func.robot index 2a8b5df299..3959e0954f 100644 --- a/tests/func/gre/eth2p-ethip4gre-ip4base-func.robot +++ b/tests/func/gre/eth2p-ethip4gre-ip4base-func.robot @@ -20,8 +20,8 @@ | Library | resources.libraries.python.IPUtil | Library | resources.libraries.python.Trace | Force Tags | VM_ENV | HW_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *GREoIPv4 test cases* | ... | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links @@ -72,10 +72,10 @@ | | ... | both DUTs and GRE tunnel between them; verify IPv4 headers on | | ... | received packets are correct. [Ref] RFC2784. | | [Tags] | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO -| | Given Path for 3-node testing is set | ${nodes['TG']} | ${nodes['DUT1']} +| | Given Configure path in 3-node circular topology | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And IP addresses are set on interfaces +| | And Set interfaces in 3-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_ip_address} | ${prefix} | | ... | ${dut1_node} | ${dut1_to_tg} | ${net1_gw_address} | ${prefix} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_ip_address} | ${prefix} @@ -85,17 +85,17 @@ | | And Add Arp On Dut | ${dut2_node} | ${dut2_to_tg} | ${net2_host_address} | | ... | ${tg_to_dut2_mac} | | ${dut1_gre_interface} | ${dut1_gre_index}= -| | ... | When GRE tunnel interface is created and up +| | ... | When Create GRE tunnel interface and set it up | | ... | ${dut1_node} | ${dut1_ip_address} | ${dut2_ip_address} | | ${dut2_gre_interface} | ${dut2_gre_index}= -| | ... | And GRE tunnel interface is created and up +| | ... | And Create GRE tunnel interface and set it up | | ... | ${dut2_node} | ${dut2_ip_address} | ${dut1_ip_address} -| | And IP addresses are set on interfaces +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_gre_index} | ${dut1_gre_ip} | ${prefix} | | ... | ${dut2_node} | ${dut2_gre_index} | ${dut2_gre_ip} | ${prefix} | | And Vpp Route Add | ${dut1_node} | ${net2_address} | ${prefix} | | ... | ${dut2_gre_ip} | ${dut1_gre_index} -| | Then Send Packet And Check Headers | ${tg_node} +| | Then Send packet and verify headers | ${tg_node} | | ... | ${net1_host_address} | ${net2_host_address} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} @@ -108,18 +108,18 @@ | | ... | non-encapsulated ICMPv4 Echo Req to DUT; verify TG received | | ... | GREoIPv4 encapsulated packet is correct. [Ref] RFC2784. | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | And IP addresses are set on interfaces +| | And Set interfaces in 2-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut1_ip_address} | ${prefix} | | ... | ${dut_node} | ${dut_to_tg_if1} | ${net1_gw_address} | ${prefix} | | And Add Arp On Dut | ${dut_node} | ${dut_to_tg_if2} | ${dut2_ip_address} | | ... | ${tg_to_dut_if2_mac} | | ${dut1_gre_interface} | ${dut1_gre_index}= -| | ... | When GRE tunnel interface is created and up +| | ... | When Create GRE tunnel interface and set it up | | ... | ${dut_node} | ${dut1_ip_address} | ${dut2_ip_address} -| | And IP addresses are set on interfaces +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut1_gre_index} | ${dut1_gre_ip} | ${prefix} | | And Vpp Route Add | ${dut_node} | ${net2_address} | ${prefix} | | ... | ${dut2_gre_ip} | ${dut1_gre_index} @@ -137,18 +137,18 @@ | | ... | encapsulated into GREoIPv4 towards VPP; verify TG received IPv4 | | ... | de-encapsulated packet is correct. [Ref] RFC2784. | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | And IP addresses are set on interfaces +| | And Set interfaces in 2-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut1_ip_address} | ${prefix} | | ... | ${dut_node} | ${dut_to_tg_if1} | ${net1_gw_address} | ${prefix} | | And Add Arp On Dut | ${dut_node} | ${dut_to_tg_if1} | ${net1_host_address} | | ... | ${tg_to_dut_if1_mac} | | ${dut1_gre_interface} | ${dut1_gre_index}= -| | ... | When GRE tunnel interface is created and up +| | ... | When Create GRE tunnel interface and set it up | | ... | ${dut_node} | ${dut1_ip_address} | ${dut2_ip_address} -| | And IP addresses are set on interfaces +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut1_gre_index} | ${dut1_gre_ip} | ${prefix} | | Then Send GRE and check received ICMPv4 header | | ... | ${tg_node} | ${tg_to_dut_if2} | ${tg_to_dut_if1} @@ -167,12 +167,12 @@ | | ... | non-encapsulated ICMPv4 Echo Req to DUT; verify TG received GREoIPv4 | | ... | encapsulated packet is correct for each tunnel. [Ref] RFC2784. | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | ${dut1_lo_index}= | And VPP Create loopback | ${dut_node} | | And Set Interface State | ${dut_node} | ${dut1_lo_index} | up -| | And IP addresses are set on interfaces +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut1_ip_address} | ${prefix} | | ... | ${dut_node} | ${dut_to_tg_if1} | ${net1_gw_address} | ${prefix} | | ... | ${dut_node} | ${dut1_lo_index} | ${dut1_lo_address} | ${32} @@ -183,12 +183,12 @@ | | And Vpp Route Add | ${dut_node} | ${tun1_dst} | ${32} | | ... | ${dut2_ip_address} | ${dut_to_tg_if2} | | ${dut1_gre0_interface} | ${dut1_gre0_index}= -| | ... | When GRE tunnel interface is created and up +| | ... | When Create GRE tunnel interface and set it up | | ... | ${dut_node} | ${dut1_lo_address} | ${tun0_dst} | | ${dut1_gre1_interface} | ${dut1_gre1_index}= -| | ... | And GRE tunnel interface is created and up +| | ... | And Create GRE tunnel interface and set it up | | ... | ${dut_node} | ${dut1_lo_address} | ${tun1_dst} -| | And IP addresses are set on interfaces +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut1_gre0_index} | ${dut_tun0_ip1} | ${prefix} | | ... | ${dut_node} | ${dut1_gre1_index} | ${dut_tun1_ip1} | ${prefix} | | And Vpp Route Add | ${dut_node} | ${net2_address} | ${prefix} @@ -218,12 +218,12 @@ | | ... | configured tunnel same as destination; verify TG received GREoIPv4 | | ... | encapsulated packet is correct. [Ref] RFC2784. | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | ${dut1_lo_index}= | And VPP Create loopback | ${dut_node} | | And Set Interface State | ${dut_node} | ${dut1_lo_index} | up -| | And IP addresses are set on interfaces +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut1_ip_address} | ${prefix} | | ... | ${dut_node} | ${dut_to_tg_if1} | ${net1_gw_address} | ${prefix} | | ... | ${dut_node} | ${dut1_lo_index} | ${dut1_lo_address} | ${32} @@ -234,12 +234,12 @@ | | And Vpp Route Add | ${dut_node} | ${tun1_dst} | ${32} | | ... | ${dut2_ip_address} | ${dut_to_tg_if2} | | ${dut1_gre0_interface} | ${dut1_gre0_index}= -| | ... | When GRE tunnel interface is created and up +| | ... | When Create GRE tunnel interface and set it up | | ... | ${dut_node} | ${dut1_lo_address} | ${tun0_dst} | | ${dut1_gre1_interface} | ${dut1_gre1_index}= -| | ... | And GRE tunnel interface is created and up +| | ... | And Create GRE tunnel interface and set it up | | ... | ${dut_node} | ${dut1_lo_address} | ${tun1_dst} -| | And IP addresses are set on interfaces +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut1_gre0_index} | ${dut_tun0_ip1} | ${prefix} | | ... | ${dut_node} | ${dut1_gre1_index} | ${dut_tun1_ip1} | ${prefix} | | And Vpp Route Add | ${dut_node} | ${net2_address} | ${prefix} @@ -267,12 +267,12 @@ | | ... | destination address. [Ref] RFC2784. | | ... | | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | ${dut1_lo_index}= | And VPP Create loopback | ${dut_node} | | And Set Interface State | ${dut_node} | ${dut1_lo_index} | up -| | And IP addresses are set on interfaces +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut1_ip_address} | ${prefix} | | ... | ${dut_node} | ${dut_to_tg_if1} | ${net1_gw_address} | ${prefix} | | ... | ${dut_node} | ${dut1_lo_index} | ${dut1_lo_address} | ${32} @@ -285,12 +285,12 @@ | | And Vpp Route Add | ${dut_node} | ${tun1_dst} | ${32} | | ... | ${dut2_ip_address} | ${dut_to_tg_if2} | | ${dut1_gre0_interface} | ${dut1_gre0_index}= -| | ... | When GRE tunnel interface is created and up +| | ... | When Create GRE tunnel interface and set it up | | ... | ${dut_node} | ${dut1_lo_address} | ${tun0_dst} | | ${dut1_gre1_interface} | ${dut1_gre1_index}= -| | ... | And GRE tunnel interface is created and up +| | ... | And Create GRE tunnel interface and set it up | | ... | ${dut_node} | ${dut1_lo_address} | ${tun1_dst} -| | And IP addresses are set on interfaces +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut1_gre0_index} | ${dut_tun0_ip1} | ${prefix} | | ... | ${dut_node} | ${dut1_gre1_index} | ${dut_tun1_ip1} | ${prefix} | | Then Send GRE and check received ICMPv4 header diff --git a/tests/func/honeycomb/mgmt-cfg-acl-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-acl-apihc-apivat-func.robot index 7792fb3fdd..9d94d3d024 100644 --- a/tests/func/honeycomb/mgmt-cfg-acl-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-acl-apihc-apivat-func.robot @@ -119,21 +119,21 @@ | | ... | ${node} | ${table_index} | ${session_index} | ${vat_acl_session} | | When Honeycomb enables ACL on interface | | ... | ${node} | ${interface} | ${hc_acl_table['name']} -| | Then Interface ACL settings from Honeycomb should be +| | Then Interface ACL configuration from Honeycomb should be | | ... | ${node} | ${interface} | ${hc_acl_table['name']} -| | And Interface ACL settings from VAT should be +| | And Interface ACL configuration from VAT should be | | ... | ${node} | ${interface} | ${table_index} | TC08: Honeycomb disables ACL on interface | | [Documentation] | Check if Honeycomb API can disable ACL on an interface. -| | Given Interface ACL settings from Honeycomb should be +| | Given Interface ACL configuration from Honeycomb should be | | ... | ${node} | ${interface} | ${hc_acl_table['name']} -| | And Interface ACL settings from VAT should be +| | And Interface ACL configuration from VAT should be | | ... | ${node} | ${interface} | ${table_index} | | When Honeycomb disables ACL on interface | ${node} | ${interface} -| | Then Interface ACL settings from Honeycomb should be empty +| | Then Interface ACL configuration from Honeycomb should be empty | | ... | ${node} | ${interface} -| | And Interface ACL settings from VAT should be empty +| | And Interface ACL configuration from VAT should be empty | | ... | ${node} | ${interface} | TC09: Honeycomb can remove one out of multiple ACL tables diff --git a/tests/func/honeycomb/mgmt-cfg-dhcp-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-dhcp-apihc-apivat-func.robot index ba39c02402..5b6656958d 100644 --- a/tests/func/honeycomb/mgmt-cfg-dhcp-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-dhcp-apihc-apivat-func.robot @@ -45,7 +45,7 @@ | | Then DHCP relay configuration from Honeycomb should contain | | ... | ${node} | ${relay1_oper} | | When DHCP relay test setup -| | Then Send DHCP Messages | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2} +| | Then Send DHCP messages and check answer | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2} | | ... | ${dhcp_server1_ip} | ${tg_to_dut_if2_mac} | ${client_ip} | | ... | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_ip} @@ -88,13 +88,13 @@ *** Keywords *** | DHCP relay test setup -| | Path for 2-node testing is set +| | Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up -| | Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length} -| | Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_length} | | Add ARP on DUT | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dhcp_server1_ip} | ${tg_to_dut_if2_mac} @@ -104,14 +104,14 @@ | | ... | ${FALSE} | ${NONE} | DHCP relay test setup IPv6 -| | Path for 2-node testing is set +| | Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up | | And Vpp All Ra Suppress Link Layer | ${nodes} -| | Honeycomb sets interface ipv6 address | ${dut_node} +| | Honeycomb sets interface IPv6 address | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip6} | ${prefix_length_v6} -| | Honeycomb sets interface ipv6 address | ${dut_node} +| | Honeycomb sets interface IPv6 address | ${dut_node} | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip6} | ${prefix_length_v6} | | And Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2} | ${dhcp_server_ip6} | | ... | ${tg_to_dut_if2_mac} diff --git a/tests/func/honeycomb/mgmt-cfg-int-apihcnc-func.robot b/tests/func/honeycomb/mgmt-cfg-int-apihcnc-func.robot index 4fe9dde40c..c6ae380f9b 100644 --- a/tests/func/honeycomb/mgmt-cfg-int-apihcnc-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-int-apihcnc-func.robot @@ -34,7 +34,7 @@ | TC01: Honeycomb can create and delete interfaces | | [Documentation] | Repeatedly create and delete an interface through Netconf\ | | ... | and check the reply for any errors. -| | Given Netconf session is established | ${node} +| | Given Netconf session should be established | ${node} | | And Honeycomb creates first L2 bridge domain | | ... | ${node} | bd_netconf | ${bd_settings} | | :FOR | ${index} | IN RANGE | 20 @@ -44,7 +44,7 @@ | TC02: Transaction revert test case 1 | | [Documentation] | Configure two conflicting VxLAN tunnels, then verify\ | | ... | that neither tunnel exists. -| | Given Netconf session is established | ${node} +| | Given Netconf session should be established | ${node} | | ${if_data}= | And InterfaceAPI.Get all interfaces oper data | ${node} | | When Error trigger is sent | ${trigger_revert1} | | ${if_data_new}= | And InterfaceAPI.Get all interfaces oper data | ${node} @@ -53,7 +53,7 @@ | TC03: Transaction revert test case 2 | | [Documentation] | Configure two conflicting TAP interfaces, then verify\ | | ... | that neither interface exists. -| | Given Netconf session is established | ${node} +| | Given Netconf session should be established | ${node} | | ${if_data}= | And InterfaceAPI.Get all interfaces oper data | ${node} | | When Error trigger is sent | ${trigger_revert1} | | ${if_data_new}= | And InterfaceAPI.Get all interfaces oper data | ${node} @@ -61,7 +61,7 @@ | TC04: Vlan subinterface creation | | [Documentation] | Configure a Vlan sub-interface under a physical interface. -| | Given Netconf session is established | ${node} +| | Given Netconf session should be established | ${node} | | When Error Trigger Is Sent | | ... | ${trigger_vlan} | interface=${interface} | | Then Replies should not contain RPC errors diff --git a/tests/func/honeycomb/mgmt-cfg-int-subint-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-int-subint-apihc-apivat-func.robot index c7e0737a6b..803cfa0932 100644 --- a/tests/func/honeycomb/mgmt-cfg-int-subint-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-int-subint-apihc-apivat-func.robot @@ -36,7 +36,7 @@ | TC01: Honeycomb creates sub-interface | | [Documentation] | Check if Honeycomb creates a sub-interface. | | ... -| | Given Honeycomb sets interface state | ${node} | ${super_if} | down +| | Given Honeycomb configures interface state | ${node} | ${super_if} | down | | And sub-interface Operational Data From Honeycomb Should Be empty | | ... | ${node} | ${super_if} | ${sub_if_id} | | And interface Operational Data From VAT Should Be empty @@ -62,7 +62,7 @@ | | ... | ${node} | ${super_if} | ${sub_if_id} | down | down | | Sub-interface state from VAT should be | | ... | ${node} | ${sub_if_name} | down | down -| | When Honeycomb sets interface state +| | When Honeycomb configures interface state | | ... | ${node} | ${super_if} | up | | Then interface state from Honeycomb should be | | ... | ${node} | ${super_if} | up @@ -112,7 +112,7 @@ | | ... | ${node} | ${super_if} | up | | And interface state from VAT should be | | ... | ${node} | ${super_if} | up -| | When Honeycomb sets interface state +| | When Honeycomb configures interface state | | ... | ${node} | ${super_if} | down | | Then interface state from Honeycomb should be | | ... | ${node} | ${super_if} | down @@ -387,7 +387,7 @@ | TC18: Honeycomb modifies sub-interface exact tag match | | [Documentation] | Check if Honeycomb can modify a sub-interface with exact\ | | ... | tag match. -| | Given Honeycomb sets interface state | ${node} | ${super_if2} | down +| | Given Honeycomb configures interface state | ${node} | ${super_if2} | down | | And sub-interface Operational Data From Honeycomb Should Be empty | | ... | ${node} | ${super_if2} | ${sub_if_id} | | And interface Operational Data From VAT Should Be empty @@ -466,7 +466,7 @@ | | ... | ${node} | ${super_if} | ${sub_if_id} | | And sub-interface ipv4 address from VAT should be empty | | ... | ${node} | ${sub_if_name} -| | And Honeycomb sets interface ipv4 address | ${node} +| | And Honeycomb sets interface IPv4 address | ${node} | | ... | local0 | ${ipv4['address']} | ${ipv4['prefix-length']} | | When Honeycomb adds unnumbered configuration to interface | | ... | ${node} | ${super_if}.${sub_if_id} | local0 @@ -485,7 +485,7 @@ | TC23: Honeycomb removes sub-interface unnumbered configuration | | [Documentation] | Check if Honeycomb can remove unnumbered configuration\ | | ... | from a sub-interface. -| | [Teardown] | Honeycomb removes interface ipv4 addresses | ${node} +| | [Teardown] | Honeycomb removes interface IPv4 addresses | ${node} | | ... | local0 | | Given IPv4 address from Honeycomb should be | | ... | ${node} | local0 | ${ipv4['address']} | ${ipv4['prefix-length']} @@ -552,7 +552,7 @@ | | ... | | [Arguments] | ${node} | ${super_interface} | ${identifier} | | ... -| | Honeycomb sets interface state +| | Honeycomb configures interface state | | ... | ${node} | ${super_interface} | up | | Honeycomb sets the sub-interface up | | ... | ${node} | ${super_interface} | ${identifier} @@ -572,7 +572,7 @@ | | ... | | [Arguments] | ${node} | ${super_interface} | ${identifier} | | ... -| | Honeycomb sets interface state +| | Honeycomb configures interface state | | ... | ${node} | ${super_interface} | down | | Honeycomb sets the sub-interface down | | ... | ${node} | ${super_interface} | ${identifier} diff --git a/tests/func/honeycomb/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot index edc1713824..dd619efbe7 100644 --- a/tests/func/honeycomb/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot @@ -34,11 +34,11 @@ | | Given Interface state from Honeycomb should be | | ... | ${node} | ${interface} | down | | And Interface state from VAT should be | ${node} | ${interface} | down -| | When Honeycomb sets interface state | ${node} | ${interface} | up +| | When Honeycomb configures interface state | ${node} | ${interface} | up | | Then Interface state from Honeycomb should be | | ... | ${node} | ${interface} | up | | And Interface state from VAT should be | ${node} | ${interface} | up -| | When Honeycomb sets interface state | ${node} | ${interface} | down +| | When Honeycomb configures interface state | ${node} | ${interface} | down | | Then Interface state from Honeycomb should be | | ... | ${node} | ${interface} | down | | And Interface state from VAT should be | ${node} | ${interface} | down @@ -48,7 +48,7 @@ | | ... | with address and netmask provided. | | Given IPv4 address from Honeycomb should be empty | ${node} | ${interface} | | And ipv4 address from VAT should be empty | ${node} | ${interface} -| | When Honeycomb sets interface ipv4 address | ${node} | ${interface} +| | When Honeycomb sets interface IPv4 address | ${node} | ${interface} | | ... | ${ipv4_address} | ${ipv4_mask} | | Then IPv4 address from Honeycomb should be | | ... | ${node} | ${interface} | ${ipv4_address} | ${ipv4_prefix} @@ -64,18 +64,18 @@ | | And IPv4 address from VAT should be | | ... | ${node} | ${interface} | ${ipv4_address} | | ... | ${ipv4_prefix} | ${ipv4_mask} -| | When Honeycomb removes interface ipv4 addresses | ${node} | ${interface} +| | When Honeycomb removes interface IPv4 addresses | ${node} | ${interface} | | Then IPv4 address from Honeycomb should be empty | ${node} | ${interface} | | And ipv4 address from VAT should be empty | ${node} | ${interface} | TC04: Honeycomb modifies interface IPv4 address with prefix | | [Documentation] | Check if Honeycomb API can configure interfaces for ipv4\ | | ... | with address and prefix provided. -| | [Teardown] | Honeycomb removes interface ipv4 addresses | ${node} +| | [Teardown] | Honeycomb removes interface IPv4 addresses | ${node} | | ... | ${interface} | | Given IPv4 address from Honeycomb should be empty | ${node} | ${interface} | | And ipv4 address from VAT should be empty | ${node} | ${interface} -| | When Honeycomb sets interface ipv4 address with prefix +| | When Honeycomb sets interface IPv4 address with prefix | | ... | ${node} | ${interface} | ${ipv4_address2} | ${ipv4_prefix} | | Then IPv4 address from Honeycomb should be | | ... | ${node} | ${interface} | ${ipv4_address2} | ${ipv4_prefix} @@ -85,24 +85,24 @@ | TC05: Honeycomb modifies IPv4 neighbor table | | [Documentation] | Check if Honeycomb API can add and remove ARP entries. -| | [Teardown] | Honeycomb clears all interface ipv4 neighbors +| | [Teardown] | Honeycomb clears all interface IPv4 neighbors | | ... | ${node} | ${interface} | | Given IPv4 neighbor from Honeycomb should be empty | | ... | ${node} | ${interface} -| | When Honeycomb adds interface ipv4 neighbor +| | When Honeycomb adds interface IPv4 neighbor | | ... | ${node} | ${interface} | ${ipv4_neighbor} | ${neighbor_mac} | | Then IPv4 neighbor from Honeycomb should be | | ... | ${node} | ${interface} | ${ipv4_neighbor} | ${neighbor_mac} | TC06: Honeycomb modifies interface configuration - IPv6 | | [Documentation] | Check if Honeycomb API can configure interfaces for ipv6. -| | [Teardown] | Honeycomb removes interface ipv6 addresses | ${node} +| | [Teardown] | Honeycomb removes interface IPv6 addresses | ${node} | | ... | ${interface} | | Given IPv6 address from Honeycomb should be empty | | ... | ${node} | ${interface} | | And IPv6 address from VAT should be empty | | ... | ${node} | ${interface} -| | When Honeycomb sets interface ipv6 address +| | When Honeycomb sets interface IPv6 address | | ... | ${node} | ${interface} | ${ipv6_address} | ${ipv6_prefix} | | Then IPv6 address from Honeycomb should contain | | ... | ${node} | ${interface} | ${ipv6_address} | ${ipv6_prefix} @@ -111,11 +111,11 @@ | TC07: Honeycomb modifies IPv6 neighbor table | | [Documentation] | Check if Honeycomb API can add and remove ARP entries. -| | [Teardown] | Honeycomb clears all interface ipv6 neighbors +| | [Teardown] | Honeycomb clears all interface IPv6 neighbors | | ... | ${node} | ${interface} | | Given IPv6 neighbor from Honeycomb should be empty | | ... | ${node} | ${interface} -| | When Honeycomb adds interface ipv6 neighbor +| | When Honeycomb adds interface IPv6 neighbor | | ... | ${node} | ${interface} | ${ipv6_neighbor} | ${neighbor_mac} | | Then IPv6 neighbor from Honeycomb should be | | ... | ${node} | ${interface} | ${ipv6_neighbor} | ${neighbor_mac} @@ -133,13 +133,13 @@ | TC09: Honeycomb modifies interface configuration - vrf | | [Documentation] | Check if Honeycomb API can configure interface\ | | ... | vrf ID. -| | [Teardown] | Honeycomb sets interface vrf ID +| | [Teardown] | Honeycomb sets interface VRF ID | | ... | ${node} | ${interface} | ${0} | ipv4 -| | When Honeycomb sets interface vrf ID +| | When Honeycomb sets interface VRF ID | | ... | ${node} | ${interface} | ${1} | ipv4 -| | Then Interface vrf ID from Honeycomb should be +| | Then Interface VRF ID from Honeycomb should be | | ... | ${node} | ${interface} | ${1} | ipv4 -| | And Interface vrf ID from VAT should be +| | And Interface VRF ID from VAT should be | | ... | ${node} | ${interface} | ${1} | TC10: Honeycomb can configure multiple IP addresses on one interface @@ -152,15 +152,15 @@ | | ... | of source and destination IP addresses. Receive an ICMP reply\ | | ... | for every packet sent. | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | When Honeycomb sets interface ipv4 address with prefix +| | When Honeycomb sets interface IPv4 address with prefix | | ... | ${dut_node} | ${dut_to_tg_if1} | ${ipv4_address} | ${ipv4_prefix} -| | And Honeycomb adds interface ipv4 address +| | And Honeycomb adds interface IPv4 address | | ... | ${dut_node} | ${dut_to_tg_if1} | ${ipv4_address2} | ${ipv4_prefix} -| | And Honeycomb sets interface ipv6 address +| | And Honeycomb sets interface IPv6 address | | ... | ${dut_node} | ${dut_to_tg_if1} | ${ipv6_address} | ${ipv6_prefix} -| | And Honeycomb adds interface ipv6 address +| | And Honeycomb adds interface IPv6 address | | ... | ${dut_node} | ${dut_to_tg_if1} | ${ipv6_address2} | ${ipv6_prefix} | | Then IPv4 address from Honeycomb should be | | ... | ${dut_node} | ${dut_to_tg_if1} | ${ipv4_address} | ${ipv4_prefix} @@ -171,16 +171,16 @@ | | ... | ${dut_node} | ${dut_to_tg_if1} | ${ipv6_address} | ${ipv6_prefix} | | And IPv6 address from VAT should contain | | ... | ${dut_node} | ${dut_to_tg_if1} | ${ipv6_address} | ${ipv6_prefix} -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | And Honeycomb adds interface ipv4 neighbor | ${dut_node} | ${dut_to_tg_if1} +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | And Honeycomb adds interface IPv4 neighbor | ${dut_node} | ${dut_to_tg_if1} | | ... | ${ipv4_neighbor} | ${neighbor_mac} -| | And Honeycomb adds interface ipv4 neighbor | ${dut_node} | ${dut_to_tg_if1} +| | And Honeycomb adds interface IPv4 neighbor | ${dut_node} | ${dut_to_tg_if1} | | ... | ${ipv4_neighbor2} | ${neighbor_mac2} -| | And Honeycomb adds interface ipv6 neighbor | ${dut_node} | ${dut_to_tg_if1} +| | And Honeycomb adds interface IPv6 neighbor | ${dut_node} | ${dut_to_tg_if1} | | ... | ${ipv6_neighbor} | ${neighbor_mac} -| | And Honeycomb adds interface ipv6 neighbor | ${dut_node} | ${dut_to_tg_if1} +| | And Honeycomb adds interface IPv6 neighbor | ${dut_node} | ${dut_to_tg_if1} | | ... | ${ipv6_neighbor2} | ${neighbor_mac2} -| | And Vpp nodes ra suppress link layer | ${nodes} +| | And Suppress ICMPv6 router advertisement message | ${nodes} | | Then Ping and Verify IP address | ${nodes['TG']} | | ... | ${ipv4_neighbor} | ${ipv4_address} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} @@ -201,15 +201,15 @@ | TC11: Honeycomb fails to configure two IPv4 addresses from the same subnet | | [Documentation] | Check if Honeycomb can configure two IPv4 addresses in\ | | ... | the same subnet onto a single interface. It should not be possible. -| | [Teardown] | Honeycomb removes interface ipv4 addresses | ${node} +| | [Teardown] | Honeycomb removes interface IPv4 addresses | ${node} | | ... | ${interface} | | [Tags] | EXPECTED_FAILING # VPP API does not configure the second address, but returns success. VPP-649 -| | When Honeycomb sets interface ipv4 address with prefix +| | When Honeycomb sets interface IPv4 address with prefix | | ... | ${node} | ${interface} | 192.168.0.1 | ${9} -| | Then Honeycomb fails to add interface ipv4 address +| | Then Honeycomb fails to add interface IPv4 address | | ... | ${node} | ${interface} | 192.168.0.2 | ${9} -| | And Honeycomb fails to add interface ipv4 address +| | And Honeycomb fails to add interface IPv4 address | | ... | ${node} | ${interface} | 192.232.0.2 | ${9} | TC12: Honeycomb fails to configure two IPv6 addresses from the same subnet @@ -217,19 +217,19 @@ | | ... | the same subnet onto a single interface. It should not be possible. | | [Tags] | EXPECTED_FAILING # VPP API does not configure the second address, but returns success. VPP-649 -| | [Teardown] | Honeycomb removes interface ipv6 addresses | ${node} +| | [Teardown] | Honeycomb removes interface IPv6 addresses | ${node} | | ... | ${interface} -| | When Honeycomb sets interface ipv6 address +| | When Honeycomb sets interface IPv6 address | | ... | ${node} | ${interface} | 10::FF10 | ${64} -| | Then Honeycomb fails to add interface ipv6 address +| | Then Honeycomb fails to add interface IPv6 address | | ... | ${node} | ${interface} | 10::FF11 | ${64} -| | And Honeycomb fails to add interface ipv6 address +| | And Honeycomb fails to add interface IPv6 address | | ... | ${node} | ${interface} | 10::FFFF | ${64} | TC13: Honeycomb can configure unnumbered interface | | [Documentation] | Check if Honeycomb can configure an unnumbered interface\ | | ... | on a physical interface, borrowing the IP address of 'local0'. -| | Given Honeycomb sets interface ipv4 address | ${node} +| | Given Honeycomb sets interface IPv4 address | ${node} | | ... | local0 | ${ipv4_address} | ${ipv4_prefix} | | When Honeycomb adds unnumbered configuration to interface | | ... | ${node} | ${interface} | local0 diff --git a/tests/func/honeycomb/mgmt-cfg-l2fib-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-l2fib-apihc-apivat-func.robot index 76683a70db..48527b98df 100644 --- a/tests/func/honeycomb/mgmt-cfg-l2fib-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-l2fib-apihc-apivat-func.robot @@ -46,7 +46,7 @@ | | ... | | Given Interface state from Honeycomb should be | | ... | ${node} | ${interface} | down -| | When Honeycomb sets interface state +| | When Honeycomb configures interface state | | ... | ${node} | ${interface} | up | | Then Interface state from Honeycomb should be | | ... | ${node} | ${interface} | up @@ -230,5 +230,5 @@ | Set test interface down | | [Documentation] | Set the interface used in tests down. | | ... -| | Honeycomb sets interface state +| | Honeycomb configures interface state | | ... | ${node} | ${interface} | down diff --git a/tests/func/honeycomb/mgmt-cfg-lisp-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-lisp-apihc-apivat-func.robot index 174a145a52..9f4a328258 100644 --- a/tests/func/honeycomb/mgmt-cfg-lisp-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-lisp-apihc-apivat-func.robot @@ -33,16 +33,16 @@ | Force Tags | HC_FUNC *** Test Cases *** -| TC01: Honeycomb enables Lisp feature +| TC01: Honeycomb enables LISP feature | | [Documentation] | Check if Honeycomb can enable the Lisp feature. | | Given Lisp Should Not Be Configured | ${node} -| | When Honeycomb Enables Lisp | ${node} -| | Then Lisp state From Honeycomb Should Be | ${node} | ${state} -| | And Lisp state From VAT Should Be | ${node} | ${state} +| | When Honeycomb enables LISP | ${node} +| | Then LISP state from Honeycomb should be | ${node} | ${state} +| | And LISP state from VAT should be | ${node} | ${state} | TC02: Honeycomb adds locator set and locator | | [Documentation] | Check if Honeycomb can configure a locator set. -| | Given Lisp state From Honeycomb Should Be | ${node} | ${state} +| | Given LISP state from Honeycomb should be | ${node} | ${state} | | When Honeycomb adds locator set | ${node} | ${interface} | ${locator_set} | | Then Locator Set From Honeycomb Should Be | | ... | ${node} | ${interface} | ${locator_set} @@ -50,39 +50,39 @@ | TC03: Honeycomb configures Lisp - remote mapping - Bridge Domain | | [Documentation] | Check if Honeycomb can configure a remote Lisp mapping\ | | ... | with a bridge domain. -| | Given Lisp state From Honeycomb Should Be | ${node} | ${state} +| | Given LISP state from Honeycomb should be | ${node} | ${state} | | And Honeycomb creates first l2 bridge domain | | ... | ${node} | ${bd_name} | ${bd_settings} -| | When Honeycomb adds Lisp mapping | ${node} | ${lisp_settings_remote_bd} -| | Then Lisp mapping From Honeycomb Should Be +| | When Honeycomb adds LISP mapping | ${node} | ${lisp_settings_remote_bd} +| | Then LISP mapping from Honeycomb should be | | ... | ${node} | ${remote_bd_subtable} -| | And Lisp mapping From VAT Should Be +| | And LISP mapping from VAT should be | | ... | ${node} | ${vat_remote_bd} | TC04: Honeycomb can remove Lisp mapping | | [Documentation] | Check if Honeycomb can remove a configured Lisp mapping. -| | Given Lisp mapping From Honeycomb Should Be +| | Given LISP mapping from Honeycomb should be | | ... | ${node} | ${remote_bd_subtable} -| | And Lisp mapping From VAT Should Be +| | And LISP mapping from VAT should be | | ... | ${node} | ${vat_remote_bd} | | When Honeycomb removes all lisp mappings | ${node} -| | Then Lisp mappings from Honeycomb should not exist +| | Then LISP mappings from Honeycomb should not exist | | ... | ${node} -| | And Lisp mappings from VAT should not exist +| | And LISP mappings from VAT should not exist | | ... | ${node} | TC05: Honeycomb configures Lisp - remote mapping - VRF | | [Documentation] | Check if Honeycomb can configure a remote Lisp mapping\ | | ... | with VRF. | | [Teardown] | Honeycomb removes all lisp mappings | ${node} -| | Given Lisp mappings from Honeycomb should not exist +| | Given LISP mappings from Honeycomb should not exist | | ... | ${node} -| | And Lisp mappings from VAT should not exist +| | And LISP mappings from VAT should not exist | | ... | ${node} -| | When Honeycomb adds Lisp mapping | ${node} | ${lisp_settings_remote_vrf} -| | Then Lisp mapping From Honeycomb Should Be +| | When Honeycomb adds LISP mapping | ${node} | ${lisp_settings_remote_vrf} +| | Then LISP mapping from Honeycomb should be | | ... | ${node} | ${remote_vrf_subtable} -| | And Lisp mapping From VAT Should Be | ${node} | ${vat_remote_vrf} +| | And LISP mapping from VAT should be | ${node} | ${vat_remote_vrf} | TC06: Honeycomb configures Lisp - local mapping - Bridge Domain | | [Documentation] | Check if Honeycomb can configure a local Lisp mapping\ @@ -90,15 +90,15 @@ | | [Teardown] | Honeycomb removes all lisp mappings | ${node} | | Given Locator Set From Honeycomb Should Be | | ... | ${node} | ${interface} | ${locator_set} -| | And Lisp mappings from Honeycomb should not exist +| | And LISP mappings from Honeycomb should not exist | | ... | ${node} -| | And Lisp mappings from VAT should not exist +| | And LISP mappings from VAT should not exist | | ... | ${node} | | And Honeycomb creates first l2 bridge domain | | ... | ${node} | ${bd2_name} | ${bd_settings} -| | When Honeycomb adds Lisp mapping | ${node} | ${lisp_settings_local_bd} -| | Then Lisp mapping From Honeycomb Should Be | ${node} | ${local_bd_subtable} -| | And Lisp mapping From VAT Should Be | ${node} | ${vat_local_bd} +| | When Honeycomb adds LISP mapping | ${node} | ${lisp_settings_local_bd} +| | Then LISP mapping from Honeycomb should be | ${node} | ${local_bd_subtable} +| | And LISP mapping from VAT should be | ${node} | ${vat_local_bd} | TC07: Honeycomb configures Lisp - local mapping - VRF | | [Documentation] | Check if Honeycomb can configure a local Lisp mapping\ @@ -106,13 +106,13 @@ | | [Teardown] | Honeycomb removes all lisp mappings | ${node} | | Given Locator Set From Honeycomb Should Be | | ... | ${node} | ${interface} | ${locator_set} -| | And Lisp mappings from Honeycomb should not exist +| | And LISP mappings from Honeycomb should not exist | | ... | ${node} -| | And Lisp mappings from VAT should not exist +| | And LISP mappings from VAT should not exist | | ... | ${node} -| | When Honeycomb adds Lisp mapping | ${node} | ${lisp_settings_local_vrf} -| | Then Lisp mapping From Honeycomb Should Be | ${node} | ${local_vrf_subtable} -| | And Lisp mapping From VAT Should Be | ${node} | ${vat_local_vrf} +| | When Honeycomb adds LISP mapping | ${node} | ${lisp_settings_local_vrf} +| | Then LISP mapping from Honeycomb should be | ${node} | ${local_vrf_subtable} +| | And LISP mapping from VAT should be | ${node} | ${vat_local_vrf} | TC08: Honeycomb configures Lisp mapping with adjacency | | [Documentation] | Check if Honeycomb can configure local and remote Lisp\ @@ -122,28 +122,28 @@ | | ... | ${node} | ${interface} | ${locator_set} | | And Honeycomb creates first l2 bridge domain | | ... | ${node} | ${bd2_name} | ${bd_settings} -| | And Lisp mappings from Honeycomb should not exist +| | And LISP mappings from Honeycomb should not exist | | ... | ${node} -| | And Lisp mappings from VAT should not exist +| | And LISP mappings from VAT should not exist | | ... | ${node} -| | And Honeycomb adds Lisp mapping | ${node} | ${lisp_settings_both_vrf} -| | When Honeycomb adds Lisp adjacency | ${node} | ${7} | remote_map_vrf +| | And Honeycomb adds LISP mapping | ${node} | ${lisp_settings_both_vrf} +| | When Honeycomb adds LISP adjacency | ${node} | ${7} | remote_map_vrf | | ... | adj01 | ${vrf_adjacency} | | Then Lisp mapping from Honeycomb should be | | ... | ${node} | ${adj_subtable} | TC09: Honeycomb configures Lisp Map Resolver | | [Documentation] | Check if Honeycomb can configure a Lisp Map Resolver. -| | Given Lisp state From Honeycomb Should Be | ${node} | ${state} -| | And Lisp state From VAT Should Be | ${node} | ${state} +| | Given LISP state from Honeycomb should be | ${node} | ${state} +| | And LISP state from VAT should be | ${node} | ${state} | | When Honeycomb adds Lisp Map Resolver | ${node} | ${ip_address} | | Then Map Resolver from Honeycomb should be | ${node} | ${ip_address} | | And Map Resolver from VAT should be | ${node} | ${ip_address} | TC10: Honeycomb configures Lisp Map Server | | [Documentation] | Check if Honeycomb can configure a Lisp Map Server. -| | Given Lisp state From Honeycomb Should Be | ${node} | ${state} -| | And Lisp state From VAT Should Be | ${node} | ${state} +| | Given LISP state from Honeycomb should be | ${node} | ${state} +| | And LISP state from VAT should be | ${node} | ${state} | | When Honeycomb adds Lisp Map Server | ${node} | @{ip_addresses} | | Then Map Server from Honeycomb should be | ${node} | @{ip_addresses} | | And Map Server from VAT should be | ${node} | @{ip_addresses} @@ -151,24 +151,24 @@ | TC11: Honeycomb configures Lisp PETR configuration | | [Documentation] | Check if Honeycomb can configure Lisp | | ... | PETR configuration. -| | Given Lisp state From Honeycomb Should Be | ${node} | ${state} -| | And Lisp state From VAT Should Be | ${node} | ${state} -| | When Honeycomb enables Lisp PETR feature | ${node} | ${ip_address} +| | Given LISP state from Honeycomb should be | ${node} | ${state} +| | And LISP state from VAT should be | ${node} | ${state} +| | When Honeycomb enables LISP PETR feature | ${node} | ${ip_address} | | Then PETR configuration from Honeycomb should be | ${node} | ${ip_address} | | And PETR configuration from VAT should be | ${node} | enabled | TC12: Honeycomb configures Lisp RLOC Probing | | [Documentation] | Check if Honeycomb can configure Lisp RLOC Probing. -| | Given Lisp state From Honeycomb Should Be | ${node} | ${state} -| | And Lisp state From VAT Should Be | ${node} | ${state} -| | When Honeycomb enables Lisp RLOC feature | ${node} +| | Given LISP state from Honeycomb should be | ${node} | ${state} +| | And LISP state from VAT should be | ${node} | ${state} +| | When Honeycomb enables LISP RLOC feature | ${node} | | Then RLOC Probing from Honeycomb should be | ${node} | ${True} | | And RLOC Probing from VAT should be | ${node} | enabled | TC13: Honeycomb configures Lisp Map Register | | [Documentation] | Check if Honeycomb can configure a Lisp Map Register. -| | Given Lisp state From Honeycomb Should Be | ${node} | ${state} -| | And Lisp state From VAT Should Be | ${node} | ${state} +| | Given LISP state from Honeycomb should be | ${node} | ${state} +| | And LISP state from VAT should be | ${node} | ${state} | | When Honeycomb adds Lisp Map Register | ${node} | ${True} | | Then Map Register from Honeycomb should be | ${node} | ${True} | | And Map Register from VAT should be | ${node} | enabled @@ -177,7 +177,7 @@ | | [Documentation] | Check if Honeycomb can configure the Lisp PITR feature. | | Given Locator Set From Honeycomb Should Be | | ... | ${node} | ${interface} | ${locator_set} -| | When Honeycomb enables Lisp PITR feature | ${node} | ${locator_set} +| | When Honeycomb enables LISP PITR feature | ${node} | ${locator_set} | | Then PITR config from Honeycomb should be | ${node} | ${locator_set} | | And PITR config from VAT should be | ${node} | ${locator_set} @@ -185,14 +185,14 @@ | | [Documentation] | Check if Honeycomb can disable all Lisp features. | | Given Map resolver from Honeycomb should be | ${node} | ${ip_address} | | And PITR config from Honeycomb should be | ${node} | ${locator_set} -| | When Honeycomb disables all Lisp features | ${node} +| | When Honeycomb disables all LISP features | ${node} | | Then Lisp Should Not Be Configured | ${node} | TC16: Honeycomb configures Lisp Map Request Mode | | [Documentation] | Check if Honeycomb can configure Lisp Map Request mode. | | ... | Note: Map Request Mode cannot be removed once configured. -| | [Teardown] | Honeycomb disables Lisp | ${node} -| | Given Honeycomb Enables Lisp | ${node} +| | [Teardown] | Honeycomb disables LISP | ${node} +| | Given Honeycomb enables LISP | ${node} | | When Honeycomb sets Lisp Map Request Mode | ${node} | ${True} | | Then Map Request Mode from Honeycomb should be | | ... | ${node} | source-destination diff --git a/tests/func/honeycomb/mgmt-cfg-pluginacl-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-pluginacl-apihc-apivat-func.robot index abdd94ceb3..7f96472474 100644 --- a/tests/func/honeycomb/mgmt-cfg-pluginacl-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-pluginacl-apihc-apivat-func.robot @@ -66,17 +66,17 @@ | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_macip} | | ... | ingress | macip=${True} -| | When Send TCP Or UDP Packet | ${tg_node} | ${src_ip} | ${dst_ip} +| | When Send TCP or UDP packet and verify received packet | ${tg_node} | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} | ${src_ip} | ${dst_ip} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${classify_src} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} | ${src_ip} | ${dst_ip} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${classify_src2} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} @@ -98,18 +98,18 @@ | | ... | ${dut_node} | ${acl_name_l3_ip4} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_l3_ip4} | ingress -| | Then Send TCP Or UDP Packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | UDP | ${src_port} | ${dst_port} -| | And Send TCP Or UDP Packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -132,18 +132,18 @@ | | ... | ${dut_node} | ${acl_name_l3_ip6} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_l3_ip6} | ingress -| | Then Send TCP Or UDP Packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | UDP | ${src_port} | ${dst_port} -| | And Send TCP Or UDP Packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -166,19 +166,19 @@ | | ... | ${dut_node} | ${acl_name_l4} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_l4} | ingress -| | Then Send TCP Or UDP Packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${classify_src} | ${classify_dst} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -201,17 +201,17 @@ | | ... | ${dut_node} | ${acl_name_mixed} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_mixed} | ingress -| | Then Send TCP Or UDP Packet | ${tg_node} | ${src_ip} | ${dst_ip} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} -| | Then Send TCP Or UDP Packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src_ip} | ${classify_dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src_ip} | ${classify_dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -233,18 +233,18 @@ | | ... | ${dut_node} | ${acl_name_icmp} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_icmp} | ingress -| | Then Send ICMP packet with type and code | ${tg_node} +| | Then Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | ${icmp_type} | ${icmp_code} -| | Then Send ICMP packet with type and code | ${tg_node} +| | Then Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | ${classify_type} | ${icmp_code} | | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send ICMP packet with type and code | ${tg_node} +| | ... | Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -266,18 +266,18 @@ | | ... | ${dut_node} | ${acl_name_icmpv6} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_icmpv6} | ingress -| | Then Send ICMP packet with type and code | ${tg_node} +| | Then Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | ${icmp_type} | ${icmp_code} -| | Then Send ICMP packet with type and code | ${tg_node} +| | Then Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | ${classify_type} | ${icmp_code} | | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send ICMP packet with type and code | ${tg_node} +| | ... | Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -308,17 +308,17 @@ | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | block_all | ingress | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} -| | And Send TCP Or UDP Packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_dst} | ${classify_src} | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if2_mac} | | ... | ${tg_to_dut_if1} | ${dut_to_tg_if2_mac} | | ... | TCP | ${dst_port} | ${src_port} -| | And Send TCP Or UDP Packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -344,18 +344,18 @@ | | ... | ${dut_node} | ${acl_name_l3_ip4} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_l3_ip4} | ingress -| | Then Send TCP Or UDP Packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | UDP | ${src_port} | ${dst_port} -| | And Send TCP Or UDP Packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -372,18 +372,18 @@ | | ... | to the other, using different IPv6 IPs. Receive all packets except\ | | ... | those with IPs in the filtered ranges and UDP protocol payload. | | [Teardown] | Routed ACL test teardown - ipv6 -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Import Variables | resources/test_data/honeycomb/plugin_acl.py | | ... | L3_IP6 | ${acl_name_l3_ip6} -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up -| | And Honeycomb sets interface ipv6 address | ${dut_node} +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | And Honeycomb sets interface IPv6 address | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length} -| | And Honeycomb sets interface ipv6 address | ${dut_node} +| | And Honeycomb sets interface IPv6 address | ${dut_node} | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_length} | | And VPP RA suppress link layer | ${dut_node} | ${dut_to_tg_if2} -| | And Honeycomb adds interface ipv6 neighbor +| | And Honeycomb adds interface IPv6 neighbor | | ... | ${node} | ${dut_to_tg_if2} | ${gateway} | ${tg_to_dut_if2_mac} | | And VPP Route Add | ${node} | ${dst_net} | ${prefix_length} | | ... | ${gateway} | interface=${dut_to_tg_if2} | use_sw_index=False @@ -393,18 +393,18 @@ | | ... | ${dut_node} | ${acl_name_l3_ip6} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_l3_ip6} | ingress -| | Then Send TCP Or UDP Packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | UDP | ${src_port} | ${dst_port} -| | And Send TCP Or UDP Packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -427,19 +427,19 @@ | | ... | ${dut_node} | ${acl_name_l4} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_l4} | ingress -| | Then Send TCP Or UDP Packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${classify_src} | ${classify_dst} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -462,17 +462,17 @@ | | ... | ${dut_node} | ${acl_name_mixed} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_mixed} | ingress -| | Then Send TCP Or UDP Packet | ${tg_node} | ${src_ip} | ${dst_ip} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} -| | Then Send TCP Or UDP Packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src_ip} | ${classify_dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src_ip} | ${classify_dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dst_mac} @@ -495,18 +495,18 @@ | | ... | ${dut_node} | ${acl_name_icmp} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_icmp} | ingress -| | Then Send ICMP packet with type and code | ${tg_node} +| | Then Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | ${icmp_type} | ${icmp_code} -| | Then Send ICMP packet with type and code | ${tg_node} +| | Then Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | ${classify_type} | ${icmp_code} | | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send ICMP packet with type and code | ${tg_node} +| | ... | Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -523,17 +523,17 @@ | | ... | to the other, using different codes and types. Receive all packets\ | | ... | except those with the filtered type and code. | | [Teardown] | Routed ACL test teardown - ipv6 -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Import Variables | resources/test_data/honeycomb/plugin_acl.py | | ... | icmpv6 | ${acl_name_icmpv6} -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up -| | And Honeycomb sets interface ipv6 address | ${dut_node} +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | And Honeycomb sets interface IPv6 address | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length} -| | And Honeycomb sets interface ipv6 address | ${dut_node} +| | And Honeycomb sets interface IPv6 address | ${dut_node} | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_length} -| | And Honeycomb adds interface ipv6 neighbor +| | And Honeycomb adds interface IPv6 neighbor | | ... | ${node} | ${dut_to_tg_if2} | ${gateway} | ${tg_to_dut_if2_mac} | | And VPP RA suppress link layer | ${dut_node} | ${dut_to_tg_if2} | | And VPP Route Add | ${node} | ${dst_net} | ${prefix_length} @@ -544,18 +544,18 @@ | | ... | ${dut_node} | ${acl_name_icmpv6} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_icmpv6} | ingress -| | Then Send ICMP packet with type and code | ${tg_node} +| | Then Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | ${icmp_type} | ${icmp_code} -| | Then Send ICMP packet with type and code | ${tg_node} +| | Then Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | ${classify_type} | ${icmp_code} | | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send ICMP packet with type and code | ${tg_node} +| | ... | Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -595,17 +595,17 @@ | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | block_all | ingress | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} -| | And Send TCP Or UDP Packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_dst} | ${classify_src} | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if2_mac} | | ... | ${tg_to_dut_if1} | ${dut_to_tg_if2_mac} | | ... | TCP | ${dst_port} | ${src_port} -| | And Send TCP Or UDP Packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -616,17 +616,17 @@ | | [Documentation] | Import test variables, set interfaces up, | | ... | configure IPv4 addresses, add neighbor entry and routes. | | [Arguments] | ${test_data_id} | ${acl_name} -| | Path for 2-node testing is set +| | Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | Import Variables | resources/test_data/honeycomb/plugin_acl.py | | ... | ${test_data_id} | ${acl_name} -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up -| | Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length} -| | Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_length} -| | And Honeycomb adds interface ipv4 neighbor +| | And Honeycomb adds interface IPv4 neighbor | | ... | ${node} | ${dut_to_tg_if2} | ${gateway} | ${tg_to_dut_if2_mac} | | VPP Route Add | | ... | ${node} | ${dst_net} | ${prefix_length} | ${gateway} @@ -638,7 +638,7 @@ | Setup interfaces and bridge domain for plugin-acl test | | [Documentation] | Import test variables, set interfaces up and bridge them. | | [Arguments] | ${test_data_id} | ${acl_name} -| | Path For 2-node Testing Is Set +| | Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | Import Variables | resources/test_data/honeycomb/plugin_acl.py | | ... | ${test_data_id} | ${acl_name} @@ -665,8 +665,8 @@ | | Show Packet Trace on All DUTs | ${nodes} | | Read plugin-ACL configuration from VAT | ${node} | | Clear plugin-acl Settings | ${node} | ${dut_to_tg_if1} -| | Honeycomb removes interface ipv4 addresses | ${node} | ${dut_to_tg_if1} -| | Honeycomb clears all interface ipv4 neighbors | ${node} | ${dut_to_tg_if1} +| | Honeycomb removes interface IPv4 addresses | ${node} | ${dut_to_tg_if1} +| | Honeycomb clears all interface IPv4 neighbors | ${node} | ${dut_to_tg_if1} | Routed ACL test teardown - ipv6 | | [Documentation] | Log packet trace and ACL settings, @@ -674,5 +674,5 @@ | | Show Packet Trace on All DUTs | ${nodes} | | Clear plugin-acl Settings | ${node} | ${dut_to_tg_if1} | | Read plugin-ACL configuration from VAT | ${node} -| | Honeycomb removes interface ipv6 addresses | ${node} | ${dut_to_tg_if1} -| | Honeycomb clears all interface ipv6 neighbors | ${node} | ${dut_to_tg_if1} +| | Honeycomb removes interface IPv6 addresses | ${node} | ${dut_to_tg_if1} +| | Honeycomb clears all interface IPv6 neighbors | ${node} | ${dut_to_tg_if1} diff --git a/tests/func/honeycomb/mgmt-cfg-policer-apihc-func.robot b/tests/func/honeycomb/mgmt-cfg-policer-apihc-func.robot index 2884f7c628..d9b6aaaa9c 100644 --- a/tests/func/honeycomb/mgmt-cfg-policer-apihc-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-policer-apihc-func.robot @@ -53,7 +53,7 @@ | TC03: Honeycomb can configure Policer with increased values of CIR (900kbps) | | [Documentation] | Checks if Honeycomb can configure Policer\ | | ... | with increased values of CIR. -| | [Teardown] | Policer test teardown | ${node} +| | [Teardown] | Tear down policer test | ${node} | | Given Policer Operational Data From Honeycomb Should Be empty | ${node} | | When Honeycomb configures Policer | ${node} | ${policer_data_2} | | Then Policer Operational Data From Honeycomb Should Be | ${node} @@ -62,7 +62,7 @@ | TC04: Honeycomb can configure Packets-Per-Second Based Policer | | [Documentation] | Checks if Honeycomb can configure Policer\ | | ... | based on rate-type measured in pps. -| | [Teardown] | Policer test teardown | ${node} +| | [Teardown] | Tear down policer test | ${node} | | Given Policer Operational Data From Honeycomb Should Be empty | ${node} | | When Honeycomb configures Policer | ${node} | ${policer_data_3} | | Then Policer Operational Data From Honeycomb Should Be | ${node} @@ -78,7 +78,7 @@ | | ... | ${acl_tables['hc_acl_session']['match']} | AND | | ... | Honeycomb removes ACL table | ${node} | | ... | ${acl_tables['hc_acl_table']['name']} | AND -| | ... | Policer test teardown | ${node} +| | ... | Tear down policer test | ${node} | | Given Honeycomb configures Policer | ${node} | ${policer_data} | | And ACL table from Honeycomb should not exist | | ... | ${node} | ${acl_tables['hc_acl_table']['name']} @@ -100,7 +100,7 @@ | | ... | Packet on DUT1 is marked with DSCP tag. Verifies if DUT1 sends\ | | ... | correct IPv4 TCP packet with correct DSCP on the second link to TG. | | [Teardown] | Show Packet Trace on All DUTs | ${nodes} -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Honeycomb configures Policer | ${dut_node} | ${policer_data_3} | | And ACL table from Honeycomb should not exist @@ -112,17 +112,17 @@ | | ... | ${acl_tables['hc_acl_session']} | | And Honeycomb enables policer on interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_tables['hc_acl_table']['name']} -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up -| | And Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | And Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length} -| | And Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | And Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_length} -| | And Honeycomb adds interface ipv4 neighbor +| | And Honeycomb adds interface IPv4 neighbor | | ... | ${dut_node} | ${dut_to_tg_if2} | ${tg_to_dut_if2_ip} | | ... | ${tg_to_dut_if2_mac} | | And interfaceCLI.VPP Node Interfaces Ready Wait | ${dut_node} -| | Then Honeycomb Send Packet and Verify Marking | ${tg_node} +| | Then Honeycomb Send packet and verify marking | ${tg_node} | | ... | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} | | ... | ${tg_to_dut_if1_ip} | ${tg_to_dut_if2_ip} | ${dscp_number} diff --git a/tests/func/honeycomb/mgmt-cfg-proxyarp-apihc-func.robot b/tests/func/honeycomb/mgmt-cfg-proxyarp-apihc-func.robot index 23ece5ed5e..056771512f 100644 --- a/tests/func/honeycomb/mgmt-cfg-proxyarp-apihc-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-proxyarp-apihc-func.robot @@ -62,16 +62,16 @@ | | [Teardown] | Run Keywords | | ... | Show Packet Trace on all DUTs | ${nodes} | | ... | AND | Honeycomb removes proxyARP configuration | ${node} -| | ... | AND | Honeycomb sets interface state +| | ... | AND | Honeycomb configures interface state | | ... | ${dut_node} | ${dut_to_tg_if1} | down -| | ... | AND | Honeycomb removes interface ipv4 addresses +| | ... | AND | Honeycomb removes interface IPv4 addresses | | ... | ${node} | ${interface} -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | ${dut_to_tg_name}= | Get interface name | ${dut_node} | ${dut_to_tg_if1} | | ${tg_to_dut_name}= | Get interface name | ${tg_node} | ${tg_to_dut_if1} -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | And Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | And Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_ip} | ${prefix_length} | | When Honeycomb configures proxyARP | ${dut_node} | ${proxyarp_settings_ipv4} | | And Honeycomb enables proxyARP on interface | ${node} | ${dut_to_tg_name} diff --git a/tests/func/honeycomb/mgmt-cfg-proxynd6-apihc-func.robot b/tests/func/honeycomb/mgmt-cfg-proxynd6-apihc-func.robot index c934b06a84..abc03c04f4 100644 --- a/tests/func/honeycomb/mgmt-cfg-proxynd6-apihc-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-proxynd6-apihc-func.robot @@ -44,7 +44,7 @@ | | [Documentation] | Check if Honeycomb can configure the IPv6 ND proxy\ | | ... | feature on an interface. | | Given IPv6 ND proxy from Honeycomb should be empty | ${node} | ${interface} -| | And Honeycomb sets interface state | ${node} | ${interface} | up +| | And Honeycomb configures interface state | ${node} | ${interface} | up | | When Honeycomb configures IPv6 ND proxy on interface | | ... | ${node} | ${interface} | ${test_dst_ip} | | Then IPv6 ND proxy from Honeycomb should be @@ -64,7 +64,7 @@ | | [Teardown] | Honeycomb disables IPv6 ND proxy on interface | | ... | ${node} | ${interface} | | Given IPv6 ND proxy from Honeycomb should be empty | ${node} | ${interface} -| | And Honeycomb sets interface state | ${node} | ${interface} | up +| | And Honeycomb configures interface state | ${node} | ${interface} | up | | When Honeycomb configures IPv6 ND proxy on interface | | ... | ${node} | ${interface} | ${test_dst_ip} | ${test_dst_ip2} | | Then IPv6 ND proxy from Honeycomb should be @@ -85,23 +85,23 @@ | | ... | Show Packet Trace on All DUTs | ${nodes} | AND | | ... | Honeycomb disables IPv6 ND proxy on interface | | ... | ${dut_node} | ${dut_to_tg_if2} -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up -| | Honeycomb sets interface ipv6 address | ${dut_node} +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | Honeycomb sets interface IPv6 address | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length} -| | Honeycomb sets interface ipv6 address | ${dut_node} +| | Honeycomb sets interface IPv6 address | ${dut_node} | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_length} | | And Vpp Ra Suppress Link Layer | ${dut_node} | ${dut_to_tg_if1} | | And Vpp Ra Suppress Link Layer | ${dut_node} | ${dut_to_tg_if2} -| | And Honeycomb adds interface ipv6 neighbor | ${dut_node} | ${dut_to_tg_if1} +| | And Honeycomb adds interface IPv6 neighbor | ${dut_node} | ${dut_to_tg_if1} | | ... | ${test_src_ip} | ${tg_to_dut_if1_mac} -| | And Honeycomb adds interface ipv6 neighbor | ${dut_node} | ${dut_to_tg_if2} +| | And Honeycomb adds interface IPv6 neighbor | ${dut_node} | ${dut_to_tg_if2} | | ... | ${test_dst_ip} | ${tg_to_dut_if2_mac} | | When Honeycomb configures IPv6 ND proxy on interface | | ... | ${dut_node} | ${dut_to_tg_if2} | ${test_dst_ip} -| | Then Verify IPv6ND Proxy | ${tg_node} +| | Then Verify IPv6ND proxy | ${tg_node} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if2} | | ... | ${test_src_ip} | ${test_dst_ip} | | ... | ${tg_to_dut_if1_mac} | ${tg_to_dut_if2_mac} diff --git a/tests/func/honeycomb/mgmt-cfg-routing-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-routing-apihc-apivat-func.robot index a722adaa7b..e0544f71bb 100644 --- a/tests/func/honeycomb/mgmt-cfg-routing-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-routing-apihc-apivat-func.robot @@ -43,7 +43,7 @@ | | ... | ${node} | table1 | ipv4 | ${table1} | ${1} | | Then Routing data from Honeycomb should contain | | ... | ${node} | table1 | ipv4 | ${table1_oper} -| | And Verify Route IPv4 | ${nodes['TG']} +| | And Verify route IPv4 | ${nodes['TG']} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -60,9 +60,9 @@ | | ... | Receive packet on the second TG interface. | | ${table}= | Set Variable | table2 | | Given Setup interfaces and neighbors for IPv4 routing test -| | And Honeycomb adds interface ipv4 neighbor | ${dut_node} | ${dut_to_tg_if2} +| | And Honeycomb adds interface IPv4 neighbor | ${dut_node} | ${dut_to_tg_if2} | | ... | ${next_hop1} | ${next_hop_mac1} -| | And Honeycomb adds interface ipv4 neighbor | ${dut_node} | ${dut_to_tg_if2} +| | And Honeycomb adds interface IPv4 neighbor | ${dut_node} | ${dut_to_tg_if2} | | ... | ${next_hop2} | ${next_hop_mac2} | | When Honeycomb configures routing table | | ... | ${node} | table2 | ipv4 | ${table2} | ${1} @@ -90,7 +90,7 @@ | | Then Routing data from Honeycomb should contain | | ... | ${node} | table3 | ipv4 | ${table3_oper} | | And Run keyword and Expect Error | ICMP echo Rx timeout -| | ... | Verify Route IPv4 | ${nodes['TG']} +| | ... | Verify route IPv4 | ${nodes['TG']} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -109,7 +109,7 @@ | | ... | ${node} | table4 | ipv6 | ${table4} | ${1} | | Then Routing data from Honeycomb should contain | | ... | ${node} | table4 | ipv6 | ${table4_oper} -| | And Verify Route IPv6 | ${nodes['TG']} +| | And Verify route IPv6 | ${nodes['TG']} | | ... | ${src_ip} | ${next_hop} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -126,9 +126,9 @@ | | ... | Receive packet on the second TG interface. | | ${table}= | Set Variable | table5 | | Given Setup interfaces and neighbors for IPv6 routing test -| | And Honeycomb adds interface ipv6 neighbor | ${dut_node} | ${dut_to_tg_if2} +| | And Honeycomb adds interface IPv6 neighbor | ${dut_node} | ${dut_to_tg_if2} | | ... | ${next_hop1} | ${next_hop_mac1} -| | And Honeycomb adds interface ipv6 neighbor | ${dut_node} | ${dut_to_tg_if2} +| | And Honeycomb adds interface IPv6 neighbor | ${dut_node} | ${dut_to_tg_if2} | | ... | ${next_hop2} | ${next_hop_mac2} | | When Honeycomb configures routing table | | ... | ${node} | table5 | ipv6 | ${table5} | ${1} @@ -156,48 +156,48 @@ | | Then Routing data from Honeycomb should contain | | ... | ${node} | table6 | ipv6 | ${table6_oper} | | And Run keyword and Expect Error | ICMP echo Rx timeout -| | ... | Verify Route IPv6 | ${nodes['TG']} +| | ... | Verify route IPv6 | ${nodes['TG']} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} *** Keywords *** | Setup interfaces and neighbors for IPv4 routing test -| | Path for 2-node testing is set +| | Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | Import Variables | resources/test_data/honeycomb/routing.py | | ... | ${nodes['DUT1']} | ipv4 | ${dut_to_tg_if2} | | Setup vrf IDs | ${dut_node} | ${dut_to_tg_if1} | ${1} | | Setup vrf IDs | ${dut_node} | ${dut_to_tg_if2} | ${1} -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up -| | Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_len} -| | Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_len} -| | Honeycomb adds interface ipv4 neighbor | ${dut_node} | ${dut_to_tg_if1} +| | Honeycomb adds interface IPv4 neighbor | ${dut_node} | ${dut_to_tg_if1} | | ... | ${src_ip} | ${tg_to_dut_if1_mac} -| | Honeycomb adds interface ipv4 neighbor | ${dut_node} | ${dut_to_tg_if2} +| | Honeycomb adds interface IPv4 neighbor | ${dut_node} | ${dut_to_tg_if2} | | ... | ${next_hop} | ${tg_to_dut_if2_mac} | Setup interfaces and neighbors for IPv6 routing test -| | Path for 2-node testing is set +| | Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | Import Variables | resources/test_data/honeycomb/routing.py | | ... | ${nodes['DUT1']} | ipv6 | ${dut_to_tg_if2} -| | Honeycomb sets interface vrf ID +| | Honeycomb sets interface VRF ID | | ... | ${dut_node} | ${dut_to_tg_if1} | ${1} | ipv6 -| | Honeycomb sets interface vrf ID +| | Honeycomb sets interface VRF ID | | ... | ${dut_node} | ${dut_to_tg_if2} | ${1} | ipv6 -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up -| | Honeycomb sets interface ipv6 address | ${dut_node} +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | Honeycomb sets interface IPv6 address | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_len} -| | Honeycomb sets interface ipv6 address | ${dut_node} +| | Honeycomb sets interface IPv6 address | ${dut_node} | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_len} -| | Honeycomb adds interface ipv6 neighbor | ${dut_node} | ${dut_to_tg_if1} +| | Honeycomb adds interface IPv6 neighbor | ${dut_node} | ${dut_to_tg_if1} | | ... | ${src_ip} | ${tg_to_dut_if1_mac} -| | Honeycomb adds interface ipv6 neighbor | ${dut_node} | ${dut_to_tg_if2} +| | Honeycomb adds interface IPv6 neighbor | ${dut_node} | ${dut_to_tg_if2} | | ... | ${next_hop} | ${tg_to_dut_if2_mac} | | Vpp all ra suppress link layer | ${nodes} @@ -209,7 +209,7 @@ | Setup vrf IDs | | [Arguments] | ${node} | ${interface} | ${vrf} -| | Honeycomb sets interface vrf ID +| | Honeycomb sets interface VRF ID | | ... | ${node} | ${interface} | ${vrf} | ipv4 -| | Honeycomb sets interface vrf ID +| | Honeycomb sets interface VRF ID | | ... | ${node} | ${interface} | ${vrf} | ipv6
\ No newline at end of file diff --git a/tests/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot b/tests/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot index 3325a0f9bd..abcd86e95d 100644 --- a/tests/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot @@ -35,7 +35,7 @@ | | Given SLAAC Operational Data From Honeycomb Should Be empty | ${node} | | ... | ${interface} | | And InterfaceAPI.Set Interface State | ${node} | ${interface} | up -| | And Honeycomb sets interface ipv6 address | ${node} | ${interface} +| | And Honeycomb sets interface IPv6 address | ${node} | ${interface} | | ... | ${address} | ${prefix} | | When Honeycomb configures SLAAC | ${node} | ${interface} | ${slaac_data} | | Then SLAAC Operational Data From Honeycomb Should Be | ${node} @@ -55,7 +55,7 @@ | | Given SLAAC Operational Data From Honeycomb Should Be empty | ${node} | | ... | ${interface} | | And InterfaceAPI.Set Interface State | ${node} | ${interface} | up -| | And Honeycomb sets interface ipv6 address | ${node} | ${interface} +| | And Honeycomb sets interface IPv6 address | ${node} | ${interface} | | ... | ${address} | ${prefix} | | When Honeycomb configures SLAAC | ${node} | ${interface} | ${slaac_data} | | Then SLAAC Operational Data From Honeycomb Should Be | ${node} @@ -68,7 +68,7 @@ | | Given SLAAC Operational Data From Honeycomb Should Be empty | ${node} | | ... | ${interface} | | And InterfaceAPI.Set Interface State | ${node} | ${interface} | up -| | And Honeycomb sets interface ipv6 address | ${node} | ${interface} +| | And Honeycomb sets interface IPv6 address | ${node} | ${interface} | | ... | ${address} | ${prefix} | | When Honeycomb configures SLAAC | ${node} | ${interface} | ${slaac_data_01} | | Then SLAAC Operational Data From Honeycomb Should Be | ${node} | ${interface} @@ -81,7 +81,7 @@ | | Given SLAAC Operational Data From Honeycomb Should Be empty | ${node} | | ... | ${interface} | | And InterfaceAPI.Set Interface State | ${node} | ${interface} | up -| | And Honeycomb sets interface ipv6 address | ${node} | ${interface} +| | And Honeycomb sets interface IPv6 address | ${node} | ${interface} | | ... | ${address} | ${prefix} | | When Honeycomb configures SLAAC | ${node} | ${interface} | ${slaac_data_02} | | Then SLAAC Operational Data From Honeycomb Should Be | ${node} | ${interface} @@ -94,7 +94,7 @@ | | Given SLAAC Operational Data From Honeycomb Should Be empty | ${node} | | ... | ${interface} | | And InterfaceAPI.Set Interface State | ${node} | ${interface} | up -| | And Honeycomb sets interface ipv6 address | ${node} | ${interface} +| | And Honeycomb sets interface IPv6 address | ${node} | ${interface} | | ... | ${address} | ${prefix} | | When Honeycomb configures SLAAC | ${node} | ${interface} | ${slaac_data_03} | | Then SLAAC Operational Data From Honeycomb Should Be | ${node} | ${interface} @@ -107,13 +107,13 @@ | | ... | [Ver] Make TG wait for two IPv6 Router Advertisement packets\ | | ... | to be sent by DUT1 and verify the received RA packets are correct. | | [Teardown] | SLAAC test teardown | ${dut_node} | ${dut_to_tg_if1} -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Honeycomb sets interface ipv6 address +| | And Honeycomb sets interface IPv6 address | | ... | ${dut_node} | ${dut_to_tg_if1} | ${address} | ${prefix} -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up | | When Honeycomb configures SLAAC | ${dut_node} | ${dut_to_tg_if1} | | ... | ${slaac_data} | | :FOR | ${n} | IN RANGE | ${2} -| | | Then Receive And Check Router Advertisement Packet +| | | Then Receive and verify router advertisement packet | | | ... | ${tg_node} | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | ${20} diff --git a/tests/func/honeycomb/mgmt-cfg-spanrx-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-spanrx-apihc-apivat-func.robot index 1cc385ca2b..b2adb871c5 100644 --- a/tests/func/honeycomb/mgmt-cfg-spanrx-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-spanrx-apihc-apivat-func.robot @@ -34,7 +34,7 @@ | | [Documentation] | Honeycomb configures SPAN on interface and verifies | | ... | against VPP SPAN dump in state receive. | | ... -| | When Honeycomb Configures SPAN on interface +| | When Honeycomb configures SPAN on interface | | ... | ${node} | ${interface1} | ${settings_receive} | | Then Interface SPAN Operational Data from Honeycomb should be | | ... | ${node} | ${interface1} | ${settings_receive} @@ -43,7 +43,7 @@ | | [Documentation] | Honeycomb configures SPAN on interface and verifies | | ... | against VPP SPAN dump in state transmit. | | ... -| | When Honeycomb Configures SPAN on interface +| | When Honeycomb configures SPAN on interface | | ... | ${node} | ${interface1} | ${settings_transmit} | | Then Interface SPAN Operational Data from Honeycomb should be | | ... | ${node} | ${interface1} | ${settings_transmit} @@ -52,7 +52,7 @@ | | [Documentation] | Honeycomb configures SPAN on interface and verifies | | ... | against VPP SPAN dump in state both. | | ... -| | When Honeycomb Configures SPAN on interface +| | When Honeycomb configures SPAN on interface | | ... | ${node} | ${interface1} | ${settings_both} | | Then Interface SPAN Operational Data from Honeycomb should be | | ... | ${node} | ${interface1} | ${settings_both} @@ -61,7 +61,7 @@ | | [Documentation] | Honeycomb configures SPAN on interface and verifies | | ... | against VPP SPAN dump in state both. | | ... -| | When Honeycomb Configures SPAN on interface +| | When Honeycomb configures SPAN on interface | | ... | ${node} | ${interface1} | ${settings_both} | ${settings_if2} | | Then Interface SPAN Operational Data from Honeycomb should be | | ... | ${node} | ${interface1} | ${settings_both} | ${settings_if2} @@ -86,9 +86,9 @@ | | ... | ${node} | ${interface1} | AND | | ... | Honeycomb removes interface SPAN configuration | | ... | ${node} | ${interface2} -| | When Honeycomb Configures SPAN on interface +| | When Honeycomb configures SPAN on interface | | ... | ${node} | ${interface1} | ${settings_if2} -| | And Honeycomb Configures SPAN on interface +| | And Honeycomb configures SPAN on interface | | ... | ${node} | ${interface2} | ${settings_if2} | | Then Interface SPAN Operational Data from Honeycomb should be | | ... | ${node} | ${interface1} | ${settings_if2} @@ -106,24 +106,24 @@ | | ... | | [Teardown] | Run Keywords | | ... | Show Packet Trace on All DUTs | ${nodes} | AND -| | ... | Honeycomb clears all interface ipv4 neighbors +| | ... | Honeycomb clears all interface IPv4 neighbors | | ... | ${dut_node} | ${dut_to_tg_if1} | AND -| | ... | Honeycomb removes interface ipv4 addresses +| | ... | Honeycomb removes interface IPv4 addresses | | ... | ${dut_node} | ${dut_to_tg_if1} | AND | | ... | Honeycomb removes interface SPAN configuration | | ... | ${node} | ${dut_to_tg_if2} -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up -| | And Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | And Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix} -| | And Honeycomb adds interface ipv4 neighbor | ${dut_node} | ${dut_to_tg_if1} +| | And Honeycomb adds interface IPv4 neighbor | ${dut_node} | ${dut_to_tg_if1} | | ... | ${tg_to_dut_if1_ip} | ${tg_to_dut_if1_mac} | | ${settings_5}= | create dictionary | state=both | | ... | iface-ref=${dut_to_tg_if1} | | And InterfaceCLI.All Vpp Interfaces Ready Wait | ${nodes} -| | When Honeycomb Configures SPAN on interface +| | When Honeycomb configures SPAN on interface | | ... | ${node} | ${dut_to_tg_if2} | ${settings_5} | | Then Send Packet And Check Received Copies | ${tg_node} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} @@ -218,17 +218,17 @@ | | ... | on the sub-interface. | | ... | | [Teardown] | Show Packet Trace on All DUTs | ${nodes} -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Sub-interface state from Honeycomb should be | | ... | ${dut_node} | ${interface1} | ${1} | down | up -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up | | And Honeycomb sets the sub-interface up | | ... | ${dut_node} | ${dut_to_tg_if1} | ${1} -| | And Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | And Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix} -| | And And Honeycomb adds interface ipv4 neighbor +| | And And Honeycomb adds interface IPv4 neighbor | | ... | ${dut_node} | ${dut_to_tg_if2} | | ... | ${tg_to_dut_if2_ip} | ${tg_to_dut_if2_mac} | | ${settings_5}= | create dictionary | state=both diff --git a/tests/func/honeycomb/mgmt-cfg-vxlan-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-vxlan-apihc-apivat-func.robot index 339fdb8972..409eb13d21 100644 --- a/tests/func/honeycomb/mgmt-cfg-vxlan-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-vxlan-apihc-apivat-func.robot @@ -49,7 +49,7 @@ | | ... | ${node} | ${vx_interface} | ${vxlan_settings} | | And VxLAN Operational Data From VAT Should Be | | ... | ${node} | ${vxlan_settings} -| | ${vxlan_index}= | Get Interface index from oper data +| | ${vxlan_index}= | Get interface index from oper data | | ... | ${node} | ${vx_interface} | | Set Suite Variable | ${vxlan_index} diff --git a/tests/func/honeycomb/mgmt-notif-apihcnc-func.robot b/tests/func/honeycomb/mgmt-notif-apihcnc-func.robot index 3386e1fe60..7daa08bc85 100644 --- a/tests/func/honeycomb/mgmt-notif-apihcnc-func.robot +++ b/tests/func/honeycomb/mgmt-notif-apihcnc-func.robot @@ -25,7 +25,7 @@ | Resource | resources/libraries/robot/honeycomb/tap.robot | Resource | resources/libraries/robot/honeycomb/notifications.robot | Suite Setup | Run keywords -| ... | Honeycomb sets interface state +| ... | Honeycomb configures interface state | ... | ${node} | ${interface} | down | AND | ... | Honeycomb creates TAP interface | ... | ${node} | ${tap_interface} | ${tap_settings} @@ -41,10 +41,10 @@ | | Given Interface state from Honeycomb should be | | ... | ${node} | ${interface} | down | | And Interface state from VAT should be | ${node} | ${interface} | down -| | And Notification listener is established | ${node} -| | When Honeycomb sets interface state | ${node} | ${interface} | up +| | And Notification listener should be established | ${node} +| | When Honeycomb configures interface state | ${node} | ${interface} | up | | Then Honeycomb should send interface state notification | ${interface} | up -| | When Honeycomb sets interface state | ${node} | ${interface} | down +| | When Honeycomb configures interface state | ${node} | ${interface} | down | | And Honeycomb should send interface state notification | ${interface} | down | TC02: Honeycomb sends notification on interface deletion @@ -54,6 +54,6 @@ | | ... | ${node} | ${tap_interface} | ${tap_settings} | | And TAP Operational Data From VAT Should Be | | ... | ${node} | ${tap_interface} | ${tap_settings} -| | And Notification listener is established | ${node} +| | And Notification listener should be established | ${node} | | When Honeycomb removes TAP interface | ${node} | ${tap_interface} | | Then Honeycomb should send interface deleted notification | ${tap_interface} diff --git a/tests/func/honeycomb/mgmt-statepersist-apihc-func.robot b/tests/func/honeycomb/mgmt-statepersist-apihc-func.robot index 5dfa4b5aed..f5f9673230 100644 --- a/tests/func/honeycomb/mgmt-statepersist-apihc-func.robot +++ b/tests/func/honeycomb/mgmt-statepersist-apihc-func.robot @@ -33,14 +33,14 @@ # =================== | TC01: Honeycomb persists configuration through restart of both Honeycomb and VPP | | [Documentation] | Checks if Honeycomb maintains configuration after both\ -| | ... | Honeycomb and VPP are restarted. +| | ... | Restart Honeycomb and VPP. | | [Tags] | HC_FUNC | | [Teardown] | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} | | Given Multi-Feature Persistence test configuration | ${node} | ${interface} | | And Multi-Feature persistence Test Verification | ${node} | ${interface} | | And Log persisted configuration on node | ${node} -| | When Honeycomb and VPP are restarted | ${node} +| | When Restart Honeycomb and VPP | ${node} | | Then Multi-Feature persistence Test Verification | ${node} | ${interface} | TC02: Honeycomb reverts to defaults if persistence files are invalid @@ -62,7 +62,7 @@ | | Given Multi-Feature Persistence test configuration | ${node} | ${interface} | | And Multi-Feature persistence Test Verification | ${node} | ${interface} | | And Log persisted configuration on node | ${node} -| | When Honeycomb is restarted | ${node} +| | When Restart Honeycomb | ${node} | | Then Multi-Feature persistence Test Verification | ${node} | ${interface} | TC04: Honeycomb persists configuration through restart of VPP @@ -73,7 +73,7 @@ | | Given Multi-Feature Persistence test configuration | ${node} | ${interface} | | And Multi-Feature persistence Test Verification | ${node} | ${interface} | | And Log persisted configuration on node | ${node} -| | When VPP is restarted | ${node} +| | When Restart VPP | ${node} | | Then Multi-Feature persistence Test Verification | ${node} | ${interface} # single-feature cases @@ -86,7 +86,7 @@ | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} | | Given Interface Persistence Setup | ${node} | | And Interface Persistence Check | ${node} -| | When Honeycomb and VPP are restarted | ${node} +| | When Restart Honeycomb and VPP | ${node} | | Then Interface Persistence Check | ${node} | TC06: Persist configuration of IP addresses and neighbors - HC restart @@ -96,7 +96,7 @@ | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} | | Given Interface Persistence Setup | ${node} | | And Interface Persistence Check | ${node} -| | When Honeycomb is restarted | ${node} +| | When Restart Honeycomb | ${node} | | Then Interface Persistence Check | ${node} | TC07: Persist configuration of IP addresses and neighbors - VPP restart @@ -106,7 +106,7 @@ | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} | | Given Interface Persistence Setup | ${node} | | And Interface Persistence Check | ${node} -| | When VPP is restarted | ${node} +| | When Restart VPP | ${node} | | Then Interface Persistence Check | ${node} | TC08: Honeycomb persists configuration of bridge domains - HC and VPP restart @@ -116,7 +116,7 @@ | | [Teardown] | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} | | Given Bridge Domain Persistence Setup | ${node} -| | When Honeycomb and VPP are restarted | ${node} +| | When Restart Honeycomb and VPP | ${node} | | Then Bridge Domain Persistence Check | ${node} | TC09: Honeycomb persists configuration of bridge domains - HC restart @@ -126,7 +126,7 @@ | | [Teardown] | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} | | Given Bridge Domain Persistence Setup | ${node} -| | When Honeycomb is restarted | ${node} +| | When Restart Honeycomb | ${node} | | Then Bridge Domain Persistence Check | ${node} | TC10: Honeycomb persists configuration of bridge domains - VPP restart @@ -136,7 +136,7 @@ | | [Teardown] | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} | | Given Bridge Domain Persistence Setup | ${node} -| | When VPP is restarted | ${node} +| | When Restart VPP | ${node} | | Then Bridge Domain Persistence Check | ${node} #TODO: All other features diff --git a/tests/func/iacl/eth2p-eth-l2xcbase-iaclbase-func.robot b/tests/func/iacl/eth2p-eth-l2xcbase-iaclbase-func.robot index bdf3b5f6e5..06b6633d97 100644 --- a/tests/func/iacl/eth2p-eth-l2xcbase-iaclbase-func.robot +++ b/tests/func/iacl/eth2p-eth-l2xcbase-iaclbase-func.robot @@ -21,8 +21,8 @@ | Library | resources.libraries.python.Classify.Classify | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *Ingress ACL test cases* | ... | ... | *[Top] Network Topologies:* TG - DUT1 - DUT2 - TG @@ -42,14 +42,14 @@ | | ... | [Top] TG-DUT1-DUT2-TG. | | ... | [Cfg] On DUT1 add source MAC address to classify table with 'deny'. | | ... | [Ver] Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And L2 setup xconnect on DUT +| | And Set interfaces in 3-node circular topology up +| | And Configure L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_tg} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | | ${table_index} | ${skip_n} | ${match_n}= | | ... | When Vpp Creates Classify Table L2 | ${dut1_node} | src @@ -58,7 +58,7 @@ | | ... | src | ${tg_to_dut1_mac} | | And Vpp Enable Input ACL Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${l2_table} | ${table_index} -| | Then Send and receive ICMP Packet should fail +| | Then ICMP packet transmission should fail | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | TC02: DUT with iACL MAC dst-addr drops matching pkts @@ -67,14 +67,14 @@ | | ... | [Cfg] On DUT1 add destination MAC address to classify | | ... | table with 'deny'. | | ... | [Ver] Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And L2 setup xconnect on DUT +| | And Set interfaces in 3-node circular topology up +| | And Configure L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_tg} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | | ${table_index} | ${skip_n} | ${match_n}= | | ... | When Vpp Creates Classify Table L2 | ${dut1_node} | dst @@ -83,7 +83,7 @@ | | ... | dst | ${tg_to_dut2_mac} | | And Vpp Enable Input ACL Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${l2_table} | ${table_index} -| | Then Send and receive ICMP Packet should fail +| | Then ICMP packet transmission should fail | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | TC03: DUT with iACL MAC src-addr and dst-addr drops matching pkts @@ -92,14 +92,14 @@ | | ... | [Cfg] On DUT1 add source and destination MAC address to classify | | ... | table with 'deny'. | | ... | [Ver] Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And L2 setup xconnect on DUT +| | And Set interfaces in 3-node circular topology up +| | And Configure L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_tg} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | | ${table_index_1} | ${skip_n_1} | ${match_n_1}= | | ... | When Vpp Creates Classify Table L2 | ${dut1_node} | src @@ -115,7 +115,7 @@ | | ... | ${dut1_node} | ${dut1_to_tg} | ${l2_table} | ${table_index_1} | | And Vpp Enable Input ACL Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${l2_table} | ${table_index_2} -| | Then Send and receive ICMP Packet should fail +| | Then ICMP packet transmission should fail | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | TC04: DUT with iACL EtherType drops matching pkts @@ -123,14 +123,14 @@ | | ... | [Top] TG-DUT1-DUT2-TG. | | ... | [Cfg] On DUT1 add EtherType IPv4(0x0800) to classify table with 'deny'. | | ... | [Ver] Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And L2 setup xconnect on DUT +| | And Set interfaces in 3-node circular topology up +| | And Configure L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_tg} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | | ${table_index} | ${skip_n} | ${match_n}= | | ... | When Vpp Creates Classify Table Hex @@ -140,5 +140,5 @@ | | ... | 0000000000000000000000000800 | | And Vpp Enable Input ACL Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${l2_table} | ${table_index} -| | Then Send and receive ICMP Packet should fail +| | Then ICMP packet transmission should fail | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} diff --git a/tests/func/iacl/eth2p-ethip4-ip4base-iaclbase-func.robot b/tests/func/iacl/eth2p-ethip4-ip4base-iaclbase-func.robot index 26df7a8480..04bfb1602b 100644 --- a/tests/func/iacl/eth2p-ethip4-ip4base-iaclbase-func.robot +++ b/tests/func/iacl/eth2p-ethip4-ip4base-iaclbase-func.robot @@ -23,8 +23,8 @@ | Library | resources.libraries.python.Classify.Classify | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *IPv4 routing with ingress ACL test cases* | ... | ... | Encapsulations: Eth-IPv4 on links TG-DUT1, TG-DUT2, DUT1-DUT2. IPv4 @@ -54,9 +54,9 @@ | | [Documentation] | | ... | On DUT1 add source IPv4 address to classify table with 'deny'.\ | | ... | Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -67,13 +67,13 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send Packet And Check Headers | ${tg_node} +| | Then Send packet and verify headers | ${tg_node} | | ... | ${non_drop_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} @@ -85,11 +85,11 @@ | | ... | ${ip_version} | src | ${test_src_ip} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send packet from Port to Port should failed | ${tg_node} +| | Then Packet transmission from port to port should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${non_drop_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} @@ -98,9 +98,9 @@ | | [Documentation] | | ... | On DUT1 add destination IPv4 address to classify table with 'deny'.\ | | ... | Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -114,13 +114,13 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${non_drop_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send Packet And Check Headers | ${tg_node} +| | Then Send packet and verify headers | ${tg_node} | | ... | ${test_src_ip} | ${non_drop_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} @@ -132,11 +132,11 @@ | | ... | ${ip_version} | dst | ${test_dst_ip} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send packet from Port to Port should failed | ${tg_node} +| | Then Packet transmission from port to port should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${test_src_ip} | ${non_drop_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} @@ -145,9 +145,9 @@ | | [Documentation] | | ... | On DUT1 add source and destination IPv4 addresses to classify table\ | | ... | with 'deny'. Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -161,13 +161,13 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${non_drop_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send Packet And Check Headers | ${tg_node} +| | Then Send packet and verify headers | ${tg_node} | | ... | ${non_drop_src_ip} | ${non_drop_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} @@ -186,11 +186,11 @@ | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index_1} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index_2} -| | Then Send packet from Port to Port should failed | ${tg_node} +| | Then Packet transmission from port to port should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${non_drop_src_ip} | ${non_drop_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} @@ -199,9 +199,9 @@ | | [Documentation] | | ... | On DUT1 add protocol mask and TCP protocol (0x06) to classify table\ | | ... | with 'deny'. Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -212,12 +212,12 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 | | ${table_index} | ${skip_n} | ${match_n}= @@ -228,10 +228,10 @@ | | ... | 000000000000000000000000000000000000000000000006 | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 @@ -239,9 +239,9 @@ | | [Documentation] | | ... | On DUT1 add protocol mask and UDP protocol (0x11) to classify table\ | | ... | with 'deny'. Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -252,12 +252,12 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 | | ${table_index} | ${skip_n} | ${match_n}= @@ -268,10 +268,10 @@ | | ... | 000000000000000000000000000000000000000000000011 | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 @@ -279,9 +279,9 @@ | | [Documentation] | | ... | On DUT1 add TCP source ports to classify table with 'deny'.\ | | ... | Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -292,12 +292,12 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 110 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 | | ${hex_mask}= | Compute Classify Hex Mask | ${ip_version} | TCP | source @@ -309,10 +309,10 @@ | | ... | ${hex_value} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 110 | 20 @@ -320,9 +320,9 @@ | | [Documentation] | | ... | On DUT1 add TCP destination ports to classify table with 'deny'.\ | | ... | Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -333,12 +333,12 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 20 | 110 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 20 | 80 | | ${hex_mask}= | Compute Classify Hex Mask | ${ip_version} | TCP | destination @@ -350,10 +350,10 @@ | | ... | ${hex_value} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 20 | 80 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 20 | 110 @@ -361,9 +361,9 @@ | | [Documentation] | | ... | On DUT1 add TCP source and destination ports to classify table\ | | ... | with 'deny'. Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -374,12 +374,12 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 110 | 25 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 | | ${hex_mask}= | Compute Classify Hex Mask | ${ip_version} | TCP @@ -392,10 +392,10 @@ | | ... | ${hex_value} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 110 | 25 @@ -403,9 +403,9 @@ | | [Documentation] | | ... | On DUT1 add UDP source ports to classify table with 'deny'.\ | | ... | Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -416,12 +416,12 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 110 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 | | ${hex_mask}= | Compute Classify Hex Mask | ${ip_version} | UDP | source @@ -433,10 +433,10 @@ | | ... | ${hex_value} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 110 | 20 @@ -444,9 +444,9 @@ | | [Documentation] | | ... | On DUT1 add TCP destination ports to classify table with 'deny'.\ | | ... | Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -457,12 +457,12 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 20 | 110 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 20 | 80 | | ${hex_mask}= | Compute Classify Hex Mask | ${ip_version} | UDP | destination @@ -474,10 +474,10 @@ | | ... | ${hex_value} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 20 | 80 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 20 | 110 @@ -485,9 +485,9 @@ | | [Documentation] | | ... | On DUT1 add UDP source and destination ports to classify table\ | | ... | with 'deny'. Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -498,12 +498,12 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 110 | 25 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 | | ${hex_mask}= | Compute Classify Hex Mask | ${ip_version} | UDP @@ -516,9 +516,9 @@ | | ... | ${hex_value} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 110 | 25 diff --git a/tests/func/iacl/eth2p-ethip6-ip6base-iaclbase-func.robot b/tests/func/iacl/eth2p-ethip6-ip6base-iaclbase-func.robot index 47daac02a5..a3eef2a665 100644 --- a/tests/func/iacl/eth2p-ethip6-ip6base-iaclbase-func.robot +++ b/tests/func/iacl/eth2p-ethip6-ip6base-iaclbase-func.robot @@ -22,8 +22,8 @@ | Library | resources.libraries.python.Classify.Classify | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *IPv6 routing with ingress ACL test cases* | ... | ... | Encapsulations: Eth-IPv6 on links TG-DUT1, TG-DUT2, DUT1-DUT2. IPv6 @@ -55,9 +55,9 @@ | | [Documentation] | | ... | On DUT1 add source IPv6 address to classify table with 'deny'.\ | | ... | Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Vpp Set If Ipv6 Addr | ${dut1_node} @@ -68,14 +68,14 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And Vpp All Ra Suppress Link Layer | ${nodes} -| | Then Send Packet And Check Headers | ${tg_node} +| | Then Send packet and verify headers | ${tg_node} | | ... | ${non_drop_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} @@ -87,11 +87,11 @@ | | ... | ${ip_version} | src | ${test_src_ip} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send packet from Port to Port should failed | ${tg_node} +| | Then Packet transmission from port to port should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${non_drop_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} @@ -100,9 +100,9 @@ | | [Documentation] | | ... | On DUT1 add destination IPv6 address to classify table with 'deny'.\ | | ... | Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Vpp Set If Ipv6 Addr | ${dut1_node} @@ -116,14 +116,14 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${non_drop_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And Vpp All Ra Suppress Link Layer | ${nodes} -| | Then Send Packet And Check Headers | ${tg_node} +| | Then Send packet and verify headers | ${tg_node} | | ... | ${test_src_ip} | ${non_drop_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} @@ -135,11 +135,11 @@ | | ... | ${ip_version} | dst | ${test_dst_ip} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send packet from Port to Port should failed | ${tg_node} +| | Then Packet transmission from port to port should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${test_src_ip} | ${non_drop_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} @@ -148,9 +148,9 @@ | | [Documentation] | | ... | On DUT1 add source and destination IPv6 addresses to classify table\ | | ... | with 'deny'. Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Vpp Set If Ipv6 Addr | ${dut1_node} @@ -164,14 +164,14 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${non_drop_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And Vpp All Ra Suppress Link Layer | ${nodes} -| | Then Send Packet And Check Headers | ${tg_node} +| | Then Send packet and verify headers | ${tg_node} | | ... | ${non_drop_src_ip} | ${non_drop_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} @@ -190,11 +190,11 @@ | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index_1} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index_2} -| | Then Send packet from Port to Port should failed | ${tg_node} +| | Then Packet transmission from port to port should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${non_drop_src_ip} | ${non_drop_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} @@ -203,9 +203,9 @@ | | [Documentation] | | ... | On DUT1 add protocol mask and TCP protocol (0x06) to classify table\ | | ... | with 'deny'. Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Vpp Set If Ipv6 Addr | ${dut1_node} @@ -216,13 +216,13 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And Vpp All Ra Suppress Link Layer | ${nodes} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 | | ${table_index} | ${skip_n} | ${match_n}= @@ -233,10 +233,10 @@ | | ... | 000000000000000000000000000000000000000006 | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 @@ -244,9 +244,9 @@ | | [Documentation] | | ... | On DUT1 add protocol mask and UDP protocol (0x11) to classify table\ | | ... | with 'deny'. Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Vpp Set If Ipv6 Addr | ${dut1_node} @@ -257,13 +257,13 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And Vpp All Ra Suppress Link Layer | ${nodes} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 | | ${table_index} | ${skip_n} | ${match_n}= @@ -274,10 +274,10 @@ | | ... | 000000000000000000000000000000000000000011 | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 @@ -285,9 +285,9 @@ | | [Documentation] | | ... | On DUT1 add TCP source ports to classify table with 'deny'.\ | | ... | Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Vpp Set If Ipv6 Addr | ${dut1_node} @@ -298,13 +298,13 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And Vpp All Ra Suppress Link Layer | ${nodes} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 110 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 | | ${hex_mask}= | Compute Classify Hex Mask | ${ip_version} | TCP | source @@ -316,10 +316,10 @@ | | ... | ${hex_value} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 110 | 20 @@ -327,9 +327,9 @@ | | [Documentation] | | ... | On DUT1 add TCP destination ports to classify table with 'deny'.\ | | ... | Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Vpp Set If Ipv6 Addr | ${dut1_node} @@ -340,13 +340,13 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And Vpp All Ra Suppress Link Layer | ${nodes} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 20 | 110 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 20 | 80 | | ${hex_mask}= | Compute Classify Hex Mask | ${ip_version} | TCP | destination @@ -358,10 +358,10 @@ | | ... | ${hex_value} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 20 | 80 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 20 | 110 @@ -369,9 +369,9 @@ | | [Documentation] | | ... | On DUT1 add TCP source and destination ports to classify table\ | | ... | with 'deny'. Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Vpp Set If Ipv6 Addr | ${dut1_node} @@ -382,13 +382,13 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And Vpp All Ra Suppress Link Layer | ${nodes} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 110 | 25 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 | | ${hex_mask}= | Compute Classify Hex Mask | ${ip_version} | TCP @@ -401,10 +401,10 @@ | | ... | ${hex_value} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 110 | 25 @@ -412,9 +412,9 @@ | | [Documentation] | | ... | On DUT1 add UDP source ports to classify table with 'deny'.\ | | ... | Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Vpp Set If Ipv6 Addr | ${dut1_node} @@ -425,13 +425,13 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And Vpp All Ra Suppress Link Layer | ${nodes} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 110 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 | | ${hex_mask}= | Compute Classify Hex Mask | ${ip_version} | UDP | source @@ -443,10 +443,10 @@ | | ... | ${hex_value} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 110 | 20 @@ -454,9 +454,9 @@ | | [Documentation] | | ... | On DUT1 add TCP destination ports to classify table with 'deny'.\ | | ... | Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Vpp Set If Ipv6 Addr | ${dut1_node} @@ -467,13 +467,13 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And Vpp All Ra Suppress Link Layer | ${nodes} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 20 | 110 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 20 | 80 | | ${hex_mask}= | Compute Classify Hex Mask | ${ip_version} | UDP | destination @@ -485,10 +485,10 @@ | | ... | ${hex_value} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 20 | 80 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 20 | 110 @@ -496,9 +496,9 @@ | | [Documentation] | | ... | On DUT1 add UDP source and destination ports to classify table\ | | ... | with 'deny'. Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Vpp Set If Ipv6 Addr | ${dut1_node} @@ -509,13 +509,13 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And Vpp All Ra Suppress Link Layer | ${nodes} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 110 | 25 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 | | ${hex_mask}= | Compute Classify Hex Mask | ${ip_version} | UDP @@ -528,10 +528,10 @@ | | ... | ${hex_value} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 110 | 25 @@ -540,18 +540,18 @@ | | ... | On DUT1 add source MAC address to classify (L2) table and add UDP\ | | ... | source and destination ports to classify (hex) table with 'deny'. | | ... | Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And L2 setup xconnect on DUT +| | And Set interfaces in 3-node circular topology up +| | And Configure L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_tg} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And Vpp All Ra Suppress Link Layer | ${nodes} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 110 | 25 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 | | ${table_index} | ${skip_n} | ${match_n}= @@ -569,9 +569,9 @@ | | ... | ${hex_value} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${l2_table} | ${table_index} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 110 | 25 -| | And Send TCP or UDP packet should failed | ${tg_node} +| | And TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 diff --git a/tests/func/ipsec/eth2p-ethip4ipsectnl-ip4base-func.robot b/tests/func/ipsec/eth2p-ethip4ipsectnl-ip4base-func.robot index 2db3899ae8..ab0c6f04c7 100644 --- a/tests/func/ipsec/eth2p-ethip4ipsectnl-ip4base-func.robot +++ b/tests/func/ipsec/eth2p-ethip4ipsectnl-ip4base-func.robot @@ -16,10 +16,10 @@ | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO | ... | VM_ENV | HW_ENV | SKIP_VPP_PATCH -| Test Setup | Run Keywords | Func Test Setup -| ... | AND | Setup Topology for IPv4 IPsec testing +| Test Setup | Run Keywords | Set up functional test +| ... | AND | Configure topology for IPv4 IPsec testing | Test Teardown | Run Keywords | VPP IPsec Show | ${dut_node} -| ... | AND | Func Test Teardown +| ... | AND | Tear down functional test | Documentation | *IPv4 IPsec tunnel mode test suite.* | ... | ... | *[Top] Network topologies:* TG-DUT1 2-node topology with one link\ @@ -51,12 +51,12 @@ | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -71,12 +71,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -91,12 +91,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 256 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -112,12 +112,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -132,12 +132,12 @@ | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -153,12 +153,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 256 | | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -174,12 +174,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 384 192 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -195,12 +195,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA 384 192 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -215,12 +215,12 @@ | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ${encr_alg}= | Crypto Alg AES CBC 256 | | ${auth_alg}= | Integ Alg SHA 384 192 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -236,12 +236,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 512 256 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -257,12 +257,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA 512 256 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -277,12 +277,12 @@ | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ${encr_alg}= | Crypto Alg AES CBC 256 | | ${auth_alg}= | Integ Alg SHA 512 256 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -298,14 +298,14 @@ | | ... | [Ref] RFC4303. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto -| | When VPP Setup IPsec Manual Keyed Connection +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -321,14 +321,14 @@ | | ... | [Ref] RFC4303. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Setup IPsec Manual Keyed Connection +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -345,15 +345,15 @@ | | ... | [Ref] RFC4303. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Setup IPsec Manual Keyed Connection +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -369,20 +369,20 @@ | | ... | and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${new_encr_key} | ${auth_alg} | ${new_auth_key} | | ... | ${tg_spi} | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -399,23 +399,23 @@ | | ... | response to be received on TG before and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${new_auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -432,23 +432,23 @@ | | ... | no response to be received on TG before and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${new_encr_key} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -466,24 +466,24 @@ | | ... | on TG before and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} diff --git a/tests/func/ipsec/eth2p-ethip4ipsectpt-ip4base-func.robot b/tests/func/ipsec/eth2p-ethip4ipsectpt-ip4base-func.robot index 31cc3a65b7..15bf7e2668 100644 --- a/tests/func/ipsec/eth2p-ethip4ipsectpt-ip4base-func.robot +++ b/tests/func/ipsec/eth2p-ethip4ipsectpt-ip4base-func.robot @@ -16,10 +16,10 @@ | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO | ... | VM_ENV | HW_ENV | SKIP_VPP_PATCH -| Test Setup | Run Keywords | Func Test Setup -| ... | AND | Setup Topology for IPv4 IPsec testing +| Test Setup | Run Keywords | Set up functional test +| ... | AND | Configure topology for IPv4 IPsec testing | Test Teardown | Run Keywords | VPP IPsec Show | ${dut_node} -| ... | AND | Func Test Teardown +| ... | AND | Tear down functional test | Documentation | *IPv4 IPsec transport mode test suite.* | ... | ... | *[Top] Network topologies:* TG-DUT1 2-node topology with one link\ @@ -52,11 +52,11 @@ | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -71,11 +71,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -90,11 +90,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 256 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -109,11 +109,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -127,11 +127,11 @@ | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -146,11 +146,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 256 | | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -165,11 +165,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 384 192 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -184,11 +184,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA 384 192 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -202,11 +202,11 @@ | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ${encr_alg}= | Crypto Alg AES CBC 256 | | ${auth_alg}= | Integ Alg SHA 384 192 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -221,11 +221,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 512 256 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -240,11 +240,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA 512 256 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -258,11 +258,11 @@ | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ${encr_alg}= | Crypto Alg AES CBC 256 | | ${auth_alg}= | Integ Alg SHA 512 256 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -279,13 +279,13 @@ | | ... | [Ref] RFC4303. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto -| | When VPP Setup IPsec Manual Keyed Connection +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -301,13 +301,13 @@ | | ... | [Ref] RFC4303. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Setup IPsec Manual Keyed Connection +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -324,14 +324,14 @@ | | ... | [Ref] RFC4303. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Setup IPsec Manual Keyed Connection +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -346,18 +346,18 @@ | | ... | and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${new_encr_key} | ${auth_alg} | ${new_auth_key} | | ... | ${tg_spi} | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -373,21 +373,21 @@ | | ... | response to be received on TG before and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${new_auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -403,21 +403,21 @@ | | ... | no response to be received on TG before and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${new_encr_key} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -434,22 +434,22 @@ | | ... | on TG before and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} diff --git a/tests/func/ipsec/eth2p-ethip6ipsectnl-ip6base-func.robot b/tests/func/ipsec/eth2p-ethip6ipsectnl-ip6base-func.robot index 0165931990..702d6f5d33 100644 --- a/tests/func/ipsec/eth2p-ethip6ipsectnl-ip6base-func.robot +++ b/tests/func/ipsec/eth2p-ethip6ipsectnl-ip6base-func.robot @@ -16,10 +16,10 @@ | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO | ... | VM_ENV | HW_ENV | SKIP_VPP_PATCH -| Test Setup | Run Keywords | Func Test Setup -| ... | AND | Setup Topology for IPv6 IPsec testing +| Test Setup | Run Keywords | Set up functional test +| ... | AND | Configure topology for IPv6 IPsec testing | Test Teardown | Run Keywords | VPP IPsec Show | ${dut_node} -| ... | AND | Func Test Teardown +| ... | AND | Tear down functional test | Documentation | *IPv6 IPsec tunnel mode test suite.* | ... | ... | *[Top] Network topologies:* TG-DUT1 2-node topology with one link\ @@ -52,12 +52,12 @@ | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -72,12 +72,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -92,12 +92,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 256 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -113,12 +113,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -133,12 +133,12 @@ | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -154,12 +154,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 256 | | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -175,12 +175,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 384 192 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -196,12 +196,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA 384 192 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -216,12 +216,12 @@ | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ${encr_alg}= | Crypto Alg AES CBC 256 | | ${auth_alg}= | Integ Alg SHA 384 192 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -237,12 +237,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 512 256 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -258,12 +258,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA 512 256 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -278,12 +278,12 @@ | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ${encr_alg}= | Crypto Alg AES CBC 256 | | ${auth_alg}= | Integ Alg SHA 512 256 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -299,14 +299,14 @@ | | ... | [Ref] RFC4303. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto -| | When VPP Setup IPsec Manual Keyed Connection +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -322,14 +322,14 @@ | | ... | [Ref] RFC4303. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Setup IPsec Manual Keyed Connection +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -346,15 +346,15 @@ | | ... | [Ref] RFC4303. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Setup IPsec Manual Keyed Connection +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -370,20 +370,20 @@ | | ... | and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${new_encr_key} | ${auth_alg} | ${new_auth_key} | | ... | ${tg_spi} | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -400,23 +400,23 @@ | | ... | response to be received on TG before and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${new_auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -433,23 +433,23 @@ | | ... | no response to be received on TG before and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${new_encr_key} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -467,24 +467,24 @@ | | ... | on TG before and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} diff --git a/tests/func/ipsec/eth2p-ethip6ipsectpt-ip6base-func.robot b/tests/func/ipsec/eth2p-ethip6ipsectpt-ip6base-func.robot index 5f2e0413b0..12cc4e4c29 100644 --- a/tests/func/ipsec/eth2p-ethip6ipsectpt-ip6base-func.robot +++ b/tests/func/ipsec/eth2p-ethip6ipsectpt-ip6base-func.robot @@ -16,10 +16,10 @@ | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO | ... | VM_ENV | HW_ENV | SKIP_VPP_PATCH -| Test Setup | Run Keywords | Func Test Setup -| ... | AND | Setup Topology for IPv6 IPsec testing +| Test Setup | Run Keywords | Set up functional test +| ... | AND | Configure topology for IPv6 IPsec testing | Test Teardown | Run Keywords | VPP IPsec Show | ${dut_node} -| ... | AND | Func Test Teardown +| ... | AND | Tear down functional test | Documentation | *IPv6 IPsec transport mode test suite.* | ... | ... | *[Top] Network topologies:* TG-DUT1 2-node topology with one link\ @@ -53,11 +53,11 @@ | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -72,11 +72,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -91,11 +91,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 256 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -110,11 +110,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -128,11 +128,11 @@ | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -147,11 +147,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 256 | | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -166,11 +166,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 384 192 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -185,11 +185,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA 384 192 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -203,11 +203,11 @@ | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ${encr_alg}= | Crypto Alg AES CBC 256 | | ${auth_alg}= | Integ Alg SHA 384 192 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -222,11 +222,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 512 256 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -241,11 +241,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA 512 256 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -259,11 +259,11 @@ | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ${encr_alg}= | Crypto Alg AES CBC 256 | | ${auth_alg}= | Integ Alg SHA 512 256 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -279,13 +279,13 @@ | | ... | [Ref] RFC4303. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto -| | When VPP Setup IPsec Manual Keyed Connection +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -301,13 +301,13 @@ | | ... | [Ref] RFC4303. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Setup IPsec Manual Keyed Connection +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -324,14 +324,14 @@ | | ... | [Ref] RFC4303. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Setup IPsec Manual Keyed Connection +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -346,18 +346,18 @@ | | ... | and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${new_encr_key} | ${auth_alg} | ${new_auth_key} | | ... | ${tg_spi} | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -373,21 +373,21 @@ | | ... | response to be received on TG before and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${new_auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -403,21 +403,21 @@ | | ... | no response to be received on TG before and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${new_encr_key} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -434,22 +434,22 @@ | | ... | on TG before and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} diff --git a/tests/func/ipv4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot b/tests/func/ipv4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot index b7d25746d7..d3bf4b517d 100644 --- a/tests/func/ipv4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot +++ b/tests/func/ipv4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot @@ -28,8 +28,8 @@ | Resource | resources/libraries/robot/qemu.robot | Resource | resources/libraries/robot/bridge_domain.robot | Force Tags | VM_ENV | HW_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *IPv4 routing test cases with vhost user interface* | ... | ... | RFC791 IPv4, RFC826 ARP, RFC792 ICMPv4. Encapsulations: Eth-IPv4-ICMPv4 @@ -61,12 +61,12 @@ | | ... | Both have IP addresses from same network. On VM is set bridge to pass | | ... | packet from a one vhost user interface to another one. | | [Teardown] | Run Keywords -| | ... | Stop and Clear QEMU | ${dut_node} | ${vm_node} | AND -| | ... | Func Test Teardown +| | ... | Stop and clear QEMU | ${dut_node} | ${vm_node} | AND +| | ... | Tear down functional test | | -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are UP +| | And Set interfaces in 2-node circular topology up | | ${vhost1}= | And Vpp Create Vhost User Interface | ${dut_node} | ${sock1} | | ${vhost2}= | And Vpp Create Vhost User Interface | ${dut_node} | ${sock2} | | And Set Interface State | ${dut_node} | ${vhost1} | up @@ -75,7 +75,7 @@ | | ... | ${vhost2} | ${fib_table_2} | | And Assign Interface To Fib Table | ${dut_node} | | ... | ${dut_to_tg_if2} | ${fib_table_2} -| | And IP addresses are set on interfaces +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if1} | ${net1_ip1} | ${prefix_length} | | ... | ${dut_node} | ${vhost1} | ${net2_ip1} | ${prefix_length} | | ... | ${dut_node} | ${vhost2} | ${net2_ip2} | ${prefix_length} @@ -90,9 +90,9 @@ | | Add IP Neighbor | ${dut_node} | ${vhost1} | ${net2_ip2} | ${vhost2_mac} | | Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2} | ${net3_ip2} | | ... | ${tg_to_dut_if2_mac} -| | When VM for Vhost L2BD forwarding is setup +| | When Configure VM for vhost L2BD forwarding | | ... | ${dut_node} | ${sock1} | ${sock2} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${net1_ip2} | ${net3_ip2} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if2_mac} | ${tg_to_dut_if2_mac} diff --git a/tests/func/ipv4/eth2p-ethip4-ip4base-func.robot b/tests/func/ipv4/eth2p-ethip4-ip4base-func.robot index 71b3da4092..eadcdee43d 100644 --- a/tests/func/ipv4/eth2p-ethip4-ip4base-func.robot +++ b/tests/func/ipv4/eth2p-ethip4-ip4base-func.robot @@ -19,17 +19,17 @@ | Resource | resources/libraries/robot/ipv4.robot | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | SKIP_VPP_PATCH | Suite Setup | Run Keywords -| ... | Setup all DUTs before test | AND -| ... | Setup all TGs before traffic script | AND +| ... | Configure all DUTs before test | AND +| ... | Configure all TGs for traffic script | AND | ... | Update All Interface Data On All Nodes | ${nodes} | AND -| ... | Setup DUT nodes for IPv4 testing +| ... | Configure DUT nodes for IPv4 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} | Test Teardown | Run Keywords | ... | Show packet trace on all DUTs | ${nodes} | AND | ... | Show VAT History On All DUTs | ${nodes} | AND -| ... | Check VPP PID in Teardown +| ... | Verify VPP PID in Teardown | Documentation | *IPv4 routing test cases* | ... | ... | RFC791 IPv4, RFC826 ARP, RFC792 ICMPv4. Encapsulations: Eth-IPv4-ICMPv4 @@ -53,7 +53,7 @@ | | ${src_port} | ${src_node}= | First Interface | | ${dst_port} | ${dst_node}= | Last Interface | | ${hops}= | Set Variable | ${0} -| | Node "${src_node}" interface "${src_port}" can route to node "${dst_node}" interface "${dst_port}" ${hops} hops away using IPv4 +| | Route traffic from interface '${src_port}' on node '${src_node}' to interface '${dst_port}' on node '${dst_node}' '${hops}' hops away using IPv4 | TC02: DUT routes IPv4 to its egress interface | | [Tags] | VM_ENV @@ -65,7 +65,7 @@ | | ${src_port} | ${src_node}= | First Interface | | ${dst_port} | ${dst_node}= | Last Egress Interface | | ${hops}= | Set Variable | ${0} -| | Node "${src_node}" interface "${src_port}" can route to node "${dst_node}" interface "${dst_port}" ${hops} hops away using IPv4 +| | Route traffic from interface '${src_port}' on node '${src_node}' to interface '${dst_port}' on node '${dst_node}' '${hops}' hops away using IPv4 | TC03: DUT1 routes IPv4 to DUT2 ingress interface | | [Tags] | VM_ENV @@ -77,7 +77,7 @@ | | ${src_port} | ${src_node}= | First Interface | | ${dst_port} | ${dst_node}= | Last Interface | | ${hops}= | Set Variable | ${1} -| | Node "${src_node}" interface "${src_port}" can route to node "${dst_node}" interface "${dst_port}" ${hops} hops away using IPv4 +| | Route traffic from interface '${src_port}' on node '${src_node}' to interface '${dst_port}' on node '${dst_node}' '${hops}' hops away using IPv4 | TC04: DUT1 routes IPv4 to DUT2 egress interface | | [Tags] | VM_ENV @@ -89,7 +89,7 @@ | | ${src_port} | ${src_node}= | First Interface | | ${dst_port} | ${dst_node}= | Last Egress Interface | | ${hops}= | Set Variable | ${1} -| | Node "${src_node}" interface "${src_port}" can route to node "${dst_node}" interface "${dst_port}" ${hops} hops away using IPv4 +| | Route traffic from interface '${src_port}' on node '${src_node}' to interface '${dst_port}' on node '${dst_node}' '${hops}' hops away using IPv4 | TC05: DUT1 and DUT2 route IPv4 between TG interfaces | | [Tags] | VM_ENV @@ -101,7 +101,7 @@ | | ${src_port} | ${src_node}= | First Interface | | ${dst_port} | ${dst_node}= | Last Interface | | ${hops}= | Set Variable | ${2} -| | Node "${src_node}" interface "${src_port}" can route to node "${dst_node}" interface "${dst_port}" ${hops} hops away using IPv4 +| | Route traffic from interface '${src_port}' on node '${src_node}' to interface '${dst_port}' on node '${dst_node}' '${hops}' hops away using IPv4 | TC06: DUT replies to ICMPv4 Echo Reqs with size 64B-to-1500B-incr-1B | | [Tags] | VM_ENV @@ -109,17 +109,17 @@ | | ... | Make TG send ICMPv4 Echo Reqs to DUT ingress interface,\ | | ... | incrementating frame size from 64B to 1500B with increment step | | ... | of 1Byte. Make TG verify ICMP Echo Replies are correct. -| | Ipv4 icmp echo sweep | ${nodes['TG']} | ${nodes['DUT1']} | 0 | 1452 | 1 +| | Execute IPv4 ICMP echo sweep | ${nodes['TG']} | ${nodes['DUT1']} | 0 | 1452 | 1 | TC07: DUT replies to ICMPv4 Echo Reqs with size 1500B-to-9000B-incr-10B | | [Documentation] | | ... | Make TG send ICMPv4 Echo Reqs to DUT ingress interface,\ | | ... | incrementating frame size from 1500B to 9000B with increment | | ... | step of 10Bytes. Make TG verify ICMPv4 Echo Replies are correct. -| | [Setup] | Setup MTU on TG based on MTU on DUT | ${nodes['TG']} | ${nodes['DUT1']} +| | [Setup] | Configure MTU on TG based on MTU on DUT | ${nodes['TG']} | ${nodes['DUT1']} | | [Teardown] | Run keywords | | ... | Set default Ethernet MTU on all interfaces on node | ${nodes['TG']} -| | ... | AND | Check VPP PID in Teardown +| | ... | AND | Verify VPP PID in Teardown | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | | Compute Path | | ${dut_port} | ${dut_node}= | Last Interface @@ -128,11 +128,11 @@ | | # IPv4 header and ICMP header | | ${end_size}= | Evaluate | ${mtu} - 14 - 4 - 20 - 8 | | Run Keyword If | ${mtu} > 1518 -| | ... | Ipv4 icmp echo sweep | ${nodes['TG']} | ${nodes['DUT1']} +| | ... | Execute IPv4 ICMP echo sweep | ${nodes['TG']} | ${nodes['DUT1']} | | ... | 1452 | ${end_size} | 10 | TC08: DUT replies to ARP request | | [Tags] | VM_ENV | SKIP_VPP_PATCH | | [Documentation] | | ... | Make TG send ARP Request to DUT and verify ARP Reply is correct.\ -| | Send ARP request and validate response | ${nodes['TG']} | ${nodes['DUT1']} +| | Send ARP request and verify response | ${nodes['TG']} | ${nodes['DUT1']} diff --git a/tests/func/ipv4/eth2p-ethip4-ip4base-ip4arp-func.robot b/tests/func/ipv4/eth2p-ethip4-ip4base-ip4arp-func.robot index 0950610559..f6b551e7a3 100644 --- a/tests/func/ipv4/eth2p-ethip4-ip4base-ip4arp-func.robot +++ b/tests/func/ipv4/eth2p-ethip4-ip4base-ip4arp-func.robot @@ -21,8 +21,8 @@ | Resource | resources/libraries/robot/traffic.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *IPv4 ARP test cases* | ... | ... | RFC826 ARP: Eth-IPv4 and Eth-ARP on links TG-DUT1, TG-DUT2, DUT1-DUT2: @@ -45,16 +45,16 @@ | | ... | Make TG send test packet destined to IPv4 address of its other\ | | ... | interface connected to DUT2. Make TG verify DUT2 sends ARP | | ... | Request for locally connected TG IPv4 address. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And L2 setup xconnect on DUT +| | And Set interfaces in 3-node circular topology up +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | When Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_dut2} | ${dut1_to_dut2_ip} | ${prefix_length} -| | Then Send Packet And Check ARP Request | ${tg_node} +| | Then Send packet and verify ARP request | ${tg_node} | | ... | ${test_src_ip} | ${dut1_to_dut2_ip_GW} | ${tg_to_dut1} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | ${dut1_to_dut2_mac} | | ... | ${dut1_to_dut2_ip} | ${dut1_to_dut2_ip_GW} @@ -64,10 +64,10 @@ | | ... | Make TG send test packet destined to IPv4 address matching\ | | ... | static route on DUT2. Make TG verify DUT2 sends ARP Request for | | ... | next hop of the static route. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And L2 setup xconnect on DUT +| | And Set interfaces in 3-node circular topology up +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | When Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} @@ -76,7 +76,7 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} | resolve_attempts=${NONE} -| | Then Send Packet And Check ARP Request | ${tg_node} +| | Then Send packet and verify ARP request | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | ${dut1_to_dut2_mac} | | ... | ${dut1_to_dut2_ip} | ${dut1_to_dut2_ip_GW} diff --git a/tests/func/ipv4/eth2p-ethip4-ip4base-ip4ecmp-func.robot b/tests/func/ipv4/eth2p-ethip4-ip4base-ip4ecmp-func.robot index f55ee64df9..8c707fc18d 100644 --- a/tests/func/ipv4/eth2p-ethip4-ip4base-ip4ecmp-func.robot +++ b/tests/func/ipv4/eth2p-ethip4-ip4base-ip4ecmp-func.robot @@ -21,8 +21,8 @@ | Resource | resources/libraries/robot/traffic.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *Ipv4 Multipath routing test cases* | ... | ... | *[Top] Network topologies:* TG=DUT 2-node topology with two links\ @@ -51,9 +51,9 @@ | | ... | [Cfg] On DUT configure multipath routing wiht two equal-cost paths. | | ... | [Ver] TG sends 100 IPv4 ICMP packets traffic on the first link to\ | | ... | DUT. On second link to TG verify if traffic is divided into two paths. -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are UP +| | And Set interfaces in 2-node circular topology up | | And Set Interface Address | ${dut_node} | | ... | ${dut_to_tg_if2} | ${ip_1} | ${prefix_length} | | And Set Interface Address | ${dut_node} @@ -68,7 +68,7 @@ | | And Vpp Route Add | | ... | ${dut_node} | ${test_dst_ip} | ${prefix_length} | ${neighbor_2_ip} | | ... | ${dut_to_tg_if1} | resolve_attempts=${NONE} | multipath=${TRUE} -| | Then Send Packets And Check Multipath Routing | ${tg_node} +| | Then Send packets and verify multipath routing | ${tg_node} | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if1} | ${test_src_ip} | ${test_dst_ip} | | ... | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac} | ${dut_to_tg_if1_mac} | | ... | ${neighbor_1_mac} | ${neighbor_2_mac} diff --git a/tests/func/ipv4/eth2p-ethip4-ip4base-ip4proxyarp-func.robot b/tests/func/ipv4/eth2p-ethip4-ip4base-ip4proxyarp-func.robot index 765a54b6d5..afe4581b16 100644 --- a/tests/func/ipv4/eth2p-ethip4-ip4base-ip4proxyarp-func.robot +++ b/tests/func/ipv4/eth2p-ethip4-ip4base-ip4proxyarp-func.robot @@ -20,8 +20,8 @@ | Library | resources.libraries.python.Trace | Library | resources.libraries.python.ProxyArp | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *RFC1027 Proxy ARP test cases* | ... | ... | *[Top] Network topologies:* TG-DUT1 2-node topology with @@ -54,9 +54,9 @@ | | ... | [Ver] Make TG send ARP request to DUT1 interface, | | ... | verify if DUT1 sends correct ARP reply on behalf of machine which | | ... | IP is in range. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | ${dut1_to_tg_name}= | Get interface name | ${dut1_node} | ${dut1_to_tg} | | ${tg_to_dut1_name}= | Get interface name | ${tg_node} | ${tg_to_dut1} | | When Set Interface Address | ${dut1_node} @@ -76,9 +76,9 @@ | | ... | [Ver] Make TG send ARP request to DUT1 interface, | | ... | verify if DUT1 sends correct ARP reply on behalf of machine which | | ... | IP is from beginning of the IP range. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | ${dut1_to_tg_name}= | Get interface name | ${dut1_node} | ${dut1_to_tg} | | ${tg_to_dut1_name}= | Get interface name | ${tg_node} | ${tg_to_dut1} | | When Set Interface Address | ${dut1_node} @@ -98,9 +98,9 @@ | | ... | [Ver] Make TG send ARP request to DUT1 interface, | | ... | verify if DUT1 sends correct ARP reply on behalf of machine which | | ... | IP is from end of the IP range. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | ${dut1_to_tg_name}= | Get interface name | ${dut1_node} | ${dut1_to_tg} | | ${tg_to_dut1_name}= | Get interface name | ${tg_node} | ${tg_to_dut1} | | When Set Interface Address | ${dut1_node} @@ -120,16 +120,16 @@ | | ... | [Ver] Make TG send ARP request to DUT1 interface, | | ... | verify if DUT1 does not send ARP reply on behalf of machine which | | ... | IP is from below of the IP range. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | ${dut1_to_tg_name}= | Get interface name | ${dut1_node} | ${dut1_to_tg} | | ${tg_to_dut1_name}= | Get interface name | ${tg_node} | ${tg_to_dut1} | | When Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Vpp Add Proxy ARP | ${dut1_node} | ${lo_ip4_addr} | ${hi_ip4_addr} | | And Vpp Proxy ARP Interface Enable | ${dut1_node} | ${dut1_to_tg_name} -| | Then Send ARP Request should failed | ${tg_node} | ${tg_to_dut1_name} +| | Then ARP request should fail | ${tg_node} | ${tg_to_dut1_name} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut1_ip} | ${fail_test_lo_ip} @@ -142,15 +142,15 @@ | | ... | [Ver] Make TG send ARP request to DUT1 interface, | | ... | verify if DUT1 does not send ARP reply on behalf of machine which | | ... | IP is from above of the IP range. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | ${dut1_to_tg_name}= | Get interface name | ${dut1_node} | ${dut1_to_tg} | | ${tg_to_dut1_name}= | Get interface name | ${tg_node} | ${tg_to_dut1} | | When Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Vpp Add Proxy ARP | ${dut1_node} | ${lo_ip4_addr} | ${hi_ip4_addr} | | And Vpp Proxy ARP Interface Enable | ${dut1_node} | ${dut1_to_tg_name} -| | Then Send ARP Request should failed | ${tg_node} | ${tg_to_dut1_name} +| | Then ARP request should fail | ${tg_node} | ${tg_to_dut1_name} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut1_ip} | ${fail_test_hi_ip} diff --git a/tests/func/ipv6/eth2p-ethip6-ip6base-func.robot b/tests/func/ipv6/eth2p-ethip6-ip6base-func.robot index d08c291f4f..88c739dd27 100644 --- a/tests/func/ipv6/eth2p-ethip6-ip6base-func.robot +++ b/tests/func/ipv6/eth2p-ethip6-ip6base-func.robot @@ -20,17 +20,17 @@ | Variables | resources/libraries/python/IPv6NodesAddr.py | ${nodes} | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | SKIP_VPP_PATCH | Suite Setup | Run Keywords -| ... | Setup ipv6 to all dut in topology | ${nodes} | ${nodes_ipv6_addr} | AND -| ... | Vpp nodes ra suppress link layer | ${nodes} | AND -| ... | Vpp nodes setup ipv6 routing | ${nodes} | ${nodes_ipv6_addr} | AND -| ... | Setup all TGs before traffic script +| ... | Configure IPv6 on all DUTs in topology | ${nodes} | ${nodes_ipv6_addr} | AND +| ... | Suppress ICMPv6 router advertisement message | ${nodes} | AND +| ... | Configure IPv6 routing on all DUTs | ${nodes} | ${nodes_ipv6_addr} | AND +| ... | Configure all TGs for traffic script | 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} | Test Teardown | Run Keywords | ... | Show packet trace on all DUTs | ${nodes} | AND | ... | Show VAT History On All DUTs | ${nodes} | AND -| ... | Check VPP PID in Teardown +| ... | Verify VPP PID in Teardown | Documentation | *IPv6 routing test cases* | ... | ... | RFC2460 IPv6, RFC4443 ICMPv6, RFC4861 Neighbor Discovery. @@ -49,7 +49,7 @@ | | [Documentation] | | ... | Make TG send ICMPv6 Echo Req to DUT ingress interface. Make TG\ | | ... | verify ICMPv6 Echo Reply is correct. -| | Ipv6 icmp echo | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes_ipv6_addr} +| | Send IPv6 icmp echo request to DUT1 ingress inteface and verify answer | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes_ipv6_addr} | TC02: DUT replies to ICMPv6 Echo Req pkt with size 64B-to-1500B-incr-1B | | [Tags] | VM_ENV @@ -57,17 +57,17 @@ | | ... | Make TG send ICMPv6 Echo Reqs to DUT ingress interface,\ | | ... | incrementating frame size from 64B to 1500B with increment step | | ... | of 1Byte. Make TG verify ICMP Echo Replies are correct. -| | Ipv6 icmp echo sweep | ${nodes['TG']} | ${nodes['DUT1']} | 0 | 1452 | 1 | ${nodes_ipv6_addr} +| | Execute IPv6 ICMP echo sweep | ${nodes['TG']} | ${nodes['DUT1']} | 0 | 1452 | 1 | ${nodes_ipv6_addr} | TC03: DUT replies to ICMPv6 Echo Req pkt with size 1500B-to-9000B-incr-10B | | [Documentation] | | ... | Make TG send ICMPv6 Echo Reqs to DUT ingress interface,\ | | ... | incrementating frame size from 1500B to 9000B with increment | | ... | step of 10Bytes. Make TG verify ICMPv6 Echo Replies are correct. -| | [Setup] | Setup MTU on TG based on MTU on DUT | ${nodes['TG']} | ${nodes['DUT1']} +| | [Setup] | Configure MTU on TG based on MTU on DUT | ${nodes['TG']} | ${nodes['DUT1']} | | [Teardown] | Run keywords | | ... | Set default Ethernet MTU on all interfaces on node | ${nodes['TG']} -| | ... | AND | Check VPP PID in Teardown +| | ... | AND | Verify VPP PID in Teardown | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | | Compute Path | | ${dut_port} | ${dut_node}= | Last Interface @@ -76,7 +76,7 @@ | | # IPv6 header and ICMPv6 header | | ${end_size}= | Evaluate | ${mtu} - 14 - 4 - 40 - 8 | | Run Keyword If | ${mtu} > 1518 -| | ... | Ipv6 icmp echo sweep | ${nodes['TG']} | ${nodes['DUT1']} +| | ... | Execute IPv6 ICMP echo sweep | ${nodes['TG']} | ${nodes['DUT1']} | | ... | 1452 | ${end_size} | 10 | ${nodes_ipv6_addr} | TC04: DUT routes to its egress interface @@ -84,7 +84,7 @@ | | [Documentation] | | ... | Make TG send ICMPv6 Echo Req towards DUT1 egress interface\ | | ... | connected to DUT2. Make TG verify ICMPv6 Echo Reply is correct. -| | Ipv6 tg to dut1 egress | ${nodes['TG']} | ${nodes['DUT1']} | +| | Send IPv6 ICMP echo request to DUT1 egress interface and verify answer | ${nodes['TG']} | ${nodes['DUT1']} | | | ... | ${nodes['DUT2']} | ${nodes_ipv6_addr} | TC05: DUT1 routes to DUT2 ingress interface @@ -92,7 +92,7 @@ | | [Documentation] | | ... | Make TG send ICMPv6 Echo Req towards DUT2 ingress interface\ | | ... | connected to DUT1. Make TG verify ICMPv6 Echo Reply is correct. -| | Ipv6 tg to dut2 via dut1 | ${nodes['TG']} | ${nodes['DUT1']} +| | Send IPv6 ICMP echo request to DUT2 via DUT1 and verify answer | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes_ipv6_addr} | TC06: DUT1 routes to DUT2 egress interface @@ -100,7 +100,7 @@ | | [Documentation] | | ... | Make TG send ICMPv6 Echo Req towards DUT2 egress interface\ | | ... | connected to TG. Make TG verify ICMPv6 Echo Reply is correct. -| | Ipv6 tg to dut2 egress via dut1 | ${nodes['TG']} | ${nodes['DUT1']} +| | Send IPv6 ICMP echo request to DUT2 egress interface via DUT1 and verify answer | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes_ipv6_addr} | TC07: DUT1 and DUT2 route between TG interfaces @@ -117,4 +117,4 @@ | | ... | On DUT configure interface IPv6 address in the main routing\ | | ... | domain. Make TG send Neighbor Solicitation message on the link | | ... | to DUT and verify DUT Neighbor Advertisement reply is correct. -| | Ipv6 neighbor solicitation | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes_ipv6_addr} +| | Send IPv6 neighbor solicitation and verify answer | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes_ipv6_addr} diff --git a/tests/func/ipv6/eth2p-ethip6-ip6base-ip6ecmp-func.robot b/tests/func/ipv6/eth2p-ethip6-ip6base-ip6ecmp-func.robot index 989ec69434..e65ac9aa76 100644 --- a/tests/func/ipv6/eth2p-ethip6-ip6base-ip6ecmp-func.robot +++ b/tests/func/ipv6/eth2p-ethip6-ip6base-ip6ecmp-func.robot @@ -21,8 +21,8 @@ | Resource | resources/libraries/robot/traffic.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *Ipv6 Multipath routing test cases* | ... | ... | *[Top] Network topologies:* TG=DUT 2-node topology with two links\ @@ -50,9 +50,9 @@ | | ... | [Cfg] On DUT configure multipath routing wiht two equal-cost paths. | | ... | [Ver] TG sends 100 IPv6 ICMP packets traffic on the first link to\ | | ... | DUT. On second link to TG verify if traffic is divided into two paths. -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are UP +| | And Set interfaces in 2-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut_node} | | ... | ${dut_to_tg_if2} | ${ip_1} | ${prefix_length} | | And Vpp Set If Ipv6 Addr | ${dut_node} @@ -61,14 +61,14 @@ | | ... | ${dut_node} | ${dut_to_tg_if1} | ${neighbor_1_ip} | ${neighbor_1_mac} | |Â And Add Ip Neighbor | | ... | ${dut_node} | ${dut_to_tg_if1} | ${neighbor_2_ip} | ${neighbor_2_mac} -| | And Vpp Nodes RA Suppress Link Layer | ${nodes} +| | And Suppress ICMPv6 router advertisement message | ${nodes} | | When Vpp Route Add | | ... | ${dut_node} | ${test_dst_ip} | ${prefix_length} | ${neighbor_1_ip} | | ... | ${dut_to_tg_if1} | resolve_attempts=${NONE} | multipath=${TRUE} | | And Vpp Route Add | | ... | ${dut_node} | ${test_dst_ip} | ${prefix_length} | ${neighbor_2_ip} | | ... | ${dut_to_tg_if1} | resolve_attempts=${NONE} | multipath=${TRUE} -| | Then Send Packets And Check Multipath Routing | ${tg_node} +| | Then Send packets and verify multipath routing | ${tg_node} | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if1} | ${test_src_ip} | ${test_dst_ip} | | ... | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac} | ${dut_to_tg_if1_mac} | | ... | ${neighbor_1_mac} | ${neighbor_2_mac} diff --git a/tests/func/ipv6/eth2p-ethip6-ip6base-ip6ra-func.robot b/tests/func/ipv6/eth2p-ethip6-ip6base-ip6ra-func.robot index e45ce730c9..ea0864e4ff 100644 --- a/tests/func/ipv6/eth2p-ethip6-ip6base-ip6ra-func.robot +++ b/tests/func/ipv6/eth2p-ethip6-ip6base-ip6ra-func.robot @@ -20,8 +20,8 @@ | Resource | resources/libraries/robot/traffic.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *IPv6 Router Advertisement test cases* | ... | ... | RFC4861 Neighbor Discovery. Encapsulations: Eth-IPv6-RA on links @@ -44,13 +44,13 @@ | | ... | [Ver] Make TG wait for IPv6 Router Advertisement packet to be sent\ | | ... | by DUT1 and verify the received RA packet is correct. | | [Tags] | EXPECTED_FAILING -| | Given Path For 3-node Testing Is Set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces In 3-node Path Are Up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | When Vpp RA Send After Interval | ${dut1_node} | ${dut1_to_tg} -| | Then Receive And Check Router Advertisement Packet +| | Then Receive and verify router advertisement packet | | ... | ${tg_node} | ${tg_to_dut1} | ${dut1_to_tg_mac} | TC02: DUT retransmits RA on IPv6 enabled interface after a set interval @@ -60,15 +60,15 @@ | | ... | [Ver] Make TG wait for two IPv6 Router Advertisement packets\ | | ... | to be sent by DUT1 and verify the received RA packets are correct. | | [Tags] | EXPECTED_FAILING -| | Given Path For 3-node Testing Is Set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces In 3-node Path Are Up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | When Vpp RA Send After Interval | ${dut1_node} | ${dut1_to_tg} | | ... | interval=${interval} | | :FOR | ${n} | IN RANGE | ${2} -| | | Then Receive And Check Router Advertisement Packet +| | | Then Receive and verify router advertisement packet | | | ... | ${tg_node} | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${interval} | TC03: DUT responds to Router Solicitation request @@ -79,9 +79,9 @@ | | ... | [Ver] Make TG send IPv6 Router Solicitation request to DUT1, listen\ | | ... | for response from DUT1 and verify the received RA packet is correct. | | [Tags] | EXPECTED_FAILING -| | Given Path For 3-node Testing Is Set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces In 3-node Path Are Up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | When VPP RA Suppress Link Layer | ${dut1_node} | ${dut1_to_tg} @@ -97,9 +97,9 @@ | | ... | [Ver] Make TG send IPv6 Router Solicitation request to DUT1, listen\ | | ... | for response from DUT1 and verify the received RA packet is correct. | | [Tags] | EXPECTED_FAILING -| | Given Path For 3-node Testing Is Set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces In 3-node Path Are Up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | When VPP RA Suppress Link Layer | ${dut1_node} | ${dut1_to_tg} diff --git a/tests/func/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-func.robot b/tests/func/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-func.robot index b2279b90fc..e15f080577 100644 --- a/tests/func/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-func.robot +++ b/tests/func/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-func.robot @@ -18,8 +18,8 @@ | Resource | resources/libraries/robot/qemu.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_DOUBLE_LINK_TOPO | HW_ENV | VM_ENV | VPP_VM_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2 bridge-domain test cases* | ... | ... | *[Top] Network Topologies:* TG=DUT=VM 3-node topology with VM @@ -52,28 +52,28 @@ | | ... | switched thru DUT1 and VM in both directions and are correct on | | ... | receive. [Ref] | | ... -| | [Teardown] | Run Keywords | Stop and Clear QEMU | ${dut_node} | ${vm_node} -| | ... | AND | Func Test Teardown +| | [Teardown] | Run Keywords | Stop and clear QEMU | ${dut_node} | ${vm_node} +| | ... | AND | Tear down functional test | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | When VPP Vhost interfaces for L2BD forwarding are setup | ${dut_node} +| | And Set interfaces in 2-node circular topology up +| | When Configure vhost interfaces for L2BD forwarding | ${dut_node} | | ... | ${sock1} | | ... | ${sock2} -| | And Bridge domain on DUT node is created | ${dut_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${dut_to_tg_if1} +| | And Create bridge domain | ${dut_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if1} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${vhost_if1} +| | And Add interface to bridge domain | ${dut_node} | ${vhost_if1} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut_node} | ${bd_id2} -| | And Interface is added to bridge domain | ${dut_node} | ${dut_to_tg_if2} +| | And Create bridge domain | ${dut_node} | ${bd_id2} +| | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if2} | | ... | ${bd_id2} -| | And Interface is added to bridge domain | ${dut_node} | ${vhost_if2} +| | And Add interface to bridge domain | ${dut_node} | ${vhost_if2} | | ... | ${bd_id2} -| | And VM for Vhost L2BD forwarding is setup | ${dut_node} | ${sock1} +| | And Configure VM for vhost L2BD forwarding | ${dut_node} | ${sock1} | | ... | ${sock2} -| | Then Send and receive ICMPv4 bidirectionally | ${tg_node} | ${tg_to_dut_if1} +| | Then Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | TC02: DUT with two L2BDs (MAC learn) switches ICMPv6 between TG and VM links @@ -85,26 +85,26 @@ | | ... | switched thru DUT1 and VM in both directions and are correct on | | ... | receive. [Ref] | | ... -| | [Teardown] | Run Keywords | Stop and Clear QEMU | ${dut_node} | ${vm_node} -| | ... | AND | Func Test Teardown +| | [Teardown] | Run Keywords | Stop and clear QEMU | ${dut_node} | ${vm_node} +| | ... | AND | Tear down functional test | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | When VPP Vhost interfaces for L2BD forwarding are setup | ${dut_node} +| | And Set interfaces in 2-node circular topology up +| | When Configure vhost interfaces for L2BD forwarding | ${dut_node} | | ... | ${sock1} | | ... | ${sock2} -| | And Bridge domain on DUT node is created | ${dut_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${dut_to_tg_if1} +| | And Create bridge domain | ${dut_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if1} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${vhost_if1} +| | And Add interface to bridge domain | ${dut_node} | ${vhost_if1} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut_node} | ${bd_id2} -| | And Interface is added to bridge domain | ${dut_node} | ${dut_to_tg_if2} +| | And Create bridge domain | ${dut_node} | ${bd_id2} +| | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if2} | | ... | ${bd_id2} -| | And Interface is added to bridge domain | ${dut_node} | ${vhost_if2} +| | And Add interface to bridge domain | ${dut_node} | ${vhost_if2} | | ... | ${bd_id2} -| | And VM for Vhost L2BD forwarding is setup | ${dut_node} | ${sock1} +| | And Configure VM for vhost L2BD forwarding | ${dut_node} | ${sock1} | | ... | ${sock2} -| | Then Send and receive ICMPv6 bidirectionally | ${tg_node} | ${tg_to_dut_if1} +| | Then Send ICMPv6 bidirectionally and verify received packets | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} diff --git a/tests/func/l2bd/eth2p-eth-l2bdbasemaclrn-func.robot b/tests/func/l2bd/eth2p-eth-l2bdbasemaclrn-func.robot index 160bf57ef4..4d201004af 100644 --- a/tests/func/l2bd/eth2p-eth-l2bdbasemaclrn-func.robot +++ b/tests/func/l2bd/eth2p-eth-l2bdbasemaclrn-func.robot @@ -18,8 +18,8 @@ | Resource | resources/libraries/robot/qemu.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2 bridge-domain test cases* | ... | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links @@ -46,7 +46,7 @@ | | ... | [Top] TG=DUT1; TG-DUT1-DUT2-TG. [Enc] None. [Cfg] Discovered \ | | ... | active interfaces. [Ver] Report active interfaces on DUT. [Ref] | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO | 3_NODE_SINGLE_LINK_TOPO -| | VPP reports interfaces on | ${nodes['DUT1']} +| | Report VPP interfaces | ${nodes['DUT1']} | TC02: DUT with L2BD (MAC learning) switch ICMPv4 between two TG links | | [Documentation] @@ -55,15 +55,15 @@ | | ... | ICMPv4 Echo Req pkts are switched thru DUT1 in both directions | | ... | and are correct on receive. [Ref] | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | When Bridge domain on DUT node is created | ${dut_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${dut_to_tg_if1} +| | And Set interfaces in 2-node circular topology up +| | When Create bridge domain | ${dut_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if1} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${dut_to_tg_if2} +| | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if2} | | ... | ${bd_id1} -| | Then Send and receive ICMPv4 bidirectionally | ${tg_node} | ${tg_to_dut_if1} +| | Then Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | TC03: DUT1 and DUT2 with L2BD (MAC learning) switch between two TG links @@ -73,18 +73,18 @@ | | ... | verify ICMPv4 Echo Req pkts are switched thru DUT1 and DUT2 in | | ... | both directions and are correct on receive. [Ref] | | [Tags] | 3_NODE_SINGLE_LINK_TOPO -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | When Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg} +| | And Set interfaces in 3-node circular topology up +| | When Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id2} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id2} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id2} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_dut1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_dut1} | | ... | ${bd_id2} -| | Then Send and receive ICMPv4 bidirectionally | ${tg_node} | ${tg_to_dut1} +| | Then Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} diff --git a/tests/func/l2bd/eth2p-eth-l2bdbasemacstc-eth-2vhost-1vm-func.robot b/tests/func/l2bd/eth2p-eth-l2bdbasemacstc-eth-2vhost-1vm-func.robot index ad5258bb9a..88d3260e1e 100644 --- a/tests/func/l2bd/eth2p-eth-l2bdbasemacstc-eth-2vhost-1vm-func.robot +++ b/tests/func/l2bd/eth2p-eth-l2bdbasemacstc-eth-2vhost-1vm-func.robot @@ -18,8 +18,8 @@ | Resource | resources/libraries/robot/qemu.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_DOUBLE_LINK_TOPO | HW_ENV | VM_ENV | VPP_VM_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2 bridge-domain test cases* | ... | ... | *[Top] Network Topologies:* TG=DUT=VM 3-node topology with VM @@ -52,50 +52,50 @@ | | ... | switched thru DUT1 and VM in both directions and are correct on | | ... | receive. [Ref] | | ... -| | [Teardown] | Run Keywords | Stop and Clear QEMU | ${dut_node} | ${vm_node} -| | ... | AND | Func Test Teardown +| | [Teardown] | Run Keywords | Stop and clear QEMU | ${dut_node} | ${vm_node} +| | ... | AND | Tear down functional test | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | When VPP Vhost interfaces for L2BD forwarding are setup | ${dut_node} +| | And Set interfaces in 2-node circular topology up +| | When Configure vhost interfaces for L2BD forwarding | ${dut_node} | | ... | ${sock1} | | ... | ${sock2} -| | And Bridge domain on DUT node is created | ${dut_node} | ${bd_id1} +| | And Create bridge domain | ${dut_node} | ${bd_id1} | | ... | learn=${FALSE} -| | And Interface is added to bridge domain | ${dut_node} | ${dut_to_tg_if1} +| | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if1} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${vhost_if1} +| | And Add interface to bridge domain | ${dut_node} | ${vhost_if1} | | ... | ${bd_id1} -| | And Destination port is added to L2FIB on DUT node | ${tg_node} +| | And Add destination port to L2FIB | ${tg_node} | | ... | ${tg_to_dut_if1} | | ... | ${dut_node} | | ... | ${dut_to_tg_if1} | | ... | ${bd_id1} -| | And Destination port is added to L2FIB on DUT node | ${tg_node} +| | And Add destination port to L2FIB | ${tg_node} | | ... | ${tg_to_dut_if2} | | ... | ${dut_node} | | ... | ${vhost_if1} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut_node} | ${bd_id2} +| | And Create bridge domain | ${dut_node} | ${bd_id2} | | ... | learn=${FALSE} -| | And Interface is added to bridge domain | ${dut_node} | ${dut_to_tg_if2} +| | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if2} | | ... | ${bd_id2} -| | And Interface is added to bridge domain | ${dut_node} | ${vhost_if2} +| | And Add interface to bridge domain | ${dut_node} | ${vhost_if2} | | ... | ${bd_id2} -| | And Destination port is added to L2FIB on DUT node | ${tg_node} +| | And Add destination port to L2FIB | ${tg_node} | | ... | ${tg_to_dut_if2} | | ... | ${dut_node} | | ... | ${dut_to_tg_if2} | | ... | ${bd_id2} -| | And Destination port is added to L2FIB on DUT node | ${tg_node} +| | And Add destination port to L2FIB | ${tg_node} | | ... | ${tg_to_dut_if1} | | ... | ${dut_node} | | ... | ${vhost_if2} | | ... | ${bd_id2} -| | And VM for Vhost L2BD forwarding is setup | ${dut_node} | ${sock1} +| | And Configure VM for vhost L2BD forwarding | ${dut_node} | ${sock1} | | ... | ${sock2} -| | Then Send and receive ICMPv4 bidirectionally | ${tg_node} | ${tg_to_dut_if1} +| | Then Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | TC02: DUT with two L2BDs (static MACs) switches ICMPv6 between TG and VM links @@ -107,48 +107,48 @@ | | ... | switched thru DUT1 and VM in both directions and are correct on | | ... | receive. [Ref] | | ... -| | [Teardown] | Run Keywords | Stop and Clear QEMU | ${dut_node} | ${vm_node} -| | ... | AND | Func Test Teardown +| | [Teardown] | Run Keywords | Stop and clear QEMU | ${dut_node} | ${vm_node} +| | ... | AND | Tear down functional test | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | When VPP Vhost interfaces for L2BD forwarding are setup | ${dut_node} +| | And Set interfaces in 2-node circular topology up +| | When Configure vhost interfaces for L2BD forwarding | ${dut_node} | | ... | ${sock1} | | ... | ${sock2} -| | And Bridge domain on DUT node is created | ${dut_node} | ${bd_id1} +| | And Create bridge domain | ${dut_node} | ${bd_id1} | | ... | learn=${FALSE} -| | And Interface is added to bridge domain | ${dut_node} | ${dut_to_tg_if1} +| | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if1} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${vhost_if1} +| | And Add interface to bridge domain | ${dut_node} | ${vhost_if1} | | ... | ${bd_id1} -| | And Destination port is added to L2FIB on DUT node | ${tg_node} +| | And Add destination port to L2FIB | ${tg_node} | | ... | ${tg_to_dut_if1} | | ... | ${dut_node} | | ... | ${dut_to_tg_if1} | | ... | ${bd_id1} -| | And Destination port is added to L2FIB on DUT node | ${tg_node} +| | And Add destination port to L2FIB | ${tg_node} | | ... | ${tg_to_dut_if2} | | ... | ${dut_node} | | ... | ${vhost_if1} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut_node} | ${bd_id2} +| | And Create bridge domain | ${dut_node} | ${bd_id2} | | ... | learn=${FALSE} -| | And Interface is added to bridge domain | ${dut_node} | ${dut_to_tg_if2} +| | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if2} | | ... | ${bd_id2} -| | And Interface is added to bridge domain | ${dut_node} | ${vhost_if2} +| | And Add interface to bridge domain | ${dut_node} | ${vhost_if2} | | ... | ${bd_id2} -| | And Destination port is added to L2FIB on DUT node | ${tg_node} +| | And Add destination port to L2FIB | ${tg_node} | | ... | ${tg_to_dut_if2} | | ... | ${dut_node} | | ... | ${dut_to_tg_if2} | | ... | ${bd_id2} -| | And Destination port is added to L2FIB on DUT node | ${tg_node} +| | And Add destination port to L2FIB | ${tg_node} | | ... | ${tg_to_dut_if1} | | ... | ${dut_node} | | ... | ${vhost_if2} | | ... | ${bd_id2} -| | And VM for Vhost L2BD forwarding is setup | ${dut_node} | ${sock1} +| | And Configure VM for vhost L2BD forwarding | ${dut_node} | ${sock1} | | ... | ${sock2} -| | Then Send and receive ICMPv6 bidirectionally | ${tg_node} | ${tg_to_dut_if1} +| | Then Send ICMPv6 bidirectionally and verify received packets | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} diff --git a/tests/func/l2bd/eth2p-eth-l2bdbasemacstc-func.robot b/tests/func/l2bd/eth2p-eth-l2bdbasemacstc-func.robot index a369d8e642..2cfa02ae99 100644 --- a/tests/func/l2bd/eth2p-eth-l2bdbasemacstc-func.robot +++ b/tests/func/l2bd/eth2p-eth-l2bdbasemacstc-func.robot @@ -18,8 +18,8 @@ | Resource | resources/libraries/robot/qemu.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2 bridge-domain test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -47,40 +47,40 @@ | | ... | TG verify ICMPv4 Echo Req pkts are switched thru DUT1 and DUT2 | | ... | in both directions and are correct on receive. [Ref] | | [Tags] | 3_NODE_SINGLE_LINK_TOPO -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | When Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} +| | And Set interfaces in 3-node circular topology up +| | When Create bridge domain | ${dut1_node} | ${bd_id1} | | ... | learn=${FALSE} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Destination port is added to L2FIB on DUT node | ${tg_node} +| | And Add destination port to L2FIB | ${tg_node} | | ... | ${tg_to_dut1} | | ... | ${dut1_node} | | ... | ${dut1_to_tg} | | ... | ${bd_id1} -| | And Destination port is added to L2FIB on DUT node | ${tg_node} +| | And Add destination port to L2FIB | ${tg_node} | | ... | ${tg_to_dut2} | | ... | ${dut1_node} | | ... | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id2} +| | And Create bridge domain | ${dut2_node} | ${bd_id2} | | ... | learn=${FALSE} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id2} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_dut1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_dut1} | | ... | ${bd_id2} -| | And Destination port is added to L2FIB on DUT node | ${tg_node} +| | And Add destination port to L2FIB | ${tg_node} | | ... | ${tg_to_dut1} | | ... | ${dut2_node} | | ... | ${dut2_to_dut1} | | ... | ${bd_id2} -| | And Destination port is added to L2FIB on DUT node | ${tg_node} +| | And Add destination port to L2FIB | ${tg_node} | | ... | ${tg_to_dut2} | | ... | ${dut2_node} | | ... | ${dut2_to_tg} | | ... | ${bd_id2} -| | Then Send and receive ICMPv4 bidirectionally | ${tg_node} | ${tg_to_dut1} +| | Then Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} diff --git a/tests/func/l2bd/eth4p-eth-l2bdbasemaclrn-l2shg-func.robot b/tests/func/l2bd/eth4p-eth-l2bdbasemaclrn-l2shg-func.robot index 295a03eadc..2136394cf5 100644 --- a/tests/func/l2bd/eth4p-eth-l2bdbasemaclrn-l2shg-func.robot +++ b/tests/func/l2bd/eth4p-eth-l2bdbasemaclrn-l2shg-func.robot @@ -18,8 +18,8 @@ | Resource | resources/libraries/robot/qemu.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2 bridge-domain test cases* | ... | ... | *[Top] Network Topologies:* TG=DUT1=DUT2=TG 3-node circular topology @@ -53,41 +53,41 @@ | | ... | are correct on receive; verify no pkts are switched thru SHG | | ... | isolated interfaces. [Ref] | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO -| | Given Path for 3-node BD-SHG testing is set | ${nodes['TG']} +| | Given Configure path for 3-node BD-SHG test | ${nodes['TG']} | | ... | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} -| | And Interfaces in 3-node BD-SHG testing are up -| | When Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg_if1} +| | And Set interfaces in 3-node BD-SHG test up +| | When Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if1} | | ... | ${bd_id1} | ${shg1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg_if2} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if2} | | ... | ${bd_id1} | ${shg1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id2} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg_if1} +| | And Create bridge domain | ${dut2_node} | ${bd_id2} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if1} | | ... | ${bd_id2} | ${shg2} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg_if2} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if2} | | ... | ${bd_id2} | ${shg2} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_dut1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_dut1} | | ... | ${bd_id2} -| | Then Send and receive ICMPv4 bidirectionally | ${tg_node} +| | Then Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if1} | | ... | ${tg_to_dut2_if1} -| | And Send and receive ICMPv4 bidirectionally | ${tg_node} +| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if1} | | ... | ${tg_to_dut2_if2} -| | And Send and receive ICMPv4 bidirectionally | ${tg_node} +| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if2} | | ... | ${tg_to_dut2_if1} -| | And Send and receive ICMPv4 bidirectionally | ${tg_node} +| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if2} | | ... | ${tg_to_dut2_if2} | | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMPv4 bidirectionally +| | ... | Send ICMPv4 bidirectionally and verify received packets | | | ... | ${tg_node} | ${tg_to_dut1_if1} | | | ... | ${tg_to_dut1_if2} | | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMPv4 bidirectionally +| | ... | Send ICMPv4 bidirectionally and verify received packets | | | ... | ${tg_node} | ${tg_to_dut2_if1} | | | ... | ${tg_to_dut2_if2} diff --git a/tests/func/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-func.robot b/tests/func/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-func.robot index 583a5ba052..0763b88142 100644 --- a/tests/func/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-func.robot +++ b/tests/func/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-func.robot @@ -22,8 +22,8 @@ | Library | resources.libraries.python.Trace | Library | resources.libraries.python.NodePath | Force Tags | 3_NODE_DOUBLE_LINK_TOPO | HW_ENV | VM_ENV | VPP_VM_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2 cross-connect test cases* | ... | ... | *[Top] Network Topologies:* TG=DUT=VM 3-node topology with VM and @@ -52,20 +52,20 @@ | | ... | i/fs to be switched by DUT to and from VM; verify all packets | | ... | are received. [Ref] | | ... -| | [Teardown] | Run Keywords | Stop and Clear QEMU | ${dut_node} | ${vm_node} -| | ... | AND | Func Test Teardown +| | [Teardown] | Run Keywords | Stop and clear QEMU | ${dut_node} | ${vm_node} +| | ... | AND | Tear down functional test | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | When VPP Vhost interfaces for L2BD forwarding are setup | ${dut_node} +| | And Set interfaces in 2-node circular topology up +| | When Configure vhost interfaces for L2BD forwarding | ${dut_node} | | ... | ${sock1} | | ... | ${sock2} -| | And L2 Setup Xconnect on DUT | ${dut_node} | ${dut_to_tg_if1} | ${vhost_if1} -| | And L2 Setup Xconnect on DUT | ${dut_node} | ${dut_to_tg_if2} | ${vhost_if2} -| | And VM for Vhost L2BD forwarding is setup | ${dut_node} | ${sock1} +| | And Configure L2XC | ${dut_node} | ${dut_to_tg_if1} | ${vhost_if1} +| | And Configure L2XC | ${dut_node} | ${dut_to_tg_if2} | ${vhost_if2} +| | And Configure VM for vhost L2BD forwarding | ${dut_node} | ${sock1} | | ... | ${sock2} -| | Then Send and receive ICMPv4 bidirectionally | ${tg_node} | ${tg_to_dut_if1} +| | Then Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | TC02: DUT with two L2XCs switches ICMPv6 between TG and local VM links @@ -77,19 +77,19 @@ | | ... | be switched by DUT to and from VM; verify all packets are | | ... | received. [Ref] | | ... -| | [Teardown] | Run Keywords | Stop and Clear QEMU | ${dut_node} | ${vm_node} -| | ... | AND | Func Test Teardown +| | [Teardown] | Run Keywords | Stop and clear QEMU | ${dut_node} | ${vm_node} +| | ... | AND | Tear down functional test | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | When VPP Vhost interfaces for L2BD forwarding are setup | ${dut_node} +| | And Set interfaces in 2-node circular topology up +| | When Configure vhost interfaces for L2BD forwarding | ${dut_node} | | ... | ${sock1} | | ... | ${sock2} -| | And L2 Setup Xconnect on DUT | ${dut_node} | ${dut_to_tg_if1} | ${vhost_if1} -| | And L2 Setup Xconnect on DUT | ${dut_node} | ${dut_to_tg_if2} | ${vhost_if2} -| | And VM for Vhost L2BD forwarding is setup | ${dut_node} | ${sock1} +| | And Configure L2XC | ${dut_node} | ${dut_to_tg_if1} | ${vhost_if1} +| | And Configure L2XC | ${dut_node} | ${dut_to_tg_if2} | ${vhost_if2} +| | And Configure VM for vhost L2BD forwarding | ${dut_node} | ${sock1} | | ... | ${sock2} -| | Then Send and receive ICMPv6 bidirectionally | ${tg_node} | ${tg_to_dut_if1} +| | Then Send ICMPv6 bidirectionally and verify received packets | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} diff --git a/tests/func/l2xc/eth2p-eth-l2xcbase-func.robot b/tests/func/l2xc/eth2p-eth-l2xcbase-func.robot index 9aa606a0c9..2c4f4625e6 100644 --- a/tests/func/l2xc/eth2p-eth-l2xcbase-func.robot +++ b/tests/func/l2xc/eth2p-eth-l2xcbase-func.robot @@ -22,8 +22,8 @@ | Library | resources.libraries.python.Trace | Library | resources.libraries.python.NodePath | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2 cross-connect test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -47,15 +47,15 @@ | | ... | Make TG send ICMPv4 Echo Req in both directions between two of | | ... | its interfaces to be switched by DUT1 and DUT2; verify all | | ... | packets are received. [Ref] -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And L2 setup xconnect on DUT +| | And Set interfaces in 3-node circular topology up +| | And Configure L2XC | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | When All Vpp Interfaces Ready Wait | ${nodes} -| | Then Send and receive ICMPv4 bidirectionally +| | Then Send ICMPv4 bidirectionally and verify received packets | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | TC02: DUT1 and DUT2 with L2XC switch ICMPv6 between two TG links @@ -66,13 +66,13 @@ | | ... | Make TG send ICMPv6 Echo Req in both directions between two of | | ... | its interfaces to be switched by DUT1 and DUT2; verify all | | ... | packets are received. [Ref] -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And L2 setup xconnect on DUT +| | And Set interfaces in 3-node circular topology up +| | And Configure L2XC | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | When All Vpp Interfaces Ready Wait | ${nodes} -| | Then Send and receive ICMPv6 bidirectionally +| | Then Send ICMPv6 bidirectionally and verify received packets | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} diff --git a/tests/func/lisp/api-crud-lisp-func.robot b/tests/func/lisp/api-crud-lisp-func.robot index 013eb7258c..b627cad8a9 100644 --- a/tests/func/lisp/api-crud-lisp-func.robot +++ b/tests/func/lisp/api-crud-lisp-func.robot @@ -23,8 +23,8 @@ | Variables | resources/test_data/lisp/api/lisp_api_resources.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO | ... | VM_ENV | HW_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *API test cases* | ... | ... | *[Top] Network Topologies:* DUT1 1-node topology. @@ -46,10 +46,10 @@ | | ... | DUT1 enable LISP. [Ver1] Check DUT1 if LISP is enabled. [Cfg2] | | ... | Then disable LISP. [Ver2] Check DUT1 if LISP is disabled. [Ref] | | ... | RFC6830. -| | When Enable lisp | ${nodes['DUT1']} -| | Then Check if lisp is enabled | ${nodes['DUT1']} | ${lisp_status} -| | When Disable lisp | ${nodes['DUT1']} -| | Then Check if lisp is disabled | ${nodes['DUT1']} | ${lisp_status} +| | When Enable LISP | ${nodes['DUT1']} +| | Then LISP should be enabled | ${nodes['DUT1']} | ${lisp_status} +| | When Disable LISP | ${nodes['DUT1']} +| | Then LISP Should be disabled | ${nodes['DUT1']} | ${lisp_status} | TC02: DUT can add and delete locator_set | | [Documentation] @@ -58,13 +58,13 @@ | | ... | configured locator_set and locator are correct. [Cfg2] Then | | ... | remove locator_set and locator. [Ver2] check DUT1 locator_set | | ... | and locator are removed. [Ref] RFC6830. -| | Given Lisp locator_set data is prepared +| | Given Generate LISP locator_set data | | ... | ${nodes['DUT1']} | ${locator_set_num} -| | And Enable lisp | ${nodes['DUT1']} -| | When Lisp locator_set data is set | ${nodes['DUT1']} -| | Then Lisp locator_set is set correctly | ${nodes['DUT1']} -| | When Delete all lisp locator_set from VPP | ${nodes['DUT1']} -| | Then Lisp locator_set should be unset | ${nodes['DUT1']} +| | And Enable LISP | ${nodes['DUT1']} +| | When Configure LISP locator_set data | ${nodes['DUT1']} +| | Then LISP locator_set shpuld be configured correctly | ${nodes['DUT1']} +| | When Delete all LISP locator_set from VPP | ${nodes['DUT1']} +| | Then LISP locator_set should be unset | ${nodes['DUT1']} | TC03: DUT can add, reset and delete locator_set | | [Documentation] @@ -77,11 +77,11 @@ | | ... | [Ref] RFC6830. | | Given Lisp locator_set data use for test reset locator_set are prepared | | ... | ${nodes['DUT1']} | ${locator_set_num} -| | And Enable lisp | ${nodes['DUT1']} -| | When Lisp locator_set data is set | ${nodes['DUT1']} -| | Then Lisp locator_set is set correctly | ${nodes['DUT1']} -| | When Delete all lisp locator_set from VPP | ${nodes['DUT1']} -| | Then Lisp locator_set should be unset | ${nodes['DUT1']} +| | And Enable LISP | ${nodes['DUT1']} +| | When Configure LISP locator_set data | ${nodes['DUT1']} +| | Then LISP locator_set shpuld be configured correctly | ${nodes['DUT1']} +| | When Delete all LISP locator_set from VPP | ${nodes['DUT1']} +| | Then LISP locator_set should be unset | ${nodes['DUT1']} | TC04: DUT can add and delete eid address | | [Documentation] @@ -89,12 +89,12 @@ | | ... | configure LISP eid IP address. [Ver1] Check DUT1 configured data | | ... | is correct. [Cfg2] Remove configured data. [Ver2] Check DUT1 all | | ... | eid IP addresses are removed. [Ref] RFC6830. -| | Given Enable lisp | ${nodes['DUT1']} -| | When Lisp eid address is set | ${nodes['DUT1']} | ${eid_table} -| | Then Lisp eid address is set correctly to eid table +| | Given Enable LISP | ${nodes['DUT1']} +| | When Configure LISP eid address | ${nodes['DUT1']} | ${eid_table} +| | Then LISP eid address should be set correctly to eid table | | ... | ${nodes['DUT1']} | ${eid_table_vat} -| | When Delete all lisp eid address from VPP | ${nodes['DUT1']} | ${eid_table} -| | Then Lisp eid table should be empty | ${nodes['DUT1']} +| | When Delete all LISP eid address from VPP | ${nodes['DUT1']} | ${eid_table} +| | Then LISP eid table should be empty | ${nodes['DUT1']} | TC05: DUT can add and delete LISP map resolver address | | [Documentation] @@ -103,10 +103,10 @@ | | ... | DUT1 configured data is correct. [Cfg2] Remove configured data. | | ... | [Ver2] Check DUT1 all map resolver addresses are removed. [Ref] | | ... | RFC6830. -| | Given Enable lisp | ${nodes['DUT1']} -| | When Lisp map resolver address is set | ${nodes['DUT1']} | ${map_resolver} -| | Then Lisp map resolver address is set correctly +| | Given Enable LISP | ${nodes['DUT1']} +| | When Configure LISP map resolver address | ${nodes['DUT1']} | ${map_resolver} +| | Then LISP map resolver address should be configured correctly | | ... | ${nodes['DUT1']} | ${map_resolver} -| | When Delete all lisp map resolver address from VPP +| | When Delete all LISP map resolver address from VPP | | ... | ${nodes['DUT1']} | ${map_resolver} -| | Then Lip map resolver address should be empty | ${nodes['DUT1']} +| | Then LISP map resolver address should be empty | ${nodes['DUT1']} diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot index 74d25e8d02..32b3b5c75c 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot @@ -35,13 +35,13 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Stop and Clear QEMU | ${nodes['DUT1']} | ${vm_node} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Stop and clear QEMU | ${nodes['DUT1']} | ${vm_node} +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *IPv4-ip4-ipsec-lispgpe-ip4 - main fib, vrf (gpe_vni-to-vrf)* | ... @@ -86,26 +86,26 @@ | | Given Setup 3-node Topology | | And Add IP Neighbors | | And Setup Qemu DUT1 -| | And Set up LISP GPE topology +| | And Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} | | ... | ${dut1_to_dut2_ip4_static_adjacency} | | ... | ${dut2_to_dut1_ip4_static_adjacency} -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${dut1_to_dut2} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip4} | ${dut2_to_dut1_ip4} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${dut2_to_dut1} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip4} | ${dut1_to_dut2_ip4} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -128,7 +128,7 @@ | | Given Setup 3-node Topology | | And Add IP Neighbors | | And Setup Qemu DUT1 -| | And Set up LISP GPE topology +| | And Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -138,20 +138,20 @@ | | ... | ${dut1_node} | lisp_gpe0 | | ${lisp2_if_idx}= | resources.libraries.python.InterfaceUtil.Get Sw If Index | | ... | ${dut2_node} | lisp_gpe0 -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${lisp1_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip4} | ${dut2_to_dut1_ip4} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${lisp2_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip4} | ${dut1_to_dut2_ip4} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -165,9 +165,9 @@ | | ... | Default is 0. | | ... | | [Arguments] | ${fib_table}=0 -| | Path for 3-node testing is set +| | Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | Interfaces in 3-node path are up +| | Set interfaces in 3-node circular topology up | | Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table} | | Assign Interface To Fib Table | ${dut2_node} @@ -203,11 +203,11 @@ | | ... | ${prefix4} | | Set Interface State | ${dut1_node} | ${vhost1} | up | | Set Interface State | ${dut1_node} | ${vhost2} | up -| | Bridge domain on DUT node is created | ${dut1_node} | ${bid} | learn=${TRUE} -| | Interface is added to bridge domain | ${dut1_node} +| | Create bridge domain | ${dut1_node} | ${bid} | learn=${TRUE} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${dut1_to_tg} | ${bid} | 0 -| | Interface is added to bridge domain | ${dut1_node} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${vhost1} | ${bid} | 0 | | ${vhost_mac}= | Get Vhost User Mac By SW Index | ${dut1_node} | ${vhost2} | | Set test variable | ${dst_vhost_mac} | ${vhost_mac} -| | VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1} | ${sock2} +| | Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1} | ${sock2} diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot index b78dacbefa..80ee675c3e 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot @@ -35,12 +35,12 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *IPv4-ip4-ipsec-lispgpe-ip4 - main fib, vrf (gpe_vni-to-vrf)* | ... @@ -80,26 +80,26 @@ | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup 3-node Topology | | And Add IP Neighbors -| | And Set up LISP GPE topology +| | And Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} | | ... | ${dut1_to_dut2_ip4_static_adjacency} | | ... | ${dut2_to_dut1_ip4_static_adjacency} -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${dut1_to_dut2} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip4} | ${dut2_to_dut1_ip4} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${dut2_to_dut1} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip4} | ${dut1_to_dut2_ip4} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -121,7 +121,7 @@ | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup 3-node Topology | | And Add IP Neighbors -| | And Set up LISP GPE topology +| | And Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -129,20 +129,20 @@ | | ... | ${dut2_to_dut1_ip4_static_adjacency} | | ${lisp_if_idx}= | resources.libraries.python.InterfaceUtil.Get sw if index | | ... | ${dut1_node} | lisp_gpe0 -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${lisp_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | ${tg1_ip4} | | ... | ${tg2_ip4} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${lisp_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | ${tg2_ip4} | | ... | ${tg1_ip4} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -164,27 +164,27 @@ | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup 3-node Topology | ${fib_table_1} | | And Add IP Neighbors -| | When IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Set up LISP GPE topology +| | When Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} | | ... | ${dut1_to_dut2_ip4_static_adjacency} | | ... | ${dut2_to_dut1_ip4_static_adjacency} | | ... | ${dut1_dut2_vni} | ${fib_table_1} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${dut1_to_dut2} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip4} | ${dut2_to_dut1_ip4} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${dut2_to_dut1} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip4} | ${dut1_to_dut2_ip4} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -206,29 +206,29 @@ | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup 3-node Topology | ${fib_table_1} | | And Add IP Neighbors -| | And Set up LISP GPE topology +| | And Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} | | ... | ${dut1_to_dut2_ip4_static_adjacency} | | ... | ${dut2_to_dut1_ip4_static_adjacency} | | ... | ${dut1_dut2_vni} | ${fib_table_1} -| | When IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | When Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${lisp_if_idx}= | resources.libraries.python.InterfaceUtil.Get sw if index | | ... | ${dut1_node} | lisp_gpe0 -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${lisp_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | ${tg1_ip4} | | ... | ${tg2_ip4} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${lisp_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | ${tg2_ip4} | | ... | ${tg1_ip4} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -242,9 +242,9 @@ | | ... | Default is 0. | | ... | | [Arguments] | ${fib_table}=0 -| | Path for 3-node testing is set +| | Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | Interfaces in 3-node path are up +| | Set interfaces in 3-node circular topology up | | Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table} | | Assign Interface To Fib Table | ${dut2_node} diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot index cc79d239e6..90b62e1f87 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot @@ -38,13 +38,13 @@ | Variables | resources/test_data/lisp/ipv6_lispgpe_ipv4/ipv6_lispgpe_ipsec_ipv4.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Stop and Clear QEMU | ${nodes['DUT1']} | ${vm_node} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Stop and clear QEMU | ${nodes['DUT1']} | ${vm_node} +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *IPv6 - ip4-ipsec-lispgpe-ip6 - main fib, vrf, virt2lisp,\ | ... | phy2lisp* @@ -79,20 +79,20 @@ | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup Topology And Lisp | | And Setup Qemu DUT1 -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${dut1_to_dut2} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip4} | ${dut2_to_dut1_ip4} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${dut2_to_dut1} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip4} | ${dut1_to_dut2_ip4} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -118,20 +118,20 @@ | | ... | ${dut1_node} | ${lisp_gpe_int} | | ${lisp2_if_idx}= | resources.libraries.python.InterfaceUtil.get sw if index | | ... | ${dut2_node} | ${lisp_gpe_int} -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${lisp1_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip4} | ${dut2_to_dut1_ip4} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${lisp2_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip4} | ${dut1_to_dut2_ip4} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -141,9 +141,9 @@ | | [Documentation] | Setup IPs and neighbors for interfaces on DUT1 and DUT2\ | | ... | and then setup LISP. | | [Arguments] | ${fib_table}=0 | ${vni_table}=0 | ${ip6}=${FALSE} -| | Path for 3-node testing is set +| | Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | Interfaces in 3-node path are up +| | Set interfaces in 3-node circular topology up | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} | | ... | ${prefix4} | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip6} @@ -161,7 +161,7 @@ | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6} | | ... | ${tg_to_dut1_mac} | | Vpp All RA Suppress Link Layer | ${nodes} -| | Set up LISP GPE topology +| | Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -178,12 +178,12 @@ | | Set Interface State | ${dut1_node} | ${vhost1} | up | | Set Interface State | ${dut1_node} | ${vhost2} | up | | Vpp RA Suppress Link Layer | ${dut1_node} | ${vhost2} -| | Bridge domain on DUT node is created | ${dut1_node} | ${bid} | learn=${TRUE} -| | Interface is added to bridge domain | ${dut1_node} +| | Create bridge domain | ${dut1_node} | ${bid} | learn=${TRUE} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${dut1_to_tg} | ${bid} | 0 -| | Interface is added to bridge domain | ${dut1_node} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${vhost1} | ${bid} | 0 | | ${vhost_mac}= | Get Vhost User Mac By SW Index | ${dut1_node} | ${vhost2} | | Set test variable | ${dst_vhost_mac} | ${vhost_mac} -| | VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1} | ${sock2} +| | Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1} | ${sock2} diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-func.robot index e0b73c7185..86db5f5bac 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-func.robot @@ -38,12 +38,12 @@ | Variables | resources/test_data/lisp/ipv6_lispgpe_ipv4/ipv6_lispgpe_ipsec_ipv4.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *IPv6 - ip4-ipsec-lispgpe-ip6 - main fib, vrf, virt2lisp,\ | ... | phy2lisp* @@ -75,20 +75,20 @@ | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup Topology And Lisp -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${dut1_to_dut2} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip4} | ${dut2_to_dut1_ip4} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${dut2_to_dut1} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip4} | ${dut1_to_dut2_ip4} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -108,22 +108,22 @@ | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup Topology And Lisp -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${lisp_if_idx}= | resources.libraries.python.InterfaceUtil.get sw if index | | ... | ${dut1_node} | ${lisp_gpe_int} -| | When VPP Setup IPsec Manual Keyed Connection +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${lisp_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip4} | ${dut2_to_dut1_ip4} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${lisp_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip4} | ${dut1_to_dut2_ip4} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -133,9 +133,9 @@ | | [Documentation] | Setup IPs and neighbors for interfaces on DUT1 and DUT2\ | | ... | and then setup LISP. | | [Arguments] | ${fib_table}=0 | ${vni_table}=0 | ${ip6}=${FALSE} -| | Path for 3-node testing is set +| | Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | Interfaces in 3-node path are up +| | Set interfaces in 3-node circular topology up | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} | | ... | ${prefix4} | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip6} @@ -153,7 +153,7 @@ | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6} | | ... | ${tg_to_dut1_mac} | | Vpp All RA Suppress Link Layer | ${nodes} -| | Set up LISP GPE topology +| | Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot index 16a10139f0..81d5f758ad 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot @@ -38,12 +38,12 @@ | Variables | resources/test_data/lisp/ipv6_lispgpe_ipv4/ipv6_lispgpe_ipsec_ipv4.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *IPv6 - ip4-ipsec-lispgpe-ip6 - main fib, vrf, virt2lisp,\ | ... | phy2lisp* @@ -75,28 +75,28 @@ | | ... | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table_1} | ip6=${TRUE} | | Assign Interface To Fib Table | ${dut2_node} | | ... | ${dut2_to_tg} | ${fib_table_1} | ip6=${TRUE} -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${dut1_to_dut2} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip4} | ${dut2_to_dut1_ip4} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${dut2_to_dut1} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip4} | ${dut1_to_dut2_ip4} | | Setup Topology And Lisp | ${fib_table_1} | ${dut1_dut2_vni} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -106,9 +106,9 @@ | | [Documentation] | Setup IPs and neighbors for interfaces on DUT1 and DUT2\ | | ... | and then setup LISP. | | [Arguments] | ${fib_table}=0 | ${vni_table}=0 | ${ip6}=${FALSE} -| | Path for 3-node testing is set +| | Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | Interfaces in 3-node path are up +| | Set interfaces in 3-node circular topology up | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} | | ... | ${prefix4} | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip6} @@ -126,7 +126,7 @@ | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6} | | ... | ${tg_to_dut1_mac} | | Vpp All RA Suppress Link Layer | ${nodes} -| | Set up LISP GPE topology +| | Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} diff --git a/tests/func/lisp/eth2p-ethip4lisp-ip4base-func.robot b/tests/func/lisp/eth2p-ethip4lisp-ip4base-func.robot index 9ab69b2d71..0a7338c26f 100644 --- a/tests/func/lisp/eth2p-ethip4lisp-ip4base-func.robot +++ b/tests/func/lisp/eth2p-ethip4lisp-ip4base-func.robot @@ -24,8 +24,8 @@ | Variables | resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO | ... | VM_ENV | HW_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *IP AFI independent functional tests.* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ @@ -56,10 +56,10 @@ | | ... | [Cfg3] Re-enable LISP. | | ... | [Ver3] Verify packets are received again via LISP tunnel. | | ... | [Ref] RFC6830. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And IP addresses are set on interfaces +| | And Set interfaces in 3-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | | ... | ${dut1_to_dut2_ip4} | ${prefix4} | | ... | ${dut1_node} | ${dut1_to_tg} @@ -74,26 +74,26 @@ | | ... | ${tg_to_dut2_mac} | | And Add Arp On Dut | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4} | | ... | ${tg_to_dut1_mac} -| | When Set up Lisp topology +| | When Configure LISP topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} | | ... | ${dut1_to_dut2_ip4_static_adjacency} | | ... | ${dut2_to_dut1_ip4_static_adjacency} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} | | When Disable Lisp | ${dut1_node} -| | Then Send packet from Port to Port should failed +| | Then Packet transmission from port to port should fail | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send packet from Port to Port should failed +| | And Packet transmission from port to port should fail | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -110,11 +110,11 @@ | | ... | ${dut2_to_dut1_ip4_static_adjacency['prefix']} | | ... | ${dut2_to_dut1_ip4_static_adjacency['seid']} | | ... | ${dut2_to_dut1_ip4_static_adjacency['prefix']} -| | Then Wait Until Keyword Succeeds | 2x | 5s | Send Packet And Check Headers +| | Then Wait Until Keyword Succeeds | 2x | 5s | Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Wait Until Keyword Succeeds | 2x | 5s | Send Packet And Check Headers +| | And Wait Until Keyword Succeeds | 2x | 5s | Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac}
\ No newline at end of file diff --git a/tests/func/lisp/eth2p-ethip4lisp-l2bdbasemaclrn-func.robot b/tests/func/lisp/eth2p-ethip4lisp-l2bdbasemaclrn-func.robot index c0a411cc4a..04c73db933 100644 --- a/tests/func/lisp/eth2p-ethip4lisp-l2bdbasemaclrn-func.robot +++ b/tests/func/lisp/eth2p-ethip4lisp-l2bdbasemaclrn-func.robot @@ -29,8 +29,8 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | ... | Documentation | *ip4-lispgpe-ip4 encapsulation test cases* | ... @@ -58,10 +58,10 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830. | | ... -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And IP addresses are set on interfaces +| | And Set interfaces in 3-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} | ${prefix4} | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip4} | ${prefix4} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_dut1_ip4} | ${prefix4} @@ -78,17 +78,17 @@ | | And Add Interface To L2 BD | ${dut1_node} | ${dut1_to_tg} | ${vpp_bd_id} | | And Create L2 BD | ${dut2_node} | ${vpp_bd_id} | | And Add Interface To L2 BD | ${dut2_node} | ${dut2_to_tg} | ${vpp_bd_id} -| | And Set up L2 Lisp on DUT | ${dut1_node} +| | And Configure L2 LISP on DUT | ${dut1_node} | | ... | ${dut1_to_dut2_ip4_static_adjacency} | | ... | ${lisp_dut_settings} -| | And Set up L2 Lisp on DUT | ${dut2_node} +| | And Configure L2 LISP on DUT | ${dut2_node} | | ... | ${dut2_to_dut1_ip4_static_adjacency} | | ... | ${lisp_dut_settings} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_if1_mac} | ${tg_if2_mac} | | ... | ${tg_to_dut2} | ${tg_if1_mac} | ${tg_if2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_if2_mac} | ${tg_if1_mac} | | ... | ${tg_to_dut1} | ${tg_if2_mac} | ${tg_if1_mac} diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-eth-2vhost-1vm-func.robot index f9860e859e..512f63ee72 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-eth-2vhost-1vm-func.robot @@ -33,13 +33,13 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Stop and Clear QEMU | ${nodes['DUT1']} | ${vm_node} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Stop and clear QEMU | ${nodes['DUT1']} | ${vm_node} +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *ip4-lispgpe-ip4 encapsulation test cases* | ... @@ -68,10 +68,10 @@ | | ... | DUTs and LISP GPE tunnel between them; verify IPv4 headers on\ | | ... | received packets are correct. | | ... -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And IP addresses are set on interfaces +| | And Set interfaces in 3-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} | ${prefix4} | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip4} | ${prefix4} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_dut1_ip4} | ${prefix4} @@ -84,18 +84,18 @@ | | ... | ${dut2_to_dut1_mac} | | And Add Arp On Dut | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip4} | | ... | ${dut1_to_dut2_mac} -| | When Set up LISP GPE topology +| | When Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} | | ... | ${dut1_to_dut2_ip4_static_adjacency} | | ... | ${dut2_to_dut1_ip4_static_adjacency} | | And Setup Qemu DUT1 -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -115,11 +115,11 @@ | | Set Interface Address | ${dut1_node} | ${vhost2} | ${vhost_ip} | ${prefix4} | | Set Interface State | ${dut1_node} | ${vhost1} | up | | Set Interface State | ${dut1_node} | ${vhost2} | up -| | Bridge domain on DUT node is created | ${dut1_node} | ${bid} | learn=${TRUE} -| | Interface is added to bridge domain | ${dut1_node} +| | Create bridge domain | ${dut1_node} | ${bid} | learn=${TRUE} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${dut1_to_tg} | ${bid} | 0 -| | Interface is added to bridge domain | ${dut1_node} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${vhost1} | ${bid} | 0 | | ${vhost_mac}= | Get Vhost User Mac By SW Index | ${dut1_node} | ${vhost2} | | Set test variable | ${dst_vhost_mac} | ${vhost_mac} -| | VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1} | ${sock2} +| | Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1} | ${sock2} diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-func.robot index d095b79f97..adb01ee289 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-func.robot @@ -33,12 +33,12 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *ip4-lispgpe-ip4 encapsulation test cases* | ... @@ -68,26 +68,26 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830. | | ... -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And IP addresses are set on interfaces +| | And Set interfaces in 3-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} | ${prefix4} | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip4} | ${prefix4} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_dut1_ip4} | ${prefix4} | | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip4} | ${prefix4} | | And Add IP Neighbors -| | When Set up LISP GPE topology +| | When Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} | | ... | ${dut1_to_dut2_ip4_static_adjacency} | | ... | ${dut2_to_dut1_ip4_static_adjacency} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot index 7199cda821..d85f009c84 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot @@ -33,13 +33,13 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Stop and Clear QEMU | ${nodes['DUT1']} | ${vm_node} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Stop and clear QEMU | ${nodes['DUT1']} | ${vm_node} +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *ip4-lispgpe-ip4 encapsulation test cases* | ... @@ -69,20 +69,20 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830. | | ... -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table_1} | | And Assign Interface To Fib Table | ${dut2_node} | | ... | ${dut2_to_tg} | ${fib_table_1} | | And Add IP Neighbors -| | And IP addresses are set on interfaces +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} | ${prefix4} | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip4} | ${prefix4} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_dut1_ip4} | ${prefix4} | | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip4} | ${prefix4} -| | When Set up LISP GPE topology +| | When Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -90,11 +90,11 @@ | | ... | ${dut2_to_dut1_ip4_static_adjacency} | | ... | ${dut1_dut2_vni} | ${fib_table_1} | | And Setup Qemu DUT1 | ${fib_table_1} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -114,14 +114,14 @@ | | Set Interface Address | ${dut1_node} | ${vhost2} | ${vhost_ip} | ${prefix4} | | Set Interface State | ${dut1_node} | ${vhost1} | up | | Set Interface State | ${dut1_node} | ${vhost2} | up -| | Bridge domain on DUT node is created | ${dut1_node} | ${bid} | learn=${TRUE} -| | Interface is added to bridge domain | ${dut1_node} +| | Create bridge domain | ${dut1_node} | ${bid} | learn=${TRUE} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${dut1_to_tg} | ${bid} | 0 -| | Interface is added to bridge domain | ${dut1_node} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${vhost1} | ${bid} | 0 | | ${vhost_mac}= | Get Vhost User Mac By SW Index | ${dut1_node} | ${vhost2} | | Set test variable | ${dst_vhost_mac} | ${vhost_mac} -| | VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1} | ${sock2} +| | Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1} | ${sock2} | Add IP Neighbors | | [Documentation] diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot index 65c6e932ba..86d7ee8c0e 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot @@ -33,12 +33,12 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *ip4-lispgpe-ip4 encapsulation test cases* | ... @@ -68,31 +68,31 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830. | | ... -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table_1} | | And Assign Interface To Fib Table | ${dut2_node} | | ... | ${dut2_to_tg} | ${fib_table_1} | | And Add IP Neighbors -| | And IP addresses are set on interfaces +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} | ${prefix4} | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip4} | ${prefix4} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_dut1_ip4} | ${prefix4} | | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip4} | ${prefix4} -| | When Set up LISP GPE topology +| | When Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} | | ... | ${dut1_to_dut2_ip4_static_adjacency} | | ... | ${dut2_to_dut1_ip4_static_adjacency} | | ... | ${dut1_dut2_vni} | ${fib_table_1} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-eth-2vhost-1vm-func.robot index e7d89744b5..f74af9607f 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-eth-2vhost-1vm-func.robot @@ -29,13 +29,13 @@ | Variables | resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO | ... | VM_ENV | HW_ENV -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Stop and Clear QEMU | ${nodes['DUT1']} | ${vm_node} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Stop and clear QEMU | ${nodes['DUT1']} | ${vm_node} +| ... | AND | Verify VPP PID in Teardown | Documentation | *LISP static adjacency test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ @@ -63,10 +63,10 @@ | | ... | DUTs and LISP GPE tunnel between them; verify IPv6 headers on\ | | ... | received packets are correct. | | ... -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And IP addresses are set on interfaces +| | And Set interfaces in 3-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6o4} | | ... | ${dut_prefix6o4} | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip6o4} | ${tg_prefix6o4} @@ -82,18 +82,18 @@ | | And Add Arp On Dut | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip6o4} | | ... | ${dut1_to_dut2_mac} | | And Vpp All RA Suppress Link Layer | ${nodes} -| | When Set up LISP GPE topology +| | When Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} | | ... | ${dut1_ip6o4_static_adjacency} | | ... | ${dut2_ip6o4_static_adjacency} | | And Setup Qemu DUT1 -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6o4} | ${tg2_ip6o4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6o4} | ${tg1_ip6o4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -108,11 +108,11 @@ | | Set Interface Address | ${dut1_node} | ${vhost2} | ${vhost_ip} | ${prefix4} | | Set Interface State | ${dut1_node} | ${vhost1} | up | | Set Interface State | ${dut1_node} | ${vhost2} | up -| | Bridge domain on DUT node is created | ${dut1_node} | ${bid} | learn=${TRUE} -| | Interface is added to bridge domain | ${dut1_node} +| | Create bridge domain | ${dut1_node} | ${bid} | learn=${TRUE} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${dut1_to_tg} | ${bid} | 0 -| | Interface is added to bridge domain | ${dut1_node} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${vhost1} | ${bid} | 0 | | ${vhost_mac}= | Get Vhost User Mac By SW Index | ${dut1_node} | ${vhost2} | | Set test variable | ${dst_vhost_mac} | ${vhost_mac} -| | VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1} | ${sock2} +| | Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1} | ${sock2} diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-func.robot index cedb942e24..2d1a9c4253 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-func.robot @@ -29,8 +29,8 @@ | Variables | resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO | ... | VM_ENV | HW_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *LISP static adjacency test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ @@ -59,10 +59,10 @@ | | ... | [Cfg2] Reconf LISP. | | ... | [Ver2] Verify packets are received again via LISP tunnel. | | ... | [Ref] RFC6830. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And IP addresses are set on interfaces +| | And Set interfaces in 3-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | | ... | ${dut1_to_dut2_ip6o4} | ${dut_prefix6o4} | | ... | ${dut1_node} | ${dut1_to_tg} @@ -73,30 +73,30 @@ | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | | And Add IP Neighbors | | And Vpp All RA Suppress Link Layer | ${nodes} -| | When Set up Lisp topology +| | When Configure LISP topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} | | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6o4} | ${tg2_ip6o4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6o4} | ${tg1_ip6o4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} -| | When Change Lisp Configuration | ${dut1_node} | ${dut2_node} +| | When Change LISP Configuration | ${dut1_node} | ${dut2_node} | | ... | ${dut1_to_dut2} | ${dut2_to_dut1} | ${dut1_to_dut2_mac} | | ... | ${dut2_to_dut1_mac} | ${dut1_to_dut2_ip6o4} | | ... | ${dut2_to_dut1_ip6o4_reconf} | ${dut_prefix6o4} | | ... | ${dut1_ip6o4_static_adjacency} | | ... | ${dut1_ip6o4_static_adjacency_reconf} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6o4} | ${tg2_ip6o4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6o4} | ${tg1_ip6o4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot index 529d0d467b..e5bc484b75 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot @@ -29,8 +29,8 @@ | Variables | resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO | ... | VM_ENV | HW_ENV -| Test Setup | Func Test Setup -| Test Teardown | Run Keywords | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Run Keywords | Tear down functional test | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} | Documentation | *LISP static adjacency test cases* @@ -61,15 +61,15 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830. | | ... -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table_1} | ip6=${TRUE} | | And Assign Interface To Fib Table | ${dut2_node} | | ... | ${dut2_to_tg} | ${fib_table_1} | ip6=${TRUE} | | And Add IP Neighbors -| | And IP addresses are set on interfaces +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6o4} | | ... | ${dut_prefix6o4} | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip6o4} | ${tg_prefix6o4} @@ -77,18 +77,18 @@ | | ... | ${dut_prefix6o4} | | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | | And Vpp All RA Suppress Link Layer | ${nodes} -| | When Set up LISP GPE topology +| | When Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} | | ... | ${dut1_ip6o4_static_adjacency} | | ... | ${dut2_ip6o4_static_adjacency} | | ... | ${dut1_dut2_vni} | ${fib_table_1} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6o4} | ${tg2_ip6o4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6o4} | ${tg1_ip6o4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} diff --git a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot index 9a1800b608..f125dcbe39 100644 --- a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot @@ -38,13 +38,13 @@ | Variables | resources/test_data/lisp/ipv4_lispgpe_ipv6/ipv4_lispgpe_ipsec_ipv6.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Stop and Clear QEMU | ${nodes['DUT1']} | ${vm_node} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Stop and clear QEMU | ${nodes['DUT1']} | ${vm_node} +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *IPv6 - ip4-ipsec-lispgpe-ip6 - main fib, virt2lisp, phy2lisp* | ... @@ -78,20 +78,20 @@ | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup Topology And Lisp | | And Setup Qemu DUT1 -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${dut1_to_dut2} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip6} | ${dut2_to_dut1_ip6} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${dut2_to_dut1} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip6} | ${dut1_to_dut2_ip6} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -117,20 +117,20 @@ | | ... | ${dut1_node} | ${lisp_gpe_int} | | ${lisp2_if_idx}= | resources.libraries.python.InterfaceUtil.get sw if index | | ... | ${dut2_node} | ${lisp_gpe_int} -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${lisp1_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip6} | ${dut2_to_dut1_ip6} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${lisp2_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip6} | ${dut1_to_dut2_ip6} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -139,9 +139,9 @@ | Setup Topology And Lisp | | [Documentation] | Setup IPs and neighbors for interfaces on DUT1 and DUT2\ | | ... | and then setup LISP. -| | Path for 3-node testing is set +| | Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | Interfaces in 3-node path are up +| | Set interfaces in 3-node circular topology up | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} | | ... | ${prefix6} | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} @@ -161,7 +161,7 @@ | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4} | | ... | ${tg_to_dut1_mac} | | Vpp All RA Suppress Link Layer | ${nodes} -| | Set up LISP GPE topology +| | Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -176,11 +176,11 @@ | | Set Interface Address | ${dut1_node} | ${vhost2} | ${vhost_ip} | ${prefix4} | | Set Interface State | ${dut1_node} | ${vhost1} | up | | Set Interface State | ${dut1_node} | ${vhost2} | up -| | Bridge domain on DUT node is created | ${dut1_node} | ${bid} | learn=${TRUE} -| | Interface is added to bridge domain | ${dut1_node} +| | Create bridge domain | ${dut1_node} | ${bid} | learn=${TRUE} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${dut1_to_tg} | ${bid} | 0 -| | Interface is added to bridge domain | ${dut1_node} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${vhost1} | ${bid} | 0 | | ${vhost_mac}= | Get Vhost User Mac By SW Index | ${dut1_node} | ${vhost2} | | Set test variable | ${dst_vhost_mac} | ${vhost_mac} -| | VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1} | ${sock2} +| | Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1} | ${sock2} diff --git a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-func.robot b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-func.robot index 150a6fee92..d67928c7ab 100644 --- a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-func.robot +++ b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-func.robot @@ -37,8 +37,8 @@ | Variables | resources/test_data/lisp/ipv4_lispgpe_ipv6/ipv4_lispgpe_ipsec_ipv6.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | ... | Documentation | *IPv6 - ip4-ipsec-lispgpe-ip6 - main fib, virt2lisp, phy2lisp* | ... @@ -69,20 +69,20 @@ | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup Topology And Lisp -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${dut1_to_dut2} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip6} | ${dut2_to_dut1_ip6} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${dut2_to_dut1} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip6} | ${dut1_to_dut2_ip6} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -102,22 +102,22 @@ | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup Topology And Lisp -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${lisp_if_idx}= | resources.libraries.python.InterfaceUtil.get sw if index | | ... | ${dut1_node} | ${lisp_gpe_int} -| | When VPP Setup IPsec Manual Keyed Connection +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${lisp_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip6} | ${dut2_to_dut1_ip6} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${lisp_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip6} | ${dut1_to_dut2_ip6} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -126,9 +126,9 @@ | Setup Topology And Lisp | | [Documentation] | Setup IPs and neighbors for interfaces on DUT1 and DUT2\ | | ... | and then setup LISP. -| | Path for 3-node testing is set +| | Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | Interfaces in 3-node path are up +| | Set interfaces in 3-node circular topology up | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} | | ... | ${prefix6} | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} @@ -148,7 +148,7 @@ | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4} | | ... | ${tg_to_dut1_mac} | | Vpp All RA Suppress Link Layer | ${nodes} -| | Set up LISP GPE topology +| | Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} diff --git a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot index c470b3c38e..66c8a58abc 100644 --- a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot @@ -38,14 +38,14 @@ | Variables | resources/test_data/lisp/ipv6_lispgpe_ipv6/ipv6_lispgpe_ipsec_ipv6.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Vpp All Ra Suppress Link Layer | ${nodes} | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Stop and Clear QEMU | ${nodes['DUT1']} | ${vm_node} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Stop and clear QEMU | ${nodes['DUT1']} | ${vm_node} +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *IPv6 - ip6-ipsec-lispgpe-ip6 - main fib, | ... | vrf (gpe_vni-to-vrf), phy2lisp, virt2lisp* @@ -90,26 +90,26 @@ | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup Topology | | And Setup Qemu DUT1 -| | And Set up LISP GPE topology +| | And Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} | | ... | ${dut1_to_dut2_ip6_static_adjacency} | | ... | ${dut2_to_dut1_ip6_static_adjacency} -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${dut1_to_dut2} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip6} | ${dut2_to_dut1_ip6} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${dut2_to_dut1} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip6} | ${dut1_to_dut2_ip6} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -131,7 +131,7 @@ | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup Topology | | And Setup Qemu DUT1 -| | And Set up LISP GPE topology +| | And Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -141,29 +141,29 @@ | | ... | ${dut1_node} | lisp_gpe0 | | ${lisp2_if_idx}= | resources.libraries.python.InterfaceUtil.get sw if index | | ... | ${dut2_node} | lisp_gpe0 -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${lisp1_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip6} | ${dut2_to_dut1_ip6} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${lisp2_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip6} | ${dut1_to_dut2_ip6} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} *** Keywords *** | Setup Topology -| | Path for 3-node testing is set +| | Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | Interfaces in 3-node path are up +| | Set interfaces in 3-node circular topology up | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} | | ... | ${prefix6} | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} @@ -194,11 +194,11 @@ | | Set Interface State | ${dut1_node} | ${vhost1} | up | | Set Interface State | ${dut1_node} | ${vhost2} | up | | Vpp RA Suppress Link Layer | ${dut1_node} | ${vhost2} -| | Bridge domain on DUT node is created | ${dut1_node} | ${bid} | learn=${TRUE} -| | Interface is added to bridge domain | ${dut1_node} +| | Create bridge domain | ${dut1_node} | ${bid} | learn=${TRUE} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${dut1_to_tg} | ${bid} | 0 -| | Interface is added to bridge domain | ${dut1_node} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${vhost1} | ${bid} | 0 | | ${vhost_mac}= | Get Vhost User Mac By SW Index | ${dut1_node} | ${vhost2} | | Set test variable | ${dst_vhost_mac} | ${vhost_mac} -| | VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1} | ${sock2} +| | Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1} | ${sock2} diff --git a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-func.robot b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-func.robot index 8475a68363..e68ecf550d 100644 --- a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-func.robot +++ b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-func.robot @@ -38,9 +38,9 @@ | Variables | resources/test_data/lisp/ipv6_lispgpe_ipv6/ipv6_lispgpe_ipsec_ipv6.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Vpp All Ra Suppress Link Layer | ${nodes} -| Test Teardown | Func Test Teardown +| Test Teardown | Tear down functional test | ... | Documentation | *IPv6 - ip6-ipsec-lispgpe-ip6 - main fib, | ... | vrf (gpe_vni-to-vrf), phy2lisp, virt2lisp* @@ -80,26 +80,26 @@ | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup Topology -| | And Set up LISP GPE topology +| | And Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} | | ... | ${dut1_to_dut2_ip6_static_adjacency} | | ... | ${dut2_to_dut1_ip6_static_adjacency} -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${dut1_to_dut2} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip6} | ${dut2_to_dut1_ip6} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${dut2_to_dut1} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip6} | ${dut1_to_dut2_ip6} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -120,7 +120,7 @@ | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup Topology -| | And Set up LISP GPE topology +| | And Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -128,29 +128,29 @@ | | ... | ${dut2_to_dut1_ip6_static_adjacency} | | ${lisp_if_idx}= | resources.libraries.python.InterfaceUtil.get sw if index | | ... | ${dut1_node} | lisp_gpe0 -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${lisp_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | ${tg1_ip6} | | ... | ${tg2_ip6} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${lisp_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | ${tg2_ip6} | | ... | ${tg1_ip6} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} *** Keywords *** | Setup Topology -| | Path for 3-node testing is set +| | Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | Interfaces in 3-node path are up +| | Set interfaces in 3-node circular topology up | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} | | ... | ${prefix6} | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} diff --git a/tests/func/lisp/eth2p-ethip6lisp-l2bdbasemaclrn-func.robot b/tests/func/lisp/eth2p-ethip6lisp-l2bdbasemaclrn-func.robot index 405aa65f72..af550b319b 100644 --- a/tests/func/lisp/eth2p-ethip6lisp-l2bdbasemaclrn-func.robot +++ b/tests/func/lisp/eth2p-ethip6lisp-l2bdbasemaclrn-func.robot @@ -29,8 +29,8 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | ... | Documentation | *l2-lispgpe-ip6 encapsulation test cases* | ... @@ -58,10 +58,10 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830. | | ... -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And IP addresses are set on interfaces +| | And Set interfaces in 3-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} | ${prefix6} | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip6} | ${prefix6} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_dut1_ip6} | ${prefix6} @@ -79,17 +79,17 @@ | | And Add Interface To L2 BD | ${dut1_node} | ${dut1_to_tg} | ${vpp_bd_id} | | And Create L2 BD | ${dut2_node} | ${vpp_bd_id} | | And Add Interface To L2 BD | ${dut2_node} | ${dut2_to_tg} | ${vpp_bd_id} -| | And Set up L2 Lisp on DUT | ${dut1_node} +| | And Configure L2 LISP on DUT | ${dut1_node} | | ... | ${dut1_to_dut2_ip6_static_adjacency} | | ... | ${lisp_dut_settings} -| | And Set up L2 Lisp on DUT | ${dut2_node} +| | And Configure L2 LISP on DUT | ${dut2_node} | | ... | ${dut2_to_dut1_ip6_static_adjacency} | | ... | ${lisp_dut_settings} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_if1_mac} | ${tg_if2_mac} | | ... | ${tg_to_dut2} | ${tg_if1_mac} | ${tg_if2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_if2_mac} | ${tg_if1_mac} | | ... | ${tg_to_dut1} | ${tg_if2_mac} | ${tg_if1_mac} diff --git a/tests/func/lisp/eth2p-ethip6lispgpe-ip4base-func.robot b/tests/func/lisp/eth2p-ethip6lispgpe-ip4base-func.robot index e47e8d2cc4..d44aabc0f2 100644 --- a/tests/func/lisp/eth2p-ethip6lispgpe-ip4base-func.robot +++ b/tests/func/lisp/eth2p-ethip6lispgpe-ip4base-func.robot @@ -24,8 +24,8 @@ | Variables | resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO | ... | VM_ENV | HW_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *LISP static adjacency test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ @@ -55,10 +55,10 @@ | | ... | [Cfg2] Reconf LISP. | | ... | [Ver2] Verify packets are received again via LISP tunnel. | | ... | [Ref] RFC6830. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And IP addresses are set on interfaces +| | And Set interfaces in 3-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | | ... | ${dut1_to_dut2_ip4o6} | ${dut_prefix4o6} | | ... | ${dut1_node} | ${dut1_to_tg} @@ -74,30 +74,30 @@ | | And Add Arp On Dut | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4o6} | | ... | ${tg_to_dut1_mac} | | And Vpp All RA Suppress Link Layer | ${nodes} -| | When Set up Lisp topology +| | When Configure LISP topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} | | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4o6} | ${tg2_ip4o6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4o6} | ${tg1_ip4o6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} -| | When Change Lisp Configuration | ${dut1_node} | ${dut2_node} +| | When Change LISP Configuration | ${dut1_node} | ${dut2_node} | | ... | ${dut1_to_dut2} | ${dut2_to_dut1} | ${dut1_to_dut2_mac} | | ... | ${dut2_to_dut1_mac} | ${dut1_to_dut2_ip4o6} | | ... | ${dut2_to_dut1_ip4o6_reconf} | ${dut_prefix4o6} | | ... | ${dut1_ip4o6_static_adjacency} | | ... | ${dut1_ip4o6_static_adjacency_reconf} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4o6} | ${tg2_ip4o6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4o6} | ${tg1_ip4o6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac}
\ No newline at end of file diff --git a/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot index ad85888aa7..b0c519f799 100644 --- a/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot @@ -31,14 +31,14 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Vpp All Ra Suppress Link Layer | ${nodes} | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Stop and Clear QEMU | ${nodes['DUT1']} | ${vm_node} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Stop and clear QEMU | ${nodes['DUT1']} | ${vm_node} +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *ip6-lispgpe-ip6 encapsulation test cases* | ... @@ -67,9 +67,9 @@ | | ... | DUTs and LISP GPE tunnel between them; verify IPv6 headers on\ | | ... | received packets are correct. | | ... -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If IPv6 Addr | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} | ${prefix6} | | And Vpp Set If IPv6 Addr @@ -80,18 +80,18 @@ | | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip6} | ${prefix6} | | And Add IP Neighbors | | And Vpp All RA Suppress Link Layer | ${nodes} -| | When Set up LISP GPE topology +| | When Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} | | ... | ${dut1_to_dut2_ip6_static_adjacency} | | ... | ${dut2_to_dut1_ip6_static_adjacency} | | And Setup Qemu DUT1 -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -112,14 +112,14 @@ | | ... | ${prefix6} | | Set Interface State | ${dut1_node} | ${vhost1} | up | | Set Interface State | ${dut1_node} | ${vhost2} | up -| | Bridge domain on DUT node is created | ${dut1_node} | ${bid} | learn=${TRUE} -| | Interface is added to bridge domain | ${dut1_node} +| | Create bridge domain | ${dut1_node} | ${bid} | learn=${TRUE} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${dut1_to_tg} | ${bid} | 0 -| | Interface is added to bridge domain | ${dut1_node} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${vhost1} | ${bid} | 0 | | ${vhost_mac}= | Get Vhost User Mac By SW Index | ${dut1_node} | ${vhost2} | | Set test variable | ${dst_vhost_mac} | ${vhost_mac} -| | VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1} | ${sock2} +| | Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1} | ${sock2} | Add IP Neighbors | | [Documentation] diff --git a/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-func.robot b/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-func.robot index ba81519e7b..73e66561d5 100644 --- a/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-func.robot +++ b/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-func.robot @@ -31,13 +31,13 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Vpp All Ra Suppress Link Layer | ${nodes} | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *ip6-lispgpe-ip6 encapsulation test cases* | ... @@ -67,9 +67,9 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830. | | ... -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If IPv6 Addr | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} | ${prefix6} | | And Vpp Set If IPv6 Addr @@ -80,17 +80,17 @@ | | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip6} | ${prefix6} | | And Add IP Neighbors | | And Vpp All RA Suppress Link Layer | ${nodes} -| | When Set up LISP GPE topology +| | When Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} | | ... | ${dut1_to_dut2_ip6_static_adjacency} | | ... | ${dut2_to_dut1_ip6_static_adjacency} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} diff --git a/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot index cda0254eba..1f409c98a0 100644 --- a/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot @@ -31,14 +31,14 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Vpp All Ra Suppress Link Layer | ${nodes} | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Stop and Clear QEMU | ${nodes['DUT1']} | ${vm_node} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Stop and clear QEMU | ${nodes['DUT1']} | ${vm_node} +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *ip6-lispgpe-ip6 encapsulation test cases* | ... @@ -69,9 +69,9 @@ | | ... | [Ref] RFC6830. | | ... | | ... -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table_1} | ipv6=${TRUE} | | And Assign Interface To Fib Table | ${dut2_node} @@ -86,7 +86,7 @@ | | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip6} | ${prefix6} | | And Add IP Neighbors | | And Vpp All RA Suppress Link Layer | ${nodes} -| | When Set up LISP GPE topology +| | When Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -94,11 +94,11 @@ | | ... | ${dut2_to_dut1_ip6_static_adjacency} | | ... | ${dut1_dut2_vni} | ${fib_table_1} | | And Setup Qemu DUT1 | ${fib_table_1} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -119,14 +119,14 @@ | | ... | ${prefix6} | | Set Interface State | ${dut1_node} | ${vhost1} | up | | Set Interface State | ${dut1_node} | ${vhost2} | up -| | Bridge domain on DUT node is created | ${dut1_node} | ${bid} | learn=${TRUE} -| | Interface is added to bridge domain | ${dut1_node} +| | Create bridge domain | ${dut1_node} | ${bid} | learn=${TRUE} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${dut1_to_tg} | ${bid} | 0 -| | Interface is added to bridge domain | ${dut1_node} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${vhost1} | ${bid} | 0 | | ${vhost_mac}= | Get Vhost User Mac By SW Index | ${dut1_node} | ${vhost2} | | Set test variable | ${dst_vhost_mac} | ${vhost_mac} -| | VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1} | ${sock2} +| | Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1} | ${sock2} | Add IP Neighbors | | [Documentation] diff --git a/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot b/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot index 1dd9969793..79503d8638 100644 --- a/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot +++ b/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot @@ -31,13 +31,13 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Vpp All Ra Suppress Link Layer | ${nodes} | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *ip6-lispgpe-ip6 encapsulation test cases* | ... @@ -67,9 +67,9 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830. | | ... -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table_1} | ipv6=${TRUE} | | And Assign Interface To Fib Table | ${dut2_node} @@ -84,18 +84,18 @@ | | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip6} | ${prefix6} | | And Add IP Neighbors | | And Vpp All RA Suppress Link Layer | ${nodes} -| | When Set up LISP GPE topology +| | When Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} | | ... | ${dut1_to_dut2_ip6_static_adjacency} | | ... | ${dut2_to_dut1_ip6_static_adjacency} | | ... | ${dut1_dut2_vni} | ${fib_table_1} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} diff --git a/tests/func/policer/eth2p-ethip4-ip4base-ipolicemarkbase-func.robot b/tests/func/policer/eth2p-ethip4-ip4base-ipolicemarkbase-func.robot index 4cb3686788..9992bb76a3 100644 --- a/tests/func/policer/eth2p-ethip4-ip4base-ipolicemarkbase-func.robot +++ b/tests/func/policer/eth2p-ethip4-ip4base-ipolicemarkbase-func.robot @@ -15,9 +15,9 @@ | Force Tags | 3_NODE_DOUBLE_LINK_TOPO | VM_ENV | HW_ENV | Resource | resources/libraries/robot/policer.robot | Library | resources.libraries.python.Trace -| Test Setup | Run Keywords | Func Test Setup -| ... | AND | Setup Topology for IPv4 policer testing -| Test Teardown | Func Test Teardown +| Test Setup | Run Keywords | Set up functional test +| ... | AND | Configure topology for IPv4 policer test +| Test Teardown | Tear down functional test | Documentation | *IPv4 policer test cases* | ... | ... | *[Top] Network topologies:* TG=DUT1 2-node topology with two links\ @@ -68,7 +68,7 @@ | | And Policer Classify Set Interface | ${dut_to_tg_if1} | | And Policer Classify Set Match IP | ${tg_to_dut_if1_ip} | | When Policer Set Configuration -| | Then Send Packet and Verify Marking | ${tg_node} | ${tg_to_dut_if1} +| | Then Send packet and verify marking | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} | | ... | ${tg_to_dut_if1_ip} | ${tg_to_dut_if2_ip} | ${dscp} @@ -98,7 +98,7 @@ | | And Policer Classify Set Interface | ${dut_to_tg_if1} | | And Policer Classify Set Match IP | ${tg_to_dut_if1_ip} | | When Policer Set Configuration -| | Then Send Packet and Verify Marking | ${tg_node} | ${tg_to_dut_if1} +| | Then Send packet and verify marking | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} | | ... | ${tg_to_dut_if1_ip} | ${tg_to_dut_if2_ip} | ${dscp} @@ -128,7 +128,7 @@ | | And Policer Classify Set Interface | ${dut_to_tg_if1} | | And Policer Classify Set Match IP | ${tg_to_dut_if1_ip} | | When Policer Set Configuration -| | Then Send Packet and Verify Marking | ${tg_node} | ${tg_to_dut_if1} +| | Then Send packet and verify marking | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} | | ... | ${tg_to_dut_if1_ip} | ${tg_to_dut_if2_ip} | ${dscp} @@ -157,6 +157,6 @@ | | And Policer Classify Set Interface | ${dut_to_tg_if1} | | And Policer Classify Set Match IP | ${tg_to_dut_if1_ip} | | When Policer Set Configuration -| | Then Send Packet and Verify Marking | ${tg_node} | ${tg_to_dut_if1} +| | Then Send packet and verify marking | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} | | ... | ${tg_to_dut_if1_ip} | ${tg_to_dut_if2_ip} | ${dscp}
\ No newline at end of file diff --git a/tests/func/policer/eth2p-ethip6-ip6base-ipolicemarkbase-func.robot b/tests/func/policer/eth2p-ethip6-ip6base-ipolicemarkbase-func.robot index 6a7ae1a306..958607eee4 100644 --- a/tests/func/policer/eth2p-ethip6-ip6base-ipolicemarkbase-func.robot +++ b/tests/func/policer/eth2p-ethip6-ip6base-ipolicemarkbase-func.robot @@ -15,9 +15,9 @@ | Force Tags | 3_NODE_DOUBLE_LINK_TOPO | VM_ENV | HW_ENV | Resource | resources/libraries/robot/policer.robot | Library | resources.libraries.python.Trace -| Test Setup | Run Keywords | Func Test Setup -| ... | AND | Setup Topology for IPv6 policer testing -| Test Teardown | Func Test Teardown +| Test Setup | Run Keywords | Set up functional test +| ... | AND | Configure topology for IPv6 policer test +| Test Teardown | Tear down functional test | Documentation | *IPv6 policer test cases* | ... | ... | *[Top] Network topologies:* TG=DUT1 2-node topology with two links\ @@ -68,7 +68,7 @@ | | And Policer Classify Set Interface | ${dut_to_tg_if1} | | And Policer Classify Set Match IP | ${tg_to_dut_if1_ip} | | When Policer Set Configuration -| | Then Send Packet and Verify Marking | ${tg_node} | ${tg_to_dut_if1} +| | Then Send packet and verify marking | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} | | ... | ${tg_to_dut_if1_ip} | ${tg_to_dut_if2_ip} | ${dscp} @@ -98,7 +98,7 @@ | | And Policer Classify Set Interface | ${dut_to_tg_if1} | | And Policer Classify Set Match IP | ${tg_to_dut_if1_ip} | | When Policer Set Configuration -| | Then Send Packet and Verify Marking | ${tg_node} | ${tg_to_dut_if1} +| | Then Send packet and verify marking | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} | | ... | ${tg_to_dut_if1_ip} | ${tg_to_dut_if2_ip} | ${dscp} @@ -128,7 +128,7 @@ | | And Policer Classify Set Interface | ${dut_to_tg_if1} | | And Policer Classify Set Match IP | ${tg_to_dut_if1_ip} | | When Policer Set Configuration -| | Then Send Packet and Verify Marking | ${tg_node} | ${tg_to_dut_if1} +| | Then Send packet and verify marking | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} | | ... | ${tg_to_dut_if1_ip} | ${tg_to_dut_if2_ip} | ${dscp} @@ -156,6 +156,6 @@ | | And Policer Classify Set Interface | ${dut_to_tg_if1} | | And Policer Classify Set Match IP | ${tg_to_dut_if1_ip} | | When Policer Set Configuration -| | Then Send Packet and Verify Marking | ${tg_node} | ${tg_to_dut_if1} +| | Then Send packet and verify marking | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} | | ... | ${tg_to_dut_if1_ip} | ${tg_to_dut_if2_ip} | ${dscp} diff --git a/tests/func/rpf/eth2p-ethip4-ip4base-rpf-func.robot b/tests/func/rpf/eth2p-ethip4-ip4base-rpf-func.robot index 372940dd82..5a704e83a0 100644 --- a/tests/func/rpf/eth2p-ethip4-ip4base-rpf-func.robot +++ b/tests/func/rpf/eth2p-ethip4-ip4base-rpf-func.robot @@ -21,8 +21,8 @@ | Resource | resources/libraries/robot/traffic.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *Source RPF check on IPv4 test cases* | ... | ... | *[Top] Network Topologies:* TG - DUT1 - DUT2 - TG @@ -51,9 +51,9 @@ | | ... | [Cfg] On DUT1 setup IP source check. | | ... | [Ver] Make TG verify matching packets which source address | | ... | is not in routes are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -70,27 +70,27 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${pass_test_src_ip} | ${prefix_length} | | ... | ${dut1_to_tg_ip_GW} | ${dut1_to_tg} | resolve_attempts=${NONE} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send Packet And Check Headers | ${tg_node} +| | Then Send packet and verify headers | ${tg_node} | | ... | ${pass_test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${drop_test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} | | ${dut1_to_tg_name}= | Get Interface Name | ${dut1_node} | ${dut1_to_tg} | | When VPP IP Source Check Setup | ${dut1_node} | ${dut1_to_tg_name} -| | Then Send Packet And Check Headers | ${tg_node} +| | Then Send packet and verify headers | ${tg_node} | | ... | ${pass_test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${dut1_to_tg_ip_GW} | ${test_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} -| | And Send packet from Port to Port should failed | ${tg_node} +| | And Packet transmission from port to port should fail | ${tg_node} | | ... | ${drop_test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} @@ -101,9 +101,9 @@ | | ... | [Cfg] On DUT1 setup IP source check. | | ... | [Ver] Make TG verify matching packets on non-enabled RPF interface | | ... | are passed. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -120,15 +120,15 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${pass_test_src_ip} | ${prefix_length} | | ... | ${dut1_to_tg_ip_GW} | ${dut1_to_tg} | resolve_attempts=${NONE} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | ${dut1_to_tg_name}= | Get Interface Name | ${dut1_node} | ${dut1_to_tg} | | When VPP IP Source Check Setup | ${dut1_node} | ${dut1_to_tg_name} -| | Then Send Packet And Check Headers | ${tg_node} +| | Then Send packet and verify headers | ${tg_node} | | ... | ${test_dst_ip} | ${pass_test_src_ip} | ${tg_to_dut2} | | ... | ${tg_to_dut2_mac} | ${dut1_to_dut2_mac} | ${tg_to_dut1} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${test_dst_ip} | ${dut1_to_tg_ip_GW} | ${tg_to_dut2} | | ... | ${tg_to_dut2_mac} | ${dut1_to_dut2_mac} | ${tg_to_dut1} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} diff --git a/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swirelw46-func.robot b/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swirelw46-func.robot index f96ee19b4e..3c98d4a67b 100644 --- a/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swirelw46-func.robot +++ b/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swirelw46-func.robot @@ -19,8 +19,8 @@ | Resource | resources/libraries/robot/map.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *Lightweight 4 over 6 test cases* | ... | ... | LW4o6 is a subset of MAP-E, with per-subscriber rules. It uses the @@ -70,10 +70,10 @@ | | ... | IPv4oIPv6 encapsulated packet is correct. | | ... | [Ref] RFC7596 RFC7597 | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | And IP addresses are set on interfaces +| | And Set interfaces in 2-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len} | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len} | | And Add IP Neighbor @@ -107,10 +107,10 @@ TC02: Encapsulate IPv4 ICMP into IPv6. IPv6 dst depends on IPv4 addr and ICMP ID | | ... | destination based on ICMP Identifier field. | | ... | [Ref] RFC7596 section 8.1 | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | And IP addresses are set on interfaces +| | And Set interfaces in 2-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len} | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len} | | And Add IP Neighbor @@ -142,10 +142,10 @@ TC03: Decapsulate IPv4 UDP from IPv6. | | ... | IPv4 non-encapsulated packet is correct. | | ... | [Ref] RFC7596 RFC7597 | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | And IP addresses are set on interfaces +| | And Set interfaces in 2-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len} | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len} | | And Add Arp on DUT @@ -176,10 +176,10 @@ TC04: Hairpinning of traffic between two lwB4 | | ... | encapsulated packet is correct. | | ... | [Ref] RFC7596 RFC7597 | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | And IP addresses are set on interfaces +| | And Set interfaces in 2-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len} | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len} | | And Add IP Neighbor diff --git a/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot b/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot index 2773980807..c509d5d0cd 100644 --- a/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot +++ b/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot @@ -22,8 +22,8 @@ | Library | resources.libraries.python.Trace | Variables | resources/test_data/softwire/map_e_domains.py | ${5} | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *Test for Basic mapping rule for MAP-E*\ | ... | *[Top] Network Topologies:* TG - DUT1 - TG with two links between the | ... | nodes. @@ -71,7 +71,7 @@ # TODO: replace setup when VPP-312 fixed #| | [Setup] | Set Interfaces IP Addresses And Routes | | [Setup] | Run Keywords -| | ... | Func Test Setup | AND +| | ... | Set up functional test | AND | | ... | Set Interfaces IP Addresses And Routes | | [Template] | Check MAP Configuration With Traffic Script # |=================|===============|================|============|=============|==========|================|==========|==================================| @@ -108,7 +108,7 @@ # TODO: replace setup when VPP-312 fixed #| | [Setup] | Set Interfaces IP Addresses And Routes | | [Setup] | Run Keywords -| | ... | Func Test Setup | AND +| | ... | Set up functional test | AND | | ... | Set Interfaces IP Addresses And Routes | | [Template] | Check MAP Configuration With Traffic Script # |===================|===============|================|============|=============|==========|================|==========|==================================| @@ -148,7 +148,7 @@ # TODO: replace setup when VPP-312 fixed #| | [Setup] | Set Interfaces IP Addresses And Routes | | [Setup] | Run Keywords -| | ... | Func Test Setup | AND +| | ... | Set up functional test | AND | | ... | Set Interfaces IP Addresses And Routes | | [Template] | Check MAP Configuration With Traffic Script # |===================|===============|================|============|=============|==========|================|==========|===================================| @@ -206,7 +206,7 @@ # TODO: replace setup when VPP-312 fixed #| | [Setup] | Set Interfaces IP Addresses And Routes | | [Setup] | Run Keywords -| | ... | Func Test Setup | AND +| | ... | Set up functional test | AND | | ... | Set Interfaces IP Addresses And Routes | | [Template] | Check MAP Configuration With Traffic Script # |===================|=========================|================|============|=============|==========|================|==========| @@ -223,7 +223,7 @@ # TODO: replace setup when VPP-312 fixed #| | [Setup] | Set Interfaces IP Addresses And Routes | | [Setup] | Run Keywords -| | ... | Func Test Setup | AND +| | ... | Set up functional test | AND | | ... | Set Interfaces IP Addresses And Routes | | [Template] | Check MAP Configuration With Traffic Script # |===================|=========================|================|============|=============|==========|================|==========| @@ -244,10 +244,10 @@ | | ... | [Ver] Send IPv4 to destination in configured domain and receive IPv6\ | | ... | packet. | | ... | [Ref] RFC7597. -| | Given Path For 2-node Testing Is Set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces In 2-node Path Are Up -| | And IP Addresses Are Set On Interfaces +| | And Set interfaces in 2-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len} | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len} | | And Vpp Route Add | ${dut_node} | :: | 0 | ${dut_ip6_gw} @@ -284,10 +284,10 @@ | | ... | [Ver] Send IPv4 encapsulated in IPv6. Source and destination are from\ | | ... | configured domains. Check if VPP translate IPv6 addresses. | | ... | [Ref] RFC7597. -| | Given Path For 2-node Testing Is Set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces In 2-node Path Are Up -| | And IP Addresses Are Set On Interfaces +| | And Set interfaces in 2-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len} | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len} | | And Vpp Route Add | ${dut_node} | :: | 0 | ${dut_ip6_gw} @@ -330,10 +330,10 @@ | | ... | IPv4oIPv6 encapsulated packet is correct. Checks IPv6 destination\ | | ... | based on ICMP Identifier field. | | ... | [Ref] RFC7597 section 8.2. -| | Given Path For 2-node Testing Is Set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces In 2-node Path Are Up -| | And IP Addresses Are Set On Interfaces +| | And Set interfaces in 2-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len} | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len} | | And Vpp Route Add | ${dut_node} | :: | 0 | ${dut_ip6_gw} @@ -366,10 +366,10 @@ | | ... | [Ver] FIB is not in broken state. The steps are add route, \ | | ... | check with traffic then add same route | | ... | again and check with traffic script. -| | Given Path For 2-node Testing Is Set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces In 2-node Path Are Up -| | When IP Addresses Are Set On Interfaces +| | And Set interfaces in 2-node circular topology up +| | When Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len} | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len} | | And Vpp Route Add | ${dut_node} | 2001:: | 16 | ${dut_ip6_gw} @@ -383,7 +383,7 @@ | | Then Check MAP Configuration With Traffic Script | | ... | 20.0.0.0/8 | 2001::/16 | ${ipv6_br_src} | ${48} | ${6} | ${8} | | ... | 20.169.201.219 | ${1232} | 2001:a9c9:db34::14a9:c9db:34 -| | When IP Addresses Are Set On Interfaces +| | When Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len} | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len} | | And Vpp Route Add | ${dut_node} | 2001:: | 16 | ${dut_ip6_gw} @@ -402,10 +402,10 @@ | Bug: VPP-318 | | [Tags] | EXPECTED_FAILING | | [Documentation] | qlen < psid length -| | Given Path For 2-node Testing Is Set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces In 2-node Path Are Up -| | And IP Addresses Are Set On Interfaces +| | And Set interfaces in 2-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len} | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len} | | Then Run Keyword And Expect Error | Unable to add map domain * @@ -415,10 +415,10 @@ *** Keywords *** | Set Interfaces IP Addresses And Routes -| | Path For 2-node Testing Is Set +| | Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | Interfaces In 2-node Path Are Up -| | IP Addresses Are Set On Interfaces +| | Set interfaces in 2-node circular topology up +| | Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len} | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len} | | Vpp Route Add | ${dut_node} | :: | 0 | ${dut_ip6_gw} | ${dut_to_tg_if2} @@ -463,7 +463,7 @@ | | ... | Map Del Domain | ${dut_node} | ${domain_index} | AND | | ... | Show Packet Trace On All DUTs | ${nodes} | AND | | ... | Clear Packet Trace On All DUTs | ${nodes} | AND -| | ... | Check VPP PID in Teardown +| | ... | Verify VPP PID in Teardown | Check Encapsulation With Traffic Script | | [Arguments] | ${ipv4_dst} | ${dst_port} | ${ipv6_dst} diff --git a/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremapt-func.robot b/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremapt-func.robot index 2223cd61f9..d3550bcac3 100644 --- a/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremapt-func.robot +++ b/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremapt-func.robot @@ -21,9 +21,9 @@ | Library | resources.libraries.python.IPUtil | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Set interfaces IP addresses and routes -| Test Teardown | Func Test Teardown +| Test Teardown | Tear down functional test | Documentation | *Test for Basic mapping rule for MAP-T*\ | ... | *[Top] Network Topologies:* TG - DUT1 - TG with two links between the | ... | nodes. @@ -78,10 +78,10 @@ *** Keywords *** | Set interfaces IP addresses and routes -| | Path for 2-node testing is set +| | Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | Interfaces in 2-node path are up -| | IP addresses are set on interfaces +| | Set interfaces in 2-node circular topology up +| | Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len} | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len} | | Vpp Route Add | ${dut_node} | :: | 0 | ${dut_ip6_gw} | ${dut_to_tg_if2} @@ -132,4 +132,4 @@ | | ... | Map Del Domain | ${dut_node} | ${domain_index} | AND | | ... | Show packet trace on all DUTs | ${nodes} | AND | | ... | Clear packet trace on all DUTs | ${nodes} | AND -| | ... | Check VPP PID in Teardown +| | ... | Verify VPP PID in Teardown diff --git a/tests/func/tap/api-crud-tap-func.robot b/tests/func/tap/api-crud-tap-func.robot index 762c4e3df2..99014a9583 100644 --- a/tests/func/tap/api-crud-tap-func.robot +++ b/tests/func/tap/api-crud-tap-func.robot @@ -24,9 +24,9 @@ | Library | resources.libraries.python.Namespaces | Library | resources.libraries.python.IPUtil | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Clean Up Namespaces | ${nodes['DUT1']} -| Test Teardown | Run Keywords | Func Test Teardown +| Test Teardown | Run Keywords | Tear down functional test | ... | AND | Clean Up Namespaces | ${nodes['DUT1']} | Documentation | *Tap Interface CRUD Tests* | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links @@ -49,9 +49,9 @@ | | ... | [Cfg] Set two TAP interfaces. | | ... | [Ver] Verify that TAP interface can be modified, deleted, and no other | | ... | TAP interface is affected. -| | Given Path for 2-node testing is set | ${nodes['TG']} | ${nodes['DUT1']} +| | Given Configure path in 2-node circular topology | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | ${int1}= | And Add Tap Interface | ${dut_node} | ${tap_int1} | | ${int2}= | And Add Tap Interface | ${dut_node} | ${tap_int2} | | And Set Interface State | ${dut_node} | ${int1} | up diff --git a/tests/func/tap/eth2p-eth-l2bdbasemaclrn-eth-2tap-func.robot b/tests/func/tap/eth2p-eth-l2bdbasemaclrn-eth-2tap-func.robot index 64284e5faf..f7d267f272 100644 --- a/tests/func/tap/eth2p-eth-l2bdbasemaclrn-eth-2tap-func.robot +++ b/tests/func/tap/eth2p-eth-l2bdbasemaclrn-eth-2tap-func.robot @@ -24,9 +24,9 @@ | Library | resources.libraries.python.Namespaces | Library | resources.libraries.python.IPUtil | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Clean Up Namespaces | ${nodes['DUT1']} -| Test Teardown | Run Keywords | Func Test Teardown +| Test Teardown | Run Keywords | Tear down functional test | ... | AND | Linux Del Bridge | ${nodes['DUT1']} | ${bid_TAP} | ... | AND | Clean Up Namespaces | ${nodes['DUT1']} | Documentation | *Tap Interface Traffic Tests* @@ -62,26 +62,26 @@ | | ... | [Ver] Packet sent from TG is passed through all L2BD and received | | ... | back on TG. Then src_ip, dst_ip and MAC are checked. | | ... -| | Given Path for 2-node testing is set | ${nodes['TG']} | ${nodes['DUT1']} +| | Given Configure path in 2-node circular topology | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | ${int1}= | And Add Tap Interface | ${dut_node} | ${tap_int1} | | ${int2}= | And Add Tap Interface | ${dut_node} | ${tap_int2} | | And Set Interface State | ${dut_node} | ${int1} | up | | And Set Interface State | ${dut_node} | ${int2} | up -| | And Bridge domain on DUT node is created | ${dut_node} +| | And Create bridge domain | ${dut_node} | | ... | ${bid_from_TG} | learn=${TRUE} -| | And Bridge domain on DUT node is created | ${dut_node} +| | And Create bridge domain | ${dut_node} | | ... | ${bid_to_TG} | learn=${TRUE} | | And Linux Add Bridge | ${dut_node} | | ... | ${bid_TAP} | ${tap_int1} | ${tap_int2} -| | And Interface is added to bridge domain | ${dut_node} +| | And Add interface to bridge domain | ${dut_node} | | ... | ${int1} | ${bid_to_TG} | 0 -| | And Interface is added to bridge domain | ${dut_node} +| | And Add interface to bridge domain | ${dut_node} | | ... | ${dut_to_tg_if1} | ${bid_to_TG} | 0 -| | And Interface is added to bridge domain | ${dut_node} +| | And Add interface to bridge domain | ${dut_node} | | ... | ${int2} | ${bid_from_TG} | 0 -| | And Interface is added to bridge domain | ${dut_node} +| | And Add interface to bridge domain | ${dut_node} | | ... | ${dut_to_tg_if2} | ${bid_from_TG} | 0 -| | Then Send and receive ICMP Packet | ${tg_node} +| | Then Send ICMP packet and verify received packet | ${tg_node} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if2} diff --git a/tests/func/tap/eth2p-eth-l2bdbasemaclrn-l2shg-eth-2tap-func.robot b/tests/func/tap/eth2p-eth-l2bdbasemaclrn-l2shg-eth-2tap-func.robot index 8620dd05fd..8b3d25d051 100644 --- a/tests/func/tap/eth2p-eth-l2bdbasemaclrn-l2shg-eth-2tap-func.robot +++ b/tests/func/tap/eth2p-eth-l2bdbasemaclrn-l2shg-eth-2tap-func.robot @@ -24,9 +24,9 @@ | Library | resources.libraries.python.Namespaces | Library | resources.libraries.python.IPUtil | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Clean Up Namespaces | ${nodes['DUT1']} -| Test Teardown | Run Keywords | Func Test Teardown +| Test Teardown | Run Keywords | Tear down functional test | ... | AND | Clean Up Namespaces | ${nodes['DUT1']} | Documentation | *Tap Interface Traffic Tests* | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links @@ -73,9 +73,9 @@ | | ... | and assign two linux-TAP interfaces to it respectively. | | ... | [Ver] Packet is sent from TG to both linux-TAP interfaces and reply | | ... | is checked. Ping from First linux-TAP to another should pass. -| | Given Path for 2-node testing is set | ${nodes['TG']} | ${nodes['DUT1']} +| | Given Configure path in 2-node circular topology | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | ${int1}= | And Add Tap Interface | ${dut_node} | ${tap_int1} | | ${int2}= | And Add Tap Interface | ${dut_node} | ${tap_int2} | | And Set Interface State | ${dut_node} | ${int1} | up @@ -98,18 +98,18 @@ | | ... | ${tg_ip_address_SHG} | ${tg_to_dut_if1_mac} | ${namespace1} | | And Set Linux Interface ARP | ${dut_node} | ${tap_int2} | | ... | ${tg_ip_address_SHG} | ${tg_to_dut_if1_mac} | ${namespace2} -| | And Bridge domain on DUT node is created | ${dut_node} +| | And Create bridge domain | ${dut_node} | | ... | ${bd_id1} | learn=${TRUE} -| | And Interface is added to bridge domain | ${dut_node} | ${dut_to_tg_if1} +| | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if1} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${int1} +| | And Add interface to bridge domain | ${dut_node} | ${int1} | | ... | ${bd_id1} | ${shg1} -| | And Interface is added to bridge domain | ${dut_node} | ${int2} +| | And Add interface to bridge domain | ${dut_node} | ${int2} | | ... | ${bd_id1} | ${shg2} -| | Then Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut_if1} +| | Then Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tap1_NM_mac} | ${tg_to_dut_if1_mac} | | ... | ${tap1_NM_ip} | ${tg_ip_address_SHG} -| | And Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut_if1} +| | And Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tap2_NM_mac} | ${tg_to_dut_if1_mac} | | ... | ${tap2_NM_SHG} | ${tg_ip_address_SHG} | | And Send Ping From Node To Dst | ${dut_node} | ${tap1_NM_ip} | namespace=${namespace2} @@ -125,9 +125,9 @@ | | ... | and assign two linux-TAP interfaces to it respectively. | | ... | [Ver] Packet is sent from TG to both linux-TAP interfaces and reply | | ... | is checked. Ping from First linux-TAP to another should fail. -| | Given Path for 2-node testing is set | ${nodes['TG']} | ${nodes['DUT1']} +| | Given Configure path in 2-node circular topology | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | ${int1}= | And Add Tap Interface | ${dut_node} | ${tap_int1} | | ${int2}= | And Add Tap Interface | ${dut_node} | ${tap_int2} | | And Set Interface State | ${dut_node} | ${int1} | up @@ -150,18 +150,18 @@ | | ... | ${tg_ip_address_SHG} | ${tg_to_dut_if1_mac} | ${namespace1} | | And Set Linux Interface ARP | ${dut_node} | ${tap_int2} | | ... | ${tg_ip_address_SHG} | ${tg_to_dut_if1_mac} | ${namespace2} -| | And Bridge domain on DUT node is created | ${dut_node} +| | And Create bridge domain | ${dut_node} | | ... | ${bd_id1} | learn=${TRUE} -| | And Interface is added to bridge domain | ${dut_node} | ${dut_to_tg_if1} +| | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if1} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${int1} +| | And Add interface to bridge domain | ${dut_node} | ${int1} | | ... | ${bd_id1} | ${shg1} -| | And Interface is added to bridge domain | ${dut_node} | ${int2} +| | And Add interface to bridge domain | ${dut_node} | ${int2} | | ... | ${bd_id1} | ${shg1} -| | Then Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut_if1} +| | Then Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tap1_NM_mac} | ${tg_to_dut_if1_mac} | | ... | ${tap1_NM_ip} | ${tg_ip_address_SHG} -| | And Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut_if1} +| | And Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tap2_NM_mac} | ${tg_to_dut_if1_mac} | | ... | ${tap2_NM_SHG} | ${tg_ip_address_SHG} | | And Run Keyword And Expect Error | Ping Not Successful | Send Ping From Node To Dst diff --git a/tests/func/tap/eth2p-ethip4-ip4base-eth-1tap-func.robot b/tests/func/tap/eth2p-ethip4-ip4base-eth-1tap-func.robot index bd767e704c..7b84a00028 100644 --- a/tests/func/tap/eth2p-ethip4-ip4base-eth-1tap-func.robot +++ b/tests/func/tap/eth2p-ethip4-ip4base-eth-1tap-func.robot @@ -24,9 +24,9 @@ | Library | resources.libraries.python.Namespaces | Library | resources.libraries.python.IPUtil | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Clean Up Namespaces | ${nodes['DUT1']} -| Test Teardown | Run Keywords | Func Test Teardown +| Test Teardown | Run Keywords | Tear down functional test | ... | AND | Clean Up Namespaces | ${nodes['DUT1']} | Documentation | *Tap Interface Traffic Tests* | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links @@ -65,9 +65,9 @@ | | ... | and one is linux-TAP. | | ... | [Ver] Packet sent from TG gets to the destination and ICMP-reply is | | ... | received on TG. -| | Given Path for 2-node testing is set | ${nodes['TG']} | ${nodes['DUT1']} +| | Given Configure path in 2-node circular topology | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | ${int1}= | And Add Tap Interface | ${dut_node} | ${tap_int1} | | | And Set Interface Address | | ... | ${dut_node} | ${int1} | ${tap1_VPP_ip} | ${prefix} @@ -83,7 +83,7 @@ | | ... | ${tg_ip_address} | ${tg_to_dut_if1_mac} | |Â And Add Arp On Dut | ${dut_node} | ${int1} | | ... | ${tap1_NM_ip} | ${tap1_NM_mac} -| | Then Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut_if1} +| | Then Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut_if1} | | ... | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac} | | ... | ${tap1_NM_ip} | ${tg_ip_address} @@ -96,9 +96,9 @@ | | ... | and one is linux-TAP in namespace. | | ... | [Ver] Packet sent from TG gets to the destination and ICMP-reply is | | ... | received on TG. -| | Given Path for 2-node testing is set | ${nodes['TG']} | ${nodes['DUT1']} +| | Given Configure path in 2-node circular topology | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | ${int1}= | And Add Tap Interface | ${dut_node} | ${tap_int1} | | | And Set Interface Address | | ... | ${dut_node} | ${int1} | ${tap1_VPP_ip} | ${prefix} @@ -118,6 +118,6 @@ | | ... | ${tap1_NM_ip} | ${tap1_NM_mac} | | And Add Route | ${dut_node} | | ... | ${tg_ip_address_GW} | ${prefix} | ${tap1_VPP_ip} | ${namespace1} -| | Then Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut_if1} +| | Then Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut_if1} | | ... | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac} | | ... | ${tap1_NM_ip} | ${tg_ip_address} diff --git a/tests/func/telemetry/ipfix/eth2p-ethip4-ip4base-ip4ipfixbase-func.robot b/tests/func/telemetry/ipfix/eth2p-ethip4-ip4base-ip4ipfixbase-func.robot index 3313f3e399..e5ec8dce9a 100644 --- a/tests/func/telemetry/ipfix/eth2p-ethip4-ip4base-ip4ipfixbase-func.robot +++ b/tests/func/telemetry/ipfix/eth2p-ethip4-ip4base-ip4ipfixbase-func.robot @@ -22,8 +22,8 @@ | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO | EXPECTED_FAILING -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *IPFIX ipv4 test cases* | ... | ... | IPFIX tests use 3-node topology TG - DUT1 - DUT2 - TG with @@ -49,9 +49,9 @@ | | ... | [Ver] Make TG listen for IPFIX template and data packets, verify | | ... | that packet is received and correct. No packets are sent from TG. | | ... | [Ref] RFC 7011 -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Add ARP on DUT | ${dut1_node} | ${dut1_to_tg} | ${tg_to_dut1_ip} @@ -79,9 +79,9 @@ | | ... | [Ver] Make TG send a packet to DUT1, then listen for IPFIX template | | ... | and data packets, verify that IPFIX reported the received packet. | | ... | [Ref] RFC 7011 -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Add ARP on DUT | ${dut1_node} | ${dut1_to_tg} | ${tg_to_dut1_ip} @@ -109,9 +109,9 @@ | | ... | [Ver] Make TG send a packet to DUT1, then listen for IPFIX template | | ... | and data packets, verify that IPFIX reported the received packet. | | ... | [Ref] RFC 7011 -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Add ARP on DUT | ${dut1_node} | ${dut1_to_tg} | ${tg_to_dut1_ip} @@ -140,9 +140,9 @@ | | ... | for IPFIX template and data packets, verify that IPFIX reported | | ... | the received packet. | | ... | [Ref] RFC 7011 -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Add ARP on DUT | ${dut1_node} | ${dut1_to_tg} | ${tg_to_dut1_ip} @@ -173,9 +173,9 @@ | | ... | [Ver] Make TG send a packet to DUT1, then listen for IPFIX template | | ... | and data packets, verify that IPFIX reported the received packet. | | ... | [Ref] RFC 7011 -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Add ARP on DUT | ${dut1_node} | ${dut1_to_tg} | ${tg_to_dut1_ip} diff --git a/tests/func/telemetry/ipfix/eth2p-ethip4-ip4base-ip4ipfixscale-func.robot b/tests/func/telemetry/ipfix/eth2p-ethip4-ip4base-ip4ipfixscale-func.robot index ef2cdf3997..cfa67ee53e 100644 --- a/tests/func/telemetry/ipfix/eth2p-ethip4-ip4base-ip4ipfixscale-func.robot +++ b/tests/func/telemetry/ipfix/eth2p-ethip4-ip4base-ip4ipfixscale-func.robot @@ -23,8 +23,8 @@ | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO | EXPECTED_FAILING | ... | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *IPFIX ipv4 test cases* | ... | ... | IPFIX tests use 3-node topology TG - DUT1 - DUT2 - TG with @@ -49,9 +49,9 @@ | | ... | [Ver] Make TG send packets to DUT1, then listen for IPFIX template | | ... | and data packets, verify that IPFIX reported the received packets. | | ... | [Ref] RFC 7011 -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Add ARP on DUT | ${dut1_node} | ${dut1_to_tg} | ${tg_to_dut1_ip} @@ -81,9 +81,9 @@ | | ... | configured sessions, then listen for IPFIX template and data packets, | | ... | verify that IPFIX reported the received packets for each session. | | ... | [Ref] RFC 7011 -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Add ARP on DUT | ${dut1_node} | ${dut1_to_tg} | ${tg_to_dut1_ip} diff --git a/tests/func/telemetry/ipfix/eth2p-ethip6-ip6base-ip6ipfixbase-func.robot b/tests/func/telemetry/ipfix/eth2p-ethip6-ip6base-ip6ipfixbase-func.robot index 7e92174ac7..8557c234d5 100644 --- a/tests/func/telemetry/ipfix/eth2p-ethip6-ip6base-ip6ipfixbase-func.robot +++ b/tests/func/telemetry/ipfix/eth2p-ethip6-ip6base-ip6ipfixbase-func.robot @@ -24,8 +24,8 @@ | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO | EXPECTED_FAILING # TODO: Remove EXPECTED_FAILING tag once functionality is implemented (VPP-204) -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *IPFIX ipv6 test cases* | ... | ... | IPFIX tests use 3-node topology TG - DUT1 - DUT2 - TG with @@ -55,9 +55,9 @@ | | ... | [Ver] Make TG send a packet to DUT1, then listen for IPFIX template | | ... | and data packets, verify that IPFIX reported the received packet. | | ... | [Ref] RFC 7011 -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -90,9 +90,9 @@ | | ... | [Ver] Make TG send a packet to DUT1, then listen for IPFIX template | | ... | and data packets, verify that IPFIX reported the received packet. | | ... | [Ref] RFC 7011 -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -126,9 +126,9 @@ | | ... | for IPFIX template and data packets, verify that IPFIX reported | | ... | the received packet. | | ... | [Ref] RFC 7011 -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -165,9 +165,9 @@ | | ... | [Ver] Make TG send a packet to DUT1, then listen for IPFIX template | | ... | and data packets, verify that IPFIX reported the received packet. | | ... | [Ref] RFC 7011 -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} diff --git a/tests/func/telemetry/ipfix/eth2p-ethip6-ip6base-ip6ipfixscale-func.robot b/tests/func/telemetry/ipfix/eth2p-ethip6-ip6base-ip6ipfixscale-func.robot index e3a0bc1f4a..ee5caef306 100644 --- a/tests/func/telemetry/ipfix/eth2p-ethip6-ip6base-ip6ipfixscale-func.robot +++ b/tests/func/telemetry/ipfix/eth2p-ethip6-ip6base-ip6ipfixscale-func.robot @@ -25,8 +25,8 @@ | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO | EXPECTED_FAILING | ... | SKIP_VPP_PATCH # TODO: Remove EXPECTED_FAILING tag once functionality is implemented (VPP-204) -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *IPFIX ipv6 test cases* | ... | ... | IPFIX tests use 3-node topology TG - DUT1 - DUT2 - TG with @@ -55,9 +55,9 @@ | | ... | [Ver] Make TG send packets to DUT1, then listen for IPFIX template | | ... | and data packets, verify that IPFIX reported the received packets. | | ... | [Ref] RFC 7011 -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -92,9 +92,9 @@ | | ... | configured sessions, then listen for IPFIX template and data packets, | | ... | verify that IPFIX reported the received packets for each session. | | ... | [Ref] RFC 7011 -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} diff --git a/tests/func/telemetry/span/eth2p-ethip4-ip4base-spanrx-func.robot b/tests/func/telemetry/span/eth2p-ethip4-ip4base-spanrx-func.robot index d8668835e7..b7929493a5 100644 --- a/tests/func/telemetry/span/eth2p-ethip4-ip4base-spanrx-func.robot +++ b/tests/func/telemetry/span/eth2p-ethip4-ip4base-spanrx-func.robot @@ -20,8 +20,8 @@ | Library | resources.libraries.python.IPv4Setup | Library | resources.libraries.python.telemetry.SPAN | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *SPAN test suite* | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two | ... | links between nodes. @@ -46,9 +46,9 @@ | | ... | [Ver] Make TG send an ARP packet to DUT through one interface,\ | | ... | then receive a copy of sent packet and of DUT's ARP reply\ | | ... | on the second interface. -| | Given Path For 2-node Testing Is Set | ${nodes['TG']} | ${nodes['DUT1']} +| | Given Configure path in 2-node circular topology | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['TG']} -| | And Interfaces In 2-node Path Are Up +| | And Set interfaces in 2-node circular topology up | | And Set interface Address | ${dut_node} | ${dut_to_tg_if1} | | ... | ${dut_to_tg_if1_ip4} | ${prefix} | | And Set SPAN Mirroring | ${dut_node} | ${dut_to_tg_if1} | ${dut_to_tg_if2} @@ -65,9 +65,9 @@ | | ... | [Ver] Make TG send an ICMP packet to DUT through one interface,\ | | ... | then receive a copy of sent packet and of DUT's ICMP reply\ | | ... | on the other interface. -| | Given Path For 2-node Testing Is Set | ${nodes['TG']} | ${nodes['DUT1']} +| | Given Configure path in 2-node circular topology | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['TG']} -| | And Interfaces In 2-node Path Are Up +| | And Set interfaces in 2-node circular topology up | | And Set interface Address | ${dut_node} | ${dut_to_tg_if1} | | ... | ${dut_to_tg_if1_ip4} | ${prefix} | | And Add ARP on DUT | ${dut_node} | ${dut_to_tg_if1} | ${tg_to_dut_if1_ip4} diff --git a/tests/func/telemetry/span/eth2p-ethip6-ip6base-spanrx-func.robot b/tests/func/telemetry/span/eth2p-ethip6-ip6base-spanrx-func.robot index e3acc0362a..1d98bdf722 100644 --- a/tests/func/telemetry/span/eth2p-ethip6-ip6base-spanrx-func.robot +++ b/tests/func/telemetry/span/eth2p-ethip6-ip6base-spanrx-func.robot @@ -21,8 +21,8 @@ | Library | resources.libraries.python.Routing | Library | resources.libraries.python.telemetry.SPAN | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *SPAN test suite* | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two | ... | links between nodes. @@ -47,9 +47,9 @@ | | ... | [Ver] Make TG send an ICMP packet to DUT through one interface,\ | | ... | then receive a copy of sent packet and of DUT's ICMP reply\ | | ... | on the other interface. -| | Given Path For 2-node Testing Is Set | ${nodes['TG']} | ${nodes['DUT1']} +| | Given Configure path in 2-node circular topology | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['TG']} -| | And Interfaces In 2-node Path Are Up +| | And Set interfaces in 2-node circular topology up | | And Vpp Ra Suppress Link Layer | ${dut_node} | ${dut_to_tg_if1} | | And Vpp Set If Ipv6 Addr | ${dut_node} | ${dut_to_tg_if1} | | ... | ${dut_to_tg_if1_ip6} | ${prefix} diff --git a/tests/func/vhost/eth2p-ethip4-l2bdbase-vhost-client-reconnect-2vm-func.robot b/tests/func/vhost/eth2p-ethip4-l2bdbase-vhost-client-reconnect-2vm-func.robot index c235212048..7ac0ec698e 100644 --- a/tests/func/vhost/eth2p-ethip4-l2bdbase-vhost-client-reconnect-2vm-func.robot +++ b/tests/func/vhost/eth2p-ethip4-l2bdbase-vhost-client-reconnect-2vm-func.robot @@ -19,10 +19,10 @@ | Resource | resources/libraries/robot/vxlan.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | VPP_VM_ENV -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | Test Teardown | Run Keywords | ... | resources.libraries.python.QemuUtils.Qemu Kill All | ${dut_node} | AND -| ... | Func Test Teardown +| ... | Tear down functional test | Documentation | *Vhost-User Interface Traffic Tests* | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links | ... | between nodes. @@ -51,9 +51,9 @@ *** Test Cases *** | TC01: Qemu reconnects to VPPs vhost-user when Qemu is killed and restarted -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | And Set Interface Address | ${dut_node} | ${dut_to_tg_if1} | ${dut_if1_ip} | | ... | ${prefix_length} | | And Add IP Neighbor | ${dut_node} | ${dut_to_tg_if1} | ${tg_if1_ip} @@ -90,9 +90,9 @@ | | ... | ${vhost_if3} | | And Vpp Add L2 Bridge Domain | ${dut_node} | ${104} | ${vxlan4} | | ... | ${vhost_if4} -| | And Setup QEMU Vhost and Run VM | ${dut_node} | ${sock_vm1_1} | ${sock_vm1_2} +| | And Configure QEMU vhost and run it VM | ${dut_node} | ${sock_vm1_1} | ${sock_vm1_2} | | ... | ${1} -| | And Setup QEMU Vhost and Run VM | ${dut_node} | ${sock_vm2_1} | ${sock_vm2_2} +| | And Configure QEMU vhost and run it VM | ${dut_node} | ${sock_vm2_1} | ${sock_vm2_2} | | ... | ${2} | | And Check traffic through VM | | When Run keyword | qemu-1.Qemu Kill @@ -107,13 +107,13 @@ | | Then Check traffic through VM -| TC02: VPP reconnects to Qemu vhost-user when VPP is restarted and reconfigured +| TC02: VPP reconnects to Qemu vhost-user when Restart VPP and reconfigured | | [Tags] | EXPECTED_FAILING | | [Documentation] | | ... | *Failing:* Qemu doesn't support reconnect prior to version 2.7. -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | And Set Interface Address | ${dut_node} | ${dut_to_tg_if1} | ${dut_if1_ip} | | ... | ${prefix_length} | | And Add IP Neighbor | ${dut_node} | ${dut_to_tg_if1} | ${tg_if1_ip} @@ -150,15 +150,15 @@ | | ... | ${vhost_if3} | | And Vpp Add L2 Bridge Domain | ${dut_node} | ${104} | ${vxlan4} | | ... | ${vhost_if4} -| | And Setup QEMU Vhost and Run VM | ${dut_node} | ${sock_vm1_1} | ${sock_vm1_2} +| | And Configure QEMU vhost and run it VM | ${dut_node} | ${sock_vm1_1} | ${sock_vm1_2} | | ... | ${1} -| | And Setup QEMU Vhost and Run VM | ${dut_node} | ${sock_vm2_1} | ${sock_vm2_2} +| | And Configure QEMU vhost and run it VM | ${dut_node} | ${sock_vm2_1} | ${sock_vm2_2} | | ... | ${2} | | And Check traffic through VM -| | And Check VPP PID in Teardown -| | When Setup All Duts ${nodes} +| | And Verify VPP PID in Teardown +| | When Setup All Duts | ${nodes} | | And Save VPP PIDs -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | And Set Interface Address | ${dut_node} | ${dut_to_tg_if1} | ${dut_if1_ip} | | ... | ${prefix_length} | | And Add IP Neighbor | ${dut_node} | ${dut_to_tg_if1} | ${tg_if1_ip} @@ -199,7 +199,7 @@ *** Keywords *** -| Setup QEMU Vhost and Run VM +| Configure QEMU vhost and run it VM | | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${qemu_id} | | Import Library | resources.libraries.python.QemuUtils | qemu_id=${qemu_id} | | ... | WITH NAME | qemu-${qemu_id} @@ -219,12 +219,12 @@ | Check traffic through VM | | [Documentation] | Send VXLAN traffic through both configured VMs. -| | Send VXLAN receive VXLAN Packet | ${tg_node} +| | Send VXLAN encapsulated packet and verify received packet | ${tg_node} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} | | ... | ${tg_if1_ip} | ${dut_if1_ip} | ${101} | | ... | ${dut_if1_ip} | ${tg_if1_ip} | ${102} -| | Send VXLAN receive VXLAN Packet | ${tg_node} +| | Send VXLAN encapsulated packet and verify received packet | ${tg_node} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} | | ... | ${tg_if1_ip} | ${dut_if1_ip} | ${103} diff --git a/tests/func/vlan/eth2p-dot1ad--dot1q-l2bdbasemaclrn-vlantrans21-func.robot b/tests/func/vlan/eth2p-dot1ad--dot1q-l2bdbasemaclrn-vlantrans21-func.robot index c48d2ca45c..249e0dea33 100644 --- a/tests/func/vlan/eth2p-dot1ad--dot1q-l2bdbasemaclrn-vlantrans21-func.robot +++ b/tests/func/vlan/eth2p-dot1ad--dot1q-l2bdbasemaclrn-vlantrans21-func.robot @@ -19,8 +19,8 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2BD with VLAN tag rewrite test cases - transalte-2-1* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -68,30 +68,30 @@ | | ... | tagged with Dot1ad tags from one of its interfaces to another one | | ... | via DUT1 and DUT2; verify that packet is received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-1 | tag1_id=${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1ad | | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1} @@ -109,31 +109,31 @@ | | ... | via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-1 | tag1_id=${outer_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1ad | vlan1=${outer_vlan_id1} | | ... | vlan2=${inner_vlan_id1} @@ -150,30 +150,30 @@ | | ... | tagged with Dot1ad tags from one of its interfaces to another one | | ... | via DUT1 and DUT2; verify that packet is received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-1 | tag1_id=${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | src_ip=${src_ip6} | | ... | dst_ip=${dst_ip6} | encaps=Dot1ad | vlan1=${outer_vlan_id1} | | ... | vlan2=${inner_vlan_id1} @@ -192,30 +192,30 @@ | | ... | via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-1 | tag1_id=${outer_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip6} | dst_ip=${dst_ip6} | encaps=Dot1ad | | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1} diff --git a/tests/func/vlan/eth2p-dot1ad--dot1q-l2xcbase-vlantrans21-func.robot b/tests/func/vlan/eth2p-dot1ad--dot1q-l2xcbase-vlantrans21-func.robot index bf65f87acb..f3643be8bb 100644 --- a/tests/func/vlan/eth2p-dot1ad--dot1q-l2xcbase-vlantrans21-func.robot +++ b/tests/func/vlan/eth2p-dot1ad--dot1q-l2xcbase-vlantrans21-func.robot @@ -18,8 +18,8 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2XC with VLAN tag rewrite test cases - translate-2-1* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -65,23 +65,23 @@ | | ... | tagged with Dot1ad tags from one of its interfaces to another one | | ... | via DUT1 and DUT2; verify that packet is received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-1 | tag1_id=${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1ad | | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1} @@ -99,24 +99,24 @@ | | ... | via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-1 | tag1_id=${outer_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1ad | vlan1=${outer_vlan_id1} | | ... | vlan2=${inner_vlan_id1} @@ -132,23 +132,23 @@ | | ... | tagegd with Dot1ad tags from one of its interfaces to another one | | ... | via DUT1 and DUT2; verify that packet is received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-1 | tag1_id=${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | src_ip=${src_ip} | | ... | dst_ip=${dst_ip} | encaps=Dot1ad | vlan1=${outer_vlan_id1} | | ... | vlan2=${inner_vlan_id1} @@ -167,23 +167,23 @@ | | ... | via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-1 | tag1_id=${outer_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip} | dst_ip=${dst_ip} | encaps=Dot1ad | | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1} diff --git a/tests/func/vlan/eth2p-dot1ad-l2bdbasemaclrn-vlantrans22-func.robot b/tests/func/vlan/eth2p-dot1ad-l2bdbasemaclrn-vlantrans22-func.robot index 48edbd54f9..6efc508423 100644 --- a/tests/func/vlan/eth2p-dot1ad-l2bdbasemaclrn-vlantrans22-func.robot +++ b/tests/func/vlan/eth2p-dot1ad-l2bdbasemaclrn-vlantrans22-func.robot @@ -19,8 +19,8 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2BD with VLAN tag rewrite test cases - translate-2-2* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -68,33 +68,33 @@ | | ... | tagged with Dot1ad tags from one of its interfaces to another one | | ... | method. [Ver] Make TG send ICMPv4 Echo Req via DUT1 and DUT2; verify | | ... | that packet is received. [Ref] IEEE 802.1ad -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1ad | | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1} @@ -111,34 +111,34 @@ | | ... | one method. [Ver] Make TG send ICMPv4 Echo Req via DUT1 and DUT2; | | ... | verify that packet is not received. [Ref] IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1ad | vlan1=${outer_vlan_id1} | | ... | vlan2=${inner_vlan_id1} @@ -155,34 +155,34 @@ | | ... | one method. [Ver] Make TG send ICMPv4 Echo Req via DUT1 and DUT2; | | ... | verify that packet is not received. [Ref] IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1ad | vlan1=${outer_vlan_id1} | | ... | vlan2=${inner_vlan_id1} @@ -199,34 +199,34 @@ | | ... | method. [Ver] Make TG send ICMPv4 Echo Req via DUT1 and DUT2; verify | | ... | that packet is not received. [Ref] IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1ad | vlan1=${outer_vlan_id1} | | ... | vlan2=${inner_vlan_id1} @@ -241,33 +241,33 @@ | | ... | tagged with Dot1ad tags from one of its interfaces to another one | | ... | method. [Ver] Make TG send ICMPv6 Echo Req via DUT1 and DUT2; verify | | ... | that packet is received. [Ref] IEEE 802.1ad -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | src_ip=${src_ip6} | | ... | dst_ip=${dst_ip6} | encaps=Dot1ad | vlan1=${outer_vlan_id1} | | ... | vlan2=${inner_vlan_id1} @@ -285,34 +285,34 @@ | | ... | one method. [Ver] Make TG send ICMPv6 Echo Req via DUT1 and DUT2; | | ... | verify that packet is not received. [Ref] IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip6} | dst_ip=${dst_ip6} | encaps=Dot1ad | | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1} @@ -329,34 +329,34 @@ | | ... | one method. [Ver] Make TG send ICMPv6 Echo Req via DUT1 and DUT2; | | ... | verify that packet is not received. [Ref] IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip6} | dst_ip=${dst_ip6} | encaps=Dot1ad | | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1} @@ -373,33 +373,33 @@ | | ... | method. [Ver] Make TG send ICMPv6 Echo Req via DUT1 and DUT2; verify | | ... | that packet is not received. [Ref] IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip6} | dst_ip=${dst_ip6} | encaps=Dot1ad | | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1} diff --git a/tests/func/vlan/eth2p-dot1ad-l2xcbase-func.robot b/tests/func/vlan/eth2p-dot1ad-l2xcbase-func.robot index 617447666a..488f9fa822 100644 --- a/tests/func/vlan/eth2p-dot1ad-l2xcbase-func.robot +++ b/tests/func/vlan/eth2p-dot1ad-l2xcbase-func.robot @@ -18,8 +18,8 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2 cross-connect with QinQ test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology with @@ -53,17 +53,17 @@ | | ... | Make TG send ICMPv4 Echo Req in both directions between two of | | ... | its interfaces to be switched by DUT1 and DUT2; verify all | | ... | packets are received. [Ref] IEEE 802.1ad. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | When VLAN subinterfaces initialized on 3-node topology +| | And Set interfaces in 3-node circular topology up +| | When Initialize VLAN sub-interfaces in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1_node} | ${subif_index_1} | ${dut2_node} | ${subif_index_2} | | ... | ${tag_rewrite_method} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_tg} | ${subif_index_1} | | ... | ${dut2_node} | ${dut2_to_tg} | ${subif_index_2} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} diff --git a/tests/func/vlan/eth2p-dot1ad-l2xcbase-vlantrans22-func.robot b/tests/func/vlan/eth2p-dot1ad-l2xcbase-vlantrans22-func.robot index b96f291b97..c646cbcd03 100644 --- a/tests/func/vlan/eth2p-dot1ad-l2xcbase-vlantrans22-func.robot +++ b/tests/func/vlan/eth2p-dot1ad-l2xcbase-vlantrans22-func.robot @@ -18,8 +18,8 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2XC with VLAN tag rewrite test cases - translate-2-2* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -65,26 +65,26 @@ | | ... | tagged with Dot1ad tags from one of its interfaces to another one | | ... | method. [Ver] Make TG send ICMPv4 Echo Req via DUT1 and DUT2; verify | | ... | that packet is received. [Ref] IEEE 802.1ad -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1ad | | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1} @@ -101,27 +101,27 @@ | | ... | method. [Ver] Make TG send ICMPv4 Echo Req via DUT1 and DUT2; verify | | ... | that packet is not received. [Ref] IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1ad | vlan1=${outer_vlan_id1} | | ... | vlan2=${inner_vlan_id1} @@ -138,27 +138,27 @@ | | ... | one method. [Ver] Make TG send ICMPv4 Echo Req via DUT1 and DUT2; | | ... | verify that packet is not received. [Ref] IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1ad | vlan1=${outer_vlan_id1} | | ... | vlan2=${inner_vlan_id1} @@ -175,27 +175,27 @@ | | ... | method. [Ver] Make TG send ICMPv4 Echo Req via DUT1 and DUT2; verify | | ... | that packet is not received. [Ref] IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1ad | vlan1=${outer_vlan_id1} | | ... | vlan2=${inner_vlan_id1} @@ -210,26 +210,26 @@ | | ... | tagegd with Dot1ad tags from one of its interfaces to another one | | ... | method. [Ver] Make TG send ICMPv6 Echo Req via DUT1 and DUT2; verify | | ... | that packet is received. [Ref] IEEE 802.1ad -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | src_ip=${src_ip} | | ... | dst_ip=${dst_ip} | encaps=Dot1ad | vlan1=${outer_vlan_id1} | | ... | vlan2=${inner_vlan_id1} @@ -247,27 +247,27 @@ | | ... | method. [Ver] Make TG send ICMPv6 Echo Req via DUT1 and DUT2; verify | | ... | that packet is not received. [Ref] IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip} | dst_ip=${dst_ip} | encaps=Dot1ad | | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1} @@ -284,27 +284,27 @@ | | ... | one method. [Ver] Make TG send ICMPv6 Echo Req via DUT1 and DUT2; | | ... | verify that packet is not received. [Ref] IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip} | dst_ip=${dst_ip} | encaps=Dot1ad | | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1} @@ -321,26 +321,26 @@ | | ... | method. [Ver] Make TG send ICMPv6 Echo Req via DUT1 and DUT2; verify | | ... | that packet is not received. [Ref] IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip} | dst_ip=${dst_ip} | encaps=Dot1ad | | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1} diff --git a/tests/func/vlan/eth2p-dot1q--dot1ad-l2bdbasemaclrn-vlantrans12-func.robot b/tests/func/vlan/eth2p-dot1q--dot1ad-l2bdbasemaclrn-vlantrans12-func.robot index 6f61c7880b..b5fbb41138 100644 --- a/tests/func/vlan/eth2p-dot1q--dot1ad-l2bdbasemaclrn-vlantrans12-func.robot +++ b/tests/func/vlan/eth2p-dot1q--dot1ad-l2bdbasemaclrn-vlantrans12-func.robot @@ -19,8 +19,8 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2BD with VLAN tag rewrite test cases - translate-1-2* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -70,31 +70,31 @@ | | ... | tagged with one Dot1q tag from one of its interfaces to another one | | ... | via DUT1 and DUT2; verify that packet is received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_id1} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1q | | ... | vlan1=${outer_vlan_id1} @@ -112,32 +112,32 @@ | | ... | via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1q | vlan1=${outer_vlan_id1} | TC03: DUT1 and DUT2 with L2BD and VLAN translate-1-2 with wrong outer tag used (DUT1) switch ICMPv4 between two TG links @@ -154,32 +154,32 @@ | | ... | via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_id1} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1q | vlan1=${outer_vlan_id1} | TC04: DUT1 and DUT2 with L2BD and VLAN translate-1-2 with wrong outer and inner tag used (DUT1) switch ICMPv4 between two TG links @@ -196,32 +196,32 @@ | | ... | to another one via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1q | vlan1=${outer_vlan_id1} | TC05: DUT1 and DUT2 with L2BD and VLAN translate-1-2 (DUT1) switch ICMPv6 between two TG links @@ -236,31 +236,31 @@ | | ... | tagged with one Dot1q tag from one of its interfaces to another one | | ... | via DUT1 and DUT2; verify that packet is received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | src_ip=${src_ip6} | | ... | dst_ip=${dst_ip6} | encaps=Dot1q | vlan1=${outer_vlan_id1} @@ -278,32 +278,32 @@ | | ... | via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip6} | dst_ip=${dst_ip6} | encaps=Dot1q | | ... | vlan1=${outer_vlan_id1} @@ -321,32 +321,32 @@ | | ... | via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip6} | dst_ip=${dst_ip6} | encaps=Dot1q | | ... | vlan1=${outer_vlan_id1} @@ -364,31 +364,31 @@ | | ... | to another one via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip6} | dst_ip=${dst_ip6} | encaps=Dot1q | | ... | vlan1=${outer_vlan_id1} diff --git a/tests/func/vlan/eth2p-dot1q--dot1ad-l2xcbase-vlantrans12-func.robot b/tests/func/vlan/eth2p-dot1q--dot1ad-l2xcbase-vlantrans12-func.robot index c886247fba..bd1cebfd1e 100644 --- a/tests/func/vlan/eth2p-dot1q--dot1ad-l2xcbase-vlantrans12-func.robot +++ b/tests/func/vlan/eth2p-dot1q--dot1ad-l2xcbase-vlantrans12-func.robot @@ -18,8 +18,8 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2XC with VLAN tag rewrite test cases - translate-1-2* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -67,24 +67,24 @@ | | ... | tagged with one Dot1q tag from one of its interfaces to another one | | ... | via DUT1 and DUT2; verify that packet is received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_id1} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1q | | ... | vlan1=${outer_vlan_id1} @@ -102,25 +102,25 @@ | | ... | via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1q | vlan1=${outer_vlan_id1} | TC03: DUT1 and DUT2 with L2XC and VLAN translate-1-2 with wrong outer tag used (DUT1) switch ICMPv4 between two TG links @@ -137,25 +137,25 @@ | | ... | via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_id1} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1q | vlan1=${outer_vlan_id1} | TC04: DUT1 and DUT2 with L2XC and VLAN translate-1-2 with wrong outer and inner tag used (DUT1) switch ICMPv4 between two TG links @@ -172,25 +172,25 @@ | | ... | to another one via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1q | vlan1=${outer_vlan_id1} | TC05: DUT1 and DUT2 with L2XC and VLAN translate-1-2 (DUT1) switch ICMPv6 between two TG links @@ -205,24 +205,24 @@ | | ... | tagegd with one Dot1q tag from one of its interfaces to another one | | ... | via DUT1 and DUT2; verify that packet is received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | src_ip=${src_ip} | | ... | dst_ip=${dst_ip} | encaps=Dot1q | vlan1=${outer_vlan_id1} @@ -240,25 +240,25 @@ | | ... | via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip} | dst_ip=${dst_ip} | encaps=Dot1q | | ... | vlan1=${outer_vlan_id1} @@ -276,25 +276,25 @@ | | ... | via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip} | dst_ip=${dst_ip} | encaps=Dot1q | | ... | vlan1=${outer_vlan_id1} @@ -312,24 +312,24 @@ | | ... | to another one via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip} | dst_ip=${dst_ip} | encaps=Dot1q | | ... | vlan1=${outer_vlan_id1} diff --git a/tests/func/vlan/eth2p-dot1q-ip4base-func.robot b/tests/func/vlan/eth2p-dot1q-ip4base-func.robot index 5398574848..19247b00ce 100644 --- a/tests/func/vlan/eth2p-dot1q-ip4base-func.robot +++ b/tests/func/vlan/eth2p-dot1q-ip4base-func.robot @@ -20,8 +20,8 @@ | Library | resources.libraries.python.Trace | Library | resources.libraries.python.IPv6Util | Force Tags | 3_NODE_DOUBLE_LINK_TOPO | VM_ENV | HW_ENV | VPP_VM_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *IPv4 with VLAN subinterfaces* | ... | ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology @@ -48,7 +48,7 @@ *** Test Cases *** | TC01: Process untagged send tagged | | Given Vlan Test Setup -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${ip4_net0_2} | ${ip4_net2_2} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} | ${tg_to_dut_if2} | | ... | ${dut_to_tg_if2_mac} | ${tg_to_dut_if2_mac} @@ -58,7 +58,7 @@ # It doesn't work with virtio | | [Tags] | EXPECTED_FAILING | | Given Vlan Test Setup -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${ip4_net2_2} | ${ip4_net0_2} | ${tg_to_dut_if2} | | ... | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac} | ${tg_to_dut_if1} | | ... | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac} @@ -68,13 +68,13 @@ # It doesn't work with virtio | | [Tags] | EXPECTED_FAILING | | Given Vlan Test Setup -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${ip4_net1_2} | ${ip4_net2_2} | ${tg_to_dut_if2} | | ... | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac} | ${tg_to_dut_if2} | | ... | ${dut_to_tg_if2_mac} | ${tg_to_dut_if2_mac} | | ... | encaps_tx=Dot1q | vlan_tx=${tag_1} | | ... | encaps_rx=Dot1q | vlan_rx=${tag_2} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${ip4_net2_2} | ${ip4_net1_2} | ${tg_to_dut_if2} | | ... | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac} | ${tg_to_dut_if2} | | ... | ${dut_to_tg_if2_mac} | ${tg_to_dut_if2_mac} @@ -83,13 +83,13 @@ *** Keywords *** | Vlan Test Setup -| | Path for 2-node testing is set +| | Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | Interfaces in 2-node path are up +| | Set interfaces in 2-node circular topology up | | -| | ${vlan1_name} | ${vlan1_index}= | Vlan Subinterface Created +| | ${vlan1_name} | ${vlan1_index}= | Create vlan sub-interface | | ... | ${dut_node} | ${dut_to_tg_if2} | ${tag_1} -| | ${vlan2_name} | ${vlan2_index}= | Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | Create vlan sub-interface | | ... | ${dut_node} | ${dut_to_tg_if2} | ${tag_2} | | | | Set Interface Address | ${dut_node} diff --git a/tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-func.robot b/tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-func.robot index e2f0e3d9fd..28ab67b266 100644 --- a/tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-func.robot +++ b/tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-func.robot @@ -21,11 +21,11 @@ | Resource | resources/libraries/robot/double_qemu_setup.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_DOUBLE_LINK_TOPO | HW_ENV | VM_ENV | VPP_VM_ENV -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show vpp trace dump on all DUTs -| ... | AND | Stop and Clear QEMU | ${dut_node} | ${vm_node} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Stop and clear QEMU | ${dut_node} | ${vm_node} +| ... | AND | Verify VPP PID in Teardown | Documentation | *L2 bridge domain with VLAN tag over VM test cases* | ... | ... | *[Top] Network Topologies:* TG=DUT 2-node circular topology @@ -74,29 +74,29 @@ | | ... | that packet is received. | | ... | [Ref] IEEE 802.1q | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 2-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut_node} | ${dut_to_tg_if2} | ${vlan_id1} -| | And VPP Vhost interfaces for L2BD forwarding are setup +| | And Configure vhost interfaces for L2BD forwarding | | ... | ${dut_node} | ${sock1} | ${sock2} -| | And VM for Vhost L2BD forwarding is setup +| | And Configure VM for vhost L2BD forwarding | | ... | ${dut_node} | ${sock1} | ${sock2} -| | And Interface is added to bridge domain | ${dut_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${vhost_if1} +| | And Add interface to bridge domain | ${dut_node} | ${vhost_if1} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut_node} | ${vlan2_index} | | ... | ${bd_id2} -| | And Interface is added to bridge domain | ${dut_node} | ${vhost_if2} +| | And Add interface to bridge domain | ${dut_node} | ${vhost_if2} | | ... | ${bd_id2} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2} | ${ip4_1} | ${ip4_2} | | ... | encaps=Dot1q | vlan1=${vlan_id1} | encaps_rx=Dot1q -| | And Send and receive ICMP Packet +| | And Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut_if2} | ${tg_to_dut_if1} | ${ip4_2} | ${ip4_1} | | ... | encaps=Dot1q | vlan1=${vlan_id1} | encaps_rx=Dot1q @@ -114,29 +114,29 @@ | | ... | that packet is received. | | ... | [Ref] IEEE 802.1q | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 2-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut_node} | ${dut_to_tg_if2} | ${vlan_id1} -| | And VPP Vhost interfaces for L2BD forwarding are setup +| | And Configure vhost interfaces for L2BD forwarding | | ... | ${dut_node} | ${sock1} | ${sock2} -| | And VM for Vhost L2BD forwarding is setup +| | And Configure VM for vhost L2BD forwarding | | ... | ${dut_node} | ${sock1} | ${sock2} -| | And Interface is added to bridge domain | ${dut_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${vhost_if1} +| | And Add interface to bridge domain | ${dut_node} | ${vhost_if1} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut_node} | ${vlan2_index} | | ... | ${bd_id2} -| | And Interface is added to bridge domain | ${dut_node} | ${vhost_if2} +| | And Add interface to bridge domain | ${dut_node} | ${vhost_if2} | | ... | ${bd_id2} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2} | ${ip6_1} | ${ip6_2} | | ... | encaps=Dot1q | vlan1=${vlan_id1} | encaps_rx=Dot1q -| | And Send and receive ICMP Packet +| | And Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut_if2} | ${tg_to_dut_if1} | ${ip6_2} | ${ip6_1} | | ... | encaps=Dot1q | vlan1=${vlan_id1} | encaps_rx=Dot1q diff --git a/tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-vlantrans11-func.robot b/tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-vlantrans11-func.robot index c122dbdbcb..379d9a4ab6 100644 --- a/tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-vlantrans11-func.robot +++ b/tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-vlantrans11-func.robot @@ -19,8 +19,8 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2BD with VLAN tag rewrite test cases - translate-1-1* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -67,28 +67,28 @@ | | ... | method. [Ver] Make TG send ICMPv4 Echo Req tagged with one Dot1q tag | | ... | from one of its interfaces to another one via DUT1 and DUT2; verify | | ... | that packet is received. [Ref] IEEE 802.1q -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-1 | tag1_id=${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1q | | ... | vlan1=${outer_vlan_id1} @@ -105,29 +105,29 @@ | | ... | from one of its interfaces to another one via DUT1 and DUT2; verify | | ... | that packet is not received. [Ref] IEEE 802.1q | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-1 | tag1_id=${outer_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1q | vlan1=${outer_vlan_id1} | TC03: DUT1 and DUT2 with L2BD and VLAN translate-1-1 (DUT1) switch ICMPv6 between two TG links @@ -141,28 +141,28 @@ | | ... | method. [Ver] Make TG send ICMPv6 Echo Req tagged with one Dot1q tag | | ... | from one of its interfaces to another one via DUT1 and DUT2; verify | | ... | that packet is received. [Ref] IEEE 802.1q -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-1 | tag1_id=${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | src_ip=${src_ip6} | | ... | dst_ip=${dst_ip6} | encaps=Dot1q | vlan1=${outer_vlan_id1} @@ -179,28 +179,28 @@ | | ... | from one of its interfaces to another one via DUT1 and DUT2; verify | | ... | that packet is not received. [Ref] IEEE 802.1q | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-1 | tag1_id=${outer_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip6} | dst_ip=${dst_ip6} | encaps=Dot1q | | ... | vlan1=${outer_vlan_id1} diff --git a/tests/func/vlan/eth2p-dot1q-l2xcbase-vlantrans11-func.robot b/tests/func/vlan/eth2p-dot1q-l2xcbase-vlantrans11-func.robot index cccd89edea..bb91940a32 100644 --- a/tests/func/vlan/eth2p-dot1q-l2xcbase-vlantrans11-func.robot +++ b/tests/func/vlan/eth2p-dot1q-l2xcbase-vlantrans11-func.robot @@ -18,8 +18,8 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2XC with VLAN tag rewrite test cases - translate-1-1* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -61,21 +61,21 @@ | | ... | method. [Ver] Make TG send ICMPv4 Echo Req tagged with one Dot1q tag | | ... | from one of its interfaces to another one via DUT1 and DUT2; verify | | ... | that packet is received. [Ref] IEEE 802.1q -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-1 | tag1_id=${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1q | | ... | vlan1=${outer_vlan_id1} @@ -91,22 +91,22 @@ | | ... | tag from one of its interfaces to another one via DUT1 and DUT2; | | ... | verify that packet is not received. [Ref] IEEE 802.1q | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-1 | tag1_id=${outer_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1q | vlan1=${outer_vlan_id1} | TC03: DUT1 and DUT2 with L2XC and VLAN translate-1-1 (DUT1) switch ICMPv6 between two TG links @@ -120,21 +120,21 @@ | | ... | method. [Ver] Make TG send ICMPv6 Echo Req tagegd with one Dot1q tag | | ... | from one of its interfaces to another one via DUT1 and DUT2; verify | | ... | that packet is received. [Ref] IEEE 802.1q -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-1 | tag1_id=${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | src_ip=${src_ip} | | ... | dst_ip=${dst_ip} | encaps=Dot1q | vlan1=${outer_vlan_id1} @@ -151,21 +151,21 @@ | | ... | from one of its interfaces to another one via DUT1 and DUT2; verify | | ... | that packet is not received. [Ref] IEEE 802.1q | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-1 | tag1_id=${outer_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip} | dst_ip=${dst_ip} | encaps=Dot1q | | ... | vlan1=${outer_vlan_id1} diff --git a/tests/func/vrf/eth2p-ethip4-ip4basevrf-func.robot b/tests/func/vrf/eth2p-ethip4-ip4basevrf-func.robot index d34eff2537..841077203b 100644 --- a/tests/func/vrf/eth2p-ethip4-ip4basevrf-func.robot +++ b/tests/func/vrf/eth2p-ethip4-ip4basevrf-func.robot @@ -22,8 +22,8 @@ | Library | resources.libraries.python.Trace | Library | resources.libraries.python.IPUtil | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *Vpn routed forwarding - baseline IPv4* | ... | *[Top] Network Topologies:* TG=DUT1=DUT2=TG 3-node topology with two | ... | links in between nodes. @@ -71,15 +71,15 @@ | | ... | with one route. | | ... | [Ver] Packet is send from TG->DUT1-if1 to DUT1->TG-if1 and from | | ... | TG->DUT1-if2 to DUT1->TG-if2 and checked if arrived. -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node -| | Then Node replies to ICMP echo request | ${tg_node} +| | Then Send ICMP echo request and verify answer | ${tg_node} | | ... | ${tg_to_dut1_if1} | ${dut1_to_tg_if1_mac} | | ... | ${tg_to_dut1_if1_mac} | ${dut1_to_tg_ip1} | ${tg_dut1_ip1} | 5 -| | And Node replies to ICMP echo request | ${tg_node} +| | And Send ICMP echo request and verify answer | ${tg_node} | | ... | ${tg_to_dut1_if2} | ${dut1_to_tg_if2_mac} | | ... | ${tg_to_dut1_if2_mac} | ${dut1_to_tg_ip2} | ${tg_dut1_ip2} | 5 @@ -94,15 +94,15 @@ | | ... | with one route. | | ... | [Ver] Packet is send from TG->DUT1-if1 to DUT1->DUT2-if1 and from | | ... | TG->DUT1-if2 to DUT1->DUT2-if2 and checked if arrived. -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node -| | Then Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut1_if1} +| | Then Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut1_if1} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac} | | ... | ${dut1_to_dut2_ip1} | ${tg_dut1_ip1} | 5 -| | And Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut1_if2} +| | And Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut1_if2} | | ... | ${dut1_to_tg_if2_mac} | ${tg_to_dut1_if2_mac} | | ... | ${dut1_to_dut2_ip2} | ${tg_dut1_ip2} | 5 @@ -117,15 +117,15 @@ | | ... | with one route. | | ... | [Ver] Packet is send from TG->DUT1-if1 to DUT2->DUT1-if1 and from | | ... | TG->DUT1-if2 to DUT2->DUT1-if2 and checked if arrived. -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node -| | Then Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut1_if1} +| | Then Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut1_if1} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac} | | ... | ${dut2_to_dut1_ip1} | ${tg_dut1_ip1} | 5 -| | And Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut1_if2} +| | And Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut1_if2} | | ... | ${dut1_to_tg_if2_mac} | ${tg_to_dut1_if2_mac} | | ... | ${dut2_to_dut1_ip2} | ${tg_dut1_ip2} | 5 @@ -140,15 +140,15 @@ | | ... | with one route. | | ... | [Ver] Packet is send from TG->DUT1-if1 to DUT2->TG-if1 and from | | ... | TG->DUT1-if2 to DUT2->TG-if2 and checked if arrived. -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node -| | Then Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut1_if1} +| | Then Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut1_if1} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac} | | ... | ${dut2_to_tg_ip1} | ${tg_dut1_ip1} | 5 -| | And Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut1_if2} +| | And Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut1_if2} | | ... | ${dut1_to_tg_if2_mac} | ${tg_to_dut1_if2_mac} | | ... | ${dut2_to_tg_ip2} | ${tg_dut1_ip2} | 5 @@ -163,16 +163,16 @@ | | ... | with one route. | | ... | [Ver] Packet is send from TG->DUT1-if1 to TG->DUT2-if1 and from | | ... | TG->DUT1-if2 to TG->DUT2-if2 and checked if arrived. -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node -| | Then Send Packet And Check Headers | ${tg_node} | ${tg_dut1_ip1} +| | Then Send packet and verify headers | ${tg_node} | ${tg_dut1_ip1} | | ... | ${tg_dut2_ip1} | ${tg_to_dut1_if1} | ${tg_to_dut1_if1_mac} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut2_if1} | ${dut2_to_tg_if1_mac} | | ... | ${tg_to_dut2_if1_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${tg_dut1_ip2} | ${tg_dut2_ip2} | ${tg_to_dut1_if2} | | ... | ${tg_to_dut1_if2_mac} | ${dut1_to_tg_if2_mac} | ${tg_to_dut2_if2} | | ... | ${dut2_to_tg_if2_mac} | ${tg_to_dut2_if2_mac} @@ -189,13 +189,13 @@ | | ... | [Ver] Packet is send from TG->DUT1-if1 to DUT1->TG-if2 where it | | ... | should not arrive. | | [Tags] | SKIP_PATCH -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Node replies to ICMP echo request +| | ... | Send ICMP echo request and verify answer | | ... | ${tg_node} | ${tg_to_dut1_if1} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac} | | ... | ${dut1_to_tg_ip2} | ${tg_dut1_ip1} | 5 @@ -212,13 +212,13 @@ | | ... | [Ver] Packet is send from TG->DUT1-if1 to DUT1->DUT2-if2 where it | | ... | should not arrive. | | [Tags] | SKIP_PATCH -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Node replies to ICMP echo request +| | ... | Send ICMP echo request and verify answer | | ... | ${tg_node} | ${tg_to_dut1_if1} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac} | | ... | ${dut1_to_dut2_ip2} | ${tg_dut1_ip1} | 5 @@ -235,13 +235,13 @@ | | ... | [Ver] Packet is send from TG->DUT1-if1 to DUT2->DUT1-if2 where it | | ... | should not arrive. | | [Tags] | SKIP_PATCH -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Node replies to ICMP echo request +| | ... | Send ICMP echo request and verify answer | | ... | ${tg_node} | ${tg_to_dut1_if1} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac} | | ... | ${dut2_to_dut1_ip2} | ${tg_dut1_ip1} | 5 @@ -258,13 +258,13 @@ | | ... | [Ver] Packet is send from TG->DUT1-if1 to DUT2->TG-if2 where it | | ... | should not arrive. | | [Tags] | SKIP_PATCH -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Node replies to ICMP echo request +| | ... | Send ICMP echo request and verify answer | | ... | ${tg_node} | ${tg_to_dut1_if1} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac} | | ... | ${dut2_to_tg_ip2} | ${tg_dut1_ip1} | 5 @@ -281,13 +281,13 @@ | | ... | [Ver] Packet is send from TG->DUT1-if1 to TG->DUT2-if2 where it | | ... | should not arrive. | | [Tags] | SKIP_PATCH -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send Packet And Check Headers | ${tg_node} | ${tg_dut1_ip1} +| | ... | Send packet and verify headers | ${tg_node} | ${tg_dut1_ip1} | | ... | ${tg_dut2_ip2} | ${tg_to_dut1_if1} | | ... | ${tg_to_dut1_if1_mac} | ${dut1_to_tg_if1_mac} | ${tg_to_dut2_if2} | | ... | ${dut2_to_tg_if2_mac} | ${tg_to_dut2_if2_mac} diff --git a/tests/func/vrf/eth2p-ethip6-ip6basevrf-func.robot b/tests/func/vrf/eth2p-ethip6-ip6basevrf-func.robot index eda02a7161..64a34c4458 100644 --- a/tests/func/vrf/eth2p-ethip6-ip6basevrf-func.robot +++ b/tests/func/vrf/eth2p-ethip6-ip6basevrf-func.robot @@ -22,8 +22,8 @@ | Library | resources.libraries.python.Trace | Library | resources.libraries.python.IPUtil | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *Vpn routed forwarding - baseline IPv6* | ... | *[Top] Network Topologies:* TG=DUT1=DUT2=TG 3-node topology with two | ... | links in between nodes. @@ -71,16 +71,16 @@ | | ... | configured with just one route. | | ... | [Ver] Packet is sent from TG->DUT1-if1 to DUT1->TG-if1 and from | | ... | TG->DUT1-if2 to DUT1->TG-if2 and checked if arrived. -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node -| | Then Node replies to ICMP echo request | ${tg_node} +| | Then Send ICMP echo request and verify answer | ${tg_node} | | ... | ${tg_to_dut1_if1} | ${dut1_to_tg_if1_mac} | | ... | ${tg_to_dut1_if1_mac} | ${dut1_to_tg_ip1} | | ... | ${tg_dut1_ip1} | ${timeout} -| | And Node replies to ICMP echo request | ${tg_node} +| | And Send ICMP echo request and verify answer | ${tg_node} | | ... | ${tg_to_dut1_if2} | ${dut1_to_tg_if2_mac} | | ... | ${tg_to_dut1_if2_mac} | ${dut1_to_tg_ip2} | | ... | ${tg_dut1_ip2} | ${timeout} @@ -96,15 +96,15 @@ | | ... | configured with just one route. | | ... | [Ver] Packet is sent from TG->DUT1-if1 to DUT1->DUT2-if1 and from | | ... | TG->DUT1-if2 to DUT1->DUT2-if2 and checked if arrived. -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node -| | Then Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut1_if1} +| | Then Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut1_if1} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac} | | ... | ${dut1_to_dut2_ip1} | ${tg_dut1_ip1} | ${timeout} -| | And Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut1_if2} +| | And Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut1_if2} | | ... | ${dut1_to_tg_if2_mac} | ${tg_to_dut1_if2_mac} | | ... | ${dut1_to_dut2_ip2} | ${tg_dut1_ip2} | ${timeout} @@ -119,15 +119,15 @@ | | ... | configured with just one route. | | ... | [Ver] Packet is sent from TG->DUT1-if1 to DUT2->DUT1-if1 and from | | ... | TG->DUT1-if2 to DUT2->DUT1-if2 and checked if arrived. -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node -| | Then Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut1_if1} +| | Then Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut1_if1} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac} | | ... | ${dut2_to_dut1_ip1} | ${tg_dut1_ip1} | ${timeout} -| | And Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut1_if2} +| | And Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut1_if2} | | ... | ${dut1_to_tg_if2_mac} | ${tg_to_dut1_if2_mac} | | ... | ${dut2_to_dut1_ip2} | ${tg_dut1_ip2} | ${timeout} @@ -142,15 +142,15 @@ | | ... | configured with just one route. | | ... | [Ver] Packet is sent from TG->DUT1-if1 to DUT2->TG-if1 and from | | ... | TG->DUT1-if2 to DUT2->TG-if2 and checked if arrived. -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node -| | Then Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut1_if1} +| | Then Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut1_if1} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac} | | ... | ${dut2_to_tg_ip1} | ${tg_dut1_ip1} | ${timeout} -| | And Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut1_if2} +| | And Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut1_if2} | | ... | ${dut1_to_tg_if2_mac} | ${tg_to_dut1_if2_mac} | | ... | ${dut2_to_tg_ip2} | ${tg_dut1_ip2} | ${timeout} @@ -165,16 +165,16 @@ | | ... | configured with just one route. | | ... | [Ver] Packet is sent from TG->DUT1-if1 to TG->DUT2-if1 and from | | ... | TG->DUT1-if2 to TG->DUT2-if2 and checked if arrived. -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node -| | Then Send Packet And Check Headers | ${tg_node} | ${tg_dut1_ip1} +| | Then Send packet and verify headers | ${tg_node} | ${tg_dut1_ip1} | | ... | ${tg_dut2_ip1} | ${tg_to_dut1_if1} | ${tg_to_dut1_if1_mac} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut2_if1} | ${dut2_to_tg_if1_mac} | | ... | ${tg_to_dut2_if1_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${tg_dut1_ip2} | ${tg_dut2_ip2} | ${tg_to_dut1_if2} | | ... | ${tg_to_dut1_if2_mac} | ${dut1_to_tg_if2_mac} | ${tg_to_dut2_if2} | | ... | ${dut2_to_tg_if2_mac} | ${tg_to_dut2_if2_mac} @@ -191,18 +191,18 @@ | | ... | [Ver] Packet is sent from TG->DUT1-if1 to DUT1->TG-if2 where it | | ... | should not arrive. | | [Tags] | SKIP_PATCH -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Node replies to ICMP echo request +| | ... | Send ICMP echo request and verify answer | | ... | ${tg_node} | ${tg_to_dut1_if1} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac} | | ... | ${dut1_to_tg_ip2} | ${tg_dut1_ip1} | ${timeout} | | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Node replies to ICMP echo request +| | ... | Send ICMP echo request and verify answer | | ... | ${tg_node} | ${tg_to_dut1_if2} | | ... | ${dut1_to_tg_if2_mac} | ${tg_to_dut1_if2_mac} | | ... | ${dut1_to_tg_ip1} | ${tg_dut1_ip2} | ${timeout} @@ -219,18 +219,18 @@ | | ... | [Ver] Packet is sent from TG->DUT1-if1 to DUT1->DUT2-if2 where it | | ... | should not arrive. | | [Tags] | SKIP_PATCH -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Node replies to ICMP echo request +| | ... | Send ICMP echo request and verify answer | | ... | ${tg_node} | ${tg_to_dut1_if1} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac} | | ... | ${dut1_to_dut2_ip2} | ${tg_dut1_ip1} | ${timeout} | | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Node replies to ICMP echo request +| | ... | Send ICMP echo request and verify answer | | ... | ${tg_node} | ${tg_to_dut1_if2} | | ... | ${dut1_to_tg_if2_mac} | ${tg_to_dut1_if2_mac} | | ... | ${dut1_to_dut2_ip1} | ${tg_dut1_ip2} | ${timeout} @@ -248,18 +248,18 @@ | | ... | [Ver] Packet is sent from TG->DUT1-if1 to DUT2->DUT1-if2 where it | | ... | should not arrive. | | [Tags] | SKIP_PATCH -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Node replies to ICMP echo request +| | ... | Send ICMP echo request and verify answer | | ... | ${tg_node} | ${tg_to_dut1_if1} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac} | | ... | ${dut2_to_dut1_ip2} | ${tg_dut1_ip1} | ${timeout} | | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Node replies to ICMP echo request +| | ... | Send ICMP echo request and verify answer | | ... | ${tg_node} | ${tg_to_dut1_if2} | | ... | ${dut1_to_tg_if2_mac} | ${tg_to_dut1_if2_mac} | | ... | ${dut2_to_dut1_ip1} | ${tg_dut1_ip2} | ${timeout} @@ -276,18 +276,18 @@ | | ... | [Ver] Packet is sent from TG->DUT1-if1 to DUT2->TG-if2 where it | | ... | should not arrive. | | [Tags] | SKIP_PATCH -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Node replies to ICMP echo request +| | ... | Send ICMP echo request and verify answer | | ... | ${tg_node} | ${tg_to_dut1_if1} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac} | | ... | ${dut2_to_tg_ip2} | ${tg_dut1_ip1} | ${timeout} | | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Node replies to ICMP echo request +| | ... | Send ICMP echo request and verify answer | | ... | ${tg_node} | ${tg_to_dut1_if2} | | ... | ${dut1_to_tg_if2_mac} | ${tg_to_dut1_if2_mac} | | ... | ${dut2_to_tg_ip1} | ${tg_dut1_ip2} | ${timeout} @@ -304,18 +304,18 @@ | | ... | [Ver] Packet is sent from TG->DUT1-if1 to TG->DUT2-if2 where it | | ... | should not arrive. | | [Tags] | SKIP_PATCH -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send Packet And Check Headers | ${tg_node} | ${tg_dut1_ip1} +| | ... | Send packet and verify headers | ${tg_node} | ${tg_dut1_ip1} | | ... | ${tg_dut2_ip2} | ${tg_to_dut1_if1} | | ... | ${tg_to_dut1_if1_mac} | ${dut1_to_tg_if1_mac} | ${tg_to_dut2_if2} | | ... | ${dut2_to_tg_if2_mac} | ${tg_to_dut2_if2_mac} | | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send Packet And Check Headers | ${tg_node} | ${tg_dut1_ip2} +| | ... | Send packet and verify headers | ${tg_node} | ${tg_dut1_ip2} | | ... | ${tg_dut2_ip1} | ${tg_to_dut1_if2} | | ... | ${tg_to_dut1_if2_mac} | ${dut1_to_tg_if2_mac} | ${tg_to_dut2_if1} | | ... | ${dut2_to_tg_if1_mac} | ${tg_to_dut2_if1_mac} diff --git a/tests/func/vxlan/eth2p-dot1qip4vxlan-l2bdbasemaclrn-func.robot b/tests/func/vxlan/eth2p-dot1qip4vxlan-l2bdbasemaclrn-func.robot index 592154845d..0155b4953d 100644 --- a/tests/func/vxlan/eth2p-dot1qip4vxlan-l2bdbasemaclrn-func.robot +++ b/tests/func/vxlan/eth2p-dot1qip4vxlan-l2bdbasemaclrn-func.robot @@ -18,8 +18,8 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *RFC7348 VXLAN: Bridge-domain with VXLAN over VLAN test cases* | ... | ... | *[Top] Network topologies:* TG-DUT1-DUT2-TG 3-node circular topology with @@ -51,26 +51,26 @@ | | ... | interface to TG and one VXLAN tunnel interface towards the other DUT | | ... | over VLAN sub-interface. [Ver] Make TG send ICMPv4 Echo Req between | | ... | two of its interfaces, verify all packets are received. [Ref] RFC7348. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And Vlan interfaces for VXLAN are created | ${VLAN} +| | And Set interfaces in 3-node circular topology up +| | And Create vlan interfaces for VXLAN | ${VLAN} | | ... | ${dut1_node} | ${dut1_to_dut2} | | ... | ${dut2_node} | ${dut2_to_dut1} -| | And IP addresses are set on interfaces +| | And Configure IP addresses and neighbors on interfaces | | ... | ${dut1_node} | ${dut1s_vlan_name} | ${dut1s_vlan_index} | | ... | ${dut2_node} | ${dut2s_vlan_name} | ${dut2s_vlan_index} | | ${dut1s_vxlan}= | When Create VXLAN interface | ${dut1_node} | ${VNI} | | | ... | ${dut1s_ip_address} | ${dut2s_ip_address} | | And Set Interface State | ${dut1_node} | ${dut1s_vxlan} | | ... | up -| | And Interfaces are added to BD | ${dut1_node} | ${BID} +| | And Add interfaces to L2BD | ${dut1_node} | ${BID} | | ... | ${dut1_to_tg} | ${dut1s_vxlan} | | ${dut2s_vxlan}= | And Create VXLAN interface | ${dut2_node} | ${VNI} | | | ... | ${dut2s_ip_address} | ${dut1s_ip_address} | | And Set Interface State | ${dut2_node} | ${dut2s_vxlan} | | ... | up -| | And Interfaces are added to BD | ${dut2_node} | ${BID} +| | And Add interfaces to L2BD | ${dut2_node} | ${BID} | | ... | ${dut2_to_tg} | ${dut2s_vxlan} -| | Then Send and receive ICMPv4 bidirectionally +| | Then Send ICMPv4 bidirectionally and verify received packets | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} diff --git a/tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot b/tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot index 5e277a3200..b69abb09d5 100644 --- a/tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot +++ b/tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot @@ -20,11 +20,11 @@ | Resource | resources/libraries/robot/double_qemu_setup.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV | VPP_VM_ENV -| Test Setup | Func Test Setup -| Test Teardown | Run Keywords | Func Test Teardown -| ... | AND | Run keyword | Qemu Teardown | ${dut1_node} +| Test Setup | Set up functional test +| Test Teardown | Run Keywords | Tear down functional test +| ... | AND | Run keyword | Tear down QEMU | ${dut1_node} | ... | ${${qemu1}} | ${qemu1} -| ... | AND | Run keyword | Qemu Teardown | ${dut2_node} +| ... | AND | Run keyword | Tear down QEMU | ${dut2_node} | ... | ${${qemu2}} | ${qemu2} | Documentation | *L2BD with VM combined with VXLAN test cases - IPv4* | ... @@ -77,22 +77,22 @@ | | ... | be switched by DUT1 and DUT2; verify packets are switched between | | ... | these TG interfaces. | | ... | [Ref] RFC7348. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | When VPP Vhost interfaces for L2BD forwarding are setup | ${dut1_node} +| | And Set interfaces in 3-node circular topology up +| | When Configure vhost interfaces for L2BD forwarding | ${dut1_node} | | ... | ${sock1} | | ... | ${sock2} | | ... | ${dut1_vhost1} | | ... | ${dut1_vhost2} -| | And VPP Vhost interfaces for L2BD forwarding are setup | ${dut2_node} +| | And Configure vhost interfaces for L2BD forwarding | ${dut2_node} | | ... | ${sock1} | | ... | ${sock2} | | ... | ${dut2_vhost1} | | ... | ${dut2_vhost2} -| | And VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1} +| | And Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1} | | ... | ${sock2} | ${qemu1} -| | And VM for Vhost L2BD forwarding is setup | ${dut2_node} | ${sock1} +| | And Configure VM for vhost L2BD forwarding | ${dut2_node} | ${sock1} | | ... | ${sock2} | ${qemu2} | | And Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${ip4_addr1} | | ... | ${ip4_prefix} @@ -104,13 +104,13 @@ | | | ... | ${ip4_addr1} | ${ip4_addr2} | | ${dut2s_vxlan}= | And Create VXLAN interface | ${dut2_node} | ${vni_1} | | | ... | ${ip4_addr2} | ${ip4_addr1} -| | And Interfaces are added to BD | ${dut1_node} | ${bd_id1} +| | And Add interfaces to L2BD | ${dut1_node} | ${bd_id1} | | ... | ${dut1_to_tg} | ${${dut1_vhost1}} -| | And Interfaces are added to BD | ${dut1_node} | ${bd_id2} +| | And Add interfaces to L2BD | ${dut1_node} | ${bd_id2} | | ... | ${dut1s_vxlan} | ${${dut1_vhost2}} -| | And Interfaces are added to BD | ${dut2_node} | ${bd_id1} +| | And Add interfaces to L2BD | ${dut2_node} | ${bd_id1} | | ... | ${dut2_to_tg} | ${${dut2_vhost1}} -| | And Interfaces are added to BD | ${dut2_node} | ${bd_id2} +| | And Add interfaces to L2BD | ${dut2_node} | ${bd_id2} | | ... | ${dut2s_vxlan} | ${${dut2_vhost2}} -| | Then Send and receive ICMPv4 bidirectionally +| | Then Send ICMPv4 bidirectionally and verify received packets | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} diff --git a/tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-func.robot b/tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-func.robot index 543fec22b8..6db2ee27ff 100644 --- a/tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-func.robot +++ b/tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-func.robot @@ -20,8 +20,8 @@ | Resource | resources/libraries/robot/double_qemu_setup.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *Bridge-domain with VXLAN test cases - IPv4* | ... | ... | *[Top] Network topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -59,20 +59,20 @@ | | ... | configure two i/fs into L2BD with MAC learning. [Ver] Make TG | | ... | verify ICMPv4 Echo Req pkts are switched thru DUT1 and DUT2 in | | ... | both directions and are correct on receive. [Ref] RFC7348. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | ${dut1_to_dut2_name}= | Get interface name | ${dut1_node} | ${dut1_to_dut2} | | ${dut2_to_dut1_name}= | Get interface name | ${dut2_node} | ${dut2_to_dut1} -| | And IP addresses are set on interfaces | ${dut1_node} | ${dut1_to_dut2_name} | ${NONE} +| | And Configure IP addresses and neighbors on interfaces | ${dut1_node} | ${dut1_to_dut2_name} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1_name} | ${NONE} | | ${dut1s_vxlan}= | When Create VXLAN interface | ${dut1_node} | ${vni_1} | | | ... | ${dut1s_ip_address} | ${dut2s_ip_address} -| | And Interfaces are added to BD | ${dut1_node} | ${bd_id1} +| | And Add interfaces to L2BD | ${dut1_node} | ${bd_id1} | | ... | ${dut1_to_tg} | ${dut1s_vxlan} | | ${dut2s_vxlan}= | And Create VXLAN interface | ${dut2_node} | ${vni_1} | | | ... | ${dut2s_ip_address} | ${dut1s_ip_address} -| | And Interfaces are added to BD | ${dut2_node} | ${bd_id1} +| | And Add interfaces to L2BD | ${dut2_node} | ${bd_id1} | | ... | ${dut2_to_tg} | ${dut2s_vxlan} -| | Then Send and receive ICMPv4 bidirectionally +| | Then Send ICMPv4 bidirectionally and verify received packets | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} diff --git a/tests/func/vxlan/eth2p-ethip4vxlan-l2xcbase-func.robot b/tests/func/vxlan/eth2p-ethip4vxlan-l2xcbase-func.robot index de38c56b2d..70f17bc368 100644 --- a/tests/func/vxlan/eth2p-ethip4vxlan-l2xcbase-func.robot +++ b/tests/func/vxlan/eth2p-ethip4vxlan-l2xcbase-func.robot @@ -18,8 +18,8 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *RFC7348 VXLAN: L2 cross-connect with VXLAN test cases* | ... | ... | *[Top] Network topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -47,20 +47,20 @@ | | ... | interface to TG and one VXLAN tunnel interface towards the other | | ... | DUT. [Ver] Make TG send ICMPv4 Echo Req between two of its | | ... | interfaces; verify all packets are received. [Ref] RFC7348. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | ${dut1_to_dut2_name}= | Get interface name | ${dut1_node} | ${dut1_to_dut2} | | ${dut2_to_dut1_name}= | Get interface name | ${dut2_node} | ${dut2_to_dut1} -| | And IP addresses are set on interfaces | ${dut1_node} | ${dut1_to_dut2_name} | ${NONE} +| | And Configure IP addresses and neighbors on interfaces | ${dut1_node} | ${dut1_to_dut2_name} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1_name} | ${NONE} | | ${dut1s_vxlan}= | When Create VXLAN interface | ${dut1_node} | ${VNI} | | | ... | ${dut1s_ip_address} | ${dut2s_ip_address} -| | And Interfaces are added to xconnect | ${dut1_node} +| | And Add interfaces to L2XC | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1s_vxlan} | | ${dut2s_vxlan}= | And Create VXLAN interface | ${dut2_node} | ${VNI} | | | ... | ${dut2s_ip_address} | ${dut1s_ip_address} -| | And Interfaces are added to xconnect | ${dut2_node} +| | And Add interfaces to L2XC | ${dut2_node} | | ... | ${dut2_to_tg} | ${dut2s_vxlan} -| | Then Send and receive ICMPv4 bidirectionally +| | Then Send ICMPv4 bidirectionally and verify received packets | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} diff --git a/tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot b/tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot index 6e1e6e8dcb..429d9a3353 100644 --- a/tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot +++ b/tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot @@ -21,11 +21,11 @@ | Library | resources.libraries.python.Trace | Library | resources.libraries.python.IPv6Setup | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV -| Test Setup | Func Test Setup -| Test Teardown | Run Keywords | Func Test Teardown -| ... | AND | Run keyword | Qemu Teardown | ${dut1_node} +| Test Setup | Set up functional test +| Test Teardown | Run Keywords | Tear down functional test +| ... | AND | Run keyword | Tear down QEMU | ${dut1_node} | ... | ${${qemu1}} | ${qemu1} -| ... | AND | Run keyword | Qemu Teardown | ${dut2_node} +| ... | AND | Run keyword | Tear down QEMU | ${dut2_node} | ... | ${${qemu2}} | ${qemu2} | Documentation | *L2BD with VM combined with VXLAN test cases - IPv6* | ... @@ -79,22 +79,22 @@ | | ... | these TG interfaces. | | ... | [Ref] RFC7348. | | [Tags] | VPP_VM_ENV -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | When VPP Vhost interfaces for L2BD forwarding are setup | ${dut1_node} +| | And Set interfaces in 3-node circular topology up +| | When Configure vhost interfaces for L2BD forwarding | ${dut1_node} | | ... | ${sock1} | | ... | ${sock2} | | ... | ${dut1_vhost1} | | ... | ${dut1_vhost2} -| | And VPP Vhost interfaces for L2BD forwarding are setup | ${dut2_node} +| | And Configure vhost interfaces for L2BD forwarding | ${dut2_node} | | ... | ${sock1} | | ... | ${sock2} | | ... | ${dut2_vhost1} | | ... | ${dut2_vhost2} -| | And VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1} +| | And Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1} | | ... | ${sock2} | ${qemu1} -| | And VM for Vhost L2BD forwarding is setup | ${dut2_node} | ${sock1} +| | And Configure VM for vhost L2BD forwarding | ${dut2_node} | ${sock1} | | ... | ${sock2} | ${qemu2} | | And Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${ip6_addr1} | | ... | ${ip6_prefix} @@ -107,13 +107,13 @@ | | | ... | ${ip6_addr1} | ${ip6_addr2} | | ${dut2s_vxlan}= | And Create VXLAN interface | ${dut2_node} | ${vni_1} | | | ... | ${ip6_addr2} | ${ip6_addr1} -| | And Interfaces are added to BD | ${dut1_node} | ${bd_id1} +| | And Add interfaces to L2BD | ${dut1_node} | ${bd_id1} | | ... | ${dut1_to_tg} | ${${dut1_vhost1}} -| | And Interfaces are added to BD | ${dut1_node} | ${bd_id2} +| | And Add interfaces to L2BD | ${dut1_node} | ${bd_id2} | | ... | ${dut1s_vxlan} | ${${dut1_vhost2}} -| | And Interfaces are added to BD | ${dut2_node} | ${bd_id1} +| | And Add interfaces to L2BD | ${dut2_node} | ${bd_id1} | | ... | ${dut2_to_tg} | ${${dut2_vhost1}} -| | And Interfaces are added to BD | ${dut2_node} | ${bd_id2} +| | And Add interfaces to L2BD | ${dut2_node} | ${bd_id2} | | ... | ${dut2s_vxlan} | ${${dut2_vhost2}} -| | Then Send and receive ICMPv6 bidirectionally +| | Then Send ICMPv6 bidirectionally and verify received packets | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} diff --git a/tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-func.robot b/tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-func.robot index 4e03dd517d..f817baa3a6 100644 --- a/tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-func.robot +++ b/tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-func.robot @@ -21,8 +21,8 @@ | Library | resources.libraries.python.Trace | Library | resources.libraries.python.IPv6Setup | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *Bridge-domain with VXLAN test cases - IPv6* | ... | ... | *[Top] Network topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -58,9 +58,9 @@ | | ... | interfaces to be switched by DUT1 and DUT2; verify all packets | | ... | are received. [Ref] RFC7348. | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${ip6_addr1} | | ... | ${ip6_prefix} | | And Set Interface Address | ${dut2_node} | ${dut2_to_dut1} | ${ip6_addr2} @@ -70,11 +70,11 @@ | | And Vpp All RA Suppress Link Layer | ${nodes} | | ${dut1s_vxlan}= | When Create VXLAN interface | ${dut1_node} | ${vni_1} | | | ... | ${ip6_addr1} | ${ip6_addr2} -| | And Interfaces are added to BD | ${dut1_node} | ${bd_id1} +| | And Add interfaces to L2BD | ${dut1_node} | ${bd_id1} | | ... | ${dut1_to_tg} | ${dut1s_vxlan} | | ${dut2s_vxlan}= | And Create VXLAN interface | ${dut2_node} | ${vni_1} | | | ... | ${ip6_addr2} | ${ip6_addr1} -| | And Interfaces are added to BD | ${dut2_node} | ${bd_id1} +| | And Add interfaces to L2BD | ${dut2_node} | ${bd_id1} | | ... | ${dut2_to_tg} | ${dut2s_vxlan} -| | Then Send and receive ICMPv6 bidirectionally +| | Then Send ICMPv6 bidirectionally and verify received packets | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} diff --git a/tests/func/vxlan/eth4p-ethip4vxlan-l2bdbasemaclrn-l2shg-func.robot b/tests/func/vxlan/eth4p-ethip4vxlan-l2bdbasemaclrn-l2shg-func.robot index 8afb22a717..8ae7286583 100644 --- a/tests/func/vxlan/eth4p-ethip4vxlan-l2bdbasemaclrn-l2shg-func.robot +++ b/tests/func/vxlan/eth4p-ethip4vxlan-l2bdbasemaclrn-l2shg-func.robot @@ -20,8 +20,8 @@ | Resource | resources/libraries/robot/double_qemu_setup.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2BD with SHG combined with VXLAN test cases - IPv4* | ... | ... | *[Top] Network topologies:* TG=DUT1=DUT2=TG 3-node circular topology @@ -67,10 +67,10 @@ | | ... | TG interfaces connected to DUT2 that are isolated by SHG on DUT1. | | ... | [Ref] RFC7348. | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO -| | Given Path for 3-node BD-SHG testing is set | ${nodes['TG']} +| | Given Configure path for 3-node BD-SHG test | ${nodes['TG']} | | ... | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} -| | And Interfaces in 3-node BD-SHG testing are up +| | And Set interfaces in 3-node BD-SHG test up | | And Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${ip4_addr1} | | ... | ${ip4_prefix} | | And Set Interface Address | ${dut2_node} | ${dut2_to_dut1} | ${ip4_addr2} @@ -91,39 +91,39 @@ | | And Set Interface State | ${dut2_node} | ${dut2s_vxlan2} | up | | And Vpp Node Interfaces Ready Wait | ${dut1_node} | | And Vpp Node Interfaces Ready Wait | ${dut2_node} -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg_if1} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if1} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg_if2} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1s_vxlan1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan1} | | ... | ${bd_id1} | ${shg1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1s_vxlan2} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan2} | | ... | ${bd_id1} | ${shg1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id2} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg_if1} +| | And Create bridge domain | ${dut2_node} | ${bd_id2} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if1} | | ... | ${bd_id2} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2s_vxlan1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan1} | | ... | ${bd_id2} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id3} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg_if2} +| | And Create bridge domain | ${dut2_node} | ${bd_id3} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if2} | | ... | ${bd_id3} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2s_vxlan2} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan2} | | ... | ${bd_id3} -| | Then Send and receive ICMPv4 bidirectionally | ${tg_node} +| | Then Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if1} | | ... | ${tg_to_dut2_if1} -| | And Send and receive ICMPv4 bidirectionally | ${tg_node} +| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if1} | | ... | ${tg_to_dut2_if2} -| | And Send and receive ICMPv4 bidirectionally | ${tg_node} +| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if2} | | ... | ${tg_to_dut2_if1} -| | And Send and receive ICMPv4 bidirectionally | ${tg_node} +| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if2} | | ... | ${tg_to_dut2_if2} | | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMPv4 bidirectionally +| | ... | Send ICMPv4 bidirectionally and verify received packets | | | ... | ${tg_node} | ${tg_to_dut2_if1} | | | ... | ${tg_to_dut2_if2} @@ -140,10 +140,10 @@ | | ... | to be switched by DUT1 and DUT2; verify packets are switched between | | ... | all TG interfaces. [Ref] RFC7348. | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO -| | Given Path for 3-node BD-SHG testing is set | ${nodes['TG']} +| | Given Configure path for 3-node BD-SHG test | ${nodes['TG']} | | ... | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} -| | And Interfaces in 3-node BD-SHG testing are up +| | And Set interfaces in 3-node BD-SHG test up | | And Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${ip4_addr1} | | ... | ${ip4_prefix} | | And Set Interface Address | ${dut2_node} | ${dut2_to_dut1} | ${ip4_addr2} @@ -164,37 +164,37 @@ | | And Set Interface State | ${dut2_node} | ${dut2s_vxlan2} | up | | And Vpp Node Interfaces Ready Wait | ${dut1_node} | | And Vpp Node Interfaces Ready Wait | ${dut2_node} -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg_if1} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if1} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg_if2} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1s_vxlan1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan1} | | ... | ${bd_id1} | ${shg1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1s_vxlan2} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan2} | | ... | ${bd_id1} | ${shg2} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id2} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg_if1} +| | And Create bridge domain | ${dut2_node} | ${bd_id2} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if1} | | ... | ${bd_id2} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2s_vxlan1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan1} | | ... | ${bd_id2} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id3} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg_if2} +| | And Create bridge domain | ${dut2_node} | ${bd_id3} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if2} | | ... | ${bd_id3} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2s_vxlan2} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan2} | | ... | ${bd_id3} -| | Then Send and receive ICMPv4 bidirectionally | ${tg_node} +| | Then Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if1} | | ... | ${tg_to_dut2_if1} -| | And Send and receive ICMPv4 bidirectionally | ${tg_node} +| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if1} | | ... | ${tg_to_dut2_if2} -| | And Send and receive ICMPv4 bidirectionally | ${tg_node} +| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if2} | | ... | ${tg_to_dut2_if1} -| | And Send and receive ICMPv4 bidirectionally | ${tg_node} +| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if2} | | ... | ${tg_to_dut2_if2} -| | And Send and receive ICMPv4 bidirectionally | ${tg_node} +| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut2_if1} | | ... | ${tg_to_dut2_if2} diff --git a/tests/func/vxlan/eth4p-ethip6vxlan-l2bdbasemaclrn-l2shg-func.robot b/tests/func/vxlan/eth4p-ethip6vxlan-l2bdbasemaclrn-l2shg-func.robot index 512d94361f..e4dec5bd1e 100644 --- a/tests/func/vxlan/eth4p-ethip6vxlan-l2bdbasemaclrn-l2shg-func.robot +++ b/tests/func/vxlan/eth4p-ethip6vxlan-l2bdbasemaclrn-l2shg-func.robot @@ -21,8 +21,8 @@ | Library | resources.libraries.python.Trace | Library | resources.libraries.python.IPv6Setup | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2BD with SHG combined with VXLAN test cases - IPv6* | ... | ... | *[Top] Network topologies:* TG=DUT1=DUT2=TG 3-node circular topology @@ -68,10 +68,10 @@ | | ... | TG interfaces connected to DUT2 that are isolated by SHG on DUT1. | | ... | [Ref] RFC7348. | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO -| | Given Path for 3-node BD-SHG testing is set | ${nodes['TG']} +| | Given Configure path for 3-node BD-SHG test | ${nodes['TG']} | | ... | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} -| | And Interfaces in 3-node BD-SHG testing are up +| | And Set interfaces in 3-node BD-SHG test up | | And Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${ip6_addr1} | | ... | ${ip6_prefix} | | And Set Interface Address | ${dut2_node} | ${dut2_to_dut1} | ${ip6_addr2} @@ -93,39 +93,39 @@ | | And Set Interface State | ${dut2_node} | ${dut2s_vxlan2} | up | | And Vpp Node Interfaces Ready Wait | ${dut1_node} | | And Vpp Node Interfaces Ready Wait | ${dut2_node} -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg_if1} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if1} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg_if2} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1s_vxlan1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan1} | | ... | ${bd_id1} | ${shg1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1s_vxlan2} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan2} | | ... | ${bd_id1} | ${shg1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id2} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg_if1} +| | And Create bridge domain | ${dut2_node} | ${bd_id2} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if1} | | ... | ${bd_id2} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2s_vxlan1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan1} | | ... | ${bd_id2} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id3} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg_if2} +| | And Create bridge domain | ${dut2_node} | ${bd_id3} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if2} | | ... | ${bd_id3} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2s_vxlan2} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan2} | | ... | ${bd_id3} -| | Then Send and receive ICMPv6 bidirectionally | ${tg_node} +| | Then Send ICMPv6 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if1} | | ... | ${tg_to_dut2_if1} -| | And Send and receive ICMPv6 bidirectionally | ${tg_node} +| | And Send ICMPv6 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if1} | | ... | ${tg_to_dut2_if2} -| | And Send and receive ICMPv6 bidirectionally | ${tg_node} +| | And Send ICMPv6 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if2} | | ... | ${tg_to_dut2_if1} -| | And Send and receive ICMPv6 bidirectionally | ${tg_node} +| | And Send ICMPv6 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if2} | | ... | ${tg_to_dut2_if2} | | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMPv6 bidirectionally +| | ... | Send ICMPv6 bidirectionally and verify received packets | | | ... | ${tg_node} | ${tg_to_dut2_if1} | | | ... | ${tg_to_dut2_if2} @@ -142,10 +142,10 @@ | | ... | to be switched by DUT1 and DUT2; verify packets are switched between | | ... | all TG interfaces. [Ref] RFC7348. | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO -| | Given Path for 3-node BD-SHG testing is set | ${nodes['TG']} +| | Given Configure path for 3-node BD-SHG test | ${nodes['TG']} | | ... | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} -| | And Interfaces in 3-node BD-SHG testing are up +| | And Set interfaces in 3-node BD-SHG test up | | And Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${ip6_addr1} | | ... | ${ip6_prefix} | | And Set Interface Address | ${dut2_node} | ${dut2_to_dut1} | ${ip6_addr2} @@ -167,37 +167,37 @@ | | And Set Interface State | ${dut2_node} | ${dut2s_vxlan2} | up | | And Vpp Node Interfaces Ready Wait | ${dut1_node} | | And Vpp Node Interfaces Ready Wait | ${dut2_node} -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg_if1} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if1} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg_if2} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1s_vxlan1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan1} | | ... | ${bd_id1} | ${shg1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1s_vxlan2} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan2} | | ... | ${bd_id1} | ${shg2} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id2} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg_if1} +| | And Create bridge domain | ${dut2_node} | ${bd_id2} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if1} | | ... | ${bd_id2} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2s_vxlan1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan1} | | ... | ${bd_id2} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id3} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg_if2} +| | And Create bridge domain | ${dut2_node} | ${bd_id3} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if2} | | ... | ${bd_id3} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2s_vxlan2} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan2} | | ... | ${bd_id3} -| | Then Send and receive ICMPv6 bidirectionally | ${tg_node} +| | Then Send ICMPv6 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if1} | | ... | ${tg_to_dut2_if1} -| | And Send and receive ICMPv6 bidirectionally | ${tg_node} +| | And Send ICMPv6 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if1} | | ... | ${tg_to_dut2_if2} -| | And Send and receive ICMPv6 bidirectionally | ${tg_node} +| | And Send ICMPv6 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if2} | | ... | ${tg_to_dut2_if1} -| | And Send and receive ICMPv6 bidirectionally | ${tg_node} +| | And Send ICMPv6 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if2} | | ... | ${tg_to_dut2_if2} -| | And Send and receive ICMPv6 bidirectionally | ${tg_node} +| | And Send ICMPv6 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut2_if1} | | ... | ${tg_to_dut2_if2} |