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
85bf7928
Commit
85bf7928
authored
1 year ago
by
JORGE SASIAIN
Committed by
Neda Moeini
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
NAT-315
: Restore ISIS should be optional in migrate iptrunk
parent
1295b282
No related branches found
No related tags found
1 merge request
!108
NAT-315: Restore ISIS should be optional in migrate iptrunk
Pipeline
#84545
passed
1 year ago
Stage: tox
Stage: documentation
Stage: sonarqube
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
gso/translations/en-GB.json
+2
-1
2 additions, 1 deletion
gso/translations/en-GB.json
gso/workflows/iptrunk/migrate_iptrunk.py
+6
-3
6 additions, 3 deletions
gso/workflows/iptrunk/migrate_iptrunk.py
with
8 additions
and
4 deletions
gso/translations/en-GB.json
+
2
−
1
View file @
85bf7928
...
@@ -31,7 +31,8 @@
...
@@ -31,7 +31,8 @@
"iptrunk_sideB_ae_members_descriptions"
:
"Aggregated Ethernet member interface descriptions"
,
"iptrunk_sideB_ae_members_descriptions"
:
"Aggregated Ethernet member interface descriptions"
,
"migrate_to_different_site"
:
"Migrating to a different Site"
,
"migrate_to_different_site"
:
"Migrating to a different Site"
,
"remove_configuration"
:
"Remove configuration from the router"
,
"remove_configuration"
:
"Remove configuration from the router"
,
"clean_up_ipam"
:
"Clean up related entries in IPAM"
"clean_up_ipam"
:
"Clean up related entries in IPAM"
,
"restore_isis_metric"
:
"Restore ISIS metric to original value"
}
}
},
},
"workflow"
:
{
"workflow"
:
{
...
...
This diff is collapsed.
Click to expand it.
gso/workflows/iptrunk/migrate_iptrunk.py
+
6
−
3
View file @
85bf7928
...
@@ -10,7 +10,7 @@ from orchestrator.forms import FormPage
...
@@ -10,7 +10,7 @@ from orchestrator.forms import FormPage
from
orchestrator.forms.validators
import
Choice
,
Label
,
UniqueConstrainedList
from
orchestrator.forms.validators
import
Choice
,
Label
,
UniqueConstrainedList
from
orchestrator.targets
import
Target
from
orchestrator.targets
import
Target
from
orchestrator.types
import
FormGenerator
,
State
,
UUIDstr
from
orchestrator.types
import
FormGenerator
,
State
,
UUIDstr
from
orchestrator.workflow
import
StepList
,
done
,
init
,
inputstep
from
orchestrator.workflow
import
StepList
,
conditional
,
done
,
init
,
inputstep
from
orchestrator.workflows.steps
import
resync
,
store_process_subscription
,
unsync
from
orchestrator.workflows.steps
import
resync
,
store_process_subscription
,
unsync
from
orchestrator.workflows.utils
import
wrap_modify_initial_input_form
from
orchestrator.workflows.utils
import
wrap_modify_initial_input_form
from
pydantic
import
validator
from
pydantic
import
validator
...
@@ -61,6 +61,7 @@ def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:
...
@@ -61,6 +61,7 @@ def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:
replace_side
:
replaced_side_enum
# type: ignore[valid-type]
replace_side
:
replaced_side_enum
# type: ignore[valid-type]
warning_label
:
Label
=
"
Are we moving to a different Site?
"
# type: ignore[assignment]
warning_label
:
Label
=
"
Are we moving to a different Site?
"
# type: ignore[assignment]
migrate_to_different_site
:
bool
=
False
migrate_to_different_site
:
bool
=
False
restore_isis_metric
:
bool
=
True
migrate_form_input
=
yield
IPTrunkMigrateForm
migrate_form_input
=
yield
IPTrunkMigrateForm
...
@@ -505,6 +506,8 @@ def update_netbox(
...
@@ -505,6 +506,8 @@ def update_netbox(
target
=
Target
.
MODIFY
,
target
=
Target
.
MODIFY
,
)
)
def
migrate_iptrunk
()
->
StepList
:
def
migrate_iptrunk
()
->
StepList
:
should_restore_isis_metric
=
conditional
(
lambda
state
:
state
[
"
restore_isis_metric
"
])
return
(
return
(
init
init
>>
store_process_subscription
(
Target
.
MODIFY
)
>>
store_process_subscription
(
Target
.
MODIFY
)
...
@@ -517,8 +520,8 @@ def migrate_iptrunk() -> StepList:
...
@@ -517,8 +520,8 @@ def migrate_iptrunk() -> StepList:
>>
pp_interaction
(
deploy_new_config_real
)
>>
pp_interaction
(
deploy_new_config_real
)
>>
confirm_continue_move_fiber
>>
confirm_continue_move_fiber
>>
pp_interaction
(
deploy_new_isis
)
>>
pp_interaction
(
deploy_new_isis
)
>>
confirm_continue_restore_isis
>>
should_restore_isis_metric
(
confirm_continue_restore_isis
)
>>
pp_interaction
(
restore_isis_metric
)
>>
should_restore_isis_metric
(
pp_interaction
(
restore_isis_metric
)
)
>>
pp_interaction
(
delete_old_config_dry
)
>>
pp_interaction
(
delete_old_config_dry
)
>>
pp_interaction
(
delete_old_config_real
)
>>
pp_interaction
(
delete_old_config_real
)
>>
update_ipam
>>
update_ipam
...
...
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