Merge branch 'main' into style/fix-ruff-rule-PLR0911

Author: IamLunchbox

changelogs/fragments/365-proxmox-snap-fail-on-missing-snapname.yml

@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - proxmox_snap - fail the task when a given snapname does not exist instead of exiting (https://github.com/ansible-collections/community.proxmox/pull/365).

plugins/inventory/proxmox.py

@@ -384,7 +384,7 @@ def _get_node_ip(self, node):
     def _get_lxc_interfaces(self, properties, node, vmid):
         status_key = self._fact("status")
 
-        if status_key not in properties or not properties[status_key] == "running":
+        if status_key not in properties or properties[status_key] != "running":
             return
 
         ret = self._get_json(f"{self.proxmox_url}/api2/json/nodes/{node}/lxc/{vmid}/interfaces", ignore_errors=[501])

plugins/modules/proxmox_kvm.py

@@ -1113,8 +1113,6 @@ def module_options():
 
 class ProxmoxKvmAnsible(ProxmoxAnsible):
     def get_vminfo(self, node, vmid, **kwargs):
-        global results
-        results = {}
         mac = {}
         devices = {}
         try:
@@ -1141,9 +1139,7 @@ def get_vminfo(self, node, vmid, **kwargs):
             elif re_dev.match(k):
                 devices[k] = parse_dev(vm[k])
 
-        results["mac"] = mac
-        results["devices"] = devices
-        results["vmid"] = int(vmid)
+        return {"mac": mac, "devices": devices, "vmid": int(vmid)}
 
     def settings(self, vmid, node, **kwargs):
         proxmox_node = self.proxmox_api.nodes(node)
@@ -1519,6 +1515,7 @@ def main():
         elif not proxmox.get_node(node):
             module.fail_json(msg=f"node '{node}' does not exist in cluster")
 
+        vminfo = {}
         try:
             proxmox.create_vm(
                 vmid,
@@ -1603,7 +1600,7 @@ def main():
             )
 
             if not clone:
-                proxmox.get_vminfo(
+                vminfo = proxmox.get_vminfo(
                     node,
                     vmid,
                     ide=module.params["ide"],
@@ -1629,7 +1626,7 @@ def main():
                 changed=True, vmid=newid, msg=f"VM {name} with newid {newid} cloned from vm with vmid {vmid}"
             )
         else:
-            module.exit_json(changed=True, msg=f"VM {name} with vmid {vmid} deployed", **results)
+            module.exit_json(changed=True, msg=f"VM {name} with vmid {vmid} deployed", **vminfo)
 
     elif state == "started":
         if not vmid:

plugins/modules/proxmox_snap.py

@@ -394,7 +394,7 @@ def main():
                     continue
 
             if not snap_exist:
-                module.exit_json(changed=False, msg=f"Snapshot {snapname} does not exist")
+                module.fail_json(changed=False, msg=f"Snapshot {snapname} does not exist")
             if proxmox.snapshot_rollback(vm, vmid, timeout, snapname):
                 if module.check_mode:
                     module.exit_json(changed=True, msg=f"Snapshot {snapname} would be rolled back")