X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=helm%2Fe2term%2Ftemplates%2Fconfigmap.yaml;h=2ca8d7801e028f5ccfd9e4156ad86377b7816d0a;hb=377889f0bd9a1385e86caf65b293809ced132780;hp=316a64ecaf4a2f266a5ccc1fdcd24438f7d47780;hpb=38dc857062b14145f5b9db89d10eba0ae5b90d11;p=ric-plt%2Fric-dep.git

diff --git a/helm/e2term/templates/configmap.yaml b/helm/e2term/templates/configmap.yaml
index 316a64e..2ca8d78 100644
--- a/helm/e2term/templates/configmap.yaml
+++ b/helm/e2term/templates/configmap.yaml
@@ -14,46 +14,101 @@
 #   See the License for the specific language governing permissions and        #
 #   limitations under the License.                                             #
 ################################################################################
+{{- $topCtx :=  . }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "common.configmapname.e2term" . }}-router-configmap
-  namespace: {{ include "common.namespace.platform" . }}
+  name: {{ include "common.configmapname.e2term" $topCtx }}-router-configmap
+  namespace: {{ include "common.namespace.platform" $topCtx }}
 data:
   rmr_verbose: |
     0
   router.txt: |
     newrt|start
-    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.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
-    rte|10020|{{ include "common.servicename.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
-    rte|10060|{{ include "common.servicename.e2term.rmr" .     }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }}
-    rte|10061|{{ include "common.servicename.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
-    rte|10062|{{ include "common.servicename.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
-    rte|10030|{{ include "common.servicename.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
-    rte|10070|{{ include "common.servicename.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
-    rte|10071|{{ include "common.servicename.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
-    rte|10080|{{ include "common.servicename.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
-    rte|10091|{{ include "common.servicename.rsm.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.rsm.rmr.data" . }}
-    rte|10092|{{ include "common.servicename.rsm.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.rsm.rmr.data" . }}
-    rte|10360|{{ include "common.servicename.e2term.rmr" .     }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }}
-    rte|10361|{{ include "common.servicename.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
-    rte|10362|{{ include "common.servicename.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
-    rte|10370|{{ include "common.servicename.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
-    rte|10371|{{ include "common.servicename.e2term.rmr" .     }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }}
-    rte|12010|{{ include "common.servicename.e2term.rmr" .     }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }}
-    rte|12020|{{ include "common.servicename.e2term.rmr" .     }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }}
-    rte|20001|{{ include "common.servicename.a1mediator.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.a1mediator.rmr.data" . }}
-    rte|12011|service-ricxapp-ueec-rmr.{{ include "common.namespace.xapp" . }}:4560;service-admission-ctrl-xapp-rmr.{{ include "common.namespace.xapp" . }}:4560
-    rte|12050|service-ricxapp-ueec-rmr.{{ include "common.namespace.xapp" . }}:4560;service-admission-ctrl-xapp-rmr.{{ include "common.namespace.xapp" . }}:4560
-    rte|12012|service-ricxapp-ueec-rmr.{{ include "common.namespace.xapp" . }}:4560;service-admission-ctrl-xapp-rmr.{{ include "common.namespace.xapp" . }}:4560
-    rte|12021|service-ricxapp-ueec-rmr.{{ include "common.namespace.xapp" . }}:4560;service-admission-ctrl-xapp-rmr.{{ include "common.namespace.xapp" . }}:4560
-    rte|12022|service-ricxapp-ueec-rmr.{{ include "common.namespace.xapp" . }}:4560;service-admission-ctrl-xapp-rmr.{{ include "common.namespace.xapp" . }}:4560
-    rte|12041|service-ricxapp-ueec-rmr.{{ include "common.namespace.xapp" . }}:4560;service-admission-ctrl-xapp-rmr.{{ include "common.namespace.xapp" . }}:4560
-    rte|12042|service-ricxapp-ueec-rmr.{{ include "common.namespace.xapp" . }}:4560;service-admission-ctrl-xapp-rmr.{{ include "common.namespace.xapp" . }}:4560
-    rte|12050|service-ricxapp-ueec-rmr.{{ include "common.namespace.xapp" . }}:4560;service-admission-ctrl-xapp-rmr.{{ include "common.namespace.xapp" . }}:4560
-    rte|20000|service-ricxapp-ueec-rmr.{{ include "common.namespace.xapp" . }}:4560;service-admission-ctrl-xapp-rmr.{{ include "common.namespace.xapp" . }}:4560
+    rte|1080|{{ include "common.servicename.e2mgr.rmr" $topCtx }}.{{ include "common.namespace.platform" $topCtx }}:{{ include "common.serviceport.e2mgr.rmr.data" $topCtx }}
+    rte|1090|
+{{- $frist := true -}}
+{{- range keys .Values.e2term -}}
+{{- if $frist -}}
+{{- $frist = false -}}
+{{- else -}}
+;
+{{- end -}}
+{{ include "common.servicename.e2term.rmr" $topCtx }}-{{ . }}.{{ include "common.namespace.platform" $topCtx }}:{{ include "common.serviceport.e2term.rmr.data" $topCtx }}
+{{- end }}
+    rte|1100|{{ include "common.servicename.e2mgr.rmr" $topCtx }}.{{ include "common.namespace.platform" $topCtx }}:{{ include "common.serviceport.e2mgr.rmr.data" $topCtx }}
+    rte|10020|{{ include "common.servicename.e2mgr.rmr" $topCtx }}.{{ include "common.namespace.platform" $topCtx }}:{{ include "common.serviceport.e2mgr.rmr.data" $topCtx }}
+    rte|10060|
+{{- $frist := true -}}
+{{- range keys .Values.e2term -}}
+{{- if $frist -}}
+{{- $frist = false -}}
+{{- else -}}
+;
+{{- end -}}
+{{ include "common.servicename.e2term.rmr" $topCtx }}-{{ . }}.{{ include "common.namespace.platform" $topCtx }}:{{ include "common.serviceport.e2term.rmr.data" $topCtx }}
+{{- end }}
+    rte|10061|{{ include "common.servicename.e2mgr.rmr" $topCtx }}.{{ include "common.namespace.platform" $topCtx }}:{{ include "common.serviceport.e2mgr.rmr.data" $topCtx }}
+    rte|10062|{{ include "common.servicename.e2mgr.rmr" $topCtx }}.{{ include "common.namespace.platform" $topCtx }}:{{ include "common.serviceport.e2mgr.rmr.data" $topCtx }}
+    rte|10030|{{ include "common.servicename.e2mgr.rmr" $topCtx }}.{{ include "common.namespace.platform" $topCtx }}:{{ include "common.serviceport.e2mgr.rmr.data" $topCtx }}
+    rte|10070|{{ include "common.servicename.e2mgr.rmr" $topCtx }}.{{ include "common.namespace.platform" $topCtx }}:{{ include "common.serviceport.e2mgr.rmr.data" $topCtx }}
+    rte|10071|{{ include "common.servicename.e2mgr.rmr" $topCtx }}.{{ include "common.namespace.platform" $topCtx }}:{{ include "common.serviceport.e2mgr.rmr.data" $topCtx }}
+    rte|10080|{{ include "common.servicename.e2mgr.rmr" $topCtx }}.{{ include "common.namespace.platform" $topCtx }}:{{ include "common.serviceport.e2mgr.rmr.data" $topCtx }}
+    rte|10091|{{ include "common.servicename.rsm.rmr" $topCtx }}.{{ include "common.namespace.platform" $topCtx }}:{{ include "common.serviceport.rsm.rmr.data" $topCtx }}
+    rte|10092|{{ include "common.servicename.rsm.rmr" $topCtx }}.{{ include "common.namespace.platform" $topCtx }}:{{ include "common.serviceport.rsm.rmr.data" $topCtx }}
+    rte|10360|
+{{- $frist := true -}}
+{{- range keys .Values.e2term -}}
+{{- if $frist -}}
+{{- $frist = false -}}
+{{- else -}}
+;
+{{- end -}}
+{{ include "common.servicename.e2term.rmr" $topCtx }}-{{ . }}.{{ include "common.namespace.platform" $topCtx }}:{{ include "common.serviceport.e2term.rmr.data" $topCtx }}
+{{- end }}
+    rte|10361|{{ include "common.servicename.e2mgr.rmr" $topCtx }}.{{ include "common.namespace.platform" $topCtx }}:{{ include "common.serviceport.e2mgr.rmr.data" $topCtx }}
+    rte|10362|{{ include "common.servicename.e2mgr.rmr" $topCtx }}.{{ include "common.namespace.platform" $topCtx }}:{{ include "common.serviceport.e2mgr.rmr.data" $topCtx }}
+    rte|10370|{{ include "common.servicename.e2mgr.rmr" $topCtx }}.{{ include "common.namespace.platform" $topCtx }}:{{ include "common.serviceport.e2mgr.rmr.data" $topCtx }}
+    rte|10371|
+{{- $frist := true -}}
+{{- range keys .Values.e2term -}}
+{{- if $frist -}}
+{{- $frist = false -}}
+{{- else -}}
+;
+{{- end -}}
+{{ include "common.servicename.e2term.rmr" $topCtx }}-{{ . }}.{{ include "common.namespace.platform" $topCtx }}:{{ include "common.serviceport.e2term.rmr.data" $topCtx }}
+{{- end }}
+    rte|12010|
+{{- $frist := true -}}
+{{- range keys .Values.e2term -}}
+{{- if $frist -}}
+{{- $frist = false -}}
+{{- else -}}
+;
+{{- end -}}
+{{ include "common.servicename.e2term.rmr" $topCtx }}-{{ . }}.{{ include "common.namespace.platform" $topCtx }}:{{ include "common.serviceport.e2term.rmr.data" $topCtx }}
+{{- end }}
+    rte|12020|
+{{- $frist := true -}}
+{{- range keys .Values.e2term -}}
+{{- if $frist -}}
+{{- $frist = false -}}
+{{- else -}}
+;
+{{- end -}}
+{{ include "common.servicename.e2term.rmr" $topCtx }}-{{ . }}.{{ include "common.namespace.platform" $topCtx }}:{{ include "common.serviceport.e2term.rmr.data" $topCtx }}
+{{- end }}
+    rte|20001|{{ include "common.servicename.a1mediator.rmr" $topCtx }}.{{ include "common.namespace.platform" $topCtx }}:{{ include "common.serviceport.a1mediator.rmr.data" $topCtx }}
+    rte|12011|service-ricxapp-ueec-rmr.{{ include "common.namespace.xapp" $topCtx }}:4560;service-admission-ctrl-xapp-rmr.{{ include "common.namespace.xapp" $topCtx }}:4560
+    rte|12050|service-ricxapp-ueec-rmr.{{ include "common.namespace.xapp" $topCtx }}:4560;service-admission-ctrl-xapp-rmr.{{ include "common.namespace.xapp" $topCtx }}:4560
+    rte|12012|service-ricxapp-ueec-rmr.{{ include "common.namespace.xapp" $topCtx }}:4560;service-admission-ctrl-xapp-rmr.{{ include "common.namespace.xapp" $topCtx }}:4560
+    rte|12021|service-ricxapp-ueec-rmr.{{ include "common.namespace.xapp" $topCtx }}:4560;service-admission-ctrl-xapp-rmr.{{ include "common.namespace.xapp" $topCtx }}:4560
+    rte|12022|service-ricxapp-ueec-rmr.{{ include "common.namespace.xapp" $topCtx }}:4560;service-admission-ctrl-xapp-rmr.{{ include "common.namespace.xapp" $topCtx }}:4560
+    rte|12041|service-ricxapp-ueec-rmr.{{ include "common.namespace.xapp" $topCtx }}:4560;service-admission-ctrl-xapp-rmr.{{ include "common.namespace.xapp" $topCtx }}:4560
+    rte|12042|service-ricxapp-ueec-rmr.{{ include "common.namespace.xapp" $topCtx }}:4560;service-admission-ctrl-xapp-rmr.{{ include "common.namespace.xapp" $topCtx }}:4560
+    rte|12050|service-ricxapp-ueec-rmr.{{ include "common.namespace.xapp" $topCtx }}:4560;service-admission-ctrl-xapp-rmr.{{ include "common.namespace.xapp" $topCtx }}:4560
+    rte|20000|service-ricxapp-ueec-rmr.{{ include "common.namespace.xapp" $topCtx }}:4560;service-admission-ctrl-xapp-rmr.{{ include "common.namespace.xapp" $topCtx }}:4560
     newrt|end