X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Ftest_env-onap-jakarta.sh;h=7d5000723116a417011af36d93a52c597c479faa;hb=8fbc63697f2edaaf2c9db40f54b318e7211361e2;hp=386f168a82b5adbca46b0a2331bd3fe95758e2d0;hpb=1b732d17463fad74721391b3a87a2a12172da63c;p=nonrtric.git diff --git a/test/common/test_env-onap-jakarta.sh b/test/common/test_env-onap-jakarta.sh index 386f168a..7d500072 100644 --- a/test/common/test_env-onap-jakarta.sh +++ b/test/common/test_env-onap-jakarta.sh @@ -1,7 +1,7 @@ #!/bin/bash # ============LICENSE_START=============================================== -# Copyright (C) 2020 Nordix Foundation. All rights reserved. +# Copyright (C) 2021 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. @@ -41,7 +41,7 @@ NEXUS_RELEASE_REPO_ONAP=$NEXUS_RELEASE_REPO # 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: POLICY_AGENT_IMAGE_BASE -> POLICY_AGENT_IMAGE +# 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. # For images built by the script, only tag #1 shall be specified @@ -59,7 +59,7 @@ NEXUS_RELEASE_REPO_ONAP=$NEXUS_RELEASE_REPO ############################################################################# # Note: -# The imgage tags for pms and sdnc are updated AFTER the release. +# The imgage 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. @@ -67,18 +67,18 @@ NEXUS_RELEASE_REPO_ONAP=$NEXUS_RELEASE_REPO # This is only applicable for ONAP images ############################################################################# -# Policy Agent image and tags -POLICY_AGENT_IMAGE_BASE="onap/ccsdk-oran-a1policymanagementservice" -POLICY_AGENT_IMAGE_TAG_LOCAL="1.3.0-SNAPSHOT" -POLICY_AGENT_IMAGE_TAG_REMOTE_SNAPSHOT="1.3.0-SNAPSHOT" -POLICY_AGENT_IMAGE_TAG_REMOTE="1.3.0-STAGING-latest" #Will use snapshot repo -POLICY_AGENT_IMAGE_TAG_REMOTE_RELEASE="1.3.0" +# 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" # SDNC A1 Controller remote image and tag SDNC_A1_CONTROLLER_IMAGE_BASE="onap/sdnc-image" -SDNC_A1_CONTROLLER_IMAGE_TAG_LOCAL="2.3.0-SNAPSHOT" ###CHECK THIS -SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_SNAPSHOT="2.3.0-STAGING-latest" -SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE="2.3.0-STAGING-latest" #Will use snapshot repo +SDNC_A1_CONTROLLER_IMAGE_TAG_LOCAL="2.3.1-SNAPSHOT" ###CHECK THIS +SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_SNAPSHOT="2.3.1-STAGING-latest" +SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE="2.3.1-STAGING-latest" #Will use snapshot repo SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_RELEASE="2.3.0" #SDNC DB remote image and tag @@ -86,12 +86,12 @@ SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_RELEASE="2.3.0" SDNC_DB_IMAGE_BASE="mariadb" SDNC_DB_IMAGE_TAG_REMOTE_PROXY="10.5" -# ICS image and tag - used e release +# ICS image and tag - using e release ICS_IMAGE_BASE="o-ran-sc/nonrtric-information-coordinator-service" -ICS_IMAGE_TAG_REMOTE_RELEASE_ORAN="1.2.0" +ICS_IMAGE_TAG_REMOTE_RELEASE_ORAN="1.2.1" #Note: Update var ICS_FEATURE_LEVEL if image version is changed -# Control Panel image and tag - used e release +# Control Panel image and tag - using e release CONTROL_PANEL_IMAGE_BASE="o-ran-sc/nonrtric-controlpanel" CONTROL_PANEL_IMAGE_TAG_REMOTE_RELEASE_ORAN="2.3.0" @@ -101,26 +101,13 @@ NRT_GATEWAY_IMAGE_TAG_REMOTE_RELEASE_ORAN="1.0.0" # RAPP Catalogue image and tags - used e release RAPP_CAT_IMAGE_BASE="o-ran-sc/nonrtric-r-app-catalogue" -RAPP_CAT_IMAGE_TAG_REMOTE_RELEASE_ORAN="1.0.1" +RAPP_CAT_IMAGE_TAG_REMOTE_RELEASE_ORAN="1.0.2" # Near RT RIC Simulator image and tags - used e release RIC_SIM_IMAGE_BASE="o-ran-sc/a1-simulator" RIC_SIM_IMAGE_TAG_REMOTE_RELEASE_ORAN="2.2.0" - -#Consul remote image and tag -CONSUL_IMAGE_BASE="consul" -CONSUL_IMAGE_TAG_REMOTE_PROXY="1.7.2" -#No local image for Consul, remote image always used - - -#CBS remote image and tag -CBS_IMAGE_BASE="onap/org.onap.dcaegen2.platform.configbinding.app-app" -CBS_IMAGE_TAG_REMOTE_RELEASE_ONAP="2.3.0" -#No local image for CBS, remote image always used - - #MR stub image and tag MRSTUB_IMAGE_BASE="mrstub" MRSTUB_IMAGE_TAG_LOCAL="latest" @@ -170,7 +157,7 @@ PVC_CLEANER_IMAGE_TAG_REMOTE_PROXY="20.10" #No local image for pvc cleaner, remote image always used # List of app short names produced by the project -PROJECT_IMAGES_APP_NAMES="PA SDNC" +PROJECT_IMAGES_APP_NAMES="A1PMS SDNC" # List of app short names which images pulled from ORAN ORAN_IMAGES_APP_NAMES="CP ICS RICSIM RC NGW" @@ -192,29 +179,30 @@ KUBE_A1SIM_NAMESPACE="a1-sim" # Namespace for a1-p si KUBE_ONAP_NAMESPACE="onap" # Namespace for onap (only message router) KUBE_SDNC_NAMESPACE="onap" # Namespace for sdnc -POLICY_AGENT_EXTERNAL_PORT=8081 # Policy Agent container external port (host -> container) -POLICY_AGENT_INTERNAL_PORT=8081 # Policy Agent container internal port (container -> container) -POLICY_AGENT_EXTERNAL_SECURE_PORT=8433 # Policy Agent container external secure port (host -> container) -POLICY_AGENT_INTERNAL_SECURE_PORT=8433 # Policy Agent container internal secure port (container -> container) -POLICY_AGENT_APIS="V1 V2" # Supported northbound api versions -PMS_VERSION="V2" # Tested version of northbound API -PMS_API_PREFIX="/a1-policy" # api url prefix, only for V2. Shall contain leading "/" - -POLICY_AGENT_APP_NAME="policymanagementservice" # Name for Policy Agent container -POLICY_AGENT_DISPLAY_NAME="Policy Management Service" -POLICY_AGENT_HOST_MNT_DIR="./mnt" # Mounted dir, relative to compose file, on the host -POLICY_AGENT_LOGPATH="/var/log/policy-agent/application.log" # Path the application log in the Policy Agent container -POLICY_AGENT_APP_NAME_ALIAS="policy-agent-container" # Alias name, name used by the control panel -POLICY_AGENT_CONFIG_KEY="policy-agent" # Key for consul config -POLICY_AGENT_PKG_NAME="org.onap.ccsdk.oran.a1policymanagementservice" # Java base package name -POLICY_AGENT_ACTUATOR="/actuator/loggers/$POLICY_AGENT_PKG_NAME" # Url for trace/debug -POLICY_AGENT_ALIVE_URL="$PMS_API_PREFIX/v2/status" # Base path for alive check -POLICY_AGENT_COMPOSE_DIR="policy_agent" # Dir in simulator_group for docker-compose -POLICY_AGENT_CONFIG_MOUNT_PATH="/opt/app/policy-agent/config" # Path in container for config file -POLICY_AGENT_DATA_MOUNT_PATH="/opt/app/policy-agent/data" # Path in container for data file -POLICY_AGENT_CONFIG_FILE="application.yaml" # Container config file name -POLICY_AGENT_DATA_FILE="application_configuration.json" # Container data file name -POLICY_AGENT_CONTAINER_MNT_DIR="/var/policy-management-service" # Mounted dir in the container +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_API_PREFIX="/a1-policy" # api url prefix, only for V2. Shall contain leading "/" + +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_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="NOCONSUL INITIALCONFIGMAP" # Space separated list of features ICS_APP_NAME="informationservice" # Name for ICS container ICS_DISPLAY_NAME="Enrichment Coordinator Service" # Display name for ICS container @@ -227,7 +215,7 @@ ICS_LOGPATH="/var/log/information-coordinator-service/application.log" # Path th ICS_APP_NAME_ALIAS="information-service-container" # Alias name, name used by the control panel ICS_HOST_MNT_DIR="./mnt" # Mounted 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.information" # Url for trace/debug +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 @@ -290,21 +278,6 @@ PROD_STUB_SUPERVISION_CALLBACK="/callbacks/supervision" # Callback path for pro PROD_STUB_ALIVE_URL="/" # Base path for alive check PROD_STUB_COMPOSE_DIR="prodstub" # Dir in simulator_group for docker-compose -CONSUL_HOST="consul-server" # Host name of consul -CONSUL_DISPLAY_NAME="Consul" -CONSUL_EXTERNAL_PORT=8500 # Consul container external port (host -> container) -CONSUL_INTERNAL_PORT=8500 # Consul container internal port (container -> container) -CONSUL_APP_NAME="polman-consul" # Name for consul container -CONSUL_ALIVE_URL="/ui/dc1/kv" # Base path for alive check -CONSUL_CBS_COMPOSE_DIR="consul_cbs" # Dir in simulator group for docker compose - -CBS_APP_NAME="polman-cbs" # Name for CBS container -CBS_DISPLAY_NAME="Config Binding Service" -CBS_EXTERNAL_PORT=10000 # CBS container external port (host -> container) -CBS_INTERNAL_PORT=10000 # CBS container internal port (container -> container) -CONFIG_BINDING_SERVICE="config-binding-service" # Host name of CBS -CBS_ALIVE_URL="/healthcheck" # Base path for alive check - 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 @@ -330,15 +303,15 @@ SDNC_A1_TRUSTSTORE_PASSWORD="a1adapter" # SDNC truststore passw 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_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_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_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 # TRANS_RESP_CODE: SDNC return southbound response code