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=38839865059853f4f5a67c33c4dec8fccf3a1542;hpb=c488e37b5803ca41d7b8feb4434cb570aae2cd43;p=nonrtric.git diff --git a/test/common/test_env.sh b/test/common/test_env.sh index 38839865..391b596c 100755 --- a/test/common/test_env.sh +++ b/test/common/test_env.sh @@ -25,26 +25,26 @@ # Local Policy Agent image and tag POLICY_AGENT_LOCAL_IMAGE="o-ran-sc/nonrtric-policy-agent" -POLICY_AGENT_LOCAL_IMAGE_TAG="1.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="1.0.0" +POLICY_AGENT_REMOTE_IMAGE_TAG="2.1.0" # Control Panel local image and tag CONTROL_PANEL_LOCAL_IMAGE="o-ran-sc/nonrtric-controlpanel" -CONTROL_PANEL_LOCAL_IMAGE_TAG="1.0.0-SNAPSHOT" +CONTROL_PANEL_LOCAL_IMAGE_TAG="2.0.0-SNAPSHOT" # Control Panel remote image and tag CONTROL_PANEL_REMOTE_IMAGE="nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-controlpanel" -CONTROL_PANEL_REMOTE_IMAGE_TAG="1.0.0" +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="1.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="1.7.4" +SDNC_A1_CONTROLLER_REMOTE_IMAGE_TAG="2.1.0" #SDNC DB remote image and tag @@ -69,10 +69,7 @@ RIC_SIM_LOCAL_IMAGE="nexus3.o-ran-sc.org:10004/o-ran-sc/a1-simulator" RIC_SIM_LOCAL_IMAGE_TAG="latest" # Near RT RIC Simulator remote image and tag RIC_SIM_REMOTE_IMAGE="nexus3.o-ran-sc.org:10004/o-ran-sc/a1-simulator" -RIC_SIM_REMOTE_IMAGE_TAG="1.0.1" - -RIC_SIM_REMOTE_IMAGE="a1test" -RIC_SIM_REMOTE_IMAGE_TAG="latest" +RIC_SIM_REMOTE_IMAGE_TAG="2.0.0" #Consul remote image and tag @@ -115,9 +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?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 @@ -133,6 +134,7 @@ export CONFIG_BINDING_SERVICE="config-binding-service" # Host name of C export RIC_SIM_BASE="g" # Base name of the RIC Simulator container, shall be the group code # Note, a prefix is added to each container name by the .env file in the 'ric' dir RIC_SIM_PREFIX="ricsim" # Prefix added to ric container name, added in the .env file in the 'ric' dir + # This prefix can be changed from the command line export RIC_SIM_INTERNAL_PORT=8085 # RIC Simulator container internal port (container -> container). # (external ports allocated by docker) export RIC_SIM_INTERNAL_SECURE_PORT=8185 # RIC Simulator container internal secure port (container -> container). @@ -141,19 +143,25 @@ export RIC_SIM_INTERNAL_SECURE_PORT=8185 # RIC Simulator export SDNC_APP_NAME="a1-controller" # Name of the SNDC A1 Controller container export SDNC_EXTERNAL_PORT=8282 # SNDC A1 Controller container external port (host -> container) export SDNC_INTERNAL_PORT=8181 # SNDC A1 Controller container internal port (container -> container) +export SDNC_EXTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container external securee port (host -> container) +export SDNC_INTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container internal secure port (container -> container) export SDNC_DB_APP_NAME="sdnc-db" # Name of the SDNC DB container SDNC_USER="admin" # SDNC username 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_KARAF_LOG="/opt/opendaylight/data/log/karaf.log" # Path to karaf log export SDNC_ONAP_APP_NAME="a1-adapter" # Name of the ONAP A1 Adapter container export SDNC_ONAP_EXTERNAL_PORT=8282 # ONAP A1 Adapter container external port (host -> container) export SDNC_ONAP_INTERNAL_PORT=8181 # ONAP A1 Adapter container internal port (container -> container) +export SDNC_ONAP_EXTERNAL_SECURE_PORT=8443 # SNDC A1 Adapter container external securee port (host -> container) +export SDNC_ONAP_INTERNAL_SECURE_PORT=8343 # SNDC A1 Adapter container internal secure port (container -> container) export SDNC_ONAP_DB_APP_NAME="sdnc-onap-db" # Name of the ONAP A1 Adapter DB container SDNC_ONAP_USER="admin" # ONAP A1 Adapter username SDNC_ONAP_PWD="Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" # ONAP A1 Adapter PWD SDNC_ONAP_API_URL="/restconf/operations/A1-ADAPTER-API:" # Base url path for ONAP A1 Adapter API +SDNC_ONAP_ALIVE_URL="/apidoc/explorer/" # Base url path for ONAP A1 Adapter API docs (for alive check) SDNC_ONAP_PROPERTIES_FILE="/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties" SDNC_ONAP_KARAF_LOG="/opt/opendaylight/data/log/karaf.log" # Path to karaf log @@ -162,8 +170,12 @@ export CONTROL_PANEL_EXTERNAL_PORT=8080 # Control Panel export CONTROL_PANEL_INTERNAL_PORT=8080 # Control Panel container external port (host -> container) CONTROL_PANEL_LOGPATH="/logs/nonrtric-controlpanel.log" # Path the application log in the Control Panel container +UUID="" # UUID used as prefix to the policy id to simulate a real UUID + # Testscript need to set the UUID to use other this empty prefix is used + 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