mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Closes #4817: Standardize device/VM component name field to 64 characters

Browse Source
This commit is contained in:
Jeremy Stretch
2020-07-02 12:08:19 -04:00
parent c5362f5931
commit d03d302eef
5 changed files with 102 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
netbox/dcim/models/device_component_templates.py
View File

@@ -27,6 +27,14 @@ __all__ = (
class ComponentTemplateModel(models.Model):
name = models.CharField(
max_length=64
)
_name = NaturalOrderingField(
target_field='name',
max_length=100,
blank=True
)
label = models.CharField(
max_length=64,
blank=True,
@@ -78,14 +86,6 @@ class ConsolePortTemplate(ComponentTemplateModel):
on_delete=models.CASCADE,
related_name='consoleport_templates'
)
name = models.CharField(
max_length=50
)
_name = NaturalOrderingField(
target_field='name',
max_length=100,
blank=True
)
type = models.CharField(
max_length=50,
choices=ConsolePortTypeChoices,
@@ -113,14 +113,6 @@ class ConsoleServerPortTemplate(ComponentTemplateModel):
on_delete=models.CASCADE,
related_name='consoleserverport_templates'
)
name = models.CharField(
max_length=50
)
_name = NaturalOrderingField(
target_field='name',
max_length=100,
blank=True
)
type = models.CharField(
max_length=50,
choices=ConsolePortTypeChoices,
@@ -148,14 +140,6 @@ class PowerPortTemplate(ComponentTemplateModel):
on_delete=models.CASCADE,
related_name='powerport_templates'
)
name = models.CharField(
max_length=50
)
_name = NaturalOrderingField(
target_field='name',
max_length=100,
blank=True
)
type = models.CharField(
max_length=50,
choices=PowerPortTypeChoices,
@@ -197,14 +181,6 @@ class PowerOutletTemplate(ComponentTemplateModel):
on_delete=models.CASCADE,
related_name='poweroutlet_templates'
)
name = models.CharField(
max_length=50
)
_name = NaturalOrderingField(
target_field='name',
max_length=100,
blank=True
)
type = models.CharField(
max_length=50,
choices=PowerOutletTypeChoices,
@@ -259,9 +235,6 @@ class InterfaceTemplate(ComponentTemplateModel):
on_delete=models.CASCADE,
related_name='interface_templates'
)
name = models.CharField(
max_length=64
)
_name = NaturalOrderingField(
target_field='name',
naturalize_function=naturalize_interface,
@@ -299,14 +272,6 @@ class FrontPortTemplate(ComponentTemplateModel):
on_delete=models.CASCADE,
related_name='frontport_templates'
)
name = models.CharField(
max_length=64
)
_name = NaturalOrderingField(
target_field='name',
max_length=100,
blank=True
)
type = models.CharField(
max_length=50,
choices=PortTypeChoices
@@ -367,14 +332,6 @@ class RearPortTemplate(ComponentTemplateModel):
on_delete=models.CASCADE,
related_name='rearport_templates'
)
name = models.CharField(
max_length=64
)
_name = NaturalOrderingField(
target_field='name',
max_length=100,
blank=True
)
type = models.CharField(
max_length=50,
choices=PortTypeChoices
@@ -406,14 +363,6 @@ class DeviceBayTemplate(ComponentTemplateModel):
on_delete=models.CASCADE,
related_name='device_bay_templates'
)
name = models.CharField(
max_length=50
)
_name = NaturalOrderingField(
target_field='name',
max_length=100,
blank=True
)
class Meta:
ordering = ('device_type', '_name')

89
netbox/dcim/models/device_components.py
View File

@@ -36,6 +36,14 @@ __all__ = (
class ComponentModel(models.Model):
name = models.CharField(
max_length=64
)
_name = NaturalOrderingField(
target_field='name',
max_length=100,
blank=True
)
label = models.CharField(
max_length=64,
blank=True,
@@ -243,14 +251,6 @@ class ConsolePort(CableTermination, ComponentModel):
on_delete=models.CASCADE,
related_name='consoleports'
)
name = models.CharField(
max_length=50
)
_name = NaturalOrderingField(
target_field='name',
max_length=100,
blank=True
)
type = models.CharField(
max_length=50,
choices=ConsolePortTypeChoices,
@@ -303,14 +303,6 @@ class ConsoleServerPort(CableTermination, ComponentModel):
on_delete=models.CASCADE,
related_name='consoleserverports'
)
name = models.CharField(
max_length=50
)
_name = NaturalOrderingField(
target_field='name',
max_length=100,
blank=True
)
type = models.CharField(
max_length=50,
choices=ConsolePortTypeChoices,
@@ -356,14 +348,6 @@ class PowerPort(CableTermination, ComponentModel):
on_delete=models.CASCADE,
related_name='powerports'
)
name = models.CharField(
max_length=50
)
_name = NaturalOrderingField(
target_field='name',
max_length=100,
blank=True
)
type = models.CharField(
max_length=50,
choices=PowerPortTypeChoices,
@@ -517,14 +501,6 @@ class PowerOutlet(CableTermination, ComponentModel):
on_delete=models.CASCADE,
related_name='poweroutlets'
)
name = models.CharField(
max_length=50
)
_name = NaturalOrderingField(
target_field='name',
max_length=100,
blank=True
)
type = models.CharField(
max_length=50,
choices=PowerOutletTypeChoices,
@@ -584,15 +560,6 @@ class PowerOutlet(CableTermination, ComponentModel):
#
class BaseInterface(models.Model):
name = models.CharField(
max_length=64
)
_name = NaturalOrderingField(
target_field='name',
naturalize_function=naturalize_interface,
max_length=100,
blank=True
)
enabled = models.BooleanField(
default=True
)
@@ -629,6 +596,12 @@ class Interface(CableTermination, ComponentModel, BaseInterface):
null=True,
blank=True
)
_name = NaturalOrderingField(
target_field='name',
naturalize_function=naturalize_interface,
max_length=100,
blank=True
)
_connected_interface = models.OneToOneField(
to='self',
on_delete=models.SET_NULL,
@@ -839,14 +812,6 @@ class FrontPort(CableTermination, ComponentModel):
on_delete=models.CASCADE,
related_name='frontports'
)
name = models.CharField(
max_length=64
)
_name = NaturalOrderingField(
target_field='name',
max_length=100,
blank=True
)
type = models.CharField(
max_length=50,
choices=PortTypeChoices
@@ -912,14 +877,6 @@ class RearPort(CableTermination, ComponentModel):
on_delete=models.CASCADE,
related_name='rearports'
)
name = models.CharField(
max_length=64
)
_name = NaturalOrderingField(
target_field='name',
max_length=100,
blank=True
)
type = models.CharField(
max_length=50,
choices=PortTypeChoices
@@ -964,15 +921,6 @@ class DeviceBay(ComponentModel):
on_delete=models.CASCADE,
related_name='device_bays'
)
name = models.CharField(
max_length=50,
verbose_name='Name'
)
_name = NaturalOrderingField(
target_field='name',
max_length=100,
blank=True
)
installed_device = models.OneToOneField(
to='dcim.Device',
on_delete=models.SET_NULL,
@@ -1045,15 +993,6 @@ class InventoryItem(ComponentModel):
blank=True,
null=True
)
name = models.CharField(
max_length=50,
verbose_name='Name'
)
_name = NaturalOrderingField(
target_field='name',
max_length=100,
blank=True
)
manufacturer = models.ForeignKey(
to='dcim.Manufacturer',
on_delete=models.PROTECT,