X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Ftest_env-oran-d-release.sh;h=1f7359503e7596ff1805eca2da28894fb8f6bcaf;hb=23d69b4a0fac41be58676c006867332c9fac6071;hp=a4f725c5fdea869ee03fa60e99c4de4d429a4fe0;hpb=8fbb226ef10720895adb98e6ca7ac1cae39f0103;p=nonrtric.git diff --git a/test/common/test_env-oran-d-release.sh b/test/common/test_env-oran-d-release.sh index a4f725c5..1f735950 100755 --- a/test/common/test_env-oran-d-release.sh +++ b/test/common/test_env-oran-d-release.sh @@ -41,7 +41,7 @@ NEXUS_RELEASE_REPO_ORAN=$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 @@ -58,12 +58,12 @@ NEXUS_RELEASE_REPO_ORAN=$NEXUS_RELEASE_REPO # 7 XXX_PROXY: other images, not produced by the project: : -# Policy Agent base image and tags -POLICY_AGENT_IMAGE_BASE="o-ran-sc/nonrtric-policy-agent" -POLICY_AGENT_IMAGE_TAG_LOCAL="2.2.1-SNAPSHOT" -POLICY_AGENT_IMAGE_TAG_REMOTE_SNAPSHOT="2.2.1-SNAPSHOT" -POLICY_AGENT_IMAGE_TAG_REMOTE="2.2.1" -POLICY_AGENT_IMAGE_TAG_REMOTE_RELEASE="2.2.1" +# A1PMS base image and tags +A1PMS_IMAGE_BASE="o-ran-sc/nonrtric-policy-agent" +A1PMS_IMAGE_TAG_LOCAL="2.2.1-SNAPSHOT" +A1PMS_IMAGE_TAG_REMOTE_SNAPSHOT="2.2.1-SNAPSHOT" +A1PMS_IMAGE_TAG_REMOTE="2.2.1" +A1PMS_IMAGE_TAG_REMOTE_RELEASE="2.2.1" # ICS image and tags ICS_IMAGE_BASE="o-ran-sc/nonrtric-enrichment-coordinator-service" @@ -190,7 +190,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 ICS CP RC RICSIM NGW" # Add SDNC here if oran image is used +PROJECT_IMAGES_APP_NAMES="A1PMS ICS CP RC RICSIM NGW" # Add SDNC here if oran image is used # List of app short names which images pulled from ORAN ORAN_IMAGES_APP_NAMES="" # Not used @@ -211,30 +211,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 - -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 -PMS_FEATURE_LEVEL="" # 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 + +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