X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Ftest_env-onap-istanbul.sh;h=b2b0d2ed44cf07257c5b93ef17581693b6ea2fa6;hb=09e21f39a3ffcfc2063110bcad028014b0056398;hp=423d3ef6cf3fbd42922ac7a555669cede32fb03d;hpb=c4d4c18bdac10d5ae35f24d8bcd9db2271124c0b;p=nonrtric.git diff --git a/test/common/test_env-onap-istanbul.sh b/test/common/test_env-onap-istanbul.sh index 423d3ef6..b2b0d2ed 100644 --- a/test/common/test_env-onap-istanbul.sh +++ b/test/common/test_env-onap-istanbul.sh @@ -69,39 +69,42 @@ NEXUS_RELEASE_REPO_ONAP=$NEXUS_RELEASE_REPO # Policy Agent image and tags POLICY_AGENT_IMAGE_BASE="onap/ccsdk-oran-a1policymanagementservice" -POLICY_AGENT_IMAGE_TAG_LOCAL="1.2.0-SNAPSHOT" -POLICY_AGENT_IMAGE_TAG_REMOTE_SNAPSHOT="1.2.0-SNAPSHOT" -POLICY_AGENT_IMAGE_TAG_REMOTE="1.2.0-STAGING-latest" #Will use snapshot repo -POLICY_AGENT_IMAGE_TAG_REMOTE_RELEASE="1.2.0" +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" # SDNC A1 Controller remote image and tag SDNC_A1_CONTROLLER_IMAGE_BASE="onap/sdnc-image" -SDNC_A1_CONTROLLER_IMAGE_TAG_LOCAL="2.2.0-SNAPSHOT" ###CHECK THIS -SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_SNAPSHOT="2.2.0-STAGING-latest" -SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE="2.2.0-STAGING-latest" #Will use snapshot repo -SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_RELEASE="2.2.0" +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 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 cherry release +# ECS image and tag - uses d release ECS_IMAGE_BASE="o-ran-sc/nonrtric-enrichment-coordinator-service" -ECS_IMAGE_TAG_REMOTE_RELEASE_ORAN="1.0.1" +ECS_IMAGE_TAG_REMOTE_RELEASE_ORAN="1.1.0" +#Note: Update var ECS_FEATURE_LEVEL if image version is changed - -# Control Panel image and tag - uses cherry release +# Control Panel image and tag - uses d release CONTROL_PANEL_IMAGE_BASE="o-ran-sc/nonrtric-controlpanel" -CONTROL_PANEL_IMAGE_TAG_REMOTE_RELEASE_ORAN="2.1.1" +CONTROL_PANEL_IMAGE_TAG_REMOTE_RELEASE_ORAN="2.2.0" +# Gateway image and tags - uses d release +NRT_GATEWAY_IMAGE_BASE="o-ran-sc/nonrtric-gateway" +NRT_GATEWAY_IMAGE_TAG_REMOTE_RELEASE_ORAN="1.0.0" -# RAPP Catalogue image and tags - uses cherry release +# RAPP Catalogue image and tags - uses d release RAPP_CAT_IMAGE_BASE="o-ran-sc/nonrtric-r-app-catalogue" RAPP_CAT_IMAGE_TAG_REMOTE_RELEASE_ORAN="1.0.1" -# Near RT RIC Simulator image and tags - uses cherry release +# Near RT RIC Simulator image and tags - uses d release RIC_SIM_IMAGE_BASE="o-ran-sc/a1-simulator" RIC_SIM_IMAGE_TAG_REMOTE_RELEASE_ORAN="2.1.0" @@ -137,35 +140,40 @@ PROD_STUB_IMAGE_TAG_LOCAL="latest" #Http proxy remote image and tag -HTTP_PROXY_IMAGE_BASE="mitmproxy/mitmproxy" -HTTP_PROXY_IMAGE_TAG_REMOTE_PROXY="6.0.2" +HTTP_PROXY_IMAGE_BASE="nodejs-http-proxy" +HTTP_PROXY_IMAGE_TAG_LOCAL="latest" #No local image for http proxy, remote image always used #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 -KUBE_PROXY_IMAGE_BASE="nodejs-http-proxy" +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 SDNC" # List of app short names which images pulled from ORAN -ORAN_IMAGES_APP_NAMES="CP ECS RICSIM RC" +ORAN_IMAGES_APP_NAMES="CP ECS RICSIM RC NGW" # List of app short names which images pulled from ONAP ONAP_IMAGES_APP_NAMES="" # Not used @@ -180,7 +188,9 @@ DOCKER_SIM_NWNAME="nonrtric-docker-net" # Name of docker privat 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) @@ -224,8 +234,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 added in the producer registration +ECS_FEATURE_LEVEL="INFO-TYPES" # 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" @@ -246,8 +257,14 @@ 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_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="/configs1" # Config files dir on localhost CR_APP_NAME="callback-receiver" # Name for the Callback receiver CR_DISPLAY_NAME="Callback Reciever" @@ -257,7 +274,9 @@ CR_EXTERNAL_SECURE_PORT=8091 # Callback receiver con CR_INTERNAL_SECURE_PORT=8091 # Callback receiver container internal secure port (container -> container) CR_APP_NAME="callback-receiver" # Name for the Callback receiver CR_APP_CALLBACK="/callbacks" # Url for callbacks -CR_ALIVE_URL="/" # Base path for alive check +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="/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 @@ -319,6 +338,8 @@ 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="TRANS_RESP_CODE" # Space separated list of features + # TRANS_RESP_CODE: SDNC return southbound response code RAPP_CAT_APP_NAME="rappcatalogueservice" # Name for the RAPP Catalogue RAPP_CAT_DISPLAY_NAME="RAPP Catalogue Service" @@ -342,28 +363,61 @@ CONTROL_PANEL_CONFIG_MOUNT_PATH=/maven # Container internal pa CONTROL_PANEL_CONFIG_FILE=application.properties # Config file name CONTROL_PANEL_HOST_MNT_DIR="./mnt" # Mounted dir, relative to compose file, on the host +NRT_GATEWAY_APP_NAME="nonrtricgateway" # Name of the Gateway container +NRT_GATEWAY_DISPLAY_NAME="NonRT-RIC Gateway" +NRT_GATEWAY_EXTERNAL_PORT=9090 # Gateway container external port (host -> container) +NRT_GATEWAY_INTERNAL_PORT=9090 # Gateway container internal port (container -> container) +NRT_GATEWAY_EXTERNAL_SECURE_PORT=9091 # Gateway container external port (host -> container) +NRT_GATEWAY_INTERNAL_SECURE_PORT=9091 # Gateway container internal port (container -> container) +NRT_GATEWAY_LOGPATH="/var/log/nonrtric-gateway/application.log" # Path the application log in the Gateway container +NRT_GATEWAY_HOST_MNT_DIR="./mnt" # Mounted dir, relative to compose file, on the host +NRT_GATEWAY_ALIVE_URL="/actuator/metrics" # Base path for alive check +NRT_GATEWAY_COMPOSE_DIR="ngw" # Dir in simulator_group for docker-compose +NRT_GATEWAY_CONFIG_MOUNT_PATH=/opt/app/nonrtric-gateway/config # Container internal path for config +NRT_GATEWAY_CONFIG_FILE=application.yaml # Config file name +NRT_GATEWAY_PKG_NAME="org.springframework.cloud.gateway" # Java base package name +NRT_GATEWAY_ACTUATOR="/actuator/loggers/$NRT_GATEWAY_PKG_NAME" # Url for trace/debug + HTTP_PROXY_APP_NAME="httpproxy" # Name of the Http Proxy container HTTP_PROXY_DISPLAY_NAME="Http Proxy" -HTTP_PROXY_EXTERNAL_PORT=8780 # Http Proxy container external port (host -> container) +HTTP_PROXY_EXTERNAL_PORT=8740 # Http Proxy container external port (host -> container) HTTP_PROXY_INTERNAL_PORT=8080 # Http Proxy container internal port (container -> container) -HTTP_PROXY_WEB_EXTERNAL_PORT=8781 # Http Proxy container external port (host -> container) +HTTP_PROXY_EXTERNAL_SECURE_PORT=8742 # Http Proxy container external secure port (host -> container) +HTTP_PROXY_INTERNAL_SECURE_PORT=8433 # Http Proxy container internal secure port (container -> container) +HTTP_PROXY_WEB_EXTERNAL_PORT=8741 # Http Proxy container external port (host -> container) HTTP_PROXY_WEB_INTERNAL_PORT=8081 # Http Proxy container internal port (container -> container) +HTTP_PROXY_WEB_EXTERNAL_SECURE_PORT=8743 # Http Proxy container external secure port (host -> container) +HTTP_PROXY_WEB_INTERNAL_SECURE_PORT=8434 # Http Proxy container internal secure port (container -> container HTTP_PROXY_CONFIG_PORT=0 # Port number for proxy config, will be set if proxy is started HTTP_PROXY_CONFIG_HOST_NAME="" # Proxy host, will be set if proxy is started HTTP_PROXY_ALIVE_URL="/" # Base path for alive check HTTP_PROXY_COMPOSE_DIR="httpproxy" # Dir in simulator_group for docker-compose - +HTTP_PROXY_BUILD_DIR="http-https-proxy" # Dir in simulator_group for image build - note, reuses source from kubeproxy KUBE_PROXY_APP_NAME="kubeproxy" # Name of the Kube Http Proxy container KUBE_PROXY_DISPLAY_NAME="Kube Http Proxy" KUBE_PROXY_EXTERNAL_PORT=8730 # Kube Http Proxy container external port (host -> container) KUBE_PROXY_INTERNAL_PORT=8080 # Kube Http Proxy container internal port (container -> container) +KUBE_PROXY_EXTERNAL_SECURE_PORT=8782 # Kube Proxy container external secure port (host -> container) +KUBE_PROXY_INTERNAL_SECURE_PORT=8433 # Kube Proxy container internal secure port (container -> container) KUBE_PROXY_WEB_EXTERNAL_PORT=8731 # Kube Http Proxy container external port (host -> container) 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 + ######################################## # Setting for common curl-base function ########################################