summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraapostoliuk <a.apostoliuk@vyos.io>2023-02-14 12:48:56 +0200
committeraapostoliuk <a.apostoliuk@vyos.io>2023-02-14 13:16:03 +0200
commit2e61af88961d8180f5ae3d7c034aaaa53b91f388 (patch)
tree09a3185c0c57403fb04544a85490d0672f0d0a0b
parent3d12327f39b95c5e9c7192361e90d1626e8b8bca (diff)
downloadvyos-1x-2e61af88961d8180f5ae3d7c034aaaa53b91f388.tar.gz
vyos-1x-2e61af88961d8180f5ae3d7c034aaaa53b91f388.zip
ipsec: T4985: Fixed 'reset vpn ipsec-peer {peer}' command
Fixed 'reset vpn ipsec-peer {peer}' command. The op-mode script uses value 'None' in the 'tunnel' parameter to clear all CHILD SAs.
-rw-r--r--op-mode-definitions/vpn-ipsec.xml.in2
-rwxr-xr-xsrc/op_mode/ipsec.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/op-mode-definitions/vpn-ipsec.xml.in b/op-mode-definitions/vpn-ipsec.xml.in
index 803ce4cc2..f6b5e6020 100644
--- a/op-mode-definitions/vpn-ipsec.xml.in
+++ b/op-mode-definitions/vpn-ipsec.xml.in
@@ -28,7 +28,7 @@
<command>sudo ${vyos_op_scripts_dir}/ipsec.py reset_peer --peer="$4" --tunnel="vti"</command>
</node>
</children>
- <command>sudo ${vyos_op_scripts_dir}/ipsec.py reset_peer --peer="$4" --tunnel="all"</command>
+ <command>sudo ${vyos_op_scripts_dir}/ipsec.py reset_peer --peer="$4"</command>
</tagNode>
<tagNode name="ipsec-profile">
<properties>
diff --git a/src/op_mode/ipsec.py b/src/op_mode/ipsec.py
index f6417764a..63fa05885 100755
--- a/src/op_mode/ipsec.py
+++ b/src/op_mode/ipsec.py
@@ -425,7 +425,7 @@ def get_peer_connections(peer, tunnel):
return matches
-def reset_peer(peer: str, tunnel:typing.Optional[str]):
+def reset_peer(peer: str, tunnel:typing.Optional[str] = None):
conns = get_peer_connections(peer, tunnel)
if not conns: