Handle potential None value for storage status in StorageInfo

Fix assertion message in ServerManagerManagedServersTest to clarify counter logic
Remove redundant 'ha_restart_priority' entry from test client configuration
2025-11-17 08:24:12 +03:00 · 2025-11-13 16:07:20 +01:00 · 2025-11-12 03:39:58 +01:00 · 2025-11-12 03:37:10 +01:00 · 2025-11-12 03:05:23 +01:00 · 2025-11-04 16:37:18 +01:00
6 changed files with 9 additions and 14 deletions
--- a/server/src/uds/services/OVirt/ovirt/types.py
+++ b/server/src/uds/services/OVirt/ovirt/types.py
@@ -144,7 +144,7 @@ class StorageInfo:
            type=StorageType.from_str(storage.type.value),
            available=storage.available,
            used=storage.used,
-            status=StorageStatus.from_str(storage.status.value),
+            status=StorageStatus.from_str(storage.status.value if storage.status else 'unknown'),
        )


--- a/server/src/uds/services/OpenNebula/deployment.py
+++ b/server/src/uds/services/OpenNebula/deployment.py
@@ -201,12 +201,12 @@ class OpenNebulaLiveDeployment(services.UserService, autoserializable.AutoSerial
                Operation.FINISH,
            ]

-    def _check_machine_state(self, state: on.types.VmState) -> types.states.TaskState:
+    def _check_machine_state(self, check_state: on.types.VmState) -> types.states.TaskState:
        logger.debug(
            'Checking that state of machine %s (%s) is %s',
            self._vmid,
            self._name,
-            state,
+            check_state,
        )
        state = self.service().get_machine_state(self._vmid)

