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
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
2f8c42b3
Verified
Commit
2f8c42b3
authored
1 year ago
by
Karel van Klink
Browse files
Options
Downloads
Patches
Plain Diff
small formatting changes, nothing functional
parent
df0cd9c9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!20
IPAM: create_device: LO, SI and LT_IAS; create_trunk: trunk networks.
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
gso/workflows/device/create_device.py
+7
-3
7 additions, 3 deletions
gso/workflows/device/create_device.py
gso/workflows/iptrunk/create_iptrunk.py
+9
-3
9 additions, 3 deletions
gso/workflows/iptrunk/create_iptrunk.py
with
16 additions
and
6 deletions
gso/workflows/device/create_device.py
+
7
−
3
View file @
2f8c42b3
...
...
@@ -19,6 +19,7 @@ from gso.products.product_types import device
from
gso.products.product_types.device
import
DeviceInactive
,
\
DeviceProvisioning
from
gso.products.product_types.site
import
Site
# noinspection PyProtectedMember
from
gso.services
import
_ipam
from
gso.services
import
provisioning_proxy
from
gso.services.provisioning_proxy
import
await_pp_results
,
\
...
...
@@ -96,11 +97,14 @@ def get_info_from_ipam(subscription: DeviceProvisioning) -> State:
subscription
.
device
.
device_lo_iso_address
\
=
iso_from_ipv4
(
str
(
subscription
.
device
.
device_lo_ipv4_address
))
subscription
.
device
.
device_si_ipv4_network
\
=
_ipam
.
allocate_service_ipv4_network
(
service_type
=
'
SI
'
,
comment
=
f
"
SI for
{
lo0_name
}
"
).
v4
=
_ipam
.
allocate_service_ipv4_network
(
service_type
=
'
SI
'
,
comment
=
f
'
SI for
{
lo0_name
}
'
).
v4
subscription
.
device
.
device_ias_lt_ipv4_network
\
=
_ipam
.
allocate_service_ipv4_network
(
service_type
=
'
LT_IAS
'
,
comment
=
f
"
LT for
{
lo0_name
}
"
).
v4
=
_ipam
.
allocate_service_ipv4_network
(
service_type
=
'
LT_IAS
'
,
comment
=
f
'
LT for
{
lo0_name
}
'
).
v4
subscription
.
device
.
device_ias_lt_ipv6_network
\
=
_ipam
.
allocate_service_ipv6_network
(
service_type
=
'
LT_IAS
'
,
comment
=
f
"
LT for
{
lo0_name
}
"
).
v6
=
_ipam
.
allocate_service_ipv6_network
(
service_type
=
'
LT_IAS
'
,
comment
=
f
'
LT for
{
lo0_name
}
'
).
v6
return
{
'
subscription
'
:
subscription
}
...
...
This diff is collapsed.
Click to expand it.
gso/workflows/iptrunk/create_iptrunk.py
+
9
−
3
View file @
2f8c42b3
...
...
@@ -17,6 +17,7 @@ from gso.products.product_blocks.iptrunk import IptrunkType
from
gso.products.product_types.device
import
Device
from
gso.products.product_types.iptrunk
import
IptrunkInactive
,
\
IptrunkProvisioning
# noinspection PyProtectedMember
from
gso.services
import
provisioning_proxy
,
_ipam
from
gso.services.provisioning_proxy
import
confirm_pp_results
,
\
await_pp_results
...
...
@@ -92,11 +93,16 @@ def create_subscription(product: UUIDstr) -> State:
@step
(
'
Get information from IPAM
'
)
def
get_info_from_ipam
(
subscription
:
IptrunkProvisioning
)
->
State
:
# TODO: get info about how these should be generated
subscription
.
iptrunk
.
iptrunk_ipv4_network
\
=
_ipam
.
allocate_service_ipv4_network
(
service_type
=
"
TRUNK
"
,
comment
=
subscription
.
iptrunk
.
iptrunk_description
).
v4
=
_ipam
.
allocate_service_ipv4_network
(
service_type
=
'
TRUNK
'
,
comment
=
subscription
.
iptrunk
.
iptrunk_description
).
v4
subscription
.
iptrunk
.
iptrunk_ipv6_network
\
=
_ipam
.
allocate_service_ipv6_network
(
service_type
=
"
TRUNK
"
,
comment
=
subscription
.
iptrunk
.
iptrunk_description
).
v6
=
_ipam
.
allocate_service_ipv6_network
(
service_type
=
'
TRUNK
'
,
comment
=
subscription
.
iptrunk
.
iptrunk_description
).
v6
return
{
'
subscription
'
:
subscription
}
...
...
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