Move wireless field choices to wireless app

netbox/dcim/api/serializers.py

@@ -19,6 +19,7 @@ from tenancy.api.nested_serializers import NestedTenantSerializer
 from users.api.nested_serializers import NestedUserSerializer
 from utilities.api import get_serializer_for_model
 from virtualization.api.nested_serializers import NestedClusterSerializer
+from wireless.choices import *
 from .nested_serializers import *
 
 

netbox/dcim/choices.py

@@ -1154,191 +1154,6 @@ class CableLengthUnitChoices(ChoiceSet):
     )
 
 
-#
-# Wireless
-#
-
-class WirelessRoleChoices(ChoiceSet):
-    ROLE_AP = 'ap'
-    ROLE_STATION = 'station'
-
-    CHOICES = (
-        (ROLE_AP, 'Access point'),
-        (ROLE_STATION, 'Station'),
-    )
-
-
-class WirelessChannelChoices(ChoiceSet):
-    CHANNEL_AUTO = 'auto'
-
-    # 2.4 GHz
-    CHANNEL_24G_1 = '2.4g-1'
-    CHANNEL_24G_2 = '2.4g-2'
-    CHANNEL_24G_3 = '2.4g-3'
-    CHANNEL_24G_4 = '2.4g-4'
-    CHANNEL_24G_5 = '2.4g-5'
-    CHANNEL_24G_6 = '2.4g-6'
-    CHANNEL_24G_7 = '2.4g-7'
-    CHANNEL_24G_8 = '2.4g-8'
-    CHANNEL_24G_9 = '2.4g-9'
-    CHANNEL_24G_10 = '2.4g-10'
-    CHANNEL_24G_11 = '2.4g-11'
-    CHANNEL_24G_12 = '2.4g-12'
-    CHANNEL_24G_13 = '2.4g-13'
-
-    # 5 GHz
-    CHANNEL_5G_32 = '5g-32'
-    CHANNEL_5G_34 = '5g-34'
-    CHANNEL_5G_36 = '5g-36'
-    CHANNEL_5G_38 = '5g-38'
-    CHANNEL_5G_40 = '5g-40'
-    CHANNEL_5G_42 = '5g-42'
-    CHANNEL_5G_44 = '5g-44'
-    CHANNEL_5G_46 = '5g-46'
-    CHANNEL_5G_48 = '5g-48'
-    CHANNEL_5G_50 = '5g-50'
-    CHANNEL_5G_52 = '5g-52'
-    CHANNEL_5G_54 = '5g-54'
-    CHANNEL_5G_56 = '5g-56'
-    CHANNEL_5G_58 = '5g-58'
-    CHANNEL_5G_60 = '5g-60'
-    CHANNEL_5G_62 = '5g-62'
-    CHANNEL_5G_64 = '5g-64'
-    CHANNEL_5G_100 = '5g-100'
-    CHANNEL_5G_102 = '5g-102'
-    CHANNEL_5G_104 = '5g-104'
-    CHANNEL_5G_106 = '5g-106'
-    CHANNEL_5G_108 = '5g-108'
-    CHANNEL_5G_110 = '5g-110'
-    CHANNEL_5G_112 = '5g-112'
-    CHANNEL_5G_114 = '5g-114'
-    CHANNEL_5G_116 = '5g-116'
-    CHANNEL_5G_118 = '5g-118'
-    CHANNEL_5G_120 = '5g-120'
-    CHANNEL_5G_122 = '5g-122'
-    CHANNEL_5G_124 = '5g-124'
-    CHANNEL_5G_126 = '5g-126'
-    CHANNEL_5G_128 = '5g-128'
-    CHANNEL_5G_132 = '5g-132'
-    CHANNEL_5G_134 = '5g-134'
-    CHANNEL_5G_136 = '5g-136'
-    CHANNEL_5G_138 = '5g-138'
-    CHANNEL_5G_140 = '5g-140'
-    CHANNEL_5G_142 = '5g-142'
-    CHANNEL_5G_144 = '5g-144'
-    CHANNEL_5G_149 = '5g-149'
-    CHANNEL_5G_151 = '5g-151'
-    CHANNEL_5G_153 = '5g-153'
-    CHANNEL_5G_155 = '5g-155'
-    CHANNEL_5G_157 = '5g-157'
-    CHANNEL_5G_159 = '5g-159'
-    CHANNEL_5G_161 = '5g-161'
-    CHANNEL_5G_163 = '5g-163'
-    CHANNEL_5G_165 = '5g-165'
-    CHANNEL_5G_167 = '5g-167'
-    CHANNEL_5G_169 = '5g-169'
-    CHANNEL_5G_171 = '5g-171'
-    CHANNEL_5G_173 = '5g-173'
-    CHANNEL_5G_175 = '5g-175'
-    CHANNEL_5G_177 = '5g-177'
-
-    CHOICES = (
-        (CHANNEL_AUTO, 'Auto'),
-        (
-            '2.4 GHz (802.11b/g/n/ax)',
-            (
-                (CHANNEL_24G_1, '1 (2412 MHz)'),
-                (CHANNEL_24G_2, '2 (2417 MHz)'),
-                (CHANNEL_24G_3, '3 (2422 MHz)'),
-                (CHANNEL_24G_4, '4 (2427 MHz)'),
-                (CHANNEL_24G_5, '5 (2432 MHz)'),
-                (CHANNEL_24G_6, '6 (2437 MHz)'),
-                (CHANNEL_24G_7, '7 (2442 MHz)'),
-                (CHANNEL_24G_8, '8 (2447 MHz)'),
-                (CHANNEL_24G_9, '9 (2452 MHz)'),
-                (CHANNEL_24G_10, '10 (2457 MHz)'),
-                (CHANNEL_24G_11, '11 (2462 MHz)'),
-                (CHANNEL_24G_12, '12 (2467 MHz)'),
-                (CHANNEL_24G_13, '13 (2472 MHz)'),
-            )
-        ),
-        (
-            '5 GHz (802.11a/n/ac/ax)',
-            (
-                (CHANNEL_5G_32, '32 (5160/20 MHz)'),
-                (CHANNEL_5G_34, '34 (5170/40 MHz)'),
-                (CHANNEL_5G_36, '36 (5180/20 MHz)'),
-                (CHANNEL_5G_38, '38 (5190/40 MHz)'),
-                (CHANNEL_5G_40, '40 (5200/20 MHz)'),
-                (CHANNEL_5G_42, '42 (5210/80 MHz)'),
-                (CHANNEL_5G_44, '44 (5220/20 MHz)'),
-                (CHANNEL_5G_46, '46 (5230/40 MHz)'),
-                (CHANNEL_5G_48, '48 (5240/20 MHz)'),
-                (CHANNEL_5G_50, '50 (5250/160 MHz)'),
-                (CHANNEL_5G_52, '52 (5260/20 MHz)'),
-                (CHANNEL_5G_54, '54 (5270/40 MHz)'),
-                (CHANNEL_5G_56, '56 (5280/20 MHz)'),
-                (CHANNEL_5G_58, '58 (5290/80 MHz)'),
-                (CHANNEL_5G_60, '60 (5300/20 MHz)'),
-                (CHANNEL_5G_62, '62 (5310/40 MHz)'),
-                (CHANNEL_5G_64, '64 (5320/20 MHz)'),
-                (CHANNEL_5G_100, '100 (5500/20 MHz)'),
-                (CHANNEL_5G_102, '102 (5510/40 MHz)'),
-                (CHANNEL_5G_104, '104 (5520/20 MHz)'),
-                (CHANNEL_5G_106, '106 (5530/80 MHz)'),
-                (CHANNEL_5G_108, '108 (5540/20 MHz)'),
-                (CHANNEL_5G_110, '110 (5550/40 MHz)'),
-                (CHANNEL_5G_112, '112 (5560/20 MHz)'),
-                (CHANNEL_5G_114, '114 (5570/160 MHz)'),
-                (CHANNEL_5G_116, '116 (5580/20 MHz)'),
-                (CHANNEL_5G_118, '118 (5590/40 MHz)'),
-                (CHANNEL_5G_120, '120 (5600/20 MHz)'),
-                (CHANNEL_5G_122, '122 (5610/80 MHz)'),
-                (CHANNEL_5G_124, '124 (5620/20 MHz)'),
-                (CHANNEL_5G_126, '126 (5630/40 MHz)'),
-                (CHANNEL_5G_128, '128 (5640/20 MHz)'),
-                (CHANNEL_5G_132, '132 (5660/20 MHz)'),
-                (CHANNEL_5G_134, '134 (5670/40 MHz)'),
-                (CHANNEL_5G_136, '136 (5680/20 MHz)'),
-                (CHANNEL_5G_138, '138 (5690/80 MHz)'),
-                (CHANNEL_5G_140, '140 (5700/20 MHz)'),
-                (CHANNEL_5G_142, '142 (5710/40 MHz)'),
-                (CHANNEL_5G_144, '144 (5720/20 MHz)'),
-                (CHANNEL_5G_149, '149 (5745/20 MHz)'),
-                (CHANNEL_5G_151, '151 (5755/40 MHz)'),
-                (CHANNEL_5G_153, '153 (5765/20 MHz)'),
-                (CHANNEL_5G_155, '155 (5775/80 MHz)'),
-                (CHANNEL_5G_157, '157 (5785/20 MHz)'),
-                (CHANNEL_5G_159, '159 (5795/40 MHz)'),
-                (CHANNEL_5G_161, '161 (5805/20 MHz)'),
-                (CHANNEL_5G_163, '163 (5815/160 MHz)'),
-                (CHANNEL_5G_165, '165 (5825/20 MHz)'),
-                (CHANNEL_5G_167, '167 (5835/40 MHz)'),
-                (CHANNEL_5G_169, '169 (5845/20 MHz)'),
-                (CHANNEL_5G_171, '171 (5855/80 MHz)'),
-                (CHANNEL_5G_173, '173 (5865/20 MHz)'),
-                (CHANNEL_5G_175, '175 (5875/40 MHz)'),
-                (CHANNEL_5G_177, '177 (5885/20 MHz)'),
-            )
-        ),
-    )
-
-
-class WirelessChannelWidthChoices(ChoiceSet):
-
-    CHANNEL_WIDTH_20 = 20
-    CHANNEL_WIDTH_40 = 40
-    CHANNEL_WIDTH_80 = 80
-    CHANNEL_WIDTH_160 = 160
-
-    CHOICES = (
-        (CHANNEL_WIDTH_20, '20 MHz'),
-        (CHANNEL_WIDTH_40, '40 MHz'),
-        (CHANNEL_WIDTH_80, '80 MHz'),
-        (CHANNEL_WIDTH_160, '160 MHz'),
-    )
-
-
 #
 # PowerFeeds
 #

netbox/dcim/forms/bulk_import.py

@@ -11,6 +11,7 @@ from extras.forms import CustomFieldModelCSVForm
 from tenancy.models import Tenant
 from utilities.forms import CSVChoiceField, CSVContentTypeField, CSVModelChoiceField, CSVTypedChoiceField, SlugField
 from virtualization.models import Cluster
+from wireless.choices import WirelessRoleChoices
 
 __all__ = (
     'CableCSVForm',

netbox/dcim/forms/filtersets.py

@@ -12,6 +12,7 @@ from utilities.forms import (
     APISelectMultiple, add_blank_choice, BootstrapMixin, ColorField, DynamicModelMultipleChoiceField, StaticSelect,
     StaticSelectMultiple, TagFilterField, BOOLEAN_WITH_BLANK_CHOICES,
 )
+from wireless.choices import *
 
 __all__ = (
     'CableFilterForm',

netbox/dcim/forms/object_create.py

@@ -10,6 +10,7 @@ from utilities.forms import (
     add_blank_choice, BootstrapMixin, ColorField, DynamicModelChoiceField, DynamicModelMultipleChoiceField,
     ExpandableNameField, StaticSelect,
 )
+from wireless.choices import *
 from .common import InterfaceCommonForm
 
 __all__ = (

netbox/dcim/models/device_components.py

@@ -18,6 +18,7 @@ from utilities.mptt import TreeManager
 from utilities.ordering import naturalize_interface
 from utilities.querysets import RestrictedQuerySet
 from utilities.query_functions import CollateAsChar
+from wireless.choices import *
 
 
 __all__ = (

netbox/wireless/choices.py

@@ -0,0 +1,182 @@
+from utilities.choices import ChoiceSet
+
+
+class WirelessRoleChoices(ChoiceSet):
+    ROLE_AP = 'ap'
+    ROLE_STATION = 'station'
+
+    CHOICES = (
+        (ROLE_AP, 'Access point'),
+        (ROLE_STATION, 'Station'),
+    )
+
+
+class WirelessChannelChoices(ChoiceSet):
+    CHANNEL_AUTO = 'auto'
+
+    # 2.4 GHz
+    CHANNEL_24G_1 = '2.4g-1'
+    CHANNEL_24G_2 = '2.4g-2'
+    CHANNEL_24G_3 = '2.4g-3'
+    CHANNEL_24G_4 = '2.4g-4'
+    CHANNEL_24G_5 = '2.4g-5'
+    CHANNEL_24G_6 = '2.4g-6'
+    CHANNEL_24G_7 = '2.4g-7'
+    CHANNEL_24G_8 = '2.4g-8'
+    CHANNEL_24G_9 = '2.4g-9'
+    CHANNEL_24G_10 = '2.4g-10'
+    CHANNEL_24G_11 = '2.4g-11'
+    CHANNEL_24G_12 = '2.4g-12'
+    CHANNEL_24G_13 = '2.4g-13'
+
+    # 5 GHz
+    CHANNEL_5G_32 = '5g-32'
+    CHANNEL_5G_34 = '5g-34'
+    CHANNEL_5G_36 = '5g-36'
+    CHANNEL_5G_38 = '5g-38'
+    CHANNEL_5G_40 = '5g-40'
+    CHANNEL_5G_42 = '5g-42'
+    CHANNEL_5G_44 = '5g-44'
+    CHANNEL_5G_46 = '5g-46'
+    CHANNEL_5G_48 = '5g-48'
+    CHANNEL_5G_50 = '5g-50'
+    CHANNEL_5G_52 = '5g-52'
+    CHANNEL_5G_54 = '5g-54'
+    CHANNEL_5G_56 = '5g-56'
+    CHANNEL_5G_58 = '5g-58'
+    CHANNEL_5G_60 = '5g-60'
+    CHANNEL_5G_62 = '5g-62'
+    CHANNEL_5G_64 = '5g-64'
+    CHANNEL_5G_100 = '5g-100'
+    CHANNEL_5G_102 = '5g-102'
+    CHANNEL_5G_104 = '5g-104'
+    CHANNEL_5G_106 = '5g-106'
+    CHANNEL_5G_108 = '5g-108'
+    CHANNEL_5G_110 = '5g-110'
+    CHANNEL_5G_112 = '5g-112'
+    CHANNEL_5G_114 = '5g-114'
+    CHANNEL_5G_116 = '5g-116'
+    CHANNEL_5G_118 = '5g-118'
+    CHANNEL_5G_120 = '5g-120'
+    CHANNEL_5G_122 = '5g-122'
+    CHANNEL_5G_124 = '5g-124'
+    CHANNEL_5G_126 = '5g-126'
+    CHANNEL_5G_128 = '5g-128'
+    CHANNEL_5G_132 = '5g-132'
+    CHANNEL_5G_134 = '5g-134'
+    CHANNEL_5G_136 = '5g-136'
+    CHANNEL_5G_138 = '5g-138'
+    CHANNEL_5G_140 = '5g-140'
+    CHANNEL_5G_142 = '5g-142'
+    CHANNEL_5G_144 = '5g-144'
+    CHANNEL_5G_149 = '5g-149'
+    CHANNEL_5G_151 = '5g-151'
+    CHANNEL_5G_153 = '5g-153'
+    CHANNEL_5G_155 = '5g-155'
+    CHANNEL_5G_157 = '5g-157'
+    CHANNEL_5G_159 = '5g-159'
+    CHANNEL_5G_161 = '5g-161'
+    CHANNEL_5G_163 = '5g-163'
+    CHANNEL_5G_165 = '5g-165'
+    CHANNEL_5G_167 = '5g-167'
+    CHANNEL_5G_169 = '5g-169'
+    CHANNEL_5G_171 = '5g-171'
+    CHANNEL_5G_173 = '5g-173'
+    CHANNEL_5G_175 = '5g-175'
+    CHANNEL_5G_177 = '5g-177'
+
+    CHOICES = (
+        (CHANNEL_AUTO, 'Auto'),
+        (
+            '2.4 GHz (802.11b/g/n/ax)',
+            (
+                (CHANNEL_24G_1, '1 (2412 MHz)'),
+                (CHANNEL_24G_2, '2 (2417 MHz)'),
+                (CHANNEL_24G_3, '3 (2422 MHz)'),
+                (CHANNEL_24G_4, '4 (2427 MHz)'),
+                (CHANNEL_24G_5, '5 (2432 MHz)'),
+                (CHANNEL_24G_6, '6 (2437 MHz)'),
+                (CHANNEL_24G_7, '7 (2442 MHz)'),
+                (CHANNEL_24G_8, '8 (2447 MHz)'),
+                (CHANNEL_24G_9, '9 (2452 MHz)'),
+                (CHANNEL_24G_10, '10 (2457 MHz)'),
+                (CHANNEL_24G_11, '11 (2462 MHz)'),
+                (CHANNEL_24G_12, '12 (2467 MHz)'),
+                (CHANNEL_24G_13, '13 (2472 MHz)'),
+            )
+        ),
+        (
+            '5 GHz (802.11a/n/ac/ax)',
+            (
+                (CHANNEL_5G_32, '32 (5160/20 MHz)'),
+                (CHANNEL_5G_34, '34 (5170/40 MHz)'),
+                (CHANNEL_5G_36, '36 (5180/20 MHz)'),
+                (CHANNEL_5G_38, '38 (5190/40 MHz)'),
+                (CHANNEL_5G_40, '40 (5200/20 MHz)'),
+                (CHANNEL_5G_42, '42 (5210/80 MHz)'),
+                (CHANNEL_5G_44, '44 (5220/20 MHz)'),
+                (CHANNEL_5G_46, '46 (5230/40 MHz)'),
+                (CHANNEL_5G_48, '48 (5240/20 MHz)'),
+                (CHANNEL_5G_50, '50 (5250/160 MHz)'),
+                (CHANNEL_5G_52, '52 (5260/20 MHz)'),
+                (CHANNEL_5G_54, '54 (5270/40 MHz)'),
+                (CHANNEL_5G_56, '56 (5280/20 MHz)'),
+                (CHANNEL_5G_58, '58 (5290/80 MHz)'),
+                (CHANNEL_5G_60, '60 (5300/20 MHz)'),
+                (CHANNEL_5G_62, '62 (5310/40 MHz)'),
+                (CHANNEL_5G_64, '64 (5320/20 MHz)'),
+                (CHANNEL_5G_100, '100 (5500/20 MHz)'),
+                (CHANNEL_5G_102, '102 (5510/40 MHz)'),
+                (CHANNEL_5G_104, '104 (5520/20 MHz)'),
+                (CHANNEL_5G_106, '106 (5530/80 MHz)'),
+                (CHANNEL_5G_108, '108 (5540/20 MHz)'),
+                (CHANNEL_5G_110, '110 (5550/40 MHz)'),
+                (CHANNEL_5G_112, '112 (5560/20 MHz)'),
+                (CHANNEL_5G_114, '114 (5570/160 MHz)'),
+                (CHANNEL_5G_116, '116 (5580/20 MHz)'),
+                (CHANNEL_5G_118, '118 (5590/40 MHz)'),
+                (CHANNEL_5G_120, '120 (5600/20 MHz)'),
+                (CHANNEL_5G_122, '122 (5610/80 MHz)'),
+                (CHANNEL_5G_124, '124 (5620/20 MHz)'),
+                (CHANNEL_5G_126, '126 (5630/40 MHz)'),
+                (CHANNEL_5G_128, '128 (5640/20 MHz)'),
+                (CHANNEL_5G_132, '132 (5660/20 MHz)'),
+                (CHANNEL_5G_134, '134 (5670/40 MHz)'),
+                (CHANNEL_5G_136, '136 (5680/20 MHz)'),
+                (CHANNEL_5G_138, '138 (5690/80 MHz)'),
+                (CHANNEL_5G_140, '140 (5700/20 MHz)'),
+                (CHANNEL_5G_142, '142 (5710/40 MHz)'),
+                (CHANNEL_5G_144, '144 (5720/20 MHz)'),
+                (CHANNEL_5G_149, '149 (5745/20 MHz)'),
+                (CHANNEL_5G_151, '151 (5755/40 MHz)'),
+                (CHANNEL_5G_153, '153 (5765/20 MHz)'),
+                (CHANNEL_5G_155, '155 (5775/80 MHz)'),
+                (CHANNEL_5G_157, '157 (5785/20 MHz)'),
+                (CHANNEL_5G_159, '159 (5795/40 MHz)'),
+                (CHANNEL_5G_161, '161 (5805/20 MHz)'),
+                (CHANNEL_5G_163, '163 (5815/160 MHz)'),
+                (CHANNEL_5G_165, '165 (5825/20 MHz)'),
+                (CHANNEL_5G_167, '167 (5835/40 MHz)'),
+                (CHANNEL_5G_169, '169 (5845/20 MHz)'),
+                (CHANNEL_5G_171, '171 (5855/80 MHz)'),
+                (CHANNEL_5G_173, '173 (5865/20 MHz)'),
+                (CHANNEL_5G_175, '175 (5875/40 MHz)'),
+                (CHANNEL_5G_177, '177 (5885/20 MHz)'),
+            )
+        ),
+    )
+
+
+class WirelessChannelWidthChoices(ChoiceSet):
+
+    CHANNEL_WIDTH_20 = 20
+    CHANNEL_WIDTH_40 = 40
+    CHANNEL_WIDTH_80 = 80
+    CHANNEL_WIDTH_160 = 160
+
+    CHOICES = (
+        (CHANNEL_WIDTH_20, '20 MHz'),
+        (CHANNEL_WIDTH_40, '40 MHz'),
+        (CHANNEL_WIDTH_80, '80 MHz'),
+        (CHANNEL_WIDTH_160, '160 MHz'),
+    )