X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Ftest_env-oran-h-release.sh;h=097f25cfcd9defcba8a13d13ffeea3fed84896ee;hb=refs%2Fchanges%2F88%2F12388%2F5;hp=365c06b8d62331219fb2ad98ba7d5cd4eb972d4a;hpb=7d7cb5f4f6306db8193ebd4e6e110fa0060900fa;p=nonrtric.git diff --git a/test/common/test_env-oran-h-release.sh b/test/common/test_env-oran-h-release.sh index 365c06b8..097f25cf 100755 --- a/test/common/test_env-oran-h-release.sh +++ b/test/common/test_env-oran-h-release.sh @@ -43,7 +43,7 @@ NEXUS_RELEASE_REPO_ORAN=$NEXUS_RELEASE_REPO # The variable is created by removing the suffix "_BASE" from the base image variable name. # 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. +# In addition, the repo and the image tag version are selected from the list of image tags based on the cmd line argument. # For images built by the script, only tag #1 shall be specified # For project images, only tag #1, #2, #3 and #4 shall be specified # For ORAN images (non project), only tag #5 shall be specified @@ -131,7 +131,7 @@ RIC_SIM_IMAGE_TAG_REMOTE_RELEASE="2.5.0" # ORAN Near RT RIC Simulator image and tags RICMEDIATOR_SIM_IMAGE_BASE="o-ran-sc/ric-plt-a1" -RICMEDIATOR_SIM_IMAGE_TAG_REMOTE_RELEASE_ORAN="3.0.1" +RICMEDIATOR_SIM_IMAGE_TAG_REMOTE_RELEASE_ORAN="3.1.1" # ORAN Near RT RIC Simulator DB image and tags RICMEDIATOR_SIM_DB_IMAGE_BASE="o-ran-sc/ric-plt-dbaas" @@ -248,10 +248,10 @@ ONAP_IMAGES_APP_NAMES="DMAAPMR SDNC" # SDNC added as ONAP image # 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 +# special vars named _LOCALHOST_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 overlapping 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, +# For KUBE PROXY there are special external port for docker as the proxy 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 @@ -358,7 +358,7 @@ PROD_STUB_INTERNAL_PORT=8092 # Producer stub contain PROD_STUB_EXTERNAL_SECURE_PORT=8093 # Producer stub container external secure port (host -> container) PROD_STUB_INTERNAL_SECURE_PORT=8093 # Producer stub container internal secure port (container -> container) PROD_STUB_JOB_CALLBACK="/callbacks/job" # Callback path for job create/update/delete -PROD_STUB_SUPERVISION_CALLBACK="/callbacks/supervision" # Callback path for producre supervision +PROD_STUB_SUPERVISION_CALLBACK="/callbacks/supervision" # Callback path for producer supervision PROD_STUB_ALIVE_URL="/" # Base path for alive check PROD_STUB_COMPOSE_DIR="prodstub" # Dir in simulator_group for docker-compose @@ -400,7 +400,7 @@ SDNC_APP_NAME="a1controller" # Name of the SNDC A1 C SDNC_DISPLAY_NAME="SDNC A1 Controller" SDNC_EXTERNAL_PORT=8282 # SNDC A1 Controller container external port (host -> container) SDNC_INTERNAL_PORT=8181 # SNDC A1 Controller container internal port (container -> container) -SDNC_EXTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container external securee port (host -> container) +SDNC_EXTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container external secure port (host -> container) SDNC_INTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container internal secure port (container -> container) SDNC_DB_APP_NAME="sdncdb" # Name of the SDNC DB container SDNC_A1_TRUSTSTORE_PASSWORD="a1adapter" # SDNC truststore password @@ -487,10 +487,10 @@ KUBE_PROXY_WEB_INTERNAL_PORT=8081 # Kube Http Proxy conta 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_DOCKER_EXTERNAL_PORT=8732 # Kube Http Proxy container external port, docker (host -> container) +KUBE_PROXY_DOCKER_EXTERNAL_SECURE_PORT=8784 # Kube Proxy container external secure port, docker (host -> container) +KUBE_PROXY_WEB_DOCKER_EXTERNAL_PORT=8733 # Kube Http Proxy container external port, docker (host -> container) +KUBE_PROXY_WEB_DOCKER_EXTERNAL_SECURE_PORT=8785 # Kube Proxy container external secure port, docker (host -> container) KUBE_PROXY_PATH="" # Proxy url path, will be set if proxy is started KUBE_PROXY_ALIVE_URL="/" # Base path for alive check