NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-18 05:28:16 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Updated naturalize_interface for '0, 0:0' types

Browse Source
This commit is contained in:
Pieter Lambrecht 2022-06-01 14:58:52 +02:00
parent e1fd723d54
commit 08d38574c0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
netbox/utilities/ordering.py
View File

@ -52,7 +52,8 @@ def naturalize_interface(value, max_length, integer_places=5, model_instance=Non
interface_type_weight_list = { interface_type_weight_list = {
r'^([fgstx]e|et|lt)-': '05', # Group juniper interfaces (https://www.juniper.net/documentation/us/en/software/junos/interfaces-fundamentals/topics/topic-map/router-interfaces-overview.html). Other Juniper interfaces will come after these and sorted alphabetically r'^([fgstx]e|et|lt)-': '05', # Group juniper interfaces (https://www.juniper.net/documentation/us/en/software/junos/interfaces-fundamentals/topics/topic-map/router-interfaces-overview.html). Other Juniper interfaces will come after these and sorted alphabetically
r'^ethernet': '10', # Group Arista Interfaces Ethernet1, Ethernet2, Ethernet49/1, Ethernet50/1 r'^ethernet': '10', # Group Arista Interfaces Ethernet1, Ethernet2, Ethernet49/1, Ethernet50/1
r'[' + ''.join(digit_separators) + ']+': '15', # Group Anything with a digit_separator r'[' + '\\'.join(digit_separators) + ']+': '15', # Group Anything with a digit_separator or subinterface_separators
r'^\d+\.?\d*$': '15', # Group Only digits together with digit_separator, including optional subinterface
r'eth': '20', # Group Anything with eth in the name r'eth': '20', # Group Anything with eth in the name
} }
@ -82,7 +83,7 @@ def naturalize_interface(value, max_length, integer_places=5, model_instance=Non
for part in parts: for part in parts:
if part.isdigit(): if part.isdigit():
output += part.rjust(integer_places, '0') # zero-pre-pad the port number. 'integer_places' digits must be at least 5, because subinterfaces can go to 65535. output += str(int(part) + 1).rjust(integer_places, '0') # zero-pre-pad the port number. 'integer_places' digits must be at least 5, because subinterfaces can go to 65535. Interface numbers are incremented with one to better sort the '0' interfaces (0:0.0; 0; 0.0)
elif part in subinterface_separators: # replace the subinterface separators with a 0 elif part in subinterface_separators: # replace the subinterface separators with a 0
output += '0' # this will group subinterfaces with the master interface, when there are interfaces with more /'s (ex: Eth1.1 and Eth1/1.5) output += '0' # this will group subinterfaces with the master interface, when there are interfaces with more /'s (ex: Eth1.1 and Eth1/1.5)
elif part in digit_separators: # standardize the digit separators to a 9. elif part in digit_separators: # standardize the digit separators to a 9.