From a885100134288b78c0fc99f4a6a8bafdbc6dd23d Mon Sep 17 00:00:00 2001
From: Karel van Klink <karel.vanklink@geant.org>
Date: Tue, 11 Jul 2023 13:22:15 +0200
Subject: [PATCH] reformat files
---
gso/services/provisioning_proxy.py | 7 ++++---
gso/workflows/device/create_device.py | 8 ++++----
gso/workflows/iptrunk/create_iptrunk.py | 20 ++++++++++----------
gso/workflows/iptrunk/modify_generic.py | 12 ++++++------
gso/workflows/iptrunk/modify_isis_metric.py | 8 ++++----
gso/workflows/iptrunk/terminate_iptrunk.py | 10 +++++-----
6 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/gso/services/provisioning_proxy.py b/gso/services/provisioning_proxy.py
index d22b3e33..479e1809 100644
--- a/gso/services/provisioning_proxy.py
+++ b/gso/services/provisioning_proxy.py
@@ -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
diff --git a/gso/workflows/device/create_device.py b/gso/workflows/device/create_device.py
index 1a3bb302..a06ee8cf 100644
--- a/gso/workflows/device/create_device.py
+++ b/gso/workflows/device/create_device.py
@@ -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
diff --git a/gso/workflows/iptrunk/create_iptrunk.py b/gso/workflows/iptrunk/create_iptrunk.py
index f6602afd..3b1e4231 100644
--- a/gso/workflows/iptrunk/create_iptrunk.py
+++ b/gso/workflows/iptrunk/create_iptrunk.py
@@ -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
diff --git a/gso/workflows/iptrunk/modify_generic.py b/gso/workflows/iptrunk/modify_generic.py
index 93400bca..f0439a9e 100644
--- a/gso/workflows/iptrunk/modify_generic.py
+++ b/gso/workflows/iptrunk/modify_generic.py
@@ -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
)
diff --git a/gso/workflows/iptrunk/modify_isis_metric.py b/gso/workflows/iptrunk/modify_isis_metric.py
index afe00796..21af4c57 100644
--- a/gso/workflows/iptrunk/modify_isis_metric.py
+++ b/gso/workflows/iptrunk/modify_isis_metric.py
@@ -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
)
diff --git a/gso/workflows/iptrunk/terminate_iptrunk.py b/gso/workflows/iptrunk/terminate_iptrunk.py
index dd6728df..2436c8e8 100644
--- a/gso/workflows/iptrunk/terminate_iptrunk.py
+++ b/gso/workflows/iptrunk/terminate_iptrunk.py
@@ -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)
--
GitLab