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

Convert from assertions to conditionals and raise exception directly.

Browse Source
This commit is contained in:
Daniel Sheppard 2024-06-07 08:40:07 -05:00
parent 7c913fecb7
commit 7f486517cc
2 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
netbox/dcim/models/cables.py
View File

@ -237,10 +237,7 @@ class Cable(PrimaryModel):
if not termination.pk or termination not in b_terminations: if not termination.pk or termination not in b_terminations:
CableTermination(cable=self, cable_end='B', termination=termination).save() CableTermination(cable=self, cable_end='B', termination=termination).save()
try: trace_paths.send(Cable, instance=self, created=_created)
trace_paths.send(Cable, instance=self, created=_created)
except ValidationError as e:
raise ValidationError(f'{e}')
def get_status_color(self): def get_status_color(self):
return LinkStatusChoices.colors.get(self.status) return LinkStatusChoices.colors.get(self.status)
@ -534,10 +531,8 @@ class CablePath(models.Model):
return None return None
# Ensure all originating terminations are attached to the same link # Ensure all originating terminations are attached to the same link
if len(terminations) > 1: if len(terminations) > 1 and not all(t.link == terminations[0].link for t in terminations[1:]):
assert all(t.link == terminations[0].link for t in terminations[1:]), ( raise ValidationError(_("All originating terminations must start must be attached to the same link"))
_("All originating terminations must start must be attached to the same link")
)
path = [] path = []
position_stack = [] position_stack = []
@ -548,15 +543,13 @@ class CablePath(models.Model):
while terminations: while terminations:
# Terminations must all be of the same type # Terminations must all be of the same type
assert all(isinstance(t, type(terminations[0])) for t in terminations[1:]), ( if not all(isinstance(t, type(terminations[0])) for t in terminations[1:]):
_("All mid-span terminations must have the same termination type") raise ValidationError(_("All mid-span terminations must have the same termination type"))
)
# All mid-span terminations must all be attached to the same device # All mid-span terminations must all be attached to the same device
if not isinstance(terminations[0], PathEndpoint): if (not isinstance(terminations[0], PathEndpoint) and not
assert all(t.parent_object == terminations[0].parent_object for t in terminations[1:]), ( all(t.parent_object == terminations[0].parent_object for t in terminations[1:])):
_("All mid-span terminations must have the same parent object") raise ValidationError(_("All mid-span terminations must have the same parent object"))
)
# Check for a split path (e.g. rear port fanning out to multiple front ports with # Check for a split path (e.g. rear port fanning out to multiple front ports with
# different cables attached) # different cables attached)
@ -579,8 +572,10 @@ class CablePath(models.Model):
return None return None
# Otherwise, halt the trace if no link exists # Otherwise, halt the trace if no link exists
break break
assert all(type(link) in (Cable, WirelessLink) for link in links), _("All links must be cable or wireless") if not all(type(link) in (Cable, WirelessLink) for link in links):
assert all(isinstance(link, type(links[0])) for link in links), _("All links must match first link type") raise ValidationError(_("All links must be cable or wireless"))
if not all(isinstance(link, type(links[0])) for link in links):
raise ValidationError(_("All links must match first link type"))
# Step 3: Record asymmetric paths as split # Step 3: Record asymmetric paths as split
not_connected_terminations = [termination.link for termination in terminations if termination.link is None] not_connected_terminations = [termination.link for termination in terminations if termination.link is None]
@ -657,16 +652,18 @@ class CablePath(models.Model):
positions = position_stack.pop() positions = position_stack.pop()
# Ensure we have a number of positions equal to the amount of remote terminations # Ensure we have a number of positions equal to the amount of remote terminations
assert len(remote_terminations) == len(positions), ( if len(remote_terminations) != len(positions):
_("All positions counts within the path on opposite ends of links must match") raise ValidationError(
) _("All positions counts within the path on opposite ends of links must match")
)
# Get our front ports # Get our front ports
q_filter = Q() q_filter = Q()
for rt in remote_terminations: for rt in remote_terminations:
position = positions.pop() position = positions.pop()
q_filter |= Q(rear_port_id=rt.pk, rear_port_position=position) q_filter |= Q(rear_port_id=rt.pk, rear_port_position=position)
assert q_filter is not Q(), _("Remote termination query filter is empty, please open a bug report") if q_filter is Q():
raise ValidationError(_("Remote termination position filter is missing"))
front_ports = FrontPort.objects.filter(q_filter) front_ports = FrontPort.objects.filter(q_filter)
# Obtain the individual front ports based on the termination and position # Obtain the individual front ports based on the termination and position
elif position_stack: elif position_stack:

5
netbox/dcim/tests/test_cablepaths.py
View File

@ -1,3 +1,4 @@
from django.core.exceptions import ValidationError
from django.test import TestCase from django.test import TestCase
from circuits.models import * from circuits.models import *
@ -2261,7 +2262,7 @@ class CablePathTestCase(TestCase):
b_terminations=[frontport1, frontport3], b_terminations=[frontport1, frontport3],
label='C1' label='C1'
) )
with self.assertRaises(AssertionError): with self.assertRaises(ValidationError):
cable1.save() cable1.save()
self.assertPathDoesNotExist( self.assertPathDoesNotExist(
@ -2280,7 +2281,7 @@ class CablePathTestCase(TestCase):
label='C3' label='C3'
) )
with self.assertRaises(AssertionError): with self.assertRaises(ValidationError):
cable3.save() cable3.save()
self.assertPathDoesNotExist( self.assertPathDoesNotExist(