Refactor dmidecode fact gathering code (#83211)

* Code now bails out early if dmidecode command is unavailable

Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>

changelogs/fragments/freebsd_facts_refactor.yml

@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - freebsd - refactor dmidecode fact gathering code for simplicity.

lib/ansible/module_utils/facts/hardware/freebsd.py

@@ -253,8 +253,14 @@ class FreeBSDHardware(Hardware):
             'product_version': 'system-version',
             'system_vendor': 'system-manufacturer',
         }
+        if dmi_bin is None:
+            dmi_facts = dict.fromkeys(
+                DMI_DICT.keys(),
+                'NA'
+            )
+            return dmi_facts
+
         for (k, v) in DMI_DICT.items():
-            if dmi_bin is not None:
             (rc, out, err) = self.module.run_command('%s -s %s' % (dmi_bin, v))
             if rc == 0:
                 # Strip out commented lines (specific dmidecode output)
@@ -266,8 +272,6 @@ class FreeBSDHardware(Hardware):
                     dmi_facts[k] = 'NA'
             else:
                 dmi_facts[k] = 'NA'
-            else:
-                dmi_facts[k] = 'NA'
 
         return dmi_facts
 

lib/ansible/module_utils/facts/hardware/linux.py

@@ -393,8 +393,14 @@ class LinuxHardware(Hardware):
                 'product_version': 'system-version',
                 'system_vendor': 'system-manufacturer',
             }
+            if dmi_bin is None:
+                dmi_facts = dict.fromkeys(
+                    DMI_DICT.keys(),
+                    'NA'
+                )
+                return dmi_facts
+
             for (k, v) in DMI_DICT.items():
-                if dmi_bin is not None:
                 (rc, out, err) = self.module.run_command('%s -s %s' % (dmi_bin, v))
                 if rc == 0:
                     # Strip out commented lines (specific dmidecode output)
@@ -407,8 +413,6 @@ class LinuxHardware(Hardware):
                     dmi_facts[k] = thisvalue
                 else:
                     dmi_facts[k] = 'NA'
-                else:
-                    dmi_facts[k] = 'NA'
 
         return dmi_facts