X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=tests%2Ffunc%2Fhoneycomb%2F081_ietf_acl_traffic.robot;h=01dbe5750cd567632b8c5b966b69cb3c1fcd7255;hb=0d782a5690c7e28a329952fb93afde84ddd97078;hp=53d4bddc95eae556c8a0e52c5b09f4a0d54c9123;hpb=21921596d22a72cc4e4f7dee172ff17d1e5853cd;p=csit.git

diff --git a/tests/func/honeycomb/081_ietf_acl_traffic.robot b/tests/func/honeycomb/081_ietf_acl_traffic.robot
index 53d4bddc95..01dbe5750c 100644
--- a/tests/func/honeycomb/081_ietf_acl_traffic.robot
+++ b/tests/func/honeycomb/081_ietf_acl_traffic.robot
@@ -22,6 +22,9 @@
 | ${acl_name_l2}= | acl_l2
 | ${acl_name_l3_ip4}= | acl_l3_ip4
 | ${acl_name_l3_ip6}= | acl_l3_ip6
+| ${acl_name_l4}= | acl_l4
+| ${acl_name_mixed}= | acl_mixed
+| ${acl_name_multirule}= | acl_multirule
 
 *** Settings ***
 | Resource | resources/libraries/robot/default.robot
@@ -46,7 +49,7 @@
 | Force Tags | Honeycomb_sanity
 
 *** Test Cases ***
-| TC01: Honeycomb can configure L2 ACL MAC filtering through IETF-ACL node
+| TC01: L2 ACL MAC filtering through IETF-ACL node
 | | [Documentation]
 | | ... | [Top] TG=DUT1=TG.
 | | ... | [Enc] Eth-IPv4-TCP.
@@ -56,76 +59,112 @@
 | | ... | using different MACs. Receive all packets except those with\
 | | ... | MACs in the filtered ranges.
 | | [Teardown] | Run Keywords
-| | ... | Clear IETF-ACL settings | ${node} | ${dut_to_tg_if1} | AND
-| | ... | Show Packet Trace on All DUTs | ${nodes} | AND
-| | ... | Honeycomb removes all bridge domains
+| | ... | Clear IETF-ACL Settings | ${node} | ${dut_to_tg_if1} | AND
+| | ... | Show Packet Trace On All DUTs | ${nodes} | AND
+| | ... | Honeycomb Removes All Bridge Domains
 | | ... | ${node} | ${dut_to_tg_if1} | ${dut_to_tg_if2}
-| | Given Setup interfaces and bridge domain for ietf-ACL test
+| | Given Setup Interfaces And Bridge Domain For IETF-ACL Test
 | | ... | L2 | ${acl_name_l2}
-| | When Honeycomb creates ACL chain through IETF node
+| | When Honeycomb Creates ACL Chain Through IETF Node
 | | ... | ${dut_node} | ${acl_name_l2} | L2 | ${acl_settings}
-| | And Honeycomb assigns IETF-ACL chain to interface
+| | And Honeycomb Assigns IETF-ACL Chain To Interface
 | | ... | ${dut_node} | ${dut_to_tg_if1} | L2 | ingress | ${acl_name_l2}
 | | ... | permit
-| | Then Send TCP or UDP packet | ${tg_node} | ${src_ip} | ${dst_ip}
+| | Then Send TCP Or UDP Packet | ${tg_node} | ${src_ip} | ${dst_ip}
 | | ... | ${tg_to_dut_if1} | ${src_mac}
 | | ... | ${tg_to_dut_if2} | ${dst_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}
+| | And Run Keyword And Expect Error | TCP/UDP Rx timeout
+| | ... | Send TCP Or UDP Packet | ${tg_node} | ${src_ip} | ${dst_ip}
 | | ... | ${tg_to_dut_if1} | ${classify_src}
 | | ... | ${tg_to_dut_if2} | ${classify_dst}
 | | ... | 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}
