X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Ftest_env-oran-cherry.sh;h=d794e6939f0b863261a7197c8f2f6f8811d4137e;hb=8fbb226ef10720895adb98e6ca7ac1cae39f0103;hp=641aabeb25d409bb6d696fab410fca1b61d6f511;hpb=0f6367023720ecc7d7b4b38cbbc4282792172a89;p=nonrtric.git diff --git a/test/common/test_env-oran-cherry.sh b/test/common/test_env-oran-cherry.sh index 641aabeb..d794e693 100755 --- a/test/common/test_env-oran-cherry.sh +++ b/test/common/test_env-oran-cherry.sh @@ -65,12 +65,12 @@ POLICY_AGENT_IMAGE_TAG_REMOTE_SNAPSHOT="2.1.1-SNAPSHOT" POLICY_AGENT_IMAGE_TAG_REMOTE="2.1.1" POLICY_AGENT_IMAGE_TAG_REMOTE_RELEASE="2.1.1" -# ECS image and tags -ECS_IMAGE_BASE="o-ran-sc/nonrtric-enrichment-coordinator-service" -ECS_IMAGE_TAG_LOCAL="1.0.1-SNAPSHOT" -ECS_IMAGE_TAG_REMOTE_SNAPSHOT="1.0.1-SNAPSHOT" -ECS_IMAGE_TAG_REMOTE="1.0.1" -ECS_IMAGE_TAG_REMOTE_RELEASE="1.0.1" +# ICS image and tags +ICS_IMAGE_BASE="o-ran-sc/nonrtric-enrichment-coordinator-service" +ICS_IMAGE_TAG_LOCAL="1.0.1-SNAPSHOT" +ICS_IMAGE_TAG_REMOTE_SNAPSHOT="1.0.1-SNAPSHOT" +ICS_IMAGE_TAG_REMOTE="1.0.1" +ICS_IMAGE_TAG_REMOTE_RELEASE="1.0.1" # Control Panel image and tags @@ -171,7 +171,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 ECS CP SDNC RC RICSIM" +PROJECT_IMAGES_APP_NAMES="PA ICS CP SDNC RC RICSIM" # List of app short names which images pulled from ORAN ORAN_IMAGES_APP_NAMES="" # Not used @@ -215,26 +215,27 @@ POLICY_AGENT_DATA_MOUNT_PATH="/opt/app/policy-agent/data" # Path in container fo 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="" # Space separated list of features +PMS_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="" # 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 @@ -259,10 +260,12 @@ MR_DMAAP_COMPOSE_DIR="dmaapmr" # Dir in simulator_grou MR_STUB_COMPOSE_DIR="mrstub" # Dir in simulator_group for mr stub for - docker-compose MR_KAFKA_APP_NAME="message-router-kafka" # Kafka app name, if just named "kafka" the image will not start... MR_KAFKA_PORT=9092 # Kafka port number +MR_KAFKA_DOCKER_LOCALHOST_PORT=30098 # Kafka port number for docker localhost +MR_KAFKA_KUBE_NODE_PORT=30099 # Kafka node port number for kube MR_ZOOKEEPER_APP_NAME="zookeeper" # Zookeeper app name MR_ZOOKEEPER_PORT="2181" # Zookeeper port number MR_DMAAP_HOST_MNT_DIR="/mnt" # Basedir localhost for mounted files -MR_DMAAP_HOST_CONFIG_DIR="/configs" # Config files dir on localhost +MR_DMAAP_HOST_CONFIG_DIR="/configs0" # Config files dir on localhost CR_APP_NAME="callback-receiver" # Name for the Callback receiver CR_DISPLAY_NAME="Callback Reciever" @@ -273,7 +276,7 @@ CR_INTERNAL_SECURE_PORT=8091 # Callback receiver con CR_APP_CALLBACK="/callbacks" # Url for callbacks CR_APP_CALLBACK_MR="/callbacks-mr" # Url for callbacks (data from mr which contains string encoded jsons in a json arr) CR_APP_CALLBACK_TEXT="/callbacks-text" # Url for callbacks (data containing text data) -CR_ALIVE_URL="/" # Base path for alive check +CR_ALIVE_URL="/reset" # Base path for alive check CR_COMPOSE_DIR="cr" # Dir in simulator_group for docker-compose PROD_STUB_APP_NAME="producer-stub" # Name for the Producer stub @@ -315,6 +318,7 @@ RIC_SIM_CERT_MOUNT_DIR="./cert" RIC_SIM_COMPOSE_DIR="ric" # Dir in simulator group for docker compose RIC_SIM_ALIVE_URL="/" # Base path for alive check +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"