Skip to content
Snippets Groups Projects

Feature/nat 329 interface names should validated 3

Merged Hakan Calim requested to merge feature/NAT-329-interface-names-should-validated-3 into develop
All threads resolved!
1 file
+ 2
13
Compare changes
  • Side-by-side
  • Inline
@@ -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()
Loading