From: Ondrej Lichtner <olichtne(a)redhat.com>
Also slightly modified the _configure_service helper method.
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
---
lnst/Controller/Machine.py | 8 ++++----
lnst/Controller/Task.py | 3 +++
lnst/Slave/NetTestSlave.py | 10 ++++++----
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/lnst/Controller/Machine.py b/lnst/Controller/Machine.py
index ee0bd76..9a7c233 100644
--- a/lnst/Controller/Machine.py
+++ b/lnst/Controller/Machine.py
@@ -636,10 +636,10 @@ class Machine(object):
return False
return self._rpc_call("disable_service", service)
- def disable_services(self):
- for service in self._services:
- self.disable_service(service)
- return True
+ def restart_service(self, service):
+ if service not in self._services:
+ self._services.append(service)
+ return self._rpc_call("restart_service", service)
def get_num_cpus(self):
return self._rpc_call("get_num_cpus")
diff --git a/lnst/Controller/Task.py b/lnst/Controller/Task.py
index e103aa6..245968d 100644
--- a/lnst/Controller/Task.py
+++ b/lnst/Controller/Task.py
@@ -542,6 +542,9 @@ class HostAPI(object):
def disable_service(self, service):
return self._m.disable_service(service)
+ def restart_service(self, service):
+ return self._m.restart_service(service)
+
def get_num_cpus(self):
return self._m.get_num_cpus()
diff --git a/lnst/Slave/NetTestSlave.py b/lnst/Slave/NetTestSlave.py
index e71d3ef..685111a 100644
--- a/lnst/Slave/NetTestSlave.py
+++ b/lnst/Slave/NetTestSlave.py
@@ -1014,8 +1014,7 @@ class SlaveMethods:
stdout, _ = exec_cmd("pidof systemd", die_on_err=False)
return len(stdout) != 0
- def _configure_service(self, service, start=True):
- action = "start" if start else "stop"
+ def _configure_service(self, service, action):
if self._is_systemd():
exec_cmd("systemctl {} {}".format(action, service))
else:
@@ -1023,10 +1022,13 @@ class SlaveMethods:
return True
def enable_service(self, service):
- return self._configure_service(service)
+ return self._configure_service(service, "start")
def disable_service(self, service):
- return self._configure_service(service, start=False)
+ return self._configure_service(service, "stop")
+
+ def restart_service(self, service):
+ return self._configure_service(service, "restart")
def get_num_cpus(self):
return int(os.sysconf('SC_NPROCESSORS_ONLN'))
--
2.14.2