Use SimpleNamespace instead of SlurmPartition in unit test

This removed the need to extend the constructor of SlurmPartition to pass
the list of SlurmNode objects `slurm_nodes`, removing the risk of wrong
implementations in the future.

Include additional cases to test_find_active_nodes().

Signed-off-by: Jacopo De Amicis <[email protected]>

Author: jdeamicis

src/slurm_plugin/slurm_resources.py

@@ -15,7 +15,6 @@
 from dataclasses import dataclass
 from datetime import datetime
 from enum import Enum
-from typing import List
 
 from common.utils import time_is_up
 
@@ -50,12 +49,12 @@ def __str__(self):
 
 
 class SlurmPartition:
-    def __init__(self, name, nodenames, state, slurm_nodes: List = None):
+    def __init__(self, name, nodenames, state):
         """Initialize slurm partition with attributes."""
         self.name = name
         self.nodenames = nodenames
         self.state = state
-        self.slurm_nodes = slurm_nodes if slurm_nodes else []
+        self.slurm_nodes = []
 
     def is_inactive(self):
         return self.state == "INACTIVE"

tests/slurm_plugin/test_clustermgtd.py

@@ -3736,7 +3736,7 @@ def test_find_unhealthy_slurm_nodes(
     [
         pytest.param(
             {
-                "queue1": SlurmPartition(
+                "queue1": SimpleNamespace(
                     name="queue1",
                     nodenames="queue1-st-cr1-1,queue1-st-cr1-2",
                     state="UP",
@@ -3745,7 +3745,7 @@ def test_find_unhealthy_slurm_nodes(
                         StaticNode(name="queue1-st-cr1-2", nodeaddr="", nodehostname="", state=""),
                     ],
                 ),
-                "queue2": SlurmPartition(
+                "queue2": SimpleNamespace(
                     name="queue2",
                     nodenames="queue2-st-cr1-1,queue2-st-cr1-2",
                     state="UP",
@@ -3765,7 +3765,7 @@ def test_find_unhealthy_slurm_nodes(
         ),
         pytest.param(
             {
-                "queue1": SlurmPartition(
+                "queue1": SimpleNamespace(
                     name="queue1",
                     nodenames="queue1-st-cr1-1,queue1-st-cr1-2",
                     state="UP",
@@ -3774,7 +3774,7 @@ def test_find_unhealthy_slurm_nodes(
                         StaticNode(name="queue1-st-cr1-2", nodeaddr="", nodehostname="", state=""),
                     ],
                 ),
-                "custom_partition": SlurmPartition(
+                "custom_partition": SimpleNamespace(
                     name="custom_partition",
                     nodenames="queue1-st-cr1-1,queue1-st-cr1-2",
                     state="UP",
@@ -3791,6 +3791,62 @@ def test_find_unhealthy_slurm_nodes(
             id="Two overlapping partitions obtained by creating a custom partition that includes nodes from a "
             "PC-managed queue",
         ),
+        pytest.param(
+            {},
+            [],
+            id="Empty cluster with no partitions",
+        ),
+        pytest.param(
+            {
+                "queue1": SimpleNamespace(
+                    name="queue1",
+                    nodenames="queue1-st-cr1-1,queue1-st-cr1-2",
+                    state="UP",
+                    slurm_nodes=[
+                        StaticNode(name="queue1-st-cr1-1", nodeaddr="", nodehostname="", state=""),
+                        StaticNode(name="queue1-st-cr1-2", nodeaddr="", nodehostname="", state=""),
+                    ],
+                ),
+                "queue2": SimpleNamespace(
+                    name="queue2",
+                    nodenames="queue2-st-cr1-1,queue2-st-cr1-2",
+                    state="INACTIVE",
+                    slurm_nodes=[
+                        StaticNode(name="queue2-st-cr1-1", nodeaddr="", nodehostname="", state=""),
+                        StaticNode(name="queue2-st-cr1-2", nodeaddr="", nodehostname="", state=""),
+                    ],
+                ),
+            },
+            [
+                StaticNode(name="queue1-st-cr1-1", nodeaddr="", nodehostname="", state=""),
+                StaticNode(name="queue1-st-cr1-2", nodeaddr="", nodehostname="", state=""),
+            ],
+            id="Two non-overlapping partitions, one active and one inactive",
+        ),
+        pytest.param(
+            {
+                "queue1": SimpleNamespace(
+                    name="queue1",
+                    nodenames="queue1-st-cr1-1,queue1-st-cr1-2",
+                    state="INACTIVE",
+                    slurm_nodes=[
+                        StaticNode(name="queue1-st-cr1-1", nodeaddr="", nodehostname="", state=""),
+                        StaticNode(name="queue1-st-cr1-2", nodeaddr="", nodehostname="", state=""),
+                    ],
+                ),
+                "queue2": SimpleNamespace(
+                    name="queue2",
+                    nodenames="queue2-st-cr1-1,queue2-st-cr1-2",
+                    state="INACTIVE",
+                    slurm_nodes=[
+                        StaticNode(name="queue2-st-cr1-1", nodeaddr="", nodehostname="", state=""),
+                        StaticNode(name="queue2-st-cr1-2", nodeaddr="", nodehostname="", state=""),
+                    ],
+                ),
+            },
+            [],
+            id="Two inactive non-overlapping partitions",
+        ),
     ],
 )
 def test_find_active_nodes(partitions_name_map, expected_nodelist):