+| | And Run Keyword And Expect Error | TCP/UDP Rx timeout
+| | ... | Send TCP Or UDP Packet | ${tg_node} | ${src_ip} | ${dst_ip}
 | | ... | ${tg_to_dut_if1} | ${classify_src2}
 | | ... | ${tg_to_dut_if2} | ${classify_dst2}
 | | ... | TCP | ${src_port} | ${dst_port}
 
-| TC02: Honeycomb can configure L3 ACL IPv4 filtering through IETF-ACL node
+| TC02: L2 ACL MAC filtering through IETF-ACL node on egress interface
+| | [Documentation]
+| | ... | [Top] TG=DUT1=TG.
+| | ... | [Enc] Eth-IPv4-TCP.
+| | ... | [Cfg] (Using Honeycomb API) On DUT1 bridge both interfaces to TG\
+| | ... | and configure L2 MAC ACL on egress interface.
+| | ... | [Ver] Send simple TCP packets from one TG interface to the other,\
+| | ... | using different MACs. Receive all packets except those with\
+| | ... | MACs in the filtered ranges.
+| | [Teardown] | Run Keywords
+| | ... | Clear IETF-ACL Settings | ${node} | ${dut_to_tg_if2} | AND
+| | ... | Show Packet Trace On All DUTs | ${nodes} | AND
+| | ... | Honeycomb Removes All Bridge Domains
+| | ... | ${node} | ${dut_to_tg_if1} | ${dut_to_tg_if2}
+| | Given Setup Interfaces And Bridge Domain For IETF-ACL Test
+| | ... | L2 | ${acl_name_l2}
+| | When Honeycomb Creates ACL Chain Through IETF Node
+| | ... | ${dut_node} | ${acl_name_l2} | L2 | ${acl_settings}
+| | And Honeycomb Assigns IETF-ACL Chain To Interface
+| | ... | ${dut_node} | ${dut_to_tg_if2} | L2 | egress | ${acl_name_l2}
+| | ... | permit
+| | Then Send TCP Or UDP Packet | ${tg_node} | ${src_ip} | ${dst_ip}
+| | ... | ${tg_to_dut_if1} | ${src_mac}
+| | ... | ${tg_to_dut_if2} | ${dst_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}
+| | ... | ${tg_to_dut_if1} | ${classify_src}
+| | ... | ${tg_to_dut_if2} | ${classify_dst}
+| | ... | 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}
+| | ... | ${tg_to_dut_if1} | ${classify_src2}
+| | ... | ${tg_to_dut_if2} | ${classify_dst2}
+| | ... | TCP | ${src_port} | ${dst_port}
+
+| TC03: L3 ACL IPv4 filtering through IETF-ACL node
 | | [Documentation]
 | | ... | [Top] TG=DUT1=TG.
 | | ... | [Enc] Eth-IPv4-TCP.
 | | ... | [Cfg] (Using Honeycomb API) On DUT1 set IPv4 addresses on both\
 | | ... | interfaces to TG, add ARP entry and routes, and configure L3 IPv4 ACL\
 | | ... | on ingress interface with src/dst IP and protocol.
-| | ... | [Ver] Send simple TCP packets from one TG interface to the other,\
-| | ... | using different IPv4 IPs. Receive all packets except those with\
-| | ... | IPs in the filtered ranges and UDP protocol payload.
-| | Given Setup interface IPs and routes for IPv4 ietf-ACL test
+| | ... | [Ver] Send simple TCP and UDP packets from one TG interface\
+| | ... | to the other, using different IPv4 IPs. Receive all packets except\
+| | ... | those with IPs in the filtered ranges and UDP protocol payload.
+| | Given Setup Interface IPs And Routes For IPv4 IETF-ACL Test
 | | ... | L3_IP4 | ${acl_name_l3_ip4}
-| | When Honeycomb creates ACL chain through IETF node
+| | When Honeycomb Creates ACL Chain Through IETF Node
 | | ... | ${dut_node} | ${acl_name_l3_ip4} | L3_IP4 | ${acl_settings}
