X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Ftest_env-oran-cherry.sh;h=91b153abe911ebe72ec25cbbf1a96e65456303f3;hb=84ffd4a403baee1b7aa86f9986f0c1659a5a0881;hp=9ee0ebd4723329cd3521cd6bfd1d67dc5cbf0a92;hpb=b0cd302e1d3adaec4335226d34a36edc9410fd65;p=nonrtric.git diff --git a/test/common/test_env-oran-cherry.sh b/test/common/test_env-oran-cherry.sh index 9ee0ebd4..91b153ab 100755 --- a/test/common/test_env-oran-cherry.sh +++ b/test/common/test_env-oran-cherry.sh @@ -75,10 +75,10 @@ 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 @@ -141,9 +141,9 @@ PROD_STUB_IMAGE_TAG_LOCAL="latest" #No remote image for producer stub, local image always used #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 Http proxy, 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" @@ -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="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 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" @@ -202,6 +207,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 @@ -220,7 +226,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 @@ -235,10 +242,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 +317,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,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