From: Zhe <zhehuang@research.att.com>
Date: Thu, 16 Apr 2020 18:46:43 +0000 (-0400)
Subject: Fix some bugs that produce wrong service name
X-Git-Tag: 3.8.0~1
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=e8844b3d9f05428990cceaedb114a0c768faca8a;p=it%2Fdev.git

Fix some bugs that produce wrong service name

Issue-ID: RIC-216
Signed-off-by: Zhe <zhehuang@research.att.com>
Change-Id: I64c81769e8e75343f81e8715d4caf28ee49a94fd
---

diff --git a/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/_helpers.tpl b/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/_helpers.tpl
index d117edb..166d47a 100644
--- a/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/_helpers.tpl
+++ b/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/_helpers.tpl
@@ -45,14 +45,9 @@ Create chart name and version as used by the chart label.
 
 
 
-{{- define "ricxapp.servicename.rmr" -}}
+{{- define "ricxapp.servicename" -}}
   {{- $name := ( include "ricxapp.fullname" . ) -}}
-  {{- printf "service-%s-rmr" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "ricxapp.servicename.http" -}}
-  {{- $name := ( include "ricxapp.fullname" . ) -}}
-  {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
+  {{- printf "service-%s" $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{- define "ricxapp.configmapname" -}}
diff --git a/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/service-rmr.yaml b/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/service-rmr.yaml
deleted file mode 100644
index 9a5d102..0000000
--- a/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/service-rmr.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-################################################################################
-#   Copyright (c) 2019 AT&T Intellectual Property.                             #
-#                                                                              #
-#   Licensed under the Apache License, Version 2.0 (the "License");            #
-#   you may not use this file except in compliance with the License.           #
-#   You may obtain a copy of the License at                                    #
-#                                                                              #
-#       http://www.apache.org/licenses/LICENSE-2.0                             #
-#                                                                              #
-#   Unless required by applicable law or agreed to in writing, software        #
-#   distributed under the License is distributed on an "AS IS" BASIS,          #
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
-#   See the License for the specific language governing permissions and        #
-#   limitations under the License.                                             #
-################################################################################
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "ricxapp.servicename.rmr" . }}
-  namespace: {{ include "ricxapp.namespace" . }}
-  labels:
-    app: {{ include "ricxapp.namespace" . }}-{{ include "ricxapp.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  type: ClusterIP
-  ports:
-  {{- range .Values.containers }}
-  {{- if .ports }}
-    {{- if .ports.rmr_data }}
-    - port: {{ .ports.rmr_data }}
-      targetPort: rmrdata-{{ .name }}
-      protocol: TCP
-      name: rmrdata-{{ .name }}
-    {{- end }}
-    {{- if .ports.rmr_route }}
-    - port: {{ .ports.rmr_route }}
-      targetPort: rmrroute-{{ .name }}
-      protocol: TCP
-      name: rmrroute-{{ .name }}
-    {{- end }}
-  {{- end }}
-  {{- end }}
-  selector:
-    app: {{ include "ricxapp.namespace" . }}-{{ include "ricxapp.name" . }}
-    release: {{ .Release.Name }}
diff --git a/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/service-http.yaml b/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/service.yaml
similarity index 87%
rename from xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/service-http.yaml
rename to xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/service.yaml
index df12f36..97fb35e 100644
--- a/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/service-http.yaml
+++ b/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/service.yaml
@@ -17,7 +17,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "ricxapp.servicename.http" . }}
+  name: {{ include "ricxapp.servicename" . }}
   namespace: {{ include "ricxapp.namespace" . }}
   labels:
     app: {{ include "ricxapp.namespace" . }}-{{ include "ricxapp.name" . }}
@@ -27,15 +27,11 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-  {{- range .Values.containers }}
-  {{- if .ports }}
-    {{- if .ports.http }}
-    - port: {{  .ports.http  }}
-      targetPort: http-{{ .name }}
+  {{- range .Values.messaging.ports  }}
+    - port: {{ .port }}
+      targetPort: {{ .name }}
       protocol: TCP
-      name: http-{{ .name }}
-    {{- end }}
-  {{- end }}
+      name: {{ .name }}
   {{- end }}
   selector:
     app: {{ include "ricxapp.namespace" . }}-{{ include "ricxapp.name" . }}