Enhance VLAN validation and payload #69
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Mark90
requested changes
Jan 7, 2026
workflows/l2vpn/create_l2vpn.py
Outdated
Comment on lines
113
to
118
| @step("Validate VLAN selection") | ||
| def validate_vlan_selection(ports: list[UUIDstr], vlan: VlanRanges) -> State: | ||
| info = SimpleNamespace(data={"ports": ports}) | ||
| validated_vlan = validate_vlan(vlan, info) | ||
| validate_vlan_not_in_use(validated_vlan, info, port_field_name="ports") | ||
| return {"ports": ports, "vlan": validated_vlan} |
Contributor
There was a problem hiding this comment.
What does this validation add on top of the same validation in the form generator?
Mark90
reviewed
Jan 12, 2026
workflows/l2vpn/create_l2vpn.py
Outdated
| if sap.port.ims_id is None: | ||
| raise ValueError("Port IMS id missing; cannot associate VLANs") | ||
| sap.ims_id = sap.port.ims_id | ||
| vlan_payloads += build_sap_vlans_payload(sap, subscription) |
Contributor
There was a problem hiding this comment.
For L2VPN the vlan groups should still be administered in IMS.
The "do not administrate VLAN group in Netbox, VLAN administration is only done in the orchestrator database" requirement only applies to NSISTP product/workflows (which is written above the summary, maybe that's the source of the confusion)
Mark90
reviewed
Jan 13, 2026
workflows/l2vpn/terminate_l2vpn.py
Outdated
Comment on lines
46
to
47
| if vlan.vid in target_vlans: | ||
| netbox.delete_vlan(id=vlan.id) |
Contributor
There was a problem hiding this comment.
Is this needed for a specific reason?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
resolves #64