From 41140bbbeeed6e7493f1b66fb0c61eec94adbcde Mon Sep 17 00:00:00 2001 From: rohithrajneesh Date: Wed, 25 Oct 2023 21:29:53 +0100 Subject: [PATCH] Fixing FTC's with respect to change in A1-Sim code using snapshot image ISSUE-ID: NONRTRIC-954 Change-Id: I1925a5908329d20d360c5bf8778746f72df97f53 Signed-off-by: rohithrajneesh --- test/auto-test/FTC150.sh | 4 ++-- test/common/sdnc_api_functions.sh | 5 ++--- test/cr/app/requirements.txt | 2 +- test/prodstub/app/requirements.txt | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/test/auto-test/FTC150.sh b/test/auto-test/FTC150.sh index 4d921d8b..25283a54 100755 --- a/test/auto-test/FTC150.sh +++ b/test/auto-test/FTC150.sh @@ -128,8 +128,8 @@ for __nb_httpx in $NB_TESTED_PROTOCOLS ; do controller_api_get_A1_policy_status 200 OSC ricsim_g1_1 1 4000 controller_api_get_A1_policy_status 200 STD ricsim_g2_1 5000 - VAL='NOT IN EFFECT' - controller_api_get_A1_policy_status 200 OSC ricsim_g1_1 1 4000 "$VAL" "false" + VAL='NOT_ENFORCED' + controller_api_get_A1_policy_status 200 OSC ricsim_g1_1 1 4000 "$VAL" "OTHER_REASON" controller_api_get_A1_policy_status 200 STD ricsim_g2_1 5000 "UNDEFINED" RESP=202 diff --git a/test/common/sdnc_api_functions.sh b/test/common/sdnc_api_functions.sh index 511d258b..4fd9de4a 100644 --- a/test/common/sdnc_api_functions.sh +++ b/test/common/sdnc_api_functions.sh @@ -588,9 +588,8 @@ controller_api_get_A1_policy_status() { if [ $# -ge 5 ] && [ $2 == "OSC" ]; then 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\"" - targetJson=$targetJson",\"created_at\":\"????\"}" + targetJson="{\"enforceStatus\":\"$6\"" + targetJson=$targetJson",\"enforceReason\":\"$7\"}" fi paramError=0 elif [ $# -ge 4 ] && [ $2 == "STD" ]; then diff --git a/test/cr/app/requirements.txt b/test/cr/app/requirements.txt index d1785cb5..7366fdd5 100644 --- a/test/cr/app/requirements.txt +++ b/test/cr/app/requirements.txt @@ -1,3 +1,3 @@ -Flask==2.0.1 +Flask==3.0.0 diff --git a/test/prodstub/app/requirements.txt b/test/prodstub/app/requirements.txt index ed6e2d42..1343bc42 100644 --- a/test/prodstub/app/requirements.txt +++ b/test/prodstub/app/requirements.txt @@ -1,3 +1,3 @@ -Flask==2.0.1 +Flask==3.0.0 jsonschema==3.2.0 requests==2.24.0 -- 2.16.6