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
23d09e91
Commit
23d09e91
authored
1 year ago
by
Karel van Klink
Committed by
Simone Spinelli
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
Add translations for currently existing workflow forms
parent
c727a1da
No related branches found
Branches containing commit
No related tags found
Tags containing commit
3 merge requests
!35
Feature/nat178 modify capacity iptrunk
,
!34
Feature/nat178 modify capacity iptrunk
,
!33
Feature/nat178 modify capacity iptrunk
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
gso/translations/en-GB.json
+28
-2
28 additions, 2 deletions
gso/translations/en-GB.json
gso/workflows/device/create_device.py
+4
-8
4 additions, 8 deletions
gso/workflows/device/create_device.py
gso/workflows/iptrunk/create_iptrunk.py
+4
-2
4 additions, 2 deletions
gso/workflows/iptrunk/create_iptrunk.py
with
36 additions
and
12 deletions
gso/translations/en-GB.json
+
28
−
2
View file @
23d09e91
...
...
@@ -2,8 +2,34 @@
"forms"
:
{
"fields"
:
{
"confirm"
:
"Confirm"
,
"confirm_info"
:
"Please verify this form looks correct."
}
"confirm_info"
:
"Please verify this form looks correct."
,
"pp_run_results"
:
"Provisioning proxy results are not ready yet."
,
"site_bgp_community_id"
:
"Site BGP community ID"
,
"site_internal_id"
:
"Site internal ID"
,
"site_tier"
:
"Site tier"
,
"hostname"
:
"Hostname of the new device, only the part that comes before the first period"
,
"ts_address"
:
"IP address of the terminal server"
,
"ts_port"
:
"Port number of the terminal server"
,
"device_vendor"
:
"Device vendor"
,
"device_role"
:
"Device role"
,
"geant_s_sid"
:
"GÉANT S-SID"
,
"iptrunk_description"
:
"IPtrunk description"
,
"iptrunk_type"
:
"IPtrunk type"
,
"iptrunk_speed"
:
"Capacity per port (in Gbits/s)"
,
"iptrunk_minimum_links"
:
"Minimum amount of links"
,
"iptrunk_sideA_ae_iface"
:
"Aggregated Ethernet interface name"
,
"iptrunk_sideA_ae_geant_a_sid"
:
"GÉANT A-SID"
,
"iptrunk_sideA_ae_members"
:
"Aggregated Ethernet member interface names"
,
"iptrunk_sideA_ae_members_descriptions"
:
"Aggregated Ethernet member interface descriptions"
,
"iptrunk_sideB_ae_iface"
:
"Aggregated Ethernet interface name"
,
"iptrunk_sideB_ae_geant_a_sid"
:
"GÉANT A-SID"
,
"iptrunk_sideB_ae_members"
:
"Aggregated Ethernet member interface names"
,
"iptrunk_sideB_ae_members_descriptions"
:
"Aggregated Ethernet member interface descriptions"
}
},
"workflow"
:
{
"modify_generic"
:
"Modify Trunk interface"
,
...
...
This diff is collapsed.
Click to expand it.
gso/workflows/device/create_device.py
+
4
−
8
View file @
23d09e91
...
...
@@ -46,13 +46,9 @@ def site_selector() -> list:
site_subscriptions
[
str
(
site_id
)]
=
site_description
# noinspection PyTypeChecker
return
choice_list
(
Choice
(
"
site_selection
"
,
zip
(
site_subscriptions
.
keys
(),
site_subscriptions
.
items
()),
),
# type:ignore
min_items
=
1
,
max_items
=
1
,
return
Choice
(
"
Select a site
"
,
zip
(
site_subscriptions
.
keys
(),
site_subscriptions
.
items
()),
)
...
...
@@ -181,7 +177,7 @@ def provision_device_real(
return
{
"
subscription
"
:
subscription
,
"
label_text
"
:
(
"
Deployment of base config for
a new
"
"
Deployment of base config for a new
"
f
"
{
subscription
.
device_type
}
. Deployment is being
"
"
taken care of by the provisioning proxy, please
"
"
wait for the results to come back before
"
...
...
This diff is collapsed.
Click to expand it.
gso/workflows/iptrunk/create_iptrunk.py
+
4
−
2
View file @
23d09e91
...
...
@@ -60,7 +60,8 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
class
AeMembersListA
(
UniqueConstrainedList
[
str
]):
min_items
=
initial_user_input
.
iptrunk_minimum_links
DeviceEnumA
=
Choice
(
"
Device A
"
,
zip
(
devices
.
keys
(),
devices
.
items
()))
DeviceEnumA
=
Choice
(
"
Select a device
"
,
zip
(
devices
.
keys
(),
devices
.
items
()))
class
CreateIptrunkSideAForm
(
FormPage
):
class
Config
:
...
...
@@ -76,7 +77,8 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
# We remove the selected device for side A, to prevent any loops
devices
.
pop
(
str
(
user_input_side_a
.
iptrunk_sideA_node_id
.
name
))
DeviceEnumB
=
Choice
(
"
Device B
"
,
zip
(
devices
.
keys
(),
devices
.
items
()))
DeviceEnumB
=
Choice
(
"
Select a device
"
,
zip
(
devices
.
keys
(),
devices
.
items
()))
class
AeMembersListB
(
UniqueConstrainedList
[
str
]):
min_items
=
len
(
user_input_side_a
.
iptrunk_sideA_ae_members
)
...
...
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