NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-23 04:22:01 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Move __str__() to the abstract class

Browse Source
This commit is contained in:
Jonathan Senecal 2020-06-10 22:04:45 -04:00
parent 81d08ac50b
commit e3a8638471
2 changed files with 10 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,11 @@ class ComponentTemplateModel(models.Model):
class Meta: class Meta:
abstract = True abstract = True
def __str__(self):
if self.label:
return f"{self.name} ({self.label})"
return self.name
def instantiate(self, device): def instantiate(self, device):
""" """
Instantiate a new component on the specified Device. Instantiate a new component on the specified Device.
@ -84,11 +89,6 @@ class ConsolePortTemplate(ComponentTemplateModel):
ordering = ('device_type', '_name') ordering = ('device_type', '_name')
unique_together = ('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): def instantiate(self, device):
return ConsolePort( return ConsolePort(
device=device, device=device,
@ -129,11 +129,6 @@ class ConsoleServerPortTemplate(ComponentTemplateModel):
ordering = ('device_type', '_name') ordering = ('device_type', '_name')
unique_together = ('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): def instantiate(self, device):
return ConsoleServerPort( return ConsoleServerPort(
device=device, device=device,
@ -186,11 +181,6 @@ class PowerPortTemplate(ComponentTemplateModel):
ordering = ('device_type', '_name') ordering = ('device_type', '_name')
unique_together = ('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): def instantiate(self, device):
return PowerPort( return PowerPort(
device=device, device=device,
@ -246,11 +236,6 @@ class PowerOutletTemplate(ComponentTemplateModel):
ordering = ('device_type', '_name') ordering = ('device_type', '_name')
unique_together = ('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): def clean(self):
# Validate power port assignment # Validate power port assignment
@ -309,11 +294,6 @@ class InterfaceTemplate(ComponentTemplateModel):
ordering = ('device_type', '_name') ordering = ('device_type', '_name')
unique_together = ('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): def instantiate(self, device):
return Interface( return Interface(
device=device, device=device,

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

@ -44,6 +44,11 @@ class ComponentModel(models.Model):
class Meta: class Meta:
abstract = True abstract = True
def __str__(self):
if self.label:
return f"{self.name} ({self.label})"
return self.name
def to_objectchange(self, action): def to_objectchange(self, action):
# Annotate the parent Device/VM # Annotate the parent Device/VM
try: try:
@ -266,11 +271,6 @@ class ConsolePort(CableTermination, ComponentModel):
ordering = ('device', '_name') ordering = ('device', '_name')
unique_together = ('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): def get_absolute_url(self):
return self.device.get_absolute_url() return self.device.get_absolute_url()
@ -328,11 +328,6 @@ class ConsoleServerPort(CableTermination, ComponentModel):
ordering = ('device', '_name') ordering = ('device', '_name')
unique_together = ('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): def get_absolute_url(self):
return self.device.get_absolute_url() return self.device.get_absolute_url()
@ -416,11 +411,6 @@ class PowerPort(CableTermination, ComponentModel):
ordering = ('device', '_name') ordering = ('device', '_name')
unique_together = ('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): def get_absolute_url(self):
return self.device.get_absolute_url() return self.device.get_absolute_url()
@ -573,11 +563,6 @@ class PowerOutlet(CableTermination, ComponentModel):
ordering = ('device', '_name') ordering = ('device', '_name')
unique_together = ('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): def get_absolute_url(self):
return self.device.get_absolute_url() return self.device.get_absolute_url()
@ -718,11 +703,6 @@ class Interface(CableTermination, ComponentModel):
ordering = ('device', CollateAsChar('_name')) ordering = ('device', CollateAsChar('_name'))
unique_together = ('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): def get_absolute_url(self):
return reverse('dcim:interface', kwargs={'pk': self.pk}) return reverse('dcim:interface', kwargs={'pk': self.pk})