X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2Fhoneycomb%2FHcAPIKwACL.py;h=565ed486d83ccd60a0c9004b95b3f50245bb2b63;hb=86f35c2c60a680b58fca27d9298dd53d02e0138f;hp=c11e3251943e92faee77a589b53db043e1ac98cc;hpb=28e17b8002b50a04cdd6c9e74c15cdc4aa33a5e2;p=csit.git

diff --git a/resources/libraries/python/honeycomb/HcAPIKwACL.py b/resources/libraries/python/honeycomb/HcAPIKwACL.py
index c11e325194..565ed486d8 100644
--- a/resources/libraries/python/honeycomb/HcAPIKwACL.py
+++ b/resources/libraries/python/honeycomb/HcAPIKwACL.py
@@ -13,7 +13,9 @@
 
 """This module implements keywords to manipulate ACL data structures using
 Honeycomb REST API."""
+from robot.api import logger
 
+from resources.libraries.python.topology import Topology
 from resources.libraries.python.HTTPRequest import HTTPCodes
 from resources.libraries.python.honeycomb.HoneycombSetup import HoneycombError
 from resources.libraries.python.honeycomb.HoneycombUtil \
@@ -59,10 +61,13 @@ class ACLKeywords(object):
             status_code, resp = HcUtil.\
                 delete_honeycomb_data(node, "config_classify_table", path)
 
-        if status_code != HTTPCodes.OK:
-            raise HoneycombError(
-                "The configuration of classify table was not successful. "
-                "Status code: {0}.".format(status_code))
+        if status_code not in (HTTPCodes.OK, HTTPCodes.ACCEPTED):
+            if data is None and '"error-tag":"data-missing"' in resp:
+                logger.debug("data does not exist in path.")
+            else:
+                raise HoneycombError(
+                    "The configuration of classify table was not successful. "
+                    "Status code: {0}.".format(status_code))
         return resp
 
     @staticmethod
@@ -262,3 +267,142 @@ class ACLKeywords(object):
             return resp["classify-session"][0]
         except (KeyError, TypeError):
             return {}
+
+    @staticmethod
+    def create_acl_plugin_classify_chain(node, list_name, data, macip=False):
+        """Create classify chain using the ietf-acl node.
+
+        :param node: Honeycomb node.
+        :param list_name: Name for the classify list.
+        :param data: Dictionary of settings to send to Honeycomb.
+        :param macip: Use simple MAC+IP classifier. Optional.
+        :type node: dict
+        :type list_name: str
+        :type data: dict
+        :type macip: bool
+
+        :return: Content of response.
+        :rtype: bytearray
+        :raises HoneycombError: If the operation fails.
+        """
+
+        if macip:
+            path = "/acl/vpp-acl:vpp-macip-acl/{0}".format(list_name)
+        else:
+            path = "/acl/vpp-acl:vpp-acl/{0}".format(list_name)
+
+        status_code, resp = HcUtil.put_honeycomb_data(
+            node, "config_plugin_acl", data, path)
+
+        if status_code not in (HTTPCodes.OK, HTTPCodes.ACCEPTED):
+            raise HoneycombError(
+                "Could not create classify chain."
+                "Status code: {0}.".format(status_code))
+
+        return resp
+
+    @staticmethod
+    def set_acl_plugin_interface(node, interface, acl_name,
+                                 direction, macip=False):
+        """Assign an interface to an ietf-acl classify chain.
+
+        :param node: Honeycomb node.
+        :param interface: Name of an interface on the node.
+        :param acl_name: Name of an ACL chain configured through ACL-plugin.
+        :param direction: Classify incoming or outgiong packets.
+        Valid options are: ingress, egress
+        :param macip: Use simple MAC+IP classifier. Optional.
+        :type node: dict
+        :type interface: str or int
+        :type acl_name: str
+        :type direction: str
+        :type macip: bool
+
+        :return: Content of response.
+        :rtype: bytearray
+        :raises HoneycombError: If the operation fails.
+        """
+
+        interface = Topology.convert_interface_reference(
+            node, interface, "name")
+
+        interface = interface.replace("/", "%2F")
+
+        if direction not in ("ingress", "egress"):
+            raise ValueError("Unknown traffic direction {0}. "
+                             "Valid options are: ingress, egress."
+                             .format(direction))
+
+        path = "/interface/{0}/interface-acl:acl/{1}".format(
+            interface, direction)
+
+        if macip:
+            data = {
+                direction: {
+                    "vpp-macip-acl": {
+                        "type": "vpp-acl:vpp-macip-acl",
+                        "name": acl_name
+                    }
+                }
+            }
+        else:
+            data = {
+                direction: {
+                    "vpp-acls": [
+                        {
+                            "type": "vpp-acl:vpp-acl",
+                            "name": acl_name
+                        }
+                    ]
+                }
+            }
+
+        status_code, resp = HcUtil.put_honeycomb_data(
+            node, "config_vpp_interfaces", data, path)
+
+        if status_code not in (HTTPCodes.OK, HTTPCodes.ACCEPTED):
+            raise HoneycombError(
+                "Could not configure ACL on interface. "
+                "Status code: {0}.".format(status_code))
+
+        return resp
+
+    @staticmethod
+    def delete_interface_plugin_acls(node, interface):
+        """Remove all plugin-acl assignments from an interface.
+
+        :param node: Honeycomb node.
+        :param interface: Name of an interface on the node.
+        :type node: dict
+        :type interface: str or int
+        """
+
+        interface = Topology.convert_interface_reference(
+            node, interface, "name")
+
+        interface = interface.replace("/", "%2F")
+
+        path = "/interface/{0}/interface-acl:acl/".format(interface)
+        status_code, _ = HcUtil.delete_honeycomb_data(
+            node, "config_vpp_interfaces", path)
+
+        if status_code != HTTPCodes.OK:
+            raise HoneycombError(
+                "Could not remove ACL assignment from interface. "
+                "Status code: {0}.".format(status_code))
+
+    @staticmethod
+    def delete_acl_plugin_classify_chains(node):
+        """Remove all plugin-ACL classify chains.
+
+        :param node: Honeycomb node.
+        :type node: dict
+        """
+
+        status_code, _ = HcUtil.delete_honeycomb_data(
+            node, "config_plugin_acl")
+
+        if status_code != HTTPCodes.OK:
+            raise HoneycombError(
+                "Could not remove plugin-acl chain. "
+                "Status code: {0}.".format(status_code))