Add ORU ODU helm charts to nonrtric deployement 92/7392/9
authorecaiyanlinux <martin.c.yan@est.tech>
Wed, 15 Dec 2021 14:06:42 +0000 (15:06 +0100)
committerecaiyanlinux <martin.c.yan@est.tech>
Wed, 12 Jan 2022 12:58:19 +0000 (13:58 +0100)
odusliceassurance
oruclosedlooprecovery

Signed-off-by: ecaiyanlinux <martin.c.yan@est.tech>
Issue-ID: NONRTRIC-691
Change-Id: I565d62bb3f7767fe3cf94e9760b09c374938bbb4

19 files changed:
bin/deploy-nonrtric
bin/undeploy-nonrtric
nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
nonrtric/helm/nonrtric/Chart.yaml
nonrtric/helm/nonrtric/values.yaml
nonrtric/helm/odusliceassurance/Chart.yaml [new file with mode: 0644]
nonrtric/helm/odusliceassurance/requirements.yaml [new file with mode: 0644]
nonrtric/helm/odusliceassurance/templates/deployment.yaml [new file with mode: 0644]
nonrtric/helm/odusliceassurance/templates/service.yaml [new file with mode: 0644]
nonrtric/helm/odusliceassurance/values.yaml [new file with mode: 0644]
nonrtric/helm/oruclosedlooprecovery/Chart.yaml [new file with mode: 0644]
nonrtric/helm/oruclosedlooprecovery/requirements.yaml [new file with mode: 0644]
nonrtric/helm/oruclosedlooprecovery/resources/config/o-ru-to-o-du-map.csv [new file with mode: 0644]
nonrtric/helm/oruclosedlooprecovery/templates/configmap.yaml [new file with mode: 0644]
nonrtric/helm/oruclosedlooprecovery/templates/deployment.yaml [new file with mode: 0644]
nonrtric/helm/oruclosedlooprecovery/templates/service.yaml [new file with mode: 0644]
nonrtric/helm/oruclosedlooprecovery/values.yaml [new file with mode: 0644]
ric-common/Common-Template/helm/nonrtric-common/templates/_odusliceassurance.tpl [new file with mode: 0644]
ric-common/Common-Template/helm/nonrtric-common/templates/_oruclosedlooprecovery.tpl [new file with mode: 0644]

index 775a311..cdf993e 100755 (executable)
@@ -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"
+COMPONENTS="controlpanel a1controller a1simulator policymanagementservice informationservice rappcatalogueservice nonrtricgateway dmaapadapterservice dmaapmediatorservice helmmanager oruclosedlooprecovery odusliceassurance"
 for component in $COMPONENTS; do
     echo "Packaging NONRTRIC component [$component]"
     helm dep up $ROOT_DIR/../nonrtric/helm/$component
index b3b2cc9..a97f888 100755 (executable)
@@ -18,7 +18,7 @@
 # This script to undeploy the NONRTRIC
 
 
-COMPONENTS="controlpanel a1controller a1simulator policymanagementservice informationservice rappcatalogueservice nonrtricgateway dmaapadapterservice dmaapmediatorservice helmmanager"
+COMPONENTS="controlpanel a1controller a1simulator policymanagementservice informationservice rappcatalogueservice nonrtricgateway dmaapadapterservice dmaapmediatorservice helmmanager oruclosedlooprecovery odusliceassurance"
 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
 
index 1a0edb1..e856e8e 100644 (file)
@@ -32,6 +32,8 @@ nonrtric:
   installDmaapadapterservice: true
   installDmaapmediatorservice: true
   installHelmmanager: true
+  installOruclosedlooprecovery: true
+  installOdusliceassurance: true
   volume1:
     # Set the size to 0 if you do not need the volume (if you are using Dynamic Volume Provisioning)
     size: 2Gi
@@ -301,3 +303,38 @@ helmmanager:
       # The alternative use a dynamic volume provisioner in the cluster. Storage class can then be for instance 'standard' or 'gluster-fs' (depeneds on which classes that are available)
       size: 1Gi
       storageClassName: helmmanager-storage
