Просмотр исходного кода

Closes #2569: Added LSH fiber type; removed SC duplex/simplex designations

Jeremy Stretch 7 лет назад
Родитель
Сommit
a228f1e1c2
2 измененных файлов с 8 добавлено и 7 удалено
  1. 2 1
      CHANGELOG.md
  2. 6 6
      netbox/dcim/constants.py

+ 2 - 1
CHANGELOG.md

@@ -37,11 +37,12 @@ NetBox now supports modeling physical cables for console, power, and interface c
 * [#2292](https://github.com/digitalocean/netbox/issues/2292) - Removed the deprecated UserAction model
 * [#2367](https://github.com/digitalocean/netbox/issues/2367) - Removed deprecated RPCClient functionality
 
-## Bug Fixes (from v2.5-beta1)
+## Changes From v2.5-beta1
 
 * [#2563](https://github.com/digitalocean/netbox/issues/2563) - Enable export templates for cables
 * [#2566](https://github.com/digitalocean/netbox/issues/2566) - Prevent both ends of a cable from connecting to the same termination point
 * [#2567](https://github.com/digitalocean/netbox/issues/2567) - Introduced proxy models to represent console/power/interface connections
+* [#2569](https://github.com/digitalocean/netbox/issues/2569) - Added LSH fiber type; removed SC duplex/simplex designations
 
 ## API Changes
 

+ 6 - 6
netbox/dcim/constants.py

@@ -226,12 +226,12 @@ IFACE_MODE_CHOICES = [
 # Pass-through port types
 PORT_TYPE_8P8C = 1000
 PORT_TYPE_ST = 2000
-PORT_TYPE_SC_SIMPLEX = 2100
-PORT_TYPE_SC_DUPLEX = 2110
+PORT_TYPE_SC = 2100
 PORT_TYPE_FC = 2200
 PORT_TYPE_LC = 2300
 PORT_TYPE_MTRJ = 2400
 PORT_TYPE_MPO = 2500
+PORT_TYPE_LSH = 2600
 PORT_TYPE_CHOICES = [
     [
         'Copper',
@@ -242,13 +242,13 @@ PORT_TYPE_CHOICES = [
     [
         'Fiber Optic',
         [
-            [PORT_TYPE_ST, 'ST'],
-            [PORT_TYPE_SC_SIMPLEX, 'SC (Simplex)'],
-            [PORT_TYPE_SC_DUPLEX, 'SC (Duplex)'],
             [PORT_TYPE_FC, 'FC'],
             [PORT_TYPE_LC, 'LC'],
-            [PORT_TYPE_MTRJ, 'MTRJ'],
+            [PORT_TYPE_LSH, 'LSH'],
             [PORT_TYPE_MPO, 'MPO'],
+            [PORT_TYPE_MTRJ, 'MTRJ'],
+            [PORT_TYPE_SC, 'SC'],
+            [PORT_TYPE_ST, 'ST'],
         ]
     ]
 ]