X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC350.sh;h=c7222457f0327a427b32e94923e9f0856934197a;hb=542d2dbfd8df1fcb011fea3d69d539c5c5fe3667;hp=692d9b5621efff4bc76059d0e668203649856500;hpb=496156d78828c000cbde44c96cc37c57032f2244;p=nonrtric.git

diff --git a/test/auto-test/FTC350.sh b/test/auto-test/FTC350.sh
index 692d9b56..c7222457 100755
--- a/test/auto-test/FTC350.sh
+++ b/test/auto-test/FTC350.sh
@@ -19,21 +19,32 @@
 
 TC_ONELINE_DESCR="Change supported policy types and reconfigure rics"
 
-#App names to exclude checking pulling images for, space separated list
-EXCLUDED_IMAGES="SDNC_ONAP"
+#App names to include in the test when running docker, space separated list
+DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC KUBEPROXY"
 
-. ../common/testcase_common.sh  $@
-. ../common/agent_api_functions.sh
-. ../common/ricsimulator_api_functions.sh
+#App names to include in the test when running kubernetes, space separated list
+KUBE_INCLUDED_IMAGES="CP CR MR PA RICSIM SDNC KUBEPROXY"
+#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
+KUBE_PRESTARTED_IMAGES=""
+
+#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
+#the image is not configured in the supplied env_file
+#Used for images not applicable to all supported profile
+CONDITIONALLY_IGNORED_IMAGES="CBS CONSUL"
+
+#Supported test environment profiles
+SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU ONAP-ISTANBUL ONAP-JAKARTA ORAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE ORAN-F-RELEASE"
+#Supported run modes
+SUPPORTED_RUNMODES="DOCKER KUBE"
+
+. ../common/testcase_common.sh $@
+
+setup_testenvironment
 
 #### TEST BEGIN ####
 
-generate_uuid
+generate_policy_uuid
 
-#Local vars in test script
-##########################
-# Path to callback receiver
-CR_PATH="http://$CR_APP_NAME:$CR_EXTERNAL_PORT/callbacks"
 use_cr_http
 
 NUM_RICS=10
@@ -52,51 +63,84 @@ for interface in $TESTED_VARIANTS ; do
 
 
     # Clean container and start all needed containers #
-    clean_containers
+    clean_environment
+
+    start_kube_proxy
 
     #Start simulators and prepare two configs
 
     start_ric_simulators ricsim_g1 $NUM_RICS_2 OSC_2.1.0
 
-    start_cr
+    start_cr 1
 
     start_mr
 
-    start_consul_cbs
+    if [ $RUNMODE == "DOCKER" ]; then
+        if [[ "$PMS_FEATURE_LEVEL" != *"NOCONSUL"* ]]; then
+            start_consul_cbs
+        fi
+    fi
 
+    # Create first config
     if [[ $interface = *"SDNC"* ]]; then
         start_sdnc
-        prepare_consul_config      SDNC  ".consul_config_2.json"
+        prepare_consul_config      SDNC  ".consul_config_initial.json"
     else
-        prepare_consul_config      NOSDNC  ".consul_config_2.json"
+        prepare_consul_config      NOSDNC  ".consul_config_initial.json"
     fi
 
-    consul_config_app                  ".consul_config_2.json"
-
-
     # Create 2nd config and save for later
     start_ric_simulators ricsim_g1 $NUM_RICS OSC_2.1.0
 
     if [[ $interface = *"SDNC"* ]]; then
-        start_sdnc
         prepare_consul_config      SDNC  ".consul_config_all.json"
     else
         prepare_consul_config      NOSDNC  ".consul_config_all.json"
     fi
 
-    start_policy_agent
+    if [ $RUNMODE == "KUBE" ] && [[ "$PMS_FEATURE_LEVEL" == *"INITIALCONFIGMAP"* ]]; then
+        start_policy_agent NORPOXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/application2.yaml
+    else
+        start_policy_agent NORPOXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/$POLICY_AGENT_CONFIG_FILE
+    fi
 
