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
285e9068
Commit
285e9068
authored
1 year ago
by
Karel van Klink
Committed by
Neda Moeini
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
make iptrunk product block use the PhyPortCapacity enum
parent
87a1dc8a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!83
Clean up the repo a bit, and add some unit tests
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
gso/products/product_blocks/iptrunk.py
+4
-3
4 additions, 3 deletions
gso/products/product_blocks/iptrunk.py
with
4 additions
and
3 deletions
gso/products/product_blocks/iptrunk.py
+
4
−
3
View file @
285e9068
...
@@ -8,6 +8,7 @@ from orchestrator.forms.validators import UniqueConstrainedList
...
@@ -8,6 +8,7 @@ from orchestrator.forms.validators import UniqueConstrainedList
from
orchestrator.types
import
SubscriptionLifecycle
,
strEnum
from
orchestrator.types
import
SubscriptionLifecycle
,
strEnum
from
pydantic
import
Field
from
pydantic
import
Field
from
gso.products.product_blocks
import
PhyPortCapacity
from
gso.products.product_blocks.router
import
RouterBlock
,
RouterBlockInactive
,
RouterBlockProvisioning
from
gso.products.product_blocks.router
import
RouterBlock
,
RouterBlockInactive
,
RouterBlockProvisioning
...
@@ -58,7 +59,7 @@ class IptrunkBlockInactive(
...
@@ -58,7 +59,7 @@ class IptrunkBlockInactive(
geant_s_sid
:
str
|
None
=
None
geant_s_sid
:
str
|
None
=
None
iptrunk_description
:
str
|
None
=
None
iptrunk_description
:
str
|
None
=
None
iptrunk_type
:
IptrunkType
|
None
=
None
iptrunk_type
:
IptrunkType
|
None
=
None
iptrunk_speed
:
str
|
None
=
None
iptrunk_speed
:
PhyPortCapacity
|
None
=
None
iptrunk_minimum_links
:
int
|
None
=
None
iptrunk_minimum_links
:
int
|
None
=
None
iptrunk_isis_metric
:
int
|
None
=
None
iptrunk_isis_metric
:
int
|
None
=
None
iptrunk_ipv4_network
:
ipaddress
.
IPv4Network
|
None
=
None
iptrunk_ipv4_network
:
ipaddress
.
IPv4Network
|
None
=
None
...
@@ -73,7 +74,7 @@ class IptrunkBlockProvisioning(IptrunkBlockInactive, lifecycle=[SubscriptionLife
...
@@ -73,7 +74,7 @@ class IptrunkBlockProvisioning(IptrunkBlockInactive, lifecycle=[SubscriptionLife
geant_s_sid
:
str
|
None
=
None
geant_s_sid
:
str
|
None
=
None
iptrunk_description
:
str
|
None
=
None
iptrunk_description
:
str
|
None
=
None
iptrunk_type
:
IptrunkType
|
None
=
None
iptrunk_type
:
IptrunkType
|
None
=
None
iptrunk_speed
:
str
|
None
=
None
iptrunk_speed
:
PhyPortCapacity
|
None
=
None
iptrunk_minimum_links
:
int
|
None
=
None
iptrunk_minimum_links
:
int
|
None
=
None
iptrunk_isis_metric
:
int
|
None
=
None
iptrunk_isis_metric
:
int
|
None
=
None
iptrunk_ipv4_network
:
ipaddress
.
IPv4Network
|
None
=
None
iptrunk_ipv4_network
:
ipaddress
.
IPv4Network
|
None
=
None
...
@@ -92,7 +93,7 @@ class IptrunkBlock(IptrunkBlockProvisioning, lifecycle=[SubscriptionLifecycle.AC
...
@@ -92,7 +93,7 @@ class IptrunkBlock(IptrunkBlockProvisioning, lifecycle=[SubscriptionLifecycle.AC
#: The type of trunk, can be either dark fibre or leased capacity.
#: The type of trunk, can be either dark fibre or leased capacity.
iptrunk_type
:
IptrunkType
iptrunk_type
:
IptrunkType
#: The speed of the trunk, measured per interface associated with it.
#: The speed of the trunk, measured per interface associated with it.
iptrunk_speed
:
str
# FIXME: should be of
PhyPortCapacity
type
iptrunk_speed
:
PhyPortCapacity
#: The minimum amount of links the trunk should consist of.
#: The minimum amount of links the trunk should consist of.
iptrunk_minimum_links
:
int
iptrunk_minimum_links
:
int
#: The :term:`IS-IS` metric of this link
#: The :term:`IS-IS` metric of this link
...
...
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