From de8e3382d5d3928609e8369a947125539f49cb3f Mon Sep 17 00:00:00 2001
From: Hakan Calim <hakan.calim@fau.de>
Date: Tue, 28 Nov 2023 15:22:01 +0100
Subject: [PATCH] NAT-329: adjusted interface name validator complexity
regarding ruff issue
---
gso/workflows/iptrunk/modify_trunk_interface.py | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/gso/workflows/iptrunk/modify_trunk_interface.py b/gso/workflows/iptrunk/modify_trunk_interface.py
index 12c5671e..43249faa 100644
--- a/gso/workflows/iptrunk/modify_trunk_interface.py
+++ b/gso/workflows/iptrunk/modify_trunk_interface.py
@@ -112,12 +112,7 @@ def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:
@validator("side_a_ae_members", allow_reuse=True)
def validate_interface_name_members(cls, side_a_ae_members: list[LAGMember]) -> list[LAGMember]:
vendor = subscription.iptrunk.iptrunk_sides[0].iptrunk_side_node.router_vendor
- if vendor == RouterVendor.NOKIA:
- ret_val = side_a_ae_members
- else:
- ret_val = validate_interface_name_list(side_a_ae_members)
-
- return ret_val
+ return validate_interface_name_list(side_a_ae_members, vendor)
user_input_side_a = yield ModifyIptrunkSideAForm
ae_members_side_b = initialize_ae_members(subscription, initial_user_input.dict(), 1)
@@ -142,13 +137,7 @@ def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:
@validator("side_b_ae_members", allow_reuse=True)
def validate_interface_name_members(cls, side_b_ae_members: list[LAGMember]) -> list[LAGMember]:
vendor = subscription.iptrunk.iptrunk_sides[1].iptrunk_side_node.router_vendor
- if vendor == RouterVendor.NOKIA:
- ret_val = side_b_ae_members
- else:
- ret_val = validate_interface_name_list(side_b_ae_members)
-
- return ret_val
-
+ 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()
--
GitLab