X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fcr_api_functions.sh;h=a29d010f8a09cbcc63e3ce17380e5bf9bf01bbef;hb=f81090f8f5f1fd1a76bb9feab1f41f03252297c3;hp=a9acd6e5d12f61e6e71f74342b886cb0687fbb68;hpb=a28a4ad261601976c345425692116e5d7250b810;p=nonrtric.git diff --git a/test/common/cr_api_functions.sh b/test/common/cr_api_functions.sh index a9acd6e5..a29d010f 100644 --- a/test/common/cr_api_functions.sh +++ b/test/common/cr_api_functions.sh @@ -94,8 +94,8 @@ __CR_kube_delete_all() { # args: __CR_store_docker_logs() { if [ $RUNMODE == "KUBE" ]; then - for podname in $(kubectl get pods -n $KUBE_SIM_NAMESPACE -l "autotest=CR" -o custom-columns=":metadata.name"); do - kubectl logs -n $KUBE_SIM_NAMESPACE $podname --tail=-1 > $1$2_$podname.log 2>&1 + for podname in $(kubectl $KUBECONF get pods -n $KUBE_SIM_NAMESPACE -l "autotest=CR" -o custom-columns=":metadata.name"); do + kubectl $KUBECONF logs -n $KUBE_SIM_NAMESPACE $podname --tail=-1 > $1$2_$podname.log 2>&1 done else crs=$(docker ps --filter "name=$CR_APP_NAME" --filter "network=$DOCKER_SIM_NWNAME" --filter "status=running" --format {{.Names}}) @@ -122,11 +122,21 @@ __CR_statisics_setup() { CR_INSTANCE_KUBE=$(($CR_INSTANCE-1)) echo -n " CR-$CR_INSTANCE_KUBE $CR_APP_NAME-$CR_INSTANCE_KUBE $KUBE_SIM_NAMESPACE " else - echo -n " CR_$CR_INSTANCE ${CR_APP_NAME}_cr_$CR_INSTANCE " + if [ $DOCKER_COMPOSE_VERSION == "V1" ]; then + echo -n " CR_$CR_INSTANCE ${CR_APP_NAME}_cr_$CR_INSTANCE " + else + echo -n " CR_$CR_INSTANCE ${CR_APP_NAME}-cr-$CR_INSTANCE " + fi fi done } +# Check application requirements, e.g. helm, the the test needs. Exit 1 if req not satisfied +# args: - +__CR_test_requirements() { + : +} + ####################################################### ################ @@ -156,12 +166,16 @@ use_cr_https() { __cr_set_protocoll() { echo -e $BOLD"$CR_DISPLAY_NAME protocol setting"$EBOLD - echo -e " Using $BOLD http $EBOLD towards $CR_DISPLAY_NAME" + echo -e " Using $BOLD $1 $EBOLD towards $CR_DISPLAY_NAME" ## Access to Dmaap adapter for ((CR_INSTANCE=0; CR_INSTANCE<$MAX_CR_APP_COUNT; CR_INSTANCE++ )); do CR_DOCKER_INSTANCE=$(($CR_INSTANCE+1)) # CR_SERVICE_PATH is the base path to cr - __CR_SERVICE_PATH=$1"://"$CR_APP_NAME"_cr_"${CR_DOCKER_INSTANCE}":"$2 # docker access, container->container and script->container via proxy + if [ $DOCKER_COMPOSE_VERSION == "V1" ]; then + __CR_SERVICE_PATH=$1"://"$CR_APP_NAME"_cr_"${CR_DOCKER_INSTANCE}":"$2 # docker access, container->container and script->container via proxy + else + __CR_SERVICE_PATH=$1"://"$CR_APP_NAME"-cr-"${CR_DOCKER_INSTANCE}":"$2 # docker access, container->container and script->container via proxy + fi if [ $RUNMODE == "KUBE" ]; then __CR_SERVICE_PATH=$1"://"$CR_APP_NAME"-"$CR_INSTANCE.$CR_APP_NAME"."$KUBE_SIM_NAMESPACE":"$3 # kube access, pod->svc and script->svc via proxy fi @@ -285,7 +299,11 @@ start_cr() { app_data="" cntr=1 while [ $cntr -le $CR_APP_COUNT ]; do - app=$CR_APP_NAME"_cr_"$cntr + if [ $DOCKER_COMPOSE_VERSION == "V1" ]; then + app=$CR_APP_NAME"_cr_"$cntr + else + app=$CR_APP_NAME"-cr-"$cntr + fi app_data="$app_data $app" let cntr=cntr+1 done @@ -297,7 +315,11 @@ start_cr() { cntr=1 #Counter for docker instance, starts on 1 cntr2=0 #Couter for env var name, starts with 0 to be compablible with kube while [ $cntr -le $CR_APP_COUNT ]; do - app=$CR_APP_NAME"_cr_"$cntr + if [ $DOCKER_COMPOSE_VERSION == "V1" ]; then + app=$CR_APP_NAME"_cr_"$cntr + else + app=$CR_APP_NAME"-cr-"$cntr + fi __dynvar="CR_SERVICE_PATH_"$cntr2 __check_service_start $app ${!__dynvar}$CR_ALIVE_URL let cntr=cntr+1 @@ -345,6 +367,27 @@ cr_equal() { fi } +# Tests if a variable value in the CR is equal to or greater than the target value and and optional timeout. +# Arg: - This test set pass or fail depending on if the variable is +# equal to the target or not. +# Arg: - This test waits up to the timeout seconds +# before setting pass or fail depending on if the variable value becomes equal to or greater than the target +# value or not. +# (Function for test scripts) +cr_greater_or_equal() { + if [ $# -eq 3 ] || [ $# -eq 4 ]; then + CR_SERVICE_PATH=$(__cr_get_service_path $1) + CR_ADAPTER=$CR_SERVICE_PATH + if [ $? -ne 0 ]; then + __print_err " missing or incorrect" $@ + return 1 + fi + __var_test "CR" "$CR_SERVICE_PATH/counter/" $2 ">=" $3 $4 + else + __print_err "Wrong args to cr_equal, needs three or four args: [ timeout ]" $@ + fi +} + # Tests if a variable value in the CR contains the target string and and optional timeout # Arg: - This test set pass or fail depending on if the variable contains # the target or not. @@ -369,7 +412,7 @@ cr_contains_str() { fi } -# Read a variable value from CR sim and send to stdout. Arg: +# Read a variable value from CR sim and send to stdout. Arg: cr_read() { CR_SERVICE_PATH=$(__cr_get_service_path $1) CR_ADAPTER=$CR_SERVICE_PATH @@ -377,7 +420,7 @@ cr_read() { __print_err " missing or incorrect" $@ return 1 fi - echo "$(__do_curl $CR_SERVICE_PATH/counter/$1)" + echo "$(__do_curl $CR_SERVICE_PATH/counter/$2)" } # Function to configure write delay on callbacks @@ -411,13 +454,13 @@ cr_delay_callback() { return 0 } -# CR API: Check the contents of all current ric sync events for one id from PMS +# CR API: Check the contents of all current ric sync events for one id from A1PMS # [ EMPTY | ( )+ ] # (Function for test scripts) cr_api_check_all_sync_events() { __log_test_start $@ - if [ "$PMS_VERSION" != "V2" ]; then + if [ "$A1PMS_VERSION" != "V2" ]; then __log_test_fail_not_supported return 1 fi @@ -473,10 +516,10 @@ cr_api_check_all_sync_events() { return 0 } -# CR API: Check the contents of all current status events for one id from ECS +# CR API: Check the contents of all current status events for one id from ICS # [ EMPTY | ( )+ ] # (Function for test scripts) -cr_api_check_all_ecs_events() { +cr_api_check_all_ics_events() { __log_test_start $@ if [ $# -lt 3 ]; then @@ -530,10 +573,10 @@ cr_api_check_all_ecs_events() { return 0 } -# CR API: Check the contents of all current type subscription events for one id from ECS +# CR API: Check the contents of all current type subscription events for one id from ICS # [ EMPTY | ( )+ ] # (Function for test scripts) -cr_api_check_all_ecs_subscription_events() { +cr_api_check_all_ics_subscription_events() { __log_test_start $@ #Valid number of parameter 3,4,8,12 @@ -609,7 +652,7 @@ cr_api_check_all_ecs_subscription_events() { cr_api_reset() { __log_conf_start $@ - if [ $# -ne 0 ]; then + if [ $# -ne 1 ]; then __print_err "" $@ return 1 fi