Skip to content

Fixes #19687 - Treat cellular interface type as not connectable #19691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 12, 2025
Merged

Fixes #19687 - Treat cellular interface type as not connectable #19691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
301b483
Add cellular interface types to WIRELESS_IFACE_TYPES const
Omripresent Jun 10, 2025
c3d2cfb
Add regression tag to cellular test
Omripresent Jun 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions netbox/dcim/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@
InterfaceTypeChoices.TYPE_802151,
InterfaceTypeChoices.TYPE_802154,
InterfaceTypeChoices.TYPE_OTHER_WIRELESS,
InterfaceTypeChoices.TYPE_GSM,
InterfaceTypeChoices.TYPE_CDMA,
InterfaceTypeChoices.TYPE_LTE,
InterfaceTypeChoices.TYPE_4G,
InterfaceTypeChoices.TYPE_5G,
]

NONCONNECTABLE_IFACE_TYPES = VIRTUAL_IFACE_TYPES + WIRELESS_IFACE_TYPES
Expand Down
13 changes: 13 additions & 0 deletions netbox/dcim/tests/test_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,6 +954,19 @@ def test_cable_cannot_terminate_to_a_wireless_interface(self):
with self.assertRaises(ValidationError):
cable.clean()

@tag('regression')
def test_cable_cannot_terminate_to_a_cellular_interface(self):
Copy link
Member

@jnovinger jnovinger Jun 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for adding the regression test!

Copy link
Member

@jnovinger jnovinger Jun 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Derp, meant to also ask ... can you add a 'regression' tag here, like so?

@tag('regression')
def test_cable_cannot_terminate_to_a_cellular_interface(self):
    ...

Copy link
Member

@jnovinger jnovinger Jun 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can import it like

from django.test import tag

Copy link
Contributor Author

@Omripresent Omripresent Jun 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My bad I misunderstood the comment on the issue. I'll add and update the PR.

Copy link
Member

@jnovinger jnovinger Jun 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It couldn't have helped that it took me three comments to say what I meant to say. 🤦

Thanks!

"""
A cable cannot terminate to a cellular interface
"""
device1 = Device.objects.get(name='TestDevice1')
interface2 = Interface.objects.get(device__name='TestDevice2', name='eth0')

cellular_interface = Interface(device=device1, name="W1", type=InterfaceTypeChoices.TYPE_LTE)
cable = Cable(a_terminations=[interface2], b_terminations=[cellular_interface])
with self.assertRaises(ValidationError):
cable.clean()


class VirtualDeviceContextTestCase(TestCase):

Expand Down