CSIT-427: Honeycomb ietf-ACL tests - mixed layers

 - add test cases for mixing L2 and L3 rules
 - update methods with mixed-acl functionality
 - update test variables

Change-Id: I2aaa3033eede609627f751ea896e098548ffae98
Signed-off-by: selias <samelias@cisco.com>

4 files changed, 156 insertions, 18 deletions

diff --git a/resources/libraries/python/honeycomb/HcAPIKwACL.py b/resources/libraries/python/honeycomb/HcAPIKwACL.py
index 82a953e128..a69ab460f6 100644
--- a/resources/libraries/python/honeycomb/HcAPIKwACL.py
+++ b/resources/libraries/python/honeycomb/HcAPIKwACL.py
@@ -284,7 +284,8 @@ class ACLKeywords(object):
         layer = layer.lower()
         suffix_dict = {"l2": "eth",
                        "l3_ip4": "ipv4",
-                       "l3_ip6": "ipv6"
+                       "l3_ip6": "ipv6",
+                       "mixed": "mixed"
                        }
         if layer == "l4":
             raise NotImplementedError
@@ -295,8 +296,12 @@ class ACLKeywords(object):
                              "Valid options are: {1}"
                              .format(layer, suffix_dict.keys()))
 
-        path = "/acl/ietf-access-control-list:{0}-acl/{1}".format(
-            suffix, list_name)
+        if layer == "mixed":
+            path = "/acl/vpp-acl:{0}-acl/{1}"
+        else:
+            path = "/acl/ietf-access-control-list:{0}-acl/{1}"
+
+        path = path.format(suffix, list_name)
 
         status_code, resp = HcUtil.put_honeycomb_data(
             node, "config_ietf_classify_chain", data, path)
@@ -310,7 +315,7 @@ class ACLKeywords(object):
 
     @staticmethod
     def set_ietf_interface_acl(node, interface, layer, direction, list_name,
-                               default_action):
+                               default_action, mode=None):
         """Assign an interface to an ietf-acl classify chain.
 
         :param node: Honeycomb node.
@@ -321,12 +326,16 @@ class ACLKeywords(object):
         Valid options are: ingress, egress
         :param list_name: Name of an ietf-acl classify chain.
         :param default_action: Default classifier action: permit or deny.
+        :param mode: When using mixed layers, this specifies operational mode
+        of the interface - L2 or L3. If layer is not "mixed", this argument
+        will be ignored.
         :type node: dict
         :type interface: str or int
         :type layer: str
         :type direction: str
         :type list_name: str
         :type default_action: str
+        :type mode: str
 
         :return: Content of response.
         :rtype: bytearray
@@ -334,6 +343,8 @@ class ACLKeywords(object):
         """
 
         layer = layer.lower()
+        if mode is not None:
+            mode = mode.lower()
         interface = Topology.convert_interface_reference(
             node, interface, "name")
 
@@ -347,10 +358,14 @@ class ACLKeywords(object):
         path = "/interface/{0}/ietf-acl/{1}/access-lists".format(
             interface, direction)
 
+        types = {
+            "ietf": "ietf-access-control-list:{0}-acl",
+            "vpp": "vpp-acl:{0}-acl"}
         layers = {
-            "l2": {"mode": "l2", "suffix": "eth"},
-            "l3_ip4": {"mode": "l3", "suffix": "ipv4"},
-            "l3_ip6": {"mode": "l3", "suffix": "ipv6"}
+            "l2": {"mode": "l2", "acl_type": types['ietf'].format("eth")},
+            "l3_ip4": {"mode": "l3", "acl_type": types['ietf'].format("ipv4")},
+            "l3_ip6": {"mode": "l3", "acl_type": types['ietf'].format("ipv6")},
+            "mixed": {"mode": mode, "acl_type": types['vpp'].format("mixed")}
             }
 
         if layer == "L4":
