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

Fixes #778: Refactored order_interfaces() to fix InterfaceTemplate ordering within a table

Browse Source
This commit is contained in:
Jeremy Stretch
2017-01-05 16:12:07 -05:00
parent dbf9840b26
commit ac72e90dcc
1 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
netbox/dcim/models.py
View File

@ -182,7 +182,7 @@ RPC_CLIENT_CHOICES = [
] ]
def order_interfaces(queryset, sql_col, primary_ordering=tuple()): def order_interfaces(queryset):
""" """
Attempt to match interface names by their slot/position identifiers and order according. Matching is done using the Attempt to match interface names by their slot/position identifiers and order according. Matching is done using the
following pattern: following pattern:
@ -190,8 +190,8 @@ def order_interfaces(queryset, sql_col, primary_ordering=tuple()):
{a}/{b}/{c}:{d} {a}/{b}/{c}:{d}
Interfaces are ordered first by field a, then b, then c, and finally d. Leading text (which typically indicates the Interfaces are ordered first by field a, then b, then c, and finally d. Leading text (which typically indicates the
interface's type) is ignored. If any fields are not contained by an interface name, those fields are treated as interface's type) is then used to order any duplicate slot/position tuples. If any fields are not contained by an
None. 'None' is ordered after all other values. For example: interface name, those fields are treated as null. Null values are ordered after all other values. For example:
et-0/0/0 et-0/0/0
et-0/0/1 et-0/0/1
@ -210,12 +210,9 @@ def order_interfaces(queryset, sql_col, primary_ordering=tuple()):
... ...
vlan1 vlan1
vlan10 vlan10
:param queryset: The base queryset to be ordered
:param sql_col: Table and name of the SQL column which contains the interface name (ex: ''dcim_interface.name')
:param primary_ordering: A tuple of fields which take ordering precedence before the interface name (optional)
""" """
ordering = primary_ordering + ('_id1', '_id2', '_id3', '_id4') sql_col = '{}.name'.format(queryset.model._meta.db_table)
ordering = ('_id1', '_id2', '_id3', '_id4', 'name')
return queryset.extra(select={ return queryset.extra(select={
'_id1': "CAST(SUBSTRING({} FROM '([0-9]+)\/[0-9]+\/[0-9]+(:[0-9]+)?$') AS integer)".format(sql_col), '_id1': "CAST(SUBSTRING({} FROM '([0-9]+)\/[0-9]+\/[0-9]+(:[0-9]+)?$') AS integer)".format(sql_col),
'_id2': "CAST(SUBSTRING({} FROM '([0-9]+)\/[0-9]+(:[0-9]+)?$') AS integer)".format(sql_col), '_id2': "CAST(SUBSTRING({} FROM '([0-9]+)\/[0-9]+(:[0-9]+)?$') AS integer)".format(sql_col),
@ -701,11 +698,17 @@ class PowerOutletTemplate(models.Model):
return self.name return self.name
class InterfaceTemplateManager(models.Manager): class InterfaceManager(models.Manager):
def get_queryset(self): def get_queryset(self):
qs = super(InterfaceTemplateManager, self).get_queryset() qs = super(InterfaceManager, self).get_queryset()
return order_interfaces(qs, 'dcim_interfacetemplate.name', ('device_type',)) return order_interfaces(qs)
def virtual(self):
return self.get_queryset().filter(form_factor=IFACE_FF_VIRTUAL)
def physical(self):
return self.get_queryset().exclude(form_factor=IFACE_FF_VIRTUAL)
class InterfaceTemplate(models.Model): class InterfaceTemplate(models.Model):
@ -717,7 +720,7 @@ class InterfaceTemplate(models.Model):
form_factor = models.PositiveSmallIntegerField(choices=IFACE_FF_CHOICES, default=IFACE_FF_10GE_SFP_PLUS) form_factor = models.PositiveSmallIntegerField(choices=IFACE_FF_CHOICES, default=IFACE_FF_10GE_SFP_PLUS)
mgmt_only = models.BooleanField(default=False, verbose_name='Management only') mgmt_only = models.BooleanField(default=False, verbose_name='Management only')
objects = InterfaceTemplateManager() objects = InterfaceManager()
class Meta: class Meta:
ordering = ['device_type', 'name'] ordering = ['device_type', 'name']
@ -1094,19 +1097,6 @@ class PowerOutlet(models.Model):
return self.device.get_absolute_url() return self.device.get_absolute_url()
class InterfaceManager(models.Manager):
def get_queryset(self):
qs = super(InterfaceManager, self).get_queryset()
return order_interfaces(qs, 'dcim_interface.name', ('device',))
def virtual(self):
return self.get_queryset().filter(form_factor=IFACE_FF_VIRTUAL)
def physical(self):
return self.get_queryset().exclude(form_factor=IFACE_FF_VIRTUAL)
class Interface(models.Model): class Interface(models.Model):
""" """
A physical data interface within a Device. An Interface can connect to exactly one other Interface via the creation A physical data interface within a Device. An Interface can connect to exactly one other Interface via the creation