starred/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-01-13 22:03:32 +01:00
Code Issues 273 Packages Projects Releases 10 Wiki Activity

[PR #17822] [MERGED] Closes #13428: Q-in-Q VLANs #15209

New Issue
Closed
opened 2025-12-30 00:20:37 +01:00 by adam · 0 comments
adam commented 2025-12-30 00:20:37 +01:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/netbox-community/netbox/pull/17822
Author: @jeremystretch
Created: 10/21/2024
Status: ✅ Merged
Merged: 10/31/2024
Merged by: @jeremystretch

Base: feature ← Head: 13428-qinq

📝 Commits (4)

📊 Changes

40 files changed (+492 additions, -70 deletions)

View changed files

📝 docs/models/dcim/interface.md (+4 -0)
📝 docs/models/ipam/vlan.md (+8 -0)
📝 docs/models/virtualization/vminterface.md (+4 -0)
📝 netbox/dcim/api/serializers_/device_components.py (+5 -4)
📝 netbox/dcim/choices.py (+2 -0)
📝 netbox/dcim/filtersets.py (+4 -2)
📝 netbox/dcim/forms/common.py (+2 -0)
📝 netbox/dcim/forms/model_forms.py (+16 -2)
📝 netbox/dcim/graphql/types.py (+1 -0)
➕ netbox/dcim/migrations/0196_qinq_svlan.py (+28 -0)
📝 netbox/dcim/models/device_components.py (+32 -15)
📝 netbox/dcim/tables/devices.py (+10 -6)
📝 netbox/dcim/tests/test_api.py (+6 -0)
📝 netbox/dcim/tests/test_filtersets.py (+25 -4)
📝 netbox/ipam/api/serializers_/nested.py (+8 -0)
📝 netbox/ipam/api/serializers_/vlans.py (+5 -2)
📝 netbox/ipam/choices.py (+11 -0)
📝 netbox/ipam/filtersets.py (+11 -0)
📝 netbox/ipam/forms/bulk_edit.py (+15 -1)
📝 netbox/ipam/forms/bulk_import.py (+17 -1)

...and 20 more files

📄 Description

Closes: #13428

  • Add Q-in-Q to InterfaceModeChoices
  • Move untagged_vlan & tagged_vlans model fields to BaseInterface
  • Add qinq_svlan field to BaseInterface
  • Add qinq_role & qinq_svlan fields to VLAN

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/netbox-community/netbox/pull/17822 **Author:** [@jeremystretch](https://github.com/jeremystretch) **Created:** 10/21/2024 **Status:** ✅ Merged **Merged:** 10/31/2024 **Merged by:** [@jeremystretch](https://github.com/jeremystretch) **Base:** `feature` ← **Head:** `13428-qinq` --- ### 📝 Commits (4) - [`f15c26e`](https://github.com/netbox-community/netbox/commit/f15c26eac6911bbb98fa19974d031c62ad460559) Initial work on #13428 (QinQ) - [`cf72b7c`](https://github.com/netbox-community/netbox/commit/cf72b7cb635f0a175d69fe996fb1b14a523267fc) Misc cleanup; add tests for Q-in-Q fields - [`0d3016f`](https://github.com/netbox-community/netbox/commit/0d3016f28703eb035887ff3c203a7a984abbf0a6) Address PR feedback - [`91a5118`](https://github.com/netbox-community/netbox/commit/91a51181b89d63a740347d5da7de09e18062508b) Merge branch 'feature' into 13428-qinq ### 📊 Changes **40 files changed** (+492 additions, -70 deletions) <details> <summary>View changed files</summary> 📝 `docs/models/dcim/interface.md` (+4 -0) 📝 `docs/models/ipam/vlan.md` (+8 -0) 📝 `docs/models/virtualization/vminterface.md` (+4 -0) 📝 `netbox/dcim/api/serializers_/device_components.py` (+5 -4) 📝 `netbox/dcim/choices.py` (+2 -0) 📝 `netbox/dcim/filtersets.py` (+4 -2) 📝 `netbox/dcim/forms/common.py` (+2 -0) 📝 `netbox/dcim/forms/model_forms.py` (+16 -2) 📝 `netbox/dcim/graphql/types.py` (+1 -0) ➕ `netbox/dcim/migrations/0196_qinq_svlan.py` (+28 -0) 📝 `netbox/dcim/models/device_components.py` (+32 -15) 📝 `netbox/dcim/tables/devices.py` (+10 -6) 📝 `netbox/dcim/tests/test_api.py` (+6 -0) 📝 `netbox/dcim/tests/test_filtersets.py` (+25 -4) 📝 `netbox/ipam/api/serializers_/nested.py` (+8 -0) 📝 `netbox/ipam/api/serializers_/vlans.py` (+5 -2) 📝 `netbox/ipam/choices.py` (+11 -0) 📝 `netbox/ipam/filtersets.py` (+11 -0) 📝 `netbox/ipam/forms/bulk_edit.py` (+15 -1) 📝 `netbox/ipam/forms/bulk_import.py` (+17 -1) _...and 20 more files_ </details> ### 📄 Description ### Closes: #13428 - Add Q-in-Q to InterfaceModeChoices - Move `untagged_vlan` & `tagged_vlans` model fields to BaseInterface - Add `qinq_svlan` field to BaseInterface - Add `qinq_role` & `qinq_svlan` fields to VLAN --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
adam added the pull-request label 2025-12-30 00:20:37 +01:00
adam closed this issue 2025-12-30 00:20:37 +01:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
beta
breaking change
complexity: high
complexity: low
complexity: medium
needs milestone
netbox
pending closure
plugin candidate
pull-request
Mirrored from GitHub Pull Request
 severity: high
severity: low
severity: medium
status: accepted
status: backlog
status: blocked
status: duplicate
status: needs owner
status: needs triage
status: revisions needed
status: under review
topic: GraphQL
topic: Internationalization
topic: OpenAPI
topic: UI/UX
topic: cabling
topic: event rules
topic: htmx navigation
topic: industrialization
topic: migrations
topic: plugins
topic: scripts
topic: templating
topic: testing
type: bug
type: deprecation
type: documentation
type: feature
type: housekeeping
type: translation
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
adam
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/netbox#15209
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?