X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fconsul_api_functions.sh;h=221124b765ab6987b149f81e3c1284c3600b8fbb;hb=d2aeca8843fe3ffca2e73dec5b64daeef0dda938;hp=5adb1144de8dd14ba115d78e532641d5c7c48c4e;hpb=e60d04ec982c4ccb833226624ff5c3e3f311097a;p=nonrtric.git diff --git a/test/common/consul_api_functions.sh b/test/common/consul_api_functions.sh index 5adb1144..221124b7 100644 --- a/test/common/consul_api_functions.sh +++ b/test/common/consul_api_functions.sh @@ -146,7 +146,7 @@ __CBS_store_docker_logs() { : else docker logs $CBS_APP_NAME > $1$2_cbs.log 2>&1 - body="$(__do_curl $LOCALHOST_HTTP:$CBS_EXTERNAL_PORT/service_component_all/$POLICY_AGENT_APP_NAME)" + body="$(__do_curl $LOCALHOST_HTTP:$CBS_EXTERNAL_PORT/service_component_all/$A1PMS_APP_NAME)" echo "$body" > $1$2_consul_config.json 2>&1 fi } @@ -199,7 +199,7 @@ __CBS_test_requirements() { ### Consul functions #################### -# Function to load config from a file into consul for the Policy Agent +# Function to load config from a file into consul for the a1pms # arg: # (Function for test scripts) consul_config_app() { @@ -212,9 +212,9 @@ consul_config_app() { exit 1 fi - echo " Loading config for "$POLICY_AGENT_APP_NAME" from "$1 + echo " Loading config for "$A1PMS_APP_NAME" from "$1 - curlString="$CONSUL_SERVICE_PATH/v1/kv/${POLICY_AGENT_CONFIG_KEY}?dc=dc1 -X PUT -H Accept:application/json -H Content-Type:application/json -H X-Requested-With:XMLHttpRequest --data-binary @"$1 + curlString="$CONSUL_SERVICE_PATH/v1/kv/${A1PMS_CONFIG_KEY}?dc=dc1 -X PUT -H Accept:application/json -H Content-Type:application/json -H X-Requested-With:XMLHttpRequest --data-binary @"$1 result=$(__do_curl "$curlString") if [ $? -ne 0 ]; then @@ -222,7 +222,7 @@ consul_config_app() { ((RES_CONF_FAIL++)) return 1 fi - body="$(__do_curl $CBS_SERVICE_PATH/service_component_all/$POLICY_AGENT_CONFIG_KEY)" + body="$(__do_curl $CBS_SERVICE_PATH/service_component_all/$A1PMS_CONFIG_KEY)" echo $body > "./tmp/.output"$1 if [ $? -ne 0 ]; then