From: lapentafd Date: Thu, 16 Jan 2025 11:19:27 +0000 (+0000) Subject: Creating K release in ORAN env file for FTC X-Git-Tag: l-release~8^2~2 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=8fc088acbdd9d88b83a8980d7a77bff4636836df;p=nonrtric.git Creating K release in ORAN env file for FTC - Updated also the certificates for http-https proxy because expired Issue-ID: NONRTRIC-1017 Change-Id: Ie0634696f1b68b46821608738d2d550449e8c377 Signed-off-by: lapentafd --- diff --git a/docker-compose/policy-service/config/application-policyagent.yaml b/docker-compose/policy-service/config/application-policyagent.yaml index 646ad326..815c56d9 100755 --- a/docker-compose/policy-service/config/application-policyagent.yaml +++ b/docker-compose/policy-service/config/application-policyagent.yaml @@ -83,6 +83,9 @@ otel: sdk: disabled: ${ONAP_SDK_DISABLED:true} south: ${ONAP_TRACING_SOUTHBOUND:true} + instrumentation: + spring-webflux: + enabled: ${ONAP_TRACING_NORTHBOUND:true} tracing: sampler: jaeger_remote: diff --git a/test/auto-test/FTC1.sh b/test/auto-test/FTC1.sh index 87284dd7..a1869859 100755 --- a/test/auto-test/FTC1.sh +++ b/test/auto-test/FTC1.sh @@ -35,7 +35,7 @@ KUBE_PRESTARTED_IMAGES="" CONDITIONALLY_IGNORED_IMAGES="NGW " #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE" +SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE ORAN-K-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" diff --git a/test/auto-test/FTC10.sh b/test/auto-test/FTC10.sh index a529c80a..1ba4e874 100755 --- a/test/auto-test/FTC10.sh +++ b/test/auto-test/FTC10.sh @@ -34,7 +34,7 @@ KUBE_PRESTARTED_IMAGES="" CONDITIONALLY_IGNORED_IMAGES="NGW" #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE" +SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE ORAN-K-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" diff --git a/test/auto-test/FTC100.sh b/test/auto-test/FTC100.sh index fbe9fd2b..bb5a0f68 100755 --- a/test/auto-test/FTC100.sh +++ b/test/auto-test/FTC100.sh @@ -41,7 +41,7 @@ KUBE_PRESTARTED_IMAGES="" CONDITIONALLY_IGNORED_IMAGES="NGW" #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE" +SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE ORAN-K-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" diff --git a/test/auto-test/FTC110.sh b/test/auto-test/FTC110.sh index 4933469a..90fa8e10 100755 --- a/test/auto-test/FTC110.sh +++ b/test/auto-test/FTC110.sh @@ -35,7 +35,7 @@ KUBE_PRESTARTED_IMAGES="" CONDITIONALLY_IGNORED_IMAGES="NGW" #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE" +SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE ORAN-K-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" diff --git a/test/auto-test/FTC1100.sh b/test/auto-test/FTC1100.sh index 2c210bd3..a977eb97 100755 --- a/test/auto-test/FTC1100.sh +++ b/test/auto-test/FTC1100.sh @@ -41,7 +41,7 @@ KUBE_PRESTARTED_IMAGES="" CONDITIONALLY_IGNORED_IMAGES="NGW" #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE" +SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE ORAN-K-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" diff --git a/test/auto-test/FTC150.sh b/test/auto-test/FTC150.sh index 33faec58..3f07a28b 100755 --- a/test/auto-test/FTC150.sh +++ b/test/auto-test/FTC150.sh @@ -34,7 +34,7 @@ KUBE_PRESTARTED_IMAGES=" " CONDITIONALLY_IGNORED_IMAGES="" #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE" +SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE ORAN-K-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" diff --git a/test/auto-test/FTC1800.sh b/test/auto-test/FTC1800.sh index bfae5737..82e2fbf8 100755 --- a/test/auto-test/FTC1800.sh +++ b/test/auto-test/FTC1800.sh @@ -35,7 +35,7 @@ KUBE_PRESTARTED_IMAGES="" CONDITIONALLY_IGNORED_IMAGES="NGW" #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE" +SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE ORAN-K-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" diff --git a/test/auto-test/FTC1_A1PMS_ADAPTER.sh b/test/auto-test/FTC1_A1PMS_ADAPTER.sh index cc102770..c2e822e2 100755 --- a/test/auto-test/FTC1_A1PMS_ADAPTER.sh +++ b/test/auto-test/FTC1_A1PMS_ADAPTER.sh @@ -35,7 +35,7 @@ KUBE_PRESTARTED_IMAGES="" CONDITIONALLY_IGNORED_IMAGES="NGW " #Supported test environment profiles -SUPPORTED_PROFILES="ORAN-I-RELEASE ORAN-J-RELEASE ONAP-MONTREAL ONAP-NEWDELHI" +SUPPORTED_PROFILES="ORAN-I-RELEASE ORAN-J-RELEASE ORAN-K-RELEASE ONAP-MONTREAL ONAP-NEWDELHI" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" diff --git a/test/auto-test/FTC1_MEDIATOR_ADAPTER.sh b/test/auto-test/FTC1_MEDIATOR_ADAPTER.sh index 26b5ce3a..5b396cdb 100644 --- a/test/auto-test/FTC1_MEDIATOR_ADAPTER.sh +++ b/test/auto-test/FTC1_MEDIATOR_ADAPTER.sh @@ -29,7 +29,7 @@ KUBE_PRESTARTED_IMAGES="" CONDITIONALLY_IGNORED_IMAGES="NGW " # Supported test environment profiles -SUPPORTED_PROFILES="ORAN-I-RELEASE ORAN-J-RELEASE" +SUPPORTED_PROFILES="ORAN-I-RELEASE ORAN-J-RELEASE ORAN-K-RELEASE " # Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" diff --git a/test/auto-test/FTC1_RICMEDIATOR.sh b/test/auto-test/FTC1_RICMEDIATOR.sh index 6ab690b6..0a8e2c5c 100755 --- a/test/auto-test/FTC1_RICMEDIATOR.sh +++ b/test/auto-test/FTC1_RICMEDIATOR.sh @@ -35,7 +35,7 @@ KUBE_PRESTARTED_IMAGES="" CONDITIONALLY_IGNORED_IMAGES="NGW " #Supported test environment profiles -SUPPORTED_PROFILES="ORAN-I-RELEASE ORAN-J-RELEASE" +SUPPORTED_PROFILES="ORAN-I-RELEASE ORAN-J-RELEASE ORAN-K-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" diff --git a/test/auto-test/FTC1_RICMEDIATORONLY.sh b/test/auto-test/FTC1_RICMEDIATORONLY.sh index e754ef07..2f438e22 100644 --- a/test/auto-test/FTC1_RICMEDIATORONLY.sh +++ b/test/auto-test/FTC1_RICMEDIATORONLY.sh @@ -32,7 +32,7 @@ KUBE_PRESTARTED_IMAGES="" CONDITIONALLY_IGNORED_IMAGES="NGW " # Supported test environment profiles -SUPPORTED_PROFILES="ORAN-I-RELEASE ORAN-J-RELEASE" +SUPPORTED_PROFILES="ORAN-I-RELEASE ORAN-J-RELEASE ORAN-K-RELEASE" # Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" @@ -55,11 +55,11 @@ for __httpx in $TESTED_PROTOCOLS ; do echo "### Testing a1pms: $interface using $__httpx" echo "#####################################################################" echo "#####################################################################" - + clean_environment - + start_kube_proxy - + use_a1pms_rest_http use_ricmediator_simulator_http @@ -71,7 +71,7 @@ for __httpx in $TESTED_PROTOCOLS ; do use_cr_http use_ricmediator_simulator_http use_a1pms_rest_http - + start_ricmediator_simulators ricsim_g4 1 NONE start_cr 1 start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE @@ -127,7 +127,7 @@ for __httpx in $TESTED_PROTOCOLS ; do a1pms_equal json:policies 0 a1pms_equal json:policy-instances 0 cr_equal 0 received_callbacks 1 - + check_a1pms_logs done done diff --git a/test/auto-test/FTC2001.sh b/test/auto-test/FTC2001.sh index fb18e8dc..a26e0d8a 100755 --- a/test/auto-test/FTC2001.sh +++ b/test/auto-test/FTC2001.sh @@ -34,7 +34,7 @@ KUBE_PRESTARTED_IMAGES="" CONDITIONALLY_IGNORED_IMAGES="NGW" #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE" +SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE ORAN-K-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" diff --git a/test/auto-test/FTC2003.sh b/test/auto-test/FTC2003.sh index 2d3ecc00..4b0199b8 100755 --- a/test/auto-test/FTC2003.sh +++ b/test/auto-test/FTC2003.sh @@ -34,7 +34,7 @@ KUBE_PRESTARTED_IMAGES="" CONDITIONALLY_IGNORED_IMAGES="" #Supported test environment profiles -SUPPORTED_PROFILES="ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE" +SUPPORTED_PROFILES="ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE ORAN-K-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" diff --git a/test/auto-test/FTC300.sh b/test/auto-test/FTC300.sh index 0c1b5946..1eb607cb 100755 --- a/test/auto-test/FTC300.sh +++ b/test/auto-test/FTC300.sh @@ -34,7 +34,7 @@ KUBE_PRESTARTED_IMAGES="" CONDITIONALLY_IGNORED_IMAGES="NGW" #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE" +SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE ORAN-K-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" diff --git a/test/auto-test/FTC3000.sh b/test/auto-test/FTC3000.sh index cce753cb..08bcbe61 100755 --- a/test/auto-test/FTC3000.sh +++ b/test/auto-test/FTC3000.sh @@ -35,7 +35,7 @@ KUBE_PRESTARTED_IMAGES="" CONDITIONALLY_IGNORED_IMAGES="" #Supported test environment profiles -SUPPORTED_PROFILES="ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE" +SUPPORTED_PROFILES="ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE ORAN-K-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" diff --git a/test/auto-test/FTC3001.sh b/test/auto-test/FTC3001.sh index 7c83ee62..d82fd7c4 100755 --- a/test/auto-test/FTC3001.sh +++ b/test/auto-test/FTC3001.sh @@ -35,7 +35,7 @@ KUBE_PRESTARTED_IMAGES="" CONDITIONALLY_IGNORED_IMAGES="" #Supported test environment profiles -SUPPORTED_PROFILES="ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE" +SUPPORTED_PROFILES="ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE ORAN-K-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" diff --git a/test/auto-test/FTC310.sh b/test/auto-test/FTC310.sh index edaead8b..e70fea8d 100755 --- a/test/auto-test/FTC310.sh +++ b/test/auto-test/FTC310.sh @@ -30,7 +30,7 @@ DOCKER_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM KUBEPROXY" CONDITIONALLY_IGNORED_IMAGES="" #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE" +SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE ORAN-K-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER" diff --git a/test/auto-test/FTC350.sh b/test/auto-test/FTC350.sh index 0c7b608d..f00f05e1 100755 --- a/test/auto-test/FTC350.sh +++ b/test/auto-test/FTC350.sh @@ -34,7 +34,7 @@ KUBE_PRESTARTED_IMAGES="" CONDITIONALLY_IGNORED_IMAGES="" #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE" +SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE ORAN-K-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" diff --git a/test/auto-test/FTC4000.sh b/test/auto-test/FTC4000.sh index 3204420c..b20355dc 100755 --- a/test/auto-test/FTC4000.sh +++ b/test/auto-test/FTC4000.sh @@ -34,7 +34,7 @@ KUBE_PRESTARTED_IMAGES="" CONDITIONALLY_IGNORED_IMAGES="" #Supported test environment profiles -SUPPORTED_PROFILES="ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE" +SUPPORTED_PROFILES="ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE ORAN-K-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" diff --git a/test/auto-test/FTC800.sh b/test/auto-test/FTC800.sh index 31961c55..59487f42 100755 --- a/test/auto-test/FTC800.sh +++ b/test/auto-test/FTC800.sh @@ -34,7 +34,7 @@ KUBE_PRESTARTED_IMAGES="" CONDITIONALLY_IGNORED_IMAGES="NGW" #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE" +SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE ORAN-K-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" diff --git a/test/auto-test/FTC805.sh b/test/auto-test/FTC805.sh index 65bc6c71..649ba1ec 100755 --- a/test/auto-test/FTC805.sh +++ b/test/auto-test/FTC805.sh @@ -34,7 +34,7 @@ KUBE_PRESTARTED_IMAGES="" CONDITIONALLY_IGNORED_IMAGES="NGW" #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE" +SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE ORAN-K-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" diff --git a/test/auto-test/FTC810.sh b/test/auto-test/FTC810.sh index 1ee33f09..e5b197d9 100755 --- a/test/auto-test/FTC810.sh +++ b/test/auto-test/FTC810.sh @@ -34,7 +34,7 @@ KUBE_PRESTARTED_IMAGES="" CONDITIONALLY_IGNORED_IMAGES="NGW" #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE" +SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE ORAN-K-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" diff --git a/test/auto-test/FTC850.sh b/test/auto-test/FTC850.sh index 87620800..836063a3 100755 --- a/test/auto-test/FTC850.sh +++ b/test/auto-test/FTC850.sh @@ -34,7 +34,7 @@ KUBE_PRESTARTED_IMAGES="" CONDITIONALLY_IGNORED_IMAGES="NGW" #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE" +SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE ORAN-K-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" diff --git a/test/auto-test/FTC900.sh b/test/auto-test/FTC900.sh index 9f144650..0946fb02 100755 --- a/test/auto-test/FTC900.sh +++ b/test/auto-test/FTC900.sh @@ -34,7 +34,7 @@ KUBE_PRESTARTED_IMAGES="" CONDITIONALLY_IGNORED_IMAGES="NGW" #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE" +SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE ORAN-K-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" diff --git a/test/auto-test/PM_DEMO.sh b/test/auto-test/PM_DEMO.sh index 1351e5d9..a98e4ab1 100755 --- a/test/auto-test/PM_DEMO.sh +++ b/test/auto-test/PM_DEMO.sh @@ -34,7 +34,7 @@ KUBE_PRESTARTED_IMAGES="" CONDITIONALLY_IGNORED_IMAGES="NGW" #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE" +SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE ORAN-K-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" diff --git a/test/auto-test/PM_EI_DEMO.sh b/test/auto-test/PM_EI_DEMO.sh index 1c9a2e2a..f0447b31 100755 --- a/test/auto-test/PM_EI_DEMO.sh +++ b/test/auto-test/PM_EI_DEMO.sh @@ -34,7 +34,7 @@ KUBE_PRESTARTED_IMAGES="" CONDITIONALLY_IGNORED_IMAGES="NGW" #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE" +SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ONAP-NEWDELHI ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE ORAN-J-RELEASE ORAN-K-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" diff --git a/test/auto-test/verify-jobs-nonrtric.sh b/test/auto-test/verify-jobs-nonrtric.sh index e93e1a70..d5bc111b 100644 --- a/test/auto-test/verify-jobs-nonrtric.sh +++ b/test/auto-test/verify-jobs-nonrtric.sh @@ -25,7 +25,7 @@ PULL_IMAGE_TYPE="remote-remove" RUN_MODE="docker" IMAGE_VERSION="release" ENV_FLAG="--env-file" -ENV_FILE="../common/test_env-oran-h-release.sh" +ENV_FILE="../common/test_env-oran-k-release.sh" # Check if jq is installed, and install it if not if ! command -v jq &> /dev/null; then diff --git a/test/common/test_env-oran-k-release.sh b/test/common/test_env-oran-k-release.sh new file mode 100644 index 00000000..c1522232 --- /dev/null +++ b/test/common/test_env-oran-k-release.sh @@ -0,0 +1,602 @@ +#!/bin/bash + +# ============LICENSE_START=============================================== +# Copyright (C) 2025 OpenInfra Foundation Europe. All rights reserved. +# ======================================================================== +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END================================================= +# +#Profile for ORAN K release +TEST_ENV_PROFILE="ORAN-K-RELEASE" +FLAVOUR="ORAN" + +######################################## +## Nexus repo settings +######################################## + +# Nexus repos for developed images +NEXUS_PROXY_REPO="nexus3.o-ran-sc.org:10001/" +NEXUS_RELEASE_REPO="nexus3.o-ran-sc.org:10002/" +NEXUS_SNAPSHOT_REPO="nexus3.o-ran-sc.org:10003/" +NEXUS_STAGING_REPO="nexus3.o-ran-sc.org:10004/" + +# Nexus repos for images used by test (not developed by the project) +NEXUS_RELEASE_REPO_ONAP="nexus3.onap.org:10002/" # Only for released ONAP images +NEXUS_RELEASE_REPO_ORAN=$NEXUS_RELEASE_REPO + +######################################## +# Set up of image and tags for the test. +######################################## + +# NOTE: One environment variable containing the image name and tag is create by the test script +# for each image from the env variables below. +# The variable is created by removing the suffix "_BASE" from the base image variable name. +# Example: A1PMS_IMAGE_BASE -> A1PMS_IMAGE +# This var will point to the local or remote image depending on cmd line arguments. +# In addition, the repo and the image tag version are selected from the list of image tags based on the cmd line argument. +# For images built by the script, only tag #1 shall be specified +# For project images, only tag #1, #2, #3 and #4 shall be specified +# For ORAN images (non project), only tag #5 shall be specified +# For ONAP images (non project), only tag #6 shall be specified +# For all other images, only tag #7 shall be specified +# 1 XXX_LOCAL: local images: : +# 2 XXX_REMOTE_SNAPSHOT: snapshot images: : +# 3 XXX_REMOTE: staging images: : +# 4 XXX_REMOTE_RELEASE: release images: : +# 5 XXX_REMOTE_RELEASE_ORAN: ORAN release images: : +# 6 XXX_REMOTE_RELEASE_ONAP: ONAP release images: : +# 7 XXX_PROXY: other images, not produced by the project: : + + +# A1PMS base image and tags +A1PMS_IMAGE_BASE="o-ran-sc/nonrtric-plt-a1policymanagementservice" +A1PMS_IMAGE_TAG_LOCAL="2.9.0-SNAPSHOT" +A1PMS_IMAGE_TAG_REMOTE_SNAPSHOT="2.9.0-SNAPSHOT" +A1PMS_IMAGE_TAG_REMOTE="2.9.0" +A1PMS_IMAGE_TAG_REMOTE_RELEASE="2.9.0" + +# ICS image and tags +ICS_IMAGE_BASE="o-ran-sc/nonrtric-plt-informationcoordinatorservice" +ICS_IMAGE_TAG_LOCAL="1.6.0-SNAPSHOT" +ICS_IMAGE_TAG_REMOTE_SNAPSHOT="1.6.0-SNAPSHOT" +ICS_IMAGE_TAG_REMOTE="1.6.0" +ICS_IMAGE_TAG_REMOTE_RELEASE="1.6.0" +#Note: Update var ICS_FEATURE_LEVEL if image version is changed + +#Control Panel image and tags +CONTROL_PANEL_IMAGE_BASE="o-ran-sc/nonrtric-controlpanel" +CONTROL_PANEL_IMAGE_TAG_LOCAL="2.5.0-SNAPSHOT" +CONTROL_PANEL_IMAGE_TAG_REMOTE_SNAPSHOT="2.5.0-SNAPSHOT" +CONTROL_PANEL_IMAGE_TAG_REMOTE="2.5.0" +CONTROL_PANEL_IMAGE_TAG_REMOTE_RELEASE="2.5.0" + + +# Gateway image and tags +NRT_GATEWAY_IMAGE_BASE="o-ran-sc/nonrtric-gateway" +NRT_GATEWAY_IMAGE_TAG_LOCAL="1.2.0-SNAPSHOT" +NRT_GATEWAY_IMAGE_TAG_REMOTE_SNAPSHOT="1.2.0-SNAPSHOT" +NRT_GATEWAY_IMAGE_TAG_REMOTE="1.2.0" +NRT_GATEWAY_IMAGE_TAG_REMOTE_RELEASE="1.2.0" + + +# SDNC A1 Controller image and tags - Note using released honolulu ONAP image +SDNC_A1_CONTROLLER_IMAGE_BASE="onap/sdnc-image" +SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_RELEASE_ONAP="2.6.1" +#No local image for ONAP SDNC, remote release image always used + +# ORAN SDNC adapter kept as reference +# SDNC A1 Controller image and tags - still using cherry version, no new version for D-Release +#SDNC_A1_CONTROLLER_IMAGE_BASE="o-ran-sc/nonrtric-a1-controller" +#SDNC_A1_CONTROLLER_IMAGE_TAG_LOCAL="2.0.1-SNAPSHOT" +#SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_SNAPSHOT="2.0.1-SNAPSHOT" +#SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE="2.0.1" +#SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_RELEASE="2.0.1" + +#SDNC DB remote image and tag +#The DB is part of SDNC so handled in the same way as SDNC +SDNC_DB_IMAGE_BASE="mariadb" +SDNC_DB_IMAGE_TAG_REMOTE_PROXY="10.5" + +#Older SDNC db image kept for reference +#SDNC DB remote image and tag +#SDNC_DB_IMAGE_BASE="mysql/mysql-server" +#SDNC_DB_IMAGE_TAG_REMOTE_PROXY="5.6" +#No local image for SSDNC DB, remote image always used + + +# RAPP Catalogue image and tags +RAPP_CAT_IMAGE_BASE="o-ran-sc/nonrtric-plt-rappcatalogue" +RAPP_CAT_IMAGE_TAG_LOCAL="1.2.0-SNAPSHOT" +RAPP_CAT_IMAGE_TAG_REMOTE_SNAPSHOT="1.2.0-SNAPSHOT" +RAPP_CAT_IMAGE_TAG_REMOTE="1.2.0" +RAPP_CAT_IMAGE_TAG_REMOTE_RELEASE="1.2.0" + + +# Near RT RIC Simulator image and tags +RIC_SIM_IMAGE_BASE="o-ran-sc/a1-simulator" +RIC_SIM_IMAGE_TAG_LOCAL="latest" +RIC_SIM_IMAGE_TAG_REMOTE_SNAPSHOT="2.8.0-SNAPSHOT" +RIC_SIM_IMAGE_TAG_REMOTE="2.8.0" +RIC_SIM_IMAGE_TAG_REMOTE_RELEASE="2.8.0" + +# ORAN Near RT RIC Simulator image and tags +RICMEDIATOR_SIM_IMAGE_BASE="o-ran-sc/ric-plt-a1" +RICMEDIATOR_SIM_IMAGE_TAG_REMOTE_RELEASE_ORAN="3.2.1" + +# ORAN Near RT RIC Simulator DB image and tags +RICMEDIATOR_SIM_DB_IMAGE_BASE="o-ran-sc/ric-plt-dbaas" +RICMEDIATOR_SIM_DB_IMAGE_TAG_REMOTE_RELEASE_ORAN="0.6.2" + +# DMAAP Mediator Service +DMAAP_MED_IMAGE_BASE="o-ran-sc/nonrtric-plt-dmaapmediatorproducer" +DMAAP_MED_IMAGE_TAG_LOCAL="1.2.0-SNAPSHOT" +DMAAP_MED_IMAGE_TAG_REMOTE_SNAPSHOT="1.2.0-SNAPSHOT" +DMAAP_MED_IMAGE_TAG_REMOTE="1.2.0" +DMAAP_MED_IMAGE_TAG_REMOTE_RELEASE="1.2.0" + +# DMAAP Adapter Service +DMAAP_ADP_IMAGE_BASE="o-ran-sc/nonrtric-plt-dmaapadapter" +DMAAP_ADP_IMAGE_TAG_LOCAL="1.4.0-SNAPSHOT" +DMAAP_ADP_IMAGE_TAG_REMOTE_SNAPSHOT="1.4.0-SNAPSHOT" +DMAAP_ADP_IMAGE_TAG_REMOTE="1.4.0" +DMAAP_ADP_IMAGE_TAG_REMOTE_RELEASE="1.4.0" + +# Helm Manager +HELM_MANAGER_IMAGE_BASE="o-ran-sc/nonrtric-plt-helmmanager" +HELM_MANAGER_IMAGE_TAG_LOCAL="1.3.0-SNAPSHOT" +HELM_MANAGER_IMAGE_TAG_REMOTE_SNAPSHOT="1.3.0-SNAPSHOT" +HELM_MANAGER_IMAGE_TAG_REMOTE="1.3.0" +HELM_MANAGER_IMAGE_TAG_REMOTE_RELEASE="1.3.0" + +# Auth sidecar +AUTHSIDECAR_IMAGE_BASE="o-ran-sc/nonrtric-auth-token-fetch" +AUTHSIDECAR_IMAGE_TAG_LOCAL="1.1.1-SNAPSHOT" +AUTHSIDECAR_IMAGE_TAG_REMOTE_SNAPSHOT="1.1.1-SNAPSHOT" +AUTHSIDECAR_IMAGE_TAG_REMOTE="1.1.1" +AUTHSIDECAR_IMAGE_TAG_REMOTE_RELEASE="1.1.1" + +#MR stub image and tag +MRSTUB_IMAGE_BASE="mrstub" +MRSTUB_IMAGE_TAG_LOCAL="latest" +#No remote image for MR stub, local image always used + + +#Callback receiver image and tag +CR_IMAGE_BASE="callback-receiver" +CR_IMAGE_TAG_LOCAL="latest" +#No remote image for CR, local image always used + + +#Producer stub image and tag +PROD_STUB_IMAGE_BASE="producer-stub" +PROD_STUB_IMAGE_TAG_LOCAL="latest" +#No remote image for producer stub, local image always used + +#Http proxy remote image and tag +HTTP_PROXY_IMAGE_BASE="nodejs-http-proxy" +HTTP_PROXY_IMAGE_TAG_LOCAL="latest" +#No local image for http proxy, remote image always used + +#ONAP Zookeeper remote image and tag +ONAP_ZOOKEEPER_IMAGE_BASE="onap/dmaap/zookeeper" +ONAP_ZOOKEEPER_IMAGE_TAG_REMOTE_RELEASE_ONAP="6.1.0" +#No local image for ONAP Zookeeper, remote image always used + +#ONAP Kafka remote image and tag +ONAP_KAFKA_IMAGE_BASE="onap/dmaap/kafka111" +ONAP_KAFKA_IMAGE_TAG_REMOTE_RELEASE_ONAP="1.1.1" +#No local image for ONAP Kafka, remote image always used + +#ONAP DMAAP-MR remote image and tag +ONAP_DMAAPMR_IMAGE_BASE="onap/dmaap/dmaap-mr" +ONAP_DMAAPMR_IMAGE_TAG_REMOTE_RELEASE_ONAP="1.3.0" +#No local image for ONAP DMAAP-MR, remote image always used + +#Kube proxy remote image and tag +KUBE_PROXY_IMAGE_BASE="nodejs-kube-proxy" +KUBE_PROXY_IMAGE_TAG_LOCAL="latest" +#No remote image for kube proxy, local image always used + +#PVC Cleaner remote image and tag +PVC_CLEANER_IMAGE_BASE="ubuntu" +PVC_CLEANER_IMAGE_TAG_REMOTE_PROXY="20.10" +#No local image for pvc cleaner, remote image always used + +#Kafka Procon image and tag +KAFKAPC_IMAGE_BASE="kafka-procon" +KAFKAPC_IMAGE_TAG_LOCAL="latest" +#No local image for pvc cleaner, remote image always used + +#Chartmusem remote image and tag +CHART_MUS_IMAGE_BASE="ghcr.io/helm/chartmuseum" +CHART_MUS_IMAGE_TAG_REMOTE_OTHER="v0.13.1" +#No local image for chart museum, remote image always used + +#Keycloak remote image and tag +KEYCLOAK_IMAGE_BASE="quay.io/keycloak/keycloak" +KEYCLOAK_IMAGE_TAG_REMOTE_OTHER="17.0.0" +#No local image for chart museum, remote image always used + +# List of app short names produced by the project +PROJECT_IMAGES_APP_NAMES="A1PMS ICS CP RC RICSIM NGW DMAAPADP DMAAPMED HELMMANAGER AUTHSIDECAR" # Add SDNC here if oran image is used + +# List of app short names which images pulled from ORAN +ORAN_IMAGES_APP_NAMES="" # Not used + +# List of app short names which images pulled from ONAP +ONAP_IMAGES_APP_NAMES="DMAAPMR SDNC" # SDNC added as ONAP image + + +######################################## +# Detailed settings per app +######################################## + +# Port number variables +# ===================== +# Port number vars _INTERNAL_PORT and _INTERNAL_SECURE_PORT are set as pod/container port in kube and container port in docker +# +# Port number vars _EXTERNAL_PORT and _EXTERNAL_SECURE_PORT are set as svc port in kube and localhost port in docker +# +# For some components, eg. MR, can be represented as the MR-STUB and/or the DMAAP MR. For these components +# special vars named _LOCALHOST_PORT and _LOCALHOST_SECURE_PORT are used as localhost ports instead of +# name>_EXTERNAL_PORT and _EXTERNAL_SECURE_PORT ports in docker in order to prevent overlapping ports on local host +# +# For KUBE PROXY there are special external port for docker as the proxy exposes also the kube svc port on localhost, +# therefore a special set of external port are needed for docker _DOCKER_EXTERNAL_PORT and _DOCKER_EXTERNAL_SECURE_PORT + +DOCKER_SIM_NWNAME="nonrtric-docker-net" # Name of docker private network + +KUBE_NONRTRIC_NAMESPACE="nonrtric" # Namespace for all nonrtric components +KUBE_SIM_NAMESPACE="nonrtric-ft" # Namespace for simulators (except MR and RICSIM) +KUBE_A1SIM_NAMESPACE="a1-sim" # Namespace for a1-p simulators (RICSIM) +KUBE_ONAP_NAMESPACE="onap" # Namespace for onap (only message router) +KUBE_SDNC_NAMESPACE="onap" # Namespace for sdnc +KUBE_KEYCLOAK_NAMESPACE="keycloak" # Namespace for keycloak + +A1PMS_EXTERNAL_PORT=8081 # A1PMS container external port (host -> container) +A1PMS_INTERNAL_PORT=8081 # A1PMS container internal port (container -> container) +A1PMS_EXTERNAL_SECURE_PORT=8433 # A1PMS container external secure port (host -> container) +A1PMS_INTERNAL_SECURE_PORT=8433 # A1PMS container internal secure port (container -> container) +A1PMS_APIS="V1 V2" # Supported northbound api versions +A1PMS_VERSION="V2" # Tested version of northbound API +A1PMS_V3="V3" # To be used this property to test v3 endpoints +A1PMS_API_PREFIX="/a1-policy" # api url prefix, only for V2 +A1PMS_API_PREFIX_V3="/a1-policy-management" # api url prefix, only for V3 +A1PMS_V3_FLAG="true" # To enable the V3 API's for testing in the same run + +A1PMS_APP_NAME="policymanagementservice" # Name for A1PMS container +A1PMS_DISPLAY_NAME="Policy Management Service" +A1PMS_HOST_MNT_DIR="./mnt" # Mounted dir, relative to compose file, on the host +A1PMS_LOGPATH="/var/log/policy-agent/application.log" # Path the application log in the A1PMS container +A1PMS_APP_NAME_ALIAS="policy-agent-container" # Alias name, name used by the control panel +A1PMS_CONFIG_KEY="policy-agent" # Key for consul config +A1PMS_PKG_NAME="org.onap.ccsdk.oran.a1policymanagementservice" # Java base package name +A1PMS_ACTUATOR="/actuator/loggers/$A1PMS_PKG_NAME" # Url for trace/debug +A1PMS_ALIVE_URL="$A1PMS_API_PREFIX/v2/status" # Base path for alive check +A1PMS_ALIVE_URL_V3=/v1/status # Base path for V3 alive check +A1PMS_COMPOSE_DIR="a1pms" # Dir in simulator_group for docker-compose +A1PMS_CONFIG_MOUNT_PATH="/opt/app/policy-agent/config" # Path in container for config file +A1PMS_DATA_MOUNT_PATH="/opt/app/policy-agent/data" # Path in container for data file +A1PMS_CONFIG_FILE="application.yaml" # Container config file name +A1PMS_DATA_FILE="application_configuration.json" # Container data file name +A1PMS_CONTAINER_MNT_DIR="/var/policy-management-service" # Mounted dir in the container +A1PMS_FEATURE_LEVEL="NO-DMAAP ADAPTER-CLASS" # Space separated list of features +A1PMS_ADAPTER_CLASS="" # Class name set by override file +A1PMS_ADAPTER_POLICY_TYPE="" # Policy type set by override file +A1PMS_NOSDNC_ADAPTER_CLASS="" # Class name set by override file +A1PMS_SDNC_ADAPTER_CLASS="" # Class name set by override file + +ICS_APP_NAME="informationservice" # Name for ICS container +ICS_DISPLAY_NAME="Information Coordinator Service" # Display name for ICS container +ICS_EXTERNAL_PORT=8083 # ICS container external port (host -> container) +ICS_INTERNAL_PORT=8083 # ICS container internal port (container -> container) +ICS_EXTERNAL_SECURE_PORT=8434 # ICS container external secure port (host -> container) +ICS_INTERNAL_SECURE_PORT=8434 # ICS container internal secure port (container -> container) + +ICS_LOGPATH="/var/log/information-coordinator-service/application.log" # Path the application log in the ICS container +ICS_APP_NAME_ALIAS="information-service-container" # Alias name, name used by the control panel +ICS_HOST_MNT_DIR="./mnt" # Mounted db dir, relative to compose file, on the host +ICS_CONTAINER_MNT_DIR="/var/information-coordinator-service" # Mounted dir in the container +ICS_ACTUATOR="/actuator/loggers/org.oransc.ics" # Url for trace/debug +ICS_CERT_MOUNT_DIR="./cert" +ICS_ALIVE_URL="/status" # Base path for alive check +ICS_COMPOSE_DIR="ics" # Dir in simulator_group for docker-compose +ICS_CONFIG_MOUNT_PATH=/opt/app/information-coordinator-service/config # Internal container path for configuration +ICS_CONFIG_FILE=application.yaml # Config file name +ICS_FEATURE_LEVEL="TYPE-SUBSCRIPTIONS INFO-TYPE-INFO RESP_CODE_CHANGE_1 DEFAULT_TYPE_VALIDATION" # Space separated list of features + +MR_DMAAP_APP_NAME="message-router" # Name for the Dmaap MR +MR_STUB_APP_NAME="mr-stub" # Name of the MR stub +MR_DMAAP_DISPLAY_NAME="DMAAP Message Router" +MR_STUB_DISPLAY_NAME="Message Router stub" +MR_STUB_CERT_MOUNT_DIR="./cert" +MR_EXTERNAL_PORT=3904 # MR dmaap/stub container external port +MR_INTERNAL_PORT=3904 # MR dmaap/stub container internal port +MR_EXTERNAL_SECURE_PORT=3905 # MR dmaap/stub container external secure port +MR_INTERNAL_SECURE_PORT=3905 # MR dmaap/stub container internal secure port +MR_DMAAP_LOCALHOST_PORT=3904 # MR stub container external port (host -> container) +MR_STUB_LOCALHOST_PORT=3908 # MR stub container external port (host -> container) +MR_DMAAP_LOCALHOST_SECURE_PORT=3905 # MR stub container internal port (container -> container) +MR_STUB_LOCALHOST_SECURE_PORT=3909 # MR stub container external secure port (host -> container) +MR_READ_TOPIC="A1-POLICY-AGENT-READ" # Read topic +MR_WRITE_TOPIC="A1-POLICY-AGENT-WRITE" # Write topic +MR_READ_URL="/events/$MR_READ_TOPIC/users/policy-agent?timeout=15000&limit=100" # Path to read messages from MR +MR_WRITE_URL="/events/$MR_WRITE_TOPIC" # Path to write messages to MR +MR_STUB_ALIVE_URL="/" # Base path for mr stub alive check +MR_DMAAP_ALIVE_URL="/topics" # Base path for dmaap-mr alive check +MR_DMAAP_COMPOSE_DIR="dmaapmr" # Dir in simulator_group for dmaap mr for - docker-compose +MR_STUB_COMPOSE_DIR="mrstub" # Dir in simulator_group for mr stub for - docker-compose +MR_KAFKA_APP_NAME="message-router-kafka" # Kafka app name, if just named "kafka" the image will not start... +MR_KAFKA_PORT=9092 # Kafka port number +MR_KAFKA_DOCKER_LOCALHOST_PORT=30098 # Kafka port number for docker localhost +MR_KAFKA_KUBE_NODE_PORT=30099 # Kafka node port number for kube +MR_ZOOKEEPER_APP_NAME="zookeeper" # Zookeeper app name +MR_ZOOKEEPER_PORT="2181" # Zookeeper port number +MR_DMAAP_HOST_MNT_DIR="/mnt" # Basedir localhost for mounted files +MR_DMAAP_HOST_CONFIG_DIR="/configs1" # Config files dir on localhost + +CR_APP_NAME="callback-receiver" # Name for the Callback receiver +CR_DISPLAY_NAME="Callback receiver" +CR_EXTERNAL_PORT=8090 # Callback receiver container external port (host -> container) +CR_INTERNAL_PORT=8090 # Callback receiver container internal port (container -> container) +CR_EXTERNAL_SECURE_PORT=8091 # Callback receiver container external secure port (host -> container) +CR_INTERNAL_SECURE_PORT=8091 # Callback receiver container internal secure port (container -> container) +CR_APP_CALLBACK="/callbacks" # Url for callbacks +CR_APP_CALLBACK_MR="/callbacks-mr" # Url for callbacks (data from mr which contains string encoded jsons in a json arr) +CR_APP_CALLBACK_TEXT="/callbacks-text" # Url for callbacks (data containing text data) +CR_ALIVE_URL="/reset" # Base path for alive check +CR_COMPOSE_DIR="cr" # Dir in simulator_group for docker-compose + +PROD_STUB_APP_NAME="producer-stub" # Name for the Producer stub +PROD_STUB_DISPLAY_NAME="Producer Stub" +PROD_STUB_EXTERNAL_PORT=8092 # Producer stub container external port (host -> container) +PROD_STUB_INTERNAL_PORT=8092 # Producer stub container internal port (container -> container) +PROD_STUB_EXTERNAL_SECURE_PORT=8093 # Producer stub container external secure port (host -> container) +PROD_STUB_INTERNAL_SECURE_PORT=8093 # Producer stub container internal secure port (container -> container) +PROD_STUB_JOB_CALLBACK="/callbacks/job" # Callback path for job create/update/delete +PROD_STUB_SUPERVISION_CALLBACK="/callbacks/supervision" # Callback path for producer supervision +PROD_STUB_ALIVE_URL="/" # Base path for alive check +PROD_STUB_COMPOSE_DIR="prodstub" # Dir in simulator_group for docker-compose + +RIC_SIM_DISPLAY_NAME="Near-RT RIC A1 Simulator" +RIC_SIM_BASE="g" # Base name of the RIC Simulator container, shall be the group code + # Note, a prefix is added to each container name by the .env file in the 'ric' dir +RIC_SIM_PREFIX="ricsim" # Prefix added to ric container name, added in the .env file in the 'ric' dir + # This prefix can be changed from the command line +RIC_SIM_INTERNAL_PORT=8085 # RIC Simulator container internal port (container -> container). + # (external ports allocated by docker) +RIC_SIM_INTERNAL_SECURE_PORT=8185 # RIC Simulator container internal secure port (container -> container). + # (external ports allocated by docker) +RIC_SIM_CERT_MOUNT_DIR="./cert" + +RIC_SIM_COMPOSE_DIR="ric" # Dir in simulator group for docker compose +RIC_SIM_ALIVE_URL="/" # Base path for alive check +RIC_SIM_COMMON_SVC_NAME="" # Name of svc if one common svc is used for all ric sim groups (stateful sets) + +RICMEDIATOR_SIM_DISPLAY_NAME="ORAN Near-RT RIC A1 Simulator" +RICMEDIATOR_SIM_DB_DISPLAY_NAME="ORAN Near-RT RIC A1 Simulator DB" +RICMEDIATOR_SIM_BASE="g" # Base name of the RIC Simulator container, shall be the group code + # Note, a prefix is added to each container name by the .env file in the 'ric' dir +RICMEDIATOR_SIM_PREFIX="ricsim" # Prefix added to ric container name, added in the .env file in the 'ric' dir + # This prefix can be changed from the command line +RICMEDIATOR_SIM_INTERNAL_PORT=10000 # RIC Simulator container internal port (container -> container). + # (external ports allocated by docker) +RICMEDIATOR_SIM_INTERNAL_SECURE_PORT=10001 # RIC Simulator container internal secure port (container -> container). + # (external ports allocated by docker) + # This port number is not supported by app, kept only for consistency with other ric sims +RICMEDIATOR_SIM_CERT_MOUNT_DIR="./cert" + +RICMEDIATOR_SIM_COMPOSE_DIR="ricmediator" # Dir in simulator group for docker compose +RICMEDIATOR_SIM_ALIVE_URL="/A1-P/v2/healthcheck" # Base path for alive check +RICMEDIATOR_SIM_COMMON_SVC_NAME="" # Name of svc if one common svc is used for all ric sim groups (stateful sets) + + +# For ONAP sdnc +SDNC_APP_NAME="a1controller" # Name of the SNDC A1 Controller container +SDNC_DISPLAY_NAME="SDNC A1 Controller" +SDNC_EXTERNAL_PORT=8282 # SNDC A1 Controller container external port (host -> container) +SDNC_INTERNAL_PORT=8181 # SNDC A1 Controller container internal port (container -> container) +SDNC_EXTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container external secure port (host -> container) +SDNC_INTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container internal secure port (container -> container) +SDNC_DB_APP_NAME="sdncdb" # Name of the SDNC DB container +SDNC_A1_TRUSTSTORE_PASSWORD="a1adapter" # SDNC truststore password +SDNC_USER="admin" # SDNC username +SDNC_PWD="admin" # SNDC PWD +SDNC_PWD="Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" # SNDC PWD +#SDNC_API_URL="/rests/operations/A1-ADAPTER-API:" # Base url path for SNDC API (for upgraded sdnc) +SDNC_API_URL="/restconf/operations/A1-ADAPTER-API:" # Base url path for SNDC API +SDNC_ALIVE_URL="/apidoc/explorer/index.html" # Base url path for SNDC API docs (for alive check) +SDNC_COMPOSE_DIR="sdnc" +SDNC_COMPOSE_FILE="docker-compose-2.yml" +SDNC_KUBE_APP_FILE="app2.yaml" +SDNC_KARAF_LOG="/opt/opendaylight/data/log/karaf.log" # Path to karaf log +#SDNC_RESPONSE_JSON_KEY="A1-ADAPTER-API:output" # Key name for output json in replies from sdnc (for upgraded sdnc) +SDNC_RESPONSE_JSON_KEY="output" # Key name for output json in replies from sdnc +SDNC_FEATURE_LEVEL="NO_NB_HTTPS" # Space separated list of features + +RAPP_CAT_APP_NAME="rappcatalogueservice" # Name for the RAPP Catalogue +RAPP_CAT_DISPLAY_NAME="RAPP Catalogue" +RAPP_CAT_EXTERNAL_PORT=8680 # RAPP Catalogue container external port (host -> container) +RAPP_CAT_INTERNAL_PORT=8680 # RAPP Catalogue container internal port (container -> container) +RAPP_CAT_EXTERNAL_SECURE_PORT=8633 # RAPP Catalogue container external secure port (host -> container) +RAPP_CAT_INTERNAL_SECURE_PORT=8633 # RAPP Catalogue container internal secure port (container -> container) +RAPP_CAT_ALIVE_URL="/services" # Base path for alive check +RAPP_CAT_COMPOSE_DIR="rapp_catalogue" # Dir in simulator_group for docker-compose + +CONTROL_PANEL_APP_NAME="controlpanel" # Name of the Control Panel container +CONTROL_PANEL_DISPLAY_NAME="Control Panel" +CONTROL_PANEL_EXTERNAL_PORT=8080 # Control Panel container external port (host -> container) +CONTROL_PANEL_INTERNAL_PORT=8080 # Control Panel container internal port (container -> container) +CONTROL_PANEL_EXTERNAL_SECURE_PORT=8880 # Control Panel container external port (host -> container) +CONTROL_PANEL_INTERNAL_SECURE_PORT=8082 # Control Panel container internal port (container -> container) +CONTROL_PANEL_LOGPATH="/var/log/nonrtric-gateway/application.log" # Path the application log in the Control Panel container +CONTROL_PANEL_ALIVE_URL="/" # Base path for alive check +CONTROL_PANEL_COMPOSE_DIR="control_panel" # Dir in simulator_group for docker-compose +CONTROL_PANEL_CONFIG_FILE=nginx.conf # Config file name +CONTROL_PANEL_HOST_MNT_DIR="./mnt" # Mounted dir, relative to compose file, on the host +CONTROL_PANEL_CONFIG_MOUNT_PATH=/etc/nginx # Container internal path for config +CONTROL_PANEL_NGINX_KUBE_RESOLVER="kube-dns.kube-system.svc.cluster.local valid=5s" #nginx resolver for kube +CONTROL_PANEL_NGINX_DOCKER_RESOLVER="127.0.0.11" # nginx resolver for docker +CONTROL_PANEL_PATH_POLICY_PREFIX="/a1-policy/" # Path prefix for forwarding policy calls to NGW +CONTROL_PANEL_PATH_ICS_PREFIX="/data-producer/" # Path prefix for forwarding ics calls to NGW +CONTROL_PANEL_PATH_ICS_PREFIX2="/data-consumer/" # Path prefix for forwarding ics calls to NGW + +NRT_GATEWAY_APP_NAME="nonrtricgateway" # Name of the Gateway container +NRT_GATEWAY_DISPLAY_NAME="NonRT-RIC Gateway" +NRT_GATEWAY_EXTERNAL_PORT=9090 # Gateway container external port (host -> container) +NRT_GATEWAY_INTERNAL_PORT=9090 # Gateway container internal port (container -> container) +NRT_GATEWAY_EXTERNAL_SECURE_PORT=9091 # Gateway container external port (host -> container) +NRT_GATEWAY_INTERNAL_SECURE_PORT=9091 # Gateway container internal port (container -> container) +NRT_GATEWAY_LOGPATH="/var/log/nonrtric-gateway/application.log" # Path the application log in the Gateway container +NRT_GATEWAY_HOST_MNT_DIR="./mnt" # Mounted dir, relative to compose file, on the host +NRT_GATEWAY_ALIVE_URL="/actuator/metrics" # Base path for alive check +NRT_GATEWAY_COMPOSE_DIR="ngw" # Dir in simulator_group for docker-compose +NRT_GATEWAY_CONFIG_MOUNT_PATH=/opt/app/nonrtric-gateway/config # Container internal path for config +NRT_GATEWAY_CONFIG_FILE=application.yaml # Config file name +NRT_GATEWAY_PKG_NAME="org.springframework.cloud.gateway" # Java base package name +NRT_GATEWAY_ACTUATOR="/actuator/loggers/$NRT_GATEWAY_PKG_NAME" # Url for trace/debug + +HTTP_PROXY_APP_NAME="httpproxy" # Name of the Http Proxy container +HTTP_PROXY_DISPLAY_NAME="Http Proxy" +HTTP_PROXY_EXTERNAL_PORT=8740 # Http Proxy container external port (host -> container) +HTTP_PROXY_INTERNAL_PORT=8080 # Http Proxy container internal port (container -> container) +HTTP_PROXY_EXTERNAL_SECURE_PORT=8742 # Http Proxy container external secure port (host -> container) +HTTP_PROXY_INTERNAL_SECURE_PORT=8433 # Http Proxy container internal secure port (container -> container) +HTTP_PROXY_WEB_EXTERNAL_PORT=8741 # Http Proxy container external port (host -> container) +HTTP_PROXY_WEB_INTERNAL_PORT=8081 # Http Proxy container internal port (container -> container) +HTTP_PROXY_WEB_EXTERNAL_SECURE_PORT=8743 # Http Proxy container external secure port (host -> container) +HTTP_PROXY_WEB_INTERNAL_SECURE_PORT=8434 # Http Proxy container internal secure port (container -> container +HTTP_PROXY_CONFIG_PORT=0 # Port number for proxy config, will be set if proxy is started +HTTP_PROXY_CONFIG_HOST_NAME="" # Proxy host, will be set if proxy is started +HTTP_PROXY_ALIVE_URL="/" # Base path for alive check +HTTP_PROXY_COMPOSE_DIR="httpproxy" # Dir in simulator_group for docker-compose +HTTP_PROXY_BUILD_DIR="http-https-proxy" # Dir in simulator_group for image build - note, reuses source from kubeproxy + +KUBE_PROXY_APP_NAME="kubeproxy" # Name of the Kube Http Proxy container +KUBE_PROXY_DISPLAY_NAME="Kube Http Proxy" +KUBE_PROXY_EXTERNAL_PORT=8730 # Kube Http Proxy container external port (host -> container) +KUBE_PROXY_INTERNAL_PORT=8080 # Kube Http Proxy container internal port (container -> container) +KUBE_PROXY_EXTERNAL_SECURE_PORT=8782 # Kube Proxy container external secure port (host -> container) +KUBE_PROXY_INTERNAL_SECURE_PORT=8433 # Kube Proxy container internal secure port (container -> container) +KUBE_PROXY_WEB_EXTERNAL_PORT=8731 # Kube Http Proxy container external port (host -> container) +KUBE_PROXY_WEB_INTERNAL_PORT=8081 # Kube Http Proxy container internal port (container -> container) +KUBE_PROXY_WEB_EXTERNAL_SECURE_PORT=8783 # Kube Proxy container external secure port (host -> container) +KUBE_PROXY_WEB_INTERNAL_SECURE_PORT=8434 # Kube Proxy container internal secure port (container -> container + +KUBE_PROXY_DOCKER_EXTERNAL_PORT=8732 # Kube Http Proxy container external port, docker (host -> container) +KUBE_PROXY_DOCKER_EXTERNAL_SECURE_PORT=8784 # Kube Proxy container external secure port, docker (host -> container) +KUBE_PROXY_WEB_DOCKER_EXTERNAL_PORT=8733 # Kube Http Proxy container external port, docker (host -> container) +KUBE_PROXY_WEB_DOCKER_EXTERNAL_SECURE_PORT=8785 # Kube Proxy container external secure port, docker (host -> container) + +KUBE_PROXY_PATH="" # Proxy url path, will be set if proxy is started +KUBE_PROXY_ALIVE_URL="/" # Base path for alive check +KUBE_PROXY_COMPOSE_DIR="kubeproxy" # Dir in simulator_group for docker-compose + +PVC_CLEANER_APP_NAME="pvc-cleaner" # Name for Persistent Volume Cleaner container +PVC_CLEANER_DISPLAY_NAME="Persistent Volume Cleaner" # Display name for Persistent Volume Cleaner +PVC_CLEANER_COMPOSE_DIR="pvc-cleaner" # Dir in simulator_group for yamls + +DMAAP_ADP_APP_NAME="dmaapadapterservice" # Name for Dmaap Adapter container +DMAAP_ADP_DISPLAY_NAME="Dmaap Adapter Service" # Display name for Dmaap Adapter container +DMAAP_ADP_EXTERNAL_PORT=9087 # Dmaap Adapter container external port (host -> container) +DMAAP_ADP_INTERNAL_PORT=8084 # Dmaap Adapter container internal port (container -> container) +DMAAP_ADP_EXTERNAL_SECURE_PORT=9088 # Dmaap Adapter container external secure port (host -> container) +DMAAP_ADP_INTERNAL_SECURE_PORT=8435 # Dmaap Adapter container internal secure port (container -> container) + +DMAAP_ADP_HOST_MNT_DIR="./mnt" # Mounted db dir, relative to compose file, on the host +DMAAP_ADP_ACTUATOR="/actuator/loggers/org.oran.dmaapadapter" # Url for trace/debug +DMAAP_ADP_ALIVE_URL="/actuator/info" # Base path for alive check +DMAAP_ADP_COMPOSE_DIR="dmaapadp" # Dir in simulator_group for docker-compose +DMAAP_ADP_CONFIG_MOUNT_PATH="/opt/app/dmaap-adapter-service/config" # Internal container path for configuration +DMAAP_ADP_DATA_MOUNT_PATH="/opt/app/dmaap-adapter-service/data" # Path in container for data file +DMAAP_ADP_DATA_FILE="application_configuration.json" # Container data file name +DMAAP_ADP_CONFIG_FILE=application.yaml # Config file name +DMAAP_ADP_CONFIG_FILE_TEMPLATE=application2.yaml # Template config file name +DMAAP_ADP_FEATURE_LEVEL="GENERATED_PROD_NAME FILTERSPEC FILTERSCHEMA" # Space separated list of features + # FILTERSCHEMA corrected type schema from rel h +DMAAP_MED_APP_NAME="dmaapmediatorservice" # Name for Dmaap Mediator container +DMAAP_MED_DISPLAY_NAME="Dmaap Mediator Service" # Display name for Dmaap Mediator container +DMAAP_MED_EXTERNAL_PORT=8085 # Dmaap Mediator container external port (host -> container) +DMAAP_MED_INTERNAL_PORT=8085 # Dmaap Mediator container internal port (container -> container) +DMAAP_MED_EXTERNAL_SECURE_PORT=8185 # Dmaap Mediator container external secure port (host -> container) +DMAAP_MED_INTERNAL_SECURE_PORT=8185 # Dmaap Mediator container internal secure port (container -> container) + +DMAAP_MED_HOST_MNT_DIR="./mnt" # Mounted db dir, relative to compose file, on the host +DMAAP_MED_ALIVE_URL="/health_check" # Base path for alive check +DMAAP_MED_COMPOSE_DIR="dmaapmed" # Dir in simulator_group for docker-compose +DMAAP_MED_DATA_MOUNT_PATH="/configs" # Path in container for data file +DMAAP_MED_HOST_DATA_FILE="type_config_1.json" # Host data file name +DMAAP_MED_CONTR_DATA_FILE="type_config.json" # Container data file name +DMAAP_MED_FEATURE_LEVEL="KAFKATYPES FILTERSCHEMA" # Space separated list of features + # KAFKATYPES support for kafka type from rel f + # FILTERSCHEMA corrected kafka type schema from rel h + +KAFKAPC_APP_NAME="kafka-procon" # Name for the Kafka procon +KAFKAPC_DISPLAY_NAME="Kafka Producer/Consumer" +KAFKAPC_EXTERNAL_PORT=8096 # Kafka procon container external port (host -> container) +KAFKAPC_INTERNAL_PORT=8090 # Kafka procon container internal port (container -> container) +KAFKAPC_EXTERNAL_SECURE_PORT=8097 # Kafka procon container external secure port (host -> container) +KAFKAPC_INTERNAL_SECURE_PORT=8091 # Kafka procon container internal secure port (container -> container) +KAFKAPC_ALIVE_URL="/" # Base path for alive check +KAFKAPC_COMPOSE_DIR="kafka-procon" # Dir in simulator_group for docker-compose +KAFKAPC_BUILD_DIR="kafka-procon" # Build dir + +CHART_MUS_APP_NAME="chartmuseum" # Name for the chart museum app +CHART_MUS_DISPLAY_NAME="Chart Museum" +CHART_MUS_EXTERNAL_PORT=8201 # chart museum container external port (host -> container) +CHART_MUS_INTERNAL_PORT=8080 # chart museum container internal port (container -> container) +CHART_MUS_ALIVE_URL="/health" # Base path for alive check +CHART_MUS_COMPOSE_DIR="chartmuseum" # Dir in simulator_group for docker-compose +CHART_MUS_CHART_CONTR_CHARTS="/tmp/charts" # Local dir container for charts + +HELM_MANAGER_APP_NAME="helmmanagerservice" # Name for the helm manager app +HELM_MANAGER_DISPLAY_NAME="Helm Manager" +HELM_MANAGER_EXTERNAL_PORT=8211 # helm manager container external port (host -> container) +HELM_MANAGER_INTERNAL_PORT=8083 # helm manager container internal port (container -> container) +HELM_MANAGER_EXTERNAL_SECURE_PORT=8212 # helm manager container external secure port (host -> container) +HELM_MANAGER_INTERNAL_SECURE_PORT=8443 # helm manager container internal secure port (container -> container) +HELM_MANAGER_CLUSTER_ROLE=cluster-admin # Kubernetes cluster role for helm manager +HELM_MANAGER_SA_NAME=helm-manager-sa # Service account name +HELM_MANAGER_ALIVE_URL="/helm/charts" # Base path for alive check +HELM_MANAGER_COMPOSE_DIR="helmmanager" # Dir in simulator_group for docker-compose +HELM_MANAGER_USER="helmadmin" +HELM_MANAGER_PWD="itisasecret" + +KEYCLOAK_APP_NAME="keycloak" # Name for the keycloak app +KEYCLOAK_DISPLAY_NAME="Keycloak" +KEYCLOAK_EXTERNAL_PORT=80 # keycloak container external port (host -> container) +KEYCLOAK_INTERNAL_PORT=8080 # keycloak container internal port (container -> container) +KEYCLOAK_ADMIN_URL_PREFIX="/realms/master" +KEYCLOAK_REALM_URL_PREFIX="/admin/realms" +KEYCLOAK_TOKEN_URL_PREFIX="/realms" +KEYCLOAK_ALIVE_URL="/realms/master" # Base path for alive check +KEYCLOAK_COMPOSE_DIR="keycloak" +KEYCLOAK_ADMIN_USER="admin" +KEYCLOAK_ADMIN_PWD="admin" +KEYCLOAK_ADMIN_CLIENT="admin-cli" +KEYCLOAK_KC_PROXY="edge" + +ISTIO_COMPOSE_DIR="istio" + +# See jwt-info.txt in simulator-group/kubeproxy for detailed info +ISTIO_GENERIC_JWKS_KEY='{ "keys":[{"kty":"RSA","e":"AQAB","kid":"dc1b272d-124e-417f-b6e3-eda9c0e29509","n":"u1SU1LfVLPHCozMxH2Mo4lgOEePzNm0tRgeLezV6ffAt0gunVTLw7onLRnrq0_IzW7yWR7QkrmBL7jTKEn5u-qKhbwKfBstIs-bMY2Zkp18gnTxKLxoS2tFczGkPLPgizskuemMghRniWaoLcyehkd3qqGElvW_VDL5AaWTg0nLVkjRo9z-40RQzuVaE8AkAFmxZzow3x-VJYKdjykkJ0iT9wCS0DRTXu269V264Vf_3jvredZiKRkgwlL9xNAwxXFg0x_XFw005UWVRIkdgcKWTjpBP2dPwVZ4WWC-9aGVd-Gyn1o0CLelf4rEjGoXbAAEgAqeGUxrcIlbjXfbcmw"}]}' +ISTIO_GENERIC_JWT="eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzdWJkb21haW4iLCJpc3MiOiJLVUJFUFJPWFkifQ.T5p9ip8yBRAYpArajFGhUlpfnV0HAbA7dPsSojYx1BNo6nwt_cpt6xJ8x66XwV-KqHud_S8hlnixLBYRtUiU8v7lWdk8RhBwW7w4CJs6n8ByvKsjJU8se18RWbSqsi-IQRsdkMiHz5fKosfCGVj6hI214S_yY988ICV7kl9anQhaD8zUPQQvso2zaAkT1qTgC5pxpZc3lB5526DvzsmYr_gaeE-GcbKW9hFoYppOhItL74IRVqRBs_pbaAauUg-9v_bRaJc5yOo3UMFDNiI2HCB6mdgJTLNb8bsT5qExgcbCRpUnOCF0I6PrvVlGft4zZkvz7I0I-8emVn4m-PV-BA" + +AUTHSIDECAR_APP_NAME="authsidecar" +AUTHSIDECAR_DISPLAY_NAME="Authentication Token Fetcher" +######################################## +# Setting for common curl-base function +######################################## + +UUID="" # UUID used as prefix to the policy id to simulate a real UUID + # Testscript need to set the UUID otherwise this empty prefix is used diff --git a/test/http-https-proxy/cert/cert.crt b/test/http-https-proxy/cert/cert.crt index 97a2c3b0..eafa45c0 100644 --- a/test/http-https-proxy/cert/cert.crt +++ b/test/http-https-proxy/cert/cert.crt @@ -1,18 +1,21 @@ -----BEGIN CERTIFICATE----- -MIIC2jCCAcICCQCoykk37ggbnjANBgkqhkiG9w0BAQsFADAvMQswCQYDVQQGEwJT -RTESMBAGA1UEBwwJTGlua29waW5nMQwwCgYDVQQKDANFU1QwHhcNMjEwNTAzMTIw -MjU1WhcNNDgwOTE3MTIwMjU1WjAvMQswCQYDVQQGEwJTRTESMBAGA1UEBwwJTGlu -a29waW5nMQwwCgYDVQQKDANFU1QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK -AoIBAQDKIgyIH3MRpXNGpPpjmlCgt+kmFvOq33AF4wu+zDHvBZL5zPiqHpacDjhl -Q1gq+8Cxmu5awwMwlz8cWFqrCjkVE1wlUYKIBi/NU7B7hbPMiDSN8fw1bA+sf7Ke -Fr3BdQ9rEHalUY/BLueNERaOeM79wiHCW+08+T2oixchaeWT/v1KINc/rfpAFVQZ -9aBSiFecbmZhcL9YKNb3TOaPivrrXgFvrSUkoGCKvIPf9mx/xYMkEbwAHAUSVlAn -MOWBWf+pQGl/sjuD5mBKS3uL1Gon4R4hXNGNafS/C0HmEbJB6r+OzdnqjumMhmtt -WGFxYvxS6ChSAa6ni4Ae7tBtlqJPAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAIRk -bicQn1gUALHz2YTGffBN6BCbIKKIzW9NJ/xIYBYUkMwyxpqq0GMRsqIaBIa9R1dr -rcG27B8BTwUfeHH8Fjp1YR18axK5uh/RRHgIU5YixaMbdlxwfYDIxV9rf8xuQ/KR -wQkYqxke5CyTZnqVXR08i3eYsa8XpUq7keqA1ecJBfG5d8g0RJg3/nK81V5PWMXL -so9xq/dCUS4ulLu7XqXxBUK8pNjnP7fgg6C2+n39eZVv/LHdt05QIjFkEErBUbmz -zJ9rCN5y70KGgr7HZioAE5buQJZaYWoekbZ/D7r5+j+25IWcWr7vy7Qq9IJA0ZIz -879adxAkeJTzpdZkfkA= +MIIDbTCCAlWgAwIBAgIUP0RCL8HcTY3FDVCFI/dGz/xCD+MwDQYJKoZIhvcNAQEL +BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM +GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAgFw0yNTAxMTYxMzI0MjNaGA8yMDUy +MDYwMjEzMjQyM1owRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUx +ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBAJwOSWQe7i0BtwyL+PNVbaeHe68Tb7jK2xFEm7oY +oHrcNsGrxp4pSp5A3AWeh/eOR8ORw7tgNmid+N6+Ua1y7UDik6EQEabTui3EALPw +Aw9y5EC+Mgv+xcFMlXmOfFGwMgKtQBmecLLxvcRqOoj50RLCHHc9iAniFt7yr8TB +NEcQY7nkEuG52eF/dlCk6ekO55yMQNtV5WTKW1/WwdF4uihgFom5jFtYN64FpKQG +FHP5MAaMZN7jt7hVU08ActiZS63oZTS0sb1bItVOgosQBqNRF0N3Qyp26Jl6DVF1 +eGKK3Ql2ei8ZEIpj9kaCOXS7ock9gOq9tyS7XoYzXIXPES0CAwEAAaNTMFEwHQYD +VR0OBBYEFLpEGPv6WOJ5mEObQtkRvbbtdgdUMB8GA1UdIwQYMBaAFLpEGPv6WOJ5 +mEObQtkRvbbtdgdUMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB +AAmLdZehcOtuPlRcRK6ZMeCIjxCPLTBz7LWlDful959r3+N6Slh9cR6hu3v+CJfv +0uglCgANT/4yDYNx1qsqKQnicAnL/QnGtV+mwZJO3wz+lzVF0TaTqzM5QcOLm9pB +7o/jZvFAPXL2jT6P7uXKLbZnI0uJ3h1zfzW8RdmRtoqzKqx3s6NBPmEEadkv+H4d +4VQArCbkmrQWbm21tRHsg33GOHxqa3phfQgca3TnjovRfoRi9TCArnm/Ksc+d23g +sr2McVAWRd3hmMql+fBiyWVkChMW7HNaz1qRaUg4saa8Mic5mliZfr8s7BzVPJeL +lTjysKnWUoiPuXgoZ6WAqEM= -----END CERTIFICATE----- diff --git a/test/http-https-proxy/cert/key.crt b/test/http-https-proxy/cert/key.crt index 286f5bbc..77852ecd 100644 --- a/test/http-https-proxy/cert/key.crt +++ b/test/http-https-proxy/cert/key.crt @@ -1,30 +1,30 @@ -----BEGIN ENCRYPTED PRIVATE KEY----- -MIIFHzBJBgkqhkiG9w0BBQ0wPDAbBgkqhkiG9w0BBQwwDgQI6ID1Pm413GQCAggA -MB0GCWCGSAFlAwQBKgQQxUi4NiTRO3ZtBXwkBMI/zwSCBNCPGAktH49M9OUptPqK -ie6rIyhvdNMfj7OJL+/SYwTwK0unwsp1CgyZou7SUtfMPVzpSRtY+WuKVhtHSTIR -4qrY20O5UNrRdIMnlm5daEld+drD5/ql2iTidAHY4idGum0KMpUMdG8G/pdFcD8m -uJ/b4ogO30gtCra7R4yvrjaSji7yuGMms1p0BWgx8nURivy6zBvFew58WCC63RGe -aouzavsu+7Xd8t4JXAvcH93zcfXr2uminiZ8d7CvwTfvrtunc0FyTfVl1u7vPB/z -FzN952KlYK3ugHgSg5ZsqJ2FES2iBNX1I55BHTOIcXkNemcaszRAomrNXqyqk9X2 -36ojasw2fCLt+hluwD3VMH2gKs4XvUbxuYnz7Gfeq9AA9L0iBtZs0+aMG6fgQ7NC -KvXty0XzupIW615vWmwd5UBubCslXmZKOfF/zyOfd+N59a54VoA/F9q1hfqiNz6L -QbGbaFhLHO36P9q/i95IZpzZbRTakwF6ICLLdI6i2S9m/AqOUJeP+LKTTZ6pPgvu -r/fxUIk3ByVzNa9BtqAwwHlqeAUmwj2r2pEF2wV7c4gaEvK/fEx5PsHE0IFbYtmN -tCNTpj5irFaHfTAmddoaq2On9qo6iZHlxr7fu6cjCjKiF54j4nifF1OcNN1KV/u1 -MNEz8dcMdmiNb69Cr4jOFU9xhyTmZ7sQ6yicUVa8R4pZTThBPRfSLBpsSur/t+n6 -7XCYVC7RyN5Dd8sqK2QVL+dqUCEumiQoV+9ogaxbfo35Z7+LTJDcyHMNieJ8C01S -Mt5H6TdsCPLtzmbF9Pgw3fYwC2U7pAZYppOMkgiWeg7pH9gyWKah0GfAK0VrCYWz -9dR2QAkb5u39NAyQKv7nOJ4hQ7TFYiBxM5j1WtnVKuQ5WpDzweP+NcnTMBYnbYDA -AbMp0VCKTyN5pRbC1JF7RPeFkiEAC1sMLfhxS9kB6UKgWO2jnl70QtUfxMsOkaon -iDVpsdB0QtfWOayC53GeLTS2uG/wXd3mzq3+QmNd7MVYCtwU7TeZpPboaRkfLX03 -d/sLU2zxcQH1Xp7JWufiN0P1VpsytxGPVGQa4BZsNjX+SOJwU7wRydEqDBhJxSJP -OrzAojG3K0sB/av7UBK+LsALI36lNso7H9ZzAHx1keYjDGBKRcsMsvtF9kwOW85v -kYkseYvcedv5CHXOlTIC/GFXOVg7Ot+InCgKI3rj0EojzI7r+M1XlvSrJNzM++iX -AgD/mBmiKovLPjW4JVkT4zZYDMoTa12QtFc0YPg4yb6rJkqqci7TW8Huy/HFAOST -LX+j54vY1YflRE1aqcILmkrBZGRT7luQICFjcwUKRRpw1UuP4RRf7Zg6ZwXcshIN -J1Vmrjo48Gqr4xotCvpgflOXqdZSXNbqyfvIxhnJqShWuVINDQ4CkdLjb+IQP+NF -8BvfjsaVgEBbu/K5K87ltpuyvqWNSIWojMLJYin5sh1T1nqhCJViwZhCXWFbuPfj -k12Iww/mFtPQmUlsWnonHNn3CHr0XbEWy7TvCK2VkjysteBmAdTROCv2r8LXTg/i -63pIL055pqXLZMPxuIx8+rf/gAseXyl2/YfuO45oVVNbZz/d8fbFaxnU/K0zwzvr -tr/T+QKZMBP0EC8BZ6Tsge6ZZA== +MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIK+eObn5naAUCAggA +MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECEVKxJYlea+RBIIEyCqU/EJqmrb+ ++Tm+nOpeZyWB3c2n2N2PeB8XD9i+BAohZ9vz2yd5QRNiZ/5ZXbgG+FJ0BwNF6Ff6 +bYxNr1rh5FnLYSqoaak1DApoRb/5YUBUcwkNnRKFFu2M+pS1GmtUoK5avwM6fUOX +TFEZdYpZ2eSA2m2Ht66dEk78PAcIzk49ZTi7AEYlHeoOIU3ZcB1r5d0kNKgG/dJy +PNIer7j3xfjxXtRRKPouBkIVMds1uQpi9zzBLiNpwOVYIeGxKu8Z5VM1BM1xwDq4 +vSbK9e6BRkMfpA8UBBntNwCsupFDB3ioYYtJkbg5+3p6VVT43PkhuZSoT+zIgW7a +QDGmLmJVOHJOTy5Yfclo9w3Y+I/YrMnkKOA5h8rY+VBhjijmE1rmaNcXh/KhZjeI +Lrbh7ThzpB0ojZahdW3mRTIct7As/+IFpV0ugLjAZs0WGxEx8kuLKPG4nHL+pU2a +B6Mg4f2TO/FQRtXtWqlvhuEhFhAQ71fUBeefbQDuRHQmwkYUpJBiuGYF92vJLT8P +4A1dZ7brjOPt5tuZVIVtmvLQ59orQUymB0EFPjn/jDqWhjNiENeivulPReHcYOl7 +AodfEvF6Uw2eA47X6ZtqsDLNSDLo20JKUhBSEaRGeT/vp5C3a4VhNaJINGbSTiO/ +/EfbRcJzRuLoUwcQrNWH6aAcLIYm02BYGv7htyympKRDgngWbxzpAoJCC2+VQcZA +QnkUb34RastLlU9bLSsaAzPLQRoFDlTjACXZKLm+nAezLpk6ZboByoBfIA9HKnas +IUjHaLlMNJ5mOQGBqMigC8qXOKmMeb3WRBg7Al0WyQzU2ZLWkErtv0HOz8KS82+B +g8ZzZGWqOq73tkCutEnIHtvRsNIeiAQsNTeYLFUYz7RB8hPcUCEjxBlp6Sn9fJ4B +OpvZojx28FXeN461sNJXcRR9gnrff0yil80O7Y2aAHFlJGRiXvgc2L0E66mh69Pj +VV4KRKj+1Y77xAZqafDWsBjr+ITqYBL4W96n1sve6ezoDrVEs/zVyLHMgP9u6rB/ +/OVDM16c4uz/Ak9nbsPAogyCeVZLZ+qh8QyjHsfsMXK3LMN4jeRnuJxg5GrJ006Q +RXg6yhxvd0phwZkERkWaY9b1eEwqixPIAm5x1TkMboHVWzGo1mnhYcTahdCuTAqS +KWP3xXsLLrk/pEt4jPUDWgqXEkUYRIq0WCNo7yG++z8qkgI5OK/GmtFIM6sVw6iI +8P5W+6AV0XOdVV8NQyUfkbrNHYxNY4IdgLc0QE4d9HqU2txncd4ZvOuv+/KK6nas +bOTHfzps+BpmWuCkWc8mxH2JlaGM3FnY1SboZ3HKI/0Ke+7w1i8MFsHMwZGsrC5B +jC6QplpVf3MbSsqIe4CzuVUCPJg993a6JwQLmE+bBtBOMznZfYrRXTIwDfDJFQai +i54Q4MgILAtmEmZ6RyqcehtuR3HFqcDZSXoDydG6Zzhgc2jXh6eq2gqxPQYO9TXf +AGHAdabjEerR42z4pZhHrTe/8Zldlpq0V6FBZUOecL5FC1yqCXiGK2FOKWXnf80x +4gbWcX3kN0oIphylN4dA9wums9isBvLyYYJeafH9ItI6tYTCQOPjHZzzmEYJ0Y/8 +TVuSsg5xLWxYgJ0q/zD4IA== -----END ENCRYPTED PRIVATE KEY----- diff --git a/test/simulator-group/a1pms/application2.yaml b/test/simulator-group/a1pms/application2.yaml index 27a585f2..ff7d2618 100644 --- a/test/simulator-group/a1pms/application2.yaml +++ b/test/simulator-group/a1pms/application2.yaml @@ -1,7 +1,7 @@ # # ============LICENSE_START======================================================= # Copyright (C) 2020-2023 Nordix Foundation. All rights reserved. -# Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved. +# Copyright (C) 2024-2025 OpenInfra Foundation Europe. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -85,6 +85,9 @@ otel: sdk: disabled: ${ONAP_SDK_DISABLED:true} south: ${ONAP_TRACING_SOUTHBOUND:true} + instrumentation: + spring-webflux: + enabled: ${ONAP_TRACING_NORTHBOUND:true} tracing: sampler: jaeger_remote: