Merge branch 'linux-ras:master' into a

Author: seeteena

Makefile

@@ -3,19 +3,21 @@
 # (C) Copyright IBM Corp. 2018, 2019
 # Author: Sourabh Jain <sourabhjain@linux.ibm.com>
 
+PYTHON:=python3
+
 
 # build everything needed to install
 build:
-	python setup.py build
+	$(PYTHON) setup.py build
 
 # install everything from build directory
 install:
-	python setup.py install
+	$(PYTHON) setup.py install
 
 # build the rpm package
 build_rpm:
-	python setup.py bdist_rpm
+	$(PYTHON) setup.py bdist_rpm
 
 # clean up temporary files from 'build' command
 clean:
-	python setup.py clean --all
+	$(PYTHON) setup.py clean --all

README.md

@@ -59,6 +59,10 @@ make install
 
 ### Running
 
+NOTE: servicereport by default runs with python3, if you want to run
+      servicereport with python2 consider chaging the shebang in servicereport
+      script to python2.
+
 Runs and print the status of all the applicable plugins in current system
 ```
 $ servicereport

ServiceReport.spec

@@ -43,6 +43,7 @@ systemctl enable servicereport.service
 %defattr(-,root,root)
 %doc /usr/share/man/man8/*
 %doc /usr/share/doc/*
+%doc /usr/share/licenses/*
 /usr/lib/*
 /usr/bin/*
 

servicereport

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # SPDX-License-Identifier: GPL-2.0-only
 #

servicereportpkg/__init__.py

@@ -12,6 +12,7 @@
 import os
 import sys
 import time
+import platform
 from argparse import ArgumentParser
 
 from servicereportpkg.repair import Repair
@@ -21,9 +22,10 @@
 from servicereportpkg.global_context import TOOL_NAME
 from servicereportpkg.logger import get_default_logger
 from servicereportpkg.utils import trigger_kernel_crash
+from servicereportpkg.global_context import SUPPORTED_ARCHS
 
 
-__version__ = '2.2.2'
+__version__ = '2.2.3'
 
 
 def parse_commandline_args(args):
@@ -104,10 +106,25 @@ def get_dump_plugin(validation_results):
     return None
 
 
+def is_arch_supported():
+    """Returns True if the tool supports current architecture else False"""
+
+    arch = platform.machine().lower()
+    if arch in SUPPORTED_ARCHS:
+        return True
+
+    return False
+
+
 def main():
     """Entry point of ServiceReport tool"""
 
     cmd_opts = parse_commandline_args(sys.argv[1:])
+
+    if not is_arch_supported():
+        print("\nUnsupported Architecure!")
+        return 1
+
     log = setup_logger(cmd_opts.log_file, cmd_opts.verbose)
 
     print(TOOL_NAME + " " + get_version()+"\n")

servicereportpkg/check.py

@@ -56,14 +56,33 @@ def get_service(self):
 class DaemonCheck(Check):
     """Manage daemon check information"""
 
-    def __init__(self, name, daemon, status=None, note=None):
-        Check.__init__(self, name, status, note)
-        self.daemon = daemon
+    def __init__(self, name, status=None, enabled=None,
+                 active=None):
+        """Daemon check initializer"""
+
+        Check.__init__(self, name, status)
+        self.enabled = enabled
+        self.active = active
+
+    def set_daemon_enabled(self, enabled):
+        """Set daemon enabled status"""
+
+        self.enabled = enabled
+
+    def is_daemon_enabled(self):
+        """Returns daemon enabled status"""
+
+        return self.enabled
+
+    def set_daemon_active(self, active):
+        """Set daemon active status"""
+
+        self.active = active
 
-    def get_daemon(self):
-        """Returns the daemon name"""
+    def is_daemon_active(self):
+        """Returns daemon active status"""
 
-        return self.daemon
+        return self.active
 
 
 class PackageCheck(Check):

servicereportpkg/global_context.py

@@ -8,3 +8,4 @@
 import sys
 
 TOOL_NAME = os.path.basename(sys.argv[0])
+SUPPORTED_ARCHS = ["ppc64le"]

servicereportpkg/repair/plugins/daemon_repair.py

@@ -7,7 +7,7 @@
 
 
 from servicereportpkg.repair.plugins import RepairPlugin
-from servicereportpkg.utils import enable_daemon
+from servicereportpkg.utils import enable_daemon, restart_service
 from servicereportpkg.check import Notes
 
 class DaemonRepair(RepairPlugin):
@@ -22,8 +22,22 @@ def repair(self, plugin_obj, checks):
 
         for check in checks:
             if not check.get_status():
-                if enable_daemon(check.get_name()):
+                daemon = check.get_name()
+                enabled = check.is_daemon_enabled()
+                active = check.is_daemon_active()
+
+                if not enabled:
+                    enabled = enable_daemon(daemon)
+                    if enabled:
+                        check.set_daemon_enabled(True)
+
+                if not active:
+                    active = restart_service(daemon)
+                    if active:
+                        check.set_daemon_active(True)
+
+                if enabled and active:
                     check.set_status(True)
                     check.set_note(Notes.FIXED)
                 else:
-                    check.set_note(Notes.NOT_FIXABLE)
+                    check.set_note("Failed to enable/start %s" % daemon)

servicereportpkg/utils.py

@@ -293,7 +293,7 @@ def install_package(package):
     log = get_default_logger()
 
     if package_manager is None:
-        log.walk_packages("Unable to locate the package manager")
+        log.warning("Unable to locate the package manager")
         return None
 
     command = package_manager["installer"]+" "+package_manager["install_option"]+" "+package

servicereportpkg/validate/plugins/daemon.py

@@ -8,6 +8,7 @@
 
 from servicereportpkg.check import DaemonCheck
 from servicereportpkg.utils import is_daemon_enabled
+from servicereportpkg.utils import get_service_status
 from servicereportpkg.validate.plugins import Plugin
 from servicereportpkg.validate.schemes.schemes import PSeriesScheme
 from servicereportpkg.validate.schemes.schemes import BMCPowerNVScheme
@@ -19,20 +20,33 @@
 
 
 def generate_daemon_check(self, daemon):
-    """Generates a function that checks the given daemon is enabled or not"""
+    """Generates a function to check daemon status"""
 
     def check():
-        check_daemon = daemon
-        daemon_status = is_daemon_enabled(check_daemon)
-
-        if daemon_status is None:
-            self.log.warning("Unable to find %s daemon status", check_daemon)
-        elif daemon_status is False:
-            self.log.error("%s is not enabled" % check_daemon)
+        status = True
+        enabled = is_daemon_enabled(daemon)
+
+        if enabled is None:
+            self.log.warning("Unable to find %s daemon status", daemon)
+        elif enabled is False:
+            self.log.error("%s is not enabled" % daemon)
+
+        active = get_service_status(daemon)
+        if active is None or active != 0:
+            self.log.error("%s daemon is not active", daemon)
+            self.log.recommendation("Start the service: systemctl start %s",
+                                    daemon)
+            active = False
         else:
-            self.log.info("%s is enabled" % check_daemon)
+            self.log.info("%s is active" % daemon)
+            active = True
+
+        if enabled is None or active is None:
+            status = None
+        elif enabled is False or active is False:
+            status = False
 
-        return DaemonCheck(check_daemon, check_daemon, daemon_status)
+        return DaemonCheck(daemon, status, enabled, active)
 
     check.__doc__ = "%s" % (daemon)
     return check