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
2ea0f7b4
Verified
Commit
2ea0f7b4
authored
7 months ago
by
Karel van Klink
Browse files
Options
Downloads
Patches
Plain Diff
Remove site tier from KentikClient
parent
32ec1310
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
gso/services/kentik_client.py
+1
-3
1 addition, 3 deletions
gso/services/kentik_client.py
gso/workflows/router/promote_p_to_pe.py
+0
-2
0 additions, 2 deletions
gso/workflows/router/promote_p_to_pe.py
with
1 addition
and
5 deletions
gso/services/kentik_client.py
+
1
−
3
View file @
2ea0f7b4
...
...
@@ -7,7 +7,6 @@ import requests
from
pydantic
import
BaseModel
from
requests
import
Response
from
gso.products.product_blocks.site
import
SiteTier
from
gso.settings
import
load_oss_params
logger
=
logging
.
getLogger
(
__name__
)
...
...
@@ -20,7 +19,6 @@ class NewKentikDevice(BaseModel):
device_description
:
str
sending_ips
:
list
[
str
]
site_id
:
int
site_tier
:
SiteTier
device_snmp_ip
:
str
device_bgp_flowspec
:
bool
device_bgp_neighbor_ip
:
str
...
...
@@ -117,7 +115,7 @@ class KentikClient:
plan_id
=
self
.
get_plan_by_name
(
self
.
config
.
placeholder_license_key
)[
"
id
"
]
request_body
=
{
"
device
"
:
{
**
device
.
model_dump
(
exclude
=
set
(
"
device_name
"
"
site_tier
"
)),
**
device
.
model_dump
(
exclude
=
set
(
"
device_name
"
)),
"
device_name
"
:
device
.
device_description
,
"
device_type
"
:
self
.
config
.
device_type
,
"
device_subtype
"
:
self
.
config
.
device_type
,
...
...
This diff is collapsed.
Click to expand it.
gso/workflows/router/promote_p_to_pe.py
+
0
−
2
View file @
2ea0f7b4
...
...
@@ -130,12 +130,10 @@ def create_kentik_device(subscription: Router) -> State:
msg
=
"
Site could not be found in Kentik.
"
raise
ProcessFailureError
(
msg
,
details
=
subscription
.
router
.
router_site
.
site_name
)
site_tier
=
subscription
.
router
.
router_site
.
site_tier
new_device
=
NewKentikDevice
(
device_name
=
subscription
.
router
.
router_fqdn
,
device_description
=
str
(
subscription
.
subscription_id
),
sending_ips
=
[
str
(
subscription
.
router
.
router_lo_ipv4_address
)],
site_tier
=
site_tier
,
site_id
=
kentik_site
[
"
id
"
],
device_snmp_ip
=
str
(
subscription
.
router
.
router_lo_ipv4_address
),
device_bgp_flowspec
=
False
,
...
...
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