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>

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 f5e628a..817134e 100644 (file)
--- 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 e547bda..88cac99 100644 (file)
--- 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 a27d81d..7f648d9 100644 (file)
--- 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 e45a1f5..0029873 100644 (file)
--- 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 67975d6..8b77612 100644 (file)
--- 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 01bf76c..cacad47 100644 (file)
--- 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: ""