@@ -219,12 +219,8 @@ class OpenNebulaLiveDeployment(services.UserService, autoserializable.AutoSerial

        ret = types.states.TaskState.RUNNING

-        if isinstance(state, (list, tuple)):
-            if state in state:
-                ret = types.states.TaskState.FINISHED
-        else:
-            if state == state:
-                ret = types.states.TaskState.FINISHED
+        if state == check_state:
+            ret = types.states.TaskState.FINISHED

        return ret

--- a/server/src/uds/transports/RDP/scripts/windows/direct.py
+++ b/server/src/uds/transports/RDP/scripts/windows/direct.py
@@ -51,4 +51,4 @@ if executable is None:

 subprocess.Popen([executable, filename])  # nosec

-# tools.addFileToUnlink(filename)
+tools.addFileToUnlink(filename)
--- a/server/src/uds/transports/RDP/scripts/windows/direct.py.signature
+++ b/server/src/uds/transports/RDP/scripts/windows/direct.py.signature
@@ -1 +1 @@
-R3sdB3d7hhz6VEoAGNzdX0vIKgss4Xe1aEU62cTQKIA7Inw2zHkaBK0wRVxZqMYH5Of/iiyMiG+NlKFAWutSrOOthoyVT83RNtDpR4F+vDTZMpW2qopiiK6XbxX5PuJq/E3UWNsnElZasAIpJk9rKqlNEJ+tkycWyDkIYIHxE6M2yrqH+dWx/V3AaDMURtnzuZStzpxPMuEzezNdCI9Kbs1fCwSz18SRSkAtNINiMJbgBV573wwKEUUgKLzRHn1ijRk65OHRVLFDlRgXz/ArN0/nkW/FkQ9pYJW5MosD4TJfptO8QZ104jYPM960maMxObLWa4LZyzEVNZ2uIE9xIWHh9SCZ3zv37DfSU6hM9n4gOKlIVGIO5hrctjZLzAwRcgsBFcXLXxtlrHQERjh7Zgr5mevjXz0yO+76pUbdgEWVwlT8G5SG4yq7083drwfNgMv5uht8GyRqes+FD952ECjv+hVeoLRItg+mxaUnILHHJOyw8A47Ex0PikHzpbT/SxzQA+CkxEMRPSD6GDPBYiKBAYm+b0Yazo5Yzo85S2GRubPaEVp6UQ6AVgWEtsfhx5yeU+tJx6AD1+MYEpB04Re6XjMeSV5zdDsHkS/HQ7kafbxS0RxU78e0LEltbW06zGNGvk/cZlIr1SE93Ztvyi1R4wZNdDRaM6vLKOD3RGo=
+b0NrFPNRgkQmGycaL/gUhFKShW34N3Yto33JyDT9ructKOTEzT8qCEnvp5ypb0vwZQBhCfya0ExGDO77DdRPb2QAvtQylPxaX+D7FdLAKZO8WOw+clCJGJHFlpiAi7a1lY0ve6dfJotu47vNppmOy5RGO1Iz9FMQuOpq0xNXcrGz9I5zez47Se0FkhU1XlYgrrI8uexQqc8faz+nw6fJE4ADnfqo+b6mJmRIm7gbE9VyMZz6NR65zqtcyOWgmRrDOO3w6dirEYOIES2GFfZXOl4L+5bIDTVbtrYGoTtPIgmom8fjFfOP2qWAhjQ7jsjDqC0pPshOlNqB4FyORoAEzQ10yt53bPJHaOe/9uzW75THNGCj8AVntzbLGDghdJG49Yv9gAxJPFpdkGhtesy92Q0pryDjtTtLBtTyWvj9iCpUremYp71tROFHdEY40ypG7YDmDHNdkK6vz99MsFwHpcjs9XnHAJlaJHy96FdI6dHBC4ePlaJSVABOb9SS74WyYVB/VOF6bZ55mbvD7XpzzsG7fk/JV6If047tULGnCdWJCvOZ05rI0H1nUJAwgg42VmOKxNKJnBKdP0hVPuvRg2L2pNDioocXxnXvYfUWBr6bq/6Vkv/qrkkkWy+XMhTSGD9nwskhpFdOMNfjeelr50bSGcl2QGzEO2SnKzrfdTo=
--- a/server/tests/core/managers/test_servers_managed.py
+++ b/server/tests/core/managers/test_servers_managed.py
@@ -258,8 +258,8 @@ class ServerManagerManagedServersTest(UDSTestCase):
                    uuid, counter = assignation
                    # uuid shuld be one on registered servers
                    self.assertTrue(uuid in self.all_uuids)
-                    # And only one assignment, so counter is 1
-                    self.assertTrue(counter, 1)
+                    # And only assignements so counter is assignations + 1
+                    self.assertTrue(counter, assignations + 1)
                    # Server locked should be None
                    self.assertIsNotNone(models.Server.objects.get(uuid=uuid).locked_until)

--- a/server/tests/services/xen/test_client.py
+++ b/server/tests/services/xen/test_client.py
@@ -202,7 +202,6 @@ class TestXenClient(UDSTransactionTestCase):
            'start_delay': 0,
            'shutdown_delay': 0,
            'order': 0,
-            'ha_restart_priority': '',
            'ha_always_run': False,
            'ha_restart_priority': '',
            'recommendations': '',
Author	SHA1	Message	Date
Adolfo Gómez García	1780d85bc1	Handle potential None value for storage status in StorageInfo	2025-11-13 16:07:20 +01:00
Adolfo Gómez García	2c31b7da36	Fix assertion message in ServerManagerManagedServersTest to clarify counter logic	2025-11-12 03:39:58 +01:00
Adolfo Gómez García	bc950acf1d	Remove redundant 'ha_restart_priority' entry from test client configuration	2025-11-12 03:37:10 +01:00
Adolfo Gómez García	d511451997	Refactor _check_machine_state method to improve parameter naming and simplify state checking logic	2025-11-12 03:05:23 +01:00
Adolfo Gómez García	1096edf79f	Fix file unlinking logic by ensuring the temporary file is added for unlinking	2025-11-04 16:37:18 +01:00