From dbc558f1cbfe5201851dc066576fd33d8806575e Mon Sep 17 00:00:00 2001
From: Hakan Calim <hakan.calim@fau.de>
Date: Thu, 8 Feb 2024 23:06:19 +0100
Subject: [PATCH] NAT-410: simplified some validators
---
gso/workflows/iptrunk/create_iptrunk.py | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/gso/workflows/iptrunk/create_iptrunk.py b/gso/workflows/iptrunk/create_iptrunk.py
index acbfe375..213a264b 100644
--- a/gso/workflows/iptrunk/create_iptrunk.py
+++ b/gso/workflows/iptrunk/create_iptrunk.py
@@ -101,13 +101,11 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
side_a_ae_members: ae_members_side_a # type: ignore[valid-type]
@validator("side_a_ae_members", allow_reuse=True)
- def validate_iptrunk_unique_interface_side_a(cls, side_a_ae_members: list[LAGMember]) -> list[LAGMember]:
- return validate_iptrunk_unique_interface(side_a_ae_members)
-
- @validator("side_a_ae_members", allow_reuse=True)
- def validate_interface_name_members(cls, side_a_ae_members: list[LAGMember]) -> list[LAGMember]:
+ def validate_side_a_ae_members(cls, side_a_ae_members: list[LAGMember]) -> list[LAGMember]:
+ validate_iptrunk_unique_interface(side_a_ae_members)
vendor = get_router_vendor(router_a)
- return validate_interface_name_list(side_a_ae_members, vendor)
+ validate_interface_name_list(side_a_ae_members, vendor)
+ return side_a_ae_members
user_input_side_a = yield CreateIptrunkSideAForm
# Remove the selected router for side A, to prevent any loops
@@ -153,13 +151,11 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
side_b_ae_members: ae_members_side_b # type: ignore[valid-type]
@validator("side_b_ae_members", allow_reuse=True)
- def validate_iptrunk_unique_interface_side_b(cls, side_b_ae_members: list[LAGMember]) -> list[LAGMember]:
- return validate_iptrunk_unique_interface(side_b_ae_members)
-
- @validator("side_b_ae_members", allow_reuse=True)
- def validate_interface_name_members(cls, side_b_ae_members: list[LAGMember]) -> list[LAGMember]:
+ def validate_side_b_ae_members(cls, side_b_ae_members: list[LAGMember]) -> list[LAGMember]:
+ validate_iptrunk_unique_interface(side_b_ae_members)
vendor = get_router_vendor(router_b)
- return validate_interface_name_list(side_b_ae_members, vendor)
+ validate_interface_name_list(side_b_ae_members, vendor)
+ return side_b_ae_members
user_input_side_b = yield CreateIptrunkSideBForm
--
GitLab