Skip to content

Commit 4c9cfc7

Browse files
committed
Fix multi-cable trace behavior
Logical direct links between the Interfaces should now be recalculated properly once intermediate passive devices are hidden.
1 parent e9fb154 commit 4c9cfc7

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

nextbox_ui_plugin/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class NextBoxUIConfig(PluginConfig):
44
name = 'nextbox_ui_plugin'
55
verbose_name = 'NextBox UI'
66
description = 'A topology visualization plugin for Netbox powered by NextUI Toolkit.'
7-
version = '0.6.8'
7+
version = '0.6.9'
88
author = 'Igor Korotchenkov'
99
author_email = 'iDebugAll@gmail.com'
1010
base_url = 'nextbox-ui'

nextbox_ui_plugin/views.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -303,11 +303,15 @@ def get_site_topology(site_id):
303303
"srcIfName": if_shortname(link.termination_a.name),
304304
"tgtIfName": if_shortname(link.termination_b.name)
305305
})
306-
if NETBOX_CURRENT_VERSION >= version.parse("2.10.1"):
307-
# Version 2.10.1 introduces some changes in cable trace behavior.
308-
if not isinstance(link.termination_a, Interface):
309-
continue
310-
trace_result = link.termination_a.trace()
306+
if not (isinstance(link.termination_a, Interface) or isinstance(link.termination_b, Interface)):
307+
# Skip trace if none of cable terminations is an Interface
308+
continue
309+
interface_side = None
310+
if isinstance(link.termination_a, Interface):
311+
interface_side = link.termination_a
312+
elif isinstance(link.termination_b, Interface):
313+
interface_side = link.termination_b
314+
trace_result = interface_side.trace()
311315
if not trace_result:
312316
continue
313317
if NETBOX_CURRENT_VERSION >= version.parse("2.10.1"):

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
setup(
99
name='nextbox_ui_plugin',
10-
version='0.6.8',
10+
version='0.6.9',
1111
url='https://github.com/iDebugAll/nextbox-ui-plugin',
12-
download_url='https://github.com/iDebugAll/nextbox-ui-plugin/archive/v0.6.8.tar.gz',
12+
download_url='https://github.com/iDebugAll/nextbox-ui-plugin/archive/v0.6.9.tar.gz',
1313
description='A topology visualization plugin for Netbox powered by NextUI Toolkit.',
1414
long_description=long_description,
1515
long_description_content_type='text/markdown',

0 commit comments

Comments
 (0)