From 854fe0dcbb6fa9a2e2765c2d279d7311f3fc8e35 Mon Sep 17 00:00:00 2001 From: Neda Moeini <neda.moeini@geant.org> Date: Tue, 20 Feb 2024 15:10:23 +0100 Subject: [PATCH] Made ruff happy. --- gso/products/product_blocks/router.py | 1 + gso/utils/helpers.py | 6 +++--- gso/workflows/iptrunk/create_iptrunk.py | 1 - test/workflows/router/test_create_router.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gso/products/product_blocks/router.py b/gso/products/product_blocks/router.py index 1905b865..04f1b91d 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 74050ef5..237d080e 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 ea2aef09..8a094e40 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 898823b7..1f54bba2 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, -- GitLab