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=3ac0a6c7a038b0c74319feae8d2064b523ce0eeb;hpb=36ff34cc560eab1814621d24f90e637dbd07373f;p=nonrtric.git diff --git a/test/common/sdnc_api_functions.sh b/test/common/sdnc_api_functions.sh index 3ac0a6c7..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 @@ -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() {