+
+odusliceassurance:
+  odusliceassurance:
+    imagePullPolicy: IfNotPresent
+    image:
+      registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
+      name: "nonrtric-o-du-slice-assurance"
+      tag: 1.0.0
+    env:
+      mr_host: "http://onap-dmaap"
+      mr_port: "3904"
+      sdnr_address: "http://sdnr:8181"
+      sdnr_user: "admin"
+      sdnr_password: "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
+      log_level: "Info"
+      polltime: "10"
+
+oruclosedlooprecovery:
+  oruclosedlooprecovery:
+    imagePullPolicy: IfNotPresent
+    image:
+      registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
+      name: "nonrtric-o-ru-closed-loop-recovery"
+      tag: 1.0.0
+    env:
+      consumer_host: "http://mrproducer"
+      consumer_port: "8095"
+      consumer_cert_path: "security/producer.crt"
+      consumer_key_path: "security/producer.key"
+      info_coord_addr: "http://ics:8083"
+      sdnr_address: "http://sdnr:8282"
+      sdnr_user: "admin"
+      sdnr_password: "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
+      oru_to_odu_map_file: "o-ru-to-o-du-map.csv"
+      log_level: "Info"
index 76422ff..7307229 100644 (file)
@@ -75,3 +75,12 @@ dependencies:
     repository: "@local"
     condition: nonrtric.installHelmmanager
 
+  - name: odusliceassurance
+    version: ~1.0.0
+    repository: "@local"
+    condition: nonrtric.installOdusliceassurance
+
+  - name: oruclosedlooprecovery
+    version: ~1.0.0
+    repository: "@local"
+    condition: nonrtric.installOruclosedlooprecovery
index 4b07fb9..d33f23b 100644 (file)
@@ -25,6 +25,9 @@ nonrtric:
   installDmaapadapterservice: true
   installDmaapmediatorservice: true
   installHelmmanager: true
+  installOruclosedlooprecovery: true
+  installOdusliceassurance: true
+
   volume1:
     size: 1Gi
     storageClassName: volume1
