X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2Fhoneycomb%2FHcAPIKwACL.py;h=0cde6d4824a07c473323dbad5e1fd11ee2368ef5;hb=refs%2Fchanges%2F30%2F4330%2F8;hp=82a953e128fef25f541029a285c117412862bf4d;hpb=21921596d22a72cc4e4f7dee172ff17d1e5853cd;p=csit.git

diff --git a/resources/libraries/python/honeycomb/HcAPIKwACL.py b/resources/libraries/python/honeycomb/HcAPIKwACL.py
index 82a953e128..0cde6d4824 100644
--- a/resources/libraries/python/honeycomb/HcAPIKwACL.py
+++ b/resources/libraries/python/honeycomb/HcAPIKwACL.py
@@ -13,6 +13,7 @@
 
 """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
@@ -60,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
@@ -284,10 +288,8 @@ class ACLKeywords(object):
         layer = layer.lower()
         suffix_dict = {"l2": "eth",
                        "l3_ip4": "ipv4",
-                       "l3_ip6": "ipv6"
-                       }
-        if layer == "l4":
-            raise NotImplementedError
+                       "l3_ip6": "ipv6",
+                       "mixed": "mixed"}
         try:
             suffix = suffix_dict[layer]
         except KeyError:
@@ -295,13 +297,17 @@ 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)
 
-        if status_code != HTTPCodes.OK:
+        if status_code not in (HTTPCodes.OK, HTTPCodes.ACCEPTED):
             raise HoneycombError(
                 "Could not create classify chain."
                 "Status code: {0}.".format(status_code))
@@ -310,7 +316,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 +327,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 +344,8 @@ class ACLKeywords(object):
         """
 
         layer = layer.lower()
+        if mode is not None:
+            mode = mode.lower()
         interface = Topology.convert_interface_reference(
             node, interface, "name")
 
@@ -347,38 +359,38 @@ 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":
-            raise NotImplementedError
-        else:
-            try:
-                data = {
-                    "access-lists": {
-                        "acl": [
-                            {
-                                "type": "ietf-access-control-list:{0}-acl"
-                                .format(layers[layer]['suffix']),
-                                "name": list_name
-                            }
-                        ],
-                        "default-action": default_action,
-                        "mode": layers[layer]['mode']
-                    }
+        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()))
+            }
+        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)
 
-        if status_code != HTTPCodes.OK:
+        if status_code not in (HTTPCodes.OK, HTTPCodes.ACCEPTED):
             raise HoneycombError(
                 "Could not configure ACL on interface. "
                 "Status code: {0}.".format(status_code))