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
b9a53439
Verified
Commit
b9a53439
authored
6 months ago
by
Karel van Klink
Browse files
Options
Downloads
Patches
Plain Diff
Fix incorrect Label usage
parent
a0ae14f5
No related branches found
No related tags found
1 merge request
!286
Add Edge Port, GÉANT IP and IAS products
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
gso/workflows/geant_ip/create_geant_ip.py
+5
-5
5 additions, 5 deletions
gso/workflows/geant_ip/create_geant_ip.py
with
5 additions
and
5 deletions
gso/workflows/geant_ip/create_geant_ip.py
+
5
−
5
View file @
b9a53439
...
...
@@ -11,13 +11,13 @@ from orchestrator.utils.errors import ProcessFailureError
from
orchestrator.workflow
import
StepList
,
begin
,
done
,
step
,
workflow
from
orchestrator.workflows.steps
import
resync
,
set_status
,
store_process_subscription
from
orchestrator.workflows.utils
import
wrap_create_initial_input_form
from
products
import
EdgePort
from
pydantic
import
AfterValidator
,
BaseModel
,
ConfigDict
,
Field
from
pydantic_forms.validators
import
Divider
,
validate_unique_list
from
gso.products.product_blocks.bgp_session
import
BGPSession
,
IPFamily
from
gso.products.product_blocks.geant_ip
import
NRENAccessPortInactive
from
gso.products.product_blocks.service_binding_port
import
VLAN_ID
,
ServiceBindingPort
from
gso.products.product_types.edge_port
import
EdgePort
from
gso.products.product_types.geant_ip
import
GeantIPInactive
from
gso.services.lso_client
import
execute_playbook
,
lso_interaction
from
gso.services.partners
import
get_partner_by_name
...
...
@@ -37,7 +37,7 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
model_config
=
ConfigDict
(
title
=
f
"
{
product_name
}
- Select partner
"
)
tt_number
:
TTNumber
partner
=
partner_choice
()
partner
:
partner_choice
()
initial_user_input
=
yield
CreateGeantIPForm
...
...
@@ -47,7 +47,7 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
class
EdgePortSelectionForm
(
FormPage
):
model_config
=
ConfigDict
(
title
=
f
"
{
product_name
}
- Select Edge Ports
"
)
info_label
=
Label
(
"
Please select the Edge Ports where this GÉANT IP service will terminate
"
)
info_label
:
Label
=
"
Please select the Edge Ports where this GÉANT IP service will terminate
"
edge_ports
:
list
[
EdgePortSelection
]
=
Field
(
default_factory
=
list
)
...
...
@@ -72,8 +72,8 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
model_config
=
ConfigDict
(
title
=
f
"
{
product_name
}
- Configure Service Binding Ports (
{
current_ep_index
+
1
}
/
{
total_ep_count
}
)
"
)
info_label
=
Label
(
"
Please configure the Service Binding Ports for each Edge Port.
"
)
current_ep_label
=
Label
(
f
'
Currently configuring Edge Port:
"
{
ep_list
[
current_ep_index
][
"
description
"
]
}
"'
)
info_label
:
Label
=
"
Please configure the Service Binding Ports for each Edge Port.
"
current_ep_label
:
Label
=
f
'
Currently configuring Edge Port:
"
{
ep_list
[
current_ep_index
][
"
description
"
]
}
"'
geant_sid
:
str
is_tagged
:
bool
...
...
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