mirror of
https://github.com/netbox-community/netbox.git
synced 2024-05-10 07:54:54 +00:00
Merge branch 'develop' into 3960-legacy-device-status
This commit is contained in:
@ -11,6 +11,7 @@
|
|||||||
* [#3951](https://github.com/netbox-community/netbox/issues/3951) - Fix exception in webhook worker due to missing constant
|
* [#3951](https://github.com/netbox-community/netbox/issues/3951) - Fix exception in webhook worker due to missing constant
|
||||||
* [#3953](https://github.com/netbox-community/netbox/issues/3953) - Fix validation error when creating child devices
|
* [#3953](https://github.com/netbox-community/netbox/issues/3953) - Fix validation error when creating child devices
|
||||||
* [#3960](https://github.com/netbox-community/netbox/issues/3960) - Fix legacy device status choice
|
* [#3960](https://github.com/netbox-community/netbox/issues/3960) - Fix legacy device status choice
|
||||||
|
* [#3967](https://github.com/netbox-community/netbox/issues/3967) - Resolve migration of "other" interface type
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -12,6 +12,7 @@ pages:
|
|||||||
- 4. LDAP (Optional): 'installation/4-ldap.md'
|
- 4. LDAP (Optional): 'installation/4-ldap.md'
|
||||||
- Upgrading NetBox: 'installation/upgrading.md'
|
- Upgrading NetBox: 'installation/upgrading.md'
|
||||||
- Migrating to Python3: 'installation/migrating-to-python3.md'
|
- Migrating to Python3: 'installation/migrating-to-python3.md'
|
||||||
|
- Migrating to systemd: 'installation/migrating-to-systemd.md'
|
||||||
- Configuration:
|
- Configuration:
|
||||||
- Configuring NetBox: 'configuration/index.md'
|
- Configuring NetBox: 'configuration/index.md'
|
||||||
- Required Settings: 'configuration/required-settings.md'
|
- Required Settings: 'configuration/required-settings.md'
|
||||||
|
@ -802,6 +802,7 @@ class InterfaceTypeChoices(ChoiceSet):
|
|||||||
TYPE_SUMMITSTACK128: 5310,
|
TYPE_SUMMITSTACK128: 5310,
|
||||||
TYPE_SUMMITSTACK256: 5320,
|
TYPE_SUMMITSTACK256: 5320,
|
||||||
TYPE_SUMMITSTACK512: 5330,
|
TYPE_SUMMITSTACK512: 5330,
|
||||||
|
TYPE_OTHER: 32767,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
20
netbox/dcim/migrations/0091_interface_type_other.py
Normal file
20
netbox/dcim/migrations/0091_interface_type_other.py
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
|
def interface_type_to_slug(apps, schema_editor):
|
||||||
|
Interface = apps.get_model('dcim', 'Interface')
|
||||||
|
Interface.objects.filter(type=32767).update(type='other')
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('dcim', '0090_cable_termination_models'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
# Missed type "other" in the initial migration (see #3967)
|
||||||
|
migrations.RunPython(
|
||||||
|
code=interface_type_to_slug
|
||||||
|
),
|
||||||
|
]
|
Reference in New Issue
Block a user