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
Commits
e7cdd2ad
Verified
Commit
e7cdd2ad
authored
1 year ago
by
Karel van Klink
Browse files
Options
Downloads
Patches
Plain Diff
When creating a router, the FQDN may not be already in use
parent
fd0bb61c
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!65
Feature/add infoblox service
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
gso/products/product_blocks/router.py
+4
-0
4 additions, 0 deletions
gso/products/product_blocks/router.py
gso/workflows/router/create_router.py
+21
-18
21 additions, 18 deletions
gso/workflows/router/create_router.py
with
25 additions
and
18 deletions
gso/products/product_blocks/router.py
+
4
−
0
View file @
e7cdd2ad
...
...
@@ -44,6 +44,10 @@ class RouterBlockInactive(
router_is_ias_connected
:
Optional
[
bool
]
=
None
def
generate_fqdn
(
hostname
:
str
,
site_name
:
str
,
country_code
:
str
)
->
str
:
return
f
"
{
hostname
}
.
{
site_name
.
lower
()
}
.
{
country_code
.
lower
()
}
.geant.net
"
class
RouterBlockProvisioning
(
RouterBlockInactive
,
lifecycle
=
[
SubscriptionLifecycle
.
PROVISIONING
]):
"""
A router that
'
s being provisioned. See {class}`RouterBlock`.
"""
...
...
This diff is collapsed.
Click to expand it.
gso/workflows/router/create_router.py
+
21
−
18
View file @
e7cdd2ad
from
typing
import
Optional
import
infoblox_client.objects
from
ipaddress
import
IPv4Network
,
IPv6Network
from
typing
import
Any
# noinspection PyProtectedMember
from
orchestrator.forms
import
FormPage
...
...
@@ -10,6 +9,7 @@ from orchestrator.types import FormGenerator, State, SubscriptionLifecycle, UUID
from
orchestrator.workflow
import
StepList
,
conditional
,
done
,
init
,
step
,
workflow
from
orchestrator.workflows.steps
import
resync
,
set_status
,
store_process_subscription
from
orchestrator.workflows.utils
import
wrap_create_initial_input_form
from
products.product_blocks.router
import
RouterRole
,
RouterVendor
,
generate_fqdn
from
pydantic
import
validator
from
gso.products.product_types.router
import
RouterInactive
,
RouterProvisioning
...
...
@@ -18,7 +18,6 @@ from gso.products.shared import PortNumber
from
gso.services
import
infoblox
,
provisioning_proxy
,
subscriptions
from
gso.services.provisioning_proxy
import
pp_interaction
from
gso.workflows.utils
import
customer_selector
,
iso_from_ipv4
from
products.product_blocks.router
import
RouterRole
,
RouterVendor
,
generate_fqdn
def
_site_selector
()
->
Choice
:
...
...
@@ -43,13 +42,17 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
ts_port
:
PortNumber
router_vendor
:
RouterVendor
router_role
:
RouterRole
is_ias_connected
:
Optional
[
bool
]
is_ias_connected
:
bool
|
None
@validator
(
"
hostname
"
,
allow_reuse
=
True
)
def
hostname_must_be_available
(
cls
,
hostname
:
str
,
**
kwargs
)
->
str
:
selected_site
=
Site
.
from_subscription
(
kwargs
[
"
values
"
].
get
(
"
router_site
"
,
""
)).
site
def
hostname_must_be_available
(
cls
,
hostname
:
str
,
**
kwargs
:
dict
[
str
,
Any
])
->
str
:
router_site
=
kwargs
[
"
values
"
].
get
(
"
router_site
"
)
if
not
router_site
:
raise
ValueError
(
"
Please select a site before setting the hostname.
"
)
selected_site
=
Site
.
from_subscription
(
router_site
).
site
input_fqdn
=
generate_fqdn
(
hostname
,
selected_site
.
site_name
,
selected_site
.
site_country_code
)
if
not
infoblox
.
hostname_available
(
input_fqdn
):
if
not
infoblox
.
hostname_available
(
f
"
lo0.
{
input_fqdn
}
"
):
raise
ValueError
(
f
'
FQDN
"
{
input_fqdn
}
"
is not available.
'
)
return
hostname
...
...
@@ -154,18 +157,16 @@ def provision_router_real(subscription: RouterProvisioning, process_id: UUIDstr)
def
verify_ipam_loopback
(
subscription
:
RouterProvisioning
)
->
State
:
host_record
=
infoblox
.
find_host_by_fqdn
(
f
"
lo0.
{
subscription
.
router
.
router_fqdn
}
"
)
if
not
host_record
or
str
(
subscription
.
subscription_id
)
not
in
host_record
.
comment
:
return
{
"
ipam_warning
"
:
"
!!! Loopback record is incorrectly configured in IPAM, please investigate this manually. !!!
"
}
return
{
"
ipam_warning
"
:
"
Loopback record is incorrectly configured in IPAM, please investigate this manually!
"
}
return
{
"
subscription
"
:
subscription
}
@step
(
"
Verify IPAM resources for IAS/LT networks
"
)
def
verify_ipam_ias
(
subscription
:
RouterProvisioning
)
->
State
:
si_ipv4_network
=
infoblox
.
find_network_by_cidr
(
subscription
.
router
.
router_si_ipv4_network
)
ias_lt_ipv4_network
=
infoblox
.
find_network_by_cidr
(
subscription
.
router
.
router_ias_lt_ipv4_network
)
ias_lt_ipv6_network
=
infoblox
.
find_network_by_cidr
(
subscription
.
router
.
router_ias_lt_ipv6_network
)
si_ipv4_network
=
infoblox
.
find_network_by_cidr
(
IPv4Network
(
subscription
.
router
.
router_si_ipv4_network
)
)
ias_lt_ipv4_network
=
infoblox
.
find_network_by_cidr
(
IPv4Network
(
subscription
.
router
.
router_ias_lt_ipv4_network
)
)
ias_lt_ipv6_network
=
infoblox
.
find_network_by_cidr
(
IPv6Network
(
subscription
.
router
.
router_ias_lt_ipv6_network
)
)
new_state
=
{}
...
...
@@ -176,13 +177,15 @@ def verify_ipam_ias(subscription: RouterProvisioning) -> State:
}
if
not
ias_lt_ipv4_network
or
str
(
subscription
.
subscription_id
)
not
in
ias_lt_ipv4_network
.
comment
:
new_state
=
new_state
|
{
"
ipam_ias_lt_ipv4_warning
"
:
f
"
IAS/LT IPv4 network expected at
{
subscription
.
router
.
router_ias_lt_ipv4_network
}
,
"
f
"
but it was not found or misconfigured, please investigate and adjust if necessary.
"
"
ipam_ias_lt_ipv4_warning
"
:
"
IAS/LT IPv4 network expected at
"
f
"
{
subscription
.
router
.
router_ias_lt_ipv4_network
}
, but it was not found or misconfigured, please
"
"
investigate and adjust if necessary.
"
}
if
not
ias_lt_ipv6_network
or
str
(
subscription
.
subscription_id
)
not
in
ias_lt_ipv6_network
.
comment
:
new_state
=
new_state
|
{
"
ipam_ias_lt_ipv6_warning
"
:
f
"
IAS/LT IPv6 network expected at
{
subscription
.
router
.
router_ias_lt_ipv6_network
}
,
"
f
"
but it was not found or misconfigured, please investigate and adjust if necessary.
"
"
ipam_ias_lt_ipv6_warning
"
:
f
"
IAS/LT IPv6 network expected at
"
f
"
{
subscription
.
router
.
router_ias_lt_ipv6_network
}
, but it was not found or misconfigured, please
"
"
investigate and adjust if necessary.
"
}
return
new_state
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment