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

Update connection status when tracing correctly for different port types

Browse Source
This commit is contained in:
Sander Steffann 2019-10-20 22:58:12 +02:00
parent a6d8f30f74
commit fb4d9a6c14
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
netbox/dcim/signals.py
View File

@ -3,7 +3,7 @@ from django.dispatch import receiver
from circuits.models import CircuitTermination from circuits.models import CircuitTermination
from dcim.constants import CONNECTION_STATUS_PLANNED, CONNECTION_STATUS_CONNECTED from dcim.constants import CONNECTION_STATUS_PLANNED, CONNECTION_STATUS_CONNECTED
from dcim.models import Interface from dcim.models import Interface, ConsoleServerPort, ConsolePort
from .models import Cable, Device, VirtualChassis from .models import Cable, Device, VirtualChassis
@ -93,8 +93,18 @@ def update_endpoints(endpoints, without_cable=None):
for item in sublist if item for item in sublist if item
][1:] ][1:]
if not endpoints or not isinstance(endpoints[-1], (Interface, CircuitTermination)): # This corresponds with the old model: interfaces and circuit terminations are considered "real endpoints"
# This corresponds with the old model: interfaces and circuit terminations are considered "real endpoints" if not endpoints:
# There really is no endpoint
endpoint.connection_status = None
elif isinstance(endpoint, Interface) and not isinstance(endpoints[-1], (Interface, CircuitTermination)):
# We only consider interfaces connected when the other end is an interface or circuit
endpoint.connection_status = None
elif isinstance(endpoint, ConsolePort) and not isinstance(endpoints[-1], ConsoleServerPort):
# We only consider console ports connected when the other end is a console server port
endpoint.connection_status = None
elif isinstance(endpoint, ConsoleServerPort) and not isinstance(endpoints[-1], ConsolePort):
# We only consider console server ports connected when the other end is a console port
endpoint.connection_status = None endpoint.connection_status = None
else: else:
endpoint.connection_status = CONNECTION_STATUS_CONNECTED if all([ endpoint.connection_status = CONNECTION_STATUS_CONNECTED if all([