X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2Fhoneycomb%2FHcAPIKwACL.py;h=a69ab460f628ad51c786f8bfe10b6ad33ab7f455;hp=1042adc8722af1dcde98fdd0c3663b6f85107c1d;hb=811b8dc97ccf12952d5ec460bb0a421ce8933326;hpb=233683de57527f477bf7e8d042a5f3d1f08c7744

diff --git a/resources/libraries/python/honeycomb/HcAPIKwACL.py b/resources/libraries/python/honeycomb/HcAPIKwACL.py
index 1042adc872..a69ab460f6 100644
--- a/resources/libraries/python/honeycomb/HcAPIKwACL.py
+++ b/resources/libraries/python/honeycomb/HcAPIKwACL.py
@@ -281,17 +281,27 @@ class ACLKeywords(object):
         :rtype: bytearray
         :raises HoneycombError: If the operation fails.
         """
-        if layer.lower() == "l2":
-            suffix = "eth"
-        elif layer.lower() in ("l3_ip4", "l3_ip6", "l4"):
+        layer = layer.lower()
+        suffix_dict = {"l2": "eth",
+                       "l3_ip4": "ipv4",
+                       "l3_ip6": "ipv6",
+                       "mixed": "mixed"
+                       }
+        if layer == "l4":
             raise NotImplementedError
-        else:
+        try:
+            suffix = suffix_dict[layer]
+        except KeyError:
             raise ValueError("Unexpected value of layer argument {0}."
-                             "Valid options are: L2, L3_IP4, L3_IP6, L4."
-                             .format(layer))
+                             "Valid options are: {1}"
+                             .format(layer, suffix_dict.keys()))
+
+        if layer == "mixed":
+            path = "/acl/vpp-acl:{0}-acl/{1}"
+        else:
+            path = "/acl/ietf-access-control-list:{0}-acl/{1}"
 
-        path = "/acl/ietf-access-control-list:{0}-acl/{1}".format(
-            suffix, list_name)
+        path = path.format(suffix, list_name)
 
         status_code, resp = HcUtil.put_honeycomb_data(
             node, "config_ietf_classify_chain", data, path)
@@ -305,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.
@@ -316,18 +326,25 @@ 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
         :raises HoneycombError: If the operation fails.
         """
 
+        layer = layer.lower()
+        if mode is not None:
+            mode = mode.lower()
         interface = Topology.convert_interface_reference(
             node, interface, "name")
 
@@ -341,30 +358,36 @@ class ACLKeywords(object):
         path = "/interface/{0}/ietf-acl/{1}/access-lists".format(
             interface, direction)
 
-        data = {
-                "access-lists": {
-                    "acl": [{
-                        "type": None,
-                        "name": list_name
-                    }],
-                    "default-action": default_action,
-                    "mode": None
-                    }
-                }
-
-        acl_type = "ietf-access-control-list:{suffix}-acl"
-
-        if layer.lower() == "l2":
-            data["access-lists"]["mode"] = "l2"
-            data["access-lists"]["acl"][0]["type"] = \
-                acl_type.format(suffix="eth")
-
-        elif layer.lower() in ("l3_ip4", "l3_ip6", "L4"):
+        types = {
+            "ietf": "ietf-access-control-list:{0}-acl",
+            "vpp": "vpp-acl:{0}-acl"}
+        layers = {
+            "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":
             raise NotImplementedError
         else:
-            raise ValueError("Unknown network layer {0}. "
-                             "Valid options are: "
-                             "L2, L3_IP4, L3_IP6, L4.".format(layer))
+            try:
+                data = {
+                    "access-lists": {
+                        "acl": [
+                            {
+                                "type": layers[layer]['acl_type'],
+                                "name": list_name
+                            }
+                        ],
+                        "default-action": default_action,
+                        "mode": layers[layer]['mode']
+                    }
+                }
+            except KeyError:
+                raise ValueError("Unknown network layer {0}. "
+                                 "Valid options are: {1}".format(
+                                    layer, layers.keys()))
 
         status_code, resp = HcUtil.put_honeycomb_data(
             node, "config_vpp_interfaces", data, path)