diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/suites/bridge_domain/bridge_domain_untagged.robot | 33 | ||||
| -rw-r--r-- | tests/suites/cop/cop_whitelist_blacklist.robot | 61 | ||||
| -rw-r--r-- | tests/suites/cop/cop_whitelist_blacklist_IPv6.robot | 78 | ||||
| -rw-r--r-- | tests/suites/ipv4/ipv4_iacl_untagged.robot | 101 | ||||
| -rw-r--r-- | tests/suites/ipv6/ipv6_iacl_untagged.robot | 104 | ||||
| -rw-r--r-- | tests/suites/tagging/qinq_l2_xconnect.robot | 17 | ||||
| -rw-r--r-- | tests/suites/vxlan/vxlan_bd_dot1q.robot | 29 | ||||
| -rw-r--r-- | tests/suites/vxlan/vxlan_bd_untagged.robot | 25 | ||||
| -rw-r--r-- | tests/suites/vxlan/vxlan_xconnect_untagged.robot | 25 |
9 files changed, 258 insertions, 215 deletions
diff --git a/tests/suites/bridge_domain/bridge_domain_untagged.robot b/tests/suites/bridge_domain/bridge_domain_untagged.robot index 6f7cd6ea86..bada88d47a 100644 --- a/tests/suites/bridge_domain/bridge_domain_untagged.robot +++ b/tests/suites/bridge_domain/bridge_domain_untagged.robot @@ -14,6 +14,7 @@ *** Settings *** | Resource | resources/libraries/robot/default.robot | Resource | resources/libraries/robot/bridge_domain.robot +| Resource | resources/libraries/robot/testing_path.robot | Resource | resources/libraries/robot/qemu.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV @@ -47,13 +48,14 @@ | | ... | add there two interfaces and check traffic | | ... | bidirectionally. | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO -| | Given Path for 2-node BD testing is set | ${nodes['TG']} | ${nodes['DUT1']} +| | Given Path for 2-node testing is set +| | ... | ${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} | | ... | ${bd_id1} | | And Interface is added to bridge domain | ${dut_node} | ${dut_to_tg_if2} | | ... | ${bd_id1} -| | And Interfaces on all VPP nodes in the path are up | ${dut_node} | | Then Send and receive ICMPv4 bidirectionally | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} @@ -62,8 +64,9 @@ | | ... | add two interfaces to each bridge domain and check traffic | | ... | bidirectionally. | | [Tags] | 3_NODE_SINGLE_LINK_TOPO -| | Given Path for 3-node BD testing is set | ${nodes['TG']} | ${nodes['DUT1']} -| | ... | ${nodes['DUT2']} +| | Given Path for 3-node testing is set +| | ... | ${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} | | ... | ${bd_id1} @@ -74,8 +77,6 @@ | | ... | ${bd_id2} | | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_dut1} | | ... | ${bd_id2} -| | And Interfaces on all VPP nodes in the path are up | ${dut1_node} -| | ... | ${dut2_node} | | Then Send and receive ICMPv4 bidirectionally | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} @@ -85,8 +86,9 @@ | | ... | static L2FIB entry on each interface and check traffic | | ... | bidirectionally. | | [Tags] | 3_NODE_SINGLE_LINK_TOPO -| | Given Path for 3-node BD testing is set | ${nodes['TG']} | ${nodes['DUT1']} -| | ... | ${nodes['DUT2']} +| | Given Path for 3-node testing is set +| | ... | ${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} | | ... | learn=${FALSE} | | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg} @@ -119,8 +121,6 @@ | | ... | ${dut2_node} | | ... | ${dut2_to_tg} | | ... | ${bd_id2} -| | And Interfaces on all VPP nodes in the path are up | ${dut1_node} -| | ... | ${dut2_node} | | Then Send and receive ICMPv4 bidirectionally | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} @@ -133,6 +133,7 @@ | | Given Path for 3-node BD-SHG testing is set | ${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} | | ... | ${bd_id1} | ${shg1} @@ -147,8 +148,6 @@ | | ... | ${bd_id2} | ${shg2} | | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_dut1} | | ... | ${bd_id2} -| | And Interfaces on all VPP nodes in the path are up | ${dut1_node} -| | ... | ${dut2_node} | | Then Send and receive ICMPv4 bidirectionally | ${tg_node} | | ... | ${tg_to_dut1_if1} | | ... | ${tg_to_dut2_if1} @@ -175,7 +174,9 @@ | | ... | interfaces and check packet forwarding through VM via two | | ... | L2 bridge domains with learning enabled. | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO | VPP_VM_ENV -| | Given Path for 2-node BD testing is set | ${nodes['TG']} | ${nodes['DUT1']} +| | Given Path for 2-node testing is set +| | ... | ${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} | | ... | ${sock1} | | ... | ${sock2} @@ -189,7 +190,6 @@ | | ... | ${bd_id2} | | And Interface is added to bridge domain | ${dut_node} | ${vhost_if2} | | ... | ${bd_id2} -| | And Interfaces on all VPP nodes in the path are up | ${dut_node} | | And VM for Vhost L2BD forwarding is setup | ${dut_node} | ${sock1} | | ... | ${sock2} | | Then Send and receive ICMPv4 bidirectionally | ${tg_node} | ${tg_to_dut_if1} @@ -203,7 +203,9 @@ | | ... | L2 bridge domains with learning disabled (static L2BFIB | | ... | entries). | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO | VPP_VM_ENV -| | Given Path for 2-node BD testing is set | ${nodes['TG']} | ${nodes['DUT1']} +| | Given Path for 2-node testing is set +| | ... | ${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} | | ... | ${sock1} | | ... | ${sock2} @@ -229,7 +231,6 @@ | | ... | ${bd_id2} | | And Interface is added to bridge domain | ${dut_node} | ${vhost_if2} | | ... | ${bd_id2} -| | And Interfaces on all VPP nodes in the path are up | ${dut_node} | | And Destination port is added to L2FIB on DUT node | ${tg_node} | | ... | ${tg_to_dut_if2} | | ... | ${dut_node} diff --git a/tests/suites/cop/cop_whitelist_blacklist.robot b/tests/suites/cop/cop_whitelist_blacklist.robot index ad02b4c499..00267bf29b 100644 --- a/tests/suites/cop/cop_whitelist_blacklist.robot +++ b/tests/suites/cop/cop_whitelist_blacklist.robot @@ -12,14 +12,13 @@ # limitations under the License. *** Settings *** -| Library | resources.libraries.python.topology.Topology -| Library | resources.libraries.python.NodePath | Library | resources.libraries.python.Trace +| Library | resources.libraries.python.Cop | Resource | resources/libraries/robot/default.robot | Resource | resources/libraries/robot/interfaces.robot | Resource | resources/libraries/robot/ipv4.robot | Resource | resources/libraries/robot/traffic.robot -| Resource | resources/libraries/robot/cop.robot +| Resource | resources/libraries/robot/testing_path.robot | 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 @@ -59,47 +58,55 @@ *** Test Cases *** | VPP permits packets based on IPv4 src addr | | [Documentation] | COP Whitelist test with basic setup. -| | Given Setup Nodes And Variables | ${tg_node} | ${dut1_node} | ${dut2_node} -| | And L2 setup xconnect on DUT | ${dut2_node} | ${dut2_if1} | ${dut2_if2} +| | Given Path for 3-node testing is set +| | ... | ${tg_node} | ${dut1_node} | ${dut2_node} | ${tg_node} +| | And Interfaces in 3-node path are up +| | And L2 setup xconnect on DUT +| | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And Set Interface Address -| | ... | ${dut1_node} | ${dut1_if1} | ${dut1_if1_ip} | ${ip_prefix} +| | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_if1_ip} | ${ip_prefix} | | And Set Interface Address -| | ... | ${dut1_node} | ${dut1_if2} | ${dut1_if2_ip} | ${ip_prefix} +| | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_if2_ip} | ${ip_prefix} | | And Add Arp On Dut -| | ... | ${dut1_node} | ${dut1_if1} | ${dut1_if1_ip_GW} | ${tg_if1_mac} +| | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_if1_ip_GW} | ${tg_to_dut1_mac} | | And Add Arp On Dut -| | ... | ${dut1_node} | ${dut1_if2} | ${dut1_if2_ip_GW} | ${tg_if2_mac} +| | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_if2_ip_GW} | ${tg_to_dut2_mac} | | And Vpp Route Add | ${dut1_node} -| | ... | ${test_dst_ip} | ${ip_prefix} | ${dut1_if2_ip_GW} | ${dut1_if2} +| | ... | ${test_dst_ip} | ${ip_prefix} | ${dut1_if2_ip_GW} | ${dut1_to_dut2} | | And Add fib table | ${dut1_node} | | ... | ${cop_dut_ip} | ${ip_prefix} | ${fib_table_number} | local | | When COP Add whitelist Entry -| | ... | ${dut1_node} | ${dut1_if1} | ip4 | ${fib_table_number} -| | And COP interface enable or disable | ${dut1_node} | ${dut1_if1} | enable -| | Then Send Packet And Check Headers | ${tg_node} | -| | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_if1} | ${tg_if1_mac} | -| | ... | ${dut1_if1_mac} | ${tg_if2} | ${dut1_if2_mac} | ${tg_if2_mac} +| | ... | ${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} +| | ... | ${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} | VPP drops packets based on IPv4 src addr | | [Documentation] | COP blacklist test with basic setup. -| | Given Setup Nodes And Variables | ${tg_node} | ${dut1_node} | ${dut2_node} -| | And L2 setup xconnect on DUT | ${dut2_node} | ${dut2_if1} | ${dut2_if2} +| | Given Path for 3-node testing is set +| | ... | ${tg_node} | ${dut1_node} | ${dut2_node} | ${tg_node} +| | And Interfaces in 3-node path are up +| | And L2 setup xconnect on DUT +| | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And Set Interface Address -| | ... | ${dut1_node} | ${dut1_if1} | ${dut1_if1_ip} | ${ip_prefix} +| | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_if1_ip} | ${ip_prefix} | | And Set Interface Address -| | ... | ${dut1_node} | ${dut1_if2} | ${dut1_if2_ip} | ${ip_prefix} +| | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_if2_ip} | ${ip_prefix} | | And Add Arp On Dut -| | ... | ${dut1_node} | ${dut1_if1} | ${dut1_if1_ip_GW} | ${tg_if1_mac} +| | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_if1_ip_GW} | ${tg_to_dut1_mac} | | And Add Arp On Dut -| | ... | ${dut1_node} | ${dut1_if2} | ${dut1_if2_ip_GW} | ${tg_if2_mac} +| | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_if2_ip_GW} | ${tg_to_dut2_mac} | | And Vpp Route Add | ${dut1_node} -| | ... | ${test_dst_ip} | ${ip_prefix} | ${dut1_if2_ip_GW} | ${dut1_if2} +| | ... | ${test_dst_ip} | ${ip_prefix} | ${dut1_if2_ip_GW} | ${dut1_to_dut2} | | And Add fib table | ${dut1_node} | | ... | ${cop_dut_ip} | ${ip_prefix} | ${fib_table_number} | drop | | When COP Add whitelist Entry -| | ... | ${dut1_node} | ${dut1_if1} | ip4 | ${fib_table_number} -| | And COP interface enable or disable | ${dut1_node} | ${dut1_if1} | enable -| | Then Send packet from Port to Port should failed | ${tg_node} | -| | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_if1} | ${tg_if1_mac} | -| | ... | ${dut1_if1_mac} | ${tg_if2} | ${dut1_if2_mac} | ${tg_if2_mac} +| | ... | ${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} +| | ... | ${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/suites/cop/cop_whitelist_blacklist_IPv6.robot b/tests/suites/cop/cop_whitelist_blacklist_IPv6.robot index a48ae01475..cb3871cd07 100644 --- a/tests/suites/cop/cop_whitelist_blacklist_IPv6.robot +++ b/tests/suites/cop/cop_whitelist_blacklist_IPv6.robot @@ -12,15 +12,13 @@ # limitations under the License. *** Settings *** -| Library | resources.libraries.python.topology.Topology -| Library | resources.libraries.python.NodePath | Library | resources.libraries.python.Trace +| Library | resources.libraries.python.Cop | Resource | resources/libraries/robot/default.robot | Resource | resources/libraries/robot/interfaces.robot | Resource | resources/libraries/robot/ipv6.robot -| Resource | resources/libraries/robot/ipv4.robot | Resource | resources/libraries/robot/traffic.robot -| Resource | resources/libraries/robot/cop.robot +| Resource | resources/libraries/robot/testing_path.robot | 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 @@ -64,57 +62,65 @@ *** Test Cases *** | VPP permits packets based on IPv6 src addr | | [Documentation] | COP Whitelist test with basic setup. -| | Given Setup Nodes And Variables | ${tg_node} | ${dut1_node} | ${dut2_node} -| | And L2 setup xconnect on DUT | ${dut2_node} | ${dut2_if1} | ${dut2_if2} +| | Given Path for 3-node testing is set +| | ... | ${tg_node} | ${dut1_node} | ${dut2_node} | ${tg_node} +| | And Interfaces in 3-node path are up +| | And L2 setup xconnect on DUT +| | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And VPP Set IF IPv6 Addr -| | ... | ${dut1_node} | ${dut1_if1} | ${dut1_if1_ip} | ${ip_prefix} +| | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_if1_ip} | ${ip_prefix} | | And VPP Set IF IPv6 Addr -| | ... | ${dut1_node} | ${dut1_if2} | ${dut1_if2_ip} | ${ip_prefix} +| | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_if2_ip} | ${ip_prefix} | | And VPP Set IF IPv6 Addr -| | ... | ${dut2_node} | ${dut2_if1} | ${dut2_if1_ip} | ${ip_prefix} +| | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_if1_ip} | ${ip_prefix} | | And VPP Set IF IPv6 Addr -| | ... | ${dut2_node} | ${dut2_if2} | ${dut2_if2_ip} | ${ip_prefix} -| | And Add Arp On Dut -| | ... | ${dut1_node} | ${dut1_if1} | ${dut1_if1_ip_GW} | ${tg_if1_mac} -| | And Add Arp On Dut -| | ... | ${dut1_node} | ${dut1_if2} | ${dut1_if2_ip_GW} | ${tg_if2_mac} +| | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_if2_ip} | ${ip_prefix} +| | And Add IP Neighbor +| | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_if1_ip_GW} | ${tg_to_dut1_mac} +| | And Add IP Neighbor +| | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_if2_ip_GW} | ${tg_to_dut2_mac} | | And Vpp Route Add | ${dut1_node} -| | ... | ${test_dst_ip} | ${ip_prefix} | ${dut1_if2_ip_GW} | ${dut1_if2} +| | ... | ${test_dst_ip} | ${ip_prefix} | ${dut1_if2_ip_GW} | ${dut1_to_dut2} | | And Vpp All Ra Suppress Link Layer | ${nodes} | | And Add fib table | ${dut1_node} | ${cop_dut_ip} | ${ip_prefix} | | | ... | ${fib_table_number} | local -| | When COP Add whitelist Entry | ${dut1_node} | ${dut1_if1} | ip6 | +| | When COP Add whitelist Entry | ${dut1_node} | ${dut1_to_tg} | ip6 | | | ... | ${fib_table_number} -| | And COP interface enable or disable | ${dut1_node} | ${dut1_if1} | enable -| | Then Send Packet And Check Headers | ${tg_node} | -| | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_if1} | ${tg_if1_mac} | -| | ... | ${dut1_if1_mac} | ${tg_if2} | ${dut1_if2_mac} | ${tg_if2_mac} +| | And COP interface enable or disable | ${dut1_node} | ${dut1_to_tg} | enable +| | Then Send Packet And Check 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} | VPP drops packets based on IPv6 src addr | | [Documentation] | COP blacklist test with basic setup. -| | Given Setup Nodes And Variables | ${tg_node} | ${dut1_node} | ${dut2_node} -| | And L2 setup xconnect on DUT | ${dut2_node} | ${dut2_if1} | ${dut2_if2} +| | Given Path for 3-node testing is set +| | ... | ${tg_node} | ${dut1_node} | ${dut2_node} | ${tg_node} +| | And Interfaces in 3-node path are up +| | And L2 setup xconnect on DUT +| | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And VPP Set IF IPv6 Addr -| | ... | ${dut1_node} | ${dut1_if1} | ${dut1_if1_ip} | ${ip_prefix} +| | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_if1_ip} | ${ip_prefix} | | And VPP Set IF IPv6 Addr -| | ... | ${dut1_node} | ${dut1_if2} | ${dut1_if2_ip} | ${ip_prefix} +| | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_if2_ip} | ${ip_prefix} | | And VPP Set IF IPv6 Addr -| | ... | ${dut2_node} | ${dut2_if1} | ${dut2_if1_ip} | ${ip_prefix} +| | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_if1_ip} | ${ip_prefix} | | And VPP Set IF IPv6 Addr -| | ... | ${dut2_node} | ${dut2_if2} | ${dut2_if2_ip} | ${ip_prefix} -| | And Add Arp On Dut -| | ... | ${dut1_node} | ${dut1_if1} | ${dut1_if1_ip_GW} | ${tg_if1_mac} -| | And Add Arp On Dut -| | ... | ${dut1_node} | ${dut1_if2} | ${dut1_if2_ip_GW} | ${tg_if2_mac} +| | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_if2_ip} | ${ip_prefix} +| | And Add IP Neighbor +| | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_if1_ip_GW} | ${tg_to_dut1_mac} +| | And Add IP Neighbor +| | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_if2_ip_GW} | ${tg_to_dut2_mac} | | And Vpp Route Add | ${dut1_node} -| | ... | ${test_dst_ip} | ${ip_prefix} | ${dut1_if2_ip_GW} | ${dut1_if2} +| | ... | ${test_dst_ip} | ${ip_prefix} | ${dut1_if2_ip_GW} | ${dut1_to_dut2} | | And Vpp All Ra Suppress Link Layer | ${nodes} | | And Add fib table | ${dut1_node} | | ... | ${cop_dut_ip} | ${ip_prefix} | ${fib_table_number} | drop | | When COP Add whitelist Entry -| | ... | ${dut1_node} | ${dut1_if1} | ip6 | ${fib_table_number} -| | And COP interface enable or disable | ${dut1_node} | ${dut1_if1} | enable -| | Then Send packet from Port to Port should failed | ${tg_node} | -| | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_if1} | ${tg_if1_mac} | -| | ... | ${dut1_if1_mac} | ${tg_if2} | ${dut1_if2_mac} | ${tg_if2_mac} +| | ... | ${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} +| | ... | ${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/suites/ipv4/ipv4_iacl_untagged.robot b/tests/suites/ipv4/ipv4_iacl_untagged.robot index 2e3d11cb3a..43460df1fa 100644 --- a/tests/suites/ipv4/ipv4_iacl_untagged.robot +++ b/tests/suites/ipv4/ipv4_iacl_untagged.robot @@ -15,8 +15,8 @@ | Resource | resources/libraries/robot/default.robot | Resource | resources/libraries/robot/counters.robot | Resource | resources/libraries/robot/interfaces.robot +| Resource | resources/libraries/robot/testing_path.robot | Resource | resources/libraries/robot/ipv4.robot -| Resource | resources/libraries/robot/iacl.robot | Resource | resources/libraries/robot/l2_xconnect.robot | Resource | resources/libraries/robot/traffic.robot | Library | resources.libraries.python.Classify.Classify @@ -29,9 +29,9 @@ | Test Teardown | Show packet trace on all DUTs | ${nodes} *** Variables *** -| ${dut1_if1_ip}= | 192.168.1.1 -| ${dut1_if2_ip}= | 192.168.2.1 -| ${dut1_if2_ip_GW}= | 192.168.2.2 +| ${dut1_to_tg_ip}= | 192.168.1.1 +| ${dut1_to_dut2_ip}= | 192.168.2.1 +| ${dut1_to_dut2_ip_GW}= | 192.168.2.2 | ${test_dst_ip}= | 32.0.0.1 | ${test_src_ip}= | 16.0.0.1 | ${prefix_length}= | 24 @@ -41,67 +41,77 @@ | | [Documentation] | Create classify table on VPP, add source IP address | | ... | of traffic into table and setup 'deny' traffic | | ... | and check if traffic is dropped. -| | Given Node path computed for 3-node topology +| | Given Path for 3-node testing is set | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in path are up -| | And IPv4 Addresses set on the node interfaces -| | ... | ${dut1_node} | ${dut1_if1} | ${dut1_if1_ip} | ${dut1_if2} -| | ... | ${dut1_if2_ip} | ${prefix_length} +| | And Interfaces in 3-node path are up +| | And 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} | | ${table_index} | ${skip_n} | ${match_n}= | When Vpp Create Classify Table | | ... | ${dut1_node} | ip4 | src | | And Vpp Configure Classify Session | | ... | ${dut1_node} | deny | ${table_index} | ${skip_n} | ${match_n} | | ... | ip4 | src | ${test_src_ip} | | And Vpp Enable Input Acl Interface -| | ... | ${dut1_node} | ${dut1_if1} | ip4 | ${table_index} +| | ... | ${dut1_node} | ${dut1_to_tg} | ip4 | ${table_index} | | And Add Arp On Dut -| | ... | ${dut1_node} | ${dut1_if2} | ${dut1_if2_ip_GW} | ${tg_if2_mac} +| | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip_GW} +| | ... | ${tg_to_dut2_mac} | | And Vpp Route Add -| | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | ${dut1_if2_ip_GW} -| | ... | ${dut1_if2} -| | And L2 setup xconnect on DUT | ${dut2_node} | ${dut2_if1} | ${dut2_if2} -| | Then Send packet from Port to Port should failed | ${tg_node} | -| | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_if1} | ${tg_if1_mac} | -| | ... | ${dut1_if1_mac} | ${tg_if2} | ${dut1_if2_mac} | ${tg_if2_mac} +| | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} +| | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} +| | And L2 setup xconnect on DUT +| | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} +| | Then Send packet from Port to Port should failed | ${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} + | VPP drops packets based on IPv4 destination addresses | | [Documentation] | Create classify table on VPP, add destination IP address | | ... | of traffic into table and setup 'deny' traffic | | ... | and check if traffic is dropped. -| | Given Node path computed for 3-node topology +| | Given Path for 3-node testing is set | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in path are up -| | And IPv4 Addresses set on the node interfaces -| | ... | ${dut1_node} | ${dut1_if1} | ${dut1_if1_ip} | ${dut1_if2} -| | ... | ${dut1_if2_ip} | ${prefix_length} +| | And Interfaces in 3-node path are up +| | And 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} | | ${table_index} | ${skip_n} | ${match_n}= | When Vpp Create Classify Table | | ... | ${dut1_node} | ip4 | dst | | And Vpp Configure Classify Session | | ... | ${dut1_node} | deny | ${table_index} | ${skip_n} | ${match_n} | | ... | ip4 | dst | ${test_dst_ip} | | And Vpp Enable Input Acl Interface -| | ... | ${dut1_node} | ${dut1_if1} | ip4 | ${table_index} +| | ... | ${dut1_node} | ${dut1_to_tg} | ip4 | ${table_index} | | And Add Arp On Dut -| | ... | ${dut1_node} | ${dut1_if2} | ${dut1_if2_ip_GW} | ${tg_if2_mac} +| | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip_GW} +| | ... | ${tg_to_dut2_mac} | | And Vpp Route Add -| | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | ${dut1_if2_ip_GW} -| | ... | ${dut1_if2} -| | And L2 setup xconnect on DUT | ${dut2_node} | ${dut2_if1} | ${dut2_if2} -| | Then Send packet from Port to Port should failed | ${tg_node} | -| | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_if1} | ${tg_if1_mac} | -| | ... | ${dut1_if1_mac} | ${tg_if2} | ${dut1_if2_mac} | ${tg_if2_mac} +| | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} +| | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} +| | And L2 setup xconnect on DUT +| | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} +| | Then Send packet from Port to Port should failed | ${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} | VPP drops packets based on IPv4 src-addr and dst-addr | | [Documentation] | Create classify table on VPP, add source and destination | | ... | IP address of traffic into table and setup 'deny' traffic | | ... | and check if traffic is dropped. -| | Given Node path computed for 3-node topology +| | Given Path for 3-node testing is set | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in path are up -| | And IPv4 Addresses set on the node interfaces -| | ... | ${dut1_node} | ${dut1_if1} | ${dut1_if1_ip} | ${dut1_if2} -| | ... | ${dut1_if2_ip} | ${prefix_length} +| | And Interfaces in 3-node path are up +| | And 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} | | ${table_index_1} | ${skip_n_1} | ${match_n_1}= | | ... | When Vpp Create Classify Table | ${dut1_node} | ip4 | src | | ${table_index_2} | ${skip_n_2} | ${match_n_2}= @@ -113,15 +123,18 @@ | | ... | ${dut1_node} | deny | ${table_index_2} | ${skip_n_2} | ${match_n_2} | | ... | ip4 | dst | ${test_dst_ip} | | And Vpp Enable Input Acl Interface -| | ... | ${dut1_node} | ${dut1_if1} | ip4 | ${table_index_1} +| | ... | ${dut1_node} | ${dut1_to_tg} | ip4 | ${table_index_1} | | And Vpp Enable Input Acl Interface -| | ... | ${dut1_node} | ${dut1_if1} | ip4 | ${table_index_2} +| | ... | ${dut1_node} | ${dut1_to_tg} | ip4 | ${table_index_2} | | And Add Arp On Dut -| | ... | ${dut1_node} | ${dut1_if2} | ${dut1_if2_ip_GW} | ${tg_if2_mac} +| | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip_GW} +| | ... | ${tg_to_dut2_mac} | | And Vpp Route Add -| | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | ${dut1_if2_ip_GW} -| | ... | ${dut1_if2} -| | And L2 setup xconnect on DUT | ${dut2_node} | ${dut2_if1} | ${dut2_if2} -| | Then Send packet from Port to Port should failed | ${tg_node} | -| | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_if1} | ${tg_if1_mac} | -| | ... | ${dut1_if1_mac} | ${tg_if2} | ${dut1_if2_mac} | ${tg_if2_mac} +| | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} +| | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} +| | And L2 setup xconnect on DUT +| | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} +| | Then Send packet from Port to Port should failed | ${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/suites/ipv6/ipv6_iacl_untagged.robot b/tests/suites/ipv6/ipv6_iacl_untagged.robot index 24a408b9be..ed91616653 100644 --- a/tests/suites/ipv6/ipv6_iacl_untagged.robot +++ b/tests/suites/ipv6/ipv6_iacl_untagged.robot @@ -15,7 +15,7 @@ | Resource | resources/libraries/robot/default.robot | Resource | resources/libraries/robot/counters.robot | Resource | resources/libraries/robot/interfaces.robot -| Resource | resources/libraries/robot/iacl.robot +| Resource | resources/libraries/robot/testing_path.robot | Resource | resources/libraries/robot/ipv6.robot | Resource | resources/libraries/robot/l2_xconnect.robot | Resource | resources/libraries/robot/traffic.robot @@ -29,11 +29,11 @@ | Test Teardown | Show packet trace on all DUTs | ${nodes} *** Variables *** -| ${dut1_if1_ip}= | 3ffe:62::1 -| ${dut1_if2_ip}= | 3ffe:63::1 -| ${dut1_if2_ip_GW}= | 3ffe:63::2 -| ${dut2_if1_ip}= | 3ffe:72::1 -| ${dut2_if2_ip}= | 3ffe:73::1 +| ${dut1_to_tg_ip}= | 3ffe:62::1 +| ${dut1_to_dut2_ip}= | 3ffe:63::1 +| ${dut1_to_dut2_ip_GW}= | 3ffe:63::2 +| ${dut2_to_dut1_ip}= | 3ffe:72::1 +| ${dut2_to_tg_ip}= | 3ffe:73::1 | ${test_dst_ip}= | 3ffe:64::1 | ${test_src_ip}= | 3ffe:61::1 | ${prefix_length}= | 64 @@ -43,68 +43,77 @@ | | [Documentation] | Create classify table on VPP, add source IP address | | ... | of traffic into table and setup 'deny' traffic | | ... | and check if traffic is dropped. -| | Given Node path computed for 3-node topology +| | Given Path for 3-node testing is set | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in path are up -| | And IPv6 Addresses set on the node interfaces -| | ... | ${dut1_node} | ${dut1_if1} | ${dut1_if1_ip} | ${dut1_if2} -| | ... | ${dut1_if2_ip} | ${prefix_length} +| | And Interfaces in 3-node path are 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} +| | ... | ${dut1_to_dut2} | ${dut1_to_dut2_ip} | ${prefix_length} | | ${table_index} | ${skip_n} | ${match_n}= | When Vpp Create Classify Table | | ... | ${dut1_node} | ip6 | src | | And Vpp Configure Classify Session | | ... | ${dut1_node} | deny | ${table_index} | ${skip_n} | ${match_n} | | ... | ip6 | src | ${test_src_ip} | | And Vpp Enable Input Acl Interface -| | ... | ${dut1_node} | ${dut1_if1} | ip6 | ${table_index} +| | ... | ${dut1_node} | ${dut1_to_tg} | ip6 | ${table_index} | | And Add Ip Neighbor -| | ... | ${dut1_node} | ${dut1_if2} | ${dut1_if2_ip_GW} | ${tg_if2_mac} +| | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip_GW} +| | ... | ${tg_to_dut2_mac} | | And Vpp Route Add -| | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | ${dut1_if2_ip_GW} -| | ... | ${dut1_if2} -| | And L2 setup xconnect on DUT | ${dut2_node} | ${dut2_if1} | ${dut2_if2} -| | Then Send packet from Port to Port should failed | ${tg_node} | -| | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_if1} | ${tg_if1_mac} | -| | ... | ${dut1_if1_mac} | ${tg_if2} | ${dut1_if2_mac} | ${tg_if2_mac} +| | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} +| | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} +| | And L2 setup xconnect on DUT +| | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} +| | Then Send packet from Port to Port should failed | ${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} | VPP drops packets based on IPv6 destination addresses | | [Documentation] | Create classify table on VPP, add destination IP address | | ... | of traffic into table and setup 'deny' traffic | | ... | and check if traffic is dropped. -| | Given Node path computed for 3-node topology +| | Given Path for 3-node testing is set | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in path are up -| | And IPv6 Addresses set on the node interfaces -| | ... | ${dut1_node} | ${dut1_if1} | ${dut1_if1_ip} | ${dut1_if2} -| | ... | ${dut1_if2_ip} | ${prefix_length} +| | And Interfaces in 3-node path are 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} +| | ... | ${dut1_to_dut2} | ${dut1_to_dut2_ip} | ${prefix_length} | | ${table_index} | ${skip_n} | ${match_n}= | When Vpp Create Classify Table | | ... | ${dut1_node} | ip6 | dst | | And Vpp Configure Classify Session | | ... | ${dut1_node} | deny | ${table_index} | ${skip_n} | ${match_n} | | ... | ip6 | dst | ${test_dst_ip} | | And Vpp Enable Input Acl Interface -| | ... | ${dut1_node} | ${dut1_if1} | ip6 | ${table_index} +| | ... | ${dut1_node} | ${dut1_to_tg} | ip6 | ${table_index} | | And Add Ip Neighbor -| | ... | ${dut1_node} | ${dut1_if2} | ${dut1_if2_ip_GW} | ${tg_if2_mac} +| | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip_GW} +| | ... | ${tg_to_dut2_mac} | | And Vpp Route Add -| | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | ${dut1_if2_ip_GW} -| | ... | ${dut1_if2} -| | And L2 setup xconnect on DUT | ${dut2_node} | ${dut2_if1} | ${dut2_if2} -| | Then Send packet from Port to Port should failed | ${tg_node} | -| | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_if1} | ${tg_if1_mac} | -| | ... | ${dut1_if1_mac} | ${tg_if2} | ${dut1_if2_mac} | ${tg_if2_mac} +| | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} +| | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} +| | And L2 setup xconnect on DUT +| | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} +| | Then Send packet from Port to Port should failed | ${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} | VPP drops packets based on IPv6 src-addr and dst-addr | | [Documentation] | Create classify table on VPP, add source and destination | | ... | IP address of traffic into table and setup 'deny' traffic | | ... | and check if traffic is dropped. -| | Given Node path computed for 3-node topology +| | Given Path for 3-node testing is set | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in path are up -| | And IPv6 Addresses set on the node interfaces -| | ... | ${dut1_node} | ${dut1_if1} | ${dut1_if1_ip} | ${dut1_if2} -| | ... | ${dut1_if2_ip} | ${prefix_length} +| | And Interfaces in 3-node path are 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} +| | ... | ${dut1_to_dut2} | ${dut1_to_dut2_ip} | ${prefix_length} | | ${table_index_1} | ${skip_n_1} | ${match_n_1}= | | ... | When Vpp Create Classify Table | ${dut1_node} | ip6 | src | | ${table_index_2} | ${skip_n_2} | ${match_n_2}= @@ -116,15 +125,18 @@ | | ... | ${dut1_node} | deny | ${table_index_2} | ${skip_n_2} | ${match_n_2} | | ... | ip6 | dst | ${test_dst_ip} | | And Vpp Enable Input Acl Interface -| | ... | ${dut1_node} | ${dut1_if1} | ip6 | ${table_index_1} +| | ... | ${dut1_node} | ${dut1_to_tg} | ip6 | ${table_index_1} | | And Vpp Enable Input Acl Interface -| | ... | ${dut1_node} | ${dut1_if1} | ip6 | ${table_index_2} +| | ... | ${dut1_node} | ${dut1_to_tg} | ip6 | ${table_index_2} | | And Add Ip Neighbor -| | ... | ${dut1_node} | ${dut1_if2} | ${dut1_if2_ip_GW} | ${tg_if2_mac} +| | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip_GW} +| | ... | ${tg_to_dut2_mac} | | And Vpp Route Add -| | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | ${dut1_if2_ip_GW} -| | ... | ${dut1_if2} -| | And L2 setup xconnect on DUT | ${dut2_node} | ${dut2_if1} | ${dut2_if2} -| | Then Send packet from Port to Port should failed | ${tg_node} | -| | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_if1} | ${tg_if1_mac} | -| | ... | ${dut1_if1_mac} | ${tg_if2} | ${dut1_if2_mac} | ${tg_if2_mac} +| | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} +| | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} +| | And L2 setup xconnect on DUT +| | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} +| | Then Send packet from Port to Port should failed | ${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/suites/tagging/qinq_l2_xconnect.robot b/tests/suites/tagging/qinq_l2_xconnect.robot index 786f870b5a..856d3accb5 100644 --- a/tests/suites/tagging/qinq_l2_xconnect.robot +++ b/tests/suites/tagging/qinq_l2_xconnect.robot @@ -13,6 +13,7 @@ *** Settings *** | Resource | resources/libraries/robot/default.robot +| Resource | resources/libraries/robot/testing_path.robot | Resource | resources/libraries/robot/tagging.robot | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace @@ -29,21 +30,21 @@ | ${tag_rewrite_method}= | pop-2 *** Test Cases *** -| VPP can push and pop two VLAN tags to traffic transfering through xconnect +| VPP can push and pop two VLAN tags to traffic transferring through xconnect | | [Documentation] | Push two tags on DUT 1 to traffic sent from TG, | | ... | pop two tags on DUT 2 from this traffic | | ... | and receive untagged traffic on TG. | | ... -| | Given Node path computed for 3-node topology +| | Given Path for 3-node testing is set | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in path are up +| | And Interfaces in 3-node path are up | | When VLAN subinterfaces initialized on 3-node topology -| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} +| | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} | | And L2 tag rewrite pop 2 tags setup on interfaces -| | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} +| | ... | ${dut1_node} | ${subif_index_1} | ${dut2_node} | ${subif_index_2} | | ... | ${tag_rewrite_method} | | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect -| | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} -| | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} -| | Then Send and receive ICMPv4 | ${tg} | ${tg_if1} | ${tg_if2} +| | ... | ${dut1_node} | ${dut1_to_tg} | ${subif_index_1} +| | ... | ${dut2_node} | ${dut2_to_tg} | ${subif_index_2} +| | Then Send and receive ICMPv4 | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} diff --git a/tests/suites/vxlan/vxlan_bd_dot1q.robot b/tests/suites/vxlan/vxlan_bd_dot1q.robot index f570e5898f..8b6b050f03 100644 --- a/tests/suites/vxlan/vxlan_bd_dot1q.robot +++ b/tests/suites/vxlan/vxlan_bd_dot1q.robot @@ -14,6 +14,7 @@ *** Settings *** | Documentation | VXLAN tunnel over Dot1Q tagged IPv4 traffic tests using bridge domain. | Resource | resources/libraries/robot/default.robot +| Resource | resources/libraries/robot/testing_path.robot | Resource | resources/libraries/robot/vxlan.robot | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace @@ -30,22 +31,22 @@ *** Test Cases *** | VPP can encapsulate L2 in VXLAN over IPv4 over Dot1Q | | [ Tags ] | EXPECTED_FAILING -| | Given Path for VXLAN testing is set -| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} -| | And Interfaces in path are up +| | Given Path for 3-node testing is set +| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} +| | And Interfaces in 3-node path are up | | And Vlan interfaces for VXLAN are created | ${VLAN} -| | ... | ${dut1} | ${dut1s_to_dut2} -| | ... | ${dut2} | ${dut2s_to_dut1} +| | ... | ${dut1_node} | ${dut1_to_dut2} +| | ... | ${dut2_node} | ${dut2_to_dut1} | | And IP addresses are set on interfaces -| | ... | ${dut1} | ${dut1s_vlan_name} | ${dut1s_vlan_index} -| | ... | ${dut2} | ${dut2s_vlan_name} | ${dut2s_vlan_index} -| | ${dut1s_vxlan}= | When Create VXLAN interface | ${dut1} | ${VNI} +| | ... | ${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 Interfaces are added to BD | ${dut1} | ${BID} -| | ... | ${dut1s_to_tg} | ${dut1s_vxlan} -| | ${dut2s_vxlan}= | And Create VXLAN interface | ${dut2} | ${VNI} +| | And Interfaces are added to BD | ${dut1_node} | ${BID} +| | ... | ${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 BD | ${dut2} | ${BID} -| | ... | ${dut2s_to_tg} | ${dut2s_vxlan} +| | And Interfaces are added to BD | ${dut2_node} | ${BID} +| | ... | ${dut2_to_tg} | ${dut2s_vxlan} | | Then Send and receive ICMPv4 bidirectionally -| | ... | ${tg} | ${tgs_to_dut1} | ${tgs_to_dut2} +| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} diff --git a/tests/suites/vxlan/vxlan_bd_untagged.robot b/tests/suites/vxlan/vxlan_bd_untagged.robot index 1eea3e90fa..ecf2c55e33 100644 --- a/tests/suites/vxlan/vxlan_bd_untagged.robot +++ b/tests/suites/vxlan/vxlan_bd_untagged.robot @@ -14,6 +14,7 @@ *** Settings *** | Documentation | VXLAN tunnel over untagged IPv4 traffic tests using bridge domain. | Resource | resources/libraries/robot/default.robot +| Resource | resources/libraries/robot/testing_path.robot | Resource | resources/libraries/robot/vxlan.robot | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace @@ -28,18 +29,18 @@ *** Test Cases *** | VPP can pass IPv4 bidirectionally through VXLAN -| | Given Path for VXLAN testing is set -| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} -| | And Interfaces in path are up -| | And IP addresses are set on interfaces | ${dut1} | ${dut1s_to_dut2} | ${NONE} -| | ... | ${dut2} | ${dut2s_to_dut1} | ${NONE} -| | ${dut1s_vxlan}= | When Create VXLAN interface | ${dut1} | ${VNI} +| | Given Path for 3-node testing is set +| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} +| | And Interfaces in 3-node path are up +| | And IP addresses are set on interfaces | ${dut1_node} | ${dut1_to_dut2} | ${NONE} +| | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} +| | ${dut1s_vxlan}= | When Create VXLAN interface | ${dut1_node} | ${VNI} | | | ... | ${dut1s_ip_address} | ${dut2s_ip_address} -| | And Interfaces are added to BD | ${dut1} | ${BID} -| | ... | ${dut1s_to_tg} | ${dut1s_vxlan} -| | ${dut2s_vxlan}= | And Create VXLAN interface | ${dut2} | ${VNI} +| | And Interfaces are added to BD | ${dut1_node} | ${BID} +| | ... | ${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 BD | ${dut2} | ${BID} -| | ... | ${dut2s_to_tg} | ${dut2s_vxlan} +| | And Interfaces are added to BD | ${dut2_node} | ${BID} +| | ... | ${dut2_to_tg} | ${dut2s_vxlan} | | Then Send and receive ICMPv4 bidirectionally -| | ... | ${tg} | ${tgs_to_dut1} | ${tgs_to_dut2} +| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} diff --git a/tests/suites/vxlan/vxlan_xconnect_untagged.robot b/tests/suites/vxlan/vxlan_xconnect_untagged.robot index 2a57468b70..5c52664c1c 100644 --- a/tests/suites/vxlan/vxlan_xconnect_untagged.robot +++ b/tests/suites/vxlan/vxlan_xconnect_untagged.robot @@ -14,6 +14,7 @@ *** Settings *** | Documentation | VXLAN tunnel over untagged IPv4 traffic tests using xconnect. | Resource | resources/libraries/robot/default.robot +| Resource | resources/libraries/robot/testing_path.robot | Resource | resources/libraries/robot/vxlan.robot | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace @@ -27,18 +28,18 @@ *** Test Cases *** | VPP can pass IPv4 bidirectionally through VXLAN -| | Given Path for VXLAN testing is set -| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} -| | And Interfaces in path are up -| | And IP addresses are set on interfaces | ${dut1} | ${dut1s_to_dut2} | ${NONE} -| | ... | ${dut2} | ${dut2s_to_dut1} | ${NONE} -| | ${dut1s_vxlan}= | When Create VXLAN interface | ${dut1} | ${VNI} +| | Given Path for 3-node testing is set +| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} +| | And Interfaces in 3-node path are up +| | And IP addresses are set on interfaces | ${dut1_node} | ${dut1_to_dut2} | ${NONE} +| | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} +| | ${dut1s_vxlan}= | When Create VXLAN interface | ${dut1_node} | ${VNI} | | | ... | ${dut1s_ip_address} | ${dut2s_ip_address} -| | And Interfaces are added to xconnect | ${dut1} -| | ... | ${dut1s_to_tg} | ${dut1s_vxlan} -| | ${dut2s_vxlan}= | And Create VXLAN interface | ${dut2} | ${VNI} +| | And Interfaces are added to xconnect | ${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} -| | ... | ${dut2s_to_tg} | ${dut2s_vxlan} +| | And Interfaces are added to xconnect | ${dut2_node} +| | ... | ${dut2_to_tg} | ${dut2s_vxlan} | | Then Send and receive ICMPv4 bidirectionally -| | ... | ${tg} | ${tgs_to_dut1} | ${tgs_to_dut2} +| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} |