From d92148dafae75a88eda98cc0b84d5017da830c8c Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Tue, 8 Oct 2024 17:42:05 +0000
Subject: [PATCH] Corrected ServiceName Constants for Analytics and Telemetry
---
src/analytics/frontend/client/AnalyticsFrontendClient.py | 4 ++--
.../frontend/service/AnalyticsFrontendService.py | 2 +-
src/analytics/frontend/tests/test_frontend.py | 6 +++---
src/common/Constants.py | 8 ++++----
src/telemetry/frontend/client/TelemetryFrontendClient.py | 4 ++--
.../frontend/service/TelemetryFrontendService.py | 2 +-
src/telemetry/frontend/tests/test_frontend.py | 6 +++---
7 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/analytics/frontend/client/AnalyticsFrontendClient.py b/src/analytics/frontend/client/AnalyticsFrontendClient.py
index 90e95d661..809c957ea 100644
--- a/src/analytics/frontend/client/AnalyticsFrontendClient.py
+++ b/src/analytics/frontend/client/AnalyticsFrontendClient.py
@@ -28,8 +28,8 @@ RETRY_DECORATOR = retry(max_retries=MAX_RETRIES, delay_function=DELAY_FUNCTION,
class AnalyticsFrontendClient:
def __init__(self, host=None, port=None):
- if not host: host = get_service_host(ServiceNameEnum.ANALYTICSFRONTEND)
- if not port: port = get_service_port_grpc(ServiceNameEnum.ANALYTICSFRONTEND)
+ if not host: host = get_service_host(ServiceNameEnum.ANALYTICS)
+ if not port: port = get_service_port_grpc(ServiceNameEnum.ANALYTICS)
self.endpoint = '{:s}:{:s}'.format(str(host), str(port))
LOGGER.debug('Creating channel to {:s}...'.format(str(self.endpoint)))
self.channel = None
diff --git a/src/analytics/frontend/service/AnalyticsFrontendService.py b/src/analytics/frontend/service/AnalyticsFrontendService.py
index 42a7fc9b6..8d2536fe0 100644
--- a/src/analytics/frontend/service/AnalyticsFrontendService.py
+++ b/src/analytics/frontend/service/AnalyticsFrontendService.py
@@ -20,7 +20,7 @@ from analytics.frontend.service.AnalyticsFrontendServiceServicerImpl import Anal
class AnalyticsFrontendService(GenericGrpcService):
def __init__(self, cls_name: str = __name__):
- port = get_service_port_grpc(ServiceNameEnum.ANALYTICSFRONTEND)
+ port = get_service_port_grpc(ServiceNameEnum.ANALYTICS)
super().__init__(port, cls_name=cls_name)
self.analytics_frontend_servicer = AnalyticsFrontendServiceServicerImpl()
diff --git a/src/analytics/frontend/tests/test_frontend.py b/src/analytics/frontend/tests/test_frontend.py
index 48ab4dac5..74fef6c79 100644
--- a/src/analytics/frontend/tests/test_frontend.py
+++ b/src/analytics/frontend/tests/test_frontend.py
@@ -41,9 +41,9 @@ from apscheduler.triggers.interval import IntervalTrigger
LOCAL_HOST = '127.0.0.1'
-ANALYTICS_FRONTEND_PORT = str(get_service_port_grpc(ServiceNameEnum.ANALYTICSFRONTEND))
-os.environ[get_env_var_name(ServiceNameEnum.ANALYTICSFRONTEND, ENVVAR_SUFIX_SERVICE_HOST )] = str(LOCAL_HOST)
-os.environ[get_env_var_name(ServiceNameEnum.ANALYTICSFRONTEND, ENVVAR_SUFIX_SERVICE_PORT_GRPC)] = str(ANALYTICS_FRONTEND_PORT)
+ANALYTICS_FRONTEND_PORT = str(get_service_port_grpc(ServiceNameEnum.ANALYTICS))
+os.environ[get_env_var_name(ServiceNameEnum.ANALYTICS, ENVVAR_SUFIX_SERVICE_HOST )] = str(LOCAL_HOST)
+os.environ[get_env_var_name(ServiceNameEnum.ANALYTICS, ENVVAR_SUFIX_SERVICE_PORT_GRPC)] = str(ANALYTICS_FRONTEND_PORT)
LOGGER = logging.getLogger(__name__)
diff --git a/src/common/Constants.py b/src/common/Constants.py
index 33a5d5047..bd4b9031f 100644
--- a/src/common/Constants.py
+++ b/src/common/Constants.py
@@ -66,9 +66,9 @@ class ServiceNameEnum(Enum):
KPIMANAGER = 'kpi-manager'
KPIVALUEAPI = 'kpi-value-api'
KPIVALUEWRITER = 'kpi-value-writer'
- TELEMETRYFRONTEND = 'telemetry-frontend'
+ TELEMETRY = 'telemetry'
TELEMETRYBACKEND = 'telemetry-backend'
- ANALYTICSFRONTEND = 'analytics-frontend'
+ ANALYTICS = 'analytics'
ANALYTICSBACKEND = 'analytics-backend'
QOSPROFILE = 'qos-profile'
@@ -105,9 +105,9 @@ DEFAULT_SERVICE_GRPC_PORTS = {
ServiceNameEnum.KPIMANAGER .value : 30010,
ServiceNameEnum.KPIVALUEAPI .value : 30020,
ServiceNameEnum.KPIVALUEWRITER .value : 30030,
- ServiceNameEnum.TELEMETRYFRONTEND .value : 30050,
+ ServiceNameEnum.TELEMETRY .value : 30050,
ServiceNameEnum.TELEMETRYBACKEND .value : 30060,
- ServiceNameEnum.ANALYTICSFRONTEND .value : 30080,
+ ServiceNameEnum.ANALYTICS .value : 30080,
ServiceNameEnum.ANALYTICSBACKEND .value : 30090,
ServiceNameEnum.AUTOMATION .value : 30200,
diff --git a/src/telemetry/frontend/client/TelemetryFrontendClient.py b/src/telemetry/frontend/client/TelemetryFrontendClient.py
index cd36ecd45..afcf24153 100644
--- a/src/telemetry/frontend/client/TelemetryFrontendClient.py
+++ b/src/telemetry/frontend/client/TelemetryFrontendClient.py
@@ -29,8 +29,8 @@ RETRY_DECORATOR = retry(max_retries=MAX_RETRIES, delay_function=DELAY_FUNCTION,
class TelemetryFrontendClient:
def __init__(self, host=None, port=None):
- if not host: host = get_service_host(ServiceNameEnum.TELEMETRYFRONTEND)
- if not port: port = get_service_port_grpc(ServiceNameEnum.TELEMETRYFRONTEND)
+ if not host: host = get_service_host(ServiceNameEnum.TELEMETRY)
+ if not port: port = get_service_port_grpc(ServiceNameEnum.TELEMETRY)
self.endpoint = '{:s}:{:s}'.format(str(host), str(port))
LOGGER.debug('Creating channel to {:s}...'.format(str(self.endpoint)))
self.channel = None
diff --git a/src/telemetry/frontend/service/TelemetryFrontendService.py b/src/telemetry/frontend/service/TelemetryFrontendService.py
index abd361aa0..49def20a1 100644
--- a/src/telemetry/frontend/service/TelemetryFrontendService.py
+++ b/src/telemetry/frontend/service/TelemetryFrontendService.py
@@ -21,7 +21,7 @@ from telemetry.frontend.service.TelemetryFrontendServiceServicerImpl import Tele
class TelemetryFrontendService(GenericGrpcService):
def __init__(self, cls_name: str = __name__) -> None:
- port = get_service_port_grpc(ServiceNameEnum.TELEMETRYFRONTEND)
+ port = get_service_port_grpc(ServiceNameEnum.TELEMETRY)
super().__init__(port, cls_name=cls_name)
self.telemetry_frontend_servicer = TelemetryFrontendServiceServicerImpl()
diff --git a/src/telemetry/frontend/tests/test_frontend.py b/src/telemetry/frontend/tests/test_frontend.py
index c3f8091c8..988d76af0 100644
--- a/src/telemetry/frontend/tests/test_frontend.py
+++ b/src/telemetry/frontend/tests/test_frontend.py
@@ -36,9 +36,9 @@ from telemetry.frontend.service.TelemetryFrontendServiceServicerImpl import Tele
LOCAL_HOST = '127.0.0.1'
-TELEMETRY_FRONTEND_PORT = str(get_service_port_grpc(ServiceNameEnum.TELEMETRYFRONTEND))
-os.environ[get_env_var_name(ServiceNameEnum.TELEMETRYFRONTEND, ENVVAR_SUFIX_SERVICE_HOST )] = str(LOCAL_HOST)
-os.environ[get_env_var_name(ServiceNameEnum.TELEMETRYFRONTEND, ENVVAR_SUFIX_SERVICE_PORT_GRPC)] = str(TELEMETRY_FRONTEND_PORT)
+TELEMETRY_FRONTEND_PORT = str(get_service_port_grpc(ServiceNameEnum.TELEMETRY))
+os.environ[get_env_var_name(ServiceNameEnum.TELEMETRY, ENVVAR_SUFIX_SERVICE_HOST )] = str(LOCAL_HOST)
+os.environ[get_env_var_name(ServiceNameEnum.TELEMETRY, ENVVAR_SUFIX_SERVICE_PORT_GRPC)] = str(TELEMETRY_FRONTEND_PORT)
LOGGER = logging.getLogger(__name__)
--
GitLab