Bugfix: Change query_dict for _template modules to choose devicetype_id (#300)

Author: FragmentedPacket

plugins/module_utils/netbox_utils.py

@@ -665,10 +665,6 @@ def _build_query_params(
                 }
                 query_dict.update(rear_port)
 
-        elif parent == "interface_template" or parent == "device_bay_template":
-            if query_dict.get("device_type"):
-                query_dict["devicetype_id"] = query_dict.pop("device_type")
-
         elif parent == "rear_port_template" and self.endpoint == "front_port_templates":
             if isinstance(module_data.get("rear_port_template"), str):
                 rear_port_template = {
@@ -677,6 +673,10 @@ def _build_query_params(
                 }
                 query_dict.update(rear_port_template)
 
+        elif "_template" in parent:
+            if query_dict.get("device_type"):
+                query_dict["devicetype_id"] = query_dict.pop("device_type")
+
         query_dict = self._convert_identical_keys(query_dict)
         return query_dict
 

tests/unit/module_utils/test_data/build_query_params_no_child/data.json

@@ -330,6 +330,72 @@
             "devicetype_id": 1
         }
     },
+    {
+        "parent": "console_port_template",
+        "module_data": {
+            "name": "CP 1",
+            "device_type": 1
+        },
+        "expected": {
+            "name": "CP 1",
+            "devicetype_id": 1
+        }
+    },
+    {
+        "parent": "console_server_port_template",
+        "module_data": {
+            "name": "CP - Server 1",
+            "device_type": 1
+        },
+        "expected": {
+            "name": "CP - Server 1",
+            "devicetype_id": 1
+        }
+    },
+    {
+        "parent": "interface_template",
+        "module_data": {
+            "name": "Dev Intf 1",
+            "device_type": 1
+        },
+        "expected": {
+            "name": "Dev Intf 1",
+            "devicetype_id": 1
+        }
+    },
+    {
+        "parent": "front_port_template",
+        "module_data": {
+            "name": "FP 1",
+            "device_type": 1
+        },
+        "expected": {
+            "name": "FP 1",
+            "devicetype_id": 1
+        }
+    },
+    {
+        "parent": "power_outlet_template",
+        "module_data": {
+            "name": "PO 1",
+            "device_type": 1
+        },
+        "expected": {
+            "name": "PO 1",
+            "devicetype_id": 1
+        }
+    },
+    {
+        "parent": "power_port_template",
+        "module_data": {
+            "name": "PP 1",
+            "device_type": 1
+        },
+        "expected": {
+            "name": "PP 1",
+            "devicetype_id": 1
+        }
+    },
     {
         "parent": "virtual_machine",
         "module_data": {