From abb00c806fb82a861cd1edebe0914fdfcf24e0a7 Mon Sep 17 00:00:00 2001
From: RehanRaza <muhammad.rehan.raza@est.tech>
Date: Mon, 13 Dec 2021 13:18:25 +0100
Subject: [PATCH] Update helm charts for O-RU fronthaul usecase

The environment variables in the helm charts should be overridden
in order to make them configurable.

Change-Id: Ic7023f60e6b1aad96ee509f71b6bd232e62cf078
Issue-ID: NONRTRIC-559
Signed-off-by: RehanRaza <muhammad.rehan.raza@est.tech>
---
 .../helm/message-generator/templates/deployment.yaml              | 4 ++--
 .../scriptversion/helm/message-generator/values.yaml              | 4 ++++
 .../scriptversion/helm/oru-app/templates/deployment.yaml          | 8 ++++----
 .../oruclosedlooprecovery/scriptversion/helm/oru-app/values.yaml  | 8 ++++++++
 .../scriptversion/helm/sdnr-simulator/templates/deployment.yaml   | 4 ++--
 .../scriptversion/helm/sdnr-simulator/values.yaml                 | 4 ++++
 6 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/test/usecases/oruclosedlooprecovery/scriptversion/helm/message-generator/templates/deployment.yaml b/test/usecases/oruclosedlooprecovery/scriptversion/helm/message-generator/templates/deployment.yaml
index f5e628a4..817134e9 100644
--- a/test/usecases/oruclosedlooprecovery/scriptversion/helm/message-generator/templates/deployment.yaml
+++ b/test/usecases/oruclosedlooprecovery/scriptversion/helm/message-generator/templates/deployment.yaml
@@ -47,9 +47,9 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
           - name: MR-HOST
-            value: http://dmaap-mr
+            value: "{{ .Values.messagerouter.host }}"
           - name: MR-PORT
-            value: "3904"
+            value: "{{ .Values.messagerouter.port }}"
           ports:
             - name: http
               containerPort: 80
diff --git a/test/usecases/oruclosedlooprecovery/scriptversion/helm/message-generator/values.yaml b/test/usecases/oruclosedlooprecovery/scriptversion/helm/message-generator/values.yaml
index e547bda9..88cac992 100644
--- a/test/usecases/oruclosedlooprecovery/scriptversion/helm/message-generator/values.yaml
+++ b/test/usecases/oruclosedlooprecovery/scriptversion/helm/message-generator/values.yaml
@@ -25,6 +25,10 @@ image:
   # Overrides the image tag whose default is the chart appVersion.
   tag: "latest"
 
+messagerouter:
+  host: http://dmaap-mr
+  port: 3904
+
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
diff --git a/test/usecases/oruclosedlooprecovery/scriptversion/helm/oru-app/templates/deployment.yaml b/test/usecases/oruclosedlooprecovery/scriptversion/helm/oru-app/templates/deployment.yaml
index a27d81d0..7f648d91 100644
--- a/test/usecases/oruclosedlooprecovery/scriptversion/helm/oru-app/templates/deployment.yaml
+++ b/test/usecases/oruclosedlooprecovery/scriptversion/helm/oru-app/templates/deployment.yaml
@@ -47,13 +47,13 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
           - name: MR-HOST
-            value: http://dmaap-mr
+            value: "{{ .Values.messagerouter.host }}"
           - name: MR-PORT
-            value: "3904"
+            value: "{{ .Values.messagerouter.port }}"
           - name: SDNR-HOST
-            value: http://sdnr-simulator
+            value: "{{ .Values.sdnr.host }}"
           - name: SDNR-PORT
-            value: "9990"
+            value: "{{ .Values.sdnr.port }}"
           - name: VERBOSE
             value: "on"
           ports:
diff --git a/test/usecases/oruclosedlooprecovery/scriptversion/helm/oru-app/values.yaml b/test/usecases/oruclosedlooprecovery/scriptversion/helm/oru-app/values.yaml
index e45a1f5e..00298739 100644
--- a/test/usecases/oruclosedlooprecovery/scriptversion/helm/oru-app/values.yaml
+++ b/test/usecases/oruclosedlooprecovery/scriptversion/helm/oru-app/values.yaml
@@ -25,6 +25,14 @@ image:
   # Overrides the image tag whose default is the chart appVersion.
   tag: "latest"
 
+messagerouter:
+  host: http://dmaap-mr
+  port: 3904
+
+sdnr:
+  host: http://sdnr-simulator
+  port: 9990
+
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
diff --git a/test/usecases/oruclosedlooprecovery/scriptversion/helm/sdnr-simulator/templates/deployment.yaml b/test/usecases/oruclosedlooprecovery/scriptversion/helm/sdnr-simulator/templates/deployment.yaml
index 67975d6b..8b77612b 100644
--- a/test/usecases/oruclosedlooprecovery/scriptversion/helm/sdnr-simulator/templates/deployment.yaml
+++ b/test/usecases/oruclosedlooprecovery/scriptversion/helm/sdnr-simulator/templates/deployment.yaml
@@ -47,9 +47,9 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
           - name: MR-HOST
-            value: http://dmaap-mr
+            value: "{{ .Values.messagerouter.host }}"
           - name: MR-PORT
-            value: "3904"
+            value: "{{ .Values.messagerouter.port }}"
           ports:
             - name: http
               containerPort: 9990
diff --git a/test/usecases/oruclosedlooprecovery/scriptversion/helm/sdnr-simulator/values.yaml b/test/usecases/oruclosedlooprecovery/scriptversion/helm/sdnr-simulator/values.yaml
index 01bf76c3..cacad476 100644
--- a/test/usecases/oruclosedlooprecovery/scriptversion/helm/sdnr-simulator/values.yaml
+++ b/test/usecases/oruclosedlooprecovery/scriptversion/helm/sdnr-simulator/values.yaml
@@ -25,6 +25,10 @@ image:
   # Overrides the image tag whose default is the chart appVersion.
   tag: "latest"
 
+messagerouter:
+  host: http://dmaap-mr
+  port: 3904
+
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
-- 
2.16.6