From 9251b4c961d05e8d57d2e487850be0e94d0bf25d Mon Sep 17 00:00:00 2001
From: Hakan Calim <hakan.calim@fau.de>
Date: Tue, 31 Oct 2023 16:00:16 +0100
Subject: [PATCH] NAT-328: moved the validator for site name to correct class
---
gso/api/v1/imports.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/gso/api/v1/imports.py b/gso/api/v1/imports.py
index c65c23b8..9cd2ee90 100644
--- a/gso/api/v1/imports.py
+++ b/gso/api/v1/imports.py
@@ -39,6 +39,15 @@ class SiteImportModel(BaseModel):
site_ts_address: str
customer: str
+ @validator("site_name", allow_reuse=True)
+ def site_name_must_be_valid(cls, site_name: str) -> str:
+ # Accept 3 chapital letters and only one ditigt after capital letters.
+ pattern = re.compile(r"^[A-Z]{3}[0-9]?$")
+ if not bool(pattern.match(site_name)):
+ raise ValueError(f"Enter a valid site name similar looks like AMS, AMS1or LON9. Get: {site_name}")
+
+ return site_name
+
class RouterImportModel(BaseModel):
customer: str
@@ -105,15 +114,6 @@ class IptrunkImportModel(BaseModel):
return value
- @validator("site_name", allow_reuse=True)
- def site_name_must_be_valid(cls, site_name: str) -> str:
- # Accept 3 chapital letters and only one ditigt after capital letters.
- pattern = re.compile(r"^[A-Z]{3}[0-9]?$")
- if not bool(pattern.match(site_name)):
- raise ValueError(f"Enter a valid site name similar looks like AMS, AMS1or LON9. Get: {site_name}")
-
- return site_name
-
@root_validator
def check_members(cls, values: dict[str, Any]) -> dict[str, Any]:
min_links = values["iptrunk_minimum_links"]
--
GitLab