Some fixes to Node API due to backporting

Author: tazend

pyslurm/core/node.pxd

@@ -33,8 +33,6 @@ from pyslurm.slurm cimport (
     slurm_load_node,
     slurm_load_node_single,
     slurm_update_node,
-    slurm_delete_node,
-    slurm_create_node,
     slurm_load_partitions,
     slurm_free_update_node_msg,
     slurm_init_update_node_msg,
@@ -77,8 +75,6 @@ cdef class Nodes(dict):
             Total amount of idle CPUs in this node collection.
         allocated_cpus (int):
             Total amount of allocated CPUs in this node collection.
-        effective_cpus (int):
-            Total amount of effective CPUs in this node collection.
         current_watts (int):
             Total amount of Watts consumed in this node collection.
         avg_watts (int):
@@ -166,8 +162,6 @@ cdef class Node:
             Amount of temporary disk space this node has, in Mebibytes.
         weight (int):
             Weight of the node in scheduling.
-        effective_cpus (int):
-            Number of effective CPUs the node has.
         total_cpus (int):
             Total amount of CPUs the node has.
         sockets (int):

pyslurm/core/node.pyx

@@ -185,10 +185,6 @@ cdef class Nodes(dict):
     def allocated_cpus(self):
         return _sum_prop(self, Node.allocated_cpus)
 
-    @property
-    def effective_cpus(self):
-        return _sum_prop(self, Node.effective_cpus)
-
     @property
     def current_watts(self):
         return _sum_prop(self, Node.current_watts)
@@ -308,38 +304,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.
-            MemoryError: If malloc failed to allocate memory.
-
-        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, changes):
         """Modify a node.
 
@@ -366,22 +330,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.
-            MemoryError: If malloc failed to allocate memory.
-
-        Examples:
-            >>> import pyslurm
-            >>> pyslurm.Node("localhost").delete()
-        """
-        self._alloc_umsg()
-        verify_rpc(slurm_delete_node(self.umsg))
-
     def as_dict(self):
         """Node information formatted as a dictionary.
 
@@ -515,10 +463,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)
@@ -610,11 +554,11 @@ cdef class Node:
 
     @property
     def idle_cpus(self):
-        efctv = self.effective_cpus
-        if not efctv:
+        tot = self.total_cpus
+        if not tot:
             return None
 
-        return efctv - self.allocated_cpus
+        return tot - self.allocated_cpus
 
     @property
     def cpu_binding(self):

tests/integration/test_node.py

@@ -42,19 +42,6 @@ def test_load():
         Node.load("nonexistent")
 
 
-def test_create():
-    node = Node("testhostpyslurm")
-    node.create()
-
-    with pytest.raises(RPCError,
-                       match=f"Invalid node state specified"):
-        Node("testhostpyslurm2").create("idle")
-
-
-# def test_delete():
-#    node = Node("testhost1").delete()
-
-
 def test_modify():
     node = Node(Nodes.load().as_list()[0].name)