diff --git a/netbox/dcim/models/device_component_templates.py b/netbox/dcim/models/device_component_templates.py index 3530d77de..53080d8f6 100644 --- a/netbox/dcim/models/device_component_templates.py +++ b/netbox/dcim/models/device_component_templates.py @@ -30,6 +30,11 @@ class ComponentTemplateModel(models.Model): class Meta: abstract = True + def __str__(self): + if self.label: + return f"{self.name} ({self.label})" + return self.name + def instantiate(self, device): """ Instantiate a new component on the specified Device. @@ -84,11 +89,6 @@ class ConsolePortTemplate(ComponentTemplateModel): ordering = ('device_type', '_name') unique_together = ('device_type', 'name') - def __str__(self): - if self.label: - return f"{self.name} ({self.label})" - return self.name - def instantiate(self, device): return ConsolePort( device=device, @@ -129,11 +129,6 @@ class ConsoleServerPortTemplate(ComponentTemplateModel): ordering = ('device_type', '_name') unique_together = ('device_type', 'name') - def __str__(self): - if self.label: - return f"{self.name} ({self.label})" - return self.name - def instantiate(self, device): return ConsoleServerPort( device=device, @@ -186,11 +181,6 @@ class PowerPortTemplate(ComponentTemplateModel): ordering = ('device_type', '_name') unique_together = ('device_type', 'name') - def __str__(self): - if self.label: - return f"{self.name} ({self.label})" - return self.name - def instantiate(self, device): return PowerPort( device=device, @@ -246,11 +236,6 @@ class PowerOutletTemplate(ComponentTemplateModel): ordering = ('device_type', '_name') unique_together = ('device_type', 'name') - def __str__(self): - if self.label: - return f"{self.name} ({self.label})" - return self.name - def clean(self): # Validate power port assignment @@ -309,11 +294,6 @@ class InterfaceTemplate(ComponentTemplateModel): ordering = ('device_type', '_name') unique_together = ('device_type', 'name') - def __str__(self): - if self.label: - return f"{self.name} ({self.label})" - return self.name - def instantiate(self, device): return Interface( device=device, diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py index 5a79519a2..022b2733d 100644 --- a/netbox/dcim/models/device_components.py +++ b/netbox/dcim/models/device_components.py @@ -44,6 +44,11 @@ class ComponentModel(models.Model): class Meta: abstract = True + def __str__(self): + if self.label: + return f"{self.name} ({self.label})" + return self.name + def to_objectchange(self, action): # Annotate the parent Device/VM try: @@ -266,11 +271,6 @@ class ConsolePort(CableTermination, ComponentModel): ordering = ('device', '_name') unique_together = ('device', 'name') - def __str__(self): - if self.label: - return f"{self.name} ({self.label})" - return self.name - def get_absolute_url(self): return self.device.get_absolute_url() @@ -328,11 +328,6 @@ class ConsoleServerPort(CableTermination, ComponentModel): ordering = ('device', '_name') unique_together = ('device', 'name') - def __str__(self): - if self.label: - return f"{self.name} ({self.label})" - return self.name - def get_absolute_url(self): return self.device.get_absolute_url() @@ -416,11 +411,6 @@ class PowerPort(CableTermination, ComponentModel): ordering = ('device', '_name') unique_together = ('device', 'name') - def __str__(self): - if self.label: - return f"{self.name} ({self.label})" - return self.name - def get_absolute_url(self): return self.device.get_absolute_url() @@ -573,11 +563,6 @@ class PowerOutlet(CableTermination, ComponentModel): ordering = ('device', '_name') unique_together = ('device', 'name') - def __str__(self): - if self.label: - return f"{self.name} ({self.label})" - return self.name - def get_absolute_url(self): return self.device.get_absolute_url() @@ -718,11 +703,6 @@ class Interface(CableTermination, ComponentModel): ordering = ('device', CollateAsChar('_name')) unique_together = ('device', 'name') - def __str__(self): - if self.label: - return f"{self.name} ({self.label})" - return self.name - def get_absolute_url(self): return reverse('dcim:interface', kwargs={'pk': self.pk})