Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
GÉANT Service Orchestrator
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GÉANT Orchestration and Automation Team
GAP
GÉANT Service Orchestrator
Merge requests
!97
Feature/nat 328 site names should be validated
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Feature/nat 328 site names should be validated
feature/NAT-328-Site-names-should-be-validated
into
develop
Overview
0
Commits
19
Pipelines
8
Changes
1
Merged
Hakan Calim
requested to merge
feature/NAT-328-Site-names-should-be-validated
into
develop
1 year ago
Overview
0
Commits
19
Pipelines
8
Changes
1
Expand
0
0
Merge request reports
Viewing commit
f143a658
Show latest version
1 file
+
10
−
0
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
f143a658
NAT-328
: added validation for site name
· f143a658
Hakan Calim
authored
1 year ago
gso/api/v1/imports.py
+
10
−
0
Options
import
ipaddress
from
typing
import
Any
from
uuid
import
UUID
import
re
from
fastapi
import
Depends
,
HTTPException
,
status
from
fastapi.routing
import
APIRouter
@@ -104,6 +105,15 @@ 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
"
]
Loading