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
c21df0e3
Verified
Commit
c21df0e3
authored
1 year ago
by
Karel van Klink
Browse files
Options
Downloads
Patches
Plain Diff
add input step for radius insertion in create_router workflow
parent
23976c78
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!170
add input step that prompts for Sharepoint checklist creation
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
gso/workflows/router/create_router.py
+20
-0
20 additions, 0 deletions
gso/workflows/router/create_router.py
test/workflows/router/test_create_router.py
+2
-2
2 additions, 2 deletions
test/workflows/router/test_create_router.py
with
22 additions
and
2 deletions
gso/workflows/router/create_router.py
+
20
−
0
View file @
c21df0e3
...
...
@@ -203,6 +203,25 @@ def prompt_insert_in_ims() -> FormGenerator:
return
{}
@inputstep
(
"
Prompt RADIUS insertion
"
,
assignee
=
Assignee
.
SYSTEM
)
def
prompt_insert_in_radius
(
subscription
:
RouterInactive
)
->
FormGenerator
:
"""
Wait for confirmation from an operator that the router has been inserted in RADIUS.
"""
class
RadiusPrompt
(
FormPage
):
class
Config
:
title
=
"
Update RADIUS clients
"
info_label_1
:
Label
=
(
f
"
Please go to https://kratos.geant.org/add_radius_client and add the
{
subscription
.
router
.
router_fqdn
}
"
# type: ignore[assignment]
f
"
-
{
subscription
.
router
.
router_lo_ipv4_address
}
to radius authentication
"
)
info_label_2
:
Label
=
"
This will be functionally checked later during verification work.
"
# type: ignore[assignment]
yield
RadiusPrompt
return
{}
@workflow
(
"
Create router
"
,
initial_input_form
=
wrap_create_initial_input_form
(
initial_input_form_generator
),
...
...
@@ -231,6 +250,7 @@ def create_router() -> StepList:
>>
prompt_reboot_router
>>
prompt_console_login
>>
prompt_insert_in_ims
>>
prompt_insert_in_radius
>>
router_is_nokia
(
create_netbox_device
)
>>
pp_interaction
(
run_checks_after_base_config
)
>>
set_status
(
SubscriptionLifecycle
.
PROVISIONING
)
...
...
This diff is collapsed.
Click to expand it.
test/workflows/router/test_create_router.py
+
2
−
2
View file @
c21df0e3
...
...
@@ -87,8 +87,8 @@ def test_create_nokia_router_success(
for
_
in
range
(
2
):
result
,
step_log
=
assert_pp_interaction_success
(
result
,
process_stat
,
step_log
)
# Handle
three
consecutive user input steps
for
_
in
range
(
3
):
# Handle
four
consecutive user input steps
for
_
in
range
(
4
):
assert_suspended
(
result
)
result
,
step_log
=
resume_workflow
(
process_stat
,
step_log
,
input_data
=
USER_CONFIRM_EMPTY_FORM
)
...
...
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