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
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
2ea53a41
Commit
2ea53a41
authored
1 year ago
by
Neda Moeini
Browse files
Options
Downloads
Patches
Plain Diff
Display router FQDN in the IP trunk form.
parent
2b7ab966
No related branches found
No related tags found
1 merge request
!193
Enhancement/nat 515
Pipeline
#86132
passed
1 year ago
Stage: tox
Stage: documentation
Stage: sonarqube
Changes
1
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
gso/workflows/iptrunk/create_iptrunk.py
+4
-2
4 additions, 2 deletions
gso/workflows/iptrunk/create_iptrunk.py
with
4 additions
and
2 deletions
gso/workflows/iptrunk/create_iptrunk.py
+
4
−
2
View file @
2ea53a41
...
...
@@ -83,6 +83,7 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
user_input_router_side_a
=
yield
SelectRouterSideA
router_a
=
user_input_router_side_a
.
side_a_node_id
.
name
router_a_fqdn
=
Router
.
from_subscription
(
router_a
).
router
.
router_fqdn
class
JuniperAeMembers
(
UniqueConstrainedList
[
LAGMember
]):
min_items
=
initial_user_input
.
iptrunk_minimum_links
...
...
@@ -104,7 +105,7 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
class
CreateIptrunkSideAForm
(
FormPage
):
class
Config
:
title
=
"
Provide subscription details for side A of the trunk.
"
title
=
f
"
Provide subscription details for side A of the trunk.
(
{
router_a_fqdn
}
)
"
side_a_ae_iface
:
available_lags_choices
(
router_a
)
or
str
# type: ignore[valid-type]
side_a_ae_geant_a_sid
:
str
...
...
@@ -134,6 +135,7 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
user_input_router_side_b
=
yield
SelectRouterSideB
router_b
=
user_input_router_side_b
.
side_b_node_id
.
name
router_b_fqdn
=
Router
.
from_subscription
(
router_b
).
router
.
router_fqdn
if
get_router_vendor
(
router_b
)
==
Vendor
.
NOKIA
:
...
...
@@ -154,7 +156,7 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
class
CreateIptrunkSideBForm
(
FormPage
):
class
Config
:
title
=
"
Provide subscription details for side B of the trunk.
"
title
=
f
"
Provide subscription details for side B of the trunk.
(
{
router_b_fqdn
}
)
"
side_b_ae_iface
:
available_lags_choices
(
router_b
)
or
str
# type: ignore[valid-type]
side_b_ae_geant_a_sid
:
str
...
...
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