diff --git a/nonrtric/helm/odusliceassurance/Chart.yaml b/nonrtric/helm/odusliceassurance/Chart.yaml
new file mode 100644 (file)
index 0000000..f506b96
--- /dev/null
@@ -0,0 +1,21 @@
+################################################################################
+#   Copyright (c) 2021 Nordix Foundation.                                      #
+#                                                                              #
+#   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                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+apiVersion: v1
+appVersion: "2.0.0"
+description: A Helm chart for odu slice assurance
+name: odusliceassurance
+version: 1.0.0
diff --git a/nonrtric/helm/odusliceassurance/requirements.yaml b/nonrtric/helm/odusliceassurance/requirements.yaml
new file mode 100644 (file)
index 0000000..69b4db6
--- /dev/null
@@ -0,0 +1,20 @@
+################################################################################
+#   Copyright (c) 2021 Nordix Foundation.                                      #
+#                                                                              #
+#   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                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+dependencies:
+  - name: nonrtric-common
+    version: ^2.0.0
+    repository: "@local"
diff --git a/nonrtric/helm/odusliceassurance/templates/deployment.yaml b/nonrtric/helm/odusliceassurance/templates/deployment.yaml
new file mode 100644 (file)
index 0000000..819a725
--- /dev/null
@@ -0,0 +1,65 @@
+################################################################################
+#   Copyright (c) 2021 Nordix Foundation.                                      #
+#                                                                              #
+#   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                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+kind: Deployment
+apiVersion: apps/v1
+metadata:
+  name: {{ include "common.name.odusliceassurance" . }}
+  namespace: {{ include "common.namespace.nonrtric" . }}
+  generation: 1
+  labels:
+    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.odusliceassurance" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+  annotations:
+    deployment.kubernetes.io/revision: '1'
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.odusliceassurance" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.odusliceassurance" . }}
+        release: {{ .Release.Name }}
+    spec:
+      hostname: {{ include "common.name.odusliceassurance" . }}
+      containers:
+      - name: {{ include "common.container.odusliceassurance" . }}
+        image: {{ .Values.odusliceassurance.image.registry }}/{{ .Values.odusliceassurance.image.name }}:{{ .Values.odusliceassurance.image.tag }}
+        imagePullPolicy: {{ .Values.odusliceassurance.imagePullPolicy }}
+        ports:
+        - containerPort: 80
+          protocol: TCP
+        env:
+          - name: MR_HOST
+            value: "{{ .Values.odusliceassurance.env.mr_host }}"
+          - name: MR_PORT
+            value: "{{ .Values.odusliceassurance.env.mr_port }}"
+          - name: SDNR_ADDRESS
+            value: "{{ .Values.odusliceassurance.env.sdnr_address }}"
+          - name: SDNR_USER
+            value: "{{ .Values.odusliceassurance.env.sdnr_user }}"
+          - name: SDNR_PASSWORD
+            value: "{{ .Values.odusliceassurance.env.sdnr_password }}"
+          - name: LOG_LEVEL
+            value: "{{ .Values.odusliceassurance.env.log_level }}"
+          - name: POLLTIME
+            value: "{{ .Values.odusliceassurance.env.polltime }}"
+
diff --git a/nonrtric/helm/odusliceassurance/templates/service.yaml b/nonrtric/helm/odusliceassurance/templates/service.yaml
new file mode 100644 (file)
index 0000000..d4d29f2
--- /dev/null
@@ -0,0 +1,37 @@
+################################################################################
+#   Copyright (c) 2021 Nordix Foundation.                                      #
+#                                                                              #
+#   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                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+kind: Service
+apiVersion: v1
+metadata:
+  name: {{ include "common.name.odusliceassurance" . }}
+  namespace: {{ include "common.namespace.nonrtric" . }}
+  labels:
+    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.odusliceassurance" . }}
+    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 }}
+      protocol: TCP
+    {{- end }}
+  selector:
+    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.odusliceassurance" . }}
+    release: {{ .Release.Name }}
+  type: ClusterIP
diff --git a/nonrtric/helm/odusliceassurance/values.yaml b/nonrtric/helm/odusliceassurance/values.yaml
new file mode 100644 (file)
index 0000000..8479912
--- /dev/null
@@ -0,0 +1,38 @@
+################################################################################
+#   Copyright (c) 2021 Nordix Foundation.                                      #
+#                                                                              #
+#   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                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+# Default values for odu slice assurance.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+odusliceassurance:
+  imagePullPolicy: IfNotPresent
+  image:
+    registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
+    name: nonrtric-o-du-slice-assurance
+    tag: 1.0.0
+  service:
+    httpName: web
+    allowHttp: true
+    port: 80
+  env:
+    mr_host: "http://onap-dmaap"
+    mr_port: "3904"
+    sdnr_address: "http://sdnr:8181"
+    sdnr_user: "admin"
+    sdnr_password: "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
+    log_level: "Info"
+    polltime: "10"
diff --git a/nonrtric/helm/oruclosedlooprecovery/Chart.yaml b/nonrtric/helm/oruclosedlooprecovery/Chart.yaml
new file mode 100644 (file)
index 0000000..df25c81
--- /dev/null
@@ -0,0 +1,21 @@
+################################################################################
+#   Copyright (c) 2021 Nordix Foundation.                                      #
+#                                                                              #
+#   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                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+apiVersion: v1
+appVersion: "2.0.0"
+description: A Helm chart for oru closed loop recovery
+name: oruclosedlooprecovery
+version: 1.0.0
diff --git a/nonrtric/helm/oruclosedlooprecovery/requirements.yaml b/nonrtric/helm/oruclosedlooprecovery/requirements.yaml
new file mode 100644 (file)
index 0000000..69b4db6
--- /dev/null
@@ -0,0 +1,20 @@
+################################################################################
+#   Copyright (c) 2021 Nordix Foundation.                                      #
+#                                                                              #
+#   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                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+dependencies:
+  - name: nonrtric-common
+    version: ^2.0.0
+    repository: "@local"
diff --git a/nonrtric/helm/oruclosedlooprecovery/resources/config/o-ru-to-o-du-map.csv b/nonrtric/helm/oruclosedlooprecovery/resources/config/o-ru-to-o-du-map.csv
new file mode 100644 (file)
index 0000000..951337a
--- /dev/null
@@ -0,0 +1,11 @@
+ERICSSON-O-RU-11220,HCL-O-DU-1122
+ERICSSON-O-RU-11221,HCL-O-DU-1122
+ERICSSON-O-RU-11222,HCL-O-DU-1122
+ERICSSON-O-RU-11223,HCL-O-DU-1122
+ERICSSON-O-RU-11223,HCL-O-DU-1122
+ERICSSON-O-RU-11224,HCL-O-DU-1123
+ERICSSON-O-RU-11225,HCL-O-DU-1123
+ERICSSON-O-RU-11226,HCL-O-DU-1123
+ERICSSON-O-RU-11227,HCL-O-DU-1124
+ERICSSON-O-RU-11228,HCL-O-DU-1125
+ERICSSON-O-RU-11229,HCL-O-DU-1125
\ No newline at end of file
diff --git a/nonrtric/helm/oruclosedlooprecovery/templates/configmap.yaml b/nonrtric/helm/oruclosedlooprecovery/templates/configmap.yaml
new file mode 100644 (file)
index 0000000..4f1ce19
--- /dev/null
@@ -0,0 +1,29 @@
+################################################################################
+#   Copyright (c) 2021 Nordix Foundation.                                      #
+#                                                                              #
+#   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                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "common.name.oruclosedlooprecovery" . }}-configmap-config
+  namespace: {{ include "common.namespace.nonrtric" . }}
+  labels:
+    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.oruclosedlooprecovery" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
\ No newline at end of file
diff --git a/nonrtric/helm/oruclosedlooprecovery/templates/deployment.yaml b/nonrtric/helm/oruclosedlooprecovery/templates/deployment.yaml
new file mode 100644 (file)
index 0000000..0f2d08c
--- /dev/null
@@ -0,0 +1,78 @@
+################################################################################
+#   Copyright (c) 2021 Nordix Foundation.                                      #
+#                                                                              #
+#   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                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+kind: Deployment
+apiVersion: apps/v1
+metadata:
+  name: {{ include "common.name.oruclosedlooprecovery" . }}
+  namespace: {{ include "common.namespace.nonrtric" . }}
+  generation: 1
+  labels:
+    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.oruclosedlooprecovery" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+  annotations:
+    deployment.kubernetes.io/revision: '1'
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.oruclosedlooprecovery" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.oruclosedlooprecovery" . }}
+        release: {{ .Release.Name }}
+    spec:
+      hostname: {{ include "common.name.oruclosedlooprecovery" . }}
+      containers:
+      - name: {{ include "common.container.oruclosedlooprecovery" . }}
+        image: {{ .Values.oruclosedlooprecovery.image.registry }}/{{ .Values.oruclosedlooprecovery.image.name }}:{{ .Values.oruclosedlooprecovery.image.tag }}
+        imagePullPolicy: {{ .Values.oruclosedlooprecovery.imagePullPolicy }}
+        ports:
+        - containerPort: 80
+          protocol: TCP
+        env:
+          - name: CONSUMER_HOST
+            value: "{{ .Values.oruclosedlooprecovery.env.consumer_host }}"
+          - name: CONSUMER_PORT
+            value: "{{ .Values.oruclosedlooprecovery.env.consumer_port }}"
+          - name: CONSUMER_CERT_PATH
+            value: "{{ .Values.oruclosedlooprecovery.env.consumer_cert_path }}"
+          - name: CONSUMER_KEY_PATH
+            value: "{{ .Values.oruclosedlooprecovery.env.consumer_key_path }}"
+          - name: INFO_COORD_ADDR
+            value: "{{ .Values.oruclosedlooprecovery.env.info_coord_addr }}"
+          - name: SDNR_ADDRESS
+            value: "{{ .Values.oruclosedlooprecovery.env.sdnr_address }}"
+          - name: SDNR_USER
+            value: "{{ .Values.oruclosedlooprecovery.env.sdnr_user }}"
+          - name: SDNR_PASSWORD
+            value: "{{ .Values.oruclosedlooprecovery.env.sdnr_password }}"
+          - name: ORU_TO_ODU_MAP_FILE
+            value: "{{ .Values.oruclosedlooprecovery.env.oru_to_odu_map_file }}"
+          - name: LOG_LEVEL
+            value: "{{ .Values.oruclosedlooprecovery.env.log_level }}"
+        volumeMounts:
+        - name: {{ include "common.name.oruclosedlooprecovery" . }}-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
+          configMap:
+            name: {{ include "common.name.oruclosedlooprecovery" . }}-configmap-config
diff --git a/nonrtric/helm/oruclosedlooprecovery/templates/service.yaml b/nonrtric/helm/oruclosedlooprecovery/templates/service.yaml
new file mode 100644 (file)
index 0000000..adca209
--- /dev/null
@@ -0,0 +1,37 @@
+################################################################################
+#   Copyright (c) 2021 Nordix Foundation.                                      #
+#                                                                              #
+#   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                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+kind: Service
+apiVersion: v1
+metadata:
+  name: {{ include "common.name.oruclosedlooprecovery" . }}
+  namespace: {{ include "common.namespace.nonrtric" . }}
+  labels:
+    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.oruclosedlooprecovery" . }}
+    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 }}
+      protocol: TCP
+    {{- end }}
+  selector:
+    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.oruclosedlooprecovery" . }}
+    release: {{ .Release.Name }}
+  type: ClusterIP
diff --git a/nonrtric/helm/oruclosedlooprecovery/values.yaml b/nonrtric/helm/oruclosedlooprecovery/values.yaml
new file mode 100644 (file)
index 0000000..e3830c8
--- /dev/null
@@ -0,0 +1,41 @@
+################################################################################
+#   Copyright (c) 2021 Nordix Foundation.                                      #
+#                                                                              #
+#   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                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+# Default values for oru closed loop recovery.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+oruclosedlooprecovery:
+  imagePullPolicy: IfNotPresent
+  image:
+    registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
+    name: nonrtric-o-ru-closed-loop-recovery
+    tag: 1.0.0
+  service:
+    httpName: web
+    allowHttp: true
+    port: 80
+  env:
+    consumer_host: "http://mrproducer"
+    consumer_port: "8095"
+    consumer_cert_path: "security/producer.crt"
+    consumer_key_path: "security/producer.key"
+    info_coord_addr: "http://ics:8083"
+    sdnr_address: "http://sdnr:8282"
+    sdnr_user: "admin"
+    sdnr_password: "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
+    oru_to_odu_map_file: "o-ru-to-o-du-map.csv"
+    log_level: "Info"
diff --git a/ric-common/Common-Template/helm/nonrtric-common/templates/_odusliceassurance.tpl b/ric-common/Common-Template/helm/nonrtric-common/templates/_odusliceassurance.tpl
new file mode 100644 (file)
index 0000000..d6e1d48
--- /dev/null
@@ -0,0 +1,24 @@
+################################################################################
+#   Copyright (c) 2020 Nordix Foundation.                                      #
+#                                                                              #
+#   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                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+{{- define "common.name.odusliceassurance" -}}
+  {{- printf "odusliceassurance" -}}
+{{- end -}}
+
+{{- define "common.container.odusliceassurance" -}}
+  {{- $name := ( include "common.name.odusliceassurance" . ) -}}
+  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/ric-common/Common-Template/helm/nonrtric-common/templates/_oruclosedlooprecovery.tpl b/ric-common/Common-Template/helm/nonrtric-common/templates/_oruclosedlooprecovery.tpl
new file mode 100644 (file)
index 0000000..0cf0b23
--- /dev/null
@@ -0,0 +1,24 @@
+################################################################################
+#   Copyright (c) 2021 Nordix Foundation.                                      #
+#                                                                              #
+#   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                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+{{- define "common.name.oruclosedlooprecovery" -}}
+  {{- printf "oruclosedlooprecovery" -}}
+{{- end -}}
+
+{{- define "common.container.oruclosedlooprecovery" -}}
+  {{- $name := ( include "common.name.oruclosedlooprecovery" . ) -}}
+  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}