fixed compute node resources

Author: sanderegg

services/autoscaling/src/simcore_service_autoscaling/utils/utils_docker.py

@@ -358,13 +358,11 @@ async def compute_node_used_resources(
             and task.spec.resources
             and task.spec.resources.reservations
         ):
-            task_reservations = task.spec.resources.reservations.model_dump(
-                exclude_none=True
-            )
             cluster_resources_counter.update(
                 {
-                    "ram": task_reservations.get("MemoryBytes", 0),
-                    "cpus": task_reservations.get("NanoCPUs", 0) / _NANO_CPU,
+                    "ram": task.spec.resources.reservations.memory_bytes or 0,
+                    "cpus": (task.spec.resources.reservations.nano_cp_us or 0)
+                    / _NANO_CPU,
                 }
             )
     return Resources.model_validate(dict(cluster_resources_counter))

services/autoscaling/tests/unit/test_utils_docker.py

@@ -436,29 +436,24 @@ async def test_pending_service_task_with_insufficient_resources_properly_sorts_t
 
     assert len(pending_tasks) == len(services)
     # check sorting is done by creation date
-    last_date = datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(
-        days=1
-    )
+    last_date = datetime.datetime.now(datetime.UTC) - datetime.timedelta(days=1)
     for task in pending_tasks:
         assert task.created_at  # NOTE: in this case they are but they might be None
-        assert (
-            to_datetime(task.created_at).replace(tzinfo=datetime.timezone.utc)
-            > last_date
-        )
-        last_date = to_datetime(task.created_at).replace(tzinfo=datetime.timezone.utc)
+        assert to_datetime(task.created_at).replace(tzinfo=datetime.UTC) > last_date
+        last_date = to_datetime(task.created_at).replace(tzinfo=datetime.UTC)
 
 
 def test_safe_sort_key_callback():
     tasks_with_faulty_timestamp = [
-        Task(ID=n, CreatedAt=value)  # type: ignore
+        Task(ID=f"{n}", CreatedAt=value)
         for n, value in enumerate(
             [
                 # SEE test_to_datetime_conversion_known_errors
                 None,
                 "2023-03-15 09:20:58.123456",
                 "2023-03-15T09:20:58.123456",
                 "2023-03-15T09:20:58.123456Z",
-                f"{datetime.datetime.now(datetime.timezone.utc)}",
+                f"{datetime.datetime.now(datetime.UTC)}",
                 "corrupted string",
             ]
         )