aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kubernetes/aai/charts/aai-traversal/templates/job.yaml1
-rw-r--r--kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml5
-rw-r--r--kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml2
-rw-r--r--kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py52
-rwxr-xr-xkubernetes/robot/values.yaml45
-rwxr-xr-xkubernetes/so/charts/so-bpmn-infra/templates/service.yaml23
-rwxr-xr-xkubernetes/so/charts/so-catalog-db-adapter/templates/service.yaml104
-rwxr-xr-xkubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml26
-rwxr-xr-xkubernetes/so/charts/so-openstack-adapter/templates/service.yaml50
-rwxr-xr-xkubernetes/so/charts/so-openstack-adapter/values.yaml7
-rwxr-xr-xkubernetes/so/charts/so-request-db-adapter/templates/service.yaml113
-rwxr-xr-xkubernetes/so/charts/so-sdc-controller/templates/service.yaml23
-rwxr-xr-xkubernetes/so/charts/so-sdnc-adapter/templates/service.yaml23
-rwxr-xr-xkubernetes/so/templates/service.yaml162
14 files changed, 190 insertions, 446 deletions
diff --git a/kubernetes/aai/charts/aai-traversal/templates/job.yaml b/kubernetes/aai/charts/aai-traversal/templates/job.yaml
index a018ede1a3..599bbc23fc 100644
--- a/kubernetes/aai/charts/aai-traversal/templates/job.yaml
+++ b/kubernetes/aai/charts/aai-traversal/templates/job.yaml
@@ -58,6 +58,7 @@ spec:
- |
set -x
mkdir -p /opt/aai/logroot/AAI-GQ/misc
+ until nc -w10 -z -v aai.{{.Release.Namespace}} 8443; do echo "Retrying to reach aai on port 8443"; done;
bash -x /opt/app/aai-traversal/docker-entrypoint.sh install/updateQueryData.sh
env:
- name: LOCAL_USER_ID
diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml
index 778005db45..20265e017e 100644
--- a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml
@@ -50,6 +50,9 @@ spec:
- name: {{ include "common.name" . }}
image: "{{ include "common.repository" . }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ envFrom:
+ - configMapRef:
+ name: {{ include "common.fullname" . }}-config
ports:
- containerPort: {{ .Values.service.internalPort }}
- containerPort: {{ .Values.service.internalPort2 }}
@@ -75,7 +78,7 @@ spec:
mountPath: /opt/app/config/conf
subPath: buscontroller.env
-# NOTE: the basename of the subdirectory is important - it matches the DBCL API URI
+# NOTE: the basename of the subdirectory specified in mountPath is important - it matches the DBCL API URI
- name: {{ include "common.name" . }}-dmaap
mountPath: /opt/app/config/dmaap/
- name: {{ include "common.name" . }}-dcaelocations
diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml b/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml
index e79a693382..39ecb8f8ac 100644
--- a/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml
@@ -31,7 +31,7 @@ pullPolicy: Always
# application images
repository: nexus3.onap.org:10001
-image: onap/dmaap/buscontroller:1.0.19
+image: onap/dmaap/buscontroller:1.0.20
# application configuration
diff --git a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
index f459e9d1b7..38bfceb12a 100644
--- a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
+++ b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
@@ -14,18 +14,18 @@
# aaf info - everything is from the private oam network (also called onap private network)
GLOBAL_AAF_SERVER = "https://aaf-service.{{include "common.namespace" .}}:8100"
-GLOBAL_AAF_USERNAME = "demo@people.osaaf.org"
-GLOBAL_AAF_PASSWORD = "demo123456!"
+GLOBAL_AAF_USERNAME = "{{ .Values.aafUsername }}"
+GLOBAL_AAF_PASSWORD = "{{ .Values.aafPassword }}"
# aai info - everything is from the private oam network (also called onap private network)
GLOBAL_AAI_SERVER_PROTOCOL = "https"
GLOBAL_AAI_SERVER_PORT = "8443"
-GLOBAL_AAI_USERNAME = "aai@aai.onap.org"
-GLOBAL_AAI_PASSWORD = "demo123456!"
+GLOBAL_AAI_USERNAME = "{{ .Values.aaiUsername }}"
+GLOBAL_AAI_PASSWORD = "{{ .Values.aaiPassword}}"
# appc info - everything is from the private oam network (also called onap private network)
GLOBAL_APPC_SERVER_PROTOCOL = "http"
GLOBAL_APPC_SERVER_PORT = "8282"
-GLOBAL_APPC_USERNAME = "admin"
-GLOBAL_APPC_PASSWORD = "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
+GLOBAL_APPC_USERNAME = "{{ .Values.appcUsername }}"
+GLOBAL_APPC_PASSWORD = "{{ .Values.appcPassword }}"
GLOBAL_APPC_CDT_SERVER_PROTOCOL = "http"
GLOBAL_APPC_CDT_SERVER_PORT = "80"
GLOBAL_APPC_CDT_USERNAME = "demo"
@@ -48,8 +48,8 @@ GLOBAL_CLI_SERVER_PORT = "8080"
# dcae info - everything is from the private oam network (also called onap private network)
GLOBAL_DCAE_SERVER_PROTOCOL = "http"
GLOBAL_DCAE_HEALTH_SERVER_PORT = "80"
-GLOBAL_DCAE_USERNAME = "console"
-GLOBAL_DCAE_PASSWORD = "ZjJkYjllMjljMTI2M2Iz"
+GLOBAL_DCAE_USERNAME = "{{ .Values.dcaeUsername }}"
+GLOBAL_DCAE_PASSWORD = "{{ .Values.dcaePassword}}"
# data router info - everything is from the private oam network (also called onap private network)
GLOBAL_DMAAP_DR_PROV_SERVER_PROTOCOL = "http"
GLOBAL_DMAAP_DR_PROV_SERVER_PORT = "8080"
@@ -57,8 +57,8 @@ GLOBAL_DMAAP_DR_NODE_SERVER_PROTOCOL = "http"
GLOBAL_DMAAP_DR_NODE_SERVER_PORT = "8080"
# DROOL server port and credentials
GLOBAL_DROOLS_SERVER_PORT = "9696"
-GLOBAL_DROOLS_USERNAME = "demo@people.osaaf.org"
-GLOBAL_DROOLS_PASSWORD = "demo123456!"
+GLOBAL_DROOLS_USERNAME = "{{ .Values.droolsUsername }}"
+GLOBAL_DROOLS_PASSWORD = "{{ .Values.droolsPassword }}"
# log server config - NOTE: no log server is run in HEAT; only on OOM
GLOBAL_LOG_SERVER_PROTOCOL = "http"
GLOBAL_LOG_ELASTICSEARCH_PORT = "9200"
@@ -88,10 +88,10 @@ GLOBAL_MSO_REQDB_SERVER_PORT = "8083"
GLOBAL_MSO_SDNC_SERVER_PORT = "8086"
GLOBAL_MSO_VFC_SERVER_PORT = "8084"
-GLOBAL_MSO_USERNAME = "InfraPortalClient"
-GLOBAL_MSO_CATDB_USERNAME = "bpel"
-GLOBAL_MSO_PASSWORD = "password1$"
-
+GLOBAL_MSO_USERNAME = "{{ .Values.soUsername }}"
+GLOBAL_MSO_CATDB_USERNAME = "{{ .Values.soCatdbUsername }}"
+GLOBAL_MSO_PASSWORD = "{{ .Values.soPassword }}"
+# robot uses MSO_PASSWORD for both SO and CATDB
# music info - everything is from the private oam network (also called onap private network)
GLOBAL_MUSIC_SERVER_PROTOCOL = "http"
GLOBAL_MUSIC_SERVER_PORT = "8080"
@@ -111,21 +111,21 @@ GLOBAL_PGN_PORT = "2831"
GLOBAL_POLICY_SERVER_PROTOCOL = "https"
GLOBAL_POLICY_SERVER_PORT = "8081"
GLOBAL_POLICY_HEALTHCHECK_PORT = "6969"
-GLOBAL_POLICY_AUTH = "dGVzdHBkcDphbHBoYTEyMw=="
-GLOBAL_POLICY_CLIENTAUTH = "cHl0aG9uOnRlc3Q="
-GLOBAL_POLICY_USERNAME = "demo@people.osaaf.org"
-GLOBAL_POLICY_PASSWORD = "demo123456!"
+GLOBAL_POLICY_AUTH = "{{ .Values.policyAuth}}"
+GLOBAL_POLICY_CLIENTAUTH = "{{ .Values.policyClientAuth}}"
+GLOBAL_POLICY_USERNAME = "{{ .Values.policyUsername }}"
+GLOBAL_POLICY_PASSWORD = "{{ .Values.policyPassword }}"
# portal info - everything is from the private oam network (also called onap private network)
GLOBAL_PORTAL_SERVER_PROTOCOL = "http"
GLOBAL_PORTAL_SERVER_PORT = "8989"
-GLOBAL_PORTAL_USERNAME = "demo"
-GLOBAL_PORTAL_PASSWORD = "Kp8bJ4SXszM0WXlhak3eHlcse"
+GLOBAL_PORTAL_USERNAME = "{{ .Values.portalUsername }}"
+GLOBAL_PORTAL_PASSWORD = "{{ .Values.portalPassword }}"
# sdngc info - everything is from the private oam network (also called onap private network)
GLOBAL_SDNGC_SERVER_PROTOCOL = "http"
GLOBAL_SDNGC_REST_PORT = "8282"
GLOBAL_SDNGC_ADMIN_PORT = "8843"
-GLOBAL_SDNGC_USERNAME = "admin"
-GLOBAL_SDNGC_PASSWORD = "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
+GLOBAL_SDNGC_USERNAME = "{{ .Values.sdncUsername }}"
+GLOBAL_SDNGC_PASSWORD = "{{ .Values.sdncPassword }}"
# sms (AAF) info
GLOBAL_SMS_SERVER_PROTOCOL = "https"
GLOBAL_SMS_SERVER_NAME = "aaf-sms.{{include "common.namespace" .}}"
@@ -133,10 +133,10 @@ GLOBAL_SMS_SERVER_PORT = "10443"
# vid info - everything is from the private oam network (also called onap private network)
GLOBAL_VID_SERVER_PROTOCOL = "https"
GLOBAL_VID_SERVER_PORT = "8443"
-GLOBAL_VID_USERNAME = "demo"
-GLOBAL_VID_PASSWORD = "Kp8bJ4SXszM0WX"
-GLOBAL_VID_HEALTH_USERNAME = "Default"
-GLOBAL_VID_HEALTH_PASSWORD = "AppPassword!1"
+GLOBAL_VID_USERNAME = "{{ .Values.vidUsername }}"
+GLOBAL_VID_PASSWORD = "{{ .Values.vidPassword}}"
+GLOBAL_VID_HEALTH_USERNAME = "{{ .Values.vidHealthUsername }}"
+GLOBAL_VID_HEALTH_PASSWORD = "{{ .Values.vidHealthPassword }}"
# vnfsdk info - everything is from the private oam network (also called onap private network)
GLOBAL_VNFSDK_SERVER_PROTOCOL = "http"
GLOBAL_VNFSDK_SERVER_PORT = "8702"
diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml
index 7fb9885596..6a11f2bf0c 100755
--- a/kubernetes/robot/values.yaml
+++ b/kubernetes/robot/values.yaml
@@ -60,7 +60,7 @@ openStackProjectName: "onap"
# Domain id of openstack where VNFs will be deployed. Maps to GLOBAL_INJECTED_OPENSTACK_DOMAIN_ID
openStackDomainId: "default"
# Openstack Keystone API version. Valid values are [ v2.0, v3 ]. Maps to GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION
-openStackKeystoneAPIVersion: ""
+openStackKeystoneAPIVersion: "v2.0"
# Openstack glance image name for Ubuntu 14. Maps to GLOBAL_INJECTED_UBUNTU_1404_IMAGE
ubuntu14Image: "Ubuntu_14_trusty"
# Openstack glance image name for Ubuntu 16. Maps to GLOBAL_INJECTED_UBUNTU_1604_IMAGE
@@ -78,11 +78,54 @@ openStackPrivateNetCidr: "10.0.0.0/8"
# The first 2 octets of the private Openstack subnet where VNFs will be spawned.
# Needed because sdnc preload templates hardcodes things like this 10.0.${ecompnet}.X
openStackOamNetworkCidrPrefix: "10.0"
+# VID protocol/port until Selenium issue with SSL resolved
+# https/8443 vs http/8080
+vidServerProtocol: "http"
+vidServerPort: "8080"
# Override with Pub Key for access to VNF
vnfPubKey: "FILL_IN_WITH_PUB_KEY"
# Override with DCAE VES Collector external IP
dcaeCollectorIp: "FILL_IN_WITH_DCAE_VES_COLLECTOR_IP"
+# Credentials for ONAP Component
+# AAF
+aafUsername: "demo@people.osaaf.org"
+aafPassword: "demo123456!"
+# AAI
+aaiUsername: "aai@aai.onap.org"
+aaiPassword: "demo123456!"
+# APPC
+appcUsername: "admin"
+appcPassword: "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
+# DCAE
+dcaeUsername: "console"
+dcaePassword: "ZjJkYjllMjljMTI2M2Iz"
+# DROOLS
+droolsUsername: "demo@people.osaaf.org"
+droolsPassword: "demo123456!"
+# POLICY
+policyAuth: "dGVzdHBkcDphbHBoYTEyMw=="
+policyClientAuth: "cHl0aG9uOnRlc3Q="
+policyUsername: "demo@people.osaaf.org"
+policyPassword: "demo123456!"
+# PORTAL
+portalUsername: "demo"
+portalPassword: "Kp8bJ4SXszM0WXlhak3eHlcse"
+# SO
+soUsername: "InfraPortalClient"
+soPassword: "password1$"
+soCatdbUsername: "bpel"
+soCatdbPassword: "password1$"
+# SDNC
+sdncUsername: "admin"
+sdncPassword: "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
+# VID
+vidUsername: "demo"
+vidPassword: "Kp8bJ4SXszM0WX"
+vidHealthUsername: "Default"
+vidHealthPassword: "AppPassword!1"
+
+
# default number of instances
replicaCount: 1
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/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml
index c0f7851103..f7e9e47947 100755
--- a/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml
@@ -16,8 +16,8 @@ server:
spring:
datasource:
url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
- username: ${DB_USERNAME}
- password: ${DB_PASSWORD}
+ username: ${DB_ADMIN_USERNAME}
+ password: ${DB_ADMIN_PASSWORD}
driver-class-name: org.mariadb.jdbc.Driver
dbcp2:
initial-size: 5
@@ -112,11 +112,20 @@ cloud_config:
identity_url: "https://identity.api.rackspacecloud.com/v2.0"
mso_id: "RACKSPACE_ACCOUNT_ID"
mso_pass: "RACKSPACE_ACCOUNT_APIKEY"
- admin_tenant: "service"
+ admin_tenant: "{{ .Values.config.openStackServiceTenantName }}"
member_role: "admin"
tenant_metadata: true
identity_server_type: "KEYSTONE"
identity_authentication_type: "RACKSPACE_APIKEY"
+ DEFAULT_KEYSTONE:
+ identity_url: "{{ .Values.config.openStackKeyStoneUrl }}"
+ mso_id: "{{ .Values.config.openStackUserName }}"
+ mso_pass: "{{ .Values.config.openStackEncryptedPasswordHere }}"
+ admin_tenant: "{{ .Values.config.openStackServiceTenantName }}"
+ member_role: "admin"
+ tenant_metadata: true
+ identity_server_type: "KEYSTONE"
+ identity_authentication_type: "USERNAME_PASSWORD"
cloud_sites:
Dallas:
region_id: "DFW"
@@ -133,8 +142,13 @@ cloud_config:
clli: "ORD"
aic_version: "2.5"
identity_service_id: "RAX_KEYSTONE"
+ RegionOne:
+ region_id: "RegionOne"
+ clli: "RegionOne"
+ aic_version: "2.5"
+ identity_service_id: "DEFAULT_KEYSTONE"
DEFAULT:
- region_id: "DFW"
- clli: "DFW"
+ region_id: "{{ .Values.config.openStackRegion }}"
+ clli: "{{ .Values.config.openStackRegion }}"
aic_version: "2.5"
- identity_service_id: "RAX_KEYSTONE"
+ identity_service_id: "DEFAULT_KEYSTONE"
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-openstack-adapter/values.yaml b/kubernetes/so/charts/so-openstack-adapter/values.yaml
index d076c7255c..447b7cab75 100755
--- a/kubernetes/so/charts/so-openstack-adapter/values.yaml
+++ b/kubernetes/so/charts/so-openstack-adapter/values.yaml
@@ -76,6 +76,13 @@ mariadb:
nameOverride: so-mariadb
ingress:
enabled: false
+config:
+ openStackUserName: "vnf_user"
+ openStackRegion: "RegionOne"
+ openStackKeyStoneUrl: "http://1.2.3.4:5000/v2.0"
+ openStackServiceTenantName: "service"
+ openStackEncryptedPasswordHere: "c124921a3a0efbe579782cde8227681e"
+ openStackTenantId: "d570c718cbc545029f40e50b75eb13df"
nodeSelector: {}
tolerations: []
affinity: {}
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 }}