diff options
author | selias <samelias@cisco.com> | 2016-12-01 10:11:53 +0100 |
---|---|---|
committer | Peter Mikus <pmikus@cisco.com> | 2017-02-15 09:34:10 +0000 |
commit | 005e7e00d0e9b9d4c0796c998b88d639ee316033 (patch) | |
tree | c5fb57ec19aa6414122385d81934f9c2ea9b91c0 /resources | |
parent | 4e249c36f388a3c030ba83bd3aed8b38ebf54af4 (diff) |
HC Test: ACL updates
- update low level ACL based on yang model changes
- remove ietf-ACL test suite and test data and keywords
- add ACL-plugin test suite, test data and keywords
The ietf model of ACLs is no longer supported in Honeycomb. It has
been replaced by the ACL plugin.
Change-Id: Ic2c2a3e11c9717d1d3885275f6b868a0098343f9
Signed-off-by: selias <samelias@cisco.com>
Diffstat (limited to 'resources')
-rw-r--r-- | resources/libraries/python/Classify.py | 33 | ||||
-rw-r--r-- | resources/libraries/python/honeycomb/HcAPIKwACL.py | 105 | ||||
-rw-r--r-- | resources/libraries/robot/honeycomb/access_control_lists.robot | 106 | ||||
-rw-r--r-- | resources/templates/honeycomb/config_plugin_acl.url (renamed from resources/templates/honeycomb/config_ietf_classify_chain.url) | 0 | ||||
-rw-r--r-- | resources/templates/vat/acl_plugin/acl_dump.vat | 1 | ||||
-rw-r--r-- | resources/templates/vat/acl_plugin/acl_interface_dump.vat | 1 | ||||
-rw-r--r-- | resources/test_data/honeycomb/ietf_acl.py | 336 | ||||
-rw-r--r-- | resources/test_data/honeycomb/plugin_acl.py | 520 | ||||
-rwxr-xr-x | resources/traffic_scripts/send_icmp_type_code.py | 125 |
9 files changed, 795 insertions, 432 deletions
diff --git a/resources/libraries/python/Classify.py b/resources/libraries/python/Classify.py index ef140681d8..d0a5804bf8 100644 --- a/resources/libraries/python/Classify.py +++ b/resources/libraries/python/Classify.py @@ -1,4 +1,4 @@ -# Copyright (c) 2016 Cisco and/or its affiliates. +# Copyright (c) 2017 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -363,3 +363,34 @@ class Classify(object): return data[0][session_index] else: return data[0] + + @staticmethod + def vpp_log_plugin_acl_settings(node): + """Retrieve configured settings from the ACL plugin + and write to robot log. + + :param node: VPP node. + :type node: dict + """ + try: + VatExecutor.cmd_from_template( + node, "acl_plugin/acl_dump.vat") + except ValueError: + # Fails to parse JSON data in response, but it is still logged + pass + + @staticmethod + def vpp_log_plugin_acl_interface_assignment(node): + """Retrieve interface assignment from the ACL plugin + and write to robot log. + + :param node: VPP node. + :type node: dict + """ + + try: + VatExecutor.cmd_from_template( + node, "acl_plugin/acl_interface_dump.vat", json_out=False) + except RuntimeError: + # Fails to parse response, but it is still logged + pass diff --git a/resources/libraries/python/honeycomb/HcAPIKwACL.py b/resources/libraries/python/honeycomb/HcAPIKwACL.py index 0cde6d4824..565ed486d8 100644 --- a/resources/libraries/python/honeycomb/HcAPIKwACL.py +++ b/resources/libraries/python/honeycomb/HcAPIKwACL.py @@ -269,43 +269,30 @@ class ACLKeywords(object): return {} @staticmethod - def create_ietf_classify_chain(node, list_name, layer, data): + 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 layer: Network layer to classify on. :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 layer: string :type data: dict + :type macip: bool :return: Content of response. :rtype: bytearray :raises HoneycombError: If the operation fails. """ - layer = layer.lower() - suffix_dict = {"l2": "eth", - "l3_ip4": "ipv4", - "l3_ip6": "ipv6", - "mixed": "mixed"} - try: - suffix = suffix_dict[layer] - except KeyError: - raise ValueError("Unexpected value of layer argument {0}." - "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 = path.format(suffix, list_name) + 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_ietf_classify_chain", data, path) + node, "config_plugin_acl", data, path) if status_code not in (HTTPCodes.OK, HTTPCodes.ACCEPTED): raise HoneycombError( @@ -315,37 +302,27 @@ class ACLKeywords(object): return resp @staticmethod - def set_ietf_interface_acl(node, interface, layer, direction, list_name, - default_action, mode=None): + 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 layer: Network layer to classify packets on. - Valid options are: L2, L3, L4. Mixed ACL not supported yet. + :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 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. + :param macip: Use simple MAC+IP classifier. Optional. :type node: dict :type interface: str or int - :type layer: str + :type acl_name: str :type direction: str - :type list_name: str - :type default_action: str - :type mode: str + :type macip: bool :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") @@ -356,36 +333,29 @@ class ACLKeywords(object): "Valid options are: ingress, egress." .format(direction)) - path = "/interface/{0}/ietf-acl/{1}/access-lists".format( + path = "/interface/{0}/interface-acl:acl/{1}".format( interface, direction) - 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 macip: + data = { + direction: { + "vpp-macip-acl": { + "type": "vpp-acl:vpp-macip-acl", + "name": acl_name + } + } } - - try: + else: data = { - "access-lists": { - "acl": [ + direction: { + "vpp-acls": [ { - "type": layers[layer]['acl_type'], - "name": list_name + "type": "vpp-acl:vpp-acl", + "name": acl_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) @@ -398,20 +368,21 @@ class ACLKeywords(object): return resp @staticmethod - def delete_ietf_interface_acls(node, interface): - """Remove all ietf-acl assignments from an interface. + 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""" + :type interface: str or int + """ interface = Topology.convert_interface_reference( node, interface, "name") interface = interface.replace("/", "%2F") - path = "/interface/{0}/ietf-acl/".format(interface) + path = "/interface/{0}/interface-acl:acl/".format(interface) status_code, _ = HcUtil.delete_honeycomb_data( node, "config_vpp_interfaces", path) @@ -421,17 +392,17 @@ class ACLKeywords(object): "Status code: {0}.".format(status_code)) @staticmethod - def delete_ietf_classify_chains(node): - """Remove all classify chains from the ietf-acl node. + 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_ietf_classify_chain") + node, "config_plugin_acl") if status_code != HTTPCodes.OK: raise HoneycombError( - "Could not remove ietf-acl chain. " + "Could not remove plugin-acl chain. " "Status code: {0}.".format(status_code)) diff --git a/resources/libraries/robot/honeycomb/access_control_lists.robot b/resources/libraries/robot/honeycomb/access_control_lists.robot index d24da5bd96..29af35f0f5 100644 --- a/resources/libraries/robot/honeycomb/access_control_lists.robot +++ b/resources/libraries/robot/honeycomb/access_control_lists.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2016 Cisco and/or its affiliates. +# Copyright (c) 2017 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -339,50 +339,46 @@ | | [Arguments] | ${node} | | Remove all classify tables | ${node} -| Honeycomb creates ACL chain through IETF node -| | [Documentation] | Creates classify chain through the high-level\ -| | ... | IETF-ACL node. +| Honeycomb creates ACL chain through ACL plugin +| | [Documentation] | Creates classify chain using the ACL plugin. | | ... | | ... | *Arguments:* | | ... | - node - Information about a DUT node. Type: dictionary | | ... | - acl_list_name - Name for the classify chain. Type: string -| | ... | - layer - Classification layer (L2, L3, L4, mixed). Type: string | | ... | - acl_list_settings - classify rules. Type: dictionary +| | ... | - macip - Use MAC+IP classifier. Optional. Type: boolean | | ... | | ... | *Example:* | | ... -| | ... | \| Honeycomb creates ACL chain through IETF node \ +| | ... | \| Honeycomb creates ACL chain through ACL plugin \ | | ... | \| ${nodes['DUT1']} \| acl_test \| ${settings} \| -| | [Arguments] | ${node} | ${acl_list_name} | ${layer} | ${acl_list_settings} -| | Create IETF classify chain -| | ... | ${node} | ${acl_list_name} | ${layer} | ${acl_list_settings} +| | [Arguments] | ${node} | ${acl_list_name} | ${acl_list_settings} +| | ... | ${macip}=${False} +| | Create ACL plugin classify chain +| | ... | ${node} | ${acl_list_name} | ${acl_list_settings} | ${macip} -| Honeycomb assigns IETF-ACL chain to interface +| Honeycomb assigns plugin-ACL chain to interface | | [Documentation] | Applies classification through the high-level\ | | ... | IETF-ACL node to an interface. | | ... | | ... | *Arguments:* | | ... | - node - Information about a DUT node. Type: dictionary -| | ... | - interface - Interface to apply classifier to. | Type: string -| | ... | - layer - Classification layer (L2, L3, L4, mixed). Type: string -| | ... | - direction - Ingress or Egress ACL. Type: string -| | ... | - acl_list_name - Name of the classify chain to apply. Type: string -| | ... | - default_action - Default classify action: permit or deny.\ -| | ... | Type: string +| | ... | - interface - Interface to assign classifier to. Type: string +| | ... | - acl_list_name - Name of the clasify chain. Type: string +| | ... | - direction - Classifier direction, ingress or egress. Type: string +| | ... | - macip - Use MAC+IP classifier. Optional. Type: boolean | | ... | | ... | *Example:* | | ... -| | ... | \| Honeycomb assigns IETF-ACL chain to interface \ -| | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| L2 \| ingress \ -| | ... | \| acl_test \| permit \| +| | ... | \| Honeycomb assigns plugin-ACL chain to interface \ +| | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| acl_test \| ingress \| | | [Arguments] -| | ... | ${node} | ${interface} | ${layer} | ${direction} | ${acl_list_name} -| | ... | ${default-action} | ${mode}=${None} -| | Set IETF interface ACL -| | ... | ${node} | ${interface} | ${layer} | ${direction} | ${acl_list_name} -| | ... | ${default-action} | ${mode} +| | ... | ${node} | ${interface} | ${acl_list_name} | ${direction} +| | ... | ${macip}=${False} +| | Set ACL plugin interface +| | ... | ${node} | ${interface} | ${acl_list_name} | ${direction} | ${macip} -| Clear IETF-ACL settings +| Clear plugin-ACL settings | | [Documentation] | Removes ACl assignment from interface, then deletes\ | | ... | IETF-ACL chain. | | ... @@ -392,7 +388,61 @@ | | ... | | ... | *Example:* | | ... -| | ... | Clear IETF-ACL settings | ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| +| | ... | \| Clear plugin-ACL settings | ${nodes['DUT1']} \ +| | ... | \| GigabitEthernet0/8/0 \| | | [Arguments] | ${node} | ${interface} -| | Delete IETF interface ACLs | ${node} | ${interface} -| | Delete IETF classify chains | ${node}
\ No newline at end of file +| | Delete interface plugin ACLs | ${node} | ${interface} +| | Delete ACL plugin classify chains | ${node} + +| Read plugin-ACL configuration from VAT +| | [Documentation] | Obtains ACL-plugin configuration through VAT and logs\ +| | ... | the reply. +| | ... +| | ... | *Arguments:* +| | ... | - node - Information about a DUT node. Type: dictionary +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Read plugin-ACL configuration from VAT \| ${nodes['DUT1']} \| +| | [Arguments] | ${node} +| | VPP log plugin acl settings | ${node} +| | VPP log plugin acl interface assignment | ${node} + +| Send ICMP packet with type and code +| | [Documentation] | Sends an ICMP packet with specified code and type. +| | ... +| | ... | *Arguments:* +| | ... +| | ... | _NOTE:_ Arguments are based on topology: +| | ... | TG(if1)->(if1)DUT(if2)->TG(if2) +| | ... +| | ... | - tg_node - Node to execute scripts on (TG). Type: dictionary +| | ... | - src_ip - IP of source interface (TG-if1). Type: integer +| | ... | - dst_ip - IP of destination interface (TG-if2). Type: integer +| | ... | - tx_port - Source interface (TG-if1). Type: string +| | ... | - tx_mac - MAC address of source interface (TG-if1). Type: string +| | ... | - rx_port - Destionation interface (TG-if1). Type: string +| | ... | - rx_mac - MAC address of destination interface (TG-if1). Type: string +| | ... | - icmp_type - ICMP type to use. Type: int +| | ... | - icmp_code - ICMP code to use. Type: int +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Send ICMP packet with type and code \| ${nodes['TG']} \ +| | ... | \| 16.0.0.1 \| 32.0.0.1 \| eth2 \| 08:00:27:cc:4f:54 \ +| | ... | \| eth4 \| 08:00:27:c9:6a:d5 \| ${1} \| ${1} \| +| | ... +| | [Arguments] | ${tg_node} | ${src_ip} | ${dst_ip} | ${tx_port} | +| | ... | ${tx_mac} | ${rx_port} | ${rx_mac} | ${icmp_type} | ${icmp_code} +| | ${tx_port_name}= | Get interface name | ${tg_node} | ${tx_port} +| | ${rx_port_name}= | Get interface name | ${tg_node} | ${rx_port} +| | ${args}= | Catenate | --src_mac | ${tx_mac} +| | ... | --dst_mac | ${rx_mac} +| | ... | --src_ip | ${src_ip} +| | ... | --dst_ip | ${dst_ip} +| | ... | --tx_if | ${tx_port_name} +| | ... | --rx_if | ${rx_port_name} +| | ... | --icmp_type | ${icmp_type} +| | ... | --icmp_code | ${icmp_code} +| | Run Traffic Script On Node | send_icmp_type_code.py +| | ... | ${tg_node} | ${args} diff --git a/resources/templates/honeycomb/config_ietf_classify_chain.url b/resources/templates/honeycomb/config_plugin_acl.url index 79a9670f44..79a9670f44 100644 --- a/resources/templates/honeycomb/config_ietf_classify_chain.url +++ b/resources/templates/honeycomb/config_plugin_acl.url diff --git a/resources/templates/vat/acl_plugin/acl_dump.vat b/resources/templates/vat/acl_plugin/acl_dump.vat new file mode 100644 index 0000000000..f24fc99005 --- /dev/null +++ b/resources/templates/vat/acl_plugin/acl_dump.vat @@ -0,0 +1 @@ +acl_dump
\ No newline at end of file diff --git a/resources/templates/vat/acl_plugin/acl_interface_dump.vat b/resources/templates/vat/acl_plugin/acl_interface_dump.vat new file mode 100644 index 0000000000..83da2e86dd --- /dev/null +++ b/resources/templates/vat/acl_plugin/acl_interface_dump.vat @@ -0,0 +1 @@ +acl_interface_list_dump
\ No newline at end of file diff --git a/resources/test_data/honeycomb/ietf_acl.py b/resources/test_data/honeycomb/ietf_acl.py deleted file mode 100644 index aaabfa49e2..0000000000 --- a/resources/test_data/honeycomb/ietf_acl.py +++ /dev/null @@ -1,336 +0,0 @@ -# Copyright (c) 2016 Cisco and/or its affiliates. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""Test variables for ietf-ACL test suite.""" - - -def get_variables(test_case, name): - """Create and return a dictionary of test variables for the specified - test case. - - :param test_case: Determines which test variables to return. - :param name: Name for the classify chain used in test. - :type test_case: str - :type name: str - - :return: Dictionary of test variables - settings for Honeycomb's - ietf-acl node and packet fields to use in verification. - :rtype: dict - """ - - test_case = test_case.lower() - variables = { - # Variables for control packet, should always pass through DUT - "src_ip": "16.0.0.1", - "dst_ip": "16.0.1.1", - "dst_net": "16.0.1.0", - "src_port": "1234", - "dst_port": "1234", - "src_mac": "01:02:03:04:05:06", - "dst_mac": "10:20:30:40:50:60"} - - test_vars = { - "l2": { - # MACs classified directly - "classify_src": "12:23:34:45:56:67", - "classify_dst": "89:9A:AB:BC:CD:DE", - # MACs classified through mask - "classify_src2": "01:02:03:04:56:67", - "classify_dst2": "89:9A:AB:BC:50:60", - "src_mask": "00:00:00:00:FF:FF", - "dst_mask": "FF:FF:FF:FF:00:00" - }, - "l3_ip4": { - # IPs for DUT interface setup - "dut_to_tg_if1_ip": "16.0.0.2", - "dut_to_tg_if2_ip": "192.168.0.2", - "prefix_length": 24, - "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": "16.0.2.1", - "classify_dst": "16.0.3.1", - }, - "l3_ip6": { - # Override control packet addresses with IPv6 - "src_ip": "10::1", - "dst_ip": "11::1", - "dst_net": "11::", - # IPs for DUT interface setup - "dut_to_tg_if1_ip": "10::2", - "dut_to_tg_if2_ip": "20::2", - "prefix_length": 64, - "gateway": "20::1", - # classified networks - "classify_src_net": "12::", - "classify_dst_net": "13::", - # IPs in classified networks - "classify_src": "12::1", - "classify_dst": "13::1", - }, - "l4": { - # IPs for DUT interface and route setup - "dut_to_tg_if1_ip": "16.0.0.2", - "dut_to_tg_if2_ip": "192.168.0.2", - "prefix_length": 24, - "gateway": "192.168.0.1", - "classify_dst_net": "16.0.3.0", - # Ports in classified ranges - "classify_src": 1500, - "classify_dst": 2000, - }, - "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", - # classified ports - "classify_src_port": 1500, - "classify_dst_port": 2000, - }, - "multirule": { - # MACs classified by first rule - "classify_src": "12:23:34:45:56:67", - "classify_dst": "89:9A:AB:BC:CD:DE", - # MACs classified by second rule - "classify_src2": "01:02:03:04:56:67", - "classify_dst2": "89:9A:AB:BC:50:60", - # MAC rule masks - only match specific addresses - "src_mask": "FF:FF:FF:FF:FF:FF", - "dst_mask": "FF:FF:FF:FF:FF:FF", - } - } - acl_data = { - # ACL configuration for L2 tests - "l2": { - "acl": [{ - "acl-type": - "ietf-access-control-list:eth-acl", - "acl-name": name, - "access-list-entries": {"ace": [{ - "rule-name": "rule1", - "matches": { - "source-mac-address": - test_vars["l2"]["classify_src"], - "source-mac-address-mask": - test_vars["l2"]["src_mask"], - "destination-mac-address": - test_vars["l2"]["classify_dst"], - "destination-mac-address-mask": - test_vars["l2"]["dst_mask"] - }, - "actions": { - "deny": {} - } - }]} - }] - }, - # ACL configuration for L3 IPv4 tests - "l3_ip4": { - "acl": [{ - "acl-type": - "ietf-access-control-list:ipv4-acl", - "acl-name": name, - "access-list-entries": {"ace": [{ - "rule-name": "rule1", - "matches": { - "source-ipv4-network": - "{0}/{1}".format( - test_vars["l3_ip4"]["classify_src_net"], - test_vars["l3_ip4"]["prefix_length"]), - "destination-ipv4-network": - "{0}/{1}".format( - test_vars["l3_ip4"]["classify_dst_net"], - test_vars["l3_ip4"]["prefix_length"]), - "protocol": 17 - }, - "actions": { - "deny": {} - } - }]} - }] - }, - # ACL settings for L3 IPv6 tests - "l3_ip6": { - "acl": [{ - "acl-type": - "ietf-access-control-list:ipv6-acl", - "acl-name": name, - "access-list-entries": {"ace": [{ - "rule-name": "rule1", - "matches": { - "source-ipv6-network": - "{0}/{1}".format( - test_vars["l3_ip6"]["classify_src_net"], - test_vars["l3_ip6"]["prefix_length"]), - "destination-ipv6-network": - "{0}/{1}".format( - test_vars["l3_ip6"]["classify_dst_net"], - test_vars["l3_ip6"]["prefix_length"]), - "protocol": 17 - }, - "actions": { - "deny": {} - } - }]} - }] - }, - # ACL configuration for L4 tests - "l4": { - "acl": [{ - "acl-type": - "vpp-acl:mixed-acl", - "acl-name": name, - "access-list-entries": {"ace": [{ - "rule-name": "rule1", - "matches": { - "destination-ipv4-network": "0.0.0.0/0", - "destination-port-range": { - "lower-port": test_vars["l4"]["classify_dst"], - "upper-port": test_vars["l4"]["classify_dst"] + 50 - }, - "source-port-range": { - "lower-port": test_vars["l4"]["classify_src"], - "upper-port": test_vars["l4"]["classify_src"] + 50 - } - }, - "actions": { - "deny": {} - } - }]} - }] - }, - "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, - "vpp-acl:destination-port-range": { - "lower-port": test_vars["l4"]["classify_dst"], - "upper-port": test_vars["l4"]["classify_dst"] + 50 - }, - "vpp-acl:source-port-range": { - "lower-port": test_vars["l4"]["classify_src"], - "upper-port": test_vars["l4"]["classify_src"] + 50 - } - }, - "actions": { - "deny": {} - } - }]} - }] - }, - "multirule": { - "acl": [{ - "acl-type": - "ietf-access-control-list:eth-acl", - "acl-name": name, - "access-list-entries": {"ace": [ - { - "rule-name": "rule1", - "matches": { - "source-mac-address": - test_vars["multirule"]["classify_src"], - "source-mac-address-mask": - test_vars["multirule"]["src_mask"], - "destination-mac-address": - test_vars["multirule"]["classify_dst"], - "destination-mac-address-mask": - test_vars["multirule"]["dst_mask"] - }, - "actions": { - "deny": {} - } - }, - { - "rule-name": "rule2", - "matches": { - "source-mac-address": - test_vars["multirule"]["classify_src2"], - "source-mac-address-mask": - test_vars["multirule"]["src_mask"], - "destination-mac-address": - test_vars["multirule"]["classify_dst2"], - "destination-mac-address-mask": - test_vars["multirule"]["dst_mask"] - }, - "actions": { - "deny": {} - } - }, - { - "rule-name": "rule3", - "matches": { - "source-mac-address": - variables["src_mac"], - "source-mac-address-mask": - test_vars["multirule"]["src_mask"], - "destination-mac-address": - variables["dst_mac"], - "destination-mac-address-mask": - test_vars["multirule"]["dst_mask"] - }, - "actions": { - "permit": {} - } - } - ]} - }] - } - } - try: - ret_vars = {} - ret_vars.update(variables) - ret_vars.update(test_vars[test_case]) - ret_vars.update( - {"acl_settings": acl_data[test_case]} - ) - except KeyError: - raise Exception("Unrecognized test case {0}." - " Valid options are: {1}".format( - test_case, acl_data.keys())) - return ret_vars diff --git a/resources/test_data/honeycomb/plugin_acl.py b/resources/test_data/honeycomb/plugin_acl.py new file mode 100644 index 0000000000..d9d2ecd90f --- /dev/null +++ b/resources/test_data/honeycomb/plugin_acl.py @@ -0,0 +1,520 @@ +# Copyright (c) 2017 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +"""Test variables for ACL-plugin test suite.""" + + +def get_variables(test_case, name): + """Create and return a dictionary of test variables for the specified + test case. + + :param test_case: Determines which test variables to return. + :param name: Name for the classify chain used in test. + :type test_case: str + :type name: str + + :returns: Dictionary of test variables - settings for Honeycomb's + ietf-acl node and packet fields to use in verification. + :rtype: dict + :raises KeyError: If the test_case parameter is incorrect. + """ + + test_case = test_case.lower() + variables = { + # Variables for control packet + "src_ip": "16.0.0.1", + "dst_ip": "16.0.1.1", + "dst_net": "16.0.1.0", + "src_port": "1234", + "dst_port": "1234", + "src_mac": "01:02:03:04:05:06", + "dst_mac": "10:20:30:40:50:60"} + + test_vars = { + "macip": { + # MACs classified directly + "classify_src": "12:23:34:45:56:67", + "classify_dst": "89:9A:AB:BC:CD:DE", + # MACs classified through mask + "classify_src2": "01:02:03:04:56:67", + "classify_dst2": "89:9A:AB:BC:50:60", + "src_mask": "00:00:00:00:FF:FF", + "dst_mask": "FF:FF:FF:FF:00:00" + }, + "l3_ip4": { + # IPs for DUT interface setup + "dut_to_tg_if1_ip": "16.0.0.2", + "dut_to_tg_if2_ip": "192.168.0.2", + "prefix_length": 24, + "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": "16.0.2.1", + "classify_dst": "16.0.3.1", + }, + "l3_ip6": { + # Override control packet addresses with IPv6 + "src_ip": "10::1", + "dst_ip": "11::1", + "dst_net": "11::", + # IPs for DUT interface setup + "dut_to_tg_if1_ip": "10::2", + "dut_to_tg_if2_ip": "20::2", + "prefix_length": 64, + "gateway": "20::1", + # classified networks + "classify_src_net": "12::", + "classify_dst_net": "13::", + # IPs in classified networks + "classify_src": "12::1", + "classify_dst": "13::1", + }, + "l4": { + # IPs for DUT interface and route setup + "dut_to_tg_if1_ip": "16.0.0.2", + "dut_to_tg_if2_ip": "192.168.0.2", + "prefix_length": 24, + "gateway": "192.168.0.1", + "classify_dst_net": "16.0.3.0", + # Ports in classified ranges + "classify_src": 60000, + "classify_dst": 61000, + }, + "mixed": { + # IPs for DUT interface and route setup + "dut_to_tg_if1_ip": "16.0.0.2", + "dut_to_tg_if2_ip": "192.168.0.2", + "prefix_length": 24, + "gateway": "192.168.0.1", + "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", + # Ports in classified ranges + "classify_src_port": 60000, + "classify_dst_port": 61000, + }, + "icmp": { + # ICMP code and type for control packet + "icmp_type": 0, + "icmp_code": 0, + # classified ICMP code and type + "classify_type": 3, + "classify_code": 3 + + }, + "icmpv6": { + # Override control packet addresses with IPv6 + "src_ip": "10::1", + "dst_ip": "11::1", + "dst_net": "11::", + # ICMP code and type for control packet + "icmp_type": 1, + "icmp_code": 0, + # classified ICMP code and type + "classify_type": 4, + "classify_code": 2 + + }, + "reflex": { + # IPs for DUT interface setup + "dut_to_tg_if1_ip": "16.0.0.2", + "dut_to_tg_if2_ip": "192.168.0.2", + "prefix_length": 24, + "gateway": "192.168.0.1", + "gateway2": "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": "16.0.2.1", + "classify_dst": "16.0.3.1", + }, + "block_all": {} + } + acl_data = { + # ACL configuration for L2 tests + "macip": { + "acl": [{ + "acl-type": + "vpp-acl:vpp-macip-acl", + "acl-name": name, + "access-list-entries": {"ace": [ + { + "rule-name": "rule1", + "matches": { + "vpp-macip-ace-nodes": { + "source-mac-address": + test_vars["macip"]["classify_src"], + "source-mac-address-mask": + test_vars["macip"]["src_mask"], + "source-ipv4-network": "16.0.0.0/24" + } + }, + "actions": { + "deny": {} + } + }, + { + "rule-name": "rule_all", + "matches": { + "vpp-macip-ace-nodes": { + "source-mac-address": + test_vars["macip"]["classify_src"], + "source-mac-address-mask": "00:00:00:00:00:00", + "source-ipv4-network": "0.0.0.0/0" + } + }, + "actions": { + "permit": {} + } + }, + ]} + }] + }, + # ACL configuration for L3 IPv4 tests + "l3_ip4": { + "acl": [{ + "acl-type": + "vpp-acl:vpp-acl", + "acl-name": name, + "access-list-entries": {"ace": [ + { + "rule-name": "rule1", + "matches": { + "vpp-ace-nodes": { + "source-ipv4-network": + "{0}/{1}".format( + test_vars["l3_ip4"]["classify_src_net"], + test_vars["l3_ip4"]["prefix_length"]), + "destination-ipv4-network": + "{0}/{1}".format( + test_vars["l3_ip4"]["classify_dst_net"], + test_vars["l3_ip4"]["prefix_length"]), + "udp-nodes": { + "source-port-range": { + "lower-port": "0", + "upper-port": "65535" + }, + "destination-port-range": { + "lower-port": "0", + "upper-port": "65535" + } + } + } + }, + "actions": { + "deny": {} + }, + }, + { + "rule-name": "rule_all", + "matches": { + "vpp-ace-nodes": { + "source-ipv4-network": "0.0.0.0/0", + "destination-ipv4-network": "0.0.0.0/0", + } + }, + "actions": { + "permit": {} + } + } + ]} + }] + }, + # ACL settings for L3 IPv6 tests + "l3_ip6": { + "acl": [{ + "acl-type": + "vpp-acl:vpp-acl", + "acl-name": name, + "access-list-entries": {"ace": [ + { + "rule-name": "rule1", + "matches": { + "vpp-ace-nodes": { + "source-ipv6-network": + "{0}/{1}".format( + test_vars["l3_ip6"]["classify_src_net"], + test_vars["l3_ip6"]["prefix_length"]), + "destination-ipv6-network": + "{0}/{1}".format( + test_vars["l3_ip6"]["classify_dst_net"], + test_vars["l3_ip6"]["prefix_length"]), + "udp-nodes": { + "source-port-range": { + "lower-port": "0", + "upper-port": "65535" + }, + "destination-port-range": { + "lower-port": "0", + "upper-port": "65535" + } + } + } + }, + "actions": { + "deny": {} + } + }, + { + "rule-name": "rule_all", + "matches": { + "vpp-ace-nodes": { + "source-ipv6-network": "0::0/0", + "destination-ipv6-network": "0::0/0", + } + }, + "actions": { + "permit": {} + } + } + ]} + }] + }, + # ACL configuration for L4 tests + "l4": { + "acl": [{ + "acl-type": + "vpp-acl:vpp-acl", + "acl-name": name, + "access-list-entries": {"ace": [{ + "rule-name": "rule1", + "matches": { + "vpp-ace-nodes": { + "tcp-nodes": { + "destination-port-range": { + "lower-port": + test_vars["l4"]["classify_dst"], + "upper-port": + test_vars["l4"]["classify_dst"] + 10 + }, + "source-port-range": { + "lower-port": + test_vars["l4"]["classify_src"], + "upper-port": + test_vars["l4"]["classify_src"] + 10 + } + } + } + }, + "actions": { + "deny": {} + }, + }, + { + "rule-name": "rule_all", + "matches": { + "vpp-ace-nodes": { + "source-ipv4-network": "0.0.0.0/0", + "destination-ipv4-network": "0.0.0.0/0", + } + }, + "actions": { + "permit": {} + } + } + ]} + }] + }, + "mixed": { + "acl": [{ + "acl-type": + "vpp-acl:vpp-acl", + "acl-name": name, + "access-list-entries": {"ace": [{ + "rule-name": "ports", + "matches": { + "vpp-ace-nodes": { + "tcp-nodes": { + "destination-port-range": { + "lower-port": + test_vars["l4"]["classify_dst"], + "upper-port": + test_vars["l4"]["classify_dst"] + 10 + }, + "source-port-range": { + "lower-port": + test_vars["l4"]["classify_src"], + "upper-port": + test_vars["l4"]["classify_src"] + 10 + } + } + } + }, + "actions": { + "deny": {} + }, + }, + { + "rule-name": "rule_all", + "matches": { + "vpp-ace-nodes": { + "source-ipv4-network": "0.0.0.0/0", + "destination-ipv4-network": "0.0.0.0/0", + } + }, + "actions": { + "permit": {} + } + } + ]} + }] + }, + "icmp": { + "acl": [{ + "acl-type": + "vpp-acl:vpp-acl", + "acl-name": name, + "access-list-entries": {"ace": [ + { + "rule-name": "rule1", + "matches": { + "vpp-ace-nodes": { + "icmp-nodes": { + "icmp-type-range": { + "first": "1", + "last": "5" + }, + "icmp-code-range": { + "first": "1", + "last": "5" + } + } + } + }, + "actions": { + "deny": {} + }, + }, + { + "rule-name": "rule_all", + "matches": { + "vpp-ace-nodes": { + "source-ipv4-network": "0.0.0.0/0", + "destination-ipv4-network": "0.0.0.0/0", + } + }, + "actions": { + "permit": {} + } + } + ]} + }] + }, + "icmpv6": { + "acl": [{ + "acl-type": + "vpp-acl:vpp-acl", + "acl-name": name, + "access-list-entries": {"ace": [ + { + "rule-name": "rule1", + "matches": { + "vpp-ace-nodes": { + "icmp-v6-nodes": { + "icmp-type-range": { + "first": "1", + "last": "5" + }, + "icmp-code-range": { + "first": "1", + "last": "5" + } + } + } + }, + "actions": { + "deny": {} + }, + }, + { + "rule-name": "rule_all", + "matches": { + "vpp-ace-nodes": { + "source-ipv6-network": "0::0/0", + "destination-ipv6-network": "0::0/0", + } + }, + "actions": { + "permit": {} + } + } + ]} + }] + }, + "reflex": { + "acl": [{ + "acl-type": + "vpp-acl:vpp-acl", + "acl-name": name, + "access-list-entries": {"ace": [ + { + "rule-name": "rule1", + "matches": { + "vpp-ace-nodes": { + "source-ipv4-network": + "{0}/{1}".format( + test_vars["reflex"]["classify_dst_net"], + test_vars["reflex"]["prefix_length"]), + "destination-ipv4-network": + "{0}/{1}".format( + test_vars["reflex"]["classify_src_net"], + test_vars["reflex"]["prefix_length"]), + } + }, + "actions": { + # TODO: will be renamed in HC2VPP-57 + "vpp-acl:permit": {} + }, + }, + ]} + }] + }, + "block_all": { + "acl": [{ + "acl-type": + "vpp-acl:vpp-acl", + "acl-name": name, + "access-list-entries": {"ace": [ + { + "rule-name": "rule_all", + "matches": { + "vpp-ace-nodes": { + "source-ipv4-network": "0.0.0.0/0", + "destination-ipv4-network": "0.0.0.0/0", + } + }, + "actions": { + "deny": {} + } + } + ]} + }] + }, + } + + try: + ret_vars = {} + ret_vars.update(variables) + ret_vars.update(test_vars[test_case]) + ret_vars.update( + {"acl_settings": acl_data[test_case]} + ) + except KeyError: + raise KeyError( + "Unrecognized test case {0}. Valid options are: {1}".format( + test_case, acl_data.keys())) + return ret_vars diff --git a/resources/traffic_scripts/send_icmp_type_code.py b/resources/traffic_scripts/send_icmp_type_code.py new file mode 100755 index 0000000000..dffaafff38 --- /dev/null +++ b/resources/traffic_scripts/send_icmp_type_code.py @@ -0,0 +1,125 @@ +#!/usr/bin/env python +# Copyright (c) 2017 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +"""Traffic script that sends an IP ICMPv4/ICMPv6 packet from one interface to +the other one. Dot1q or Dot1ad tagging of the ethernet frame can be set. +""" + +import sys +import ipaddress + +from scapy.layers.inet import ICMP, IP +from scapy.layers.l2 import Ether +from scapy.layers.inet6 import ICMPv6EchoRequest +from scapy.layers.inet6 import IPv6 + +from resources.libraries.python.PacketVerifier import RxQueue, TxQueue +from resources.libraries.python.TrafficScriptArg import TrafficScriptArg + + +def valid_ipv4(ip): + """Check if IP address has the correct IPv4 address format. + + :param ip: IP address. + :type ip: str + :returns: True in case of correct IPv4 address format, + otherwise return false. + :rtype: bool + """ + try: + ipaddress.IPv4Address(unicode(ip)) + return True + except (AttributeError, ipaddress.AddressValueError): + return False + + +def valid_ipv6(ip): + """Check if IP address has the correct IPv6 address format. + + :param ip: IP address. + :type ip: str + :returns: True in case of correct IPv6 address format, + otherwise return false. + :rtype: bool + """ + try: + ipaddress.IPv6Address(unicode(ip)) + return True + except (AttributeError, ipaddress.AddressValueError): + return False + + +def main(): + """Send IP ICMPv4/ICMPv6 packet from one traffic generator interface to + the other one.""" + + args = TrafficScriptArg(['src_mac', 'dst_mac', 'src_ip', 'dst_ip', + 'icmp_type', 'icmp_code']) + + src_mac = args.get_arg('src_mac') + dst_mac = args.get_arg('dst_mac') + src_ip = args.get_arg('src_ip') + dst_ip = args.get_arg('dst_ip') + + tx_if = args.get_arg('tx_if') + rx_if = args.get_arg('rx_if') + + icmp_type = int(args.get_arg('icmp_type')) + icmp_code = int(args.get_arg('icmp_code')) + + rxq = RxQueue(rx_if) + txq = TxQueue(tx_if) + + sent_packets = [] + + # Create empty ip ICMP packet and add padding before sending + if valid_ipv4(src_ip) and valid_ipv4(dst_ip): + pkt_raw = (Ether(src=src_mac, dst=dst_mac) / + IP(src=src_ip, dst=dst_ip) / + ICMP(code=icmp_code, type=icmp_type)) + ip_format = 'IP' + icmp_format = 'ICMP' + elif valid_ipv6(src_ip) and valid_ipv6(dst_ip): + pkt_raw = (Ether(src=src_mac, dst=dst_mac) / + IPv6(src=src_ip, dst=dst_ip) / + ICMPv6EchoRequest(code=icmp_code, type=icmp_type)) + ip_format = 'IPv6' + icmp_format = 'ICMPv6' + else: + raise ValueError("IP(s) not in correct format") + + # Send created packet on one interface and receive on the other + sent_packets.append(pkt_raw) + txq.send(pkt_raw) + + ether = rxq.recv(2) + + # Check whether received packet contains layers Ether, IP and ICMP + if ether is None: + raise RuntimeError('ICMP echo Rx timeout') + + if not ether.haslayer(ip_format): + raise RuntimeError('Not an IP packet received {0}' + .format(ether.__repr__())) + + # Cannot use haslayer for ICMPv6, every type of ICMPv6 is a separate layer + # Next header value of 58 means the next header is ICMPv6 + if not ether.haslayer(icmp_format) and ether[ip_format].nh != 58: + raise RuntimeError('Not an ICMP packet received {0}' + .format(ether.__repr__())) + + sys.exit(0) + +if __name__ == "__main__": + main() |