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 #4336: Ensure interfaces without a channel/unit are ordered before a channel/unit of zero

Browse Source
This commit is contained in:
Jeremy Stretch
2020-03-10 10:03:42 -04:00
parent 0e49a7a1fd
commit bb3f37ca35
3 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-2.7.md
View File

@ -15,6 +15,7 @@
### Bug Fixes ### Bug Fixes
* [#4326](https://github.com/netbox-community/netbox/issues/4326) - Exclude Python modules without Script classes from scripts list * [#4326](https://github.com/netbox-community/netbox/issues/4326) - Exclude Python modules without Script classes from scripts list
* [#4336](https://github.com/netbox-community/netbox/issues/4336) - Ensure interfaces without a channel/unit are ordered before a channel/unit of zero
--- ---

3
netbox/utilities/ordering.py
View File

@ -75,7 +75,8 @@ def naturalize_interface(value, max_length):
if part is not None: if part is not None:
output += part.rjust(6, '0') output += part.rjust(6, '0')
else: else:
output += '000000' # Append a "null" signifier to ensure ordering before a zero value
output += '......'
# Finally, naturalize any remaining text and append it # Finally, naturalize any remaining text and append it
if match.group('remainder') is not None and len(output) < max_length: if match.group('remainder') is not None and len(output) < max_length:

34
netbox/utilities/tests/test_ordering.py
View File

@ -31,22 +31,28 @@ class NaturalizationTestCase(TestCase):
# Original, naturalized # Original, naturalized
data = ( data = (
# IOS/JunOS-style # IOS/JunOS-style
('Gi', '9999999999999999Gi000000000000000000'), ('Gi', '9999999999999999Gi..................'),
('Gi1', '9999999999999999Gi000001000000000000'), ('Gi1', '9999999999999999Gi000001............'),
('Gi1/2', '0001999999999999Gi000002000000000000'), ('Gi1.0', '9999999999999999Gi000001......000000'),
('Gi1/2/3', '0001000299999999Gi000003000000000000'), ('Gi1.1', '9999999999999999Gi000001......000001'),
('Gi1/2/3/4', '0001000200039999Gi000004000000000000'), ('Gi1:0', '9999999999999999Gi000001000000......'),
('Gi1/2/3/4/5', '0001000200030004Gi000005000000000000'), ('Gi1:0.0', '9999999999999999Gi000001000000000000'),
('Gi1/2/3/4/5:6', '0001000200030004Gi000005000006000000'), ('Gi1:0.1', '9999999999999999Gi000001000000000001'),
('Gi1:1', '9999999999999999Gi000001000001......'),
('Gi1:1.0', '9999999999999999Gi000001000001000000'),
('Gi1:1.1', '9999999999999999Gi000001000001000001'),
('Gi1/2', '0001999999999999Gi000002............'),
('Gi1/2/3', '0001000299999999Gi000003............'),
('Gi1/2/3/4', '0001000200039999Gi000004............'),
('Gi1/2/3/4/5', '0001000200030004Gi000005............'),
('Gi1/2/3/4/5:6', '0001000200030004Gi000005000006......'),
('Gi1/2/3/4/5:6.7', '0001000200030004Gi000005000006000007'), ('Gi1/2/3/4/5:6.7', '0001000200030004Gi000005000006000007'),
('Gi1:2', '9999999999999999Gi000001000002000000'),
('Gi1:2.3', '9999999999999999Gi000001000002000003'),
# Generic # Generic
('Interface 1', '9999999999999999Interface 000001000000000000'), ('Interface 1', '9999999999999999Interface 000001............'),
('Interface 1 (other)', '9999999999999999Interface 000001000000000000 (other)'), ('Interface 1 (other)', '9999999999999999Interface 000001............ (other)'),
('Interface 99', '9999999999999999Interface 000099000000000000'), ('Interface 99', '9999999999999999Interface 000099............'),
('PCIe1-p1', '9999999999999999PCIe000001000000000000-p00000001'), ('PCIe1-p1', '9999999999999999PCIe000001............-p00000001'),
('PCIe1-p99', '9999999999999999PCIe000001000000000000-p00000099'), ('PCIe1-p99', '9999999999999999PCIe000001............-p00000099'),
) )
for origin, naturalized in data: for origin, naturalized in data: