From 0bac8169cd8421dbc87294f22072142ec0202f53 Mon Sep 17 00:00:00 2001 From: Trygve Vea Date: Thu, 5 Dec 2024 23:44:51 +0100 Subject: [PATCH] Fix connection status reporting when using LibreSwan 4 The regex-pattern used to check for connection liveness needs to remove the IPSec-keyword to correctly detect active connections on LibreSwan 4. Closes-Bug: #2089252 Change-Id: I76f04842025e6d676e372e7394a3c5ab04d0d129 --- neutron_vpnaas/services/vpn/device_drivers/ipsec.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neutron_vpnaas/services/vpn/device_drivers/ipsec.py b/neutron_vpnaas/services/vpn/device_drivers/ipsec.py index fb4d4791c..de61aa54d 100644 --- a/neutron_vpnaas/services/vpn/device_drivers/ipsec.py +++ b/neutron_vpnaas/services/vpn/device_drivers/ipsec.py @@ -187,9 +187,9 @@ class BaseSwanProcess(metaclass=abc.ABCMeta): STATUS_RE = r'\d\d\d "([a-f0-9\-]+).* (unrouted|erouted);' STATUS_NOT_RUNNING_RE = 'Command:.*ipsec.*status.*Exit code: [1|3]$' STATUS_IPSEC_SA_ESTABLISHED_RE = ( - r'\d{3} #\d+: "([a-f0-9\-]+).*established.*newest IPSEC') + r'\d{3} #\d+: "([a-f0-9\-]+).*established.*newest') STATUS_IPSEC_SA_ESTABLISHED_RE2 = ( - r'\d{3} #\d+: "([a-f0-9\-\/x]+).*established.*newest IPSEC') + r'\d{3} #\d+: "([a-f0-9\-\/x]+).*established.*newest') def __init__(self, conf, process_id, vpnservice, namespace): self.conf = conf