diff options
| -rw-r--r-- | resources/api/vpp/supported_crcs.yaml | 35 | ||||
| -rw-r--r-- | resources/libraries/python/FlowUtil.py | 2 | ||||
| -rw-r--r-- | resources/libraries/python/IPsecUtil.py | 30 | ||||
| -rw-r--r-- | resources/libraries/python/InterfaceUtil.py | 2 | ||||
| -rw-r--r-- | resources/libraries/python/Tap.py | 4 |
5 files changed, 28 insertions, 45 deletions
diff --git a/resources/api/vpp/supported_crcs.yaml b/resources/api/vpp/supported_crcs.yaml index 30ea8bf6a2..10deb6e1f4 100644 --- a/resources/api/vpp/supported_crcs.yaml +++ b/resources/api/vpp/supported_crcs.yaml @@ -30,8 +30,8 @@ # Use bash command "env LC_COLLATE=C sort -u" if not clear. # https://packagecloud.io/app/fdio/release -# /search?q=21.06&filter=debs&filter=all&dist=debian -21.06-release: +# /search?q=22.06&filter=debs&filter=all&dist=debian +22.06-release: acl_add_replace: '0xee5c2f18' # dev acl_add_replace_reply: '0xac407b0c' # dev acl_details: '0x95babae0' # dev teardown @@ -46,8 +46,8 @@ adl_allowlist_enable_disable_reply: '0xe8d4e804' # dev adl_interface_enable_disable: '0x5501adee' # dev adl_interface_enable_disable_reply: '0xe8d4e804' # dev - af_xdp_create: '0x21226c99' # dev - af_xdp_create_reply: '0x5383d31f' # dev + af_xdp_create_v2: '0xe17ec2eb' # dev + af_xdp_create_v2_reply: '0x5383d31f' # dev avf_create: '0xdaab8ae2' # dev avf_create_reply: '0x5383d31f' # dev bond_add_member: '0xe7d14948' # perf @@ -96,14 +96,14 @@ det44_session_dump: '0xe45a3af7' # dev # TODO: Which test to run to verify det44_* messages? # dhcp_proxy_dump / details # honeycomb - flow_add: '0xf946ed84' # dev - flow_add_reply: '0x8587dc85' # dev + flow_add_v2: '0x5b757558' # dev + flow_add_v2_reply: '0x8587dc85' # dev + flow_del: '0xb6b9b02c' # dev + flow_del_reply: '0xe8d4e804' # dev + flow_disable: '0x2024be69' # dev + flow_disable_reply: '0xe8d4e804' # dev flow_enable: '0x2024be69' # dev flow_enable_reply: '0xe8d4e804' # dev - flow_disable: '0x2024be69' #dev - flow_disable_reply: '0xe8d4e804' #dev - flow_del: '0xb6b9b02c' #dev - flow_del_reply: '0xe8d4e804' #dev geneve_add_del_tunnel2: '0x8c2a9999' # dev geneve_add_del_tunnel2_reply: '0x5383d31f' # dev geneve_tunnel_details: '0x6b16eb24' # dev @@ -137,8 +137,8 @@ ipsec_interface_add_del_spd_reply: '0xe8d4e804' # dev ipsec_sa_v3_details: '0x2fc991ee' # dev ipsec_sa_v3_dump: '0x2076c2f4' # dev - ipsec_sad_entry_add_del_v3: '0xc77ebd92' # dev - ipsec_sad_entry_add_del_v3_reply: '0x9ffac24b' # dev + ipsec_sad_entry_add: '0x50229353' # dev + ipsec_sad_entry_add_reply: '0x9ffac24b' # dev ipsec_select_backend: '0x5bcfd3b7' # perf ipsec_select_backend_reply: '0xe8d4e804' # perf # ^^ 64B-1c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr @@ -216,10 +216,6 @@ nat44_show_running_config_reply: '0x93d8e267' # dev teardown nat44_static_mapping_details: '0x06cb40b2' # dev teardown nat44_static_mapping_dump: '0x51077d14' # dev teardown - nat44_user_details: '0x355896c2' # not used - nat44_user_dump: '0x51077d14' # not used - nat44_user_session_details: '0x2cf6e16d' # not used - nat44_user_session_dump: '0xe1899c98' # not used # nat44_user_dump and nat44_user_session_dump can be called # by show_nat_user_data function nat_worker_details: '0x84bf06fc' # dev teardown @@ -270,8 +266,6 @@ sw_interface_rx_placement_dump: '0xf9e6675e' # dev sw_interface_set_flags: '0xf5aec1b8' # dev sw_interface_set_flags_reply: '0xe8d4e804' # dev - sw_interface_set_geneve_bypass: '0x65247409' # not used - sw_interface_set_geneve_bypass_reply: '0xe8d4e804' # not used # sw_interface_set_geneve_bypass can be called # by enable_interface_geneve_bypass function sw_interface_set_l2_bridge: '0xd0678b13' # dev @@ -295,8 +289,8 @@ sw_member_interface_details: '0x3c4a0e23' # perf sw_member_interface_dump: '0xf9e6675e' # perf # ^^ see bond_* - tap_create_v2: '0x2d0d6570' # dev - tap_create_v2_reply: '0x5383d31f' # dev + tap_create_v3: '0x3f3fd1df' # dev + tap_create_v3_reply: '0x5383d31f' # dev vxlan_add_del_tunnel_v3: '0x0072b037' # dev vxlan_add_del_tunnel_v3_reply: '0x5383d31f' # dev # vxlan_gpe_tunnel_dump / details # honeycomb @@ -313,6 +307,7 @@ # Independent hint: # $ fgrep -rn dump_and_log +# (The rest has not been updated since 2021-09-28.) # TODO: Create an on-demand perf verify job with a tag expression # covering API calls used only in perf tests, # and maintain the expression as device test gets more coverage. diff --git a/resources/libraries/python/FlowUtil.py b/resources/libraries/python/FlowUtil.py index 23293b6dc6..f92f5148db 100644 --- a/resources/libraries/python/FlowUtil.py +++ b/resources/libraries/python/FlowUtil.py @@ -400,7 +400,7 @@ class FlowUtil: :rtype: int :raises ValueError: If action type is not supported. """ - cmd = u"flow_add" + cmd = u"flow_add_v2" if action == u"redirect-to-queue": flow_rule = { diff --git a/resources/libraries/python/IPsecUtil.py b/resources/libraries/python/IPsecUtil.py index 6ed2db1eae..86bed716d1 100644 --- a/resources/libraries/python/IPsecUtil.py +++ b/resources/libraries/python/IPsecUtil.py @@ -438,7 +438,7 @@ class IPsecUtil: src_addr = u"" dst_addr = u"" - cmd = u"ipsec_sad_entry_add_del_v3" + cmd = u"ipsec_sad_entry_add" err_msg = f"Failed to add Security Association Database entry " \ f"on host {node[u'host']}" sad_entry = dict( @@ -462,10 +462,7 @@ class IPsecUtil: udp_src_port=4500, # default value in api udp_dst_port=4500 # default value in api ) - args = dict( - is_add=True, - entry=sad_entry - ) + args = dict(entry=sad_entry) with PapiSocketExecutor(node) as papi_exec: papi_exec.add(cmd, **args).get_reply(err_msg) @@ -562,7 +559,7 @@ class IPsecUtil: IPsecSadFlags.IPSEC_API_SAD_FLAG_IS_TUNNEL_V6 ) - cmd = u"ipsec_sad_entry_add_del_v3" + cmd = u"ipsec_sad_entry_add" err_msg = f"Failed to add Security Association Database entry " \ f"on host {node[u'host']}" @@ -585,12 +582,9 @@ class IPsecUtil: ), protocol=int(IPsecProto.IPSEC_API_PROTO_ESP), udp_src_port=4500, # default value in api - udp_dst_port=4500 # default value in api - ) - args = dict( - is_add=True, - entry=sad_entry + udp_dst_port=4500, # default value in api ) + args = dict(entry=sad_entry) with PapiSocketExecutor(node) as papi_exec: for i in range(n_entries): args[u"entry"][u"sad_id"] = int(sad_id) + i @@ -1471,7 +1465,7 @@ class IPsecUtil: # Configure IPSec SAD entries ckeys = [bytes()] * existing_tunnels ikeys = [bytes()] * existing_tunnels - cmd = u"ipsec_sad_entry_add_del_v3" + cmd = u"ipsec_sad_entry_add" c_key = dict( length=0, data=None @@ -1502,10 +1496,7 @@ class IPsecUtil: udp_src_port=IPSEC_UDP_PORT_NONE, udp_dst_port=IPSEC_UDP_PORT_NONE, ) - args = dict( - is_add=True, - entry=sad_entry - ) + args = dict(entry=sad_entry) for i in range(existing_tunnels, n_tunnels): ckeys.append( gen_key(IPsecUtil.get_crypto_alg_key_len(crypto_alg)) @@ -1713,7 +1704,7 @@ class IPsecUtil: ] ) # Configure IPSec SAD entries - cmd = u"ipsec_sad_entry_add_del_v3" + cmd = u"ipsec_sad_entry_add" c_key = dict( length=0, data=None @@ -1744,10 +1735,7 @@ class IPsecUtil: udp_src_port=IPSEC_UDP_PORT_NONE, udp_dst_port=IPSEC_UDP_PORT_NONE, ) - args = dict( - is_add=True, - entry=sad_entry - ) + args = dict(entry=sad_entry) for i in range(existing_tunnels, n_tunnels): ckeys.append( gen_key(IPsecUtil.get_crypto_alg_key_len(crypto_alg)) diff --git a/resources/libraries/python/InterfaceUtil.py b/resources/libraries/python/InterfaceUtil.py index 4a53f71a01..7578716023 100644 --- a/resources/libraries/python/InterfaceUtil.py +++ b/resources/libraries/python/InterfaceUtil.py @@ -1311,7 +1311,7 @@ class InterfaceUtil: node, u"set logging class af_xdp level debug" ) - cmd = u"af_xdp_create" + cmd = u"af_xdp_create_v2" pci_addr = Topology.get_interface_pci_addr(node, if_key) args = dict( name=InterfaceUtil.pci_to_eth(node, pci_addr), diff --git a/resources/libraries/python/Tap.py b/resources/libraries/python/Tap.py index 7a987fc34b..7380344b72 100644 --- a/resources/libraries/python/Tap.py +++ b/resources/libraries/python/Tap.py @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2022 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: @@ -64,7 +64,7 @@ class Tap: :returns: Returns a interface index. :rtype: int """ - cmd = u"tap_create_v2" + cmd = u"tap_create_v3" args = dict( id=Constants.BITWISE_NON_ZERO, use_random_mac=bool(mac is None), |