Convert RACK_WIDTH_CHOICES to ChoiceSet

netbox/dcim/api/serializers.py

@@ -118,7 +118,7 @@ class RackSerializer(TaggitSerializer, CustomFieldModelSerializer):
     status = ChoiceField(choices=RACK_STATUS_CHOICES, required=False)
     role = NestedRackRoleSerializer(required=False, allow_null=True)
     type = ChoiceField(choices=RackTypeChoices, required=False, allow_null=True)
-    width = ChoiceField(choices=RACK_WIDTH_CHOICES, required=False)
+    width = ChoiceField(choices=RackWidthChoices, required=False)
     outer_unit = ChoiceField(choices=RACK_DIMENSION_UNIT_CHOICES, required=False)
     tags = TagListSerializerField(required=False)
     device_count = serializers.IntegerField(read_only=True)

netbox/dcim/choices.py

@@ -30,6 +30,17 @@ class RackTypeChoices(ChoiceSet):
     }
 
 
+class RackWidthChoices(ChoiceSet):
+
+    WIDTH_19IN = 19
+    WIDTH_23IN = 23
+
+    CHOICES = (
+        (WIDTH_19IN, '19 inches'),
+        (WIDTH_23IN, '23 inches'),
+    )
+
+
 #
 # Console port type values
 #

netbox/dcim/constants.py

@@ -1,11 +1,3 @@
-# Rack widths
-RACK_WIDTH_19IN = 19
-RACK_WIDTH_23IN = 23
-RACK_WIDTH_CHOICES = (
-    (RACK_WIDTH_19IN, '19 inches'),
-    (RACK_WIDTH_23IN, '23 inches'),
-)
-
 # Rack faces
 RACK_FACE_FRONT = 0
 RACK_FACE_REAR = 1

netbox/dcim/forms.py

@@ -492,10 +492,7 @@ class RackCSVForm(forms.ModelForm):
         help_text='Rack type'
     )
     width = forms.ChoiceField(
-        choices=(
-            (RACK_WIDTH_19IN, '19'),
-            (RACK_WIDTH_23IN, '23'),
-        ),
+        choices=RackWidthChoices,
         help_text='Rail-to-rail width (in inches)'
     )
     outer_unit = CSVChoiceField(
@@ -598,7 +595,7 @@ class RackBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditFor
         widget=StaticSelect2()
     )
     width = forms.ChoiceField(
-        choices=add_blank_choice(RACK_WIDTH_CHOICES),
+        choices=add_blank_choice(RackWidthChoices),
         required=False,
         widget=StaticSelect2()
     )

netbox/dcim/models.py

@@ -504,8 +504,8 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
         verbose_name='Type'
     )
     width = models.PositiveSmallIntegerField(
-        choices=RACK_WIDTH_CHOICES,
-        default=RACK_WIDTH_19IN,
+        choices=RackWidthChoices,
+        default=RackWidthChoices.WIDTH_19IN,
         verbose_name='Width',
         help_text='Rail-to-rail width'
     )