X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Ftest_env.sh;h=391b596ccca6467f2ad2b2623e2ce2a72d7c5a84;hb=caf750c05d1fdac7165b2368f5cc6882517c6390;hp=11c3b6d2c1c5957ae7f571f2d17eb5d10fe7dbf1;hpb=e704d116cf5d97ca5faad93c536901f3351df93f;p=nonrtric.git diff --git a/test/common/test_env.sh b/test/common/test_env.sh index 11c3b6d2..391b596c 100755 --- a/test/common/test_env.sh +++ b/test/common/test_env.sh @@ -25,10 +25,10 @@ # Local Policy Agent image and tag POLICY_AGENT_LOCAL_IMAGE="o-ran-sc/nonrtric-policy-agent" -POLICY_AGENT_LOCAL_IMAGE_TAG="2.0.0-SNAPSHOT" +POLICY_AGENT_LOCAL_IMAGE_TAG="2.1.0-SNAPSHOT" # Remote Policy Agent image and tag POLICY_AGENT_REMOTE_IMAGE="nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-policy-agent" -POLICY_AGENT_REMOTE_IMAGE_TAG="2.0.0" +POLICY_AGENT_REMOTE_IMAGE_TAG="2.1.0" # Control Panel local image and tag @@ -41,10 +41,10 @@ CONTROL_PANEL_REMOTE_IMAGE_TAG="2.0.0" # SDNC A1 Controller local image and tag SDNC_A1_CONTROLLER_LOCAL_IMAGE="o-ran-sc/nonrtric-a1-controller" -SDNC_A1_CONTROLLER_LOCAL_IMAGE_TAG="2.0.0-SNAPSHOT" +SDNC_A1_CONTROLLER_LOCAL_IMAGE_TAG="2.1.0-SNAPSHOT" # SDNC A1 Controller remote image and tag SDNC_A1_CONTROLLER_REMOTE_IMAGE="nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-a1-controller" -SDNC_A1_CONTROLLER_REMOTE_IMAGE_TAG="2.0.0" +SDNC_A1_CONTROLLER_REMOTE_IMAGE_TAG="2.1.0" #SDNC DB remote image and tag @@ -112,11 +112,13 @@ export MR_INTERNAL_PORT=3905 # MR stub contai export MR_EXTERNAL_SECURE_PORT=3906 # MR stub container external secure port (host -> container) export MR_INTERNAL_SECURE_PORT=3906 # MR stub container internal secure port (container -> container) export MR_APP_NAME="message-router" # Name for the MR -export MR_READ_URL="/events/A1-POLICY-AGENT-READ/users/policy-agent" # Path to read messages from MR +export MR_READ_URL="/events/A1-POLICY-AGENT-READ/users/policy-agent?timeout=15000&limit=100" # Path to read messages from MR export MR_WRITE_URL="/events/A1-POLICY-AGENT-WRITE" # Path write messages to MR export CR_EXTERNAL_PORT=8090 # Callback receiver container external port (host -> container) export CR_INTERNAL_PORT=8090 # Callback receiver container internal port (container -> container) +export CR_EXTERNAL_SECURE_PORT=8091 # Callback receiver container external secure port (host -> container) +export CR_INTERNAL_SECURE_PORT=8091 # Callback receiver container internal secure port (container -> container) export CR_APP_NAME="callback-receiver" # Name for the Callback receiver export CONSUL_HOST="consul-server" # Host name of consul @@ -173,6 +175,7 @@ UUID="" # UUID used as p RESTBASE="http://localhost:"$POLICY_AGENT_EXTERNAL_PORT # Base url to the Agent NB REST interface RESTBASE_SECURE="https://localhost:"$POLICY_AGENT_EXTERNAL_SECURE_PORT # Base url to the secure Agent NB REST interface -DMAAPBASE="http://localhost:"$MR_EXTERNAL_PORT # Base url to the Dmaap adapter +DMAAPBASE="http://localhost:"$MR_EXTERNAL_PORT # Base url to the Dmaap adapter, http +DMAAPBASE_SECURE="https://localhost:"$MR_EXTERNAL_SECURE_PORT # Base url to the Dmaap adapter, https ADAPTER=$RESTBASE # Adapter holds the address the agent R-APP interface (REST OR DMAAP) # The values of this var is swiched between the two base url when needed \ No newline at end of file