Fix ServiceNameEnum.APP to ServiceNameEnum.QKD_APP

src/qkd_app/client/QKDAppClient.py

@@ -28,8 +28,8 @@ RETRY_DECORATOR = retry(max_retries=MAX_RETRIES, delay_function=DELAY_FUNCTION,
 
 class QKDAppClient:
     def __init__(self, host=None, port=None):
-        if not host: host = get_service_host(ServiceNameEnum.APP)
-        if not port: port = get_service_port_grpc(ServiceNameEnum.APP)
+        if not host: host = get_service_host(ServiceNameEnum.QKD_APP)
+        if not port: port = get_service_port_grpc(ServiceNameEnum.QKD_APP)
         self.endpoint = '{:s}:{:s}'.format(str(host), str(port))
         LOGGER.debug('Creating channel to {:s}...'.format(self.endpoint))
         self.channel = None

src/qkd_app/service/QKDAppService.py

@@ -29,7 +29,7 @@ class AppService(GenericGrpcService):
     def __init__(
         self, db_engine : sqlalchemy.engine.Engine, messagebroker : MessageBroker, cls_name: str = __name__
     ) -> None:
-        port = get_service_port_grpc(ServiceNameEnum.APP)
+        port = get_service_port_grpc(ServiceNameEnum.QKD_APP)
         super().__init__(port, max_workers=GRPC_MAX_WORKERS, cls_name=cls_name)
         self.app_servicer = AppServiceServicerImpl(db_engine, messagebroker)
 

src/qkd_app/service/rest_server/RestServer.py

@@ -18,6 +18,6 @@ from common.tools.service.GenericRestServer import GenericRestServer
 
 class RestServer(GenericRestServer):
     def __init__(self, cls_name: str = __name__) -> None:
-        bind_port = get_service_port_http(ServiceNameEnum.APP)
-        base_url = get_service_baseurl_http(ServiceNameEnum.APP)
+        bind_port = get_service_port_http(ServiceNameEnum.QKD_APP)
+        base_url = get_service_baseurl_http(ServiceNameEnum.QKD_APP)
         super().__init__(bind_port, base_url, cls_name=cls_name)

src/webui/service/__main__.py

@@ -43,8 +43,8 @@ def main():
         get_env_var_name(ServiceNameEnum.SERVICE, ENVVAR_SUFIX_SERVICE_PORT_GRPC),
         get_env_var_name(ServiceNameEnum.SLICE,   ENVVAR_SUFIX_SERVICE_HOST     ),
         get_env_var_name(ServiceNameEnum.SLICE,   ENVVAR_SUFIX_SERVICE_PORT_GRPC),
-        get_env_var_name(ServiceNameEnum.APP,   ENVVAR_SUFIX_SERVICE_HOST     ),
-        get_env_var_name(ServiceNameEnum.APP,   ENVVAR_SUFIX_SERVICE_PORT_GRPC),
+        get_env_var_name(ServiceNameEnum.QKD_APP, ENVVAR_SUFIX_SERVICE_HOST     ),
+        get_env_var_name(ServiceNameEnum.QKD_APP, ENVVAR_SUFIX_SERVICE_PORT_GRPC),
     ])
 
     logger.info('Starting...')