X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Ftest_env-onap-istanbul.sh;h=7e1c75568e13813dbcc0c28bae93f443cb957c33;hb=23d69b4a0fac41be58676c006867332c9fac6071;hp=b2b0d2ed44cf07257c5b93ef17581693b6ea2fa6;hpb=09e21f39a3ffcfc2063110bcad028014b0056398;p=nonrtric.git diff --git a/test/common/test_env-onap-istanbul.sh b/test/common/test_env-onap-istanbul.sh index b2b0d2ed..7e1c7556 100644 --- a/test/common/test_env-onap-istanbul.sh +++ b/test/common/test_env-onap-istanbul.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,29 +67,29 @@ 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.2.4-SNAPSHOT" -POLICY_AGENT_IMAGE_TAG_REMOTE_SNAPSHOT="1.2.4-SNAPSHOT" -POLICY_AGENT_IMAGE_TAG_REMOTE="1.2.4-STAGING-latest" #Will use snapshot repo -POLICY_AGENT_IMAGE_TAG_REMOTE_RELEASE="1.2.3" +# A1PMS image and tags +A1PMS_IMAGE_BASE="onap/ccsdk-oran-a1policymanagementservice" +A1PMS_IMAGE_TAG_LOCAL="1.2.6-SNAPSHOT" +A1PMS_IMAGE_TAG_REMOTE_SNAPSHOT="1.2.6-SNAPSHOT" +A1PMS_IMAGE_TAG_REMOTE="1.2.6-STAGING-latest" #Will use snapshot repo +A1PMS_IMAGE_TAG_REMOTE_RELEASE="1.2.5" # SDNC A1 Controller remote image and tag SDNC_A1_CONTROLLER_IMAGE_BASE="onap/sdnc-image" -SDNC_A1_CONTROLLER_IMAGE_TAG_LOCAL="2.2.1-SNAPSHOT" ###CHECK THIS -SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_SNAPSHOT="2.2.1-STAGING-latest" -SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE="2.2.1-STAGING-latest" #Will use snapshot repo -SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_RELEASE="2.2.1" +SDNC_A1_CONTROLLER_IMAGE_TAG_LOCAL="2.2.6-SNAPSHOT" ###CHECK THIS +SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_SNAPSHOT="2.2.6-STAGING-latest" +SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE="2.2.6-STAGING-latest" #Will use snapshot repo +SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_RELEASE="2.2.5" #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" -# ECS image and tag - uses d release -ECS_IMAGE_BASE="o-ran-sc/nonrtric-enrichment-coordinator-service" -ECS_IMAGE_TAG_REMOTE_RELEASE_ORAN="1.1.0" -#Note: Update var ECS_FEATURE_LEVEL if image version is changed +# ICS image and tag - uses d release +ICS_IMAGE_BASE="o-ran-sc/nonrtric-enrichment-coordinator-service" +ICS_IMAGE_TAG_REMOTE_RELEASE_ORAN="1.1.0" +#Note: Update var ICS_FEATURE_LEVEL if image version is changed # Control Panel image and tag - uses d release CONTROL_PANEL_IMAGE_BASE="o-ran-sc/nonrtric-controlpanel" @@ -170,10 +170,10 @@ 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 ECS RICSIM RC NGW" +ORAN_IMAGES_APP_NAMES="CP ICS RICSIM RC NGW" # List of app short names which images pulled from ONAP ONAP_IMAGES_APP_NAMES="" # Not used @@ -192,49 +192,50 @@ 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 - -ECS_APP_NAME="enrichmentservice" # Name for ECS container -ECS_DISPLAY_NAME="Enrichment Coordinator Service" # Display name for ECS container -ECS_EXTERNAL_PORT=8083 # ECS container external port (host -> container) -ECS_INTERNAL_PORT=8083 # ECS container internal port (container -> container) -ECS_EXTERNAL_SECURE_PORT=8434 # ECS container external secure port (host -> container) -ECS_INTERNAL_SECURE_PORT=8434 # ECS container internal secure port (container -> container) - -ECS_LOGPATH="/var/log/enrichment-coordinator-service/application.log" # Path the application log in the ECS container -ECS_APP_NAME_ALIAS="enrichment-service-container" # Alias name, name used by the control panel -ECS_HOST_MNT_DIR="./mnt" # Mounted dir, relative to compose file, on the host -ECS_CONTAINER_MNT_DIR="/var/enrichment-coordinator-service" # Mounted dir in the container -ECS_ACTUATOR="/actuator/loggers/org.oransc.enrichment" # Url for trace/debug -ECS_CERT_MOUNT_DIR="./cert" -ECS_ALIVE_URL="/status" # Base path for alive check -ECS_COMPOSE_DIR="ecs" # Dir in simulator_group for docker-compose -ECS_CONFIG_MOUNT_PATH=/opt/app/enrichment-coordinator-service/config # Internal container path for configuration -ECS_CONFIG_FILE=application.yaml # Config file name -ECS_VERSION="V1-2" # Version where the types are added in the producer registration -ECS_FEATURE_LEVEL="INFO-TYPES" # Space separated list of features +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="" # Space separated list of features + +ICS_APP_NAME="informationservice" # Name for ICS container +ICS_DISPLAY_NAME="Enrichment Coordinator Service" # Display name for ICS container +ICS_EXTERNAL_PORT=8083 # ICS container external port (host -> container) +ICS_INTERNAL_PORT=8083 # ICS container internal port (container -> container) +ICS_EXTERNAL_SECURE_PORT=8434 # ICS container external secure port (host -> container) +ICS_INTERNAL_SECURE_PORT=8434 # ICS container internal secure port (container -> container) + +ICS_LOGPATH="/var/log/information-coordinator-service/application.log" # Path the application log in the ICS container +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_CERT_MOUNT_DIR="./cert" +ICS_ALIVE_URL="/status" # Base path for alive check +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 MR_DMAAP_APP_NAME="message-router" # Name for the Dmaap MR MR_STUB_APP_NAME="mr-stub" # Name of the MR stub @@ -317,6 +318,7 @@ RIC_SIM_INTERNAL_SECURE_PORT=8185 # RIC Simulator contain RIC_SIM_CERT_MOUNT_DIR="./cert" RIC_SIM_COMPOSE_DIR="ric" # Dir in simulator group for docker compose RIC_SIM_ALIVE_URL="/" +RIC_SIM_COMMON_SVC_NAME="" # Name of svc if one common svc is used for all ric sim groups (stateful sets) SDNC_APP_NAME="a1controller" # Name of the SNDC A1 Controller container SDNC_DISPLAY_NAME="SDNC A1 Controller"