X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Ftest_env-onap-guilin.sh;h=59acba3a4feac2a466859c71b99d73ee72f30f71;hb=2772b3e52b693924df131a195859ff8e44458bb3;hp=809e1f7c003e9cffba601a2cc0ec0cea8daa88a8;hpb=edea18a8fda2e2201cb3ede7f7af13f610bf4acc;p=nonrtric.git diff --git a/test/common/test_env-onap-guilin.sh b/test/common/test_env-onap-guilin.sh old mode 100644 new mode 100755 index 809e1f7c..59acba3a --- a/test/common/test_env-onap-guilin.sh +++ b/test/common/test_env-onap-guilin.sh @@ -114,8 +114,8 @@ CR_IMAGE_TAG_LOCAL="latest" #No remote image for CR, 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" +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 @@ -134,9 +134,9 @@ 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 +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 @@ -181,6 +181,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 MR_DMAAP_APP_NAME="dmaap-mr" # Name for the Dmaap MR MR_STUB_APP_NAME="mr-stub" # Name of the MR stub @@ -195,10 +196,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 @@ -278,24 +279,31 @@ CONTROL_PANEL_HOST_MNT_DIR="./mnt" # Mounted dir, relative 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_CONFIG_PORT=0 # Port number for proxy config, will be set if proxy is started -KUBE_PROXY_CONFIG_HOST_NAME="" # Proxy host, will be set if proxy is started +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