Merge "Update MSB annotations SO helm chart service"

7 files changed, 87 insertions, 411 deletions

diff --git a/kubernetes/so/charts/so-bpmn-infra/templates/service.yaml b/kubernetes/so/charts/so-bpmn-infra/templates/service.yaml
index 1ad478667c..741614886c 100755
--- a/kubernetes/so/charts/so-bpmn-infra/templates/service.yaml
+++ b/kubernetes/so/charts/so-bpmn-infra/templates/service.yaml
@@ -21,27 +21,6 @@ metadata:
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
-  annotations:
-    msb.onap.org/service-info: '[
-         {
-        "serviceName": "so/bpmn",
-        "version": "v1",
-        "url": "/VNFAdaptercallback/",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1" ,
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/bpmn",
-        "version": "v1",
-        "url": "/SDNCAdapterCallbackService",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         }
-         ]'
 spec:
   type: {{ .Values.service.type }}
   ports:
@@ -56,4 +35,4 @@ spec:
     {{- end}}
   selector:
     app: {{ include "common.name" . }}
-    release: {{ .Release.Name }}
\ No newline at end of file
+    release: {{ .Release.Name }}
diff --git a/kubernetes/so/charts/so-catalog-db-adapter/templates/service.yaml b/kubernetes/so/charts/so-catalog-db-adapter/templates/service.yaml
index db3bb7848b..741614886c 100755
--- a/kubernetes/so/charts/so-catalog-db-adapter/templates/service.yaml
+++ b/kubernetes/so/charts/so-catalog-db-adapter/templates/service.yaml
@@ -21,108 +21,6 @@ metadata:
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
-  annotations:
-    msb.onap.org/service-info: '[
-         {
-        "serviceName": "so/catdb",
-        "version": "v1",
-        "url": "/services",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1" ,
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/catdb",
-        "version": "v1",
-        "url": "/{version: v[0-9]+}/vnfResources/{vnfModelCustomizationUuid}",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/catdb",
-        "version": "v1",
-        "url": "/{version: v[0-9]+}/serviceVnfs",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-          {
-        "serviceName": "so/catdb",
-        "version": "v1",
-        "url": "/{version: v[0-9]+}/networkResources/{networkModelCustomizationUuid}",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/catdb",
-        "version": "v1",
-        "url": "/{version: v[0-9]+}/serviceNetworks",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/catdb",
-        "version": "v1",
-        "url": "/{version: v[0-9]+}/serviceResources",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/catdb",
-        "version": "v1",
-        "url": "/{version: v[0-9]+}/allottedResources/{arModelCustomizationUuid}",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/catdb",
-        "version": "v1",
-        "url": "/{version: v[0-9]+}/serviceAllottedResources",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/catdb",
-        "version": "v1",
-        "url": "/{version: v[0-9]+}/vfModules",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/catdb",
-        "version": "v1",
-        "url": "/{version: v[0-9]+}/serviceToscaCsar",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/catdb",
-        "version": "v1",
-        "url": "/{version: v[0-9]+}/resourceRecipe",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         }
-         ]'
 spec:
   type: {{ .Values.service.type }}
   ports:
@@ -137,4 +35,4 @@ spec:
     {{- end}}
   selector:
     app: {{ include "common.name" . }}
-    release: {{ .Release.Name }}
\ No newline at end of file
+    release: {{ .Release.Name }}
diff --git a/kubernetes/so/charts/so-openstack-adapter/templates/service.yaml b/kubernetes/so/charts/so-openstack-adapter/templates/service.yaml
index 031616a4f3..741614886c 100755
--- a/kubernetes/so/charts/so-openstack-adapter/templates/service.yaml
+++ b/kubernetes/so/charts/so-openstack-adapter/templates/service.yaml
@@ -21,54 +21,6 @@ metadata:
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
-  annotations:
-    msb.onap.org/service-info: '[
-         {
-        "serviceName": "so/openstack",
-        "version": "v1",
-        "url": "/NetworkAdapter",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/openstack",
-        "version": "v1",
-        "url": "/NetworkAdapterAsync",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-          {
-        "serviceName": "so/openstack",
-        "version": "v1",
-        "url": "/TenantAdapter",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/openstack",
-        "version": "v1",
-        "url": "/VnfAdapter",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/openstack",
-        "version": "v1",
-        "url": "/VnfCloudifyAdapterImpl",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         }
-         ]'
 spec:
   type: {{ .Values.service.type }}
   ports:
@@ -83,4 +35,4 @@ spec:
     {{- end}}
   selector:
     app: {{ include "common.name" . }}
-    release: {{ .Release.Name }}
\ No newline at end of file
+    release: {{ .Release.Name }}
diff --git a/kubernetes/so/charts/so-request-db-adapter/templates/service.yaml b/kubernetes/so/charts/so-request-db-adapter/templates/service.yaml
index 085d986eb4..741614886c 100755
--- a/kubernetes/so/charts/so-request-db-adapter/templates/service.yaml
+++ b/kubernetes/so/charts/so-request-db-adapter/templates/service.yaml
@@ -21,117 +21,6 @@ metadata:
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
-  annotations:
-    msb.onap.org/service-info: '[
-          {
-        "serviceName": "so/reqdb",
-        "version": "v1",
-        "url": "/services",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1" ,
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/reqdb",
-        "version": "v1",
-        "url": "/RequestsDbAdapter/updateInfraRequest",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/reqdb",
-        "version": "v1",
-        "url": "/RequestsDbAdapter/getInfraRequest",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-          {
-        "serviceName": "so/reqdb",
-        "version": "v1",
-        "url": "/RequestsDbAdapter/getSiteStatus",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/reqdb",
-        "version": "v1",
-        "url": "/RequestsDbAdapter/updateServiceOperationStatus",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/reqdb",
-        "version": "v1",
-        "url": "/RequestsDbAdapter/initResourceOperationStatus",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/reqdb",
-        "version": "v1",
-        "url": "/RequestsDbAdapter/getResourceOperationStatus",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/reqdb",
-        "version": "v1",
-        "url": "/RequestsDbAdapter/updateResourceOperationStatus",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/reqdb",
-        "version": "v1",
-        "url": "/RequestsDbAdapter/infraActiveRequests/getCloudOrchestrationFiltersFromInfraActive",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/reqdb",
-        "version": "v1",
-        "url": "/RequestsDbAdapter/infraActiveRequests/getOrchestrationFiltersFromInfraActive",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/reqdb",
-        "version": "v1",
-        "url": "/RequestsDbAdapter/infraActiveRequests/checkVnfIdStatus/{operationalEnvironmentId}",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/reqdb",
-        "version": "v1",
-        "url": "/RequestsDbAdapter/infraActiveRequests/checkInstanceNameDuplicate",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         }
-         ]'
 spec:
   type: {{ .Values.service.type }}
   ports:
