diff options
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/libraries/python/honeycomb/HcAPIKwACL.py | 32 | ||||
| -rw-r--r-- | resources/libraries/robot/honeycomb/access_control_lists.robot | 4 | ||||
| -rw-r--r-- | resources/test_data/honeycomb/ietf_acl.py | 51 |
3 files changed, 75 insertions, 12 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 |