Commit 355cba92 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'cherry-pick-9ac39915' into 'develop' 

Resolve "E2E Orchestrator component has wrong service name in Constants.py"

See merge request !246
parents 4312f710 baa73d79

src/common/Constants.py

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ class ServiceNameEnum(Enum): 
    CACHING                = 'caching'

    TE                     = 'te'

    FORECASTER             = 'forecaster'

    E2EORCHESTRATOR        = 'e2eorchestrator'

    E2EORCHESTRATOR        = 'e2e-orchestrator'

    OPTICALCONTROLLER      = 'opticalcontroller'

    BGPLS                  = 'bgpls-speaker'

src/common/Settings.py

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