Update static routing table, etc.

configmap.yaml, config.yaml: updated static routing tables;
RIC_PLATFORM_RECIPE_EXAMPLE: updated the service name in
  config for components reaching RT MGR
dbaas/values: updated default image name;
ext service definitions: corrected port for https endpoints.

Change-Id: Ie21a969f35ed6b1b26e25ca785073e0daf408175
Signed-off-by: wrider <lji@research.att.com>

diff --git a/RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE b/RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE
index bda371a..7be8304 100644 (file)
--- a/RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE
+++ b/RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE
@@ -75,7 +75,7 @@ e2mgr:
     name: e2mgr
     tag: 1.6.0
   env:
-    RMR_RTG_SVC: "ric-full-rtmgr"
+    RMR_RTG_SVC: "service-ricplt-rtmgr-rmr"
     RIC_ID: "bbbccc-abcd0e/20"
 
 
@@ -86,7 +86,7 @@ e2term:
     tag: 1.6.0
   env:
     print: "1"
-    RMR_RTG_SVC: "ric-full-rtmgr"
+    RMR_RTG_SVC: "service-ricplt-rtmgr-rmr"
 
 # Routing Manager
 rtmgr:
@@ -103,4 +103,4 @@ submgr:
 # the service for redirecting to AUX cluster
 ext:
   ip:
-    192.168.130.102
+    192.168.130.102
\ No newline at end of file

diff --git a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/config.yaml b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/config.yaml
index acf2df0..7e52fda 100644 (file)
--- a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/config.yaml
+++ b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/config.yaml
@@ -23,8 +23,21 @@ metadata:
 data:
   local.rt: |
     newrt|start
-    rte|20000|service-ricxapp-admctrl-rmr:4563
-    rte|20001|{{ include "common.servicename.a1mediator.rmr" .}}:{{ .Values.a1mediator.service.rmr.port }}
+    rte|10060|{{ include "common.servicename.e2term.rmr" . }}.ricplt:38000
+    rte|10061|{{ include "common.servicename.e2mgr.rmr" . }}.ricplt:3801
+    rte|10062|{{ include "common.servicename.e2mgr.rmr" . }}.ricplt:3801
+    rte|10080|{{ include "common.servicename.e2mgr.rmr" . }}.ricplt:3801
+    rte|10360|{{ include "common.servicename.e2term.rmr" . }}.ricplt:38000
+    rte|10361|{{ include "common.servicename.e2mgr.rmr" . }}.ricplt:3801
+    rte|10362|{{ include "common.servicename.e2mgr.rmr" . }}.ricplt:3801
+    rte|12010|{{ include "common.servicename.e2term.rmr" . }}.ricplt:38000
+    rte|20001|{{ include "common.servicename.a1mediator.rmr" . }}.ricplt:4562
+    rte|12011|service-ricxapp-admctrl-rmr.ricxapp:4563
+    rte|12012|service-ricxapp-admctrl-rmr.ricxapp:4563
+    rte|12021|service-ricxapp-admctrl-rmr.ricxapp:4563;service-ricxapp-ueec-rmr.ricxapp:4560
+    rte|12022|service-ricxapp-admctrl-rmr.ricxapp:4563;service-ricxapp-ueec-rmr.ricxapp:4560
+    rte|12050|service-ricxapp-admctrl-rmr.ricxapp:4563;service-ricxapp-ueec-rmr.ricxapp:4560
+    rte|20000|service-ricxapp-admctrl-rmr.ricxapp:4563
     newrt|end
   rmr_string_int_mapping.txt: {{ tpl (.Files.Get "files/rmr_string_int_mapping.txt") . | quote }}
-  ricmanifest.json: {{ tpl (.Files.Get "files/ricmanifest.json") . | quote }}
\ No newline at end of file
+  ricmanifest.json: {{ tpl (.Files.Get "files/ricmanifest.json") . | quote }}

diff --git a/ric-platform/50-RIC-Platform/helm/dbaas/values.yaml b/ric-platform/50-RIC-Platform/helm/dbaas/values.yaml
index 2950715..58b2feb 100644 (file)
--- a/ric-platform/50-RIC-Platform/helm/dbaas/values.yaml
+++ b/ric-platform/50-RIC-Platform/helm/dbaas/values.yaml
@@ -19,21 +19,6 @@ repository: "nexus3.o-ran-sc.org:10004"
 imagePullPolicy: IfNotPresent
 repositoryCred: docker-reg-cred
 
