X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Ftest_env-oran-e-release.sh;h=546e94cfd66a2095934548a77d8a1c7d7371569a;hb=0f6367023720ecc7d7b4b38cbbc4282792172a89;hp=e468d0349a0d189e716b8f98ce8e209d5e55ef34;hpb=c9b469c6f038725d47b9622c5d11495c2194f581;p=nonrtric.git diff --git a/test/common/test_env-oran-e-release.sh b/test/common/test_env-oran-e-release.sh index e468d034..546e94cf 100755 --- a/test/common/test_env-oran-e-release.sh +++ b/test/common/test_env-oran-e-release.sh @@ -89,9 +89,9 @@ NRT_GATEWAY_IMAGE_TAG_REMOTE="1.1.0" NRT_GATEWAY_IMAGE_TAG_REMOTE_RELEASE="1.1.0" -# SDNC A1 Controller image and tags - Note using ONAP image +# SDNC A1 Controller image and tags - Note using released honolulu ONAP image SDNC_A1_CONTROLLER_IMAGE_BASE="onap/sdnc-image" -SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_RELEASE_ONAP="2.1.2" +SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_RELEASE_ONAP="2.1.6" #No local image for ONAP SDNC, remote release image always used # ORAN SDNC adapter kept as reference @@ -125,10 +125,23 @@ RAPP_CAT_IMAGE_TAG_REMOTE_RELEASE="1.1.0" # Near RT RIC Simulator image and tags - same version as cherry RIC_SIM_IMAGE_BASE="o-ran-sc/a1-simulator" RIC_SIM_IMAGE_TAG_LOCAL="latest" -RIC_SIM_IMAGE_TAG_REMOTE_SNAPSHOT="2.1.0-SNAPSHOT" -RIC_SIM_IMAGE_TAG_REMOTE="2.1.0" -RIC_SIM_IMAGE_TAG_REMOTE_RELEASE="2.1.0" - +RIC_SIM_IMAGE_TAG_REMOTE_SNAPSHOT="2.2.0-SNAPSHOT" +RIC_SIM_IMAGE_TAG_REMOTE="2.2.0" +RIC_SIM_IMAGE_TAG_REMOTE_RELEASE="2.2.0" + +# DMAAP Mediator Service +DMAAP_MED_IMAGE_BASE="o-ran-sc/nonrtric-dmaap-mediator-producer" +DMAAP_MED_IMAGE_TAG_LOCAL="1.0.0-SNAPSHOT" +DMAAP_MED_IMAGE_TAG_REMOTE_SNAPSHOT="1.0.0-SNAPSHOT" +DMAAP_MED_IMAGE_TAG_REMOTE="1.0.0" +DMAAP_MED_IMAGE_TAG_REMOTE_RELEASE="1.0.0" + +# DMAAP Adapter Service +DMAAP_ADP_IMAGE_BASE="o-ran-sc/nonrtric-dmaap-adaptor" +DMAAP_ADP_IMAGE_TAG_LOCAL="1.0.0-SNAPSHOT" +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" #Consul remote image and tag CONSUL_IMAGE_BASE="consul" @@ -166,17 +179,17 @@ HTTP_PROXY_IMAGE_TAG_LOCAL="latest" #ONAP Zookeeper remote image and tag ONAP_ZOOKEEPER_IMAGE_BASE="onap/dmaap/zookeeper" -ONAP_ZOOKEEPER_IMAGE_TAG_REMOTE_RELEASE_ONAP="6.0.3" +ONAP_ZOOKEEPER_IMAGE_TAG_REMOTE_RELEASE_ONAP="6.1.0" #No local image for ONAP Zookeeper, remote image always used #ONAP Kafka remote image and tag ONAP_KAFKA_IMAGE_BASE="onap/dmaap/kafka111" -ONAP_KAFKA_IMAGE_TAG_REMOTE_RELEASE_ONAP="1.0.4" +ONAP_KAFKA_IMAGE_TAG_REMOTE_RELEASE_ONAP="1.1.1" #No local image for ONAP Kafka, remote image always used #ONAP DMAAP-MR remote image and tag ONAP_DMAAPMR_IMAGE_BASE="onap/dmaap/dmaap-mr" -ONAP_DMAAPMR_IMAGE_TAG_REMOTE_RELEASE_ONAP="1.1.18" +ONAP_DMAAPMR_IMAGE_TAG_REMOTE_RELEASE_ONAP="1.3.0" #No local image for ONAP DMAAP-MR, remote image always used #Kube proxy remote image and tag @@ -184,8 +197,13 @@ 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_IMAGE_BASE="ubuntu" +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 RC RICSIM NGW" # Add SDNC here if oran image is used +PROJECT_IMAGES_APP_NAMES="PA ECS CP RC RICSIM NGW DMAAPADP DMAAPMED" # Add SDNC here if oran image is used # List of app short names which images pulled from ORAN ORAN_IMAGES_APP_NAMES="" # Not used @@ -198,11 +216,26 @@ ONAP_IMAGES_APP_NAMES="CBS DMAAPMR SDNC" # SDNC added as ONAP image # Detailed settings per app ######################################## +# Port number variables +# ===================== +# Port number vars _INTERNAL_PORT and _INTERNAL_SECURE_PORT are set as pod/container port in kube and container port in docker +# +# Port number vars _EXTERNAL_PORT and _EXTERNAL_SECURE_PORT are set as svc port in kube and localhost port in docker +# +# For some components, eg. MR, can be represented as the MR-STUB and/or the DMAAP MR. For these components +# special vars nameed _LOSTHOST_PORT and _LOCALHOST_SECURE_PORT are used as localhost ports instead of +# name>_EXTERNAL_PORT and _EXTERNAL_SECURE_PORT ports in docker in order to prevent overalapping ports on local host +# +# For KUBE PROXY there are special external port for docker as the proyx exposes also the kube svc port on localhost, +# therefore a special set of external port are needed for docker _DOCKER_EXTERNAL_PORT and _DOCKER_EXTERNAL_SECURE_PORT + DOCKER_SIM_NWNAME="nonrtric-docker-net" # Name of docker private network KUBE_NONRTRIC_NAMESPACE="nonrtric" # Namespace for all nonrtric components KUBE_SIM_NAMESPACE="nonrtric-ft" # Namespace for simulators (except MR and RICSIM) +KUBE_A1SIM_NAMESPACE="a1-sim" # Namespace for a1-p simulators (RICSIM) 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) @@ -227,7 +260,6 @@ 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 -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 @@ -247,9 +279,9 @@ ECS_COMPOSE_DIR="ecs" # Dir in simulator_grou 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" # Space separated list of features +ECS_FEATURE_LEVEL="INFO-TYPES TYPE-SUBSCRIPTIONS INFO-TYPE-INFO" # Space separated list of features -MR_DMAAP_APP_NAME="dmaap-mr" # Name for the Dmaap MR +MR_DMAAP_APP_NAME="message-router" # Name for the Dmaap MR MR_STUB_APP_NAME="mr-stub" # Name of the MR stub MR_DMAAP_DISPLAY_NAME="DMAAP Message Router" MR_STUB_DISPLAY_NAME="Message Router stub" @@ -270,9 +302,12 @@ MR_STUB_ALIVE_URL="/" # Base path for mr stub MR_DMAAP_ALIVE_URL="/topics" # Base path for dmaap-mr alive check MR_DMAAP_COMPOSE_DIR="dmaapmr" # Dir in simulator_group for dmaap mr for - docker-compose MR_STUB_COMPOSE_DIR="mrstub" # Dir in simulator_group for mr stub for - docker-compose -MR_KAFKA_APP_NAME="kafka" # Kafka app name +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_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 CR_APP_NAME="callback-receiver" # Name for the Callback receiver CR_DISPLAY_NAME="Callback receiver" @@ -281,6 +316,8 @@ CR_INTERNAL_PORT=8090 # Callback receiver con CR_EXTERNAL_SECURE_PORT=8091 # Callback receiver container external secure port (host -> container) CR_INTERNAL_SECURE_PORT=8091 # Callback receiver container internal secure port (container -> container) 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_COMPOSE_DIR="cr" # Dir in simulator_group for docker-compose @@ -364,6 +401,7 @@ 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_FEATURE_LEVEL="" # Space separated list of features RAPP_CAT_APP_NAME="rappcatalogueservice" # Name for the RAPP Catalogue RAPP_CAT_DISPLAY_NAME="RAPP Catalogue" @@ -433,13 +471,60 @@ KUBE_PROXY_WEB_EXTERNAL_PORT=8731 # Kube Http Proxy conta KUBE_PROXY_WEB_INTERNAL_PORT=8081 # Kube Http Proxy container internal port (container -> container) KUBE_PROXY_WEB_EXTERNAL_SECURE_PORT=8783 # Kube Proxy container external secure port (host -> container) KUBE_PROXY_WEB_INTERNAL_SECURE_PORT=8434 # Kube Proxy container internal secure port (container -> container + +KUBE_PROXY_DOCKER_EXTERNAL_PORT=8732 # Kube Http Proxy container external port, doocker (host -> container) +KUBE_PROXY_DOCKER_EXTERNAL_SECURE_PORT=8784 # Kube Proxy container external secure port, doocker (host -> container) +KUBE_PROXY_WEB_DOCKER_EXTERNAL_PORT=8733 # Kube Http Proxy container external port, doocker (host -> container) +KUBE_PROXY_WEB_DOCKER_EXTERNAL_SECURE_PORT=8785 # Kube Proxy container external secure port, doocker (host -> container) + KUBE_PROXY_PATH="" # Proxy url path, will be set if proxy is started KUBE_PROXY_ALIVE_URL="/" # Base path for alive check KUBE_PROXY_COMPOSE_DIR="kubeproxy" # Dir in simulator_group for docker-compose +PVC_CLEANER_APP_NAME="pvc-cleaner" # Name for Persistent Volume Cleaner container +PVC_CLEANER_DISPLAY_NAME="Persistent Volume Cleaner" # Display name for Persistent Volume Cleaner +PVC_CLEANER_COMPOSE_DIR="pvc-cleaner" # Dir in simulator_group for yamls + +DMAAP_ADP_APP_NAME="dmaapadapterservice" # Name for Dmaap Adapter container +DMAAP_ADP_DISPLAY_NAME="Dmaap Adapter Service" # Display name for Dmaap Adapter container +DMAAP_ADP_EXTERNAL_PORT=9087 # Dmaap Adapter container external port (host -> container) +DMAAP_ADP_INTERNAL_PORT=8084 # Dmaap Adapter container internal port (container -> container) +DMAAP_ADP_EXTERNAL_SECURE_PORT=9088 # Dmaap Adapter container external secure port (host -> container) +DMAAP_ADP_INTERNAL_SECURE_PORT=8435 # Dmaap Adapter container internal secure port (container -> container) + +#DMAAP_ADP_LOGPATH="/var/log/dmaap-adaptor-service/application.log" # Path the application log in the Dmaap Adapter container +DMAAP_ADP_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_ADP_ACTUATOR="/actuator/loggers/org.oran.dmaapadapter" # Url for trace/debug +#DMAAP_ADP_CERT_MOUNT_DIR="./cert" +DMAAP_ADP_ALIVE_URL="/actuator/info" # Base path for alive check +DMAAP_ADP_COMPOSE_DIR="dmaapadp" # Dir in simulator_group for docker-compose +DMAAP_ADP_CONFIG_MOUNT_PATH="/opt/app/dmaap-adaptor-service/config" # Internal container path for configuration +DMAAP_ADP_DATA_MOUNT_PATH="/opt/app/dmaap-adaptor-service/data" # Path in container for data file +DMAAP_ADP_DATA_FILE="application_configuration.json" # Container data file name +DMAAP_ADP_CONFIG_FILE=application.yaml # Config file name + +DMAAP_MED_APP_NAME="dmaapmediatorservice" # Name for Dmaap Mediator container +DMAAP_MED_DISPLAY_NAME="Dmaap Mediator Service" # Display name for Dmaap Mediator container +DMAAP_MED_EXTERNAL_PORT=8085 # Dmaap Mediator container external port (host -> container) +DMAAP_MED_INTERNAL_PORT=8085 # Dmaap Mediator container internal port (container -> container) +DMAAP_MED_EXTERNAL_SECURE_PORT=8185 # Dmaap Mediator container external secure port (host -> container) +DMAAP_MED_INTERNAL_SECURE_PORT=8185 # Dmaap Mediator container internal secure port (container -> container) + +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_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 + ######################################## # Setting for common curl-base function ######################################## -UUID="" # UUID used as prefix to the policy id to simulate a real UUID - # Testscript need to set the UUID otherwise this empty prefix is used +UUID="" # UUID used as prefix to the policy id to simulate a real UUID + # Testscript need to set the UUID otherwise this empty prefix is used