From 21962b3488afa75c5920dbceae4bcb29fc4338bc Mon Sep 17 00:00:00 2001 From: Joel McGuire Date: Mon, 9 Dec 2024 14:03:00 -0600 Subject: [PATCH] fix #17960 by adding 6 more tunnel encap options (#18097) * fix #17960 * updated post feedback --------- Co-authored-by: Joel L. McGuire --- netbox/vpn/choices.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/netbox/vpn/choices.py b/netbox/vpn/choices.py index 75145404951..9847e1b97aa 100644 --- a/netbox/vpn/choices.py +++ b/netbox/vpn/choices.py @@ -23,15 +23,23 @@ class TunnelStatusChoices(ChoiceSet): class TunnelEncapsulationChoices(ChoiceSet): ENCAP_GRE = 'gre' - ENCAP_IP_IP = 'ip-ip' ENCAP_IPSEC_TRANSPORT = 'ipsec-transport' ENCAP_IPSEC_TUNNEL = 'ipsec-tunnel' + ENCAP_IP_IP = 'ip-ip' + ENCAP_L2TP = 'l2tp' + ENCAP_OPENVPN = 'openvpn' + ENCAP_PPTP = 'pptp' + ENCAP_WIREGUARD = 'wireguard' CHOICES = [ (ENCAP_IPSEC_TRANSPORT, _('IPsec - Transport')), (ENCAP_IPSEC_TUNNEL, _('IPsec - Tunnel')), (ENCAP_IP_IP, _('IP-in-IP')), (ENCAP_GRE, _('GRE')), + (ENCAP_WIREGUARD, _('WireGuard')), + (ENCAP_OPENVPN, _('OpenVPN')), + (ENCAP_L2TP, _('L2TP')), + (ENCAP_PPTP, _('PPTP')), ]