Fix for mapping between power_outlet_template and power_port_template (#444)

Author: toerb

plugins/module_utils/netbox_utils.py

@@ -108,6 +108,7 @@
     parent_tenant_group="slug",
     power_panel="name",
     power_port="name",
+    power_port_template="name",
     platform="slug",
     prefix_role="slug",
     primary_ip="address",
@@ -174,6 +175,7 @@
     "parent_tenant_group": "tenant_groups",
     "power_panel": "power_panels",
     "power_port": "power_ports",
+    "power_port_template": "power_port_templates",
     "prefix_role": "roles",
     "primary_ip": "ip_addresses",
     "primary_ip4": "ip_addresses",
@@ -392,6 +394,7 @@
     "cluster_group": "group",
     "parent_region": "parent",
     "parent_tenant_group": "parent",
+    "power_port_template": "power_port",
     "prefix_role": "role",
     "rack_group": "group",
     "rack_role": "role",
@@ -752,6 +755,25 @@ def _build_query_params(
                 }
                 query_dict.update(rear_port_template)
 
+        elif parent == "power_port" and self.endpoint == "power_outlets":
+            if isinstance(module_data.get("power_port"), str):
+                power_port = {
+                    "device_id": module_data.get("device"),
+                    "name": module_data.get("power_port"),
+                }
+                query_dict.update(power_port)
+
+        elif (
+            parent == "power_port_template"
+            and self.endpoint == "power_outlet_templates"
+        ):
+            if isinstance(module_data.get("power_port_template"), str):
+                power_port_template = {
+                    "devicetype_id": module_data.get("device_type"),
+                    "name": module_data.get("power_port_template"),
+                }
+                query_dict.update(power_port_template)
+
         elif "_template" in parent:
             if query_dict.get("device_type"):
                 query_dict["devicetype_id"] = query_dict.pop("device_type")
@@ -878,7 +900,13 @@ def _find_ids(self, data, user_query_params):
                         else:
                             self._handle_errors(msg="%s not found" % (list_item))
                 else:
-                    if k in ["lag", "rear_port", "rear_port_template"]:
+                    if k in [
+                        "lag",
+                        "rear_port",
+                        "rear_port_template",
+                        "power_port",
+                        "power_port_template",
+                    ]:
                         query_params = self._build_query_params(
                             k, data, user_query_params
                         )

plugins/modules/netbox_power_outlet_template.py

@@ -115,9 +115,9 @@
           - hdot-cx
         required: false
         type: str
-      power_port:
+      power_port_template:
         description:
-          - The attached power port
+          - The attached power port template
         required: false
         type: raw
       feed_leg:
@@ -157,33 +157,33 @@
   gather_facts: False
 
   tasks:
-    - name: Create power port within Netbox with only required information
+    - name: Create power outlet template within Netbox with only required information
       netbox_power_outlet_template:
         netbox_url: http://netbox.local
         netbox_token: thisIsMyToken
         data:
-          name: Test Power Outlet
+          name: Test Power Outlet Template
           device_type: Test Device Type
         state: present
 
-    - name: Update power port with other fields
+    - name: Update power outlet template with other fields
       netbox_power_outlet_template:
         netbox_url: http://netbox.local
         netbox_token: thisIsMyToken
         data:
-          name: Test Power Outlet
+          name: Test Power Outlet Template
           device_type: Test Device Type
           type: iec-60320-c6
-          power_port: Test Power Port
+          power_port_template: Test Power Port Template
           feed_leg: A
         state: present
 
-    - name: Delete power port within netbox
+    - name: Delete power outlet template within netbox
       netbox_power_outlet_template:
         netbox_url: http://netbox.local
         netbox_token: thisIsMyToken
         data:
-          name: Test Power Outlet
+          name: Test Power Outlet Template
           device_type: Test Device Type
         state: absent
 """
@@ -283,7 +283,7 @@ def main():
                         ],
                         type="str",
                     ),
-                    power_port=dict(required=False, type="raw"),
+                    power_port_template=dict(required=False, type="raw"),
                     feed_leg=dict(required=False, choices=["A", "B", "C"], type="str"),
                 ),
             ),

tests/integration/targets/latest/tasks/netbox_power_outlet_template.yml

@@ -53,7 +53,7 @@
       name: Power Outlet Template
       device_type: Device Type Power Tests
       type: ita-e
-      power_port: Power Port
+      power_port_template: Power Port Template
       feed_leg: B
     state: present
   register: test_three

tests/integration/targets/v2.9/tasks/netbox_power_outlet_template.yml

@@ -53,7 +53,7 @@
       name: Power Outlet Template
       device_type: Device Type Power Tests
       type: ita-e
-      power_port: Power Port
+      power_port_template: Power Port Template
       feed_leg: B
     state: present
   register: test_three