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
!293
Update validate workflow WF_USABLE_MAP
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Update validate workflow WF_USABLE_MAP
feature/validate-provisioning-routers
into
develop
Overview
0
Commits
2
Pipelines
2
Changes
22
Merged
Karel van Klink
requested to merge
feature/validate-provisioning-routers
into
develop
6 months ago
Overview
0
Commits
2
Pipelines
2
Changes
22
Expand
Allow for router and IP trunk validation workflow to be run on those that are still provisioning
Only run validation workflows on the default state "ACTIVE", not all allowed states for a validation workflow to avoid validating provisioning routers
Edited
6 months ago
by
Karel van Klink
0
0
Merge request reports
Compare
develop
version 1
e7aedfdd
6 months ago
develop (base)
and
latest version
latest version
5a97c665
2 commits,
6 months ago
version 1
e7aedfdd
1 commit,
6 months ago
22 files
+
171
−
235
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
22
Search (e.g. *.vue) (Ctrl+P)
gso/schedules/validate_subscriptions.py
+
5
−
3
Options
@@ -2,7 +2,7 @@
import
structlog
from
orchestrator.services.processes
import
get_execution_context
from
orchestrator.services.subscriptions
import
TARGET_DEFAULT_USABLE_MAP
,
WF_USABLE_MAP
from
orchestrator.services.subscriptions
import
TARGET_DEFAULT_USABLE_MAP
from
orchestrator.targets
import
Target
from
gso.schedules.scheduling
import
CronScheduleConfig
,
scheduler
@@ -29,8 +29,10 @@ def validate_subscriptions() -> None:
validation_workflow
=
workflow
.
name
if
validation_workflow
:
default
=
TARGET_DEFAULT_USABLE_MAP
[
Target
.
SYSTEM
]
usable_when
=
WF_USABLE_MAP
.
get
(
validation_workflow
,
default
)
# Validation workflows only run on subscriptions that are active, even when they could be run on
# provisioning subscriptions. E.g. for routers, they can manually be validated when provisioning, but are
# not included in this schedule.
usable_when
=
TARGET_DEFAULT_USABLE_MAP
[
Target
.
SYSTEM
]
if
subscription
.
status
in
usable_when
:
json
=
[{
"
subscription_id
"
:
str
(
subscription
.
subscription_id
)}]
Loading