Fixes for 21.8.x due to backporting from 22.5.x

Some changes made in 22.5.x are not available/different for 21.8.x, so
they are changed accordingly for 21.8.x

Author: tazend

pyslurm/core/node.pyx

@@ -187,10 +187,6 @@ cdef class Nodes(MultiClusterMap):
     def allocated_cpus(self):
         return xcollections.sum_property(self, Node.allocated_cpus)
 
-    @property
-    def effective_cpus(self):
-        return xcollections.sum_property(self, Node.effective_cpus)
-
     @property
     def current_watts(self):
         return xcollections.sum_property(self, Node.current_watts)
@@ -313,37 +309,6 @@ cdef class Node:
 
         return wrap
 
-    def create(self, state="future"):
-        """Create a node.
-
-        Implements the slurm_create_node RPC.
-
-        Args:
-            state (str, optional): 
-                An optional state the created Node should have. Allowed values
-                are `future` and `cloud`. `future` is the default.
-
-        Returns:
-            (pyslurm.Node): This function returns the current Node-instance
-                object itself.
-
-        Raises:
-            RPCError: If creating the Node was not successful.
-
-        Examples:
-            >>> import pyslurm
-            >>> node = pyslurm.Node("testnode").create()
-        """
-        if not self.name:
-            raise ValueError("You need to set a node name first.")
-
-        self._alloc_umsg()
-        cstr.fmalloc(&self.umsg.extra,
-                     f"NodeName={self.name} State={state}")
-        verify_rpc(slurm_create_node(self.umsg))
-
-        return self
-
     def modify(self, Node changes):
         """Modify a node.
 
@@ -372,21 +337,6 @@ cdef class Node:
         cstr.fmalloc(&n.umsg.node_names, self.name)
         verify_rpc(slurm_update_node(n.umsg))
 
-    def delete(self):
-        """Delete a node.
-
-        Implements the slurm_delete_node RPC.
-
-        Raises:
-            RPCError: If deleting the Node was not successful.
-
-        Examples:
-            >>> import pyslurm
-            >>> pyslurm.Node("localhost").delete()
-        """
-        self._alloc_umsg()
-        verify_rpc(slurm_delete_node(self.umsg))
-
     def as_dict(self):
         return self.to_dict()
 
@@ -527,10 +477,6 @@ cdef class Node:
     def weight(self, val):
         self.info.weight=self.umsg.weight = u32(val)
 
-    @property
-    def effective_cpus(self):
-        return u16_parse(self.info.cpus_efctv)
-
     @property
     def total_cpus(self):
         return u16_parse(self.info.cpus, on_noval=0)
@@ -622,7 +568,7 @@ cdef class Node:
 
     @property
     def idle_cpus(self):
-        efctv = self.effective_cpus
+        efctv = self.total_cpus
         if not efctv:
             return None
 

pyslurm/core/partition.pxd

@@ -172,8 +172,6 @@ cdef class Partition:
             The oversubscribe mode for this Partition
         nodes (str):
             Nodes that are in a Partition
-        nodesets (list[str]):
-            List of Nodesets that a Partition has configured
         over_time_limit (int):
             Limit in minutes that Jobs can exceed their time-limit
 

pyslurm/core/partition.pyx

@@ -527,14 +527,6 @@ cdef class Partition:
     def nodes(self, val):
         cstr.from_list(&self.ptr.nodes, val)
 
-    @property
-    def nodesets(self):
-        return cstr.to_list(self.ptr.nodesets)
-
-    @nodesets.setter
-    def nodesets(self, val):
-        cstr.from_list(&self.ptr.nodesets, val)
-
     @property
     def over_time_limit(self):
         return u16_parse(self.ptr.over_time_limit)

tests/integration/test_job_steps.py

@@ -109,7 +109,7 @@ def test_collection(submit_job):
     assert len(steps) == 3
     assert ("batch" in steps and
             0 in steps and
-            1 in steps)
+            (1 in steps or 'pending' in steps))
 
 
 def test_cancel(submit_job):
@@ -120,7 +120,7 @@ def test_cancel(submit_job):
     assert len(steps) == 3
     assert ("batch" in steps and
             0 in steps and
-            1 in steps)
+            (1 in steps or 'pending' in steps))
 
     steps[0].cancel()