@@ -361,8 +376,7 @@ class ACLKeywords(object):
                     "access-lists": {
                         "acl": [
                             {
-                                "type": "ietf-access-control-list:{0}-acl"
-                                .format(layers[layer]['suffix']),
+                                "type": layers[layer]['acl_type'],
                                 "name": list_name
                             }
                         ],
diff --git a/resources/libraries/robot/honeycomb/access_control_lists.robot b/resources/libraries/robot/honeycomb/access_control_lists.robot
index 0898a9339e..5c60af30ab 100644
--- a/resources/libraries/robot/honeycomb/access_control_lists.robot
+++ b/resources/libraries/robot/honeycomb/access_control_lists.robot
@@ -376,10 +376,10 @@
 | | ... | \| acl_test \| permit \|
 | | [Arguments]
 | | ... | ${node} | ${interface} | ${layer} | ${direction} | ${acl_list_name}
-| | ... | ${default-action}
+| | ... | ${default-action} | ${mode}=${None}
 | | Set IETF interface ACL
 | | ... | ${node} | ${interface} | ${layer} | ${direction} | ${acl_list_name}
-| | ... | ${default-action}
+| | ... | ${default-action} | ${mode}
 
 | Clear IETF-ACL settings
 | | [Documentation] | Removes ACl assignment from interface, then deletes\
diff --git a/resources/test_data/honeycomb/ietf_acl.py b/resources/test_data/honeycomb/ietf_acl.py
index 672bca3199..6f785acf2e 100644
--- a/resources/test_data/honeycomb/ietf_acl.py
+++ b/resources/test_data/honeycomb/ietf_acl.py
@@ -79,6 +79,24 @@ def get_variables(test_case, name):
             "classify_src": "12::1",
             "classify_dst": "13::1",
             "prefix_length": 64
+        },
+        "mixed": {
+            # IPs for DUT interface setup
+            "dut_to_tg_if1_ip": "16.0.0.2",
+            "dut_to_tg_if2_ip": "192.168.0.2",
+            "gateway": "192.168.0.1",
+            # classified networks
+            "classify_src_net": "16.0.2.0",
+            "classify_dst_net": "16.0.3.0",
+            # IPs in classified networks
+            "classify_src_ip": "16.0.2.1",
+            "classify_dst_ip": "16.0.3.1",
+            "prefix_length": 24,
+            # MACs classified through mask
+            "classify_src_mac": "01:02:03:04:56:67",
+            "classify_dst_mac": "89:9A:AB:BC:50:60",
+            "src_mask": "00:00:00:00:FF:FF",
+            "dst_mask": "FF:FF:FF:FF:00:00"
         }
     }
     acl_data = {
@@ -155,6 +173,38 @@ def get_variables(test_case, name):
                     }
                 }]}
             }]
+        },
+        "mixed": {
+            "acl": [{
+                "acl-type":
+                    "vpp-acl:mixed-acl",
+                "acl-name": name,
+                "access-list-entries": {"ace": [{
+                    "rule-name": "rule1",
+                    "matches": {
+                        "vpp-acl:source-mac-address":
+                            test_vars["mixed"]["classify_src_mac"],
+                        "vpp-acl:source-mac-address-mask":
+                            test_vars["mixed"]["src_mask"],
+                        "vpp-acl:destination-mac-address":
+                            test_vars["mixed"]["classify_dst_mac"],
+                        "vpp-acl:destination-mac-address-mask":
+                            test_vars["mixed"]["dst_mask"],
+                        "vpp-acl:source-ipv4-network":
+                            "{0}/{1}".format(
+                                test_vars["mixed"]["classify_src_net"],
+                                test_vars["mixed"]["prefix_length"]),
+                        "vpp-acl:destination-ipv4-network":
+                            "{0}/{1}".format(
+                                test_vars["mixed"]["classify_dst_net"],
+                                test_vars["mixed"]["prefix_length"]),
+                        "vpp-acl:protocol": 17
+                    },
+                    "actions": {
+                        "deny": {}
+                    }
+                }]}
+            }]
         }
     }
     try:
@@ -166,5 +216,4 @@ def get_variables(test_case, name):
         raise Exception("Unrecognized test case {0}."
                         " Valid options are: {1}".format(
                             test_case, acl_data.keys()))
-
     return variables
diff --git a/tests/func/honeycomb/081_ietf_acl_traffic.robot b/tests/func/honeycomb/081_ietf_acl_traffic.robot
index 53d4bddc95..be6ea16947 100644
--- a/tests/func/honeycomb/081_ietf_acl_traffic.robot
+++ b/tests/func/honeycomb/081_ietf_acl_traffic.robot
@@ -22,6 +22,7 @@
 | ${acl_name_l2}= | acl_l2
 | ${acl_name_l3_ip4}= | acl_l3_ip4
 | ${acl_name_l3_ip6}= | acl_l3_ip6
+| ${acl_name_mixed}= | acl_mixed
 
 *** Settings ***
 | Resource | resources/libraries/robot/default.robot
@@ -89,9 +90,9 @@
 | | ... | [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.
+| | ... | [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
@@ -123,9 +124,9 @@
 | | ... | [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
@@ -167,6 +168,80 @@
 | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac}
 | | ... | UDP | ${src_port} | ${dst_port}
 
+| TC04: Honeycomb can configure L2 and L3 ACL 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 and L3 ACL on ingress interface\
+| | ... | with src/dst MAC, src/dst IP and protocol.
+| | ... | [Ver] Send simple TCP and UDP packets from one TG interface\
+| | ... | to the other, using different MACs and IPv4 IPs. Receive all packets\
+| | ... | except those with MACs and IPs 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 Send TCP or UDP 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}
+| | ... | UDP | ${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 | ${src_port} | ${dst_port}
+
+| TC05: Honeycomb can configure L2 and L3 ACL 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 and L3 ACL on ingress interface with src/dst MAC, src/dst IP\
+| | ... | and protocol.
+| | ... | [Ver] Send simple TCP and UDP packets from one TG interface\
+| | ... | to the other, using different MACs and IPv4 IPs. Receive all packets\
+| | ... | except those with MACs and IPs 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 Send TCP or UDP 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}
+| | ... | UDP | ${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 | ${src_port} | ${dst_port}
+
 # TODO: Test case for L4 ACL port-based filtering
 # TODO: Test case for multiple classify rules and rule ordering