@@ -146,4 +35,4 @@ spec:
     {{- end}}
   selector:
     app: {{ include "common.name" . }}
-    release: {{ .Release.Name }}
\ No newline at end of file
+    release: {{ .Release.Name }}
diff --git a/kubernetes/so/charts/so-sdc-controller/templates/service.yaml b/kubernetes/so/charts/so-sdc-controller/templates/service.yaml
index 9746e3f151..741614886c 100755
--- a/kubernetes/so/charts/so-sdc-controller/templates/service.yaml
+++ b/kubernetes/so/charts/so-sdc-controller/templates/service.yaml
@@ -21,27 +21,6 @@ metadata:
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
-  annotations:
-    msb.onap.org/service-info: '[
-        {
-        "serviceName": "so/sdc",
-        "version": "v1",
-        "url": "/treatNotification/v1",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/sdc",
-        "version": "v1",
-        "url": "/statusData/v1",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         }
-        ]'
 spec:
   type: {{ .Values.service.type }}
   ports:
@@ -56,4 +35,4 @@ spec:
     {{- end}}
   selector:
     app: {{ include "common.name" . }}
-    release: {{ .Release.Name }}
\ No newline at end of file
+    release: {{ .Release.Name }}
diff --git a/kubernetes/so/charts/so-sdnc-adapter/templates/service.yaml b/kubernetes/so/charts/so-sdnc-adapter/templates/service.yaml
index 39f96a7ffa..741614886c 100755
--- a/kubernetes/so/charts/so-sdnc-adapter/templates/service.yaml
+++ b/kubernetes/so/charts/so-sdnc-adapter/templates/service.yaml
@@ -21,27 +21,6 @@ metadata:
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
-  annotations:
-    msb.onap.org/service-info: '[
-         {
-        "serviceName": "so/sdnc",
-        "version": "v1",
-        "url": "/SDNCAdapter",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/sdnc",
-        "version": "v1",
-        "url": "/SDNCNotify/SNIROResponse/{correlator}",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         }
-         ]'
 spec:
   type: {{ .Values.service.type }}
   ports:
@@ -56,4 +35,4 @@ spec:
     {{- end}}
   selector:
     app: {{ include "common.name" . }}
-    release: {{ .Release.Name }}
\ No newline at end of file
+    release: {{ .Release.Name }}
diff --git a/kubernetes/so/templates/service.yaml b/kubernetes/so/templates/service.yaml
index a813a18030..ab58ea6ede 100755
--- a/kubernetes/so/templates/service.yaml
+++ b/kubernetes/so/templates/service.yaml
@@ -24,362 +24,362 @@ metadata:
   annotations:
     msb.onap.org/service-info: '[
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/cloudResources/{version:[vV][1]}/operationalEnvironments",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/cloudResources/{version:[vV][1]}/operationalEnvironments/{operationalEnvironmentId}/activate",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/cloudResources/{version:[vV][1]}/operationalEnvironments/{operationalEnvironmentId}/deactivate",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/cloudResourcesRequests/{version:[vV][1]}/{requestId}/unlock",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/cloudResourcesRequests/{version:[vV][1]}",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/orchestrationRequests/{version:[vV][4-7]}/{requestId}",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/orchestrationRequests/{version:[vV][4-7]}",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/orchestrationRequests/{version:[vV][4-7]}/{requestId}/unlock",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/activate",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/deactivate",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][7]}/serviceInstances/assign",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][7]}/serviceInstances/{serviceInstanceId}/unassign",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/configurations",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/configurations/{configurationInstanceId}",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/configurations/{configurationInstanceId}/enablePort",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/configurations/{configurationInstanceId}/disablePort",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/configurations/{configurationInstanceId}/activate",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/configurations/{configurationInstanceId}/deactivate",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][6-7]}/serviceInstances/{serviceInstanceId}/addRelationships",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][6-7]}/serviceInstances/{serviceInstanceId}/removeRelationships",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/replace",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][6-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/applyUpdatedConfig",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "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.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfmoduleInstanceId}",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][6-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/inPlaceSoftwareUpdate",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfmoduleInstanceId}",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfmoduleInstanceId}/deactivateAndCloudDelete",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/scaleOut",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/volumeGroups",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/volumeGroups/{volumeGroupInstanceId}",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/volumeGroups/{volumeGroupInstanceId}",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/networks",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/networks/{networkInstanceId}",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/networks/{networkInstanceId}",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          }
@@ -398,4 +398,4 @@ spec:
     {{- end}}
   selector:
     app: {{ include "common.name" . }}
-    release: {{ .Release.Name }}
\ No newline at end of file
+    release: {{ .Release.Name }}