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
Commits
9d809dbd
Commit
9d809dbd
authored
4 weeks ago
by
Saket Agrahari
Browse files
Options
Downloads
Patches
Plain Diff
fix value set in iptrunk_config_version
parent
f04c36af
No related branches found
No related tags found
1 merge request
!425
Resolve #1048 "Service config backfilling"
Pipeline
#94459
failed
4 weeks ago
Stage: tox
Stage: documentation
Stage: sonarqube
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
gso/oss-params-example.json
+4
-4
4 additions, 4 deletions
gso/oss-params-example.json
gso/utils/helpers.py
+5
-8
5 additions, 8 deletions
gso/utils/helpers.py
with
9 additions
and
12 deletions
gso/oss-params-example.json
+
4
−
4
View file @
9d809dbd
...
@@ -134,15 +134,15 @@
...
@@ -134,15 +134,15 @@
"SERVICE_VERSIONS"
:
{
"SERVICE_VERSIONS"
:
{
"IP_TRUNK"
:
{
"IP_TRUNK"
:
{
"version"
:
{
"version"
:
{
"1.0"
:
"Base Version"
,
"1.0"
:
"
1.0 -
Base Version"
,
"
1.1
"
:
"Minor Upgrade"
"
2.0
"
:
"
2.0 -
Minor Upgrade"
},
},
"default_version"
:
"1.0"
"default_version"
:
"1.0"
},
},
"GEANT_IP"
:
{
"GEANT_IP"
:
{
"version"
:
{
"version"
:
{
"1.0"
:
"Base Version"
,
"1.0"
:
"
1.0 -
Base Version"
,
"2.0"
:
"
Maj
or Upgrade"
"2.0"
:
"
2.0 - Min
or Upgrade"
},
},
"default_version"
:
"1.0"
"default_version"
:
"1.0"
}
}
...
...
This diff is collapsed.
Click to expand it.
gso/utils/helpers.py
+
5
−
8
View file @
9d809dbd
...
@@ -283,17 +283,14 @@ def active_edge_port_selector(*, partner_id: UUIDstr | None = None) -> TypeAlias
...
@@ -283,17 +283,14 @@ def active_edge_port_selector(*, partner_id: UUIDstr | None = None) -> TypeAlias
)
)
def
ip_trunk_service_version_selector
()
->
TypeAlias
:
def
ip_trunk_service_version_selector
()
->
Choice
:
"""
Generate a dropdown selector for choosing a service version.
"""
"""
Generate a dropdown selector for choosing a service version.
"""
iptrunk_versions
=
load_oss_params
().
SERVICE_VERSIONS
.
IP_TRUNK
.
version
iptrunk_versions
=
load_oss_params
().
SERVICE_VERSIONS
.
IP_TRUNK
.
version
return
cast
(
return
Choice
(
"
Select an IP trunk service version.
"
,
type
[
Choice
],
zip
(
iptrunk_versions
.
keys
(),
Choice
.
__call__
(
iptrunk_versions
.
items
(),
"
Select an IP trunk service version.
"
,
strict
=
True
))
# type: ignore[arg-type]
[(
k
,
f
"
Version
{
k
}
-
{
iptrunk_versions
[
k
]
}
"
)
for
k
in
iptrunk_versions
],
),
)
def
partner_choice
()
->
Choice
:
def
partner_choice
()
->
Choice
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment