From 1a667938a92faec08766d2afe5671261cae16b3d Mon Sep 17 00:00:00 2001 From: Brian Freeman Date: Thu, 6 Sep 2018 14:45:37 -0500 Subject: Fix from robot testing and resolve merge Issue-ID: SO-713 Change-Id: Icafe6b039cc793c3724c387c06a2e80153e307bb Signed-off-by: Brian Freeman --- .../config/integration_preload_parameters.py | 2 +- .../config/integration_robot_properties.py | 15 ++++++++++++++- .../config/eteshare/config/vm_properties.py | 22 ++++++++++++++++++---- kubernetes/so/charts/so-bpmn-infra/values.yaml | 4 ++-- .../so/charts/so-catalog-db-adapter/values.yaml | 4 ++-- .../so/charts/so-openstack-adapter/values.yaml | 2 +- .../so/charts/so-request-db-adapter/values.yaml | 4 ++-- kubernetes/so/charts/so-sdc-controller/values.yaml | 4 ++-- kubernetes/so/charts/so-sdnc-adapter/values.yaml | 4 ++-- kubernetes/so/charts/so-vfc-adapter/values.yaml | 4 ++-- kubernetes/so/values.yaml | 4 ++-- 11 files changed, 48 insertions(+), 21 deletions(-) (limited to 'kubernetes') diff --git a/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py b/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py index b87ca650fc..a857e8300b 100644 --- a/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py +++ b/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py @@ -1,4 +1,4 @@ -# Copyright © 2018 Amdocs, Bell Canada +# Copyright (c) 2018 Amdocs, Bell Canada # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. 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 f2b50ce7dd..24bb08a42a 100644 --- a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py +++ b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py @@ -1,4 +1,4 @@ -# Copyright © 2018 Amdocs, Bell Canada +# Copyright (c) 2018 Amdocs, Bell Canada # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -75,8 +75,20 @@ GLOBAL_MR_SERVER_PORT = "3904" # mso info - everything is from the private oam network (also called onap private network) GLOBAL_MSO_SERVER_PROTOCOL = "http" GLOBAL_MSO_SERVER_PORT = "8080" + +GLOBAL_MSO_APIHAND_SERVER_PORT = "8080" +GLOBAL_MSO_ASDCHAND_SERVER_PORT = "8085" +GLOBAL_MSO_BPMN_SERVER_PORT = "8081" +GLOBAL_MSO_CATDB_SERVER_PORT = "8082" +GLOBAL_MSO_OPENSTACK_SERVER_PORT = "8087" +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$" + # music info - everything is from the private oam network (also called onap private network) GLOBAL_MUSIC_SERVER_PROTOCOL = "http" GLOBAL_MUSIC_SERVER_PORT = "8080" @@ -132,3 +144,4 @@ GLOBAL_PROXY_WARNING_CONTINUE_XPATH="" GLOBAL_DNS_TRAFFIC_DURATION = "600" # location where heat templates are loaded from GLOBAL_HEAT_TEMPLATES_FOLDER = "/var/opt/OpenECOMP_ETE/demo/heat" + diff --git a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py index d07f2e34a1..6a6ec3ed14 100644 --- a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py +++ b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py @@ -1,4 +1,4 @@ -# Copyright © 2018 Amdocs, Bell Canada +# Copyright (c) 2018 Amdocs, Bell Canada # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -34,7 +34,6 @@ GLOBAL_INJECTED_LOG_KIBANA_IP_ADDR = "log-kibana.{{include "common.namespace" .} GLOBAL_INJECTED_LOG_LOGSTASH_IP_ADDR = "log-ls-http.{{include "common.namespace" .}}" GLOBAL_INJECTED_KEYSTONE = "{{ .Values.openStackKeyStoneUrl }}" GLOBAL_INJECTED_MR_IP_ADDR = "message-router.{{include "common.namespace" .}}" -GLOBAL_INJECTED_MSO_IP_ADDR = "so.{{include "common.namespace" .}}" GLOBAL_INJECTED_MUSIC_IP_ADDR = "music.{{include "common.namespace" .}}" GLOBAL_INJECTED_NBI_IP_ADDR = "nbi.{{include "common.namespace" .}}" GLOBAL_INJECTED_NETWORK = "{{ .Values.openStackPrivateNetId }}" @@ -61,7 +60,15 @@ GLOBAL_INJECTED_SDC_FE_IP_ADDR = "sdc-fe.{{include "common.namespace" .}}" GLOBAL_INJECTED_SDC_IP_ADDR = "N/A" GLOBAL_INJECTED_SDNC_IP_ADDR = "sdnc.{{include "common.namespace" .}}" GLOBAL_INJECTED_SDNC_PORTAL_IP_ADDR = "sdnc-portal.{{include "common.namespace" .}}" +GLOBAL_INJECTED_SO_APIHAND_IP_ADDR = "so.{{include "common.namespace" .}}" +GLOBAL_INJECTED_SO_ASDCHAND_IP_ADDR = "so-sdc-controller.{{include "common.namespace" .}}" +GLOBAL_INJECTED_SO_BPMN_IP_ADDR = "so-bpmn-infra.{{include "common.namespace" .}}" +GLOBAL_INJECTED_SO_CATDB_IP_ADDR = "so-catalog-db-adapter.{{include "common.namespace" .}}" GLOBAL_INJECTED_SO_IP_ADDR = "so.{{include "common.namespace" .}}" +GLOBAL_INJECTED_SO_OPENSTACK_IP_ADDR = "so-openstack-adapter.{{include "common.namespace" .}}" +GLOBAL_INJECTED_SO_REQDB_IP_ADDR = "so-request-db-adapter.{{include "common.namespace" .}}" +GLOBAL_INJECTED_SO_SDNC_IP_ADDR = "so-sdnc-adapter.{{include "common.namespace" .}}" +GLOBAL_INJECTED_SO_VFC_IP_ADDR = "so-vfc-adapter.{{include "common.namespace" .}}" GLOBAL_INJECTED_UBUNTU_1404_IMAGE = "{{ .Values.ubuntu14Image }}" GLOBAL_INJECTED_UBUNTU_1604_IMAGE = "{{ .Values.ubuntu16Image }}" GLOBAL_INJECTED_VM_IMAGE_NAME = "{{ .Values.ubuntu14Image }}" @@ -81,7 +88,7 @@ GLOBAL_INJECTED_PROPERTIES = { "GLOBAL_INJECTED_CLOUD_ENV" : "openstack", "GLOBAL_INJECTED_DCAE_IP_ADDR" : "dcae-healthcheck.{{include "common.namespace" .}}", "GLOBAL_INJECTED_DMAAP_DR_PROV_IP_ADDR" : "dmaap-dr-prov.{{include "common.namespace" .}}", - "GLOBAL_INJECTED_DMAAP_DR_NODE_IP_ADDR": "dmaap-dr-node.{{include "common.namespace" .}}", + "GLOBAL_INJECTED_DMAAP_DR_NODE_IP_ADDR" : "dmaap-dr-node.{{include "common.namespace" .}}", "GLOBAL_INJECTED_DNS_IP_ADDR" : "N/A", "GLOBAL_INJECTED_DOCKER_VERSION" : "1.2-STAGING-latest", "GLOBAL_INJECTED_EXTERNAL_DNS" : "N/A", @@ -90,7 +97,6 @@ GLOBAL_INJECTED_PROPERTIES = { "GLOBAL_INJECTED_LOG_KIBANA_IP_ADDR" : "log-kibana.{{include "common.namespace" .}}", "GLOBAL_INJECTED_LOG_LOGSTASH_IP_ADDR" : "log-ls.{{include "common.namespace" .}}", "GLOBAL_INJECTED_MR_IP_ADDR" : "message-router.{{include "common.namespace" .}}", - "GLOBAL_INJECTED_MSO_IP_ADDR" : "so.{{include "common.namespace" .}}", "GLOBAL_INJECTED_MUSIC_IP_ADDR" : "music.{{include "common.namespace" .}}", "GLOBAL_INJECTED_NBI_IP_ADDR" : "nbi.{{include "common.namespace" .}}", "GLOBAL_INJECTED_NETWORK" : "{{ .Values.openStackPrivateNetId }}", @@ -117,7 +123,15 @@ GLOBAL_INJECTED_PROPERTIES = { "GLOBAL_INJECTED_SCRIPT_VERSION" : "{{ .Values.scriptVersion }}", "GLOBAL_INJECTED_SDNC_IP_ADDR" : "sdnc.{{include "common.namespace" .}}", "GLOBAL_INJECTED_SDNC_PORTAL_IP_ADDR" : "sdnc-portal.{{include "common.namespace" .}}", + "GLOBAL_INJECTED_SO_APIHAND_IP_ADDR" : "so.{{include "common.namespace" .}}", + "GLOBAL_INJECTED_SO_ASDCHAND_IP_ADDR" : "so-sdc-controller.{{include "common.namespace" .}}", + "GLOBAL_INJECTED_SO_BPMN_IP_ADDR" : "so-bpmn-infra.{{include "common.namespace" .}}", + "GLOBAL_INJECTED_SO_CATDB_IP_ADDR" : "so-catalog-db-adapter.{{include "common.namespace" .}}", "GLOBAL_INJECTED_SO_IP_ADDR" : "so.{{include "common.namespace" .}}", + "GLOBAL_INJECTED_SO_OPENSTACK_IP_ADDR" : "so-openstack-adapter.{{include "common.namespace" .}}", + "GLOBAL_INJECTED_SO_REQDB_IP_ADDR" : "so-request-db-adapter.{{include "common.namespace" .}}", + "GLOBAL_INJECTED_SO_SDNC_IP_ADDR" : "so-sdnc-adapter.{{include "common.namespace" .}}", + "GLOBAL_INJECTED_SO_VFC_IP_ADDR" : "so-vfc-adapter.{{include "common.namespace" .}}", "GLOBAL_INJECTED_UBUNTU_1404_IMAGE" : "{{.Values.ubuntu14Image}}", "GLOBAL_INJECTED_UBUNTU_1604_IMAGE" : "{{.Values.ubuntu16Image}}", "GLOBAL_INJECTED_VM_IMAGE_NAME" : "{{ .Values.ubuntu14Image }}", diff --git a/kubernetes/so/charts/so-bpmn-infra/values.yaml b/kubernetes/so/charts/so-bpmn-infra/values.yaml index 4f6e1093b1..82fb5a67ff 100755 --- a/kubernetes/so/charts/so-bpmn-infra/values.yaml +++ b/kubernetes/so/charts/so-bpmn-infra/values.yaml @@ -22,7 +22,7 @@ app: so-bpmn-infra service: type: ClusterIP internalPort: 8081 - externalPort: 10200 + externalPort: 8081 portName: so-bpmn-port updateStrategy: type: RollingUpdate @@ -47,4 +47,4 @@ ingress: enabled: false nodeSelector: {} tolerations: [] -affinity: {} \ No newline at end of file +affinity: {} diff --git a/kubernetes/so/charts/so-catalog-db-adapter/values.yaml b/kubernetes/so/charts/so-catalog-db-adapter/values.yaml index 7e49057cc0..a62d9c0d9b 100755 --- a/kubernetes/so/charts/so-catalog-db-adapter/values.yaml +++ b/kubernetes/so/charts/so-catalog-db-adapter/values.yaml @@ -22,7 +22,7 @@ app: catalog-db-adapter service: type: ClusterIP internalPort: 8082 - externalPort: 10800 + externalPort: 8082 portName: so-catdb-port updateStrategy: type: RollingUpdate @@ -48,4 +48,4 @@ ingress: enabled: false nodeSelector: {} tolerations: [] -affinity: {} \ No newline at end of file +affinity: {} diff --git a/kubernetes/so/charts/so-openstack-adapter/values.yaml b/kubernetes/so/charts/so-openstack-adapter/values.yaml index abd12c76dc..c90b931bca 100755 --- a/kubernetes/so/charts/so-openstack-adapter/values.yaml +++ b/kubernetes/so/charts/so-openstack-adapter/values.yaml @@ -21,7 +21,7 @@ app: openstack-adapter service: type: ClusterIP internalPort: 8087 - externalPort: 10300 + externalPort: 8087 portName: so-optack-port updateStrategy: type: RollingUpdate diff --git a/kubernetes/so/charts/so-request-db-adapter/values.yaml b/kubernetes/so/charts/so-request-db-adapter/values.yaml index 46ac09e8ee..cf418cdaf3 100755 --- a/kubernetes/so/charts/so-request-db-adapter/values.yaml +++ b/kubernetes/so/charts/so-request-db-adapter/values.yaml @@ -21,7 +21,7 @@ app: request-db-adapter service: type: ClusterIP internalPort: 8083 - externalPort: 10700 + externalPort: 8083 portName: so-reqdb-port updateStrategy: type: RollingUpdate @@ -47,4 +47,4 @@ ingress: enabled: false nodeSelector: {} tolerations: [] -affinity: {} \ No newline at end of file +affinity: {} diff --git a/kubernetes/so/charts/so-sdc-controller/values.yaml b/kubernetes/so/charts/so-sdc-controller/values.yaml index 903b490612..c191ffc86f 100755 --- a/kubernetes/so/charts/so-sdc-controller/values.yaml +++ b/kubernetes/so/charts/so-sdc-controller/values.yaml @@ -21,7 +21,7 @@ app: sdc-controller service: type: ClusterIP internalPort: 8085 - externalPort: 10500 + externalPort: 8085 portName: so-sdc-port updateStrategy: type: RollingUpdate @@ -47,4 +47,4 @@ ingress: enabled: false nodeSelector: {} tolerations: [] -affinity: {} \ No newline at end of file +affinity: {} diff --git a/kubernetes/so/charts/so-sdnc-adapter/values.yaml b/kubernetes/so/charts/so-sdnc-adapter/values.yaml index 0402e6fc7d..278d30287a 100755 --- a/kubernetes/so/charts/so-sdnc-adapter/values.yaml +++ b/kubernetes/so/charts/so-sdnc-adapter/values.yaml @@ -21,7 +21,7 @@ app: sdnc-adapter service: type: ClusterIP internalPort: 8086 - externalPort: 10400 + externalPort: 8086 portName: so-sdnc-port updateStrategy: type: RollingUpdate @@ -47,4 +47,4 @@ ingress: enabled: false nodeSelector: {} tolerations: [] -affinity: {} \ No newline at end of file +affinity: {} diff --git a/kubernetes/so/charts/so-vfc-adapter/values.yaml b/kubernetes/so/charts/so-vfc-adapter/values.yaml index 3007a2fc8b..ad83dbcaac 100755 --- a/kubernetes/so/charts/so-vfc-adapter/values.yaml +++ b/kubernetes/so/charts/so-vfc-adapter/values.yaml @@ -21,7 +21,7 @@ app: vfc-adapter service: type: ClusterIP internalPort: 8084 - externalPort: 10600 + externalPort: 8084 portName: so-vfc-port updateStrategy: type: RollingUpdate @@ -47,4 +47,4 @@ ingress: enabled: false nodeSelector: {} tolerations: [] -affinity: {} \ No newline at end of file +affinity: {} diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml index cdca395b17..a613ee1a3a 100755 --- a/kubernetes/so/values.yaml +++ b/kubernetes/so/values.yaml @@ -22,7 +22,7 @@ app: api-handler-infra service: type: NodePort nodePort: 77 - internalPort: 10100 + internalPort: 8080 portName: so-apih-port updateStrategy: type: RollingUpdate @@ -52,4 +52,4 @@ global: mariadb: nameOverride: so-db nodeSelector: {} -affinity: {} \ No newline at end of file +affinity: {} -- cgit 1.2.3-korg