From b5ae0e9bbb9bb19fe2b116d6ee8f8ad767e8ff50 Mon Sep 17 00:00:00 2001
From: "Joel L. McGuire" <joel.mcguire@ccr.net>
Date: Mon, 25 Nov 2024 08:53:34 -0600
Subject: [PATCH 1/2] fix #17960

---
 netbox/vpn/choices.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/netbox/vpn/choices.py b/netbox/vpn/choices.py
index 75145404951..fadcf97be4b 100644
--- a/netbox/vpn/choices.py
+++ b/netbox/vpn/choices.py
@@ -22,16 +22,28 @@ class TunnelStatusChoices(ChoiceSet):
 
 
 class TunnelEncapsulationChoices(ChoiceSet):
+    ENCAP_EOIP = 'eoip'
     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_SSTP = 'sstp'
+    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')),
+        (ENCAP_EOIP, _('EoIP')),
+        (ENCAP_SSTP, _('SSTP')),
     ]
 
 

From 326b142d664530119417bf0c8a5a27856b9880a0 Mon Sep 17 00:00:00 2001
From: "Joel L. McGuire" <joel.mcguire@ccr.net>
Date: Fri, 6 Dec 2024 10:04:01 -0600
Subject: [PATCH 2/2] updated post feedback

---
 netbox/vpn/choices.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/netbox/vpn/choices.py b/netbox/vpn/choices.py
index fadcf97be4b..9847e1b97aa 100644
--- a/netbox/vpn/choices.py
+++ b/netbox/vpn/choices.py
@@ -22,7 +22,6 @@ class TunnelStatusChoices(ChoiceSet):
 
 
 class TunnelEncapsulationChoices(ChoiceSet):
-    ENCAP_EOIP = 'eoip'
     ENCAP_GRE = 'gre'
     ENCAP_IPSEC_TRANSPORT = 'ipsec-transport'
     ENCAP_IPSEC_TUNNEL = 'ipsec-tunnel'
@@ -30,7 +29,6 @@ class TunnelEncapsulationChoices(ChoiceSet):
     ENCAP_L2TP = 'l2tp'
     ENCAP_OPENVPN = 'openvpn'
     ENCAP_PPTP = 'pptp'
-    ENCAP_SSTP = 'sstp'
     ENCAP_WIREGUARD = 'wireguard'
 
     CHOICES = [
@@ -42,8 +40,6 @@ class TunnelEncapsulationChoices(ChoiceSet):
         (ENCAP_OPENVPN, _('OpenVPN')),
         (ENCAP_L2TP, _('L2TP')),
         (ENCAP_PPTP, _('PPTP')),
-        (ENCAP_EOIP, _('EoIP')),
-        (ENCAP_SSTP, _('SSTP')),
     ]