X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Ftest_env-oran-h-release.sh;h=097f25cfcd9defcba8a13d13ffeea3fed84896ee;hb=refs%2Fchanges%2F88%2F12388%2F5;hp=96c88cafd8b6e5573940333b14c65cd7c941118a;hpb=d49bea61eb78af0058136cb8e16af0acd467f1f3;p=nonrtric.git diff --git a/test/common/test_env-oran-h-release.sh b/test/common/test_env-oran-h-release.sh index 96c88caf..097f25cf 100755 --- a/test/common/test_env-oran-h-release.sh +++ b/test/common/test_env-oran-h-release.sh @@ -1,7 +1,7 @@ #!/bin/bash # ============LICENSE_START=============================================== -# Copyright (C) 2020 Nordix Foundation. All rights reserved. +# Copyright (C) 2020-2023 Nordix Foundation. 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. @@ -16,7 +16,7 @@ # limitations under the License. # ============LICENSE_END================================================= # -#Profile for ORAN Cherry +#Profile for ORAN H release TEST_ENV_PROFILE="ORAN-H-RELEASE" FLAVOUR="ORAN" @@ -43,7 +43,7 @@ NEXUS_RELEASE_REPO_ORAN=$NEXUS_RELEASE_REPO # 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 argurment. +# 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 @@ -83,10 +83,10 @@ 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.1.0-SNAPSHOT" -NRT_GATEWAY_IMAGE_TAG_REMOTE_SNAPSHOT="1.1.0-SNAPSHOT" -NRT_GATEWAY_IMAGE_TAG_REMOTE="1.1.0" -NRT_GATEWAY_IMAGE_TAG_REMOTE_RELEASE="1.0.0" +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 @@ -122,13 +122,21 @@ RAPP_CAT_IMAGE_TAG_REMOTE="1.2.0" RAPP_CAT_IMAGE_TAG_REMOTE_RELEASE="1.2.0" -# Near RT RIC Simulator image and tags - same version as cherry +# 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.5.0-SNAPSHOT" RIC_SIM_IMAGE_TAG_REMOTE="2.5.0" RIC_SIM_IMAGE_TAG_REMOTE_RELEASE="2.5.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.1.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" @@ -240,10 +248,10 @@ ONAP_IMAGES_APP_NAMES="DMAAPMR SDNC" # SDNC added as ONAP image # 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 nameed _LOSTHOST_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 overalapping ports on local host +# 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 proyx exposes also the kube svc port on localhost, +# 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 @@ -278,7 +286,9 @@ A1PMS_DATA_MOUNT_PATH="/opt/app/policy-agent/data" # Path in container f 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="" # Space separated list of features +A1PMS_FEATURE_LEVEL="NO-DMAAP ADAPTER-CLASS" # Space separated list of features +A1PMS_ADAPTER_CLASS="" # Class name set by override file +A1PMS_ADAPTER_POLICY_NAME="" # Policy name set by override file ICS_APP_NAME="informationservice" # Name for ICS container ICS_DISPLAY_NAME="Information Coordinator Service" # Display name for ICS container @@ -297,8 +307,7 @@ ICS_ALIVE_URL="/status" # Base path for alive c 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_VERSION="V1-2" # Version where the types are decoupled from the producer registration -ICS_FEATURE_LEVEL="INFO-TYPES TYPE-SUBSCRIPTIONS INFO-TYPE-INFO RESP_CODE_CHANGE_1 DEFAULT_TYPE_VALIDATION" # Space separated list of features +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 @@ -349,7 +358,7 @@ PROD_STUB_INTERNAL_PORT=8092 # Producer stub contain 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 producre supervision +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 @@ -360,7 +369,7 @@ RIC_SIM_PREFIX="ricsim" # Prefix added to ric c # 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). +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" @@ -368,12 +377,30 @@ RIC_SIM_COMPOSE_DIR="ric" # Dir in simulator grou 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/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 securee port (host -> 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 @@ -460,10 +487,10 @@ KUBE_PROXY_WEB_INTERNAL_PORT=8081 # Kube Http Proxy conta 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, doocker (host -> container) -KUBE_PROXY_DOCKER_EXTERNAL_SECURE_PORT=8784 # Kube Proxy container external secure port, doocker (host -> container) -KUBE_PROXY_WEB_DOCKER_EXTERNAL_PORT=8733 # Kube Http Proxy container external port, doocker (host -> container) -KUBE_PROXY_WEB_DOCKER_EXTERNAL_SECURE_PORT=8785 # Kube Proxy container external secure port, doocker (host -> 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