X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Ftest_env-oran-cherry.sh;h=9039b8d5d04fb87b67d20ecee0510a4913cb2072;hb=cb28fdff6d977773c123db418ab0b5f6861f5335;hp=bc20aba72736de9d08dcf3ab2b22fcf8c2bdbed7;hpb=28ea034c54771d3680743f3885c97d6bc9eb7f7b;p=nonrtric.git diff --git a/test/common/test_env-oran-cherry.sh b/test/common/test_env-oran-cherry.sh index bc20aba7..9039b8d5 100755 --- a/test/common/test_env-oran-cherry.sh +++ b/test/common/test_env-oran-cherry.sh @@ -60,25 +60,25 @@ 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_TAG_LOCAL="2.1.0-SNAPSHOT" -POLICY_AGENT_IMAGE_TAG_REMOTE_SNAPSHOT="2.1.0-SNAPSHOT" -POLICY_AGENT_IMAGE_TAG_REMOTE="2.1.0" -POLICY_AGENT_IMAGE_TAG_REMOTE_RELEASE="2.1.0" +POLICY_AGENT_IMAGE_TAG_LOCAL="2.1.1-SNAPSHOT" +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.0-SNAPSHOT" -ECS_IMAGE_TAG_REMOTE_SNAPSHOT="1.0.0-SNAPSHOT" -ECS_IMAGE_TAG_REMOTE="1.0.0" -ECS_IMAGE_TAG_REMOTE_RELEASE="1.0.0" +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" # Control Panel image and tags CONTROL_PANEL_IMAGE_BASE="o-ran-sc/nonrtric-controlpanel" -CONTROL_PANEL_IMAGE_TAG_LOCAL="2.1.0-SNAPSHOT" -CONTROL_PANEL_IMAGE_TAG_REMOTE_SNAPSHOT="2.1.0-SNAPSHOT" -CONTROL_PANEL_IMAGE_TAG_REMOTE="2.1.0" -CONTROL_PANEL_IMAGE_TAG_REMOTE_RELEASE="2.1.0" +CONTROL_PANEL_IMAGE_TAG_LOCAL="2.1.1-SNAPSHOT" +CONTROL_PANEL_IMAGE_TAG_REMOTE_SNAPSHOT="2.1.1-SNAPSHOT" +CONTROL_PANEL_IMAGE_TAG_REMOTE="2.1.1" +CONTROL_PANEL_IMAGE_TAG_REMOTE_RELEASE="2.1.1" # SDNC A1 Controller image and tags @@ -97,10 +97,10 @@ SDNC_DB_IMAGE_TAG_REMOTE_PROXY="5.6" # RAPP Catalogue image and tags RAPP_CAT_IMAGE_BASE="o-ran-sc/nonrtric-r-app-catalogue" -RAPP_CAT_IMAGE_TAG_LOCAL="1.0.0-SNAPSHOT" -RAPP_CAT_IMAGE_TAG_REMOTE_SNAPSHOT="1.0.0-SNAPSHOT" -RAPP_CAT_IMAGE_TAG_REMOTE="1.0.0" -RAPP_CAT_IMAGE_TAG_REMOTE_RELEASE="1.0.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 @@ -160,6 +160,11 @@ ONAP_DMAAPMR_IMAGE_BASE="onap/dmaap/dmaap-mr" ONAP_DMAAPMR_IMAGE_TAG_REMOTE_RELEASE_ONAP="1.1.18" #No local image for ONAP DMAAP-MR, remote image always used +#Kube proxy remote image and tag +KUBE_PROXY_IMAGE_BASE="mitmproxy/mitmproxy" +KUBE_PROXY_IMAGE_TAG_REMOTE_PROXY="6.0.2" +#No local image for http proxy, remote image always used + # List of app short names produced by the project PROJECT_IMAGES_APP_NAMES="PA ECS CP SDNC RC RICSIM" @@ -186,7 +191,7 @@ POLICY_AGENT_EXTERNAL_SECURE_PORT=8433 # Policy Agent containe POLICY_AGENT_INTERNAL_SECURE_PORT=8433 # Policy Agent container internal secure port (container -> container) POLICY_AGENT_APIS="V1 V2" # Supported northbound api versions PMS_VERSION="V2" # Tested version of northbound API -PMS_API_PREFIX="" # api url prefix, only for V2 +PMS_API_PREFIX="/a1-policy" # api url prefix, only for V2 POLICY_AGENT_APP_NAME="policymanagementservice" # Name for Policy Agent container POLICY_AGENT_DISPLAY_NAME="Policy Management Service" @@ -212,7 +217,7 @@ ECS_INTERNAL_SECURE_PORT=8434 # ECS container interna 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/db" # Mounted dir, relative to compose file, on the host +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" @@ -220,7 +225,7 @@ ECS_ALIVE_URL="/status" # Base path for alive c 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-1" # Version where the types are added in the producer registration +ECS_VERSION="V1-2" # Version where the types are added in the producer registration MR_DMAAP_APP_NAME="dmaap-mr" # Name for the Dmaap MR MR_STUB_APP_NAME="mr-stub" # Name of the MR stub @@ -235,10 +240,10 @@ MR_DMAAP_LOCALHOST_PORT=3904 # MR stub container ext MR_STUB_LOCALHOST_PORT=3908 # MR stub container external port (host -> container) MR_DMAAP_LOCALHOST_SECURE_PORT=3905 # MR stub container internal port (container -> container) MR_STUB_LOCALHOST_SECURE_PORT=3909 # MR stub container external secure port (host -> container) -MR_READ_URL="/events/A1-POLICY-AGENT-READ/users/policy-agent?timeout=15000&limit=100" # Path to read messages from MR -MR_WRITE_URL="/events/A1-POLICY-AGENT-WRITE" # Path write messages to MR MR_READ_TOPIC="A1-POLICY-AGENT-READ" # Read topic MR_WRITE_TOPIC="A1-POLICY-AGENT-WRITE" # Write topic +MR_READ_URL="/events/$MR_READ_TOPIC/users/policy-agent?timeout=15000&limit=100" # Path to read messages from MR +MR_WRITE_URL="/events/$MR_WRITE_TOPIC" # Path to write messages to MR MR_STUB_ALIVE_URL="/" # Base path for mr stub alive check 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 @@ -310,14 +315,17 @@ SDNC_PWD="Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" # SNDC PWD SDNC_API_URL="/restconf/operations/A1-ADAPTER-API:" # Base url path for SNDC API SDNC_ALIVE_URL="/apidoc/explorer/" # Base url path for SNDC API docs (for alive check) SDNC_COMPOSE_DIR="sdnc" # Dir in simulator_group for docker-compose +SDNC_COMPOSE_FILE="docker-compose.yml" +SDNC_KUBE_APP_FILE="app.yaml" SDNC_KARAF_LOG="/opt/opendaylight/data/log/karaf.log" # Path to karaf log +SDNC_RESPONSE_JSON_KEY="output" # Key name for output json in replies from sdnc RAPP_CAT_APP_NAME="rappcatalogueservice" # Name for the RAPP Catalogue RAPP_CAT_DISPLAY_NAME="RAPP Catalogue Service" RAPP_CAT_EXTERNAL_PORT=8680 # RAPP Catalogue container external port (host -> container) -RAPP_CAT_INTERNAL_PORT=8080 # RAPP Catalogue container internal port (container -> container) +RAPP_CAT_INTERNAL_PORT=8680 # RAPP Catalogue container internal port (container -> container) RAPP_CAT_EXTERNAL_SECURE_PORT=8633 # RAPP Catalogue container external secure port (host -> container) -RAPP_CAT_INTERNAL_SECURE_PORT=8433 # RAPP Catalogue container internal secure port (container -> container) +RAPP_CAT_INTERNAL_SECURE_PORT=8633 # RAPP Catalogue container internal secure port (container -> container) RAPP_CAT_ALIVE_URL="/services" # Base path for alive check RAPP_CAT_COMPOSE_DIR="rapp_catalogue" # Dir in simulator_group for docker-compose @@ -332,6 +340,7 @@ CONTROL_PANEL_ALIVE_URL="/" # Base path for alive c CONTROL_PANEL_COMPOSE_DIR="control_panel" # Dir in simulator_group for docker-compose CONTROL_PANEL_CONFIG_MOUNT_PATH=/maven # Container internal path for config CONTROL_PANEL_CONFIG_FILE=application.properties # Config file name +CONTROL_PANEL_HOST_MNT_DIR="./mnt" # Mounted dir, relative to compose file, on the host HTTP_PROXY_APP_NAME="httpproxy" # Name of the Http Proxy container HTTP_PROXY_DISPLAY_NAME="Http Proxy" @@ -344,6 +353,17 @@ HTTP_PROXY_CONFIG_HOST_NAME="" # Proxy host, will be s HTTP_PROXY_ALIVE_URL="/" # Base path for alive check HTTP_PROXY_COMPOSE_DIR="httpproxy" # Dir in simulator_group for docker-compose + +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_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_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 + ######################################## # Setting for common curl-base function ########################################