diff --git a/gso/utils/helpers.py b/gso/utils/helpers.py
index 92b7e555362222485153bfa915f7e7e13b3630ce..8bafd81c0d8fb4b2bc0fa1f11cb7265cce422bb7 100644
--- a/gso/utils/helpers.py
+++ b/gso/utils/helpers.py
@@ -223,7 +223,6 @@ def validate_site_name(site_name: str) -> str:
return site_name
-<<<<<<< HEAD
class BaseSiteValidatorModel(BaseModel):
"""A base site validator model extended by create site and by import site."""
diff --git a/gso/workflows/iptrunk/modify_trunk_interface.py b/gso/workflows/iptrunk/modify_trunk_interface.py
index 8e3b2e26790399694d6cf56ef7440209a5b2420f..fca789dbf097cc6bbe476ce3a374299513fea6cd 100644
--- a/gso/workflows/iptrunk/modify_trunk_interface.py
+++ b/gso/workflows/iptrunk/modify_trunk_interface.py
@@ -138,6 +138,7 @@ def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:
def validate_interface_name_members(cls, side_b_ae_members: list[LAGMember]) -> list[LAGMember]:
vendor = subscription.iptrunk.iptrunk_sides[1].iptrunk_side_node.vendor
return validate_interface_name_list(side_b_ae_members, vendor)
+
user_input_side_b = yield ModifyIptrunkSideBForm
return initial_user_input.dict() | user_input_side_a.dict() | user_input_side_b.dict()
diff --git a/test/conftest.py b/test/conftest.py
index 0ec9f325157417044cf89363d36ff87b94d6dfb1..ff7784da7c2b288cf139b440937ec183f9a6f44a 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -37,6 +37,7 @@ def pytest_collection_modifyitems(config, items):
class UseJuniperSide(strEnum):
"""Define on tests on which side to use Juniper router"""
+
NONE = "none"
SIDE_A = "side_a"
SIDE_B = "side_b"
@@ -87,13 +88,15 @@ class FakerProvider(BaseProvider):
interface_names = [f"{prefix}{i}" for prefix in ["xe-1/0/", "ge-3/0/", "xe-2/1/"] for i in range(iface_amount)]
return [
LAGMember(interface_name=interface_name, interface_description=self.generator.sentence())
- for interface_name in interface_names]
+ for interface_name in interface_names
+ ]
def generate_nokia_members_list(self) -> list[LAGMember]:
iface_amount = self.generator.random_int(min=2, max=5)
return [
- LAGMember(interface_name=f"Interface{i}",
- interface_description=self.generator.sentence()) for i in range(iface_amount)]
+ LAGMember(interface_name=f"Interface{i}", interface_description=self.generator.sentence())
+ for i in range(iface_amount)
+ ]
@pytest.fixture(scope="session")
diff --git a/test/schedules/test_scheduling.py b/test/schedules/test_scheduling.py
index 82168eb4375f2bdb50ed2c4de34fe9e0f65cd8cb..5ed2ad01e14a00e9e0785e9ee9a31518325f4bea 100644
--- a/test/schedules/test_scheduling.py
+++ b/test/schedules/test_scheduling.py
@@ -8,7 +8,7 @@ from gso.schedules.scheduling import scheduler
@pytest.fixture(scope="module")
def validate_subscriptions():
- from gso.schedules.validate_subscriptions import validate_subscriptions as vs
+ from gso.schedules.validate_subscriptions import validate_subscriptions as vs # noqa: PLC0415
return vs
diff --git a/test/services/conftest.py b/test/services/conftest.py
index 282ae9edc8521e77cc6b8688670ad5218fa676c2..ce6c6c45b2d21861300120d7b35885a98e6ca23d 100644
--- a/test/services/conftest.py
+++ b/test/services/conftest.py
@@ -7,10 +7,12 @@ class MockedNetboxClient:
def get_device_by_name(self):
return self.BaseMockObject(id=1, name="test")
- def get_available_lags(self) -> list[str]:
+ @staticmethod
+ def get_available_lags() -> list[str]:
return [f"LAG{lag}" for lag in range(1, 5)]
- def get_available_interfaces(self):
+ @staticmethod
+ def get_available_interfaces():
interfaces = []
for interface in range(5):
interface_data = {
@@ -30,14 +32,17 @@ class MockedNetboxClient:
def reserve_interface(self):
return self.BaseMockObject(id=1, name="test")
- def allocate_interface(self):
+ @staticmethod
+ def allocate_interface():
return {"id": 1, "name": "test"}
def free_interface(self):
return self.BaseMockObject(id=1, name="test")
- def detach_interfaces_from_lag(self):
+ @staticmethod
+ def detach_interfaces_from_lag():
return None
- def delete_interface(self):
+ @staticmethod
+ def delete_interface():
return None
diff --git a/test/workflows/iptrunk/test_create_iptrunk.py b/test/workflows/iptrunk/test_create_iptrunk.py
index 852530050c86224d6d83794c6f3af7a44404d2c7..fa5292f7dbdee2881e6c2a5b44719a7b85961657 100644
--- a/test/workflows/iptrunk/test_create_iptrunk.py
+++ b/test/workflows/iptrunk/test_create_iptrunk.py
@@ -55,10 +55,9 @@ def input_form_wizard_data(request, juniper_router_subscription_factory, nokia_r
else:
router_side_b = nokia_router_subscription_factory()
side_b_members = [
- LAGMember(
- interface_name=f"Interface{interface}",
- interface_description=faker.sentence())
- for interface in range(5)]
+ LAGMember(interface_name=f"Interface{interface}", interface_description=faker.sentence())
+ for interface in range(5)
+ ]
create_ip_trunk_step = {
"tt_number": faker.tt_number(),
diff --git a/test/workflows/iptrunk/test_modify_trunk_interface.py b/test/workflows/iptrunk/test_modify_trunk_interface.py
index 76a8e6ae4c997e85855af1093ae1aadb61259893..bb83572d8c15eaa4059404c8876b636a108dc7c2 100644
--- a/test/workflows/iptrunk/test_modify_trunk_interface.py
+++ b/test/workflows/iptrunk/test_modify_trunk_interface.py
@@ -23,7 +23,7 @@ def input_form_iptrunk_data(
juniper_router_subscription_factory,
nokia_router_subscription_factory,
iptrunk_side_subscription_factory,
- ):
+):
use_juniper = getattr(request, "param", UseJuniperSide.NONE)
if use_juniper == UseJuniperSide.SIDE_A:
side_node = juniper_router_subscription_factory()
@@ -83,10 +83,11 @@ def input_form_iptrunk_data(
]
-@pytest.mark.parametrize("input_form_iptrunk_data", [UseJuniperSide.NONE,
- UseJuniperSide.SIDE_A,
- UseJuniperSide.SIDE_B,
- UseJuniperSide.SIDE_BOTH], indirect=True)
+@pytest.mark.parametrize(
+ "input_form_iptrunk_data",
+ [UseJuniperSide.NONE, UseJuniperSide.SIDE_A, UseJuniperSide.SIDE_B, UseJuniperSide.SIDE_BOTH],
+ indirect=True,
+)
@pytest.mark.workflow()
@patch("gso.workflows.iptrunk.modify_trunk_interface.provisioning_proxy.provision_ip_trunk")
@patch("gso.services.netbox_client.NetboxClient.get_available_interfaces")
@@ -140,9 +141,9 @@ def test_iptrunk_modify_trunk_interface_success(
# Only Nokia interfaces will checked
vendor_side_a = subscription.iptrunk.iptrunk_sides[0].iptrunk_side_node.vendor
vendor_side_b = subscription.iptrunk.iptrunk_sides[1].iptrunk_side_node.vendor
- num_ifaces = (
- len(new_side_a_ae_members) if vendor_side_a == RouterVendor.NOKIA else 0) + (
- len(new_side_b_ae_members) if vendor_side_b == RouterVendor.NOKIA else 0)
+ num_ifaces = (len(new_side_a_ae_members) if vendor_side_a == RouterVendor.NOKIA else 0) + (
+ len(new_side_b_ae_members) if vendor_side_b == RouterVendor.NOKIA else 0
+ )
# Define free interfaces for only nokia sides
num_free_ifaces = 2 * (vendor_side_a == RouterVendor.NOKIA) + 2 * (vendor_side_b == RouterVendor.NOKIA)