commit a30d15c7adf2ba01f832267dd70a2c9fe18ced09
author Lusheng Ji <lji@research.att.com> Mon Jan 13 15:30:09 2020 +0000
committer Gerrit Code Review <gerrit@o-ran-sc.org> Mon Jan 13 15:30:09 2020 +0000
tree 3ad97b9e02d8d8b97008630c66ad6cf222d04c68
parent 86ae95a180ec3fd7f4fd7242c12b2dcd5eaeb4fa
parent 815ac932eb3157bedf35506e3db3d8f360b087f5

Merge "Making static platform routes configurable"

ci/package-tag.yaml

diff --git a/ci/package-tag.yaml b/ci/package-tag.yaml
index a6e73be..9b5fb0d 100644
--- a/ci/package-tag.yaml
+++ b/ci/package-tag.yaml
@@ -14,4 +14,4 @@
 #   See the License for the specific language governing permissions and        #
 #   limitations under the License.                                             #
 ################################################################################
-tag: 2.0.4
+tag: 2.0.5

ric-platform/50-RIC-Platform/helm/e2mgr/templates/configmap.yaml

diff --git a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/configmap.yaml b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/configmap.yaml
index ca91f95..7a1cccb 100644
--- a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/configmap.yaml
+++ b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/configmap.yaml
@@ -28,6 +28,7 @@
     rte|1080|{{ include "common.servicename.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
     rte|1090|{{ include "common.servicename.e2term.rmr" .     }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }}
     rte|1100|{{ include "common.servicename.e2term.rmr" .     }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }}
+    rte|1101|{{ include "common.servicename.e2term.rmr" .     }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }}
     rte|1200|{{ include "common.servicename.rsm.rmr" .     }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.rsm.rmr.data" . }}
     rte|1210|{{ include "common.servicename.rsm.rmr" .     }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.rsm.rmr.data" . }}
     rte|1220|{{ include "common.servicename.rsm.rmr" .     }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.rsm.rmr.data" . }}
@@ -80,6 +81,12 @@
       {{- else }}
       maxMsgSize: 4096
       {{- end }}
+    routingManager:
+      {{- if hasKey .Values.e2mgr "baseUrl" }}
+      baseUrl: {{ .Values.e2mgr.baseUrl }}
+      {{- else }}
+      baseUrl: "http://service-ricplt-rtmgr-http:3800/ric/v1/handles/"
+      {{- end }}
 
     {{- if hasKey .Values.e2mgr "notificationResponseBuffer" }}
     notificationResponseBuffer: {{ .Values.e2mgr.notificationResponseBuffer }}
@@ -114,13 +121,13 @@
     {{- if hasKey .Values.e2mgr "keepAliveResponseTimeoutMs" }}
     keepAliveResponseTimeoutMs: {{ .Values.e2mgr.keepAliveResponseTimeoutMs }}
     {{- else }}
-    keepAliveResponseTimeoutMs: 1500
+    keepAliveResponseTimeoutMs: 4500
     {{- end }}
 
     {{- if hasKey .Values.e2mgr "keepAliveDelayMs" }}
     keepAliveDelayMs: {{ .Values.e2mgr.keepAliveDelayMs }}
     {{- else }}
-    keepAliveDelayMs: 500
+    keepAliveDelayMs: 1500
     {{- end }}
 
 ---