From 45ca060f6fb74d3e955ca4a82ddde5c3868db862 Mon Sep 17 00:00:00 2001 From: Robin Schneider Date: Sat, 13 Sep 2025 17:14:10 +0200 Subject: [PATCH 1/2] feat: add Wi-Fi Alliance generation labels to Interface type texts Closes: #20347 --- netbox/dcim/choices.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/netbox/dcim/choices.py b/netbox/dcim/choices.py index d44048d58f8..635ec63cb79 100644 --- a/netbox/dcim/choices.py +++ b/netbox/dcim/choices.py @@ -1128,12 +1128,12 @@ class InterfaceTypeChoices(ChoiceSet): ( (TYPE_80211A, 'IEEE 802.11a'), (TYPE_80211G, 'IEEE 802.11b/g'), - (TYPE_80211N, 'IEEE 802.11n'), - (TYPE_80211AC, 'IEEE 802.11ac'), - (TYPE_80211AD, 'IEEE 802.11ad'), - (TYPE_80211AX, 'IEEE 802.11ax'), - (TYPE_80211AY, 'IEEE 802.11ay'), - (TYPE_80211BE, 'IEEE 802.11be'), + (TYPE_80211N, 'IEEE 802.11n (Wi-Fi 4)'), + (TYPE_80211AC, 'IEEE 802.11ac (Wi-Fi 5)'), + (TYPE_80211AD, 'IEEE 802.11ad (WiGig 60 GHz Wi-Fi)'), + (TYPE_80211AX, 'IEEE 802.11ax (Wi-Fi 6)'), + (TYPE_80211AY, 'IEEE 802.11ay (WiGig 60 GHz Wi-Fi)'), + (TYPE_80211BE, 'IEEE 802.11be (Wi-Fi 7)'), (TYPE_802151, 'IEEE 802.15.1 (Bluetooth)'), (TYPE_802154, 'IEEE 802.15.4 (LR-WPAN)'), (TYPE_OTHER_WIRELESS, 'Other (Wireless)'), From 23b7095e8b3c3b48953f8a8957810d78f8feb98e Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 15 Sep 2025 14:32:59 -0400 Subject: [PATCH 2/2] Shorten labels for WiGig choices --- netbox/dcim/choices.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/dcim/choices.py b/netbox/dcim/choices.py index 635ec63cb79..a10e51034f8 100644 --- a/netbox/dcim/choices.py +++ b/netbox/dcim/choices.py @@ -1130,9 +1130,9 @@ class InterfaceTypeChoices(ChoiceSet): (TYPE_80211G, 'IEEE 802.11b/g'), (TYPE_80211N, 'IEEE 802.11n (Wi-Fi 4)'), (TYPE_80211AC, 'IEEE 802.11ac (Wi-Fi 5)'), - (TYPE_80211AD, 'IEEE 802.11ad (WiGig 60 GHz Wi-Fi)'), + (TYPE_80211AD, 'IEEE 802.11ad (WiGig)'), (TYPE_80211AX, 'IEEE 802.11ax (Wi-Fi 6)'), - (TYPE_80211AY, 'IEEE 802.11ay (WiGig 60 GHz Wi-Fi)'), + (TYPE_80211AY, 'IEEE 802.11ay (WiGig)'), (TYPE_80211BE, 'IEEE 802.11be (Wi-Fi 7)'), (TYPE_802151, 'IEEE 802.15.1 (Bluetooth)'), (TYPE_802154, 'IEEE 802.15.4 (LR-WPAN)'),