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,18 +253,22 @@ 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))
-                (rc, out, err) = self.module.run_command('%s -s %s' % (dmi_bin, v))
+            if rc == 0:
-                if rc == 0:
+                # Strip out commented lines (specific dmidecode output)
-                    # Strip out commented lines (specific dmidecode output)
+                # FIXME: why add the fact and then test if it is json?
-                    # FIXME: why add the fact and then test if it is json?
+                dmi_facts[k] = ''.join([line for line in out.splitlines() if not line.startswith('#')])
-                    dmi_facts[k] = ''.join([line for line in out.splitlines() if not line.startswith('#')])
+                try:
-                    try:
+                    json.dumps(dmi_facts[k])
-                        json.dumps(dmi_facts[k])
+                except UnicodeDecodeError:
-                    except UnicodeDecodeError:
-                        dmi_facts[k] = 'NA'
-                else:
                     dmi_facts[k] = 'NA'
             else:
                 dmi_facts[k] = 'NA'

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

@@ -393,20 +393,24 @@ 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))
-                    (rc, out, err) = self.module.run_command('%s -s %s' % (dmi_bin, v))
+                if rc == 0:
-                    if rc == 0:
+                    # Strip out commented lines (specific dmidecode output)
-                        # Strip out commented lines (specific dmidecode output)
+                    thisvalue = ''.join([line for line in out.splitlines() if not line.startswith('#')])
-                        thisvalue = ''.join([line for line in out.splitlines() if not line.startswith('#')])
+                    try:
-                        try:
+                        json.dumps(thisvalue)
-                            json.dumps(thisvalue)
+                    except UnicodeDecodeError:
-                        except UnicodeDecodeError:
+                        thisvalue = "NA"
-                            thisvalue = "NA"
 
-                        dmi_facts[k] = thisvalue
+                    dmi_facts[k] = thisvalue
-                    else:
-                        dmi_facts[k] = 'NA'
                 else:
                     dmi_facts[k] = 'NA'