X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ric_robot_suite%2Fhelm%2Fnanobot%2Fconfigmap-src%2Fpublic%2Fproperties%2Fglobal_properties.robot;h=0e9d3ff0cd323665d156ff94cb8a110d319ba236;hb=427c16323bdc11b3ffa338ce51a2d509698ce7db;hp=704112f78ca505f3c1c4dd3cab849441464233c5;hpb=cc685917b28444e6e9fc70f1a96b14e073d8cec7;p=it%2Ftest.git diff --git a/ric_robot_suite/helm/nanobot/configmap-src/public/properties/global_properties.robot b/ric_robot_suite/helm/nanobot/configmap-src/public/properties/global_properties.robot index 704112f..0e9d3ff 100644 --- a/ric_robot_suite/helm/nanobot/configmap-src/public/properties/global_properties.robot +++ b/ric_robot_suite/helm/nanobot/configmap-src/public/properties/global_properties.robot @@ -1,5 +1,5 @@ # Copyright (c) 2019 AT&T Intellectual Property. -# +# Copyright (c) 2020 HCL Technologies Limited. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -18,6 +18,9 @@ {{- $ricplt := printf "%s.svc.%s" $ricpltNS $domain }} {{- $release := default "r1" .Values.ric.robot.release }} {{- $testxapp := default "robot-xapp" .Values.ric.robot.environment.xapp }} +{{- $dt := "deployment" }} +{{- $e2_suff := "alpha" }} +{{- $ds := "" }} # *** Settings *** Documentation store all properties that can change or are used in multiple places here @@ -26,12 +29,28 @@ Documentation store all properties that can change or are used in multipl *** Variables *** -&{GLOBAL_RICPLT_COMPONENTS} {{- range keys .Values.ric.platform.components }} -... {{.}}={{include (printf "common.deploymentname.%s" .) $}} +#{{ printf "%s.%s" (include "common.servicename.a1mediator.http" .) $ricplt }} +# {{ printf "%s-alpha.%s" (include "common.servicename.e2term.rmr" .) $ricplt}} +&{GLOBAL_RICPLT_COMPONENTS} {{- range $k, $v := .Values.ric.platform.components }} + {{- if $v }} + {{- $ct := index $v "controller" }} + {{- if $ct }} + {{- $dt = index $ct "type" | default "deployment" | lower }} + {{- $ds = index $ct "suffix" | default "" }} + {{- if $ds }} + {{- $ds = (printf "-%s" $ds) }} + {{- end }} + {{- else }} + {{- $dt = "deployment" }} + {{- $ds = "" }} + {{- end }} + {{- end }} +... {{$k}}={{$dt}}|{{include (printf "common.%sname.%s" $dt $k) $}}{{$ds}} {{- end }} &{GLOBAL_RICPLT_XAPPS} {{- range keys .Values.ric.xapp }} ... {{.}}={{ printf "%s-%s" $xappNS . }} {{- end }} + # ${GLOBAL_APPLICATION_ID} {{ default "r0" .Values.ric.robot.release | printf "nanobot-%s" }} ${GLOBAL_BUILD_NUMBER} {{ default "0" .Values.ric.platform.build }} @@ -54,14 +73,21 @@ ${GLOBAL_INJECTED_E2MGR_USER} {{ .Values.ric.platform.components.e2mgr.u ${GLOBAL_INJECTED_E2MGR_PASSWORD} {{ .Values.ric.platform.components.e2mgr.password }} {{- end }} # +{{- if .Values.ric.platform.components.e2term }} +${GLOBAL_INJECTED_E2TERM_IP_ADDR} {{ printf "%s-alpha.%s" (include "common.servicename.e2term.rmr" .) $ricplt}} +${GLOBAL_E2TERM_SERVER_PORT} {{ include "common.serviceport.e2term.rmr.data" . }} +{{- end }} +# {{- if .Values.ric.platform.components.rtmgr }} ${GLOBAL_RTMGR_SERVER_PROTOCOL} {{ default "http" .Values.ric.platform.components.rtmgr.protocol }} ${GLOBAL_INJECTED_RTMGR_IP_ADDR} {{ printf "%s.%s" (include "common.servicename.rtmgr.http" .) $ricplt }} -${GLOBAL_RTMGR_SERVER_PORT} {{ include "common.serviceport.e2mgr.http" . }} +${GLOBAL_RTMGR_SERVER_PORT} {{ include "common.serviceport.rtmgr.http" . }} +${GLOBAL_RTMGR_SERVER_HTTP_PORT} {{ default "8080" }} ${GLOBAL_INJECTED_RTMGR_USER} {{ .Values.ric.platform.components.rtmgr.user }} ${GLOBAL_INJECTED_RTMGR_PASSWORD} {{ .Values.ric.platform.components.rtmgr.password }} {{- end }} # +# {{- if .Values.ric.platform.components.a1mediator }} ${GLOBAL_A1MEDIATOR_SERVER_PROTOCOL} {{ default "http" .Values.ric.platform.components.a1mediator.protocol }} ${GLOBAL_INJECTED_A1MEDIATOR_IP_ADDR} {{ printf "%s.%s" (include "common.servicename.a1mediator.http" .) $ricplt }} @@ -71,6 +97,9 @@ ${GLOBAL_A1MEDIATOR_TARGET_XAPP} {{ default $testxapp .Values.ric.plat {{- end }} # {{- if .Values.ric.platform.components.o1mediator }} +${GLOBAL_O1MEDIATOR_SERVER_PROTOCOL} {{ default "http" .Values.ric.platform.components.o1mediator.protocol }} +${GLOBAL_O1MEDIATOR_HTTP_SERVER} {{ printf "%s.%s" (include "common.servicename.o1mediator.http" .) $ricplt }} +${GLOBAL_O1MEDIATOR_SERVER_PORT} {{ include "common.serviceport.o1mediator.http" . }} ${GLOBAL_O1MEDIATOR_HOST} {{ printf "%s.%s" (include "common.servicename.o1mediator.tcp.netconf" .) $ricplt }} ${GLOBAL_O1MEDIATOR_PORT} {{ include "common.serviceport.o1mediator.tcp.netconf" . }} ${GLOBAL_O1MEDIATOR_USER} {{ .Values.ric.platform.components.o1mediator.user }} @@ -80,10 +109,18 @@ ${GLOBAL_O1MEDIATOR_XAPP_VERSION} {{ default "1.0" .Values.ric.platform.co ${GLOBAL_O1MEDIATOR_DEPLOYMENT_WAIT} {{ default "180" .Values.ric.platform.components.o1mediator.xapp.wait }} {{- end }} # -${GLOBAL_INJECTED_DBAAS_IP_ADDR} {{ printf "%s.%s" (include "common.servicename.dbaas.tcp" .) $ricplt }} -${GLOBAL_DBAAS_SERVER_PORT} {{ include "common.serviceport.dbaas.tcp" . }} +{{- if .Values.ric.platform.components.submgr }} +${GLOBAL_SUBMGR_SERVER_PROTOCOL} {{ default "http" .Values.ric.platform.components.submgr.protocol }} +${GLOBAL_SUBMGR_HTTP_SERVER} {{ printf "%s.%s" (include "common.servicename.submgr.http" .) $ricplt }} +${GLOBAL_SUBMGR_SERVER_PORT} {{ include "common.serviceport.submgr.http" . }} +${GLOBAL_SUBMGR_SERVER_PROTOCOL} {{ default "http" .Values.ric.platform.components.submgr.protocol }} +${GLOBAL_INJECTED_SUBMGR_IP_ADDR} {{ printf "%s.%s" (include "common.servicename.submgr.http" .) $ricplt }} +${GLOBAL_INJECTED_SUBMGR_USER} {{ .Values.ric.platform.components.submgr.user }} +${GLOBAL_INJECTED_SUBMGR_PASSWORD} {{ .Values.ric.platform.components.submgr.password }} +{{- end }} # ${GLOBAL_TEST_XAPP} {{ default "xapp-std" .Values.ric.robot.environment.xapp }} +${GLOBAL_TEST_XAPP_ONBOARDER} {{ default "deployment|deployment-ricplt-xapp-onboarder" }} # ${GLOBAL_TEST_NODEB_NAME} {{ default "AAAA456789" .Values.ric.robot.environment.gNodeB.name }} ${GLOBAL_TEST_NODEB_ADDRESS} {{ default "10.0.0.3" .Values.ric.robot.environment.gNodeB.address }} @@ -92,3 +129,8 @@ ${GLOBAL_TEST_NODEB_PORT} {{ default "36421" .Values.ric.robot. ${GLOBAL_DASH_SERVER_PROTOCOL} {{ default "http" .Values.ric.robot.environment.dashboard.protocol }} ${GLOBAL_DASH_SERVER_PORT} {{ default "31080" .Values.ric.robot.environment.dashboard.port }} ${GLOBAL_INJECTED_DASH_IP_ADDR} {{ default "127.0.0.1" .Values.ric.robot.environment.dashboard.port }} +${GLOBAL_XAPP} {{ .Values.ric.robot.environment.xapp }} +${Global_RAN_NAMESPACE} {{ .Values.ric.robot.environment.gNodeB.ran_namespace }} +${Global_RAN_DEPLOYMENT} {{ .Values.ric.robot.environment.gNodeB.ran_deployment }} + +