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
598f84f2
Verified
Commit
598f84f2
authored
7 months ago
by
Neda Moeini
Committed by
Karel van Klink
6 months ago
Browse files
Options
Downloads
Patches
Plain Diff
Improve patner workflows to use partner_choice method for list of partners.
parent
8f9fc89d
No related branches found
No related tags found
1 merge request
!286
Add Edge Port, GÉANT IP and IAS products
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
gso/workflows/tasks/delete_partners.py
+3
-8
3 additions, 8 deletions
gso/workflows/tasks/delete_partners.py
gso/workflows/tasks/modify_partners.py
+2
-8
2 additions, 8 deletions
gso/workflows/tasks/modify_partners.py
with
5 additions
and
16 deletions
gso/workflows/tasks/delete_partners.py
+
3
−
8
View file @
598f84f2
...
...
@@ -7,23 +7,18 @@ from orchestrator.targets import Target
from
orchestrator.types
import
FormGenerator
,
State
,
UUIDstr
from
orchestrator.workflow
import
StepList
,
begin
,
done
,
step
,
workflow
from
pydantic
import
ConfigDict
,
EmailStr
,
field_validator
from
pydantic_forms.validators
import
Choice
from
gso.services.partners
import
delete_partner
,
get_all_partners
,
get_partner_by_name
from
gso.services.partners
import
delete_partner
,
get_partner_by_name
from
gso.services.subscriptions
import
get_subscriptions
from
gso.utils.helpers
import
partner_choice
def
initial_input_form_generator
()
->
FormGenerator
:
"""
Gather input from the user needed for deleting a partner.
"""
partners
=
{}
for
partner
in
get_all_partners
():
partners
[
partner
[
"
partner_id
"
]]
=
partner
[
"
name
"
]
partner_choice
=
Choice
(
"
Select a partner
"
,
zip
(
partners
.
values
(),
partners
.
items
(),
strict
=
True
))
# type: ignore[arg-type]
class
SelectPartnerForm
(
FormPage
):
model_config
=
ConfigDict
(
title
=
"
Delete a Partner
"
)
partners
:
partner_choice
# type: ignore[valid-type]
partners
:
partner_choice
()
# type: ignore[valid-type]
@field_validator
(
"
partners
"
)
def
validate_partners
(
cls
,
value
:
Enum
)
->
Enum
:
...
...
This diff is collapsed.
Click to expand it.
gso/workflows/tasks/modify_partners.py
+
2
−
8
View file @
598f84f2
...
...
@@ -5,30 +5,24 @@ from orchestrator.targets import Target
from
orchestrator.types
import
FormGenerator
,
State
,
UUIDstr
from
orchestrator.workflow
import
StepList
,
begin
,
done
,
step
,
workflow
from
pydantic
import
ConfigDict
,
EmailStr
,
field_validator
from
pydantic_forms.validators
import
Choice
from
gso.services.partners
import
(
ModifiedPartnerSchema
,
edit_partner
,
filter_partners_by_email
,
filter_partners_by_name
,
get_all_partners
,
get_partner_by_name
,
)
from
gso.utils.helpers
import
partner_choice
def
initial_input_form_generator
()
->
FormGenerator
:
"""
Gather input from the user needed for modifying a partner.
"""
partners
=
{}
for
partner
in
get_all_partners
():
partners
[
partner
[
"
partner_id
"
]]
=
partner
[
"
name
"
]
partner_choice
=
Choice
(
"
Select a partner
"
,
zip
(
partners
.
values
(),
partners
.
items
(),
strict
=
True
))
# type: ignore[arg-type]
class
SelectPartnerForm
(
FormPage
):
model_config
=
ConfigDict
(
title
=
"
Choose a Partner
"
)
partners
:
partner_choice
# type: ignore[valid-type]
partners
:
partner_choice
()
# type: ignore[valid-type]
initial_user_input
=
yield
SelectPartnerForm
...
...
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