-
-# Uncomment the following line to override the docker registry
-#repositoryOverride: ""
-
-
-# Uncomment the following line to override the docker registry credential
-#repositoryCredOverride: ""
-
-# Uncomment the following line to override the image pull policy
-#imagePullPolicyOverride: ""
-
-
-
-nameOverride: "redis-standalone"
-
 dbaas:
   backend:
     terminationGracePeriodSeconds: 0
@@ -41,5 +26,5 @@ dbaas:
     port: 6379
     containerPort: 6379
     image:
-      name: redis-standalone
-      tag: latest
+      name: ric-plt-dbaas
+      tag: latest
\ No newline at end of file

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 690f4f8..35632c1 100644 (file)
--- a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/configmap.yaml
+++ b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/configmap.yaml
@@ -24,6 +24,20 @@ metadata:
 data:
   router.txt: |
     newrt|start
-    rte|1001|{{ include "common.servicename.e2term.rmr" .}}:38000
-    rte|2002|{{ include "common.servicename.e2mgr.rmr" .}}:3801
+    rte|10060|{{ include "common.servicename.e2term.rmr" . }}.ricplt:38000
+    rte|10061|{{ include "common.servicename.e2mgr.rmr" . }}.ricplt:3801
+    rte|10062|{{ include "common.servicename.e2mgr.rmr" . }}.ricplt:3801
+    rte|10080|{{ include "common.servicename.e2mgr.rmr" . }}.ricplt:3801
+    rte|10360|{{ include "common.servicename.e2term.rmr" . }}.ricplt:38000
+    rte|10361|{{ include "common.servicename.e2mgr.rmr" . }}.ricplt:3801
+    rte|10362|{{ include "common.servicename.e2mgr.rmr" . }}.ricplt:3801
+    rte|12010|{{ include "common.servicename.e2term.rmr" . }}.ricplt:38000
+    rte|20001|{{ include "common.servicename.a1mediator.rmr" . }}.ricplt:4562
+    rte|12011|service-ricxapp-admctrl-rmr.ricxapp:4563
+    rte|12012|service-ricxapp-admctrl-rmr.ricxapp:4563
+    rte|12021|service-ricxapp-admctrl-rmr.ricxapp:4563;service-ricxapp-ueec-rmr.ricxapp:4560
+    rte|12022|service-ricxapp-admctrl-rmr.ricxapp:4563;service-ricxapp-ueec-rmr.ricxapp:4560
+    rte|12050|service-ricxapp-admctrl-rmr.ricxapp:4563;service-ricxapp-ueec-rmr.ricxapp:4560
+    rte|20000|service-ricxapp-admctrl-rmr.ricxapp:4563
     newrt|end
+

diff --git a/ric-platform/50-RIC-Platform/helm/e2term/templates/configmap.yaml b/ric-platform/50-RIC-Platform/helm/e2term/templates/configmap.yaml
index 68faf8e..d82ab13 100644 (file)
--- a/ric-platform/50-RIC-Platform/helm/e2term/templates/configmap.yaml
+++ b/ric-platform/50-RIC-Platform/helm/e2term/templates/configmap.yaml
@@ -24,6 +24,19 @@ metadata:
 data:
   router.txt: |
     newrt|start
-    rte|1001|{{ include "common.servicename.e2term.rmr" . }}:38000
-    rte|2002|{{ include "common.servicename.e2mgr.rmr" . }}:3801
+    rte|10060|{{ include "common.servicename.e2term.rmr" . }}.ricplt:38000
+    rte|10061|{{ include "common.servicename.e2mgr.rmr" . }}.ricplt:3801
+    rte|10062|{{ include "common.servicename.e2mgr.rmr" . }}.ricplt:3801
+    rte|10080|{{ include "common.servicename.e2mgr.rmr" . }}.ricplt:3801
+    rte|10360|{{ include "common.servicename.e2term.rmr" . }}.ricplt:38000
+    rte|10361|{{ include "common.servicename.e2mgr.rmr" . }}.ricplt:3801
+    rte|10362|{{ include "common.servicename.e2mgr.rmr" . }}.ricplt:3801
+    rte|12010|{{ include "common.servicename.e2term.rmr" . }}.ricplt:38000
+    rte|20001|{{ include "common.servicename.a1mediator.rmr" . }}.ricplt:4562
+    rte|12011|service-ricxapp-admctrl-rmr.ricxapp:4563
+    rte|12012|service-ricxapp-admctrl-rmr.ricxapp:4563
+    rte|12021|service-ricxapp-admctrl-rmr.ricxapp:4563;service-ricxapp-ueec-rmr.ricxapp:4560
+    rte|12022|service-ricxapp-admctrl-rmr.ricxapp:4563;service-ricxapp-ueec-rmr.ricxapp:4560
+    rte|12050|service-ricxapp-admctrl-rmr.ricxapp:4563;service-ricxapp-ueec-rmr.ricxapp:4560
+    rte|20000|service-ricxapp-admctrl-rmr.ricxapp:4563
     newrt|end

diff --git a/ric-platform/55-Ext-Services/helm/ext/templates/services-aux.yaml b/ric-platform/55-Ext-Services/helm/ext/templates/services-aux.yaml
index ec524c1..96839eb 100644 (file)
--- a/ric-platform/55-Ext-Services/helm/ext/templates/services-aux.yaml
+++ b/ric-platform/55-Ext-Services/helm/ext/templates/services-aux.yaml
@@ -41,7 +41,7 @@ subsets:
     ports:
       - port: {{ include "common.ingresshttpport.ricaux" . }}
         name: {{ include "common.ingressurl.ricaux" . }}-http-ingress-port
-      - port: {{ include "common.ingresshttpport.ricaux" . }}
+      - port: {{ include "common.ingresshttpsport.ricaux" . }}
         name: {{ include "common.ingressurl.ricaux" . }}-https-ingress-port
 ---
 kind: "Service"
@@ -70,5 +70,5 @@ subsets:
     ports:
       - port: {{ include "common.ingresshttpport.ricinfra" . }}
         name: {{ include "common.ingressurl.ricinfra" . }}-http-ingress-port
-      - port: {{ include "common.ingresshttpport.ricinfra" . }}
+      - port: {{ include "common.ingresshttspport.ricinfra" . }}
         name: {{ include "common.ingressurl.ricinfra" . }}-https-ingress-port

diff --git a/ric-platform/55-Ext-Services/helm/ext/templates/services-docker.yaml b/ric-platform/55-Ext-Services/helm/ext/templates/services-docker.yaml
index 019b1a2..8d6eb01 100644 (file)
--- a/ric-platform/55-Ext-Services/helm/ext/templates/services-docker.yaml
+++ b/ric-platform/55-Ext-Services/helm/ext/templates/services-docker.yaml
@@ -41,5 +41,5 @@ subsets:
     ports:
       - port: {{ include "common.ingresshttpport.ricinfra" . }}
         name: {{ include "common.ingressurl.localdocker" . }}-http-ingress-port
-      - port: {{ include "common.ingresshttpport.ricinfra" . }}
+      - port: {{ include "common.ingresshttpsport.ricinfra" . }}
         name: {{ include "common.ingressurl.localdocker" . }}-https-ingress-port

diff --git a/ric-platform/55-Ext-Services/helm/ext/templates/services-helm.yaml b/ric-platform/55-Ext-Services/helm/ext/templates/services-helm.yaml
index 8bb2338..11ab1d8 100644 (file)
--- a/ric-platform/55-Ext-Services/helm/ext/templates/services-helm.yaml
+++ b/ric-platform/55-Ext-Services/helm/ext/templates/services-helm.yaml
@@ -41,5 +41,5 @@ subsets:
     ports:
       - port: {{ include "common.ingresshttpport.ricinfra" . }}
         name: {{ include "common.ingressurl.localhelm" . }}-http-ingress-port
-      - port: {{ include "common.ingresshttpport.ricinfra" . }}
+      - port: {{ include "common.ingresshttpsport.ricinfra" . }}
         name: {{ include "common.ingressurl.localhelm" . }}-https-ingress-port