From 9ab89a5412ec83f2cebe5ad71fd0d4b610706861 Mon Sep 17 00:00:00 2001
From: Lin Liu <lin.liu@citrix.com>
Date: Mon, 26 Feb 2024 09:00:31 +0000
Subject: [PATCH] CP-48018: Update to systemd to manage services

All existing living XS use systemd to manage services,
Update the service management command to systemd

Signed-off-by: Lin Liu <lin.liu@citrix.com>
---
 drivers/iscsilib.py         | 6 +++---
 drivers/mpath_dmp.py        | 2 +-
 scripts/set-iscsi-initiator | 4 ++--
 tests/test_mpath_dmp.py     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/iscsilib.py b/drivers/iscsilib.py
index 79c0ff0e8..bb1a572a0 100644
--- a/drivers/iscsilib.py
+++ b/drivers/iscsilib.py
@@ -378,14 +378,14 @@ def get_luns(targetIQN, portal):
 
 
 def is_iscsi_daemon_running():
-    cmd = ["/sbin/pidof", "-s", "/sbin/iscsid"]
+    cmd = ["/usr/bin/systemctl", "is-active", "iscsid.service"]
     (rc, stdout, stderr) = util.doexec(cmd)
     return (rc == 0)
 
 
 def stop_daemon():
     if is_iscsi_daemon_running():
-        cmd = ["service", "iscsid", "stop"]
+        cmd = ["/usr/bin/systemctl", "stop", "iscsid.service"]
         failuremessage = "Failed to stop iscsi daemon"
         exn_on_failure(cmd, failuremessage)
 
@@ -401,7 +401,7 @@ def restart_daemon():
             shutil.rmtree(os.path.join(_ISCSI_DB_PATH, 'send_targets'))
         except:
             pass
-    cmd = ["service", "iscsid", "start"]
+    cmd = ["/usr/bin/systemctl", "start", "iscsid.service"]
     failuremessage = "Failed to start iscsi daemon"
     exn_on_failure(cmd, failuremessage)
 
diff --git a/drivers/mpath_dmp.py b/drivers/mpath_dmp.py
index 3b8224d53..fa6d83c2b 100755
--- a/drivers/mpath_dmp.py
+++ b/drivers/mpath_dmp.py
@@ -191,7 +191,7 @@ def activate():
 
     if not _is_mpath_daemon_running():
         util.SMlog("Warning: multipath daemon not running.  Starting daemon!")
-        cmd = ["service", "multipathd", "start"]
+        cmd = ["/usr/bin/systemctl", "start", "multipathd.service"]
         util.pread2(cmd)
 
     for i in range(0, 120):
diff --git a/scripts/set-iscsi-initiator b/scripts/set-iscsi-initiator
index 739c80f29..a44936dec 100644
--- a/scripts/set-iscsi-initiator
+++ b/scripts/set-iscsi-initiator
@@ -64,11 +64,11 @@ touch $RUNNING_LOCK
         echo "InitiatorName=$INITIATORNAME" > $INITIATORFILE
         echo "InitiatorAlias=$INITIATORALIAS" >> $INITIATORFILE
 
-        systemctl is-active -q iscsid
+        systemctl is-active -q iscsid.service
         if [ $? -eq 0 ]
         then
             # iscsid is running so restart
-            systemctl restart iscsid
+            systemctl restart iscsid.service
         fi
 
 ) 200>$RUNNING_LOCK
diff --git a/tests/test_mpath_dmp.py b/tests/test_mpath_dmp.py
index da9823ba1..78973c49a 100644
--- a/tests/test_mpath_dmp.py
+++ b/tests/test_mpath_dmp.py
@@ -227,7 +227,7 @@ def test_activate_noiscsi_start_mpath(
 
         self.assertEqual(1, mock_util.pread2.call_count)
         mock_util.pread2.assert_called_once_with(
-            ['service', 'multipathd', 'start'])
+            ['/usr/bin/systemctl', 'start', 'multipathd.service'])
 
     @testlib.with_context
     @mock.patch('mpath_dmp.iscsilib', autospec=True)