From 6857447bf6acba3537d5e5372cd320aef078b81e Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 27 Dec 2022 17:16:22 +0100
Subject: strongSwan: upgrade scripts to work with package version 5.9.8

---
 op-mode-definitions/monitor-log.xml.in  | 2 +-
 op-mode-definitions/show-log.xml.in     | 4 ++--
 smoketest/scripts/cli/test_vpn_ipsec.py | 5 +++--
 src/conf_mode/vpn_ipsec.py              | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/op-mode-definitions/monitor-log.xml.in b/op-mode-definitions/monitor-log.xml.in
index 8abc5f4db..c14f45d75 100644
--- a/op-mode-definitions/monitor-log.xml.in
+++ b/op-mode-definitions/monitor-log.xml.in
@@ -262,7 +262,7 @@
                 <properties>
                   <help>Monitor last lines of IPsec</help>
                 </properties>
-                <command>journalctl --no-hostname --boot --follow --unit strongswan-starter.service</command>
+                <command>journalctl --no-hostname --boot --follow --unit strongswan.service</command>
               </leafNode>
               <leafNode name="l2tp">
                 <properties>
diff --git a/op-mode-definitions/show-log.xml.in b/op-mode-definitions/show-log.xml.in
index 977ece453..70afaaf6e 100644
--- a/op-mode-definitions/show-log.xml.in
+++ b/op-mode-definitions/show-log.xml.in
@@ -403,13 +403,13 @@
                 <properties>
                   <help>Show log for ALL</help>
                 </properties>
-                <command>journalctl --no-hostname --boot --unit strongswan-starter.service --unit accel-ppp@*.service</command>
+                <command>journalctl --no-hostname --boot --unit strongswan.service --unit accel-ppp@*.service</command>
               </leafNode>
               <leafNode name="ipsec">
                 <properties>
                   <help>Show log for IPsec</help>
                 </properties>
-                <command>journalctl --no-hostname --boot --unit strongswan-starter.service</command>
+                <command>journalctl --no-hostname --boot --unit strongswan.service</command>
               </leafNode>
               <leafNode name="l2tp">
                 <properties>
diff --git a/smoketest/scripts/cli/test_vpn_ipsec.py b/smoketest/scripts/cli/test_vpn_ipsec.py
index bd242104f..7d7618d7c 100755
--- a/smoketest/scripts/cli/test_vpn_ipsec.py
+++ b/smoketest/scripts/cli/test_vpn_ipsec.py
@@ -39,6 +39,7 @@ vif = '100'
 esp_group = 'MyESPGroup'
 ike_group = 'MyIKEGroup'
 secret = 'MYSECRETKEY'
+PROCESS_NAME = 'charon'
 
 ca_pem = """
 MIIDSzCCAjOgAwIBAgIUQHK+ZgTUYZksvXY2/MyW+Jiels4wDQYJKoZIhvcNAQEL
@@ -137,14 +138,14 @@ class TestVPNIPsec(VyOSUnitTestSHIM.TestCase):
 
     def tearDown(self):
         # Check for running process
-        self.assertTrue(process_named_running('charon'))
+        self.assertTrue(process_named_running(PROCESS_NAME))
 
         self.cli_delete(base_path)
         self.cli_delete(tunnel_path)
         self.cli_commit()
 
         # Check for no longer running process
-        self.assertFalse(process_named_running('charon'))
+        self.assertFalse(process_named_running(PROCESS_NAME))
 
     def test_01_dhcp_fail_handling(self):
         # Interface for dhcp-interface
diff --git a/src/conf_mode/vpn_ipsec.py b/src/conf_mode/vpn_ipsec.py
index b79e9847a..04e2f2939 100755
--- a/src/conf_mode/vpn_ipsec.py
+++ b/src/conf_mode/vpn_ipsec.py
@@ -622,7 +622,7 @@ def wait_for_vici_socket(timeout=5, sleep_interval=0.1):
         sleep(sleep_interval)
 
 def apply(ipsec):
-    systemd_service = 'strongswan-starter.service'
+    systemd_service = 'strongswan.service'
     if not ipsec:
         call(f'systemctl stop {systemd_service}')
     else:
-- 
cgit v1.2.3