X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Ftest_env-oran-e-release.sh;h=9a892705f53048d40e4e19ebca2fe447512a1326;hb=542d2dbfd8df1fcb011fea3d69d539c5c5fe3667;hp=fc547febfbf97b82beaed2f5883a1008b7dfe731;hpb=a28a4ad261601976c345425692116e5d7250b810;p=nonrtric.git diff --git a/test/common/test_env-oran-e-release.sh b/test/common/test_env-oran-e-release.sh index fc547feb..9a892705 100755 --- a/test/common/test_env-oran-e-release.sh +++ b/test/common/test_env-oran-e-release.sh @@ -59,19 +59,19 @@ NEXUS_RELEASE_REPO_ORAN=$NEXUS_RELEASE_REPO # Policy Agent base image and tags -POLICY_AGENT_IMAGE_BASE="o-ran-sc/nonrtric-policy-agent" +POLICY_AGENT_IMAGE_BASE="o-ran-sc/nonrtric-a1-policy-management-service" POLICY_AGENT_IMAGE_TAG_LOCAL="2.3.0-SNAPSHOT" POLICY_AGENT_IMAGE_TAG_REMOTE_SNAPSHOT="2.3.0-SNAPSHOT" POLICY_AGENT_IMAGE_TAG_REMOTE="2.3.0" POLICY_AGENT_IMAGE_TAG_REMOTE_RELEASE="2.3.0" -# ECS image and tags -ECS_IMAGE_BASE="o-ran-sc/nonrtric-enrichment-coordinator-service" -ECS_IMAGE_TAG_LOCAL="1.2.0-SNAPSHOT" -ECS_IMAGE_TAG_REMOTE_SNAPSHOT="1.2.0-SNAPSHOT" -ECS_IMAGE_TAG_REMOTE="1.2.0" -ECS_IMAGE_TAG_REMOTE_RELEASE="1.2.0" -#Note: Update var ECS_FEATURE_LEVEL if image version is changed +# ICS image and tags +ICS_IMAGE_BASE="o-ran-sc/nonrtric-information-coordinator-service" +ICS_IMAGE_TAG_LOCAL="1.2.0-SNAPSHOT" +ICS_IMAGE_TAG_REMOTE_SNAPSHOT="1.2.0-SNAPSHOT" +ICS_IMAGE_TAG_REMOTE="1.2.0" +ICS_IMAGE_TAG_REMOTE_RELEASE="1.2.0" +#Note: Update var ICS_FEATURE_LEVEL if image version is changed #Control Panel image and tags CONTROL_PANEL_IMAGE_BASE="o-ran-sc/nonrtric-controlpanel" @@ -83,10 +83,10 @@ CONTROL_PANEL_IMAGE_TAG_REMOTE_RELEASE="2.3.0" # Gateway image and tags NRT_GATEWAY_IMAGE_BASE="o-ran-sc/nonrtric-gateway" -NRT_GATEWAY_IMAGE_TAG_LOCAL="1.1.0-SNAPSHOT" -NRT_GATEWAY_IMAGE_TAG_REMOTE_SNAPSHOT="1.1.0-SNAPSHOT" -NRT_GATEWAY_IMAGE_TAG_REMOTE="1.1.0" -NRT_GATEWAY_IMAGE_TAG_REMOTE_RELEASE="1.1.0" +NRT_GATEWAY_IMAGE_TAG_LOCAL="1.0.0-SNAPSHOT" +NRT_GATEWAY_IMAGE_TAG_REMOTE_SNAPSHOT="1.0.0-SNAPSHOT" +NRT_GATEWAY_IMAGE_TAG_REMOTE="1.0.0" +NRT_GATEWAY_IMAGE_TAG_REMOTE_RELEASE="1.0.0" # SDNC A1 Controller image and tags - Note using released honolulu ONAP image @@ -116,10 +116,10 @@ SDNC_DB_IMAGE_TAG_REMOTE_PROXY="10.5" # RAPP Catalogue image and tags RAPP_CAT_IMAGE_BASE="o-ran-sc/nonrtric-r-app-catalogue" -RAPP_CAT_IMAGE_TAG_LOCAL="1.1.0-SNAPSHOT" -RAPP_CAT_IMAGE_TAG_REMOTE_SNAPSHOT="1.1.0-SNAPSHOT" -RAPP_CAT_IMAGE_TAG_REMOTE="1.1.0" -RAPP_CAT_IMAGE_TAG_REMOTE_RELEASE="1.1.0" +RAPP_CAT_IMAGE_TAG_LOCAL="1.0.1-SNAPSHOT" +RAPP_CAT_IMAGE_TAG_REMOTE_SNAPSHOT="1.0.1-SNAPSHOT" +RAPP_CAT_IMAGE_TAG_REMOTE="1.0.1" +RAPP_CAT_IMAGE_TAG_REMOTE_RELEASE="1.0.1" # Near RT RIC Simulator image and tags - same version as cherry @@ -143,6 +143,13 @@ DMAAP_ADP_IMAGE_TAG_REMOTE_SNAPSHOT="1.0.0-SNAPSHOT" DMAAP_ADP_IMAGE_TAG_REMOTE="1.0.0" DMAAP_ADP_IMAGE_TAG_REMOTE_RELEASE="1.0.0" +# Helm Manager +HELM_MANAGER_IMAGE_BASE="o-ran-sc/nonrtric-helm-manager" +HELM_MANAGER_IMAGE_TAG_LOCAL="1.1.0-SNAPSHOT" +HELM_MANAGER_IMAGE_TAG_REMOTE_SNAPSHOT="1.1.0-SNAPSHOT" +HELM_MANAGER_IMAGE_TAG_REMOTE="1.1.0" +HELM_MANAGER_IMAGE_TAG_REMOTE_RELEASE="1.1.0" + #Consul remote image and tag CONSUL_IMAGE_BASE="consul" CONSUL_IMAGE_TAG_REMOTE_PROXY="1.7.2" @@ -197,13 +204,23 @@ KUBE_PROXY_IMAGE_BASE="nodejs-kube-proxy" KUBE_PROXY_IMAGE_TAG_LOCAL="latest" #No remote image for kube proxy, local image always used -#Kube proxy remote image and tag +#PVC Cleaner remote image and tag PVC_CLEANER_IMAGE_BASE="ubuntu" PVC_CLEANER_IMAGE_TAG_REMOTE_PROXY="20.10" #No local image for pvc cleaner, remote image always used +#Kafka Procon image and tag +KAFKAPC_IMAGE_BASE="kafka-procon" +KAFKAPC_IMAGE_TAG_LOCAL="latest" +#No local image for pvc cleaner, remote image always used + +#PVC Cleaner remote image and tag +CHART_MUS_IMAGE_BASE="ghcr.io/helm/chartmuseum" +CHART_MUS_IMAGE_TAG_REMOTE_OTHER="v0.13.1" +#No local image for chart museum, remote image always used + # List of app short names produced by the project -PROJECT_IMAGES_APP_NAMES="PA ECS CP RC RICSIM NGW DMAAPADP DMAAPMED" # Add SDNC here if oran image is used +PROJECT_IMAGES_APP_NAMES="PA ICS CP RC RICSIM NGW DMAAPADP DMAAPMED HELMMANAGER" # Add SDNC here if oran image is used # List of app short names which images pulled from ORAN ORAN_IMAGES_APP_NAMES="" # Not used @@ -260,26 +277,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 db 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 decoupled from the producer registration -ECS_FEATURE_LEVEL="INFO-TYPES TYPE-SUBSCRIPTIONS INFO-TYPE-INFO" # Space separated list of features +PMS_FEATURE_LEVEL="" # Space separated list of features + +ICS_APP_NAME="informationservice" # Name for ICS container +ICS_DISPLAY_NAME="Information 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 db 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 decoupled from the producer registration +ICS_FEATURE_LEVEL="INFO-TYPES TYPE-SUBSCRIPTIONS INFO-TYPE-INFO RESP_CODE_CHANGE_1" # 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 @@ -304,6 +322,8 @@ 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 @@ -360,7 +380,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) # Kept as reference for oran a1 adapter # SDNC_APP_NAME="a1controller" # Name of the SNDC A1 Controller container # SDNC_DISPLAY_NAME="SDNC A1 Controller" @@ -427,8 +447,8 @@ CONTROL_PANEL_CONFIG_MOUNT_PATH=/etc/nginx # Container internal pa CONTROL_PANEL_NGINX_KUBE_RESOLVER="kube-dns.kube-system.svc.cluster.local valid=5s" #nginx resolver for kube CONTROL_PANEL_NGINX_DOCKER_RESOLVER="127.0.0.11" # nginx resolver for docker CONTROL_PANEL_PATH_POLICY_PREFIX="/a1-policy/" # Path prefix for forwarding policy calls to NGW -CONTROL_PANEL_PATH_ECS_PREFIX="/data-producer/" # Path prefix for forwarding ecs calls to NGW -CONTROL_PANEL_PATH_ECS_PREFIX2="/data-consumer/" # Path prefix for forwarding ecs calls to NGW +CONTROL_PANEL_PATH_ICS_PREFIX="/data-producer/" # Path prefix for forwarding ics calls to NGW +CONTROL_PANEL_PATH_ICS_PREFIX2="/data-consumer/" # Path prefix for forwarding ics calls to NGW NRT_GATEWAY_APP_NAME="nonrtricgateway" # Name of the Gateway container NRT_GATEWAY_DISPLAY_NAME="NonRT-RIC Gateway" @@ -514,13 +534,46 @@ DMAAP_MED_INTERNAL_SECURE_PORT=8185 # Dmaap Mediator contai DMAAP_MED_LOGPATH="/var/log/dmaap-adaptor-service/application.log" # Path the application log in the Dmaap Mediator container DMAAP_MED_HOST_MNT_DIR="./mnt" # Mounted db dir, relative to compose file, on the host #MAAP_ADP_CONTAINER_MNT_DIR="/var/dmaap-adaptor-service" # Mounted dir in the container -#DMAAP_MED_ACTUATOR="/actuator/loggers/org.oransc.enrichment" # Url for trace/debug +#DMAAP_MED_ACTUATOR="/actuator/loggers/org.oransc.information" # Url for trace/debug #DMAAP_MED_CERT_MOUNT_DIR="./cert" DMAAP_MED_ALIVE_URL="/status" # Base path for alive check DMAAP_MED_COMPOSE_DIR="dmaapmed" # Dir in simulator_group for docker-compose #MAAP_MED_CONFIG_MOUNT_PATH="/app" # Internal container path for configuration DMAAP_MED_DATA_MOUNT_PATH="/configs" # Path in container for data file -DMAAP_MED_DATA_FILE="type_config.json" # Container data file name +DMAAP_MED_HOST_DATA_FILE="type_config.json" # Host data file name +DMAAP_MED_CONTR_DATA_FILE="type_config.json" # Container data file name +DMAAP_MED_FEATURE_LEVEL="" # Space separated list of features + +KAFKAPC_APP_NAME="kafka-procon" # Name for the Kafka procon +KAFKAPC_DISPLAY_NAME="Kafka Producer/Consumer" +KAFKAPC_EXTERNAL_PORT=8096 # Kafka procon container external port (host -> container) +KAFKAPC_INTERNAL_PORT=8090 # Kafka procon container internal port (container -> container) +KAFKAPC_EXTERNAL_SECURE_PORT=8097 # Kafka procon container external secure port (host -> container) +KAFKAPC_INTERNAL_SECURE_PORT=8091 # Kafka procon container internal secure port (container -> container) +KAFKAPC_ALIVE_URL="/" # Base path for alive check +KAFKAPC_COMPOSE_DIR="kafka-procon" # Dir in simulator_group for docker-compose +KAFKAPC_BUILD_DIR="kafka-procon" # Build dir + +CHART_MUS_APP_NAME="chartmuseum" # Name for the chart museum app +CHART_MUS_DISPLAY_NAME="Chart Museum" +CHART_MUS_EXTERNAL_PORT=8201 # chart museum container external port (host -> container) +CHART_MUS_INTERNAL_PORT=8080 # chart museum container internal port (container -> container) +CHART_MUS_ALIVE_URL="/health" # Base path for alive check +CHART_MUS_COMPOSE_DIR="chartmuseum" # Dir in simulator_group for docker-compose +CHART_MUS_CHART_CONTR_CHARTS="/tmp/charts" # Local dir container for charts + +HELM_MANAGER_APP_NAME="helmmanagerservice" # Name for the helm manager app +HELM_MANAGER_DISPLAY_NAME="Helm Manager" +HELM_MANAGER_EXTERNAL_PORT=8211 # helm manager container external port (host -> container) +HELM_MANAGER_INTERNAL_PORT=8083 # helm manager container internal port (container -> container) +HELM_MANAGER_EXTERNAL_SECURE_PORT=8212 # helm manager container external secure port (host -> container) +HELM_MANAGER_INTERNAL_SECURE_PORT=8443 # helm manager container internal secure port (container -> container) +HELM_MANAGER_CLUSTER_ROLE=cluster-admin # Kubernetes cluster role for helm manager +HELM_MANAGER_SA_NAME=helm-manager-sa # Service account name +HELM_MANAGER_ALIVE_URL="/helm/charts" # Base path for alive check +HELM_MANAGER_COMPOSE_DIR="helmmanager" # Dir in simulator_group for docker-compose +HELM_MANAGER_USER="helmadmin" +HELM_MANAGER_PWD="itisasecret" ######################################## # Setting for common curl-base function