X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fcontroller_api_functions.sh;h=e33c61907c1b183b04b1d8e4c2e2ea043e198154;hb=ad0477833fe6a8270f274e17f73022a2d881f074;hp=daab47c66123ec5d34a181f7b016fdc66b67c764;hpb=62c6c9d408d60fedc20e93238f4f57562298f3d2;p=nonrtric.git diff --git a/test/common/controller_api_functions.sh b/test/common/controller_api_functions.sh index daab47c6..e33c6190 100644 --- a/test/common/controller_api_functions.sh +++ b/test/common/controller_api_functions.sh @@ -119,7 +119,7 @@ controller_api_get_A1_policy_ids() { if [ "$targetJson" != "[" ]; then targetJson=$targetJson"," fi - targetJson=$targetJson"\"$pid\"" + targetJson=$targetJson"\"$UUID$pid\"" done targetJson=$targetJson"]" @@ -209,10 +209,10 @@ controller_api_delete_A1_policy() { paramError=1 if [ $# -eq 5 ] && [ $2 == "OSC" ]; then - url="http://$3:$RIC_SIM_INTERNAL_PORT/a1-p/policytypes/$4/policies/$5" + url="http://$3:$RIC_SIM_INTERNAL_PORT/a1-p/policytypes/$4/policies/$UUID$5" paramError=0 elif [ $# -eq 4 ] && [ $2 == "STD" ]; then - url="http://$3:$RIC_SIM_INTERNAL_PORT/A1-P/v1/policies/$4" + url="http://$3:$RIC_SIM_INTERNAL_PORT/A1-P/v1/policies/$UUID$4" paramError=0 fi @@ -254,12 +254,12 @@ controller_api_put_A1_policy() { paramError=1 if [ $# -eq 6 ] && [ $2 == "OSC" ]; then - url="http://$3:$RIC_SIM_INTERNAL_PORT/a1-p/policytypes/$4/policies/$5" + url="http://$3:$RIC_SIM_INTERNAL_PORT/a1-p/policytypes/$4/policies/$UUID$5" body=$(sed 's/XXX/'${5}'/g' $6) paramError=0 elif [ $# -eq 5 ] && [ $2 == "STD" ]; then - url="http://$3:$RIC_SIM_INTERNAL_PORT/A1-P/v1/policies/$4" + url="http://$3:$RIC_SIM_INTERNAL_PORT/A1-P/v1/policies/$UUID$4" body=$(sed 's/XXX/'${4}'/g' $5) paramError=0 fi @@ -304,7 +304,7 @@ controller_api_get_A1_policy_status() { targetJson="" paramError=1 if [ $# -ge 5 ] && [ $2 == "OSC" ]; then - url="http://$3:$RIC_SIM_INTERNAL_PORT/a1-p/policytypes/$4/policies/$5/status" + url="http://$3:$RIC_SIM_INTERNAL_PORT/a1-p/policytypes/$4/policies/$UUID$5/status" if [ $# -gt 5 ]; then targetJson="{\"instance_status\":\"$6\"" targetJson=$targetJson",\"has_been_deleted\":\"$7\"" @@ -312,7 +312,7 @@ controller_api_get_A1_policy_status() { fi paramError=0 elif [ $# -ge 4 ] && [ $2 == "STD" ]; then - url="http://$3:$RIC_SIM_INTERNAL_PORT/A1-P/v1/policies/$4/status" + url="http://$3:$RIC_SIM_INTERNAL_PORT/A1-P/v1/policies/$UUID$4/status" if [ $# -gt 4 ]; then targetJson="{\"enforceStatus\":\"$5\"" if [ $# -eq 6 ]; then