From: Zhe Huang Date: Mon, 11 Jan 2021 14:51:55 +0000 (+0000) Subject: Merge "Add A1 STD V2 simulators" X-Git-Tag: f-release~65 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=81dc65cca59e635d527c1a4aae8be7e16c80b544;hp=ee640dc47d881672e230b849ffabcaab0ac39ddc;p=it%2Fdep.git Merge "Add A1 STD V2 simulators" --- diff --git a/nonrtric/bin/install b/nonrtric/bin/install index dbaff472..80088336 100755 --- a/nonrtric/bin/install +++ b/nonrtric/bin/install @@ -72,7 +72,7 @@ helm dep up $DIR/../helm/$PARENT_CHART HELM_NAME_OPT="" if [ -z $IS_HELM3 ];then HELM_NAME_OPT="--name" -fi +fi -helm install $DIR/../helm/"${PARENT_CHART}" -f $OVERRIDEYAML --namespace "${NONRTRIC_NAMESPACE:-nonrtric}" ${HELM_NAME_OPT} "${RELEASE_PREFIX}" +helm install -f $OVERRIDEYAML --namespace "${NONRTRIC_NAMESPACE:-nonrtric}" ${HELM_NAME_OPT} "${RELEASE_PREFIX}" $DIR/../helm/"${PARENT_CHART}" diff --git a/ric-common/Common-Template/helm/ric-common/templates/_alarmadapter.tpl b/ric-common/Common-Template/helm/ric-common/templates/_alarmmanager.tpl similarity index 50% rename from ric-common/Common-Template/helm/ric-common/templates/_alarmadapter.tpl rename to ric-common/Common-Template/helm/ric-common/templates/_alarmmanager.tpl index 27554927..a172e5ea 100755 --- a/ric-common/Common-Template/helm/ric-common/templates/_alarmadapter.tpl +++ b/ric-common/Common-Template/helm/ric-common/templates/_alarmmanager.tpl @@ -14,51 +14,68 @@ # limitations under the License. # ################################################################################ -{{- define "common.name.alarmadapter" -}} - {{- printf "alarmadapter" -}} +{{- define "common.name.alarmmanager" -}} + {{- printf "alarmmanager" -}} {{- end -}} -{{- define "common.fullname.alarmadapter" -}} - {{- $name := ( include "common.name.alarmadapter" . ) -}} +{{- define "common.fullname.alarmmanager" -}} + {{- $name := ( include "common.name.alarmmanager" . ) -}} {{- $namespace := ( include "common.namespace.platform" . ) -}} {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}} {{- end -}} -{{- define "common.configmapname.alarmadapter" -}} - {{- $name := ( include "common.fullname.alarmadapter" . ) -}} +{{- define "common.configmapname.alarmmanager" -}} + {{- $name := ( include "common.fullname.alarmmanager" . ) -}} {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} -{{- define "common.deploymentname.alarmadapter" -}} - {{- $name := ( include "common.fullname.alarmadapter" . ) -}} +{{- define "common.deploymentname.alarmmanager" -}} + {{- $name := ( include "common.fullname.alarmmanager" . ) -}} {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} -{{- define "common.containername.alarmadapter" -}} - {{- $name := ( include "common.fullname.alarmadapter" . ) -}} +{{- define "common.containername.alarmmanager" -}} + {{- $name := ( include "common.fullname.alarmmanager" . ) -}} {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} -{{- define "common.serviceaccountname.alarmadapter" -}} - {{- $name := ( include "common.fullname.alarmadapter" . ) -}} +{{- define "common.serviceaccountname.alarmmanager" -}} + {{- $name := ( include "common.fullname.alarmmanager" . ) -}} {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} -{{- define "common.ingressname.alarmadapter" -}} - {{- $name := ( include "common.fullname.alarmadapter" . ) -}} +{{- define "common.ingressname.alarmmanager" -}} + {{- $name := ( include "common.fullname.alarmmanager" . ) -}} {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{- define "common.kongpath.ric.alarmmanager" -}}/alarmmanager{{- end -}} -{{- define "common.servicename.alarmadapter.rmr" -}} - {{- $name := ( include "common.fullname.alarmadapter" . ) -}} +{{- define "common.servicename.alarmmanager.rmr" -}} + {{- $name := ( include "common.fullname.alarmmanager" . ) -}} {{- printf "service-%s-rmr" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} -{{- define "common.servicename.alarmadapter.http" -}} - {{- $name := ( include "common.fullname.alarmadapter" . ) -}} +{{- define "common.servicename.alarmmanager.http" -}} + {{- $name := ( include "common.fullname.alarmmanager" . ) -}} {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} -{{- define "common.serviceport.alarmadapter.rmr.data" -}}4560{{- end -}} -{{- define "common.serviceport.alarmadapter.rmr.route" -}}4561{{- end -}} -{{- define "common.serviceport.alarmadapter.http" -}}8080{{- end -}} +{{- define "common.servicename.alarmmanager.rest" -}} + {{- $name := ( include "common.fullname.alarmmanager" . ) -}} + {{- printf "service-%s-rest" $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{- define "common.pvname.alarmmanager" -}} + {{- $name := ( include "common.fullname.alarmmanager" . ) -}} + {{- printf "pv-%s" $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{- define "common.pvcname.alarmmanager" -}} + {{- $name := ( include "common.fullname.alarmmanager" . ) -}} + {{- printf "pvc-%s" $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{- define "common.serviceport.alarmmanager.rmr.data" -}}4560{{- end -}} +{{- define "common.serviceport.alarmmanager.rmr.route" -}}4561{{- end -}} +{{- define "common.serviceport.alarmmanager.http" -}}8080{{- end -}} +{{- define "common.serviceport.alarmmanager.rest" -}}8088{{- end -}}