From baa73d795398100b66254f6228de784eace7fff9 Mon Sep 17 00:00:00 2001 From: Lluis Gifre Renom Date: Mon, 22 Jul 2024 09:00:00 +0000 Subject: [PATCH] Merge branch 'feat/171-e2e-orchestrator-component-has-wrong-service-name-in-constants-py' into 'release/3.0.1' Resolve "E2E Orchestrator component has wrong service name in Constants.py" See merge request tfs/controller!245 (cherry picked from commit 9ac39915f30c035fa7cba6165cb255eaa47adddd) d1c7d0eb Common Framework: --- src/common/Constants.py | 2 +- src/common/Settings.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/common/Constants.py b/src/common/Constants.py index de9ac45a4..a6a6899b0 100644 --- a/src/common/Constants.py +++ b/src/common/Constants.py @@ -58,7 +58,7 @@ class ServiceNameEnum(Enum): CACHING = 'caching' TE = 'te' FORECASTER = 'forecaster' - E2EORCHESTRATOR = 'e2eorchestrator' + E2EORCHESTRATOR = 'e2e-orchestrator' OPTICALCONTROLLER = 'opticalcontroller' BGPLS = 'bgpls-speaker' diff --git a/src/common/Settings.py b/src/common/Settings.py index edc74c776..eaeb363ad 100644 --- a/src/common/Settings.py +++ b/src/common/Settings.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import logging, os, time +import logging, os, re, time from typing import Dict, List from common.Constants import ( DEFAULT_GRPC_BIND_ADDRESS, DEFAULT_GRPC_GRACE_PERIOD, DEFAULT_GRPC_MAX_WORKERS, DEFAULT_HTTP_BIND_ADDRESS, @@ -68,7 +68,8 @@ def get_setting(name, **kwargs): raise Exception('Setting({:s}) not specified in environment or configuration'.format(str(name))) def get_env_var_name(service_name : ServiceNameEnum, env_var_group): - return ('{:s}SERVICE_{:s}'.format(service_name.value, env_var_group)).upper() + service_name = re.sub(r'[^a-zA-Z0-9]', '_', service_name.value) + return ('{:s}SERVICE_{:s}'.format(service_name, env_var_group)).upper() def get_service_host(service_name : ServiceNameEnum): envvar_name = get_env_var_name(service_name, ENVVAR_SUFIX_SERVICE_HOST) -- GitLab