X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Ftest_env-onap-london.sh;h=3266c1d27663607f242471a9e5a2daf5423d0aad;hb=refs%2Fchanges%2F88%2F12388%2F5;hp=ac8e6407fea5089ee1df9ed85d1cadb9ef01718a;hpb=a27463f3bb2fbe454586a871bba9b08367e9ad77;p=nonrtric.git diff --git a/test/common/test_env-onap-london.sh b/test/common/test_env-onap-london.sh index ac8e6407..3266c1d2 100644 --- a/test/common/test_env-onap-london.sh +++ b/test/common/test_env-onap-london.sh @@ -1,7 +1,7 @@ #!/bin/bash # ============LICENSE_START=============================================== -# Copyright (C) 2021 Nordix Foundation. All rights reserved. +# Copyright (C) 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. @@ -76,37 +76,37 @@ A1PMS_IMAGE_TAG_REMOTE_RELEASE="1.5.0" # SDNC A1 Controller remote image and tag SDNC_A1_CONTROLLER_IMAGE_BASE="onap/sdnc-image" -SDNC_A1_CONTROLLER_IMAGE_TAG_LOCAL="2.5.0-SNAPSHOT" ###CHECK THIS -SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_SNAPSHOT="2.5.0-STAGING-latest" -SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE="2.5.0-STAGING-latest" #Will use snapshot repo -SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_RELEASE="2.5.0" +SDNC_A1_CONTROLLER_IMAGE_TAG_LOCAL="2.5.1-SNAPSHOT" ###CHECK THIS +SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_SNAPSHOT="2.5.1-STAGING-latest" +SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE="2.5.1-STAGING-latest" #Will use snapshot repo +SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_RELEASE="2.5.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" -# ICS image and tag - using f release +# ICS image and tag - using h release ICS_IMAGE_BASE="o-ran-sc/nonrtric-plt-informationcoordinatorservice" -ICS_IMAGE_TAG_REMOTE_RELEASE_ORAN="1.3.1" +ICS_IMAGE_TAG_REMOTE_RELEASE_ORAN="1.5.0" #Note: Update var ICS_FEATURE_LEVEL if image version is changed -# Control Panel image and tag - using f release +# Control Panel image and tag - using h release CONTROL_PANEL_IMAGE_BASE="o-ran-sc/nonrtric-controlpanel" -CONTROL_PANEL_IMAGE_TAG_REMOTE_RELEASE_ORAN="2.3.0" +CONTROL_PANEL_IMAGE_TAG_REMOTE_RELEASE_ORAN="2.5.0" -# Gateway image and tags - used f release +# Gateway image and tags - used h release NRT_GATEWAY_IMAGE_BASE="o-ran-sc/nonrtric-gateway" -NRT_GATEWAY_IMAGE_TAG_REMOTE_RELEASE_ORAN="1.0.0" +NRT_GATEWAY_IMAGE_TAG_REMOTE_RELEASE_ORAN="1.2.0" -# RAPP Catalogue image and tags - used f release +# RAPP Catalogue image and tags - used h release RAPP_CAT_IMAGE_BASE="o-ran-sc/nonrtric-plt-rappcatalogue" -RAPP_CAT_IMAGE_TAG_REMOTE_RELEASE_ORAN="1.1.0" +RAPP_CAT_IMAGE_TAG_REMOTE_RELEASE_ORAN="1.2.0" -# Near RT RIC Simulator image and tags - used f release +# Near RT RIC Simulator image and tags - used h release RIC_SIM_IMAGE_BASE="o-ran-sc/a1-simulator" -RIC_SIM_IMAGE_TAG_REMOTE_RELEASE_ORAN="2.3.1" +RIC_SIM_IMAGE_TAG_REMOTE_RELEASE_ORAN="2.5.0" #MR stub image and tag MRSTUB_IMAGE_BASE="mrstub" @@ -202,7 +202,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="NOCONSUL INITIALCONFIGMAP" # 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="Enrichment Coordinator Service" # Display name for ICS container @@ -221,8 +223,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 +275,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 +297,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 @@ -305,14 +306,14 @@ 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/" # Base url path for SNDC API docs (for alive check) +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="TRANS_RESP_CODE" # Space separated list of features +SDNC_FEATURE_LEVEL="TRANS_RESP_CODE NO_NB_HTTPS" # Space separated list of features # TRANS_RESP_CODE: SDNC return southbound response code RAPP_CAT_APP_NAME="rappcatalogueservice" # Name for the RAPP Catalogue @@ -329,7 +330,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 +380,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