From b4ab4186efd96bb13bd078a805f5ba6c7b5717d7 Mon Sep 17 00:00:00 2001
From: Neda Moeini <neda.moeini@geant.org>
Date: Fri, 8 Nov 2024 11:16:46 +0100
Subject: [PATCH] Make Ruff happy
---
.../l2_circuit/create_layer_2_circuit.py | 2 +-
test/fixtures/__init__.py | 2 +-
test/fixtures/layer_2_circuit_fixtures.py | 39 ++++++++++---------
.../l2_circuit/test_modify_layer_2_circuit.py | 24 ++++++------
4 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/gso/workflows/l2_circuit/create_layer_2_circuit.py b/gso/workflows/l2_circuit/create_layer_2_circuit.py
index 723c5c37..a3199bc1 100644
--- a/gso/workflows/l2_circuit/create_layer_2_circuit.py
+++ b/gso/workflows/l2_circuit/create_layer_2_circuit.py
@@ -48,7 +48,7 @@ def initial_input_generator(product_name: str) -> FormGenerator:
)
vlan_id: VLAN_ID
- def _vlan_range_field(*, is_tagged: bool) -> VLAN_ID | int:
+ def _vlan_range_field(*, is_tagged: bool) -> VLAN_ID:
"""Return the appropriate field type based on whether the circuit is tagged."""
return VLAN_ID if is_tagged else ReadOnlyField(None, default_type=int)
diff --git a/test/fixtures/__init__.py b/test/fixtures/__init__.py
index 1fa5c4cf..d2582b5b 100644
--- a/test/fixtures/__init__.py
+++ b/test/fixtures/__init__.py
@@ -21,6 +21,7 @@ __all__ = [
"iptrunk_side_subscription_factory",
"iptrunk_subscription_factory",
"lan_switch_interconnect_subscription_factory",
+ "layer_2_circuit_subscription_factory",
"nren_access_port_factory",
"nren_l3_core_service_subscription_factory",
"office_router_subscription_factory",
@@ -30,5 +31,4 @@ __all__ = [
"site_subscription_factory",
"super_pop_switch_subscription_factory",
"switch_subscription_factory",
- "layer_2_circuit_subscription_factory",
]
diff --git a/test/fixtures/layer_2_circuit_fixtures.py b/test/fixtures/layer_2_circuit_fixtures.py
index b0e73227..522b2b17 100644
--- a/test/fixtures/layer_2_circuit_fixtures.py
+++ b/test/fixtures/layer_2_circuit_fixtures.py
@@ -5,7 +5,7 @@ from orchestrator.db import db
from orchestrator.domain import SubscriptionModel
from orchestrator.types import SubscriptionLifecycle, UUIDstr
-from gso.products import ProductName, EdgePort
+from gso.products import EdgePort, ProductName
from gso.products.product_blocks.layer_2_circuit import Layer2CircuitSideBlockInactive, Layer2CircuitType
from gso.products.product_blocks.service_binding_port import ServiceBindingPortInactive
from gso.products.product_types.layer_2_circuit import (
@@ -23,24 +23,23 @@ from gso.utils.types.virtual_identifiers import VLAN_ID
@pytest.fixture()
def layer_2_circuit_subscription_factory(faker, geant_partner, edge_port_subscription_factory):
def create_subscription(
- description: str | None = None,
- partner: dict | None = None,
- status: SubscriptionLifecycle | None = None,
- start_date: str | None = "2024-01-01T10:20:30+01:02",
- layer_2_circuit_service_type: Layer2CircuitServiceType | None = None,
- layer_2_circuit_type: Layer2CircuitType = Layer2CircuitType.TAGGED,
- vlan_range_lower_bound: VLAN_ID | None = None,
- vlan_range_upper_bound: VLAN_ID | None = None,
- policer_bandwidth: BandwidthString | None = None,
- layer_2_circuit_side_a_edgeport: UUIDstr | None = None,
- vlan_id_side_a: VLAN_ID | None = None,
- layer_2_circuit_side_b_edgeport: UUIDstr | None = None,
- vlan_id_side_b: VLAN_ID | None = None,
- geant_sid: str | None = None,
- *,
- policer_enabled: bool = False,
+ description: str | None = None,
+ partner: dict | None = None,
+ status: SubscriptionLifecycle | None = None,
+ start_date: str | None = "2024-01-01T10:20:30+01:02",
+ layer_2_circuit_service_type: Layer2CircuitServiceType | None = None,
+ layer_2_circuit_type: Layer2CircuitType = Layer2CircuitType.TAGGED,
+ vlan_range_lower_bound: VLAN_ID | None = None,
+ vlan_range_upper_bound: VLAN_ID | None = None,
+ policer_bandwidth: BandwidthString | None = None,
+ layer_2_circuit_side_a_edgeport: UUIDstr | None = None,
+ vlan_id_side_a: VLAN_ID | None = None,
+ layer_2_circuit_side_b_edgeport: UUIDstr | None = None,
+ vlan_id_side_b: VLAN_ID | None = None,
+ geant_sid: str | None = None,
+ *,
+ policer_enabled: bool = False,
) -> UUIDstr:
-
# Assign default partner if none provided
if partner is None:
partner = geant_partner
@@ -100,7 +99,9 @@ def layer_2_circuit_subscription_factory(faker, geant_partner, edge_port_subscri
subscription.layer_2_circuit.policer_enabled = policer_enabled
subscription.layer_2_circuit.bandwidth = policer_bandwidth if policer_enabled else None
- subscription.description = description or f"{subscription.product.name} - {subscription.layer_2_circuit.virtual_circuit_id}"
+ subscription.description = description or (
+ f"{subscription.product.name} - " f"{subscription.layer_2_circuit.virtual_circuit_id}"
+ )
subscription = SubscriptionModel.from_other_lifecycle(subscription, SubscriptionLifecycle.ACTIVE)
subscription.insync = True
diff --git a/test/workflows/l2_circuit/test_modify_layer_2_circuit.py b/test/workflows/l2_circuit/test_modify_layer_2_circuit.py
index aee47662..078d9c25 100644
--- a/test/workflows/l2_circuit/test_modify_layer_2_circuit.py
+++ b/test/workflows/l2_circuit/test_modify_layer_2_circuit.py
@@ -10,11 +10,11 @@ from test.workflows import assert_complete, extract_state, run_workflow
@pytest.mark.parametrize("layer_2_circuit_service_type", [ProductName.GEANT_PLUS, ProductName.EXPRESSROUTE])
@pytest.mark.workflow()
def test_modify_layer_2_circuit_change_policer_bandwidth(
- layer_2_circuit_service_type,
- layer_2_circuit_subscription_factory,
- faker,
- partner_factory,
- data_config_filename,
+ layer_2_circuit_service_type,
+ layer_2_circuit_subscription_factory,
+ faker,
+ partner_factory,
+ data_config_filename,
):
subscription_id = layer_2_circuit_subscription_factory(layer_2_circuit_service_type=layer_2_circuit_service_type)
subscription = Layer2Circuit.from_subscription(subscription_id)
@@ -29,7 +29,7 @@ def test_modify_layer_2_circuit_change_policer_bandwidth(
"vlan_range_lower_bound": subscription.layer_2_circuit.vlan_range_lower_bound,
"vlan_range_upper_bound": subscription.layer_2_circuit.vlan_range_upper_bound,
"policer_bandwidth": None,
- }
+ },
]
result, _, _ = run_workflow("modify_layer_2_circuit", input_form_data)
assert_complete(result)
@@ -41,11 +41,11 @@ def test_modify_layer_2_circuit_change_policer_bandwidth(
@pytest.mark.parametrize("layer_2_circuit_service_type", [ProductName.GEANT_PLUS, ProductName.EXPRESSROUTE])
@pytest.mark.workflow()
def test_modify_layer_2_circuit_change_circuit_type(
- layer_2_circuit_service_type,
- layer_2_circuit_subscription_factory,
- faker,
- partner_factory,
- data_config_filename,
+ layer_2_circuit_service_type,
+ layer_2_circuit_subscription_factory,
+ faker,
+ partner_factory,
+ data_config_filename,
):
subscription_id = layer_2_circuit_subscription_factory(layer_2_circuit_service_type=layer_2_circuit_service_type)
subscription = Layer2Circuit.from_subscription(subscription_id)
@@ -59,7 +59,7 @@ def test_modify_layer_2_circuit_change_circuit_type(
"vlan_range_lower_bound": None,
"vlan_range_upper_bound": None,
"policer_bandwidth": subscription.layer_2_circuit.bandwidth,
- }
+ },
]
result, _, _ = run_workflow("modify_layer_2_circuit", input_form_data)
assert_complete(result)
--
GitLab