fix(api): bump messages to 23.02 usage

New features are generally not used in CSIT,
but some edits in code are needed to continue using defaults.

3 messages have newer versions:
* bridge_domain_add_del_v2
* ipsec_spd_entry_add_del_v2
* lb_add_del_vip_v2

Change-Id: Ibcc089ccbf933c019b5e7188c06ef229e68d39a8
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/resources/api/vpp/supported_crcs.yaml b/resources/api/vpp/supported_crcs.yaml
index c778753..522dc44 100644 (file)
--- a/resources/api/vpp/supported_crcs.yaml
+++ b/resources/api/vpp/supported_crcs.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Cisco and/or its affiliates.
+# Copyright (c) 2023 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:
@@ -30,8 +30,8 @@
 # Use bash command "env LC_COLLATE=C sort -u" if not clear.
 
 # https://packagecloud.io/app/fdio/release
-# /search?q=22.06&filter=debs&filter=all&dist=debian
-22.06-release:
+# /search?q=23.02&filter=debs&filter=all&dist=debian
+23.02-release:
     acl_add_replace: '0xee5c2f18'  # dev
     acl_add_replace_reply: '0xac407b0c'  # dev
     acl_details: '0x95babae0'  # dev teardown
@@ -56,8 +56,8 @@
     bond_create2_reply: '0x5383d31f'  # perf
     # 4x^ 64B-1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
     # ^ ndrpdrAND1cAND64bAND1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm
-    bridge_domain_add_del: '0x600b7170'  # dev
-    bridge_domain_add_del_reply: '0xe8d4e804'  # dev
+    bridge_domain_add_del_v2: '0x600b7170'  # dev
+    bridge_domain_add_del_v2_reply: '0xfcb1e980'  # dev
     # bridge_domain_dump / details # honeycomb
     classify_add_del_session: '0xf20879f0'  # dev
     classify_add_del_session_reply: '0xe8d4e804'  # dev
@@ -147,8 +147,8 @@
     ipsec_set_async_mode_reply: '0xe8d4e804'  # perf
     ipsec_spd_add_del: '0x20e89a95'  # dev
     ipsec_spd_add_del_reply: '0xe8d4e804'  # dev
-    ipsec_spd_entry_add_del: '0x338b7411'  # dev
-    ipsec_spd_entry_add_del_reply: '0x9ffac24b'  # dev
+    ipsec_spd_entry_add_del_v2: '0x7bfe69fc'  # dev
+    ipsec_spd_entry_add_del_v2_reply: '0x9ffac24b'  # dev
     ipsec_tunnel_protect_update: '0x30d5f133'  # dev
     ipsec_tunnel_protect_update_reply: '0xe8d4e804'  # dev
     # ^^ 64B-1c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
@@ -165,8 +165,8 @@
     lb_add_del_as_reply: '0xe8d4e804'  # perf
     lb_add_del_intf_nat4: '0x47d6e753'  # perf
     lb_add_del_intf_nat4_reply: '0xe8d4e804'  # perf
-    lb_add_del_vip: '0x6fa569c7'  # perf
-    lb_add_del_vip_reply: '0xe8d4e804'  # perf
+    lb_add_del_vip_v2: '0x7c520e0f'  # perf
+    lb_add_del_vip_v2_reply: '0xe8d4e804'  # perf
     lb_conf: '0x56cd3261'  # perf
     lb_conf_reply: '0xe8d4e804'  # perf
     # 8x^ 64B-1c-ethip4-loadbalancer-nat4-ndrpdr

diff --git a/resources/libraries/python/IPsecUtil.py b/resources/libraries/python/IPsecUtil.py
index 6ae8d10..9c5337b 100644 (file)
--- a/resources/libraries/python/IPsecUtil.py
+++ b/resources/libraries/python/IPsecUtil.py
@@ -879,7 +879,7 @@ class IPsecUtil:
         local_net = ip_network(laddr_range, strict=False)
         remote_net = ip_network(raddr_range, strict=False)
 
-        cmd = u"ipsec_spd_entry_add_del"
+        cmd = u"ipsec_spd_entry_add_del_v2"
 
         spd_entry = dict(
             spd_id=int(spd_id),
@@ -887,7 +887,7 @@ class IPsecUtil:
             is_outbound=not inbound,
             sa_id=int(sa_id) if sa_id else 0,
             policy=int(action),
-            protocol=int(proto) if proto else 0,
+            protocol=255 if proto is None else int(proto),
             remote_address_start=IPAddress.create_ip_address_object(
                 remote_net.network_address
             ),

diff --git a/resources/libraries/python/L2Util.py b/resources/libraries/python/L2Util.py
index b951e62..92c93ed 100644 (file)
--- a/resources/libraries/python/L2Util.py
+++ b/resources/libraries/python/L2Util.py
@@ -156,7 +156,7 @@ class L2Util:
         :type learn: bool
         :type arp_term: bool
         """
-        cmd = u"bridge_domain_add_del"
+        cmd = u"bridge_domain_add_del_v2"
         err_msg = f"Failed to create L2 bridge domain on host {node[u'host']}"
         args = dict(
             bd_id=int(bd_id),
@@ -222,7 +222,7 @@ class L2Util:
         sw_if_index1 = Topology.get_interface_sw_index(node, port_1)
         sw_if_index2 = Topology.get_interface_sw_index(node, port_2)
 
-        cmd1 = u"bridge_domain_add_del"
+        cmd1 = u"bridge_domain_add_del_v2"
         args1 = dict(
             bd_id=int(bd_id),
             flood=True,

diff --git a/resources/libraries/python/LoadBalancerUtil.py b/resources/libraries/python/LoadBalancerUtil.py
index 6810122..471bc87 100644 (file)
--- a/resources/libraries/python/LoadBalancerUtil.py
+++ b/resources/libraries/python/LoadBalancerUtil.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Intel and/or its affiliates.
+# Copyright (c) 2023 Intel 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:
@@ -108,9 +108,10 @@ class LoadBalancerUtil:
             target_port = kwargs.pop(u"target_port", 0)
             node_port = kwargs.pop(u"node_port", 0)
             new_len = kwargs.pop(u"new_len", 1024)
+            src_ip_sticky = kwargs.pop(u"src_ip_sticky", 0)
             is_del = kwargs.pop(u"is_del", 0)
 
-            cmd = u"lb_add_del_vip"
+            cmd = u"lb_add_del_vip_v2"
             err_msg = f"Failed to add vip on host {node[u'host']}"
 
             vip_addr = ip_address(vip_addr).packed
@@ -127,7 +128,8 @@ class LoadBalancerUtil:
                 target_port=target_port,
                 node_port=node_port,
                 new_flows_table_length=int(new_len),
-                is_del=is_del
+                src_ip_sticky=src_ip_sticky,
+                is_del=is_del,
             )
 
             with PapiSocketExecutor(node) as papi_exec: