[fadump] update initrd validation check

The fadump initrd isolation feature brought a new initrd module named
zz-fadumpinit in addition to kdumpbase.

Now FADump initrd is considered valid if either kdumpbase or zz-fadumpinit
module is present.

Signed-off-by: Sourabh Jain <sourabhjain@linux.ibm.com>

Author: sourabhjains

servicereportpkg/validate/plugins/fadump.py

@@ -33,7 +33,7 @@ def __init__(self):
         self.name = FADump.__name__
         self.description = FADump.__doc__
         self.dump_service_name = "kdump"
-        self.dump_comp_name = "kdump"
+        self.dump_comp_name = ["kdump", "zz-fadumpinit"]
         # (system mem, mem reservation needed)
         # (GB, MB)
         self.log = get_default_logger()

servicereportpkg/validate/plugins/kdump.py

@@ -30,7 +30,7 @@ class Dump(object):
 
     def __init__(self):
         self.dump_service_name = ""
-        self.dump_comp_name = ""
+        self.dump_comp_name = []
         self.initial_ramdisk = ""
         self.log = get_default_logger()
         self.kernel_release = platform.release()
@@ -57,7 +57,7 @@ def check_is_dump_service_active(self):
     def check_dump_component_in_initrd(self):
         """Dump component in initial ramdisk"""
 
-        status = True
+        status = None
 
         if not os.path.isfile(self.initial_ramdisk):
             self.log.error("Initial ramdisk not found %s",
@@ -77,14 +77,19 @@ def check_dump_component_in_initrd(self):
                                self.dump_comp_name)
                 status = False
 
-            elif self.dump_comp_name not in str(stdout):
-                self.log.error("kdump component is missing in %s",
-                               self.initial_ramdisk)
-                status = False
+            elif self.dump_comp_name:
+                for dump_comp in self.dump_comp_name:
+                    if dump_comp in str(stdout):
+                        status = True;
+                        break
 
-            else:
-                self.log.debug("%s component found in %s", self.dump_comp_name,
+                if status:
+                    self.log.debug("%s component found in %s", self.dump_comp_name,
+                                   self.initial_ramdisk)
+                else:
+                    self.log.error("kdump component is missing in %s",
                                self.initial_ramdisk)
+                    status = False
 
         return Check(self.check_dump_component_in_initrd.__doc__,
                      status)
@@ -118,7 +123,7 @@ def __init__(self):
         self.name = Kdump.__name__
         self.description = Kdump.__doc__
         self.dump_service_name = "kdump"
-        self.dump_comp_name = "kdump"
+        self.dump_comp_name = ["kdump"]
         self.kdump_etc_conf = "/etc/kdump.conf"
         self.kdump_conf_file = "/etc/sysconfig/kdump"
         self.log = get_default_logger()