-    set_agent_debug
+    set_agent_trace
 
     api_get_status 200
 
+    # Create service to be able to receive events when rics becomes available
+    # Must use rest towards the agent since dmaap is not configured yet
+    api_put_service 201 "ric-registration" 0 "$CR_SERVICE_APP_PATH_0/ric-registration"
+
+    #Load first config
+    if [ $RUNMODE == "KUBE" ]; then
+        if [[ "$PMS_FEATURE_LEVEL" == *"INITIALCONFIGMAP"* ]]; then
+            api_put_configuration 200              ".consul_config_initial.json"
+            api_get_configuration 200              ".consul_config_initial.json"
+        else
+            agent_load_config                      ".consul_config_initial.json"
+        fi
+    else
+        if [[ "$PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then
+            api_put_configuration 200              ".consul_config_initial.json"
+            api_get_configuration 200              ".consul_config_initial.json"
+        else
+            consul_config_app                      ".consul_config_initial.json"
+        fi
+    fi
+
     for ((i=1; i<=${NUM_RICS}; i++))
     do
         sim_print ricsim_g1_$i interface
     done
 
     # All sims running but 2 are not configured in consul
-    api_equal json:rics 8 120
+    api_equal json:rics 8 300
+
+    if [ "$PMS_VERSION" == "V2" ]; then
+        cr_equal 0 received_callbacks?id=ric-registration 8 120
+        cr_api_check_all_sync_events 200 0 ric-registration ricsim_g1_1 ricsim_g1_2  ricsim_g1_3 ricsim_g1_4 ricsim_g1_5 ricsim_g1_6  ricsim_g1_7  ricsim_g1_8
+    fi
 
     api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:NOTYPE:???? \
                              ricsim_g1_2:me1_ricsim_g1_2,me2_ricsim_g1_2:NOTYPE:???? \
@@ -136,19 +180,32 @@ for interface in $TESTED_VARIANTS ; do
     sim_put_policy_type 201 ricsim_g1_6 5 testdata/OSC/sim_5.json
     sim_put_policy_type 201 ricsim_g1_7 5 testdata/OSC/sim_5.json
     sim_put_policy_type 201 ricsim_g1_8 5 testdata/OSC/sim_5.json
-    sim_put_policy_type 201 ricsim_g1_9 5 testdata/OSC/sim_5.json
 
-    api_equal json:policy_types 5 120
-
-    echo "Check the number of types in the agent for each ric"
-    api_equal json:policy_types?ric=ricsim_g1_1 1 120
-    api_equal json:policy_types?ric=ricsim_g1_2 2 120
-    api_equal json:policy_types?ric=ricsim_g1_3 3 120
-    api_equal json:policy_types?ric=ricsim_g1_4 4 120
-    api_equal json:policy_types?ric=ricsim_g1_5 5 120
-    api_equal json:policy_types?ric=ricsim_g1_6 4 120
-    api_equal json:policy_types?ric=ricsim_g1_7 3 120
-    api_equal json:policy_types?ric=ricsim_g1_8 2 120
+    if [ "$PMS_VERSION" == "V2" ]; then
+        api_equal json:policy-types 5 120
+
+        echo "Check the number of types in the agent for each ric"
+        api_equal json:policy-types?ric_id=ricsim_g1_1 1 120
+        api_equal json:policy-types?ric_id=ricsim_g1_2 2 120
+        api_equal json:policy-types?ric_id=ricsim_g1_3 3 120
+        api_equal json:policy-types?ric_id=ricsim_g1_4 4 120
+        api_equal json:policy-types?ric_id=ricsim_g1_5 5 120
+        api_equal json:policy-types?ric_id=ricsim_g1_6 4 120
+        api_equal json:policy-types?ric_id=ricsim_g1_7 3 120
+        api_equal json:policy-types?ric_id=ricsim_g1_8 2 120
+    else
+        api_equal json:policy_types 5 120
+
+        echo "Check the number of types in the agent for each ric"
+        api_equal json:policy_types?ric=ricsim_g1_1 1 120
+        api_equal json:policy_types?ric=ricsim_g1_2 2 120
+        api_equal json:policy_types?ric=ricsim_g1_3 3 120
+        api_equal json:policy_types?ric=ricsim_g1_4 4 120
+        api_equal json:policy_types?ric=ricsim_g1_5 5 120
+        api_equal json:policy_types?ric=ricsim_g1_6 4 120
+        api_equal json:policy_types?ric=ricsim_g1_7 3 120
+        api_equal json:policy_types?ric=ricsim_g1_8 2 120
+    fi
 
     api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1:???? \
                              ricsim_g1_2:me1_ricsim_g1_2,me2_ricsim_g1_2:1,2:???? \
@@ -159,23 +216,68 @@ for interface in $TESTED_VARIANTS ; do
                              ricsim_g1_7:me1_ricsim_g1_7,me2_ricsim_g1_7:3,4,5:???? \
                              ricsim_g1_8:me1_ricsim_g1_8,me2_ricsim_g1_8:4,5:???? "
 
+    if [ "$PMS_VERSION" == "V2" ]; then
+        cr_equal 0 received_callbacks?id=ric-registration 16 120
+        cr_api_check_all_sync_events 200 0 ric-registration ricsim_g1_1 ricsim_g1_2  ricsim_g1_3 ricsim_g1_4 ricsim_g1_5 ricsim_g1_6  ricsim_g1_7  ricsim_g1_8
+    fi
 
     #Load config with all rics
-    consul_config_app                  ".consul_config_all.json"
+    if [ $RUNMODE == "KUBE" ]; then
+        if [[ "$PMS_FEATURE_LEVEL" == *"INITIALCONFIGMAP"* ]]; then
+            api_put_configuration 200              ".consul_config_all.json"
+            api_get_configuration 200              ".consul_config_all.json"
+        else
+            agent_load_config                      ".consul_config_all.json"
+        fi
+    else
+        if [[ "$PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then
+            api_put_configuration 200               ".consul_config_all.json"
+            api_get_configuration 200               ".consul_config_all.json"
+        else
+            consul_config_app                       ".consul_config_all.json"
+        fi
+    fi
 
     api_equal json:rics 10 120
 
-    echo "Check the number of types in the agent for each ric"
-    api_equal json:policy_types?ric=ricsim_g1_1 1 120
-    api_equal json:policy_types?ric=ricsim_g1_2 2 120
-    api_equal json:policy_types?ric=ricsim_g1_3 3 120
-    api_equal json:policy_types?ric=ricsim_g1_4 4 120
-    api_equal json:policy_types?ric=ricsim_g1_5 5 120
-    api_equal json:policy_types?ric=ricsim_g1_6 4 120
-    api_equal json:policy_types?ric=ricsim_g1_7 3 120
-    api_equal json:policy_types?ric=ricsim_g1_8 2 120
-    api_equal json:policy_types?ric=ricsim_g1_9 1 120
-    api_equal json:policy_types?ric=ricsim_g1_10 0 120
+    if [ "$PMS_VERSION" == "V2" ]; then
+        cr_equal 0 received_callbacks?id=ric-registration 18 120
+        cr_api_check_all_sync_events 200 0 ric-registration ricsim_g1_9  ricsim_g1_10
+    fi
+
+    sim_put_policy_type 201 ricsim_g1_9 5 testdata/OSC/sim_5.json
+
+    if [ "$PMS_VERSION" == "V2" ]; then
+
+        api_equal json:policy-types 5 120
+
+        echo "Check the number of types in the agent for each ric"
+        api_equal json:policy-types?ric_id=ricsim_g1_1 1 120
+        api_equal json:policy-types?ric_id=ricsim_g1_2 2 120
+        api_equal json:policy-types?ric_id=ricsim_g1_3 3 120
+        api_equal json:policy-types?ric_id=ricsim_g1_4 4 120
+        api_equal json:policy-types?ric_id=ricsim_g1_5 5 120
+        api_equal json:policy-types?ric_id=ricsim_g1_6 4 120
+        api_equal json:policy-types?ric_id=ricsim_g1_7 3 120
+        api_equal json:policy-types?ric_id=ricsim_g1_8 2 120
+        api_equal json:policy-types?ric_id=ricsim_g1_9 1 120
+        api_equal json:policy-types?ric_id=ricsim_g1_10 0 120
+    else
+
+        api_equal json:policy_types 5 120
+
+        echo "Check the number of types in the agent for each ric"
+        api_equal json:policy_types?ric=ricsim_g1_1 1 120
+        api_equal json:policy_types?ric=ricsim_g1_2 2 120
+        api_equal json:policy_types?ric=ricsim_g1_3 3 120
+        api_equal json:policy_types?ric=ricsim_g1_4 4 120
+        api_equal json:policy_types?ric=ricsim_g1_5 5 120
+        api_equal json:policy_types?ric=ricsim_g1_6 4 120
+        api_equal json:policy_types?ric=ricsim_g1_7 3 120
+        api_equal json:policy_types?ric=ricsim_g1_8 2 120
+        api_equal json:policy_types?ric=ricsim_g1_9 1 120
+        api_equal json:policy_types?ric=ricsim_g1_10 0 120
+    fi
 
     api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1:???? \
                              ricsim_g1_2:me1_ricsim_g1_2,me2_ricsim_g1_2:1,2:???? \
@@ -188,34 +290,80 @@ for interface in $TESTED_VARIANTS ; do
                              ricsim_g1_9:me1_ricsim_g1_9,me2_ricsim_g1_9:5:???? \
                              ricsim_g1_10:me1_ricsim_g1_10,me2_ricsim_g1_10:NOTYPE:???? "
 
+    if [ "$PMS_VERSION" == "V2" ]; then
+        cr_equal 0 received_callbacks?id=ric-registration 19 120
+        cr_api_check_all_sync_events 200 0 ric-registration ricsim_g1_9
+    fi
 
     #No policy type in sim #10
 
-    api_equal json:policy_types 5
-
-    api_put_service 201 "serv1" 3600 "$CR_PATH/serv1"
-
-    api_put_policy 201 "serv1" ricsim_g1_9 5 2000 NOTRANSIENT testdata/OSC/pi5_template.json 1
+    if [ "$PMS_VERSION" == "V2" ]; then
+        api_equal json:policy-types 5
+    else
+        api_equal json:policy_types 5
+    fi
 
-    api_equal json:policy_ids 1
+    api_put_service 201 "serv1" 3600 "$CR_SERVICE_APP_PATH_0/serv1"
 
-    sim_equal ricsim_g1_9 num_instances 1
+    if [ "$PMS_VERSION" == "V2" ]; then
+        notificationurl=$CR_SERVICE_APP_PATH_0"/test"
+    else
+        notificationurl=""
+    fi
 
+    sleep_wait 120
 
     # Load config with reduced number of rics
-    consul_config_app                  ".consul_config_2.json"
+    if [ $RUNMODE == "KUBE" ]; then
+        if [[ "$PMS_FEATURE_LEVEL" == *"INITIALCONFIGMAP"* ]]; then
+            api_put_configuration 200              ".consul_config_initial.json"
+            api_get_configuration 200              ".consul_config_initial.json"
+        else
+            agent_load_config                      ".consul_config_initial.json"
+        fi
+    else
+        if [[ "$PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then
+            api_put_configuration 200              ".consul_config_initial.json"
+            api_get_configuration 200              ".consul_config_initial.json"
+        else
+            consul_config_app                      ".consul_config_initial.json"
+        fi
+    fi
 
     api_equal json:rics 8 120
 
-    echo "Check the number of types in the agent for each ric"
-    api_equal json:policy_types?ric=ricsim_g1_1 1 120
-    api_equal json:policy_types?ric=ricsim_g1_2 2 120
-    api_equal json:policy_types?ric=ricsim_g1_3 3 120
-    api_equal json:policy_types?ric=ricsim_g1_4 4 120
-    api_equal json:policy_types?ric=ricsim_g1_5 5 120
-    api_equal json:policy_types?ric=ricsim_g1_6 4 120
-    api_equal json:policy_types?ric=ricsim_g1_7 3 120
-    api_equal json:policy_types?ric=ricsim_g1_8 2 120
+    if [ "$PMS_VERSION" == "V2" ]; then
+        cr_equal 0 received_callbacks?id=ric-registration 19 120
+        cr_api_check_all_sync_events 200 0 ric-registration EMPTY
+    fi
+
+    if [ "$PMS_VERSION" == "V2" ]; then
+
+        api_equal json:policy-types 5 120
+
+        echo "Check the number of types in the agent for each ric"
+        api_equal json:policy-types?ric_id=ricsim_g1_1 1 120
+        api_equal json:policy-types?ric_id=ricsim_g1_2 2 120
+        api_equal json:policy-types?ric_id=ricsim_g1_3 3 120
+        api_equal json:policy-types?ric_id=ricsim_g1_4 4 120
+        api_equal json:policy-types?ric_id=ricsim_g1_5 5 120
+        api_equal json:policy-types?ric_id=ricsim_g1_6 4 120
+        api_equal json:policy-types?ric_id=ricsim_g1_7 3 120
+        api_equal json:policy-types?ric_id=ricsim_g1_8 2 120
+    else
+
+        api_equal json:policy_types 5 120
+
+        echo "Check the number of types in the agent for each ric"
+        api_equal json:policy_types?ric=ricsim_g1_1 1 120
+        api_equal json:policy_types?ric=ricsim_g1_2 2 120
+        api_equal json:policy_types?ric=ricsim_g1_3 3 120
+        api_equal json:policy_types?ric=ricsim_g1_4 4 120
+        api_equal json:policy_types?ric=ricsim_g1_5 5 120
+        api_equal json:policy_types?ric=ricsim_g1_6 4 120
+        api_equal json:policy_types?ric=ricsim_g1_7 3 120
+        api_equal json:policy_types?ric=ricsim_g1_8 2 120
+    fi
 
     api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1:???? \
                              ricsim_g1_2:me1_ricsim_g1_2,me2_ricsim_g1_2:1,2:???? \
@@ -226,32 +374,66 @@ for interface in $TESTED_VARIANTS ; do
                              ricsim_g1_7:me1_ricsim_g1_7,me2_ricsim_g1_7:3,4,5:???? \
                              ricsim_g1_8:me1_ricsim_g1_8,me2_ricsim_g1_8:4,5:???? "
 
-    sleep 120
+    sleep_wait 120
 
-    api_equal json:policy_ids 0
+    if [ "$PMS_VERSION" == "V2" ]; then
+        api_equal json:policy-instances 0
+    else
+        api_equal json:policy_ids 0
+    fi
 
     api_get_policy_types 404 ricsim_g1_9
 
-    sim_equal ricsim_g1_9 num_instances 1
-
-    api_delete_policy 404 2000
-
     # Load config with all rics
-    consul_config_app                  ".consul_config_all.json"
+    if [ $RUNMODE == "KUBE" ]; then
+        if [[ "$PMS_FEATURE_LEVEL" == *"INITIALCONFIGMAP"* ]]; then
+            api_put_configuration 200              ".consul_config_all.json"
+            api_get_configuration 200              ".consul_config_all.json"
+        else
+            agent_load_config                      ".consul_config_all.json"
+        fi
+    else
+        if [[ "$PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then
+            api_put_configuration 200               ".consul_config_all.json"
+            api_get_configuration 200               ".consul_config_all.json"
+        else
+            consul_config_app                      ".consul_config_all.json"
+        fi
+    fi
 
     api_equal json:rics 10 120
 
-    echo "Check the number of types in the agent for each ric"
-    api_equal json:policy_types?ric=ricsim_g1_1 1 120
-    api_equal json:policy_types?ric=ricsim_g1_2 2 120
-    api_equal json:policy_types?ric=ricsim_g1_3 3 120
-    api_equal json:policy_types?ric=ricsim_g1_4 4 120
-    api_equal json:policy_types?ric=ricsim_g1_5 5 120
-    api_equal json:policy_types?ric=ricsim_g1_6 4 120
-    api_equal json:policy_types?ric=ricsim_g1_7 3 120
-    api_equal json:policy_types?ric=ricsim_g1_8 2 120
-    api_equal json:policy_types?ric=ricsim_g1_9 1 120
-    api_equal json:policy_types?ric=ricsim_g1_10 0 120
+    if [ "$PMS_VERSION" == "V2" ]; then
+
+        api_equal json:policy-types 5 120
+
+        echo "Check the number of types in the agent for each ric"
+        api_equal json:policy-types?ric_id=ricsim_g1_1 1 120
+        api_equal json:policy-types?ric_id=ricsim_g1_2 2 120
+        api_equal json:policy-types?ric_id=ricsim_g1_3 3 120
+        api_equal json:policy-types?ric_id=ricsim_g1_4 4 120
+        api_equal json:policy-types?ric_id=ricsim_g1_5 5 120
+        api_equal json:policy-types?ric_id=ricsim_g1_6 4 120
+        api_equal json:policy-types?ric_id=ricsim_g1_7 3 120
+        api_equal json:policy-types?ric_id=ricsim_g1_8 2 120
+        api_equal json:policy-types?ric_id=ricsim_g1_9 1 120
+        api_equal json:policy-types?ric_id=ricsim_g1_10 0 120
+    else
+
+        api_equal json:policy_types 5 120
+
+        echo "Check the number of types in the agent for each ric"
+        api_equal json:policy_types?ric=ricsim_g1_1 1 120
+        api_equal json:policy_types?ric=ricsim_g1_2 2 120
+        api_equal json:policy_types?ric=ricsim_g1_3 3 120
+        api_equal json:policy_types?ric=ricsim_g1_4 4 120
+        api_equal json:policy_types?ric=ricsim_g1_5 5 120
+        api_equal json:policy_types?ric=ricsim_g1_6 4 120
+        api_equal json:policy_types?ric=ricsim_g1_7 3 120
+        api_equal json:policy_types?ric=ricsim_g1_8 2 120
+        api_equal json:policy_types?ric=ricsim_g1_9 1 120
+        api_equal json:policy_types?ric=ricsim_g1_10 0 120
+    fi
 
     api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1:???? \
                              ricsim_g1_2:me1_ricsim_g1_2,me2_ricsim_g1_2:1,2:???? \
@@ -264,9 +446,13 @@ for interface in $TESTED_VARIANTS ; do
                              ricsim_g1_9:me1_ricsim_g1_9,me2_ricsim_g1_9:5:???? \
                              ricsim_g1_10:me1_ricsim_g1_10,me2_ricsim_g1_10:NOTYPE:???? "
 
-    sleep 120
+    sleep_wait 120
 
-    api_equal json:policy_ids 0
+    if [ "$PMS_VERSION" == "V2" ]; then
+        api_equal json:policy-instances 0
+    else
+        api_equal json:policy_ids 0
+    fi
 
     sim_equal ricsim_g1_9 num_instances 0
 
@@ -276,18 +462,37 @@ for interface in $TESTED_VARIANTS ; do
     sim_delete_policy_type 204 ricsim_g1_6 4
     sim_delete_policy_type 204 ricsim_g1_7 4
 
-    sleep 120
+    sleep_wait 120
+
+    if [ "$PMS_VERSION" == "V2" ]; then
 
-    api_equal json:policy_types?ric=ricsim_g1_1 1 120
-    api_equal json:policy_types?ric=ricsim_g1_2 2 120
-    api_equal json:policy_types?ric=ricsim_g1_3 3 120
-    api_equal json:policy_types?ric=ricsim_g1_4 3 120
-    api_equal json:policy_types?ric=ricsim_g1_5 4 120
-    api_equal json:policy_types?ric=ricsim_g1_6 3 120
-    api_equal json:policy_types?ric=ricsim_g1_7 2 120
-    api_equal json:policy_types?ric=ricsim_g1_8 2 120
-    api_equal json:policy_types?ric=ricsim_g1_9 1 120
-    api_equal json:policy_types?ric=ricsim_g1_10 0 120
+        api_equal json:policy-types 5 120
+
+        api_equal json:policy-types?ric_id=ricsim_g1_1 1 120
+        api_equal json:policy-types?ric_id=ricsim_g1_2 2 120
+        api_equal json:policy-types?ric_id=ricsim_g1_3 3 120
+        api_equal json:policy-types?ric_id=ricsim_g1_4 3 120
+        api_equal json:policy-types?ric_id=ricsim_g1_5 4 120
+        api_equal json:policy-types?ric_id=ricsim_g1_6 3 120
+        api_equal json:policy-types?ric_id=ricsim_g1_7 2 120
+        api_equal json:policy-types?ric_id=ricsim_g1_8 2 120
+        api_equal json:policy-types?ric_id=ricsim_g1_9 1 120
+        api_equal json:policy-types?ric_id=ricsim_g1_10 0 120
+    else
+
+        api_equal json:policy_types 5 120
+
+        api_equal json:policy_types?ric=ricsim_g1_1 1 120
+        api_equal json:policy_types?ric=ricsim_g1_2 2 120
+        api_equal json:policy_types?ric=ricsim_g1_3 3 120
+        api_equal json:policy_types?ric=ricsim_g1_4 3 120
+        api_equal json:policy_types?ric=ricsim_g1_5 4 120
+        api_equal json:policy_types?ric=ricsim_g1_6 3 120
+        api_equal json:policy_types?ric=ricsim_g1_7 2 120
+        api_equal json:policy_types?ric=ricsim_g1_8 2 120
+        api_equal json:policy_types?ric=ricsim_g1_9 1 120
+        api_equal json:policy_types?ric=ricsim_g1_10 0 120
+    fi
 
     api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1:???? \
                              ricsim_g1_2:me1_ricsim_g1_2,me2_ricsim_g1_2:1,2:???? \
@@ -302,7 +507,13 @@ for interface in $TESTED_VARIANTS ; do
 
     sim_delete_policy_type 204 ricsim_g1_8 4
 
-    api_equal json:policy_types?ric=ricsim_g1_8 1 120
+    if [ "$PMS_VERSION" == "V2" ]; then
+        api_equal json:policy-types 5 120
+        api_equal json:policy-types?ric_id=ricsim_g1_8 1 120
+    else
+        api_equal json:policy_types 5 120
+        api_equal json:policy_types?ric=ricsim_g1_8 1 120
+    fi
 
     api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1:???? \
                             ricsim_g1_2:me1_ricsim_g1_2,me2_ricsim_g1_2:1,2:???? \
@@ -318,11 +529,13 @@ for interface in $TESTED_VARIANTS ; do
 
 
     check_policy_agent_logs
-    store_logs          ${interface}
-done
-
+    if [[ $interface = *"SDNC"* ]]; then
+        check_sdnc_logs
+    fi
 
+    store_logs          ${interface}
 
+done
 
 
 #### TEST COMPLETE ####
@@ -330,4 +543,4 @@ done
 
 print_result
 
-auto_clean_containers
\ No newline at end of file
+auto_clean_environment
\ No newline at end of file