-# Copyright (c) 2022 Cisco and/or its affiliates.
-# Copyright (c) 2022 PANTHEON.tech s.r.o.
+# Copyright (c) 2023 Cisco and/or its affiliates.
+# Copyright (c) 2023 PANTHEON.tech s.r.o.
# 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:
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(
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)
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']}"
),
protocol=int(IPsecProto.IPSEC_API_PROTO_ESP),
udp_src_port=4500, # default value in api
- udp_dst_port=4500 # default value in api
+ udp_dst_port=4500, # default value in api
)
- args = dict(
- is_add=True,
- entry=sad_entry
- )
- with PapiSocketExecutor(node) as papi_exec:
+ args = dict(entry=sad_entry)
+ with PapiSocketExecutor(node, is_async=True) as papi_exec:
for i in range(n_entries):
args[u"entry"][u"sad_id"] = int(sad_id) + i
args[u"entry"][u"spi"] = int(spi) + i
else f"Failed to configure IP addresses and IP routes " \
f"on interface {interface} on host {node[u'host']}"
- with PapiSocketExecutor(node) as papi_exec:
+ with PapiSocketExecutor(node, is_async=True) as papi_exec:
for i in range(n_tunnels):
tunnel_dst_addr = tunnel_dst + i * addr_incr
args1[u"prefix"] = IPUtil.create_prefix_object(
loop_sw_if_idx = InterfaceUtil.vpp_get_interface_sw_index(
nodes[u"DUT1"], u"loop0"
)
- with PapiSocketExecutor(nodes[u"DUT1"]) as papi_exec:
+ with PapiSocketExecutor(nodes[u"DUT1"], is_async=True) as papi_exec:
# Configure IP addresses on loop0 interface
cmd = u"sw_interface_add_del_address"
args = dict(
# 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
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))
:type spi_d: dict
:type existing_tunnels: int
"""
- with PapiSocketExecutor(nodes[u"DUT2"]) as papi_exec:
+ with PapiSocketExecutor(nodes[u"DUT2"], is_async=True) as papi_exec:
if not existing_tunnels:
# Set IP address on VPP node 2 interface
cmd = u"sw_interface_add_del_address"
)
err_msg = f"Failed to set IP address on interface {if2_key} " \
f"on host {nodes[u'DUT2'][u'host']}"
- papi_exec.add(cmd, **args).get_reply(err_msg)
+ papi_exec.add(cmd, **args).get_replies(err_msg)
# Configure IPIP tunnel interfaces
cmd = u"ipip_add_tunnel"
ipip_tunnel = dict(
]
)
# 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
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))