fix(agent): correct ClusterShell NodeSet import

The module was incorrectly imported as 'import ClusterShell' which doesn't
expose NodeSet as a direct attribute. This causes AttributeError when trying
to access ClusterShell.NodeSet.NodeSet().

Changed to import NodeSet directly from ClusterShell.NodeSet module and
updated the usage accordingly throughout the codebase.

This fixes the error when viewing jobs on a specific node in the web UI.

Signed-off-by: Rémi Palancher <[email protected]>

Author: faganihajizada

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [unreleased]
+
+### Fixed
+- agent: Import of ClusterShell NodeSet class (#682). Contribution from
+  @faganihajizada.
+
 ## [6.0.0] - 2025-11-28
 
 ### Added

slurmweb/slurmrestd/__init__.py

@@ -9,7 +9,7 @@
 import logging
 
 import requests
-import ClusterShell
+from ClusterShell.NodeSet import NodeSet
 
 from .unix import SlurmrestdUnixAdapter
 from .auth import SlurmrestdAuthentifier
@@ -222,7 +222,7 @@ def on_node(job):
             """Return True if job is allocated this node."""
             if job["nodes"] == "":
                 return False
-            return node in ClusterShell.NodeSet.NodeSet(job["nodes"])
+            return node in NodeSet(job["nodes"])
 
         def terminated(job):
             """Return True if job is terminated."""

slurmweb/tests/slurmrestd/test_slurmrestd.py

@@ -9,7 +9,7 @@
 import urllib
 
 import requests
-import ClusterShell
+from ClusterShell.NodeSet import NodeSet
 
 from slurmweb.slurmrestd import Slurmrestd
 from slurmweb.slurmrestd.errors import (
@@ -177,7 +177,7 @@ def terminated(job):
             return False
 
         # Select random busy node on cluster
-        busy_nodes = ClusterShell.NodeSet.NodeSet()
+        busy_nodes = NodeSet()
         for job in asset:
             if not terminated(job):
                 busy_nodes.update(job["nodes"])
@@ -195,7 +195,7 @@ def terminated(job):
             self.assertNotIn(job["job_state"], ["COMPLETED", "FAILED", "TIMEOUT"])
             self.assertIn(
                 random_busy_node,
-                ClusterShell.NodeSet.NodeSet(job["nodes"]),
+                NodeSet(job["nodes"]),
             )
 
         # Test get jobs on nonexistent node.

slurmweb/tests/views/test_agent.py

@@ -8,7 +8,7 @@
 from unittest import mock
 import random
 
-import ClusterShell
+from ClusterShell.NodeSet import NodeSet
 
 from racksdb.version import get_version as racksdb_get_version
 
@@ -191,7 +191,7 @@ def terminated(job):
             return False
 
         # Select random busy node on cluster
-        busy_nodes = ClusterShell.NodeSet.NodeSet()
+        busy_nodes = NodeSet()
         for job in jobs_asset:
             if not terminated(job):
                 busy_nodes.update(job["nodes"])
@@ -210,7 +210,7 @@ def terminated(job):
             self.assertNotIn(job["job_state"], ["COMPLETED", "FAILED", "TIMEOUT"])
             self.assertIn(
                 random_busy_node,
-                ClusterShell.NodeSet.NodeSet(job["nodes"]),
+                NodeSet(job["nodes"]),
             )
 
     @all_slurm_api_versions