X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Ftest_env-onap-kohn.sh;h=9a345964be4d69b6ef51324f36f59b71bbbcb0f5;hb=b188e12cc1b4be627ae6f8f424f06c38ffb89804;hp=d4818b23f576b2aabf81f244661a96cf50b2cc2c;hpb=f4a7e420842aa8cde747aa71180f7b47bb1010dc;p=nonrtric.git diff --git a/test/common/test_env-onap-kohn.sh b/test/common/test_env-onap-kohn.sh index d4818b23..9a345964 100644 --- a/test/common/test_env-onap-kohn.sh +++ b/test/common/test_env-onap-kohn.sh @@ -1,7 +1,7 @@ #!/bin/bash # ============LICENSE_START=============================================== -# Copyright (C) 2021 Nordix Foundation. All rights reserved. +# Copyright (C) 2021-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. @@ -43,7 +43,7 @@ NEXUS_RELEASE_REPO_ONAP=$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 @@ -59,7 +59,7 @@ NEXUS_RELEASE_REPO_ONAP=$NEXUS_RELEASE_REPO ############################################################################# # Note: -# The imgage tags for a1pms and sdnc are updated AFTER the release. +# The image tags for a1pms and sdnc are updated AFTER the release. # This means that the latest staging/snapshot images for these two components have # version one step (0.0.1 - bug-level) higher than the # latest release image version. @@ -69,17 +69,17 @@ NEXUS_RELEASE_REPO_ONAP=$NEXUS_RELEASE_REPO # A1PMS image and tags A1PMS_IMAGE_BASE="onap/ccsdk-oran-a1policymanagementservice" -A1PMS_IMAGE_TAG_LOCAL="1.4.0-SNAPSHOT" -A1PMS_IMAGE_TAG_REMOTE_SNAPSHOT="1.4.0-SNAPSHOT" -A1PMS_IMAGE_TAG_REMOTE="1.4.0-STAGING-latest" #Will use snapshot repo -A1PMS_IMAGE_TAG_REMOTE_RELEASE="1.4.0" +A1PMS_IMAGE_TAG_LOCAL="1.4.2-SNAPSHOT" +A1PMS_IMAGE_TAG_REMOTE_SNAPSHOT="1.4.2-SNAPSHOT" +A1PMS_IMAGE_TAG_REMOTE="1.4.2-STAGING-latest" #Will use snapshot repo +A1PMS_IMAGE_TAG_REMOTE_RELEASE="1.4.1" # SDNC A1 Controller remote image and tag SDNC_A1_CONTROLLER_IMAGE_BASE="onap/sdnc-image" -SDNC_A1_CONTROLLER_IMAGE_TAG_LOCAL="2.3.3-SNAPSHOT" ###CHECK THIS -SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_SNAPSHOT="2.3.3-STAGING-latest" -SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE="2.3.3-STAGING-latest" #Will use snapshot repo -SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_RELEASE="2.3.3" +SDNC_A1_CONTROLLER_IMAGE_TAG_LOCAL="2.4.2-SNAPSHOT" ###CHECK THIS +SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_SNAPSHOT="2.4.2-STAGING-latest" +SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE="2.4.2-STAGING-latest" #Will use snapshot repo +SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_RELEASE="2.4.1" #SDNC DB remote image and tag #The DB is part of SDNC so handled in the same way as SDNC @@ -202,7 +202,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="Enrichment Coordinator Service" # Display name for ICS container @@ -221,8 +221,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 added in the producer registration -ICS_FEATURE_LEVEL="INFO-TYPES" # Space separated list of features +ICS_FEATURE_LEVEL="" # 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 @@ -274,7 +273,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 @@ -296,7 +295,7 @@ SDNC_APP_NAME="a1controller" # Name of the SNDC A1 C 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 @@ -329,7 +328,7 @@ CONTROL_PANEL_DISPLAY_NAME="Non-RT RIC 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 intternal port (container -> container) +CONTROL_PANEL_INTERNAL_SECURE_PORT=8082 # Control Panel container internal port (container -> container) CONTROL_PANEL_LOGPATH="/logs/nonrtric-controlpanel.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 @@ -379,10 +378,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