From c414bac83714be22bd3d8a7f0987ee5a85407ddd Mon Sep 17 00:00:00 2001
From: "Georgios P. Katsikas" <gkatsikas@ubitech.eu>
Date: Fri, 7 Nov 2025 17:00:52 +0000
Subject: [PATCH] fix: telemetry INT collector misplacement issue

---
 src/telemetry/backend/service/HelperMethods.py               | 5 +++--
 src/telemetry/backend/service/collectors/__init__.py         | 3 +--
 .../backend/service/collectors/gnmi_oc/SubscriptionNew.py    | 4 ++--
 .../{ => service}/collectors/intcollector/INTCollector.py    | 2 +-
 .../collectors/intcollector/INTCollectorCommon.py            | 0
 .../{ => service}/collectors/intcollector/__init__.py        | 0
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename src/telemetry/backend/{ => service}/collectors/intcollector/INTCollector.py (99%)
 rename src/telemetry/backend/{ => service}/collectors/intcollector/INTCollectorCommon.py (100%)
 rename src/telemetry/backend/{ => service}/collectors/intcollector/__init__.py (100%)

diff --git a/src/telemetry/backend/service/HelperMethods.py b/src/telemetry/backend/service/HelperMethods.py
index db56c9a76..332b3f10d 100644
--- a/src/telemetry/backend/service/HelperMethods.py
+++ b/src/telemetry/backend/service/HelperMethods.py
@@ -19,12 +19,13 @@ from .collector_api.DriverInstanceCache      import get_driver
 from common.proto.kpi_manager_pb2            import KpiId
 from common.tools.context_queries.Device     import get_device
 from common.tools.context_queries.EndPoint   import get_endpoint_names
+from typing import List, Tuple, Optional
 
 LOGGER = logging.getLogger(__name__)
 
 def get_subscription_parameters(
         kpi_id : str, kpi_manager_client, context_client, duration, interval
-        ) -> list[tuple] | None:
+        ) -> Optional[List[Tuple]]:
     """
     Method to get subscription parameters based on KPI ID.
     Returns a list of tuples with subscription parameters.
@@ -95,7 +96,7 @@ def get_subscription_parameters(
 
 
 def get_collector_by_kpi_id(kpi_id: str, kpi_manager_client, context_client, driver_instance_cache
-                            ) -> _Collector | None:
+                            ) -> Optional[_Collector]:
     """
     Method to get a collector instance based on KPI ID.
     Preconditions:
diff --git a/src/telemetry/backend/service/collectors/__init__.py b/src/telemetry/backend/service/collectors/__init__.py
index 1e07dc43f..b2391d623 100644
--- a/src/telemetry/backend/service/collectors/__init__.py
+++ b/src/telemetry/backend/service/collectors/__init__.py
@@ -49,7 +49,7 @@ if LOAD_ALL_DEVICE_DRIVERS:
     )
 
 if LOAD_ALL_DEVICE_DRIVERS:
-    from ...collectors.intcollector.INTCollector import INTCollector # pylint: disable=wrong-import-position
+    from .intcollector.INTCollector import INTCollector # pylint: disable=wrong-import-position
     COLLECTORS.append(
         (INTCollector, [
             {
@@ -58,4 +58,3 @@ if LOAD_ALL_DEVICE_DRIVERS:
             }
         ])
     )
-
diff --git a/src/telemetry/backend/service/collectors/gnmi_oc/SubscriptionNew.py b/src/telemetry/backend/service/collectors/gnmi_oc/SubscriptionNew.py
index e34b2e472..cbf0ebf42 100644
--- a/src/telemetry/backend/service/collectors/gnmi_oc/SubscriptionNew.py
+++ b/src/telemetry/backend/service/collectors/gnmi_oc/SubscriptionNew.py
@@ -41,7 +41,7 @@ class Subscription:
         metric_queue:          Queue,
         mode:                  str        = "stream",
         sample_interval_ns:    int        = 10_000_000_000,
-        heartbeat_interval_ns: int | None = None,  # ← NEW
+        heartbeat_interval_ns: Optional[int] = None,  # ← NEW
         encoding:              str        = "json_ietf",
         on_update:             Optional[Callable[[dict], None]] = None,
     ) -> None:
@@ -82,7 +82,7 @@ class Subscription:
         path_list: List[str],
         mode: str,
         sample_interval_ns: int,
-        heartbeat_interval_ns: int | None,
+        heartbeat_interval_ns: Optional[int],
         encoding: str,
         on_update: Optional[Callable[[dict], None]],
     ) -> None:  # pragma: no cover
diff --git a/src/telemetry/backend/collectors/intcollector/INTCollector.py b/src/telemetry/backend/service/collectors/intcollector/INTCollector.py
similarity index 99%
rename from src/telemetry/backend/collectors/intcollector/INTCollector.py
rename to src/telemetry/backend/service/collectors/intcollector/INTCollector.py
index 9d89827f4..5931f33f3 100644
--- a/src/telemetry/backend/collectors/intcollector/INTCollector.py
+++ b/src/telemetry/backend/service/collectors/intcollector/INTCollector.py
@@ -20,7 +20,7 @@ from apscheduler.schedulers.background import BackgroundScheduler
 from apscheduler.jobstores.memory import MemoryJobStore
 from apscheduler.executors.pool import ThreadPoolExecutor
 from datetime import datetime
-from telemetry.backend.collector_api._Collector import _Collector
+from telemetry.backend.service.collector_api._Collector import _Collector
 
 from scapy.all import *
 import struct
diff --git a/src/telemetry/backend/collectors/intcollector/INTCollectorCommon.py b/src/telemetry/backend/service/collectors/intcollector/INTCollectorCommon.py
similarity index 100%
rename from src/telemetry/backend/collectors/intcollector/INTCollectorCommon.py
rename to src/telemetry/backend/service/collectors/intcollector/INTCollectorCommon.py
diff --git a/src/telemetry/backend/collectors/intcollector/__init__.py b/src/telemetry/backend/service/collectors/intcollector/__init__.py
similarity index 100%
rename from src/telemetry/backend/collectors/intcollector/__init__.py
rename to src/telemetry/backend/service/collectors/intcollector/__init__.py
-- 
GitLab