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
!248
add geant_s_sid to the network api used by map
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
add geant_s_sid to the network api used by map
feature/add-sid-for-map
into
develop
Overview
0
Commits
1
Pipelines
2
Changes
1
Merged
Mohammad Torkashvand
requested to merge
feature/add-sid-for-map
into
develop
10 months ago
Overview
0
Commits
1
Pipelines
2
Changes
1
Expand
0
0
Merge request reports
Compare
develop
version 1
a28ba3a3
10 months ago
develop (base)
and
latest version
latest version
a4171775
1 commit,
10 months ago
version 1
a28ba3a3
1 commit,
10 months ago
1 file
+
2
−
0
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
gso/api/v1/network.py
+
2
−
0
Options
@@ -62,6 +62,7 @@ class IptrunkBlock(OrchestratorBaseModel):
iptrunk_capacity
:
str
iptrunk_isis_metric
:
int
iptrunk_sides
:
list
[
IptrunkSideBlock
]
geant_s_sid
:
str
class
IptrunkSchema
(
OrchestratorBaseModel
):
@@ -106,6 +107,7 @@ def network_topology() -> NetworkTopologyDomainModelSchema:
"
iptrunk_capacity
"
:
_calculate_iptrunk_capacity
(
extended_model
[
"
iptrunk
"
][
"
iptrunk_sides
"
],
extended_model
[
"
iptrunk
"
][
"
iptrunk_speed
"
]
),
"
geant_s_sid
"
:
extended_model
[
"
iptrunk
"
][
"
geant_s_sid
"
],
"
iptrunk_sides
"
:
[
{
"
subscription_instance_id
"
:
side
[
"
subscription_instance_id
"
],
Loading