-| | And Honeycomb assigns IETF-ACL chain to interface
+| | And Honeycomb Assigns IETF-ACL Chain To Interface
 | | ... | ${dut_node} | ${dut_to_tg_if1} | L3_IP4 | ingress | ${acl_name_l3_ip4}
 | | ... | permit
-| | Then Send TCP or UDP packet | ${tg_node}
+| | Then Send TCP Or UDP 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 | ${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}
+| | And Run Keyword And Expect Error | TCP/UDP Rx timeout
+| | ... | Send TCP Or UDP 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}
 | | ... | UDP | ${src_port} | ${dst_port}
 
-| TC03: Honeycomb can configure L3 ACL IPv6 filtering through IETF-ACL node
+| TC04: L3 ACL IPv6 filtering through IETF-ACL node
 | | [Documentation]
 | | ... | [Top] TG=DUT1=TG.
 | | ... | [Enc] Eth-IPv4-TCP.
 | | ... | [Cfg] (Using Honeycomb API) On DUT1 set IPv6 addresses on both\
 | | ... | interfaces to TG, add IP neighbor entry and routes, and configure\
 | | ... | L3 IPv6 ACL on ingress interface with src/dst IP and next-header.
-| | ... | [Ver] Send simple TCP packets from one TG interface to the other,\
-| | ... | using different IPv6 IPs. Receive all packets except those with\
-| | ... | IPs in the filtered ranges and UDP protocol payload.
+| | ... | [Ver] Send simple TCP and UDP packets from one TG interface\
+| | ... | to the other, using different IPv6 IPs. Receive all packets except\
+| | ... | those with IPs in the filtered ranges and UDP protocol payload.
 | | Given Path for 2-node testing is set
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
 | | And Import Variables | resources/test_data/honeycomb/ietf_acl.py
@@ -145,30 +184,156 @@
 | | ... | ${gateway} | interface=${dut_to_tg_if2} | use_sw_index=False
 | | And VPP Route Add | ${node} | ${classify_dst_net} | ${prefix_length}
 | | ... | ${gateway} | interface=${dut_to_tg_if2} | use_sw_index=False
-| | When Honeycomb creates ACL chain through IETF node
+| | When Honeycomb Creates ACL Chain Through IETF Node
 | | ... | ${dut_node} | ${acl_name_l3_ip6} | L3_IP6 | ${acl_settings}
-| | And Honeycomb assigns IETF-ACL chain to interface
+| | And Honeycomb Assigns IETF-ACL Chain To Interface
 | | ... | ${dut_node} | ${dut_to_tg_if1} | L3_IP6 | ingress | ${acl_name_l3_ip6}
 | | ... | permit
-| | Then Send TCP or UDP packet | ${tg_node}
+| | Then Send TCP Or UDP 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 | ${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}
+| | And Run Keyword And Expect Error | TCP/UDP Rx timeout
+| | ... | Send TCP Or UDP 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}
 | | ... | UDP | ${src_port} | ${dst_port}
 
-# TODO: Test case for L4 ACL port-based filtering
-# TODO: Test case for multiple classify rules and rule ordering
+| TC05: L4 ACL port filtering through IETF-ACL node
+| | [Documentation]
+| | ... | [Top] TG=DUT1=TG.
+| | ... | [Enc] Eth-IPv4-TCP.
+| | ... | [Cfg] (Using Honeycomb API) On DUT1 set IPv4 addresses on both\
+| | ... | interfaces to TG, add ARP entry and routes, and configure L4 port ACL\
+| | ... | on ingress interface with src/dst port ranges.
+| | ... | [Ver] Send simple TCP and UDP packets from one TG interface\
+| | ... | to the other, using different ports. Receive all packets except\
+| | ... | those with ports in the filtered ranges.
+| | Given Setup Interface IPs And Routes For IPv4 IETF-ACL Test
+| | ... | L4 | ${acl_name_l4}
+| | When Honeycomb Creates ACL Chain Through IETF Node
+| | ... | ${dut_node} | ${acl_name_l4} | mixed | ${acl_settings}
+| | And Honeycomb Assigns IETF-ACL Chain To Interface
+| | ... | ${dut_node} | ${dut_to_tg_if1} | mixed | ingress | ${acl_name_l4}
+| | ... | permit | L3
+| | Then Send TCP Or UDP 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}
+| | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac}
+| | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac}
+| | ... | TCP | ${classify_src} | ${classify_dst}
+
+| TC06: L2,L3 and L4 ACL together on L2-mode interface
+| | [Documentation]
+| | ... | [Top] TG=DUT1=TG.
+| | ... | [Enc] Eth-IPv4-TCP.
+| | ... | [Cfg] (Using Honeycomb API) On DUT1 bridge both interfaces to TG\
+| | ... | and configure L2, L3 and L4 ACL on ingress interface\
+| | ... | with src/dst MAC, src/dst IP, protocol and src/dst port ranges.
+| | ... | [Ver] Send simple TCP and UDP packets from one TG interface\
+| | ... | to the other, using different MACs, IPv4 IPs and ports. Receive\
+| | ... | all packets except those with MACs, IPs and ports in the filtered\
+| | ... | ranges and UDP protocol payload.
+| | [Teardown] | Run Keywords
+| | ... | Clear IETF-ACL Settings | ${node} | ${dut_to_tg_if1} | AND
+| | ... | Show Packet Trace On All DUTs | ${nodes} | AND
+| | ... | Honeycomb Removes All Bridge Domains
+| | ... | ${node} | ${dut_to_tg_if1} | ${dut_to_tg_if2}
+| | Given Setup Interfaces And Bridge Domain For IETF-ACL Test
+| | ... | mixed | ${acl_name_mixed}
+| | When Honeycomb Creates ACL Chain Through IETF Node
+| | ... | ${dut_node} | ${acl_name_mixed} | mixed | ${acl_settings}
+| | And Honeycomb Assigns IETF-ACL Chain To Interface
+| | ... | ${dut_node} | ${dut_to_tg_if1} | mixed | ingress | ${acl_name_mixed}
+| | ... | permit | L2
+| | Then Send TCP Or UDP Packet | ${tg_node} | ${src_ip} | ${dst_ip}
+| | ... | ${tg_to_dut_if1} | ${classify_src_mac}
+| | ... | ${tg_to_dut_if2} | ${classify_dst_mac}
+| | ... | TCP | ${src_port} | ${dst_port}
+| | And Run Keyword And Expect Error | TCP/UDP Rx timeout
+| | ... | Send TCP Or UDP Packet | ${tg_node}
+| | ... | ${classify_src_ip} | ${classify_dst_ip}
+| | ... | ${tg_to_dut_if1} | ${classify_src_mac}
+| | ... | ${tg_to_dut_if2} | ${classify_dst_mac}
+| | ... | UDP | ${classify_src_port} | ${classify_dst_port}
+
+| TC07: L2,L3 and L4 ACL together on L3-mode interface
+| | [Documentation]
+| | ... | [Top] TG=DUT1=TG.
+| | ... | [Enc] Eth-IPv4-TCP.
+| | ... | [Cfg] (Using Honeycomb API) On DUT1 set IPv4 addresses on both\
+| | ... | interfaces to TG, add ARP entry and routes, and configure\
+| | ... | L2, L3 and L4 ACL on ingress interface with src/dst MAC, src/dst IP,\
+| | ... | protocol and src/dst port ranges.
+| | ... | [Ver] Send simple TCP and UDP packets from one TG interface\
+| | ... | to the other, using different MACs, IPv4 IPs and ports. Receive\
+| | ... | all packets except those with MACs, IPs and ports in the filtered\
+| | ... | ranges and UDP protocol payload.
+| | Setup Interface IPs And Routes For IPv4 IETF-ACL Test
+| | ... | mixed | ${acl_name_mixed}
+| | When Honeycomb Creates ACL Chain Through IETF Node
+| | ... | ${dut_node} | ${acl_name_mixed} | mixed | ${acl_settings}
+| | And Honeycomb Assigns IETF-ACL Chain To Interface
+| | ... | ${dut_node} | ${dut_to_tg_if1} | mixed | ingress | ${acl_name_mixed}
+| | ... | permit | L3
+| | Then Send TCP Or UDP Packet | ${tg_node} | ${src_ip} | ${dst_ip}
+| | ... | ${tg_to_dut_if1} | ${classify_src_mac}
+| | ... | ${tg_to_dut_if2} | ${classify_dst_mac}
+| | ... | TCP | ${src_port} | ${dst_port}
+| | And Run Keyword And Expect Error | TCP/UDP Rx timeout
+| | ... | Send TCP Or UDP Packet | ${tg_node}
+| | ... | ${classify_src_ip} | ${classify_dst_ip}
+| | ... | ${tg_to_dut_if1} | ${classify_src_mac}
+| | ... | ${tg_to_dut_if2} | ${classify_dst_mac}
+| | ... | UDP | ${classify_src_port} | ${classify_dst_port}
+
+| TC08: Multiple classify rules in one ACL
+| | [Documentation]
+| | ... | [Top] TG=DUT1=TG.
+| | ... | [Enc] Eth-IPv4-TCP.
+| | ... | [Cfg] (Using Honeycomb API) On DUT1 bridge both interfaces to TG\
+| | ... | and configure a series of L2 MAC ACL rules on ingress interface.
+| | ... | [Ver] Send simple TCP packets from one TG interface to the other,\
+| | ... | using different MACs. Receive all packets except those with\
+| | ... | MACs in the ranges filtered by any rule.
+| | [Teardown] | Run Keywords
+| | ... | Clear IETF-ACL Settings | ${node} | ${dut_to_tg_if1} | AND
+| | ... | Show Packet Trace On All DUTs | ${nodes} | AND
+| | ... | Honeycomb Removes All Bridge Domains
+| | ... | ${node} | ${dut_to_tg_if1} | ${dut_to_tg_if2}
+| | Given Setup Interfaces And Bridge Domain For IETF-ACL Test
+| | ... | multirule | ${acl_name_multirule}
+| | When Honeycomb Creates ACL Chain Through IETF Node
+| | ... | ${dut_node} | ${acl_name_multirule} | L2 | ${acl_settings}
+| | And Honeycomb Assigns IETF-ACL Chain To Interface
+| | ... | ${dut_node} | ${dut_to_tg_if1} | L2 | ingress | ${acl_name_multirule}
+| | ... | permit
+| | Then Send TCP Or UDP Packet | ${tg_node} | ${src_ip} | ${dst_ip}
+| | ... | ${tg_to_dut_if1} | ${src_mac}
+| | ... | ${tg_to_dut_if2} | ${dst_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}
+| | ... | ${tg_to_dut_if1} | ${classify_src}
+| | ... | ${tg_to_dut_if2} | ${classify_dst}
+| | ... | 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}
+| | ... | ${tg_to_dut_if1} | ${classify_src2}
+| | ... | ${tg_to_dut_if2} | ${classify_dst2}
+| | ... | TCP | ${src_port} | ${dst_port}
 
 *** Keywords ***
 | Setup interface IPs and routes for IPv4 ietf-ACL test
@@ -180,11 +345,9 @@
 | | 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}
-| | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip}
-| | ... | ${prefix_length} | ${if_settings}
+| | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length}
 | | Honeycomb sets interface ipv4 address with prefix | ${dut_node}
-| | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip}
-| | ... | ${prefix_length} | ${if_settings}
+| | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_length}
 # TODO: Configure routes through Honeycomb when implemented.(Honeycomb-58)
 | | Add ARP on DUT
 | | ... | ${node} | ${dut_to_tg_if2} | ${gateway} | ${tg_to_dut_if2_mac}
@@ -203,7 +366,7 @@
 | | ... | ${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 Creates L2 Bridge Domain
+| | Honeycomb Creates first L2 Bridge Domain
 | | ... | ${dut_node} | ${bd_name} | ${bd_settings}
 | | Honeycomb Adds Interfaces To Bridge Domain
 | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_to_tg_if2}