From 2ea0f7b41faa303085784fd754f9005735ae5b71 Mon Sep 17 00:00:00 2001
From: Karel van Klink <karel.vanklink@geant.org>
Date: Fri, 9 Aug 2024 10:53:18 +0200
Subject: [PATCH] Remove site tier from KentikClient
---
gso/services/kentik_client.py | 4 +---
gso/workflows/router/promote_p_to_pe.py | 2 --
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/gso/services/kentik_client.py b/gso/services/kentik_client.py
index 7f62d169..bb990288 100644
--- a/gso/services/kentik_client.py
+++ b/gso/services/kentik_client.py
@@ -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,
diff --git a/gso/workflows/router/promote_p_to_pe.py b/gso/workflows/router/promote_p_to_pe.py
index c8c4f016..a910a571 100644
--- a/gso/workflows/router/promote_p_to_pe.py
+++ b/gso/workflows/router/promote_p_to_pe.py
@@ -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,
--
GitLab