X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fso%2Ftemplates%2Fservice.yaml;h=5a83d566ac3a59c216037e73fe1fe63fbd29cab2;hb=e4aac7a3c577b7bb9eaae93387d482f952ee4b72;hp=ac9d179628d911f956630055e3c6f1f8e42d3f6a;hpb=282751f1c3c062ab6c0c3aa6c49b32417de360e4;p=oom.git

diff --git a/kubernetes/so/templates/service.yaml b/kubernetes/so/templates/service.yaml
old mode 100644
new mode 100755
index ac9d179628..5a83d566ac
--- a/kubernetes/so/templates/service.yaml
+++ b/kubernetes/so/templates/service.yaml
@@ -1,4 +1,5 @@
-# Copyright © 2017 Amdocs, Bell Canada
+{{/*
+# Copyright © 2018 AT&T USA
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +12,7 @@
 # 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:
@@ -20,65 +21,383 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
   annotations:
     msb.onap.org/service-info: '[
-      {
-          "serviceName": "{{ include "common.servicename" . }}",
-          "version": "v1",
-          "url": "/ecomp/mso/infra",
-          "protocol": "REST"
-          "port": "8080",
-          "visualRange":"1"
-      },
-      {
-          "serviceName": "so-deprecated",
-          "version": "v1",
-          "url": "/ecomp/mso/infra",
-          "protocol": "REST"
-          "port": "8080",
-          "visualRange":"1",
-          "path":"/ecomp/mso/infra"
-      }
-      ]'
+         {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/cloudResources/{version:[vV][1]}/operationalEnvironments",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+         {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/cloudResources/{version:[vV][1]}/operationalEnvironments/{operationalEnvironmentId}/activate",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+          {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/cloudResources/{version:[vV][1]}/operationalEnvironments/{operationalEnvironmentId}/deactivate",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+         {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/cloudResourcesRequests/{version:[vV][1]}/{requestId}/unlock",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+         {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/cloudResourcesRequests/{version:[vV][1]}",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+          {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/orchestrationRequests/{version:[vV][4-7]}/{requestId}",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+          {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/orchestrationRequests/{version:[vV][4-7]}",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+          {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/orchestrationRequests/{version:[vV][4-7]}/{requestId}/unlock",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+         {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+         {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/activate",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+          {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/deactivate",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+         {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+         {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][7]}/serviceInstances/assign",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+          {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiation/{version:[vV][7]}/serviceInstances/{serviceInstanceId}/unassign",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+          {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/configurations",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+          {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/configurations/{configurationInstanceId}",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+         {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/configurations/{configurationInstanceId}/enablePort",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+         {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/configurations/{configurationInstanceId}/disablePort",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+          {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/configurations/{configurationInstanceId}/activate",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+         {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/configurations/{configurationInstanceId}/deactivate",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+         {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][6-7]}/serviceInstances/{serviceInstanceId}/addRelationships",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+          {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiation/{version:[vV][6-7]}/serviceInstances/{serviceInstanceId}/removeRelationships",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+          {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+          {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/replace",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+         {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+         {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiation/{version:[vV][6-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/applyUpdatedConfig",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+          {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+         {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+         {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfmoduleInstanceId}/replace",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+          {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfmoduleInstanceId}",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+          {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][6-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/inPlaceSoftwareUpdate",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+          {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfmoduleInstanceId}",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+         {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiation/{version:[vV][7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfmoduleInstanceId}/deactivateAndCloudDelete",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+         {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiation/{version:[vV][7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/scaleOut",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+          {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/volumeGroups",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+         {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/volumeGroups/{volumeGroupInstanceId}",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+         {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/volumeGroups/{volumeGroupInstanceId}",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+          {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/networks",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+          {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/networks/{networkInstanceId}",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         },
+          {
+        "serviceName": "so",
+        "version": "v1",
+        "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/networks/{networkInstanceId}",
+        "protocol": "REST",
+        "port": "{{ .Values.service.internalPort }}",
+        "visualRange":"0",
+        "lb_policy":"ip_hash"
+         }
+         ]'
 spec:
   type: {{ .Values.service.type }}
   ports:
     {{if eq .Values.service.type "NodePort" -}}
     - port: {{ .Values.service.internalPort }}
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
-      name: {{ .Values.service.portName }}
-    - port: {{ .Values.service.internalPort2 }}
-      nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
-      name: {{ .Values.service.portName }}2
-    - port: {{ .Values.service.internalPort3 }}
-      nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort3 }}
-      name: {{ .Values.service.portName }}3
-    - port: {{ .Values.service.internalPort4 }}
-      nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort4 }}
-      name: {{ .Values.service.portName }}4
-    - port: {{ .Values.service.internalPort5 }}
-      nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort5 }}
-      name: {{ .Values.service.portName }}5
+      name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
     {{- else -}}
     - port: {{ .Values.service.externalPort }}
       targetPort: {{ .Values.service.internalPort }}
-      name: {{ .Values.service.portName }}
-    - port: {{ .Values.service.externalPort2 }}
-      targetPort: {{ .Values.service.internalPort2 }}
-      name: {{ .Values.service.portName }}2
-    - port: {{ .Values.service.externalPort3 }}
-      targetPort: {{ .Values.service.internalPort3 }}
-      name: {{ .Values.service.portName }}3
-    - port: {{ .Values.service.externalPort4 }}
-      targetPort: {{ .Values.service.internalPort4 }}
-      name: {{ .Values.service.portName }}4
-    - port: {{ .Values.service.externalPort5 }}
-      targetPort: {{ .Values.service.internalPort5 }}
-      name: {{ .Values.service.portName }}5
+      name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
     {{- end}}
   selector:
     app: {{ include "common.name" . }}
-    release: {{ .Release.Name }}
-
+    release: {{ include "common.release" . }}