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
+ 6
1
Compare changes
  • Side-by-side
  • Inline
+ 6
1
@@ -223,6 +223,7 @@ 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."""
@@ -265,7 +266,7 @@ class BaseSiteValidatorModel(BaseModel):
return site_name
def validate_interface_name_list(interface_name_list: list) -> list:
def validate_interface_name_list(interface_name_list: list, vendor: str) -> list:
"""Validate that the provided interface name matches the expected pattern.
The expected pattern for the interface name is one of 'ge', 'et', 'xe' followed by a dash '-',
@@ -276,11 +277,15 @@ def validate_interface_name_list(interface_name_list: list) -> list:
Args:
----
interface_name_list: List of interface names to validate.
vendor: Router vendor to check interface names
Returns:
-------
list: The list of interface names if all match was successful, otherwise it will throw a ValueError exception.
"""
# For Nokia nothing to do
if vendor == RouterVendor.NOKIA:
return interface_name_list
pattern = re.compile(r"^(ge|et|xe)-[0-9]/[0-9]/[0-9]$")
for interface in interface_name_list:
if not bool(pattern.match(interface.interface_name)):
Loading