Skip to content

Commit 3c4b34f

Browse files
committed
Add new endpoints for vpn app
1 parent 5976736 commit 3c4b34f

File tree

1 file changed

+24
-8
lines changed

1 file changed

+24
-8
lines changed

plugins/lookup/nb_lookup.py

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,6 @@ def get_endpoint(netbox, term):
206206
"job-results": {"endpoint": netbox.extras.job_results},
207207
"journal-entries": {"endpoint": netbox.extras.journal_entries},
208208
"locations": {"endpoint": netbox.dcim.locations},
209-
"l2vpn-terminations": {"endpoint": netbox.ipam.l2vpn_terminations},
210-
"l2vpns": {"endpoint": netbox.ipam.l2vpns},
211209
"manufacturers": {"endpoint": netbox.dcim.manufacturers},
212210
"module-bays": {"endpoint": netbox.dcim.module_bays},
213211
"module-bay-templates": {"endpoint": netbox.dcim.module_bay_templates},
@@ -257,9 +255,9 @@ def get_endpoint(netbox, term):
257255
"webhooks": {"endpoint": netbox.extras.webhooks},
258256
}
259257

260-
major, minor, patch = map(int, pynetbox.__version__.split("."))
258+
pynetbox_versiontuple = major, minor, patch = tuple(map(int, pynetbox.__version__.split(".")))
261259

262-
if major >= 6 and minor >= 4 and patch >= 0:
260+
if pynetbox_versiontuple >= (6, 4):
263261
netbox_endpoint_map["wireless-lan-groups"] = {
264262
"endpoint": netbox.wireless.wireless_lan_groups
265263
}
@@ -273,17 +271,35 @@ def get_endpoint(netbox, term):
273271
"endpoint": netbox.wireless.wireless_links
274272
}
275273

276-
if major < 7 and minor >= 0 and patch >= 1:
277-
netbox_endpoint_map["secret-roles"] = {"endpoint": netbox.secrets.secret_roles}
278-
netbox_endpoint_map["secrets"] = {"endpoint": netbox.secrets.secrets}
279-
280274
else:
281275
if "wireless" in term:
282276
Display().v(
283277
"pynetbox version %d.%d.%d does not support wireless app; please update to v6.4.0 or newer."
284278
% (major, minor, patch)
285279
)
286280

281+
if pynetbox_versiontuple < (7, 0, 1):
282+
netbox_endpoint_map["secret-roles"] = {"endpoint": netbox.secrets.secret_roles}
283+
netbox_endpoint_map["secrets"] = {"endpoint": netbox.secrets.secrets}
284+
285+
if pynetbox_versiontuple >= (7, 3):
286+
netbox_versiontuple = tuple(map(int, netbox.version.split(".")))
287+
288+
if netbox_versiontuple >= (3, 7):
289+
netbox_endpoint_map["l2vpn-terminations"] = {
290+
"endpoint": netbox.vpn.l2vpn_terminations
291+
}
292+
netbox_endpoint_map["l2vpns"] = {"endpoint": netbox.vpn.l2vpns}
293+
netbox_endpoint_map["tunnel-terminations"] = {
294+
"endpoint": netbox.vpn.tunnel_terminations
295+
}
296+
netbox_endpoint_map["tunnels"] = {"endpoint": netbox.vpn.tunnels}
297+
else:
298+
netbox_endpoint_map["l2vpn-terminations"] = {
299+
"endpoint": netbox.ipam.l2vpn_terminations
300+
}
301+
netbox_endpoint_map["l2vpns"] = {"endpoint": netbox.ipam.l2vpns}
302+
287303
return netbox_endpoint_map[term]["endpoint"]
288304

289305

0 commit comments

Comments
 (0)