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
66bf227e
Commit
66bf227e
authored
3 months ago
by
Neda Moeini
Committed by
Mohammad Torkashvand
3 months ago
Browse files
Options
Downloads
Patches
Plain Diff
Update create EdgePort WF and rename generating GA and GS ids function
parent
c0b3a841
No related branches found
Branches containing commit
Tags
2.28
Tags containing commit
1 merge request
!324
Feature/manage sid and gids
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
gso/services/subscriptions.py
+2
-2
2 additions, 2 deletions
gso/services/subscriptions.py
gso/workflows/edge_port/create_edge_port.py
+2
-2
2 additions, 2 deletions
gso/workflows/edge_port/create_edge_port.py
with
4 additions
and
4 deletions
gso/services/subscriptions.py
+
2
−
2
View file @
66bf227e
...
@@ -333,7 +333,7 @@ def is_virtual_circuit_id_available(virtual_circuit_id: str) -> bool:
...
@@ -333,7 +333,7 @@ def is_virtual_circuit_id_available(virtual_circuit_id: str) -> bool:
return
is_resource_type_value_unique
(
"
virtual_circuit_id
"
,
virtual_circuit_id
)
return
is_resource_type_value_unique
(
"
virtual_circuit_id
"
,
virtual_circuit_id
)
def
mak
e_unique_gs_id
()
->
str
:
def
generat
e_unique_gs_id
()
->
str
:
"""
Generate a unique GS ID using the gs_id_seq database sequence.
"""
Generate a unique GS ID using the gs_id_seq database sequence.
Returns:
Returns:
...
@@ -351,7 +351,7 @@ def make_unique_gs_id() -> str:
...
@@ -351,7 +351,7 @@ def make_unique_gs_id() -> str:
return
f
"
GS-
{
new_id
}
"
return
f
"
GS-
{
new_id
}
"
def
mak
e_unique_ga_id
()
->
str
:
def
generat
e_unique_ga_id
()
->
str
:
"""
Generate a unique GA ID using the ga_id_seq database sequence.
"""
Generate a unique GA ID using the ga_id_seq database sequence.
Returns:
Returns:
...
...
This diff is collapsed.
Click to expand it.
gso/workflows/edge_port/create_edge_port.py
+
2
−
2
View file @
66bf227e
...
@@ -22,7 +22,7 @@ from gso.products.product_types.router import Router
...
@@ -22,7 +22,7 @@ from gso.products.product_types.router import Router
from
gso.services.lso_client
import
LSOState
,
lso_interaction
from
gso.services.lso_client
import
LSOState
,
lso_interaction
from
gso.services.netbox_client
import
NetboxClient
from
gso.services.netbox_client
import
NetboxClient
from
gso.services.partners
import
get_partner_by_id
from
gso.services.partners
import
get_partner_by_id
from
gso.services.subscriptions
import
mak
e_unique_ga_id
from
gso.services.subscriptions
import
generat
e_unique_ga_id
from
gso.utils.helpers
import
(
from
gso.utils.helpers
import
(
active_pe_router_selector
,
active_pe_router_selector
,
available_interfaces_choices
,
available_interfaces_choices
,
...
@@ -150,7 +150,7 @@ def initialize_subscription(
...
@@ -150,7 +150,7 @@ def initialize_subscription(
subscription
.
edge_port
.
edge_port_name
=
name
subscription
.
edge_port
.
edge_port_name
=
name
subscription
.
edge_port
.
minimum_links
=
minimum_links
subscription
.
edge_port
.
minimum_links
=
minimum_links
subscription
.
edge_port
.
ignore_if_down
=
ignore_if_down
subscription
.
edge_port
.
ignore_if_down
=
ignore_if_down
ga_id
=
mak
e_unique_ga_id
()
ga_id
=
generat
e_unique_ga_id
()
subscription
.
edge_port
.
ga_id
=
ga_id
subscription
.
edge_port
.
ga_id
=
ga_id
subscription
.
edge_port
.
mac_address
=
mac_address
subscription
.
edge_port
.
mac_address
=
mac_address
partner_name
=
get_partner_by_id
(
partner
).
name
partner_name
=
get_partner_by_id
(
partner
).
name
...
...
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