diff options
| author |   efiacor <fiachra.corcoran@est.tech> | 2019-05-15 10:48:17 +0000 |
|---|---|---|
| committer | efiacor <fiachra.corcoran@est.tech> | 2019-05-15 10:48:17 +0000 |
| commit | 338e9668b06c245af29746d6469803f2914aabe4 (patch) | |
| tree | 5a3225cef32b403c706ddd3b5d15016126ef1522 /kubernetes | |
| parent | e323097501a808b41e57d6b501c33d2eeadb8359 (diff) | |
Fix Message Router ports in robot test suite
https://gerrit.onap.org/r/c/86515/ disabled the use of HTTP ports in
Message Router by default and so 3904 is not there on a fresh install.
This commit change the use of default message router port and scheme in
robot testsuite
Change-Id: I92d267b9482c21606fb9b437f6c64a18f044184a
Issue-ID: DMAAP-1152
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Diffstat (limited to 'kubernetes')
4 files changed, 13 insertions, 7 deletions
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml b/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml index 096b51c094..92349b8bf2 100644 --- a/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml +++ b/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml @@ -29,10 +29,12 @@ spec: env: - name: DELAY value: "60" + {{- if .Values.global.allow_http }} - name: PROTO value: "http" - name: PORT value: "8080" + {{ end }} - name: REQUESTID value: "{{.Chart.Name}}-post-install" diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml index 8a2cf692b8..e411b2b4e7 100644 --- a/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml +++ b/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml @@ -29,10 +29,12 @@ spec: env: - name: DELAY value: "30" + {{- if .Values.global.allow_http }} - name: PROTO value: "http" - name: PORT value: "8080" + {{ end }} - name: REQUESTID value: "{{.Chart.Name}}-post-install" diff --git a/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml b/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml index 6d246de87f..b6f75d57cd 100644 --- a/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml +++ b/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml @@ -29,10 +29,12 @@ spec: env: - name: DELAY value: "30" + {{- if .Values.global.allow_http }} - name: PROTO value: "http" - name: PORT value: "8080" + {{ end }} - name: REQUESTID value: "{{.Chart.Name}}-post-install" volumeMounts: 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 0370bbc71d..98b6e3bb01 100644 --- a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py +++ b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py @@ -54,13 +54,13 @@ GLOBAL_DCAE_PASSWORD = '{{ .Values.dcaePassword}}' GLOBAL_DCAE_HVVES_SERVER_NAME = 'dcae-hv-ves-collector.{{include "common.namespace" .}}' GLOBAL_DCAE_HVVES_SERVER_PORT = "6061" # 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" -GLOBAL_DMAAP_DR_NODE_SERVER_PROTOCOL = "http" -GLOBAL_DMAAP_DR_NODE_SERVER_PORT = "8080" +GLOBAL_DMAAP_DR_PROV_SERVER_PROTOCOL = "https" +GLOBAL_DMAAP_DR_PROV_SERVER_PORT = "8443" +GLOBAL_DMAAP_DR_NODE_SERVER_PROTOCOL = "https" +GLOBAL_DMAAP_DR_NODE_SERVER_PORT = "8443" # dmaap message router info GLOBAL_DMAAP_MESSAGE_ROUTER_SERVER_NAME = 'message-router.{{include "common.namespace" .}}' -GLOBAL_DMAAP_MESSAGE_ROUTER_SERVER_PORT = "3904" +GLOBAL_DMAAP_MESSAGE_ROUTER_SERVER_PORT = "3905" # dmaap kafka info GLOBAL_DMAAP_KAFKA_SERVER_NAME = 'message-router-kafka.{{include "common.namespace" .}}' GLOBAL_DMAAP_KAFKA_SERVER_PORT = "9092" @@ -93,8 +93,8 @@ GLOBAL_POMBA_CONTEXTAGGREGATOR_PORT = "9529" GLOBAL_MSB_SERVER_PROTOCOL = "http" GLOBAL_MSB_SERVER_PORT = "80" # message router info - everything is from the private oam network (also called onap private network) -GLOBAL_MR_SERVER_PROTOCOL = "http" -GLOBAL_MR_SERVER_PORT = "3904" +GLOBAL_MR_SERVER_PROTOCOL = "https" +GLOBAL_MR_SERVER_PORT = "3905" # bus controller info GLOBAL_BC_HTTPS_SERVER_PORT = "8443" GLOBAL_BC_USERNAME = '{{ .Values.bcUsername }}' |