diff --git a/gso/products/product_blocks/router.py b/gso/products/product_blocks/router.py index 1905b8652f3ad18c51a0433502ee11f7d10eef3f..04f1b91df6cecaaedcfbdd80dbf87592b26f7527 100644 --- a/gso/products/product_blocks/router.py +++ b/gso/products/product_blocks/router.py @@ -52,6 +52,7 @@ class RouterBlockProvisioning(RouterBlockInactive, lifecycle=[SubscriptionLifecy router_site: SiteBlockProvisioning vendor: Vendor + class RouterBlock(RouterBlockProvisioning, lifecycle=[SubscriptionLifecycle.ACTIVE]): """A router that's currently deployed in the network.""" diff --git a/gso/utils/helpers.py b/gso/utils/helpers.py index 74050ef545b768042115093cb19263dbb7831dd7..237d080e67facb6a4381223641613ca7e3f01225 100644 --- a/gso/utils/helpers.py +++ b/gso/utils/helpers.py @@ -55,9 +55,9 @@ def available_interfaces_choices(router_id: UUID, speed: str) -> Choice | None: def available_interfaces_choices_including_current_members( - router_id: UUID, - speed: str, - interfaces: list[IptrunkInterfaceBlock], + router_id: UUID, + speed: str, + interfaces: list[IptrunkInterfaceBlock], ) -> Choice | None: """Return a list of available interfaces for a given router and speed including the current members. diff --git a/gso/workflows/iptrunk/create_iptrunk.py b/gso/workflows/iptrunk/create_iptrunk.py index ea2aef09b013a4ed3148818584488b8d56b3d2bf..8a094e404e3f0b97b3a61a3c00961db320f1bee0 100644 --- a/gso/workflows/iptrunk/create_iptrunk.py +++ b/gso/workflows/iptrunk/create_iptrunk.py @@ -21,7 +21,6 @@ from gso.products.product_blocks.iptrunk import ( IptrunkType, PhyPortCapacity, ) - from gso.products.product_types.iptrunk import IptrunkInactive from gso.products.product_types.router import Router from gso.services import infoblox, subscriptions diff --git a/test/workflows/router/test_create_router.py b/test/workflows/router/test_create_router.py index 898823b79e84bb34200225c132f4319515999cf5..1f54bba29c148de31783a4ed9d906ab90eb57c48 100644 --- a/test/workflows/router/test_create_router.py +++ b/test/workflows/router/test_create_router.py @@ -7,8 +7,8 @@ from gso.products import ProductType, Site from gso.products.product_blocks.router import RouterRole from gso.products.product_types.router import Router from gso.services.subscriptions import get_product_id_by_name -from test import USER_CONFIRM_EMPTY_FORM from gso.utils.shared_choices import Vendor +from test import USER_CONFIRM_EMPTY_FORM from test.workflows import ( assert_complete, assert_pp_interaction_failure,