diff --git a/gso/products/__init__.py b/gso/products/__init__.py index 0ca82bfe7805d5a83d3aa9af96bcf54f26478cc9..f0f4872e4c48a61dbe469c81404e9e708d524402 100644 --- a/gso/products/__init__.py +++ b/gso/products/__init__.py @@ -1,8 +1,8 @@ """Module that updates the domain model of {term}`GSO`. Should contain all types of subscriptions.""" from orchestrator.domain import SUBSCRIPTION_MODEL_REGISTRY -from gso.products.product_types.router import Router from gso.products.product_types.iptrunk import Iptrunk +from gso.products.product_types.router import Router from gso.products.product_types.site import Site SUBSCRIPTION_MODEL_REGISTRY.update( diff --git a/gso/services/provisioning_proxy.py b/gso/services/provisioning_proxy.py index 390a5ff4db1d97545629ed29c6ecf955b08ae92b..c76900e109a93586f3c262322db734c32dfe7cae 100644 --- a/gso/services/provisioning_proxy.py +++ b/gso/services/provisioning_proxy.py @@ -18,8 +18,8 @@ from orchestrator.workflow import Step, StepList, abort from pydantic import validator from gso import settings -from gso.products.product_types.router import RouterProvisioning from gso.products.product_types.iptrunk import Iptrunk, IptrunkProvisioning +from gso.products.product_types.router import RouterProvisioning logger = logging.getLogger(__name__) """{class}`logging.Logger` instance.""" diff --git a/gso/workflows/iptrunk/create_iptrunk.py b/gso/workflows/iptrunk/create_iptrunk.py index f059b9ae35e2bd09b5d82359e3a6a1f31f288e04..0f25f16e97b175b30c887649e4513950e11466c8 100644 --- a/gso/workflows/iptrunk/create_iptrunk.py +++ b/gso/workflows/iptrunk/create_iptrunk.py @@ -9,8 +9,8 @@ from orchestrator.workflows.utils import wrap_create_initial_input_form from gso.products.product_blocks import PhyPortCapacity from gso.products.product_blocks.iptrunk import IptrunkType -from gso.products.product_types.router import Router from gso.products.product_types.iptrunk import IptrunkInactive, IptrunkProvisioning +from gso.products.product_types.router import Router from gso.services import ipam, provisioning_proxy from gso.services.provisioning_proxy import pp_interaction from gso.workflows.utils import customer_selector diff --git a/gso/workflows/router/terminate_router.py b/gso/workflows/router/terminate_router.py index 4901e8cc2c255cc48d807d8ca10bd997a54ea863..3276a8fb31f8ae053b25edfe137c55260b432885 100644 --- a/gso/workflows/router/terminate_router.py +++ b/gso/workflows/router/terminate_router.py @@ -17,7 +17,7 @@ logger = logging.getLogger(__name__) def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator: - subscription = Router.from_subscription(subscription_id) + Router.from_subscription(subscription_id) class TerminateForm(FormPage): termination_label: Label = (