refactor: move PVECluster.get_node_resources to PVENode.resources property

Author: plaffitt

src/pvecontrol/cluster.py

@@ -27,10 +27,9 @@ def _initstatus(self):
         for node in self.get_resources_nodes():
             self.nodes.append(
                 PVENode(
-                    self.api,
+                    self,
                     node["node"],
                     node["status"],
-                    node_resources=self.get_node_resources(node["node"]),
                     kwargs=node,
                 )
             )
@@ -118,9 +117,6 @@ def is_healthy(self):
     def get_resources_nodes(self):
         return [resource for resource in self.resources if resource["type"] == "node"]
 
-    def get_node_resources(self, node_name):
-        return [resource for resource in self.resources if resource.get("node") == node_name]
-
     def get_vm(self, vm_id):
         if isinstance(vm_id, str):
             vm_id = int(vm_id)

src/pvecontrol/node.py

@@ -16,16 +16,13 @@ class NodeStatus(Enum):
 class PVENode:
     """A proxmox VE Node"""
 
-    _api = None
-
-    def __init__(self, api, node, status, node_resources, kwargs=None):
+    def __init__(self, cluster, node, status, kwargs=None):
         if not kwargs:
             kwargs = {}
 
         self.node = node
-        self.resources = node_resources
         self.status = NodeStatus[status.upper()]
-        self._api = api
+        self.cluster = cluster
         self.cpu = kwargs.get("cpu", 0)
         self.allocatedcpu = 0
         self.maxcpu = kwargs.get("maxcpu", 0)
@@ -52,7 +49,7 @@ def __str__(self):
     def _init_vms(self):
         self.vms = []
         if self.status == NodeStatus.ONLINE:
-            self.vms = [PVEVm(self._api, self.node, vm["vmid"], vm["status"], vm) for vm in self.resources_vms]
+            self.vms = [PVEVm(self.api, self.node, vm["vmid"], vm["status"], vm) for vm in self.resources_vms]
 
     def _init_allocatedmem(self):
         """Compute the amount of memory allocated to running VMs"""
@@ -70,6 +67,14 @@ def _init_allocatedcpu(self):
                 continue
             self.allocatedcpu += vm.cpus
 
+    @property
+    def api(self):
+        return self.cluster.api
+
+    @property
+    def resources(self):
+        return [resource for resource in self.cluster.resources if resource.get("node") == self.node]
+
     @property
     def resources_vms(self):
         return [resource for resource in self.resources if resource["type"] == "qemu"]