From 89a4298c2135fa58a2a5b9ff70f96c5874875ec7 Mon Sep 17 00:00:00 2001 From: elinuxhenrik Date: Fri, 1 Jul 2022 11:19:43 +0200 Subject: [PATCH] Align nonrtric products to release f Issue-ID: NONRTRIC-762 Signed-off-by: elinuxhenrik Change-Id: I8f4012160aea72d3bb3c79567235a924f1ecef95 --- bin/deploy-nonrtric | 2 +- bin/undeploy-nonrtric | 2 +- nonrtric/RECIPE_EXAMPLE/example_recipe.yaml | 49 +++++++++++----------- nonrtric/helm/a1simulator/values.yaml | 2 +- nonrtric/helm/dmaapadapterservice/values.yaml | 4 +- nonrtric/helm/dmaapmediatorservice/values.yaml | 4 +- nonrtric/helm/helmmanager/values.yaml | 4 +- nonrtric/helm/informationservice/values.yaml | 4 +- nonrtric/helm/nonrtric/Chart.yaml | 8 ++-- nonrtric/helm/nonrtric/values.yaml | 4 +- .../Chart.yaml | 2 +- .../requirements.yaml | 0 .../resources/config/o-ru-to-o-du-map.csv | 0 .../templates/configmap.yaml | 4 +- .../templates/deployment.yaml | 42 +++++++++---------- .../templates/service.yaml | 12 +++--- .../values.yaml | 6 +-- nonrtric/helm/policymanagementservice/values.yaml | 4 +- .../Chart.yaml | 2 +- .../requirements.yaml | 0 .../templates/deployment.yaml | 30 ++++++------- .../templates/service.yaml | 12 +++--- .../values.yaml | 6 +-- nonrtric/helm/rappcatalogueservice/values.yaml | 4 +- ...ruclosedlooprecovery.tpl => _orufhrecovery.tpl} | 8 ++-- ...dusliceassurance.tpl => _ransliceassurance.tpl} | 8 ++-- .../oran_oom/dmaapadapterservice/values.yaml | 4 +- .../oran_oom/dmaapmediatorservice/values.yaml | 4 +- smo-install/oran_oom/helmmanager/values.yaml | 4 +- .../oran_oom/informationservice/values.yaml | 4 +- smo-install/oran_oom/oru-app/values.yaml | 4 +- .../oran_oom/policymanagementservice/values.yaml | 4 +- .../oran_oom/rappcatalogueservice/values.yaml | 4 +- 33 files changed, 126 insertions(+), 125 deletions(-) rename nonrtric/helm/{oruclosedlooprecovery => orufhrecovery}/Chart.yaml (97%) rename nonrtric/helm/{odusliceassurance => orufhrecovery}/requirements.yaml (100%) rename nonrtric/helm/{oruclosedlooprecovery => orufhrecovery}/resources/config/o-ru-to-o-du-map.csv (100%) rename nonrtric/helm/{oruclosedlooprecovery => orufhrecovery}/templates/configmap.yaml (93%) rename nonrtric/helm/{oruclosedlooprecovery => orufhrecovery}/templates/deployment.yaml (61%) rename nonrtric/helm/{oruclosedlooprecovery => orufhrecovery}/templates/service.yaml (83%) rename nonrtric/helm/{oruclosedlooprecovery => orufhrecovery}/values.yaml (95%) rename nonrtric/helm/{odusliceassurance => ransliceassurance}/Chart.yaml (98%) rename nonrtric/helm/{oruclosedlooprecovery => ransliceassurance}/requirements.yaml (100%) rename nonrtric/helm/{odusliceassurance => ransliceassurance}/templates/deployment.yaml (70%) rename nonrtric/helm/{odusliceassurance => ransliceassurance}/templates/service.yaml (84%) rename nonrtric/helm/{odusliceassurance => ransliceassurance}/values.yaml (95%) rename ric-common/Common-Template/helm/nonrtric-common/templates/{_oruclosedlooprecovery.tpl => _orufhrecovery.tpl} (85%) rename ric-common/Common-Template/helm/nonrtric-common/templates/{_odusliceassurance.tpl => _ransliceassurance.tpl} (86%) diff --git a/bin/deploy-nonrtric b/bin/deploy-nonrtric index cdf993e3..47f3ea6d 100755 --- a/bin/deploy-nonrtric +++ b/bin/deploy-nonrtric @@ -106,7 +106,7 @@ rm $HELM_LOCAL_REPO/* helm repo remove local $ROOT_DIR/prepare-common-templates -COMPONENTS="controlpanel a1controller a1simulator policymanagementservice informationservice rappcatalogueservice nonrtricgateway dmaapadapterservice dmaapmediatorservice helmmanager oruclosedlooprecovery odusliceassurance" +COMPONENTS="controlpanel a1controller a1simulator policymanagementservice informationservice rappcatalogueservice nonrtricgateway dmaapadapterservice dmaapmediatorservice helmmanager orufhrecovery ransliceassurance" for component in $COMPONENTS; do echo "Packaging NONRTRIC component [$component]" helm dep up $ROOT_DIR/../nonrtric/helm/$component diff --git a/bin/undeploy-nonrtric b/bin/undeploy-nonrtric index a97f888a..be6dff7e 100755 --- a/bin/undeploy-nonrtric +++ b/bin/undeploy-nonrtric @@ -18,7 +18,7 @@ # This script to undeploy the NONRTRIC -COMPONENTS="controlpanel a1controller a1simulator policymanagementservice informationservice rappcatalogueservice nonrtricgateway dmaapadapterservice dmaapmediatorservice helmmanager oruclosedlooprecovery odusliceassurance" +COMPONENTS="controlpanel a1controller a1simulator policymanagementservice informationservice rappcatalogueservice nonrtricgateway dmaapadapterservice dmaapmediatorservice helmmanager orufhrecovery ransliceassurance" RECIPE_NAMESPACE=$(kubectl get cm --all-namespaces | grep nonrtric-recipe | awk '{print $1}') kubectl get configmap -n $RECIPE_NAMESPACE nonrtric-recipe -o jsonpath='{.data.recipe}' > /tmp/recipe.yaml diff --git a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml index ea90b1d9..b6494407 100644 --- a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml +++ b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml @@ -32,8 +32,8 @@ nonrtric: installDmaapadapterservice: true installDmaapmediatorservice: true installHelmmanager: true - installOruclosedlooprecovery: true - installOdusliceassurance: true + installOrufhrecovery: true + installRansliceassurance: true volume1: # Set the size to 0 if you do not need the volume (if you are using Dynamic Volume Provisioning) size: 2Gi @@ -59,8 +59,8 @@ informationservice: imagePullPolicy: Always image: registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc' - name: 'nonrtric-information-coordinator-service' - tag: 1.2.1 + name: 'nonrtric-plt-informationcoordinatorservice' + tag: 1.3.0 service: allowHttp: true httpName: http @@ -89,8 +89,8 @@ policymanagementservice: imagePullPolicy: Always image: registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc' - name: nonrtric-a1-policy-management-service - tag: 2.3.1 + name: nonrtric-plt-a1policymanagementservice + tag: 2.4.0 service: allowHttp: true httpName: http @@ -113,7 +113,7 @@ policymanagementservice: ingress: enabled: true -# A1 Conttroller may take few more minutes to start. Increase the initialDelaySeconds in liveness to avoid container restart. +# A1 Controller may take few more minutes to start. Increase the initialDelaySeconds in liveness to avoid container restart. a1controller: a1controller: imagePullPolicy: Always @@ -144,7 +144,7 @@ a1simulator: image: registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc' name: a1-simulator - tag: 2.2.0 + tag: 2.3.0 service: allowHttp: true httpName: http @@ -201,8 +201,8 @@ rappcatalogueservice: imagePullPolicy: Always image: registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc' - name: nonrtric-r-app-catalogue - tag: 1.0.2 + name: nonrtric-plt-rappcatalogue + tag: 1.1.0 service: allowHttp: true httpName: http @@ -242,8 +242,8 @@ dmaapadapterservice: imagePullPolicy: Always image: registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc' - name: 'nonrtric-dmaap-adaptor' - tag: 1.0.1 + name: 'nonrtric-plt-dmaapadapter' + tag: 1.1.0 service: allowHttp: true httpName: http @@ -264,8 +264,8 @@ dmaapmediatorservice: imagePullPolicy: IfNotPresent image: registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" - name: "nonrtric-dmaap-mediator-producer" - tag: 1.0.1 + name: "nonrtric-plt-dmaapmediatorproducer" + tag: 1.1.0 service: allowHttp: true httpName: http @@ -287,8 +287,8 @@ helmmanager: imagePullPolicy: Always image: registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" - name: "nonrtric-helm-manager" - tag: 1.1.1 + name: "nonrtric-plt-helmmanager" + tag: 1.2.0 service: httpName: http internalPort1: 8112 @@ -305,13 +305,13 @@ helmmanager: size: 1Gi storageClassName: helmmanager-storage -odusliceassurance: - odusliceassurance: +ransliceassurance: + ransliceassurance: imagePullPolicy: IfNotPresent image: registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" - name: "nonrtric-o-du-slice-assurance" - tag: 1.0.2 + name: "nonrtric-rapp-ransliceassurance" + tag: 1.1.0 env: mr_host: "http://onap-dmaap" mr_port: "3904" @@ -321,13 +321,13 @@ odusliceassurance: log_level: "Info" polltime: "10" -oruclosedlooprecovery: - oruclosedlooprecovery: +orufhrecovery: + orufhrecovery: imagePullPolicy: IfNotPresent image: registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" - name: "nonrtric-o-ru-closed-loop-consumer" - tag: 1.0.1 + name: "nonrtric-rapp-orufhrecovery" + tag: 1.1.0 env: consumer_host: "http://mrproducer" consumer_port: "8095" @@ -339,3 +339,4 @@ oruclosedlooprecovery: sdnr_password: "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" oru_to_odu_map_file: "o-ru-to-o-du-map.csv" log_level: "Info" + diff --git a/nonrtric/helm/a1simulator/values.yaml b/nonrtric/helm/a1simulator/values.yaml index d104e1a2..8d7fb32c 100644 --- a/nonrtric/helm/a1simulator/values.yaml +++ b/nonrtric/helm/a1simulator/values.yaml @@ -24,7 +24,7 @@ a1simulator: image: registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc' name: a1-simulator - tag: 2.2.0 + tag: 2.3.0 service: allowHttp: true httpName: http diff --git a/nonrtric/helm/dmaapadapterservice/values.yaml b/nonrtric/helm/dmaapadapterservice/values.yaml index 24263c48..8db10694 100644 --- a/nonrtric/helm/dmaapadapterservice/values.yaml +++ b/nonrtric/helm/dmaapadapterservice/values.yaml @@ -22,8 +22,8 @@ dmaapadapterservice: imagePullPolicy: IfNotPresent image: registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" - name: "nonrtric-dmaap-adaptor" - tag: 1.0.1 + name: "nonrtric-plt-dmaapadapter" + tag: 1.1.0 service: allowHttp: true httpName: http diff --git a/nonrtric/helm/dmaapmediatorservice/values.yaml b/nonrtric/helm/dmaapmediatorservice/values.yaml index fd67ae6d..9a99dfc8 100644 --- a/nonrtric/helm/dmaapmediatorservice/values.yaml +++ b/nonrtric/helm/dmaapmediatorservice/values.yaml @@ -22,8 +22,8 @@ dmaapmediatorservice: imagePullPolicy: IfNotPresent image: registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" - name: "nonrtric-dmaap-mediator-producer" - tag: 1.0.1 + name: "nonrtric-plt-dmaapmediatorproducer" + tag: 1.1.0 service: allowHttp: true httpName: http diff --git a/nonrtric/helm/helmmanager/values.yaml b/nonrtric/helm/helmmanager/values.yaml index 94a6777e..ad141e0b 100644 --- a/nonrtric/helm/helmmanager/values.yaml +++ b/nonrtric/helm/helmmanager/values.yaml @@ -23,8 +23,8 @@ helmmanager: imagePullPolicy: IfNotPresent image: registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" - name: "nonrtric-helm-manager" - tag: 1.1.1 + name: "nonrtric-plt-helmmanager" + tag: 1.2.0 service: httpName: http internalPort1: 8112 diff --git a/nonrtric/helm/informationservice/values.yaml b/nonrtric/helm/informationservice/values.yaml index f5d83aa6..4ef157fd 100644 --- a/nonrtric/helm/informationservice/values.yaml +++ b/nonrtric/helm/informationservice/values.yaml @@ -22,8 +22,8 @@ informationservice: imagePullPolicy: IfNotPresent image: registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" - name: "nonrtric-information-coordinator-service" - tag: 1.2.1 + name: "nonrtric-plt-informationcoordinatorservice" + tag: 1.3.0 service: allowHttp: true httpName: http diff --git a/nonrtric/helm/nonrtric/Chart.yaml b/nonrtric/helm/nonrtric/Chart.yaml index 73072293..bb2a24a2 100644 --- a/nonrtric/helm/nonrtric/Chart.yaml +++ b/nonrtric/helm/nonrtric/Chart.yaml @@ -75,12 +75,12 @@ dependencies: repository: "@local" condition: nonrtric.installHelmmanager - - name: odusliceassurance + - name: ransliceassurance version: ~1.0.0 repository: "@local" - condition: nonrtric.installOdusliceassurance + condition: nonrtric.installRansliceassurance - - name: oruclosedlooprecovery + - name: orufhrecovery version: ~1.0.0 repository: "@local" - condition: nonrtric.installOruclosedlooprecovery + condition: nonrtric.installOrufhrecovery diff --git a/nonrtric/helm/nonrtric/values.yaml b/nonrtric/helm/nonrtric/values.yaml index 983ca346..e936b135 100644 --- a/nonrtric/helm/nonrtric/values.yaml +++ b/nonrtric/helm/nonrtric/values.yaml @@ -25,8 +25,8 @@ nonrtric: installDmaapadapterservice: true installDmaapmediatorservice: true installHelmmanager: true - installOruclosedlooprecovery: true - installOdusliceassurance: true + installOrufhrecovery: true + installRansliceassurance: true volume1: size: 1Gi diff --git a/nonrtric/helm/oruclosedlooprecovery/Chart.yaml b/nonrtric/helm/orufhrecovery/Chart.yaml similarity index 97% rename from nonrtric/helm/oruclosedlooprecovery/Chart.yaml rename to nonrtric/helm/orufhrecovery/Chart.yaml index df25c817..789a7050 100644 --- a/nonrtric/helm/oruclosedlooprecovery/Chart.yaml +++ b/nonrtric/helm/orufhrecovery/Chart.yaml @@ -17,5 +17,5 @@ apiVersion: v1 appVersion: "2.0.0" description: A Helm chart for oru closed loop recovery -name: oruclosedlooprecovery +name: orufhrecovery version: 1.0.0 diff --git a/nonrtric/helm/odusliceassurance/requirements.yaml b/nonrtric/helm/orufhrecovery/requirements.yaml similarity index 100% rename from nonrtric/helm/odusliceassurance/requirements.yaml rename to nonrtric/helm/orufhrecovery/requirements.yaml diff --git a/nonrtric/helm/oruclosedlooprecovery/resources/config/o-ru-to-o-du-map.csv b/nonrtric/helm/orufhrecovery/resources/config/o-ru-to-o-du-map.csv similarity index 100% rename from nonrtric/helm/oruclosedlooprecovery/resources/config/o-ru-to-o-du-map.csv rename to nonrtric/helm/orufhrecovery/resources/config/o-ru-to-o-du-map.csv diff --git a/nonrtric/helm/oruclosedlooprecovery/templates/configmap.yaml b/nonrtric/helm/orufhrecovery/templates/configmap.yaml similarity index 93% rename from nonrtric/helm/oruclosedlooprecovery/templates/configmap.yaml rename to nonrtric/helm/orufhrecovery/templates/configmap.yaml index 4f1ce19a..3882374a 100644 --- a/nonrtric/helm/oruclosedlooprecovery/templates/configmap.yaml +++ b/nonrtric/helm/orufhrecovery/templates/configmap.yaml @@ -18,10 +18,10 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "common.name.oruclosedlooprecovery" . }}-configmap-config + name: {{ include "common.name.orufhrecovery" . }}-configmap-config namespace: {{ include "common.namespace.nonrtric" . }} labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.oruclosedlooprecovery" . }} + app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.orufhrecovery" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} diff --git a/nonrtric/helm/oruclosedlooprecovery/templates/deployment.yaml b/nonrtric/helm/orufhrecovery/templates/deployment.yaml similarity index 61% rename from nonrtric/helm/oruclosedlooprecovery/templates/deployment.yaml rename to nonrtric/helm/orufhrecovery/templates/deployment.yaml index fbc8bffb..0d975555 100644 --- a/nonrtric/helm/oruclosedlooprecovery/templates/deployment.yaml +++ b/nonrtric/helm/orufhrecovery/templates/deployment.yaml @@ -17,11 +17,11 @@ kind: Deployment apiVersion: apps/v1 metadata: - name: {{ include "common.name.oruclosedlooprecovery" . }} + name: {{ include "common.name.orufhrecovery" . }} namespace: {{ include "common.namespace.nonrtric" . }} generation: 1 labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.oruclosedlooprecovery" . }} + app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.orufhrecovery" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -31,48 +31,48 @@ spec: replicas: 1 selector: matchLabels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.oruclosedlooprecovery" . }} + app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.orufhrecovery" . }} release: {{ .Release.Name }} template: metadata: labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.oruclosedlooprecovery" . }} + app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.orufhrecovery" . }} release: {{ .Release.Name }} spec: - hostname: {{ include "common.name.oruclosedlooprecovery" . }} + hostname: {{ include "common.name.orufhrecovery" . }} containers: - - name: {{ include "common.container.oruclosedlooprecovery" . }} - image: {{ .Values.oruclosedlooprecovery.image.registry }}/{{ .Values.oruclosedlooprecovery.image.name }}:{{ .Values.oruclosedlooprecovery.image.tag }} - imagePullPolicy: {{ .Values.oruclosedlooprecovery.imagePullPolicy }} + - name: {{ include "common.container.orufhrecovery" . }} + image: {{ .Values.orufhrecovery.image.registry }}/{{ .Values.orufhrecovery.image.name }}:{{ .Values.orufhrecovery.image.tag }} + imagePullPolicy: {{ .Values.orufhrecovery.imagePullPolicy }} ports: - containerPort: 80 protocol: TCP env: - name: CONSUMER_HOST - value: "{{ .Values.oruclosedlooprecovery.env.consumer_host }}" + value: "{{ .Values.orufhrecovery.env.consumer_host }}" - name: CONSUMER_PORT - value: "{{ .Values.oruclosedlooprecovery.env.consumer_port }}" + value: "{{ .Values.orufhrecovery.env.consumer_port }}" - name: CONSUMER_CERT_PATH - value: "{{ .Values.oruclosedlooprecovery.env.consumer_cert_path }}" + value: "{{ .Values.orufhrecovery.env.consumer_cert_path }}" - name: CONSUMER_KEY_PATH - value: "{{ .Values.oruclosedlooprecovery.env.consumer_key_path }}" + value: "{{ .Values.orufhrecovery.env.consumer_key_path }}" - name: INFO_COORD_ADDR - value: "{{ .Values.oruclosedlooprecovery.env.info_coord_addr }}" + value: "{{ .Values.orufhrecovery.env.info_coord_addr }}" - name: SDNR_ADDR - value: "{{ .Values.oruclosedlooprecovery.env.sdnr_address }}" + value: "{{ .Values.orufhrecovery.env.sdnr_address }}" - name: SDNR_USER - value: "{{ .Values.oruclosedlooprecovery.env.sdnr_user }}" + value: "{{ .Values.orufhrecovery.env.sdnr_user }}" - name: SDNR_PASSWORD - value: "{{ .Values.oruclosedlooprecovery.env.sdnr_password }}" + value: "{{ .Values.orufhrecovery.env.sdnr_password }}" - name: ORU_TO_ODU_MAP_FILE - value: "{{ .Values.oruclosedlooprecovery.env.oru_to_odu_map_file }}" + value: "{{ .Values.orufhrecovery.env.oru_to_odu_map_file }}" - name: LOG_LEVEL - value: "{{ .Values.oruclosedlooprecovery.env.log_level }}" + value: "{{ .Values.orufhrecovery.env.log_level }}" volumeMounts: - - name: {{ include "common.name.oruclosedlooprecovery" . }}-oru-config + - name: {{ include "common.name.orufhrecovery" . }}-oru-config mountPath: "/app/o-ru-to-o-du-map.csv" subPath: "o-ru-to-o-du-map.csv" volumes: - - name: {{ include "common.name.oruclosedlooprecovery" . }}-oru-config + - name: {{ include "common.name.orufhrecovery" . }}-oru-config configMap: - name: {{ include "common.name.oruclosedlooprecovery" . }}-configmap-config + name: {{ include "common.name.orufhrecovery" . }}-configmap-config diff --git a/nonrtric/helm/oruclosedlooprecovery/templates/service.yaml b/nonrtric/helm/orufhrecovery/templates/service.yaml similarity index 83% rename from nonrtric/helm/oruclosedlooprecovery/templates/service.yaml rename to nonrtric/helm/orufhrecovery/templates/service.yaml index adca2098..3cf88e18 100644 --- a/nonrtric/helm/oruclosedlooprecovery/templates/service.yaml +++ b/nonrtric/helm/orufhrecovery/templates/service.yaml @@ -17,21 +17,21 @@ kind: Service apiVersion: v1 metadata: - name: {{ include "common.name.oruclosedlooprecovery" . }} + name: {{ include "common.name.orufhrecovery" . }} namespace: {{ include "common.namespace.nonrtric" . }} labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.oruclosedlooprecovery" . }} + app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.orufhrecovery" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: ports: - {{if eq .Values.oruclosedlooprecovery.service.allowHttp true -}} - - name: {{ index .Values.oruclosedlooprecovery.service.httpName }} - port: {{ .Values.oruclosedlooprecovery.service.port }} + {{if eq .Values.orufhrecovery.service.allowHttp true -}} + - name: {{ index .Values.orufhrecovery.service.httpName }} + port: {{ .Values.orufhrecovery.service.port }} protocol: TCP {{- end }} selector: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.oruclosedlooprecovery" . }} + app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.orufhrecovery" . }} release: {{ .Release.Name }} type: ClusterIP diff --git a/nonrtric/helm/oruclosedlooprecovery/values.yaml b/nonrtric/helm/orufhrecovery/values.yaml similarity index 95% rename from nonrtric/helm/oruclosedlooprecovery/values.yaml rename to nonrtric/helm/orufhrecovery/values.yaml index 4ca94c55..4e73cc9b 100644 --- a/nonrtric/helm/oruclosedlooprecovery/values.yaml +++ b/nonrtric/helm/orufhrecovery/values.yaml @@ -18,12 +18,12 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. -oruclosedlooprecovery: +orufhrecovery: imagePullPolicy: IfNotPresent image: registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc' - name: nonrtric-o-ru-closed-loop-consumer - tag: 1.0.1 + name: nonrtric-rapp-orufhrecovery-consumer + tag: 1.1.0 service: httpName: web allowHttp: true diff --git a/nonrtric/helm/policymanagementservice/values.yaml b/nonrtric/helm/policymanagementservice/values.yaml index 9085ad1f..4fa26f0d 100644 --- a/nonrtric/helm/policymanagementservice/values.yaml +++ b/nonrtric/helm/policymanagementservice/values.yaml @@ -22,8 +22,8 @@ policymanagementservice: imagePullPolicy: IfNotPresent image: registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" - name: nonrtric-a1-policy-management-service - tag: 2.3.1 + name: nonrtric-plt-a1policymanagementservice + tag: 2.4.0 service: allowHttp: true httpName: http diff --git a/nonrtric/helm/odusliceassurance/Chart.yaml b/nonrtric/helm/ransliceassurance/Chart.yaml similarity index 98% rename from nonrtric/helm/odusliceassurance/Chart.yaml rename to nonrtric/helm/ransliceassurance/Chart.yaml index f506b969..2043c140 100644 --- a/nonrtric/helm/odusliceassurance/Chart.yaml +++ b/nonrtric/helm/ransliceassurance/Chart.yaml @@ -17,5 +17,5 @@ apiVersion: v1 appVersion: "2.0.0" description: A Helm chart for odu slice assurance -name: odusliceassurance +name: ransliceassurance version: 1.0.0 diff --git a/nonrtric/helm/oruclosedlooprecovery/requirements.yaml b/nonrtric/helm/ransliceassurance/requirements.yaml similarity index 100% rename from nonrtric/helm/oruclosedlooprecovery/requirements.yaml rename to nonrtric/helm/ransliceassurance/requirements.yaml diff --git a/nonrtric/helm/odusliceassurance/templates/deployment.yaml b/nonrtric/helm/ransliceassurance/templates/deployment.yaml similarity index 70% rename from nonrtric/helm/odusliceassurance/templates/deployment.yaml rename to nonrtric/helm/ransliceassurance/templates/deployment.yaml index 819a725c..a762e611 100644 --- a/nonrtric/helm/odusliceassurance/templates/deployment.yaml +++ b/nonrtric/helm/ransliceassurance/templates/deployment.yaml @@ -17,11 +17,11 @@ kind: Deployment apiVersion: apps/v1 metadata: - name: {{ include "common.name.odusliceassurance" . }} + name: {{ include "common.name.ransliceassurance" . }} namespace: {{ include "common.namespace.nonrtric" . }} generation: 1 labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.odusliceassurance" . }} + app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.ransliceassurance" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -31,35 +31,35 @@ spec: replicas: 1 selector: matchLabels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.odusliceassurance" . }} + app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.ransliceassurance" . }} release: {{ .Release.Name }} template: metadata: labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.odusliceassurance" . }} + app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.ransliceassurance" . }} release: {{ .Release.Name }} spec: - hostname: {{ include "common.name.odusliceassurance" . }} + hostname: {{ include "common.name.ransliceassurance" . }} containers: - - name: {{ include "common.container.odusliceassurance" . }} - image: {{ .Values.odusliceassurance.image.registry }}/{{ .Values.odusliceassurance.image.name }}:{{ .Values.odusliceassurance.image.tag }} - imagePullPolicy: {{ .Values.odusliceassurance.imagePullPolicy }} + - name: {{ include "common.container.ransliceassurance" . }} + image: {{ .Values.ransliceassurance.image.registry }}/{{ .Values.ransliceassurance.image.name }}:{{ .Values.ransliceassurance.image.tag }} + imagePullPolicy: {{ .Values.ransliceassurance.imagePullPolicy }} ports: - containerPort: 80 protocol: TCP env: - name: MR_HOST - value: "{{ .Values.odusliceassurance.env.mr_host }}" + value: "{{ .Values.ransliceassurance.env.mr_host }}" - name: MR_PORT - value: "{{ .Values.odusliceassurance.env.mr_port }}" + value: "{{ .Values.ransliceassurance.env.mr_port }}" - name: SDNR_ADDRESS - value: "{{ .Values.odusliceassurance.env.sdnr_address }}" + value: "{{ .Values.ransliceassurance.env.sdnr_address }}" - name: SDNR_USER - value: "{{ .Values.odusliceassurance.env.sdnr_user }}" + value: "{{ .Values.ransliceassurance.env.sdnr_user }}" - name: SDNR_PASSWORD - value: "{{ .Values.odusliceassurance.env.sdnr_password }}" + value: "{{ .Values.ransliceassurance.env.sdnr_password }}" - name: LOG_LEVEL - value: "{{ .Values.odusliceassurance.env.log_level }}" + value: "{{ .Values.ransliceassurance.env.log_level }}" - name: POLLTIME - value: "{{ .Values.odusliceassurance.env.polltime }}" + value: "{{ .Values.ransliceassurance.env.polltime }}" diff --git a/nonrtric/helm/odusliceassurance/templates/service.yaml b/nonrtric/helm/ransliceassurance/templates/service.yaml similarity index 84% rename from nonrtric/helm/odusliceassurance/templates/service.yaml rename to nonrtric/helm/ransliceassurance/templates/service.yaml index d4d29f28..a0a5b841 100644 --- a/nonrtric/helm/odusliceassurance/templates/service.yaml +++ b/nonrtric/helm/ransliceassurance/templates/service.yaml @@ -17,21 +17,21 @@ kind: Service apiVersion: v1 metadata: - name: {{ include "common.name.odusliceassurance" . }} + name: {{ include "common.name.ransliceassurance" . }} namespace: {{ include "common.namespace.nonrtric" . }} labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.odusliceassurance" . }} + app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.ransliceassurance" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: ports: - {{if eq .Values.odusliceassurance.service.allowHttp true -}} - - name: {{ index .Values.odusliceassurance.service.httpName }} - port: {{ .Values.odusliceassurance.service.port }} + {{if eq .Values.ransliceassurance.service.allowHttp true -}} + - name: {{ index .Values.ransliceassurance.service.httpName }} + port: {{ .Values.ransliceassurance.service.port }} protocol: TCP {{- end }} selector: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.odusliceassurance" . }} + app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.ransliceassurance" . }} release: {{ .Release.Name }} type: ClusterIP diff --git a/nonrtric/helm/odusliceassurance/values.yaml b/nonrtric/helm/ransliceassurance/values.yaml similarity index 95% rename from nonrtric/helm/odusliceassurance/values.yaml rename to nonrtric/helm/ransliceassurance/values.yaml index f67ffac6..0dcb2eff 100644 --- a/nonrtric/helm/odusliceassurance/values.yaml +++ b/nonrtric/helm/ransliceassurance/values.yaml @@ -18,12 +18,12 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. -odusliceassurance: +ransliceassurance: imagePullPolicy: IfNotPresent image: registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc' - name: nonrtric-o-du-slice-assurance - tag: 1.0.2 + name: nonrtric-rapp-ransliceassurance + tag: 1.1.0 service: httpName: web allowHttp: true diff --git a/nonrtric/helm/rappcatalogueservice/values.yaml b/nonrtric/helm/rappcatalogueservice/values.yaml index f01b2c29..dd3376f0 100644 --- a/nonrtric/helm/rappcatalogueservice/values.yaml +++ b/nonrtric/helm/rappcatalogueservice/values.yaml @@ -22,8 +22,8 @@ rappcatalogueservice: imagePullPolicy: IfNotPresent image: registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc' - name: nonrtric-r-app-catalogue - tag: 1.0.2 + name: nonrtric-plt-rappcatalogue + tag: 1.1.0 service: allowHttp: true httpName: http diff --git a/ric-common/Common-Template/helm/nonrtric-common/templates/_oruclosedlooprecovery.tpl b/ric-common/Common-Template/helm/nonrtric-common/templates/_orufhrecovery.tpl similarity index 85% rename from ric-common/Common-Template/helm/nonrtric-common/templates/_oruclosedlooprecovery.tpl rename to ric-common/Common-Template/helm/nonrtric-common/templates/_orufhrecovery.tpl index 0cf0b23b..642af207 100644 --- a/ric-common/Common-Template/helm/nonrtric-common/templates/_oruclosedlooprecovery.tpl +++ b/ric-common/Common-Template/helm/nonrtric-common/templates/_orufhrecovery.tpl @@ -14,11 +14,11 @@ # limitations under the License. # ################################################################################ -{{- define "common.name.oruclosedlooprecovery" -}} - {{- printf "oruclosedlooprecovery" -}} +{{- define "common.name.orufhrecovery" -}} + {{- printf "orufhrecovery" -}} {{- end -}} -{{- define "common.container.oruclosedlooprecovery" -}} - {{- $name := ( include "common.name.oruclosedlooprecovery" . ) -}} +{{- define "common.container.orufhrecovery" -}} + {{- $name := ( include "common.name.orufhrecovery" . ) -}} {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} diff --git a/ric-common/Common-Template/helm/nonrtric-common/templates/_odusliceassurance.tpl b/ric-common/Common-Template/helm/nonrtric-common/templates/_ransliceassurance.tpl similarity index 86% rename from ric-common/Common-Template/helm/nonrtric-common/templates/_odusliceassurance.tpl rename to ric-common/Common-Template/helm/nonrtric-common/templates/_ransliceassurance.tpl index d6e1d483..3ba2a313 100644 --- a/ric-common/Common-Template/helm/nonrtric-common/templates/_odusliceassurance.tpl +++ b/ric-common/Common-Template/helm/nonrtric-common/templates/_ransliceassurance.tpl @@ -14,11 +14,11 @@ # limitations under the License. # ################################################################################ -{{- define "common.name.odusliceassurance" -}} - {{- printf "odusliceassurance" -}} +{{- define "common.name.ransliceassurance" -}} + {{- printf "ransliceassurance" -}} {{- end -}} -{{- define "common.container.odusliceassurance" -}} - {{- $name := ( include "common.name.odusliceassurance" . ) -}} +{{- define "common.container.ransliceassurance" -}} + {{- $name := ( include "common.name.ransliceassurance" . ) -}} {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} diff --git a/smo-install/oran_oom/dmaapadapterservice/values.yaml b/smo-install/oran_oom/dmaapadapterservice/values.yaml index 3260e267..8db10694 100644 --- a/smo-install/oran_oom/dmaapadapterservice/values.yaml +++ b/smo-install/oran_oom/dmaapadapterservice/values.yaml @@ -22,8 +22,8 @@ dmaapadapterservice: imagePullPolicy: IfNotPresent image: registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" - name: "nonrtric-dmaap-adaptor" - tag: 1.0.0 + name: "nonrtric-plt-dmaapadapter" + tag: 1.1.0 service: allowHttp: true httpName: http diff --git a/smo-install/oran_oom/dmaapmediatorservice/values.yaml b/smo-install/oran_oom/dmaapmediatorservice/values.yaml index 3ae2eacb..9a99dfc8 100644 --- a/smo-install/oran_oom/dmaapmediatorservice/values.yaml +++ b/smo-install/oran_oom/dmaapmediatorservice/values.yaml @@ -22,8 +22,8 @@ dmaapmediatorservice: imagePullPolicy: IfNotPresent image: registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" - name: "nonrtric-dmaap-mediator-producer" - tag: 1.0.0 + name: "nonrtric-plt-dmaapmediatorproducer" + tag: 1.1.0 service: allowHttp: true httpName: http diff --git a/smo-install/oran_oom/helmmanager/values.yaml b/smo-install/oran_oom/helmmanager/values.yaml index 255ad717..9d8358bb 100644 --- a/smo-install/oran_oom/helmmanager/values.yaml +++ b/smo-install/oran_oom/helmmanager/values.yaml @@ -23,8 +23,8 @@ helmmanager: imagePullPolicy: IfNotPresent image: registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" - name: "nonrtric-helm-manager" - tag: 1.1.0 + name: "nonrtric-plt-helmmanager" + tag: 1.2.0 service: httpName: http internalPort1: 8112 diff --git a/smo-install/oran_oom/informationservice/values.yaml b/smo-install/oran_oom/informationservice/values.yaml index a5d571ac..4ef157fd 100644 --- a/smo-install/oran_oom/informationservice/values.yaml +++ b/smo-install/oran_oom/informationservice/values.yaml @@ -22,8 +22,8 @@ informationservice: imagePullPolicy: IfNotPresent image: registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" - name: "nonrtric-information-coordinator-service" - tag: 1.2.0 + name: "nonrtric-plt-informationcoordinatorservice" + tag: 1.3.0 service: allowHttp: true httpName: http diff --git a/smo-install/oran_oom/oru-app/values.yaml b/smo-install/oran_oom/oru-app/values.yaml index 56ae692d..f25815f7 100644 --- a/smo-install/oran_oom/oru-app/values.yaml +++ b/smo-install/oran_oom/oru-app/values.yaml @@ -2,8 +2,8 @@ replicaCount: 1 image: repository: 'nexus3.o-ran-sc.org:10002/o-ran-sc' - name: nonrtric-o-ru-closed-loop-recovery - tag: 1.0.0 + name: nonrtric-rapp-orufhrecovery + tag: 1.1.0 pullPolicy: IfNotPresent global: diff --git a/smo-install/oran_oom/policymanagementservice/values.yaml b/smo-install/oran_oom/policymanagementservice/values.yaml index 0d8b55ae..d9572a2f 100644 --- a/smo-install/oran_oom/policymanagementservice/values.yaml +++ b/smo-install/oran_oom/policymanagementservice/values.yaml @@ -22,8 +22,8 @@ policymanagementservice: imagePullPolicy: IfNotPresent image: registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" - name: nonrtric-a1-policy-management-service - tag: 2.3.0 + name: nonrtric-plt-a1policymanagementservice + tag: 2.4.0 service: type: NodePort allowHttp: true diff --git a/smo-install/oran_oom/rappcatalogueservice/values.yaml b/smo-install/oran_oom/rappcatalogueservice/values.yaml index 35a64097..e3a491f7 100644 --- a/smo-install/oran_oom/rappcatalogueservice/values.yaml +++ b/smo-install/oran_oom/rappcatalogueservice/values.yaml @@ -22,8 +22,8 @@ rappcatalogueservice: imagePullPolicy: IfNotPresent image: registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc' - name: nonrtric-r-app-catalogue - tag: 1.0.1 + name: nonrtric-plt-rappcatalogue + tag: 1.1.0 service: allowHttp: true httpName: http -- 2.16.6