X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fsdnc_api_functions.sh;h=bab9474fe4cf596d2fd91e9d17c9ed79d9881461;hb=d2aeca8843fe3ffca2e73dec5b64daeef0dda938;hp=b3ef07b90c674f92a81e7fa053b4090f917d98e6;hpb=a28a4ad261601976c345425692116e5d7250b810;p=nonrtric.git diff --git a/test/common/sdnc_api_functions.sh b/test/common/sdnc_api_functions.sh index b3ef07b9..bab9474f 100644 --- a/test/common/sdnc_api_functions.sh +++ b/test/common/sdnc_api_functions.sh @@ -93,9 +93,9 @@ __SDNC_kube_delete_all() { # args: __SDNC_store_docker_logs() { if [ $RUNMODE == "KUBE" ]; then - kubectl logs -l "autotest=SDNC" -n $KUBE_SDNC_NAMESPACE --tail=-1 > $1$2_SDNC.log 2>&1 - podname=$(kubectl get pods -n $KUBE_SDNC_NAMESPACE -l "autotest=SDNC" -o custom-columns=":metadata.name") - kubectl exec -t -n $KUBE_SDNC_NAMESPACE $podname -- cat $SDNC_KARAF_LOG> $1$2_SDNC_karaf.log 2>&1 + kubectl $KUBECONF logs -l "autotest=SDNC" -n $KUBE_SDNC_NAMESPACE --tail=-1 > $1$2_SDNC.log 2>&1 + podname=$(kubectl $KUBECONF get pods -n $KUBE_SDNC_NAMESPACE -l "autotest=SDNC" -o custom-columns=":metadata.name") + kubectl $KUBECONF exec -t -n $KUBE_SDNC_NAMESPACE $podname -- cat $SDNC_KARAF_LOG> $1$2_SDNC_karaf.log 2>&1 else docker exec -t $SDNC_APP_NAME cat $SDNC_KARAF_LOG> $1$2_SDNC_karaf.log 2>&1 fi @@ -120,6 +120,12 @@ __SDNC_statisics_setup() { fi } +# Check application requirements, e.g. helm, the the test needs. Exit 1 if req not satisfied +# args: - +__SDNC_test_requirements() { + : +} + ####################################################### # Set http as the protocol to use for all communication to SDNC @@ -140,15 +146,15 @@ use_sdnc_https() { # args: __sdnc_set_protocoll() { echo -e $BOLD"$SDNC_DISPLAY_NAME protocol setting"$EBOLD - echo -e " Using $BOLD http $EBOLD towards $SDNC_DISPLAY_NAME" + echo -e " Using $BOLD $1 $EBOLD towards $SDNC_DISPLAY_NAME" ## Access to SDNC SDNC_SERVICE_PATH=$1"://"$SDNC_APP_NAME":"$2 # docker access, container->container and script->container via proxy - SDNC_SERVICE_API_PATH=$1"://"$SDNC_USER":"$SDNC_PWD"@"$SDNC_APP_NAME":"$1$SDNC_API_URL + SDNC_SERVICE_API_PATH=$1"://"$SDNC_USER":"$SDNC_PWD"@"$SDNC_APP_NAME":"$2$SDNC_API_URL if [ $RUNMODE == "KUBE" ]; then SDNC_SERVICE_PATH=$1"://"$SDNC_APP_NAME.$KUBE_SDNC_NAMESPACE":"$3 # kube access, pod->svc and script->svc via proxy - SDNC_SERVICE_API_PATH=$1"://"$SDNC_USER":"$SDNC_PWD"@"$SDNC_APP_NAME.KUBE_SDNC_NAMESPACE":"$1$SDNC_API_URL + SDNC_SERVICE_API_PATH=$1"://"$SDNC_USER":"$SDNC_PWD"@"$SDNC_APP_NAME.$KUBE_SDNC_NAMESPACE":"$3$SDNC_API_URL fi echo "" @@ -242,7 +248,7 @@ start_sdnc() { __check_included_image 'SDNC' if [ $? -eq 1 ]; then echo -e $RED"The SDNC A1 Controller app is not included in this test script"$ERED - echo -e $RED"The Policy Agent will not be started"$ERED + echo -e $RED"The A1PMS will not be started"$ERED exit fi @@ -307,7 +313,7 @@ start_stopped_sdnc() { return 0 } -# Check the agent logs for WARNINGs and ERRORs +# Check the sdnc logs for WARNINGs and ERRORs # args: - # (Function for test scripts) check_sdnc_logs() { @@ -380,16 +386,13 @@ __do_curl_to_controller() { controller_api_get_A1_policy_ids() { __log_test_start $@ - ric_id=$3 - if [ $RUNMODE == "KUBE" ]; then - ric_id=$(get_kube_sim_host $3) - fi + ric_id=$(__find_sim_host $3) paramError=1 if [ $# -gt 3 ] && [ $2 == "OSC" ]; then - url="$RIC_SIM_HTTPX://$ric_id:$RIC_SIM_PORT/a1-p/policytypes/$4/policies" + url="$ric_id/a1-p/policytypes/$4/policies" paramError=0 elif [ $# -gt 2 ] && [ $2 == "STD" ]; then - url="$RIC_SIM_HTTPX://$ric_id:$RIC_SIM_PORT/A1-P/v1/policies" + url="$ric_id/A1-P/v1/policies" paramError=0 fi @@ -446,13 +449,10 @@ controller_api_get_A1_policy_ids() { controller_api_get_A1_policy_type() { __log_test_start $@ - ric_id=$3 - if [ $RUNMODE == "KUBE" ]; then - ric_id=$(get_kube_sim_host $3) - fi + ric_id=$(__find_sim_host $3) paramError=1 if [ $# -gt 3 ] && [ $2 == "OSC" ]; then - url="$RIC_SIM_HTTPX://$ric_id:$RIC_SIM_PORT/a1-p/policytypes/$4" + url="$ric_id/a1-p/policytypes/$4" paramError=0 fi @@ -500,16 +500,13 @@ controller_api_get_A1_policy_type() { controller_api_delete_A1_policy() { __log_test_start $@ - ric_id=$3 - if [ $RUNMODE == "KUBE" ]; then - ric_id=$(get_kube_sim_host $3) - fi + ric_id=$(__find_sim_host $3) paramError=1 if [ $# -eq 5 ] && [ $2 == "OSC" ]; then - url="$RIC_SIM_HTTPX://$ric_id:$RIC_SIM_PORT/a1-p/policytypes/$4/policies/$UUID$5" + url="$ric_id/a1-p/policytypes/$4/policies/$UUID$5" paramError=0 elif [ $# -eq 4 ] && [ $2 == "STD" ]; then - url="$RIC_SIM_HTTPX://$ric_id:$RIC_SIM_PORT/A1-P/v1/policies/$UUID$4" + url="$ric_id/A1-P/v1/policies/$UUID$4" paramError=0 fi @@ -542,18 +539,15 @@ controller_api_delete_A1_policy() { controller_api_put_A1_policy() { __log_test_start $@ - ric_id=$3 - if [ $RUNMODE == "KUBE" ]; then - ric_id=$(get_kube_sim_host $3) - fi + ric_id=$(__find_sim_host $3) paramError=1 if [ $# -eq 6 ] && [ $2 == "OSC" ]; then - url="$RIC_SIM_HTTPX://$ric_id:$RIC_SIM_PORT/a1-p/policytypes/$4/policies/$UUID$5" + url="$ric_id/a1-p/policytypes/$4/policies/$UUID$5" body=$(sed 's/XXX/'${5}'/g' $6) paramError=0 elif [ $# -eq 5 ] && [ $2 == "STD" ]; then - url="$RIC_SIM_HTTPX://$ric_id:$RIC_SIM_PORT/A1-P/v1/policies/$UUID$4" + url="$ric_id/A1-P/v1/policies/$UUID$4" body=$(sed 's/XXX/'${4}'/g' $5) paramError=0 fi @@ -588,14 +582,11 @@ controller_api_put_A1_policy() { controller_api_get_A1_policy_status() { __log_test_start $@ - ric_id=$3 - if [ $RUNMODE == "KUBE" ]; then - ric_id=$(get_kube_sim_host $3) - fi + ric_id=$(__find_sim_host $3) targetJson="" paramError=1 if [ $# -ge 5 ] && [ $2 == "OSC" ]; then - url="$RIC_SIM_HTTPX://$ric_id:$RIC_SIM_PORT/a1-p/policytypes/$4/policies/$UUID$5/status" + url="$ric_id/a1-p/policytypes/$4/policies/$UUID$5/status" if [ $# -gt 5 ]; then targetJson="{\"instance_status\":\"$6\"" targetJson=$targetJson",\"has_been_deleted\":\"$7\"" @@ -603,7 +594,7 @@ controller_api_get_A1_policy_status() { fi paramError=0 elif [ $# -ge 4 ] && [ $2 == "STD" ]; then - url="$RIC_SIM_HTTPX://$ric_id:$RIC_SIM_PORT/A1-P/v1/policies/$UUID$4/status" + url="$ric_id/A1-P/v1/policies/$UUID$4/status" if [ $# -gt 4 ]; then targetJson="{\"enforceStatus\":\"$5\"" if [ $# -eq 6 ]; then