Skip to content

Commit 02f68ce

Browse files
Enhancement: Add vid for vlan searches (#343)
1 parent 3272348 commit 02f68ce

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

plugins/module_utils/netbox_utils.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -309,15 +309,15 @@
309309
"role": set(["slug"]),
310310
"services": set(["device", "virtual_machine", "name", "port", "protocol"]),
311311
"site": set(["slug"]),
312-
"tagged_vlans": set(["name", "site", "vlan_group", "tenant"]),
312+
"tagged_vlans": set(["name", "site", "vid", "vlan_group", "tenant"]),
313313
"tenant": set(["slug"]),
314314
"tenant_group": set(["slug"]),
315315
"termination_a": set(["name", "device", "virtual_machine"]),
316316
"termination_b": set(["name", "device", "virtual_machine"]),
317-
"untagged_vlan": set(["name", "site", "vlan_group", "tenant"]),
317+
"untagged_vlan": set(["name", "site", "vid", "vlan_group", "tenant"]),
318318
"virtual_chassis": set(["master"]),
319319
"virtual_machine": set(["name", "cluster"]),
320-
"vlan": set(["name", "site", "tenant", "vlan_group"]),
320+
"vlan": set(["name", "site", "tenant", "vid", "vlan_group"]),
321321
"vlan_group": set(["slug", "site"]),
322322
"vrf": set(["name", "tenant"]),
323323
}

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,19 +102,22 @@
102102
"name": "Test VLAN",
103103
"site": "Test Site",
104104
"tenant": "Test Tenant",
105+
"vid": 1,
105106
"vlan_group": "Test VLAN group"
106107
}
107108
},
108109
"child": {
109110
"name": "Test VLAN",
110111
"site": "Test Site",
111112
"tenant": "Test Tenant",
113+
"vid": 1,
112114
"vlan_group": "Test VLAN group"
113115
},
114116
"expected": {
115117
"name": "Test VLAN",
116118
"site_id": 1,
117119
"tenant_id": 1,
120+
"vid": 1,
118121
"group": "Test VLAN group"
119122
}
120123
},
@@ -146,16 +149,19 @@
146149
"description": "Test Prefix",
147150
"untagged_vlan": {
148151
"name": "Test VLAN",
149-
"site": "Test Site"
152+
"site": "Test Site",
153+
"vid": 1
150154
}
151155
},
152156
"child": {
153157
"name": "Test VLAN",
154-
"site": "Test Site"
158+
"site": "Test Site",
159+
"vid": 1
155160
},
156161
"expected": {
157162
"name": "Test VLAN",
158-
"site_id": 1
163+
"site_id": 1,
164+
"vid": 1
159165
}
160166
},
161167
{

0 commit comments

Comments
 (0)