X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Ftest_env-oran-g-release.sh;h=5a71de565ee8fe8d7ec42fbbf4c5091de02e8edc;hb=HEAD;hp=9b24d267a87d2b24055781d79dc673a9d173e37a;hpb=f81090f8f5f1fd1a76bb9feab1f41f03252297c3;p=nonrtric.git diff --git a/test/common/test_env-oran-g-release.sh b/test/common/test_env-oran-g-release.sh index 9b24d267..5a71de56 100755 --- a/test/common/test_env-oran-g-release.sh +++ b/test/common/test_env-oran-g-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. @@ -17,7 +17,7 @@ # ============LICENSE_END================================================= # #Profile for ORAN Cherry -TEST_ENV_PROFILE="ORAN-F-RELEASE" +TEST_ENV_PROFILE="ORAN-G-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 @@ -75,10 +75,10 @@ ICS_IMAGE_TAG_REMOTE_RELEASE="1.4.0" #Control Panel image and tags CONTROL_PANEL_IMAGE_BASE="o-ran-sc/nonrtric-controlpanel" -CONTROL_PANEL_IMAGE_TAG_LOCAL="2.3.0-SNAPSHOT" -CONTROL_PANEL_IMAGE_TAG_REMOTE_SNAPSHOT="2.3.0-SNAPSHOT" -CONTROL_PANEL_IMAGE_TAG_REMOTE="2.3.0" -CONTROL_PANEL_IMAGE_TAG_REMOTE_RELEASE="2.3.0" +CONTROL_PANEL_IMAGE_TAG_LOCAL="2.4.0-SNAPSHOT" +CONTROL_PANEL_IMAGE_TAG_REMOTE_SNAPSHOT="2.4.0-SNAPSHOT" +CONTROL_PANEL_IMAGE_TAG_REMOTE="2.4.0" +CONTROL_PANEL_IMAGE_TAG_REMOTE_RELEASE="2.4.0" # Gateway image and tags @@ -91,7 +91,7 @@ NRT_GATEWAY_IMAGE_TAG_REMOTE_RELEASE="1.0.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.2.5" +SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_RELEASE_ONAP="2.3.2" #No local image for ONAP SDNC, remote release image always used # ORAN SDNC adapter kept as reference @@ -119,7 +119,7 @@ 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" +RAPP_CAT_IMAGE_TAG_REMOTE_RELEASE="1.1.0" # Near RT RIC Simulator image and tags - same version as cherry @@ -134,7 +134,7 @@ 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_MED_IMAGE_TAG_REMOTE_RELEASE="1.1.0" # DMAAP Adapter Service DMAAP_ADP_IMAGE_BASE="o-ran-sc/nonrtric-plt-dmaapadapter" @@ -148,14 +148,14 @@ 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" +HELM_MANAGER_IMAGE_TAG_REMOTE_RELEASE="1.2.0" # Auth sidecar AUTHSIDECAR_IMAGE_BASE="o-ran-sc/nonrtric-auth-token-fetch" AUTHSIDECAR_IMAGE_TAG_LOCAL="1.1.0-SNAPSHOT" AUTHSIDECAR_IMAGE_TAG_REMOTE_SNAPSHOT="1.1.0-SNAPSHOT" AUTHSIDECAR_IMAGE_TAG_REMOTE="1.1.0" -AUTHSIDECAR_IMAGE_TAG_REMOTE_RELEASE="1.1.0" +AUTHSIDECAR_IMAGE_TAG_REMOTE_RELEASE="1.0.0" #MR stub image and tag MRSTUB_IMAGE_BASE="mrstub" @@ -240,10 +240,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 +278,7 @@ 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="NOCONSUL INITIALCONFIGMAP" # Space separated list of features +A1PMS_FEATURE_LEVEL="" # Space separated list of features ICS_APP_NAME="informationservice" # Name for ICS container ICS_DISPLAY_NAME="Information Coordinator Service" # Display name for ICS container @@ -297,8 +297,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 +348,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 @@ -367,31 +366,13 @@ 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) -# Kept as reference for oran a1 adapter -# 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_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="" # SDNC truststore password -# SDNC_USER="admin" # SDNC username -# SDNC_PWD="Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" # SNDC PWD -# SDNC_API_URL="/restconf/operations/A1-ADAPTER-API:" # Base url path for SNDC API -# SDNC_ALIVE_URL="/apidoc/explorer/" # Base url path for SNDC API docs (for alive check) -# SDNC_COMPOSE_DIR="sdnc" # Dir in simulator_group for docker-compose -# SDNC_COMPOSE_FILE="docker-compose.yml" -# SDNC_KUBE_APP_FILE="app.yaml" -# SDNC_KARAF_LOG="/opt/opendaylight/data/log/karaf.log" # Path to karaf log -# SDNC_RESPONSE_JSON_KEY="output" # Key name for output json in replies from sdnc # 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 @@ -478,10 +459,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 @@ -506,8 +487,8 @@ DMAAP_ADP_CONFIG_MOUNT_PATH="/opt/app/dmaap-adapter-service/config" # Internal c 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=application1.yaml # Template config file name -DMAAP_ADP_FEATURE_LEVEL="GENERATED_PROD_NAME" # Space separated list of features +DMAAP_ADP_CONFIG_FILE_TEMPLATE=application2.yaml # Template config file name +DMAAP_ADP_FEATURE_LEVEL="GENERATED_PROD_NAME FILTERSPEC" # Space separated list of features DMAAP_MED_APP_NAME="dmaapmediatorservice" # Name for Dmaap Mediator container DMAAP_MED_DISPLAY_NAME="Dmaap Mediator Service" # Display name for Dmaap Mediator container @@ -523,7 +504,7 @@ DMAAP_MED_DATA_MOUNT_PATH="/configs" # Path in container for 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" # Space separated list of features - + # KAFKATYPES support for kafka type from rel f 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)