Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
GÉANT Service Orchestrator
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GÉANT Orchestration and Automation Team
GAP
GÉANT Service Orchestrator
Merge requests
!247
Skip IP trunk validation for trunks that are Juniper on both sides
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Skip IP trunk validation for trunks that are Juniper on both sides
feature/fix-legacy-trunk-validation
into
develop
Overview
1
Commits
2
Pipelines
2
Changes
2
Merged
Karel van Klink
requested to merge
feature/fix-legacy-trunk-validation
into
develop
8 months ago
Overview
1
Commits
2
Pipelines
2
Changes
2
Expand
Also updated unit tests
0
0
Merge request reports
Compare
develop
version 1
c1a27d19
8 months ago
develop (base)
and
version 1
latest version
5b9b2ddb
2 commits,
8 months ago
version 1
c1a27d19
1 commit,
8 months ago
2 files
+
83
−
3
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
gso/workflows/iptrunk/validate_iptrunk.py
+
11
−
1
Options
@@ -5,7 +5,7 @@ import json
from
orchestrator.targets
import
Target
from
orchestrator.utils.errors
import
ProcessFailureError
from
orchestrator.utils.json
import
json_dumps
from
orchestrator.workflow
import
StepList
,
begin
,
done
,
step
,
workflow
from
orchestrator.workflow
import
StepList
,
begin
,
conditional
,
done
,
step
,
workflow
from
orchestrator.workflows.steps
import
resync
,
store_process_subscription
,
unsync
from
orchestrator.workflows.utils
import
wrap_modify_initial_input_form
@@ -192,10 +192,20 @@ def validate_iptrunk() -> StepList:
* Verify the configuration on both sides of the trunk is intact.
* Check the ISIS metric of the trunk.
* Verify that TWAMP configuration is correct.
If a trunk has a Juniper router on both sides, it is considered legacy and does not require validation.
"""
skip_legacy_trunks
=
conditional
(
lambda
state
:
all
(
side
.
iptrunk_side_node
.
vendor
==
Vendor
.
JUNIPER
for
side
in
Iptrunk
.
from_subscription
(
state
[
"
subscription_id
"
]).
iptrunk
.
iptrunk_sides
)
)
return
(
begin
>>
store_process_subscription
(
Target
.
SYSTEM
)
>>
skip_legacy_trunks
(
done
)
>>
unsync
>>
verify_ipam_records
>>
verify_netbox_entries
Loading