Rear port normalize (#272)

Author: FragmentedPacket

plugins/module_utils/netbox_dcim.py

@@ -52,23 +52,6 @@
 
 class NetboxDcimModule(NetboxModule):
     def __init__(self, module, endpoint):
-        # Front ports can only be connected to rear ports of the same device
-        # This will prepare the rear port dict if only a string is given
-        if endpoint == "front_ports":
-            if isinstance(module.params.get("data").get("rear_port"), str):
-                rear_port = {
-                    "device": module.params.get("data").get("device"),
-                    "name": module.params.get("data").get("rear_port"),
-                }
-                module.params["data"].update({"rear_port": rear_port})
-        elif endpoint == "front_port_templates":
-            if isinstance(module.params.get("data").get("rear_port_template"), str):
-                rear_port_template = {
-                    "device_type": module.params.get("data").get("device_type"),
-                    "name": module.params.get("data").get("rear_port_template"),
-                }
-                module.params["data"].update({"rear_port_template": rear_port_template})
-
         super().__init__(module, endpoint)
 
     def run(self):

plugins/module_utils/netbox_utils.py

@@ -657,6 +657,22 @@ def _build_query_params(
         elif parent == "virtual_chassis":
             query_dict = {"q": self.module.params["data"].get("master")}
 
+        elif parent == "rear_port" and self.endpoint == "front_ports":
+            if isinstance(module_data.get("rear_port"), str):
+                rear_port = {
+                    "device_id": module_data.get("device"),
+                    "name": module_data.get("rear_port"),
+                }
+                query_dict.update(rear_port)
+
+        elif parent == "rear_port_template" and self.endpoint == "front_port_templates":
+            if isinstance(module_data.get("rear_port_template"), str):
+                rear_port_template = {
+                    "devicetype_id": module_data.get("device_type"),
+                    "name": module_data.get("rear_port_template"),
+                }
+                query_dict.update(rear_port_template)
+
         query_dict = self._convert_identical_keys(query_dict)
         return query_dict
 
@@ -747,7 +763,7 @@ def _find_ids(self, data, user_query_params):
                         else:
                             self._handle_errors(msg="%s not found" % (list_item))
                 else:
-                    if k in ["lag"]:
+                    if k in ["lag", "rear_port", "rear_port_template"]:
                         query_params = self._build_query_params(
                             k, data, user_query_params
                         )