From: Andreas Geissler Date: Wed, 19 Oct 2022 07:07:30 +0000 (+0200) Subject: [ROBOT] Get VES collector tests work under ServiceMesh X-Git-Tag: 11.0.0~49^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=cb947b512b1bf06890752fe35398de74a9258efe;hp=4b31de9cd509903fe8c30b226720c87890857795;p=oom.git [ROBOT] Get VES collector tests work under ServiceMesh Set the GLOBAL_DCAE_VES_HTTPS* variables to HTTP in ServiceMesh environments to enable the VES healthcheck and PNF_registrate tests Issue-ID: OOM-3005 Signed-off-by: Andreas Geissler Change-Id: I85add1d99db9570cf567fd043a5aee7b4e98431a --- diff --git a/kubernetes/robot/resources/config/eteshare/config/robot_properties.py b/kubernetes/robot/resources/config/eteshare/config/robot_properties.py index e9da3ffaa8..8365c68297 100644 --- a/kubernetes/robot/resources/config/eteshare/config/robot_properties.py +++ b/kubernetes/robot/resources/config/eteshare/config/robot_properties.py @@ -355,8 +355,8 @@ GLOBAL_VNFSDK_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "host GLOBAL_DCAE_VES_PROTOCOL = "http" GLOBAL_DCAE_VES_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "dcae-ves-collector" "port" 8080) }}' -GLOBAL_DCAE_VES_HTTPS_PROTOCOL = "https" -GLOBAL_DCAE_VES_HTTPS_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "dcae-ves-collector-https" "port" 8443) }}' +GLOBAL_DCAE_VES_HTTPS_PROTOCOL = 'http{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}' +GLOBAL_DCAE_VES_HTTPS_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "dcae-ves-collector-https" "port" ( ternary 8443 8080 (eq "true" (include "common.needTLS" . )))) }}' GLOBAL_DCAE_VES_USERNAME = 'sample1' GLOBAL_DCAE_VES_PASSWORD = 'sample1'