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
80cb3065
Commit
80cb3065
authored
2 years ago
by
JORGE SASIAIN
Browse files
Options
Downloads
Patches
Plain Diff
Make members field in each side of the trunk be a drop down list
parent
3d14476a
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!2
Develop patch
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitignore
+1
-0
1 addition, 0 deletions
.gitignore
README.md
+0
-1
0 additions, 1 deletion
README.md
geant_service_orchestrator/workflows/trunk_config_side/create_trunk_config_side.py
+20
-1
20 additions, 1 deletion
...r/workflows/trunk_config_side/create_trunk_config_side.py
with
21 additions
and
2 deletions
.gitignore
+
1
−
0
View file @
80cb3065
...
...
@@ -2,3 +2,4 @@ __pycache__/
*.egg-info
.coverage
coverage.xml
.tox/
This diff is collapsed.
Click to expand it.
README.md
+
0
−
1
View file @
80cb3065
...
...
@@ -65,7 +65,6 @@ Is process the same as subscription? If not, what’s the endpoint/way to create
## TODO
-
Fix flake8 errors for main.py products and workflows imports
-
The current input form for the members list in create_trunk_config_side is not apprpriate for a list
-
Integrate provision step (in CreateTrunkConfigSide) with IPAM/Infoblox
## Resources
...
...
This diff is collapsed.
Click to expand it.
geant_service_orchestrator/workflows/trunk_config_side/create_trunk_config_side.py
+
20
−
1
View file @
80cb3065
...
...
@@ -43,6 +43,25 @@ def trunk_config_selector() -> list:
)
def
member_selector
()
->
list
:
interfaces_dict
=
{
"
ge-0/0/1
"
:
"
ge-0/0/1
"
,
"
ge-0/0/2
"
:
"
ge-0/0/2
"
,
"
ge-0/0/3
"
:
"
ge-0/0/3
"
,
"
ge-0/0/4
"
:
"
ge-0/0/4
"
,
"
ge-0/0/5
"
:
"
ge-0/0/5
"
}
return
choice_list
(
Choice
(
"
Member Interfaces
"
,
zip
(
interfaces_dict
.
keys
(),
interfaces_dict
.
items
())),
# type:ignore
min_items
=
1
,
max_items
=
4
,
unique_items
=
True
,
)
def
initial_input_form_generator
(
product_name
:
str
)
->
FormGenerator
:
class
CreateTrunkConfigSideForm
(
FormPage
):
class
Config
:
...
...
@@ -53,7 +72,7 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
geant_a_sid
:
str
ipv4_address
:
Optional
[
str
]
ipv6_address
:
Optional
[
str
]
members
:
List
[
str
]
members
:
member_selector
()
# type:ignore
trunk_config_ids
:
trunk_config_selector
()
# type:ignore
user_input
=
yield
CreateTrunkConfigSideForm
...
...
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