From 8421172ad7f749e00af600b5533ec7ab3d1ff3d1 Mon Sep 17 00:00:00 2001
From: idanshal <idan.shalom@intl.att.com>
Date: Sun, 26 Jul 2020 15:23:50 +0000
Subject: [PATCH] [RIC-587] Update E2 Adapter templates and values

Change-Id: I7dbc19f334470a21d622988e223d67e5be326347
Signed-off-by: idanshal <idan.shalom@intl.att.com>
---
 tools/e2adapter/templates/configmap.yaml  | 23 +++++++++++------------
 tools/e2adapter/templates/deployment.yaml | 17 ++++++++++-------
 tools/e2adapter/values.yaml               | 10 +++++-----
 3 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/tools/e2adapter/templates/configmap.yaml b/tools/e2adapter/templates/configmap.yaml
index f07a75b..7f74936 100644
--- a/tools/e2adapter/templates/configmap.yaml
+++ b/tools/e2adapter/templates/configmap.yaml
@@ -19,20 +19,19 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "common.configmapname.e2adapter" . }}-configuration-configmap
+  name: e2adapter-configuration-configmap
   namespace: {{ include "common.namespace.platform" . }}
 data:
   e2adapter.conf: |
-    {{- if hasKey .Values "dummyRanConnection" }}
+    e2adapter = {
+    
+    sctp = {
+    };
+
     dummyRanConnection = {{ .Values.dummyRanConnection }};
-    {{- end }}
-    {{- if hasKey .Values "e2SctpPort" }}
-    dummyRanConnection = {{ .Values.e2SctpPort }};
-    {{- end }}
-    {{- if hasKey .Values "e2NodeType" }}
-    dummyRanConnection = {{ .Values.e2NodeType }};
-    {{- end }}
-    {{- if hasKey .Values "enbType" }}
-    dummyRanConnection = {{ .Values.enbType }};
-    {{- end }}  
+    e2SctpPort = {{ .Values.e2SctpPort }};
+    e2NodeType = {{ .Values.e2NodeType }};
+    enbType = {{ .Values.enbType }};
+    };
+
 ---
diff --git a/tools/e2adapter/templates/deployment.yaml b/tools/e2adapter/templates/deployment.yaml
index 6a0efc4..eb280fc 100644
--- a/tools/e2adapter/templates/deployment.yaml
+++ b/tools/e2adapter/templates/deployment.yaml
@@ -18,14 +18,17 @@ spec:
       labels:
         app.kubernetes.io/name: {{ include "e2adapter.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-    containers:
-      - name: {{ .Chart.Name }}
-        image: "{{ .Values.image.registry }}/{{ .Values.image.name }}:{{ .Values.image.tag }}"
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
-        - mountPath: /etc/e2adapter/e2adapter.conf
-          name: local-configuration-file
-          subPath: e2adapter.conf
+    spec:
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ .Values.image.registry }}/{{ .Values.image.name }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          volumeMounts:
+          - mountPath: /etc/e2adapter/e2adapter.conf
+            name: local-configuration-file
+            subPath: e2adapter.conf
       volumes:
         - name: local-configuration-file
           configMap:
             name: e2adapter-configuration-configmap
+
diff --git a/tools/e2adapter/values.yaml b/tools/e2adapter/values.yaml
index 1a869f3..5263662 100644
--- a/tools/e2adapter/values.yaml
+++ b/tools/e2adapter/values.yaml
@@ -4,15 +4,15 @@
 
 replicaCount: 1
 dummyRanConnection: true
-e2SctpPort: 36422
-e2NodeType: 1
-enbType: 3
+e2SctpPort: 32222
+e2NodeType: 3 
+enbType: 4
 
 imagePullPolicy: IfNotPresent
 image:
   name: e2adapter 
-  tag: 1.0.0
-  registry: "snapshot.docker.ranco-dev-tools.eastus.cloudapp.azure.com:10001"
+  tag: 2.0.8
+  registry: "ranco-dev-tools.eastus.cloudapp.azure.com:10001"
 
 nameOverride: ""
 fullnameOverride: ""
-- 
2.16.6