X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Ftest_env-onap-honolulu.sh;h=54e6fbe92605fc0faed58614e0a552f7b2f9bea4;hb=84ffd4a403baee1b7aa86f9986f0c1659a5a0881;hp=f3c5b5190e87e8357795ac778eba482717eb3a55;hpb=28ea034c54771d3680743f3885c97d6bc9eb7f7b;p=nonrtric.git diff --git a/test/common/test_env-onap-honolulu.sh b/test/common/test_env-onap-honolulu.sh old mode 100644 new mode 100755 index f3c5b519..54e6fbe9 --- a/test/common/test_env-onap-honolulu.sh +++ b/test/common/test_env-onap-honolulu.sh @@ -57,40 +57,48 @@ NEXUS_RELEASE_REPO_ONAP=$NEXUS_RELEASE_REPO # 6 XXX_REMOTE_RELEASE_ONAP: ONAP release images: : # 7 XXX_PROXY: other images, not produced by the project: : +############################################################################# +# Note: +# The imgage tags for pms and sdnc are updated AFTER the release. +# This means that the latest staging/snapshot images for these two components have +# version one step (0.0.1 - bug-level) higher than the +# latest release image version. + +# This is only applicable for ONAP images +############################################################################# + # Policy Agent image and tags POLICY_AGENT_IMAGE_BASE="onap/ccsdk-oran-a1policymanagementservice" -POLICY_AGENT_IMAGE_TAG_LOCAL="1.1.1-SNAPSHOT" -POLICY_AGENT_IMAGE_TAG_REMOTE_SNAPSHOT="1.1.1-SNAPSHOT" -POLICY_AGENT_IMAGE_TAG_REMOTE="1.1.1-STAGING-latest" #Will use snapshot repo +POLICY_AGENT_IMAGE_TAG_LOCAL="1.1.2-SNAPSHOT" +POLICY_AGENT_IMAGE_TAG_REMOTE_SNAPSHOT="1.1.2-SNAPSHOT" +POLICY_AGENT_IMAGE_TAG_REMOTE="1.1.2-STAGING-latest" #Will use snapshot repo POLICY_AGENT_IMAGE_TAG_REMOTE_RELEASE="1.1.1" - # SDNC A1 Controller remote image and tag SDNC_A1_CONTROLLER_IMAGE_BASE="onap/sdnc-image" -SDNC_A1_CONTROLLER_IMAGE_TAG_LOCAL="2.1.1-SNAPSHOT" ###CHECK THIS -SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_SNAPSHOT="2.1.1-STAGING-latest" -SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE="2.1.1-STAGING-latest" #Will use snapshot repo -SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_RELEASE="2.1.1" +SDNC_A1_CONTROLLER_IMAGE_TAG_LOCAL="2.1.7-SNAPSHOT" ###CHECK THIS +SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_SNAPSHOT="2.1.7-STAGING-latest" +SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE="2.1.7-STAGING-latest" #Will use snapshot repo +SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_RELEASE="2.1.6" #SDNC DB remote image and tag #The DB is part of SDNC so handled in the same way as SDNC -SDNC_DB_IMAGE_BASE="mysql/mysql-server" -SDNC_DB_IMAGE_TAG_REMOTE_PROXY="5.6" - +SDNC_DB_IMAGE_BASE="mariadb" +SDNC_DB_IMAGE_TAG_REMOTE_PROXY="10.5" # ECS image and tag - uses cherry release ECS_IMAGE_BASE="o-ran-sc/nonrtric-enrichment-coordinator-service" -ECS_IMAGE_TAG_REMOTE_RELEASE_ORAN="1.0.0" - +ECS_IMAGE_TAG_REMOTE_RELEASE_ORAN="1.0.1" +#Note: Update var ECS_FEATURE_LEVEL if image version is changed # Control Panel image and tag - uses cherry release CONTROL_PANEL_IMAGE_BASE="o-ran-sc/nonrtric-controlpanel" -CONTROL_PANEL_IMAGE_TAG_REMOTE_RELEASE_ORAN="2.1.0" +CONTROL_PANEL_IMAGE_TAG_REMOTE_RELEASE_ORAN="2.1.1" # RAPP Catalogue image and tags - uses cherry release RAPP_CAT_IMAGE_BASE="o-ran-sc/nonrtric-r-app-catalogue" -RAPP_CAT_IMAGE_TAG_REMOTE_RELEASE_ORAN="1.0.0" +RAPP_CAT_IMAGE_TAG_REMOTE_RELEASE_ORAN="1.0.1" # Near RT RIC Simulator image and tags - uses cherry release @@ -129,9 +137,9 @@ 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" -#No local image for SSDNC DB, remote image always used +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" @@ -148,6 +156,10 @@ 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="nodejs-kube-proxy" +KUBE_PROXY_IMAGE_TAG_LOCAL="latest" +#No remote image for kube proxy, local image always used # List of app short names produced by the project PROJECT_IMAGES_APP_NAMES="PA SDNC" @@ -192,6 +204,7 @@ POLICY_AGENT_CONFIG_MOUNT_PATH="/opt/app/policy-agent/config" # Path in containe POLICY_AGENT_DATA_MOUNT_PATH="/opt/app/policy-agent/data" # Path in container for data file 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 @@ -202,7 +215,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" @@ -210,7 +223,8 @@ 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 +ECS_FEATURE_LEVEL="" # Space separated list of features MR_DMAAP_APP_NAME="dmaap-mr" # Name for the Dmaap MR MR_STUB_APP_NAME="mr-stub" # Name of the MR stub @@ -225,10 +239,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 @@ -295,18 +309,25 @@ SDNC_INTERNAL_SECURE_PORT=8443 # SNDC A1 Controller co SDNC_DB_APP_NAME="sdncdb" # Name of the SDNC DB container SDNC_A1_TRUSTSTORE_PASSWORD="a1adapter" # SDNC truststore password SDNC_USER="admin" # SDNC username +SDNC_PWD="admin" # SNDC PWD SDNC_PWD="Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" # SNDC PWD +#SDNC_API_URL="/rests/operations/A1-ADAPTER-API:" # Base url path for SNDC API (for upgraded sdnc) 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" +SDNC_COMPOSE_FILE="docker-compose-2.yml" +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 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 @@ -321,17 +342,37 @@ 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" -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_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