Merge pull request #4 from stfc/hypervisor-fixes

ENH: Add hypervisor uptime property
stfc · Dec 11, 2024 · b8fa2d3 · b8fa2d3
2 parents 9569d93 + daa782f
commit b8fa2d3
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 1 deletion.
diff --git a/docs/user_docs/query_docs/HYPERVISORS.md b/docs/user_docs/query_docs/HYPERVISORS.md
@@ -43,6 +43,7 @@ from enums.query.props.hypervisor_properties import HypervisorProperties
 | HYPERVISOR_VCPUS              | `int`    | "vcpus"                            | The number of vCPUs on this hypervisor.                         |
 | HYPERVISOR_VCPUS_USED         | `int`    | "vcpus_used"                       | The number of vCPUs currently being used on this hypervisor.    |
 | HYPERVISOR_DISABLED_REASON    | `string` | "disabled_reason"                  | Comment of why the hypervisor is disabled, None if not disabled |
+| HYPERVISOR_UPTIME_DAYS        | `int`    | "uptime"                           | The number of days the hypervisor has been up                   |
 
 
 Any of these properties can be used for any of the API methods that takes a property - like `select`, `where`, `sort_by` etc

diff --git a/openstackquery/enums/props/hypervisor_properties.py b/openstackquery/enums/props/hypervisor_properties.py
@@ -28,6 +28,7 @@ class HypervisorProperties(PropEnum):
     HYPERVISOR_VCPUS = auto()
     HYPERVISOR_VCPUS_USED = auto()
     HYPERVISOR_DISABLED_REASON = auto()
+    HYPERVISOR_UPTIME_DAYS = auto()
 
     @staticmethod
     def _get_aliases() -> Dict:
@@ -63,6 +64,7 @@ def _get_aliases() -> Dict:
             HypervisorProperties.HYPERVISOR_VCPUS: ["vcpus"],
             HypervisorProperties.HYPERVISOR_VCPUS_USED: ["vcpus_used"],
             HypervisorProperties.HYPERVISOR_DISABLED_REASON: ["disabled_reason"],
+            HypervisorProperties.HYPERVISOR_UPTIME_DAYS: ["uptime"],
         }
 
     @staticmethod
@@ -110,6 +112,9 @@ def get_prop_mapping(prop) -> Optional[PropFunc]:
             HypervisorProperties.HYPERVISOR_DISABLED_REASON: lambda a: a["service"][
                 "disabled_reason"
             ],
+            HypervisorProperties.HYPERVISOR_UPTIME_DAYS: lambda a: int(
+                a["uptime"].strip().split(" ")[2]
+            ),
         }
         try:
             return mapping[prop]

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 
 setup(
     name="openstackquery",
-    version="0.1.2",
+    version="0.1.3",
     author="Anish Mudaraddi",
     author_email="<anish.mudaraddi@stfc.ac.uk>",
     description=DESCRIPTION,

diff --git a/tests/enums/props/test_hypervisor_properties.py b/tests/enums/props/test_hypervisor_properties.py
@@ -280,3 +280,21 @@ def test_hypervisor_disabled_reason_serialization(val):
         HypervisorProperties.from_string(val)
         is HypervisorProperties.HYPERVISOR_DISABLED_REASON
     )
+
+
+@pytest.mark.parametrize(
+    "val",
+    [
+        "HYPERVISOR_UPTIME_DAYS",
+        "Hypervisor_Uptime_Days",
+        "HyPeRvIsOr_UpTiMe_DaYs",
+    ],
+)
+def test_hypervisor_uptime_days_serialization(val):
+    """
+    Tests that variants of HYPERVISOR_UPTIME_DAYS can be serialized
+    """
+    assert (
+        HypervisorProperties.from_string(val)
+        is HypervisorProperties.HYPERVISOR_UPTIME_DAYS
+    )