Commit d92148da authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Corrected ServiceName Constants for Analytics and Telemetry

parent 5e23f50f

src/analytics/frontend/client/AnalyticsFrontendClient.py

+2 −2
Original line number Diff line number Diff line
@@ -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

src/analytics/frontend/service/AnalyticsFrontendService.py

+1 −1
Original line number Diff line number Diff line
@@ -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()

src/analytics/frontend/tests/test_frontend.py

+3 −3
Original line number Diff line number Diff line
@@ -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__)

src/common/Constants.py

+4 −4
Original line number Diff line number Diff line
@@ -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,

src/telemetry/frontend/client/TelemetryFrontendClient.py

+2 −2
Original line number Diff line number Diff line
@@ -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