diff --git a/gso/workflows/geant_ip/create_geant_ip.py b/gso/workflows/geant_ip/create_geant_ip.py index d3b660a9080f8174a7ae7def57bd9c0a53a65e2e..cc01eee1d73e69cb6747052e1cdfad24cae70475 100644 --- a/gso/workflows/geant_ip/create_geant_ip.py +++ b/gso/workflows/geant_ip/create_geant_ip.py @@ -11,13 +11,13 @@ from orchestrator.utils.errors import ProcessFailureError from orchestrator.workflow import StepList, begin, done, step, workflow from orchestrator.workflows.steps import resync, set_status, store_process_subscription from orchestrator.workflows.utils import wrap_create_initial_input_form -from products import EdgePort from pydantic import AfterValidator, BaseModel, ConfigDict, Field from pydantic_forms.validators import Divider, validate_unique_list from gso.products.product_blocks.bgp_session import BGPSession, IPFamily from gso.products.product_blocks.geant_ip import NRENAccessPortInactive from gso.products.product_blocks.service_binding_port import VLAN_ID, ServiceBindingPort +from gso.products.product_types.edge_port import EdgePort from gso.products.product_types.geant_ip import GeantIPInactive from gso.services.lso_client import execute_playbook, lso_interaction from gso.services.partners import get_partner_by_name @@ -37,7 +37,7 @@ def initial_input_form_generator(product_name: str) -> FormGenerator: model_config = ConfigDict(title=f"{product_name} - Select partner") tt_number: TTNumber - partner = partner_choice() + partner: partner_choice() initial_user_input = yield CreateGeantIPForm @@ -47,7 +47,7 @@ def initial_input_form_generator(product_name: str) -> FormGenerator: class EdgePortSelectionForm(FormPage): model_config = ConfigDict(title=f"{product_name} - Select Edge Ports") - info_label = Label("Please select the Edge Ports where this GÉANT IP service will terminate") + info_label: Label = "Please select the Edge Ports where this GÉANT IP service will terminate" edge_ports: list[EdgePortSelection] = Field(default_factory=list) @@ -72,8 +72,8 @@ def initial_input_form_generator(product_name: str) -> FormGenerator: model_config = ConfigDict( title=f"{product_name} - Configure Service Binding Ports ({current_ep_index + 1}/{total_ep_count})" ) - info_label = Label("Please configure the Service Binding Ports for each Edge Port.") - current_ep_label = Label(f'Currently configuring Edge Port: "{ep_list[current_ep_index]["description"]}"') + info_label: Label = "Please configure the Service Binding Ports for each Edge Port." + current_ep_label: Label = f'Currently configuring Edge Port: "{ep_list[current_ep_index]["description"]}"' geant_sid: str is_tagged: bool