update connector choices

docs/models/dcim/coolingoutlet.md

@@ -29,7 +29,7 @@ Indicates whether the outlet carries supply (cold) or return (warm) coolant.
 
 ### Connector Type
 
-The physical coolant connector type (e.g. UQD, QDC, blind-mate, or threaded).
+The physical coolant connector type (e.g. UQD, UQDB, QDC, camlock, or threaded NPT/BSP).
 
 ### Diameter
 

docs/models/dcim/coolingport.md

@@ -29,7 +29,7 @@ Indicates whether the port carries supply (cold) or return (warm) coolant.
 
 ### Connector Type
 
-The physical coolant connector type (e.g. UQD, QDC, blind-mate, or threaded).
+The physical coolant connector type (e.g. UQD, UQDB, QDC, camlock, or threaded NPT/BSP).
 
 ### Diameter
 

netbox/dcim/choices.py

@@ -2201,19 +2201,21 @@ class RackCoolingCapabilityChoices(ChoiceSet):
 class CoolingConnectorTypeChoices(ChoiceSet):
 
     TYPE_UQD = 'uqd'
+    TYPE_UQDB = 'uqdb'
     TYPE_QDC = 'qdc'
-    TYPE_BLIND_MATE = 'blind-mate'
-    TYPE_THREADED_NPT = 'threaded-npt'
-    TYPE_THREADED_BSP = 'threaded-bsp'
-    TYPE_OTHER = 'other'
+    TYPE_CAMLOCK = 'camlock'
+    TYPE_NPT = 'npt'
+    TYPE_BSP = 'bsp'
+    TYPE_PROPRIETARY = 'proprietary'
 
     CHOICES = [
         (TYPE_UQD, _('UQD (Universal Quick Disconnect)')),
+        (TYPE_UQDB, _('UQDB (Universal Quick Disconnect, Blind-mate)')),
         (TYPE_QDC, _('QDC (Quick Disconnect Coupling)')),
-        (TYPE_BLIND_MATE, _('Blind-mate')),
-        (TYPE_THREADED_NPT, _('Threaded (NPT)')),
-        (TYPE_THREADED_BSP, _('Threaded (BSP)')),
-        (TYPE_OTHER, _('Other')),
+        (TYPE_CAMLOCK, _('Camlock (cam-and-groove)')),
+        (TYPE_NPT, _('NPT (threaded)')),
+        (TYPE_BSP, _('BSP (threaded)')),
+        (TYPE_PROPRIETARY, _('Proprietary')),
     ]
 
 

netbox/dcim/tests/test_filtersets.py

@@ -2067,7 +2067,7 @@ class CoolingPortTemplateTestCase(TestCase, DeviceComponentTemplateFilterSetTest
                 device_type=device_types[2],
                 name='Cooling Port 3',
                 type=CoolingFeedTypeChoices.TYPE_SUPPLY,
-                connector_type=CoolingConnectorTypeChoices.TYPE_BLIND_MATE,
+                connector_type=CoolingConnectorTypeChoices.TYPE_UQDB,
                 diameter=CoolingDiameterChoices.DN40,
                 maximum_flow=300,
                 heat_capacity=150,
@@ -2139,7 +2139,7 @@ class CoolingOutletTemplateTestCase(TestCase, DeviceComponentTemplateFilterSetTe
                 device_type=device_types[2],
                 name='Cooling Outlet 3',
                 type=CoolingFeedTypeChoices.TYPE_SUPPLY,
-                connector_type=CoolingConnectorTypeChoices.TYPE_BLIND_MATE,
+                connector_type=CoolingConnectorTypeChoices.TYPE_UQDB,
                 diameter=CoolingDiameterChoices.DN40,
                 color=ColorChoices.COLOR_BLUE,
                 description='foobar3'
@@ -4821,7 +4821,7 @@ class CoolingPortTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedF
                 name='Cooling Port 3',
                 label='C',
                 type=CoolingFeedTypeChoices.TYPE_SUPPLY,
-                connector_type=CoolingConnectorTypeChoices.TYPE_BLIND_MATE,
+                connector_type=CoolingConnectorTypeChoices.TYPE_UQDB,
                 diameter=CoolingDiameterChoices.DN40,
                 maximum_flow=300,
                 heat_capacity=150,
@@ -5105,7 +5105,7 @@ class CoolingOutletTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLogge
                 name='Cooling Outlet 3',
                 label='C',
                 type=CoolingFeedTypeChoices.TYPE_SUPPLY,
-                connector_type=CoolingConnectorTypeChoices.TYPE_BLIND_MATE,
+                connector_type=CoolingConnectorTypeChoices.TYPE_UQDB,
                 diameter=CoolingDiameterChoices.DN40,
                 description='Third',
                 color='0000ff',