X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fprodstub_api_functions.sh;h=9af00d8d65a512404a00fa6fef0613795341a00a;hb=cb6113ef6f7519274d6420c649f714818dd68b23;hp=8aae95a2b87b206f1c063fd833f7f2796219846a;hpb=00fd1e7bdea32ecef53f99b5e94541350af27504;p=nonrtric.git diff --git a/test/common/prodstub_api_functions.sh b/test/common/prodstub_api_functions.sh index 8aae95a2..9af00d8d 100644 --- a/test/common/prodstub_api_functions.sh +++ b/test/common/prodstub_api_functions.sh @@ -93,58 +93,67 @@ __PRODSTUB_kube_delete_all() { # This function is called for apps managed by the test script. # args: __PRODSTUB_store_docker_logs() { - docker logs $PROD_STUB_APP_NAME > $1$2_prodstub.log 2>&1 + if [ $RUNMODE == "KUBE" ]; then + kubectl $KUBECONF logs -l "autotest=PRODSTUB" -n $KUBE_SIM_NAMESPACE --tail=-1 > $1$2_prodstub.log 2>&1 + else + docker logs $PROD_STUB_APP_NAME > $1$2_prodstub.log 2>&1 + fi } -####################################################### - -## Access to Prod stub sim -# Direct access -PROD_STUB_HTTPX="http" -PROD_STUB_HOST_NAME=$LOCALHOST_NAME -PROD_STUB_PATH=$PROD_STUB_HTTPX"://"$PROD_STUB_HOST_NAME":"$PROD_STUB_EXTERNAL_PORT - -#Docker/Kube internal path -if [ $RUNMODE == "KUBE" ]; then - PROD_STUB_SERVICE_PATH=$PROD_STUB_HTTPX"://"$PROD_STUB_APP_NAME"."$KUBE_SIM_NAMESPACE":"$PROD_STUB_EXTERNAL_PORT -else - PROD_STUB_SERVICE_PATH=$PROD_STUB_HTTPX"://"$PROD_STUB_APP_NAME":"$PROD_STUB_INTERNAL_PORT -fi - -# Set http as the protocol to use for all communication to the Producer stub +# Initial setup of protocol, host and ports +# This function is called for apps managed by the test script. # args: - -# (Function for test scripts) -use_prod_stub_http() { - echo -e $BOLD"Producer stub protocol setting"$EBOLD - echo -e " Using $BOLD http $EBOLD towards Producer stub" - - PROD_STUB_HTTPX="http" - PROD_STUB_PATH=$PROD_STUB_HTTPX"://"$PROD_STUB_HOST_NAME":"$PROD_STUB_EXTERNAL_PORT +__PRODSTUB_initial_setup() { + use_prod_stub_http +} +# Set app short-name, app name and namespace for logging runtime statistics of kubernets pods or docker containers +# For docker, the namespace shall be excluded +# This function is called for apps managed by the test script as well as for prestarted apps. +# args: - +__PRODSTUB_statisics_setup() { if [ $RUNMODE == "KUBE" ]; then - PROD_STUB_SERVICE_PATH=$PROD_STUB_HTTPX"://"$PROD_STUB_APP_NAME"."$KUBE_SIM_NAMESPACE":"$PROD_STUB_EXTERNAL_PORT + echo "PRODSTUB $PROD_STUB_APP_NAME $KUBE_SIM_NAMESPACE" else - PROD_STUB_SERVICE_PATH=$PROD_STUB_HTTPX"://"$PROD_STUB_APP_NAME":"$PROD_STUB_INTERNAL_PORT + echo "PRODSTUB $PROD_STUB_APP_NAME" fi +} - echo "" +# Check application requirements, e.g. helm, the the test needs. Exit 1 if req not satisfied +# args: - +__PRODSTUB_test_requirements() { + : } -# Set https as the protocol to use for all communication to the Producer stub +####################################################### + +# Set http as the protocol to use for all communication to the Prod stub sim +# args: - +# (Function for test scripts) +use_prod_stub_http() { + __prod_stub_set_protocoll "http" $PROD_STUB_INTERNAL_PORT $PROD_STUB_EXTERNAL_PORT +} + +# Set https as the protocol to use for all communication to the Prod stub sim # args: - # (Function for test scripts) use_prod_stub_https() { - echo -e $BOLD"Producer stub protocol setting"$EBOLD - echo -e " Using $BOLD https $EBOLD towards Producer stub" + __prod_stub_set_protocoll "https" $PROD_STUB_INTERNAL_SECURE_PORT $PROD_STUB_EXTERNAL_SECURE_PORT +} - PROD_STUB_HTTPX="https" - PROD_STUB_PATH=$PROD_STUB_HTTPX"://"$PROD_STUB_HOST_NAME":"$PROD_STUB_EXTERNAL_SECURE_PORT +# Setup paths to svc/container for internal and external access +# args: +__prod_stub_set_protocoll() { + echo -e $BOLD"$PROD_STUB_DISPLAY_NAME protocol setting"$EBOLD + echo -e " Using $BOLD $1 $EBOLD towards $PROD_STUB_DISPLAY_NAME" + ## Access to Prod stub sim + + PROD_STUB_SERVICE_PATH=$1"://"$PROD_STUB_APP_NAME":"$2 # docker access, container->container and script->container via proxy if [ $RUNMODE == "KUBE" ]; then - PROD_STUB_SERVICE_PATH=$PROD_STUB_HTTPX"://"$PROD_STUB_APP_NAME"."$KUBE_SIM_NAMESPACE":"$PROD_STUB_EXTERNAL_SECURE_PORT - else - PROD_STUB_SERVICE_PATH=$PROD_STUB_HTTPX"://"$PROD_STUB_APP_NAME":"$PROD_STUB_INTERNAL_SECURE_PORT + PROD_STUB_SERVICE_PATH=$1"://"$PROD_STUB_APP_NAME.$KUBE_SIM_NAMESPACE":"$3 # kube access, pod->svc and script->svc via proxy fi + echo "" } @@ -154,6 +163,23 @@ use_prod_stub_https() { ### Producer stub functions ########################### +# Export env vars for config files, docker compose and kube resources +# args: +__prodstub_export_vars() { + export PROD_STUB_APP_NAME + export PROD_STUB_DISPLAY_NAME + + export DOCKER_SIM_NWNAME + export KUBE_SIM_NAMESPACE + + export PROD_STUB_IMAGE + export PROD_STUB_INTERNAL_PORT + export PROD_STUB_INTERNAL_SECURE_PORT + export PROD_STUB_EXTERNAL_PORT + export PROD_STUB_EXTERNAL_SECURE_PORT +} + + # Start the Producer stub in the simulator group # args: - # (Function for test scripts) @@ -172,13 +198,13 @@ start_prod_stub() { retcode_p=$? if [ $retcode_i -ne 0 ] && [ $retcode_p -ne 0 ]; then - echo -e $RED"The $ECS_APP_NAME app is not included as managed nor prestarted in this test script"$ERED - echo -e $RED"The $ECS_APP_NAME will not be started"$ERED + echo -e $RED"The $PROD_STUB_APP_NAME app is not included as managed nor prestarted in this test script"$ERED + echo -e $RED"The $PROD_STUB_APP_NAME will not be started"$ERED exit fi if [ $retcode_i -eq 0 ] && [ $retcode_p -eq 0 ]; then - echo -e $RED"The $ECS_APP_NAME app is included both as managed and prestarted in this test script"$ERED - echo -e $RED"The $ECS_APP_NAME will not be started"$ERED + echo -e $RED"The $PROD_STUB_APP_NAME app is included both as managed and prestarted in this test script"$ERED + echo -e $RED"The $PROD_STUB_APP_NAME will not be started"$ERED exit fi @@ -190,16 +216,11 @@ start_prod_stub() { if [ $retcode_i -eq 0 ]; then echo -e " Creating $PROD_STUB_APP_NAME deployment and service" - export PROD_STUB_APP_NAME - export KUBE_SIM_NAMESPACE - export PROD_STUB_IMAGE - export PROD_STUB_INTERNAL_PORT - export PROD_STUB_INTERNAL_SECURE_PORT - export PROD_STUB_EXTERNAL_PORT - export PROD_STUB_EXTERNAL_SECURE_PORT __kube_create_namespace $KUBE_SIM_NAMESPACE + __prodstub_export_vars + # Create service input_yaml=$SIM_GROUP"/"$PROD_STUB_COMPOSE_DIR"/"svc.yaml output_yaml=$PWD/tmp/prodstub_svc.yaml @@ -211,24 +232,10 @@ start_prod_stub() { __kube_create_instance app $PROD_STUB_APP_NAME $input_yaml $output_yaml fi - PROD_STUB_HOST_NAME=$(__kube_get_service_host $PROD_STUB_APP_NAME $KUBE_SIM_NAMESPACE) - - PROD_STUB_EXTERNAL_PORT=$(__kube_get_service_port $PROD_STUB_APP_NAME $KUBE_SIM_NAMESPACE "http") - PROD_STUB_EXTERNAL_SECURE_PORT=$(__kube_get_service_port $PROD_STUB_APP_NAME $KUBE_SIM_NAMESPACE "https") - - echo " Host IP, http port, https port: $PROD_STUB_HOST_NAME $PROD_STUB_EXTERNAL_PORT $PROD_STUB_EXTERNAL_SECURE_PORT" - if [ $PROD_STUB_HTTPX == "http" ]; then - PROD_STUB_PATH=$PROD_STUB_HTTPX"://"$PROD_STUB_HOST_NAME":"$PROD_STUB_EXTERNAL_PORT - PROD_STUB_SERVICE_PATH=$PROD_STUB_HTTPX"://"$PROD_STUB_APP_NAME"."$KUBE_SIM_NAMESPACE":"$PROD_STUB_EXTERNAL_PORT - else - PROD_STUB_PATH=$PROD_STUB_HTTPX"://"$PROD_STUB_HOST_NAME":"$PROD_STUB_EXTERNAL_SECURE_PORT - PROD_STUB_SERVICE_PATH=$PROD_STUB_HTTPX"://"$PROD_STUB_APP_NAME"."$KUBE_SIM_NAMESPACE":"$PROD_STUB_EXTERNAL_SECURE_PORT - fi - - __check_service_start $PROD_STUB_APP_NAME $PROD_STUB_PATH$PROD_STUB_ALIVE_URL + __check_service_start $PROD_STUB_APP_NAME $PROD_STUB_SERVICE_PATH$PROD_STUB_ALIVE_URL echo -ne " Service $PROD_STUB_APP_NAME - reset "$SAMELINE - result=$(__do_curl $PROD_STUB_PATH/reset) + result=$(__do_curl $PROD_STUB_SERVICE_PATH/reset) if [ $? -ne 0 ]; then echo -e " Service $PROD_STUB_APP_NAME - reset $RED Failed $ERED - will continue" else @@ -244,19 +251,11 @@ start_prod_stub() { exit fi - export PROD_STUB_APP_NAME - export PROD_STUB_APP_NAME_ALIAS - export PROD_STUB_INTERNAL_PORT - export PROD_STUB_EXTERNAL_PORT - export PROD_STUB_INTERNAL_SECURE_PORT - export PROD_STUB_EXTERNAL_SECURE_PORT - export DOCKER_SIM_NWNAME - - export PROD_STUB_DISPLAY_NAME + __prodstub_export_vars __start_container $PROD_STUB_COMPOSE_DIR "" NODOCKERARGS 1 $PROD_STUB_APP_NAME - __check_service_start $PROD_STUB_APP_NAME $PROD_STUB_PATH$PROD_STUB_ALIVE_URL + __check_service_start $PROD_STUB_APP_NAME $PROD_STUB_SERVICE_PATH$PROD_STUB_ALIVE_URL fi echo "" return 0 @@ -268,13 +267,11 @@ __execute_curl_to_prodstub() { TIMESTAMP=$(date "+%Y-%m-%d %H:%M:%S") echo "(${BASH_LINENO[0]}) - ${TIMESTAMP}: ${FUNCNAME[0]}" $@ >> $HTTPLOG proxyflag="" - if [ $RUNMODE == "KUBE" ]; then - if [ ! -z "$KUBE_PROXY_PATH" ]; then - if [ $KUBE_PROXY_HTTPX == "http" ]; then - proxyflag=" --proxy $KUBE_PROXY_PATH" - else - proxyflag=" --proxy-insecure --proxy $KUBE_PROXY_PATH" - fi + if [ ! -z "$KUBE_PROXY_PATH" ]; then + if [ $KUBE_PROXY_HTTPX == "http" ]; then + proxyflag=" --proxy $KUBE_PROXY_PATH" + else + proxyflag=" --proxy-insecure --proxy $KUBE_PROXY_PATH" fi fi echo " CMD: $3 $proxyflag" >> $HTTPLOG @@ -326,7 +323,7 @@ prodstub_arm_producer() { return 1 fi - curlString="curl -X PUT -skw %{http_code} $PROD_STUB_PATH/arm/supervision/"$2 + curlString="curl -X PUT -skw %{http_code} $PROD_STUB_SERVICE_PATH/arm/supervision/"$2 if [ $# -eq 3 ]; then curlString=$curlString"?response="$3 fi @@ -345,7 +342,7 @@ prodstub_arm_job_create() { return 1 fi - curlString="curl -X PUT -skw %{http_code} $PROD_STUB_PATH/arm/create/$2/$3" + curlString="curl -X PUT -skw %{http_code} $PROD_STUB_SERVICE_PATH/arm/create/$2/$3" if [ $# -eq 4 ]; then curlString=$curlString"?response="$4 fi @@ -364,7 +361,7 @@ prodstub_arm_job_delete() { return 1 fi - curlString="curl -X PUT -skw %{http_code} $PROD_STUB_PATH/arm/delete/$2/$3" + curlString="curl -X PUT -skw %{http_code} $PROD_STUB_SERVICE_PATH/arm/delete/$2/$3" if [ $# -eq 4 ]; then curlString=$curlString"?response="$4 fi @@ -383,7 +380,7 @@ prodstub_arm_type() { return 1 fi - curlString="curl -X PUT -skw %{http_code} $PROD_STUB_PATH/arm/type/$2/$3" + curlString="curl -X PUT -skw %{http_code} $PROD_STUB_SERVICE_PATH/arm/type/$2/$3" __execute_curl_to_prodstub CONF $1 "$curlString" return $? @@ -399,7 +396,7 @@ prodstub_disarm_type() { return 1 fi - curlString="curl -X DELETE -skw %{http_code} $PROD_STUB_PATH/arm/type/$2/$3" + curlString="curl -X DELETE -skw %{http_code} $PROD_STUB_SERVICE_PATH/arm/type/$2/$3" __execute_curl_to_prodstub CONF $1 "$curlString" return $? @@ -418,14 +415,14 @@ prodstub_check_jobdata() { jobfile=$(cat $7) jobfile=$(echo "$jobfile" | sed "s/XXXX/$3/g") else - _log_test_fail_general "Template file "$7" for jobdata, does not exist" + __log_test_fail_general "Template file "$7" for jobdata, does not exist" return 1 fi targetJson="{\"ei_job_identity\":\"$3\",\"ei_type_identity\":\"$4\",\"target_uri\":\"$5\",\"owner\":\"$6\", \"ei_job_data\":$jobfile}" file="./tmp/.p.json" echo "$targetJson" > $file - curlString="curl -X GET -skw %{http_code} $PROD_STUB_PATH/jobdata/$2/$3" + curlString="curl -X GET -skw %{http_code} $PROD_STUB_SERVICE_PATH/jobdata/$2/$3" __execute_curl_to_prodstub TEST $1 "$curlString" $file return $? @@ -444,14 +441,44 @@ prodstub_check_jobdata_2() { jobfile=$(cat $7) jobfile=$(echo "$jobfile" | sed "s/XXXX/$3/g") else - _log_test_fail_general "Template file "$7" for jobdata, does not exist" + __log_test_fail_general "Template file "$7" for jobdata, does not exist" + return 1 + fi + if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then + targetJson="{\"info_job_identity\":\"$3\",\"info_type_identity\":\"$4\",\"target_uri\":\"$5\",\"owner\":\"$6\", \"info_job_data\":$jobfile,\"last_updated\":\"????\"}" + else + targetJson="{\"ei_job_identity\":\"$3\",\"ei_type_identity\":\"$4\",\"target_uri\":\"$5\",\"owner\":\"$6\", \"ei_job_data\":$jobfile,\"last_updated\":\"????\"}" + fi + file="./tmp/.p.json" + echo "$targetJson" > $file + + curlString="curl -X GET -skw %{http_code} $PROD_STUB_SERVICE_PATH/jobdata/$2/$3" + + __execute_curl_to_prodstub TEST $1 "$curlString" $file + return $? +} + +# Prodstub API: Get job data for a job and compare with a target job json (info-jobs) +# +# (Function for test scripts) +prodstub_check_jobdata_3() { + __log_test_start $@ + if [ $# -ne 7 ]; then + __print_err " " $@ + return 1 + fi + if [ -f $7 ]; then + jobfile=$(cat $7) + jobfile=$(echo "$jobfile" | sed "s/XXXX/$3/g") + else + __log_test_fail_general "Template file "$7" for jobdata, does not exist" return 1 fi - targetJson="{\"ei_job_identity\":\"$3\",\"ei_type_identity\":\"$4\",\"target_uri\":\"$5\",\"owner\":\"$6\", \"ei_job_data\":$jobfile,\"last_updated\":\"????\"}" + targetJson="{\"info_job_identity\":\"$3\",\"info_type_identity\":\"$4\",\"target_uri\":\"$5\",\"owner\":\"$6\", \"info_job_data\":$jobfile,\"last_updated\":\"????\"}" file="./tmp/.p.json" echo "$targetJson" > $file - curlString="curl -X GET -skw %{http_code} $PROD_STUB_PATH/jobdata/$2/$3" + curlString="curl -X GET -skw %{http_code} $PROD_STUB_SERVICE_PATH/jobdata/$2/$3" __execute_curl_to_prodstub TEST $1 "$curlString" $file return $? @@ -466,7 +493,7 @@ prodstub_delete_jobdata() { __print_err " " $@ return 1 fi - curlString="curl -X DELETE -skw %{http_code} $PROD_STUB_PATH/jobdata/$2/$3" + curlString="curl -X DELETE -skw %{http_code} $PROD_STUB_SERVICE_PATH/jobdata/$2/$3" __execute_curl_to_prodstub CONF $1 "$curlString" return $? @@ -481,7 +508,7 @@ prodstub_delete_jobdata() { # (Function for test scripts) prodstub_equal() { if [ $# -eq 2 ] || [ $# -eq 3 ]; then - __var_test "PRODSTUB" "$PROD_STUB_PATH/counter/" $1 "=" $2 $3 + __var_test "PRODSTUB" "$PROD_STUB_SERVICE_PATH/counter/" $1 "=" $2 $3 else __print_err "Wrong args to prodstub_equal, needs two or three args: [ timeout ]" $@ fi