diff --git a/CHANGELOG.md b/CHANGELOG.md index 8eaff04c2..d40cc01fd 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py index 161055879..36b225ca1 100644 --- a/netbox/dcim/constants.py +++ b/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'], ] ] ]