Skip to content

Commit 260b676

Browse files
authored
Fix #574 VLAN group returning multiple results (#741)
1 parent a2cf3f4 commit 260b676

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

plugins/module_utils/netbox_utils.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@
452452
"virtual_machine": set(["name", "cluster"]),
453453
"vm_bridge": set(["name"]),
454454
"vlan": set(["group", "name", "site", "tenant", "vid", "vlan_group"]),
455-
"vlan_group": set(["slug", "site", "scope"]),
455+
"vlan_group": set(["name", "slug", "site", "scope"]),
456456
"vrf": set(["name", "tenant"]),
457457
"webhook": set(["name"]),
458458
"wireless_lan": set(["ssid"]),
@@ -853,7 +853,11 @@ def _build_query_params(
853853
query_id = self._get_query_param_id(match, child)
854854
else:
855855
query_id = self._get_query_param_id(match, module_data)
856-
query_dict.update({match + "_id": query_id})
856+
857+
if parent == "vlan_group" and match == "site":
858+
query_dict.update({match: query_id})
859+
else:
860+
query_dict.update({match + "_id": query_id})
857861
else:
858862
if child:
859863
value = child.get(match)

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,9 @@
176176
"site": "Test Site"
177177
},
178178
"expected": {
179+
"name": "Test VLAN Group",
179180
"slug": "test-vlan-group",
180-
"site_id": 1
181+
"site": 1
181182
}
182183
},
183184
{

0 commit comments

Comments
 (0)