Loading manifests/pathcompextendedservice.yaml +11 −0 Original line number Diff line number Diff line Loading @@ -37,6 +37,17 @@ spec: env: - name: LOG_LEVEL value: "DEBUG" - name: ENABLE_HRAT value: "TRUE" - name: HRAT_HOST value: "10.0.2.10" - name: HRAT_PORT value: 9090 - name: HRAT_SCHEME value: "http" - name: HRAT_BASEURL value: "/api/resource-allocation" readinessProbe: exec: command: ["/bin/grpc_health_probe", "-addr=:30230"] Loading src/nbi/service/pathcompextended/__init__.py +1 −1 Original line number Diff line number Diff line Loading @@ -24,7 +24,7 @@ from .Resources import ( TransportNetworkSliceL3Details ) URL_PREFIX = '/pathcompextended' URL_PREFIX = '/pathcompextended/api/v1' def register_pathcompextended(nbi_app : NbiApplication): nbi_app.add_rest_api_resource( Loading src/pathcompextended/Config.py +0 −23 Original line number Diff line number Diff line Loading @@ -15,10 +15,6 @@ import os from common.Settings import get_setting, is_deployed_forecaster DEFAULT_PATHCOMPEXTENDED_BACKEND_SCHEME = 'http' DEFAULT_PATHCOMPEXTENDED_BACKEND_HOST = '127.0.0.1' DEFAULT_PATHCOMPEXTENDED_BACKEND_PORT = '8081' DEFAULT_PATHCOMPEXTENDED_BACKEND_BASEURL = '/pathCompExtended/api/v1' PATHCOMPEXTENDED_BACKEND_SCHEME = str(os.environ.get('PATHCOMPEXTENDED_BACKEND_SCHEME', DEFAULT_PATHCOMPEXTENDED_BACKEND_SCHEME )) PATHCOMPEXTENDED_BACKEND_BASEURL = str(os.environ.get('PATHCOMPEXTENDED_BACKEND_BASEURL', DEFAULT_PATHCOMPEXTENDED_BACKEND_BASEURL)) Loading @@ -28,29 +24,10 @@ PATHCOMPEXTENDED_BACKEND_BASEURL = str(os.environ.get('PATHCOMPEXTENDED_BACKEND_ # - if not set, check env vars PATHCOMPEXTENDEDSERVICE_SERVICE_HOST & PATHCOMPEXTENDEDSERVICE_SERVICE_PORT_HTTP # - if not set, use DEFAULT_PATHCOMPEXTENDED_BACKEND_HOST & DEFAULT_PATHCOMPEXTENDED_BACKEND_PORT backend_host = DEFAULT_PATHCOMPEXTENDED_BACKEND_HOST #backend_host = os.environ.get('PATHCOMPEXTENDEDSERVICE_SERVICE_HOST', backend_host) PATHCOMPEXTENDED_BACKEND_HOST = str(os.environ.get('PATHCOMPEXTENDED_BACKEND_HOST', backend_host)) backend_port = DEFAULT_PATHCOMPEXTENDED_BACKEND_PORT backend_port = os.environ.get('PATHCOMPEXTENDEDSERVICE_SERVICE_PORT_HTTP', backend_port) PATHCOMPEXTENDED_BACKEND_PORT = int(os.environ.get('PATHCOMPEXTENDED_BACKEND_PORT', backend_port)) BACKEND_URL = '{:s}://{:s}:{:d}{:s}'.format( PATHCOMPEXTENDED_BACKEND_SCHEME, PATHCOMPEXTENDED_BACKEND_HOST, PATHCOMPEXTENDED_BACKEND_PORT, PATHCOMPEXTENDED_BACKEND_BASEURL) SETTING_NAME_ENABLE_FORECASTER = 'ENABLE_FORECASTER' SETTING_NAME_ENABLE_HRAT = 'ENABLE_HRAT' TRUE_VALUES = {'Y', 'YES', 'TRUE', 'T', 'E', 'ENABLE', 'ENABLED'} def is_forecaster_enabled() -> bool: if not is_deployed_forecaster(): return False is_enabled = get_setting(SETTING_NAME_ENABLE_FORECASTER, default=None) if is_enabled is None: return False str_is_enabled = str(is_enabled).upper() return str_is_enabled in TRUE_VALUES # ------------------------------------------------------------ # # --- HRAT Configuration ------------------------------------- # Loading Loading
manifests/pathcompextendedservice.yaml +11 −0 Original line number Diff line number Diff line Loading @@ -37,6 +37,17 @@ spec: env: - name: LOG_LEVEL value: "DEBUG" - name: ENABLE_HRAT value: "TRUE" - name: HRAT_HOST value: "10.0.2.10" - name: HRAT_PORT value: 9090 - name: HRAT_SCHEME value: "http" - name: HRAT_BASEURL value: "/api/resource-allocation" readinessProbe: exec: command: ["/bin/grpc_health_probe", "-addr=:30230"] Loading
src/nbi/service/pathcompextended/__init__.py +1 −1 Original line number Diff line number Diff line Loading @@ -24,7 +24,7 @@ from .Resources import ( TransportNetworkSliceL3Details ) URL_PREFIX = '/pathcompextended' URL_PREFIX = '/pathcompextended/api/v1' def register_pathcompextended(nbi_app : NbiApplication): nbi_app.add_rest_api_resource( Loading
src/pathcompextended/Config.py +0 −23 Original line number Diff line number Diff line Loading @@ -15,10 +15,6 @@ import os from common.Settings import get_setting, is_deployed_forecaster DEFAULT_PATHCOMPEXTENDED_BACKEND_SCHEME = 'http' DEFAULT_PATHCOMPEXTENDED_BACKEND_HOST = '127.0.0.1' DEFAULT_PATHCOMPEXTENDED_BACKEND_PORT = '8081' DEFAULT_PATHCOMPEXTENDED_BACKEND_BASEURL = '/pathCompExtended/api/v1' PATHCOMPEXTENDED_BACKEND_SCHEME = str(os.environ.get('PATHCOMPEXTENDED_BACKEND_SCHEME', DEFAULT_PATHCOMPEXTENDED_BACKEND_SCHEME )) PATHCOMPEXTENDED_BACKEND_BASEURL = str(os.environ.get('PATHCOMPEXTENDED_BACKEND_BASEURL', DEFAULT_PATHCOMPEXTENDED_BACKEND_BASEURL)) Loading @@ -28,29 +24,10 @@ PATHCOMPEXTENDED_BACKEND_BASEURL = str(os.environ.get('PATHCOMPEXTENDED_BACKEND_ # - if not set, check env vars PATHCOMPEXTENDEDSERVICE_SERVICE_HOST & PATHCOMPEXTENDEDSERVICE_SERVICE_PORT_HTTP # - if not set, use DEFAULT_PATHCOMPEXTENDED_BACKEND_HOST & DEFAULT_PATHCOMPEXTENDED_BACKEND_PORT backend_host = DEFAULT_PATHCOMPEXTENDED_BACKEND_HOST #backend_host = os.environ.get('PATHCOMPEXTENDEDSERVICE_SERVICE_HOST', backend_host) PATHCOMPEXTENDED_BACKEND_HOST = str(os.environ.get('PATHCOMPEXTENDED_BACKEND_HOST', backend_host)) backend_port = DEFAULT_PATHCOMPEXTENDED_BACKEND_PORT backend_port = os.environ.get('PATHCOMPEXTENDEDSERVICE_SERVICE_PORT_HTTP', backend_port) PATHCOMPEXTENDED_BACKEND_PORT = int(os.environ.get('PATHCOMPEXTENDED_BACKEND_PORT', backend_port)) BACKEND_URL = '{:s}://{:s}:{:d}{:s}'.format( PATHCOMPEXTENDED_BACKEND_SCHEME, PATHCOMPEXTENDED_BACKEND_HOST, PATHCOMPEXTENDED_BACKEND_PORT, PATHCOMPEXTENDED_BACKEND_BASEURL) SETTING_NAME_ENABLE_FORECASTER = 'ENABLE_FORECASTER' SETTING_NAME_ENABLE_HRAT = 'ENABLE_HRAT' TRUE_VALUES = {'Y', 'YES', 'TRUE', 'T', 'E', 'ENABLE', 'ENABLED'} def is_forecaster_enabled() -> bool: if not is_deployed_forecaster(): return False is_enabled = get_setting(SETTING_NAME_ENABLE_FORECASTER, default=None) if is_enabled is None: return False str_is_enabled = str(is_enabled).upper() return str_is_enabled in TRUE_VALUES # ------------------------------------------------------------ # # --- HRAT Configuration ------------------------------------- # Loading