Skip to content
Snippets Groups Projects
Verified Commit a8851001 authored by Karel van Klink's avatar Karel van Klink :smiley_cat:
Browse files

reformat files

parent 6d265a95
No related branches found
No related tags found
1 merge request!44update workflows to make use of new provisioning proxy pattern with 3 retries
Pipeline #83667 passed
Stage: tox
Stage: documentation
Hide whitespace changes
Inline Side-by-side
gso/services/provisioning_proxy.py
+ 4
− 3
View file @ a8851001
......@@ -7,7 +7,7 @@ import logging
from typing import NoReturn
import requests
from orchestrator import inputstep, conditional, step
from orchestrator import conditional, inputstep, step
from orchestrator.config.assignee import Assignee
from orchestrator.domain import SubscriptionModel
from orchestrator.forms import FormPage, ReadOnlyField
......@@ -183,8 +183,9 @@ def confirm_pp_results(state: State) -> FormGenerator:
run_status: str = ReadOnlyField(state["pp_run_results"]["status"])
run_results: LongText = ReadOnlyField(f"{state['pp_run_results']['output']}")
if not successful_run:
pp_retry_label: Label = "Provisioning Proxy has failed execution, the playbook will be retried " \
"(up to two times)."
pp_retry_label: Label = (
"Provisioning Proxy playbook execution failed, it will be retried (up to two times)." # type: ignore
)
confirm: Accept = Accept("INCOMPLETE")
yield ConfirmRunPage
......
gso/workflows/device/create_device.py
+ 4
− 4
View file @ a8851001
......@@ -18,7 +18,7 @@ from gso.products.product_types import device
from gso.products.product_types.device import DeviceInactive, DeviceProvisioning
from gso.products.product_types.site import Site
from gso.services import _ipam, provisioning_proxy
from gso.services.provisioning_proxy import reset_pp_success_state, pp_interaction
from gso.services.provisioning_proxy import pp_interaction, reset_pp_success_state
def site_selector() -> Choice:
......@@ -165,17 +165,17 @@ def create_device() -> StepList:
>> store_process_subscription(Target.CREATE)
>> initialize_subscription
>> get_info_from_ipam
#
>> reset_pp_success_state
>> pp_interaction(provision_device_dry)
>> pp_interaction(provision_device_dry)
>> pp_interaction(provision_device_dry)
#
>> reset_pp_success_state
>> pp_interaction(provision_device_real)
>> pp_interaction(provision_device_real)
>> pp_interaction(provision_device_real)
#
>> set_status(SubscriptionLifecycle.ACTIVE)
>> resync
>> done
......
gso/workflows/iptrunk/create_iptrunk.py
+ 10
− 10
View file @ a8851001
......@@ -14,7 +14,7 @@ from gso.products.product_blocks.iptrunk import IptrunkType
from gso.products.product_types.device import Device
from gso.products.product_types.iptrunk import IptrunkInactive, IptrunkProvisioning
from gso.services import _ipam, provisioning_proxy
from gso.services.provisioning_proxy import await_pp_results, confirm_pp_results, pp_interaction, reset_pp_success_state
from gso.services.provisioning_proxy import pp_interaction, reset_pp_success_state
def initial_input_form_generator(product_name: str) -> FormGenerator:
......@@ -245,47 +245,47 @@ def create_iptrunk() -> StepList:
>> store_process_subscription(Target.CREATE)
>> initialize_subscription
>> get_info_from_ipam
>> reset_pp_success_state
#
>> pp_interaction(provision_ip_trunk_iface_dry)
>> pp_interaction(provision_ip_trunk_iface_dry)
>> pp_interaction(provision_ip_trunk_iface_dry)
#
>> reset_pp_success_state
>> pp_interaction(provision_ip_trunk_iface_real)
>> pp_interaction(provision_ip_trunk_iface_real)
>> pp_interaction(provision_ip_trunk_iface_real)
#
>> reset_pp_success_state
>> pp_interaction(provision_ip_trunk_isis_iface_dry)
>> pp_interaction(provision_ip_trunk_isis_iface_dry)
>> pp_interaction(provision_ip_trunk_isis_iface_dry)
#
>> reset_pp_success_state
>> pp_interaction(provision_ip_trunk_isis_iface_real)
>> pp_interaction(provision_ip_trunk_isis_iface_real)
>> pp_interaction(provision_ip_trunk_isis_iface_real)
#
>> reset_pp_success_state
>> pp_interaction(provision_ip_trunk_ldp_iface_dry)
>> pp_interaction(provision_ip_trunk_ldp_iface_dry)
>> pp_interaction(provision_ip_trunk_ldp_iface_dry)
#
>> reset_pp_success_state
>> pp_interaction(provision_ip_trunk_ldp_iface_real)
>> pp_interaction(provision_ip_trunk_ldp_iface_real)
>> pp_interaction(provision_ip_trunk_ldp_iface_real)
#
>> reset_pp_success_state
>> pp_interaction(provision_ip_trunk_lldp_iface_dry)
>> pp_interaction(provision_ip_trunk_lldp_iface_dry)
>> pp_interaction(provision_ip_trunk_lldp_iface_dry)
#
>> reset_pp_success_state
>> pp_interaction(provision_ip_trunk_lldp_iface_real)
>> pp_interaction(provision_ip_trunk_lldp_iface_real)
>> pp_interaction(provision_ip_trunk_lldp_iface_real)
#
>> set_status(SubscriptionLifecycle.ACTIVE)
>> resync
>> done
......
gso/workflows/iptrunk/modify_generic.py
+ 6
− 6
View file @ a8851001
......@@ -12,7 +12,7 @@ from gso.products.product_blocks import PhyPortCapacity
from gso.products.product_blocks.iptrunk import IptrunkType
from gso.products.product_types.iptrunk import Iptrunk
from gso.services import provisioning_proxy
from gso.services.provisioning_proxy import await_pp_results, confirm_pp_results, reset_pp_success_state, pp_interaction
from gso.services.provisioning_proxy import pp_interaction, reset_pp_success_state
def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:
......@@ -153,27 +153,27 @@ def modify_generic() -> StepList:
>> store_process_subscription(Target.MODIFY)
>> unsync
>> modify_iptrunk_subscription
#
>> reset_pp_success_state
>> pp_interaction(provision_ip_trunk_iface_dry)
>> pp_interaction(provision_ip_trunk_iface_dry)
>> pp_interaction(provision_ip_trunk_iface_dry)
#
>> reset_pp_success_state
>> pp_interaction(provision_ip_trunk_iface_real)
>> pp_interaction(provision_ip_trunk_iface_real)
>> pp_interaction(provision_ip_trunk_iface_real)
#
>> reset_pp_success_state
>> pp_interaction(provision_ip_trunk_lldp_iface_dry)
>> pp_interaction(provision_ip_trunk_lldp_iface_dry)
>> pp_interaction(provision_ip_trunk_lldp_iface_dry)
#
>> reset_pp_success_state
>> pp_interaction(provision_ip_trunk_lldp_iface_real)
>> pp_interaction(provision_ip_trunk_lldp_iface_real)
>> pp_interaction(provision_ip_trunk_lldp_iface_real)
#
>> resync
>> done
)
gso/workflows/iptrunk/modify_isis_metric.py
+ 4
− 4
View file @ a8851001
......@@ -7,7 +7,7 @@ from orchestrator.workflows.utils import wrap_modify_initial_input_form
from gso.products.product_types.iptrunk import Iptrunk
from gso.services import provisioning_proxy
from gso.services.provisioning_proxy import await_pp_results, confirm_pp_results, pp_interaction, reset_pp_success_state
from gso.services.provisioning_proxy import pp_interaction, reset_pp_success_state
def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:
......@@ -71,17 +71,17 @@ def modify_isis_metric() -> StepList:
>> store_process_subscription(Target.MODIFY)
>> unsync
>> modify_iptrunk_subscription
#
>> reset_pp_success_state
>> pp_interaction(provision_ip_trunk_isis_iface_dry)
>> pp_interaction(provision_ip_trunk_isis_iface_dry)
>> pp_interaction(provision_ip_trunk_isis_iface_dry)
#
>> reset_pp_success_state
>> pp_interaction(provision_ip_trunk_isis_iface_real)
>> pp_interaction(provision_ip_trunk_isis_iface_real)
>> pp_interaction(provision_ip_trunk_isis_iface_real)
#
>> resync
>> done
)
gso/workflows/iptrunk/terminate_iptrunk.py
+ 5
− 5
View file @ a8851001
......@@ -12,7 +12,7 @@ from orchestrator.workflows.utils import wrap_modify_initial_input_form
from gso.products.product_types.iptrunk import Iptrunk
from gso.services import ipam, provisioning_proxy
from gso.services.ipam import V4ServiceNetwork, V6ServiceNetwork
from gso.services.provisioning_proxy import await_pp_results, confirm_pp_results, pp_interaction, reset_pp_success_state
from gso.services.provisioning_proxy import pp_interaction, reset_pp_success_state
def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:
......@@ -92,22 +92,22 @@ def terminate_iptrunk() -> StepList:
>> store_process_subscription(Target.TERMINATE)
>> unsync
>> modify_iptrunk_subscription
#
>> reset_pp_success_state
>> pp_interaction(drain_traffic_from_ip_trunk)
>> pp_interaction(drain_traffic_from_ip_trunk)
>> pp_interaction(drain_traffic_from_ip_trunk)
#
>> reset_pp_success_state
>> pp_interaction(deprovision_ip_trunk_dry)
>> pp_interaction(deprovision_ip_trunk_dry)
>> pp_interaction(deprovision_ip_trunk_dry)
#
>> reset_pp_success_state
>> pp_interaction(deprovision_ip_trunk_real)
>> pp_interaction(deprovision_ip_trunk_real)
>> pp_interaction(deprovision_ip_trunk_real)
#
>> deprovision_ip_trunk_ipv4
>> deprovision_ip_trunk_ipv6
>> set_status(SubscriptionLifecycle.TERMINATED)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment