diff options
author | Vratko Polak <vrpolak@cisco.com> | 2023-04-18 14:57:11 +0200 |
---|---|---|
committer | Vratko Polak <vrpolak@cisco.com> | 2023-04-18 13:50:01 +0000 |
commit | a33d434b0a6e285227b88aad2aeabd1eb977a2b7 (patch) | |
tree | d2d06f1d8ab04296c1839cb45baea08b1c896fb0 /resources/libraries/python | |
parent | 877928bd3cf147654209225dd4605db02eb562e4 (diff) |
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>
Diffstat (limited to 'resources/libraries/python')
-rw-r--r-- | resources/libraries/python/IPsecUtil.py | 4 | ||||
-rw-r--r-- | resources/libraries/python/L2Util.py | 4 | ||||
-rw-r--r-- | resources/libraries/python/LoadBalancerUtil.py | 8 |
3 files changed, 9 insertions, 7 deletions
diff --git a/resources/libraries/python/IPsecUtil.py b/resources/libraries/python/IPsecUtil.py index 6ae8d10c43..9c5337b8d4 100644 --- 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 b951e6257a..92c93ed9dd 100644 --- 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 6810122257..471bc87e80 100644 --- 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: |