commit 49f0e5ab01b51aee8713a17aed86cd6d229b40cc
author BjornMagnussonXA <bjorn.magnusson@est.tech> Sun Nov 08 22:41:39 2020 +0100
committer BjornMagnussonXA <bjorn.magnusson@est.tech> Tue Nov 10 16:20:13 2020 +0100
tree 95a3d930f8df54cf9ba0b1af0b6d6f15a83a5e99
parent 647744d8ab625d28ea0ecda3e6741e23ba9b0bc7

Adapted test scripts to changes in PMS 2.0

Issue-ID: NONRTRIC-307

Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
Change-Id: I41effdcfbe41c742d618d247b0d60f6e8090048f

test/auto-test/FTC810.sh

diff --git a/test/auto-test/FTC810.sh b/test/auto-test/FTC810.sh
index 4cc00bd..911a1eb 100755
--- a/test/auto-test/FTC810.sh
+++ b/test/auto-test/FTC810.sh
@@ -22,9 +22,13 @@
 #App names to include in the test, space separated list
 INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC"
 
+#SUPPORTED TEST ENV FILE
+SUPPORTED_PROFILES="ONAP-MASTER ONAP-GUILIN"
+
 . ../common/testcase_common.sh  $@
 . ../common/agent_api_functions.sh
 . ../common/ricsimulator_api_functions.sh
+. ../common/cr_api_functions.sh
 
 #### TEST BEGIN ####
 
@@ -46,15 +50,11 @@
 HTTPX=HTTPS
 
 if [ $HTTPX == "HTTP" ]; then
-   # Path to callback receiver
-   CR_PATH="http://$CR_APP_NAME:$CR_EXTERNAL_PORT/callbacks"
    use_cr_http
    use_agent_rest_http
    use_sdnc_http
    use_simulator_http
 else
-   # Path to callback receiver
-   CR_PATH="https://$CR_APP_NAME:$CR_EXTERNAL_SECURE_PORT/callbacks"
    use_cr_https
    use_agent_rest_https
    use_sdnc_https
@@ -141,7 +141,7 @@
 MR_MESSAGES=0
 
 if [ "$PMS_VERSION" == "V2" ]; then
-      notificationurl="http://localhost:80"
+      notificationurl=$CR_PATH"/test"
 else
       notificationurl=""
 fi
@@ -198,7 +198,7 @@
       done
 
       if [ "$PMS_VERSION" == "V2" ]; then
-         api_equal json:policy_instances $INSTANCES
+         api_equal json:policy-instances $INSTANCES
       else
          api_equal json:policy_ids $INSTANCES
       fi
@@ -223,7 +223,7 @@
       done
 
       if [ "$PMS_VERSION" == "V2" ]; then
-         api_equal json:policy_instances $INSTANCES
+         api_equal json:policy-instances $INSTANCES
       else
          api_equal json:policy_ids $INSTANCES
       fi
@@ -251,7 +251,7 @@
       done
 
       if [ "$PMS_VERSION" == "V2" ]; then
-         api_equal json:policy_instances $INSTANCES
+         api_equal json:policy-instances $INSTANCES
       else
          api_equal json:policy_ids $INSTANCES
       fi
@@ -277,13 +277,11 @@
       done
 
       if [ "$PMS_VERSION" == "V2" ]; then
-         api_equal json:policy_instances $INSTANCES
+         api_equal json:policy-instances $INSTANCES
       else
          api_equal json:policy_ids $INSTANCES
       fi
 
-      cr_equal received_callbacks 0
-
       mr_equal requests_submitted $MR_MESSAGES
       mr_equal requests_fetched $MR_MESSAGES
       mr_equal responses_submitted $MR_MESSAGES
@@ -303,6 +301,7 @@
 done
 
 check_policy_agent_logs
+check_sdnc_logs
 
 #### TEST COMPLETE ####