Merge pull request #16 from stfc/fix-hypervisor-uptime-less-than-day

Handle uptime days is 1

Author: lizsalmon

openstackquery/time_utils.py

@@ -69,11 +69,12 @@ def extract_uptime(uptime_string: str) -> Optional[float]:
         if match:
             uptime_string = match.group(1)
             days = 0
-            if "days" in uptime_string:
-                days_part, time_part = uptime_string.split(" days, ")
+            time_part = uptime_string
+            if "day" in uptime_string:
+                days_part, time_part = uptime_string.split(
+                    " day" + ("s" if "days" in uptime_string else "") + ", "
+                )
                 days += int(days_part)
-            else:
-                time_part = uptime_string
 
             hours, minutes = map(int, time_part.split(":"))
             days += hours / 24 + minutes / 1440

tests/test_time_utils.py

@@ -112,3 +112,13 @@ def test_extract_uptime_less_than_day():
     res = TimeUtils.extract_uptime(mock_string)
 
     assert res == 0.25
+
+
+def test_extract_uptime_is_one_day():
+    """
+    Test extraction when less than a day uptime
+    """
+    mock_string = "17:13:49 up 1 day,  7:03,  0 users,  load average: 0.00, 0.01, 0.00"
+    res = TimeUtils.extract_uptime(mock_string)
+
+    assert res == 1.29