Fixes solaris (sunos) uptime in ansible facts module (#54626)

* correct uptime on solaris by using system boot_time instead of snaptime
* add unit test

changelogs/fragments/solaris_uptime_boot_time.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+        - facts - change to use boot_time on a solaris OS to report correct uptime (https://github.com/ansible/ansible/issues/53635)

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

@@ -17,6 +17,7 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 import re
+import time
 
 from ansible.module_utils.six.moves import reduce
 
@@ -266,18 +267,15 @@ class SunOSHardware(Hardware):
 
     def get_uptime_facts(self):
         uptime_facts = {}
-        # On Solaris, unix:0:system_misc:snaptime is created shortly after machine boots up
+        # sample kstat output:
-        # and displays tiem in seconds. This is much easier than using uptime as we would
+        # unix:0:system_misc:boot_time    1548249689
-        # need to have a parsing procedure for translating from human-readable to machine-readable
+        rc, out, err = self.module.run_command('/usr/bin/kstat -p unix:0:system_misc:boot_time')
-        # format.
-        # Example output:
-        # unix:0:system_misc:snaptime     1175.410463590
-        rc, out, err = self.module.run_command('/usr/bin/kstat -p unix:0:system_misc:snaptime')
 
         if rc != 0:
             return
 
-        uptime_facts['uptime_seconds'] = int(float(out.split('\t')[1]))
+        # uptime = $current_time - $boot_time
+        uptime_facts['uptime_seconds'] = int(time.time() - int(out.split('\t')[1]))
 
         return uptime_facts
 

test/units/module_utils/facts/hardware/test_sunos_get_uptime_facts.py

@@ -0,0 +1,16 @@
+import time
+from ansible.module_utils.facts.hardware import sunos
+
+
+def test_sunos_get_uptime_facts(mocker):
+    kstat_output = '\nunix:0:system_misc:boot_time\t1548249689\n'
+
+    module_mock = mocker.patch('ansible.module_utils.basic.AnsibleModule')
+    module = module_mock()
+    module.run_command.return_value = (0, kstat_output, '')
+
+    inst = sunos.SunOSHardware(module)
+
+    expected = int(time.time()) - 1548249689
+    result = inst.get_uptime_facts()
+    assert expected == result['uptime_seconds']