X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC100.sh;h=a5348a86de4fc4778bd3d9ef339d7bf317a04587;hb=refs%2Fchanges%2F89%2F10889%2F2;hp=4b2e1629c4202e16a24c17ac897fb934f8ba87f2;hpb=de4d0f86a327469fb64645c2bcd3aeea7832ad25;p=nonrtric.git

diff --git a/test/auto-test/FTC100.sh b/test/auto-test/FTC100.sh
index 4b2e1629..a5348a86 100755
--- a/test/auto-test/FTC100.sh
+++ b/test/auto-test/FTC100.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #  ============LICENSE_START===============================================
-#  Copyright (C) 2020 Nordix Foundation. All rights reserved.
+#  Copyright (C) 2020-2023 Nordix Foundation. All rights reserved.
 #  ========================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -18,69 +18,186 @@
 #
 
 
-TC_ONELINE_DESCR="Full agent API walkthrough using agent REST/DMAAP and with/without SDNC A1 Controller"
+TC_ONELINE_DESCR="Full a1pms API walkthrough using a1pms REST and with/without SDNC A1 Controller"
 
-#App names to include in the test, space separated list
-INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC"
+USE_ISTIO=0
 
+#App names to include in the test when running docker, space separated list
+DOCKER_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM SDNC NGW KUBEPROXY"
 
-#SUPPORTED TEST ENV FILE
-SUPPORTED_PROFILES="ONAP-MASTER ONAP-GUILIN ORAN-CHERRY"
+#App names to include in the test when running kubernetes, space separated list
+if [ $USE_ISTIO -eq 0 ]; then
+    KUBE_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM SDNC KUBEPROXY NGW"
+else
+    KUBE_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM SDNC KUBEPROXY NGW KEYCLOAK ISTIO AUTHSIDECAR"
+fi
+#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
+KUBE_PRESTARTED_IMAGES=""
 
-. ../common/testcase_common.sh  $@
-. ../common/agent_api_functions.sh
-. ../common/ricsimulator_api_functions.sh
-. ../common/cr_api_functions.sh
+#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="NGW"
 
-#### TEST BEGIN ####
+#Supported test environment profiles
+SUPPORTED_PROFILES="ONAP-JAKARTA ONAP-KOHN ONAP-LONDON  ORAN-F-RELEASE ORAN-G-RELEASE ORAN-H-RELEASE"
+#Supported run modes
+SUPPORTED_RUNMODES="DOCKER KUBE"
+
+. ../common/testcase_common.sh $@
 
-generate_uuid
+setup_testenvironment
 
-# Tested variants of REST/DMAAP/SDNC config
-TESTED_VARIANTS="REST   DMAAP   REST+SDNC   DMAAP+SDNC"
+#### TEST BEGIN ####
 
-#Test agent and simulator protocol versions (others are http only)
-TESTED_PROTOCOLS="HTTP HTTPS"
+sim_generate_policy_uuid
+
+if [ $USE_ISTIO -eq 0 ]; then
+    # Tested variants of REST/DMAAP/SDNC config
+    if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+        TESTED_VARIANTS="REST   REST+SDNC"
+    else
+        TESTED_VARIANTS="REST   DMAAP   REST+SDNC   DMAAP+SDNC"
+    fi
+
+    #Test a1pms and simulator protocol versions (others are http only)
+    TESTED_PROTOCOLS="HTTP HTTPS"
+else
+    if [ $USE_ISTIO -eq 1 ]; then
+        echo -e $RED"#########################################"$ERED
+        echo -e $RED"# No test of https when running with istio"$ERED
+        echo -e $RED"# No test of SDNC when running with istio"$ERED
+        echo -e $RED"#########################################"$ERED
+    fi
+    # Tested variants of REST/DMAAP/SDNC config
+    if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+        TESTED_VARIANTS="REST   DMAAP"
+    else
+        TESTED_VARIANTS="REST"
+    fi
+
+    #Test a1pms and simulator protocol versions (others are http only)
+    TESTED_PROTOCOLS="HTTP"
+fi
 
 for __httpx in $TESTED_PROTOCOLS ; do
     for interface in $TESTED_VARIANTS ; do
 
         echo "#####################################################################"
         echo "#####################################################################"
-        echo "### Testing agent: $interface using $__httpx"
+        echo "### Testing a1pms: $interface using $__httpx"
         echo "#####################################################################"
         echo "#####################################################################"
 
         # Clean container and start all needed containers #
-        clean_containers
+        clean_environment
+
+        if [ $RUNMODE != "KUBE" ]; then
+            USE_ISTIO=0
+            echo "ISTIO not supported by docker - setting USE-ISTIO=0"
+        fi
+
+        if [ $USE_ISTIO -eq 1 ]; then
+            echo -e $RED"#########################################"$ERED
+            echo -e $RED"# Work around istio jwks cache"$ERED
+            echo -e $RED"# Cycle istiod down and up to clear cache"$ERED
+            echo ""
+            __kube_scale deployment istiod istio-system 0
+            __kube_scale deployment istiod istio-system 1
+            echo -e $RED"# Cycle istiod done"
+            echo -e $RED"#########################################"$ERED
+
+            istio_enable_istio_namespace $KUBE_SIM_NAMESPACE
+            istio_enable_istio_namespace $KUBE_NONRTRIC_NAMESPACE
+            istio_enable_istio_namespace $KUBE_A1SIM_NAMESPACE
+        fi
+
+
+        start_kube_proxy
+
+        if [ $USE_ISTIO -eq 1 ]; then
+            start_keycloak
+
+            keycloak_api_obtain_admin_token
+
+            keycloak_api_create_realm                   nrtrealm   true   60
+            keycloak_api_create_confidential_client     nrtrealm   a1pmsc
+            keycloak_api_generate_client_secret         nrtrealm   a1pmsc
+            keycloak_api_get_client_secret              nrtrealm   a1pmsc
+            keycloak_api_create_client_roles            nrtrealm   a1pmsc nrtrole
+            keycloak_api_map_client_roles               nrtrealm   a1pmsc nrtrole
+
+            keycloak_api_get_client_token               nrtrealm   a1pmsc
+
+            CLIENT_TOKEN=$(keycloak_api_read_client_token nrtrealm   a1pmsc)
+            echo "CLIENT_TOKEN: "$CLIENT_TOKEN
+
+            A1PMS_SEC=$(keycloak_api_read_client_secret nrtrealm   a1pmsc)
+            echo "A1PMS_SEC: "$A1PMS_SEC
+
+            # Protect ricsim-g3
+            istio_req_auth_by_jwks              ricsim-g1 $KUBE_A1SIM_NAMESPACE KUBEPROXY "$KUBE_PROXY_ISTIO_JWKS_KEYS"
+            istio_auth_policy_by_issuer         ricsim-g1 $KUBE_A1SIM_NAMESPACE KUBEPROXY
+
+            istio_req_auth_by_jwksuri           ricsim-g1 $KUBE_A1SIM_NAMESPACE nrtrealm
+            istio_auth_policy_by_realm          ricsim-g1 $KUBE_A1SIM_NAMESPACE nrtrealm a1pmsc nrtrole
+
+            # Protect ricsim-g2
+            istio_req_auth_by_jwks              ricsim-g2 $KUBE_A1SIM_NAMESPACE KUBEPROXY "$KUBE_PROXY_ISTIO_JWKS_KEYS"
+            istio_auth_policy_by_issuer         ricsim-g2 $KUBE_A1SIM_NAMESPACE KUBEPROXY
+
+            istio_req_auth_by_jwksuri           ricsim-g2 $KUBE_A1SIM_NAMESPACE nrtrealm
+            istio_auth_policy_by_realm          ricsim-g2 $KUBE_A1SIM_NAMESPACE nrtrealm a1pmsc nrtrole
+
+            # Protect ricsim-g3
+            istio_req_auth_by_jwks              ricsim-g3 $KUBE_A1SIM_NAMESPACE KUBEPROXY "$KUBE_PROXY_ISTIO_JWKS_KEYS"
+            istio_auth_policy_by_issuer         ricsim-g3 $KUBE_A1SIM_NAMESPACE KUBEPROXY
+
+            istio_req_auth_by_jwksuri           ricsim-g3 $KUBE_A1SIM_NAMESPACE nrtrealm
+            istio_auth_policy_by_realm          ricsim-g3 $KUBE_A1SIM_NAMESPACE nrtrealm a1pmsc nrtrole
+
+            # Protect CR
+            istio_req_auth_by_jwks              $CR_APP_NAME $KUBE_SIM_NAMESPACE KUBEPROXY "$KUBE_PROXY_ISTIO_JWKS_KEYS"
+            istio_auth_policy_by_issuer         $CR_APP_NAME $KUBE_SIM_NAMESPACE KUBEPROXY
+
+            istio_req_auth_by_jwksuri           $CR_APP_NAME $KUBE_SIM_NAMESPACE nrtrealm
+            istio_auth_policy_by_realm          $CR_APP_NAME $KUBE_SIM_NAMESPACE nrtrealm a1pmsc nrtrole
+
+            a1pms_configure_sec nrtrealm a1pmsc $A1PMS_SEC
+        fi
 
         if [ $__httpx == "HTTPS" ]; then
             use_cr_https
-            use_agent_rest_https
+            use_a1pms_rest_https
         else
-            use_agent_rest_http
+            use_a1pms_rest_http
             use_cr_http
         fi
 
-        start_policy_agent
+        start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE
 
-        set_agent_trace
+        set_a1pms_debug
 
         # 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_PATH/ric-registration"
+        # Must use rest towards the a1pms since dmaap is not configured yet
+        a1pms_api_put_service 201 "ric-registration" 0 "$CR_SERVICE_APP_PATH_0/ric-registration"
 
 
         if [ $__httpx == "HTTPS" ]; then
             use_simulator_https
             use_mr_https
             if [[ $interface = *"SDNC"* ]]; then
-                use_sdnc_https
+                if [[ "$SDNC_FEATURE_LEVEL" == *"NO_NB_HTTPS"* ]]; then
+                    deviation "SDNC does not support NB https"
+                    use_sdnc_http
+                else
+                    use_sdnc_https
+                fi
             fi
             if [[ $interface = *"DMAAP"* ]]; then
-                use_agent_dmaap_https
+                use_a1pms_dmaap_https
             else
-                use_agent_rest_https
+                use_a1pms_rest_https
             fi
         else
             use_simulator_http
@@ -89,432 +206,372 @@ for __httpx in $TESTED_PROTOCOLS ; do
                 use_sdnc_http
             fi
             if [[ $interface = *"DMAAP"* ]]; then
-                use_agent_dmaap_http
+                use_a1pms_dmaap_http
             else
-                use_agent_rest_http
+                use_a1pms_rest_http
             fi
         fi
 
         start_ric_simulators ricsim_g1 1  OSC_2.1.0
         start_ric_simulators ricsim_g2 1  STD_1.1.3
-        if [ "$PMS_VERSION" == "V2" ]; then
-            start_ric_simulators ricsim_g3 1  STD_2.0.0
+
+        sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json
+        sim_put_policy_type 201 ricsim_g1_1 2 testdata/OSC/sim_2.json
+
+        start_ric_simulators ricsim_g3 1  STD_2.0.0
+        sim_put_policy_type 201 ricsim_g3_1 STD_QOS_0_2_0 testdata/STD2/sim_qos.json
+        sim_put_policy_type 201 ricsim_g3_1 STD_QOS2_0.1.0 testdata/STD2/sim_qos2.json
+
+        if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+            :
+        else
+            start_mr
         fi
 
-        start_mr
+        start_cr 1
 
-        start_cr
+        start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
 
-        start_control_panel
+        if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then
+            start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE
+        fi
 
-        start_consul_cbs
 
         if [[ $interface = *"SDNC"* ]]; then
             start_sdnc
-            prepare_consul_config      SDNC    ".consul_config.json"
+            controller_api_wait_for_status_ok 200 ricsim_g1_1
+            prepare_a1pms_config      SDNC    ".a1pms_config.json"
         else
-            prepare_consul_config      NOSDNC  ".consul_config.json"
+            prepare_a1pms_config      NOSDNC  ".a1pms_config.json"
         fi
 
-        consul_config_app                      ".consul_config.json"
-
-        sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json
-        sim_put_policy_type 201 ricsim_g1_1 2 testdata/OSC/sim_2.json
-
-        if [ "$PMS_VERSION" == "V2" ]; then
-            sim_put_policy_type 201 ricsim_g3_1 STD_QOS_0_2_0 testdata/STD2/sim_qos.json
-            sim_put_policy_type 201 ricsim_g3_1 STD_QOS2_0.1.0 testdata/STD2/sim_qos2.json
-
-            api_equal json:rics 3 60
+        if [ $RUNMODE == "KUBE" ]; then
+            a1pms_load_config                       ".a1pms_config.json"
+        else
+            #Temporary switch to http/https if dmaap use. Otherwise it is not possibble to push config
+            if [ $__httpx == "HTTPS" ]; then
+                use_a1pms_rest_https
+            else
+                use_a1pms_rest_http
+            fi
 
-            api_equal json:policy-types 5 120
+            if [[ $interface != *"DMAAP"* ]]; then
+                echo "{}" > ".a1pms_config_incorrect.json"
+                a1pms_api_put_configuration 400 ".a1pms_config_incorrect.json"
+            fi
 
-            api_equal json:policies 0
+            a1pms_api_put_configuration 200 ".a1pms_config.json"
+            a1pms_api_get_configuration 200 ".a1pms_config.json"
+            if [ $__httpx == "HTTPS" ]; then
+                if [[ $interface = *"DMAAP"* ]]; then
+                    use_a1pms_dmaap_https
+                else
+                    use_a1pms_rest_https
+                fi
+            else
+                if [[ $interface = *"DMAAP"* ]]; then
+                    use_a1pms_dmaap_http
+                else
+                    use_a1pms_rest_http
+                fi
+            fi
+        fi
 
-            api_equal json:policy-instances 0
-        else
-            api_equal json:rics 2 60
+        a1pms_equal json:rics 3 300
 
-            api_equal json:policy_schemas 3 120
+        a1pms_equal json:policy-types 5 120
 
-            api_equal json:policy_types 3
+        a1pms_equal json:policies 0
 
-            api_equal json:policies 0
+        a1pms_equal json:policy-instances 0
 
-            api_equal json:policy_ids 0
-        fi
+        cr_equal 0 received_callbacks 3 120
+        cr_api_check_all_sync_events 200 0 ric-registration ricsim_g1_1 ricsim_g2_1 ricsim_g3_1
 
-        if [ "$PMS_VERSION" == "V2" ]; then
-            cr_equal received_callbacks 3 120
-            cr_api_check_all_sync_events 200 ric-registration ricsim_g1_1 ricsim_g2_1 ricsim_g3_1
+        if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+            :
+        else
+            mr_equal requests_submitted 0
         fi
-        mr_equal requests_submitted 0
 
 
         echo "############################################"
         echo "############## Health check ################"
         echo "############################################"
 
-        api_get_status 200
+        sleep_wait 120 "Let A1PMS cofiguration take effect"
+
+        a1pms_api_get_status 200
+
+        a1pms_api_get_status_root 200
 
         echo "############################################"
         echo "##### Service registry and supervision #####"
         echo "############################################"
 
-        api_get_services 404 "service1"
+        a1pms_api_get_services 404 "service1"
 
-        api_put_service 201 "service1" 1000 "$CR_PATH/1"
+        a1pms_api_put_service 201 "service1" 1000 "$CR_SERVICE_APP_PATH_0/1"
 
-        api_put_service 200 "service1" 2000 "$CR_PATH/1"
+        a1pms_api_put_service 200 "service1" 2000 "$CR_SERVICE_APP_PATH_0/1"
 
 
-        api_put_service 400 "service2" -1 "$CR_PATH/2"
+        a1pms_api_put_service 400 "service2" -1 "$CR_SERVICE_APP_PATH_0/2"
 
-        api_put_service 400 "service2" "wrong" "$CR_PATH/2"
+        a1pms_api_put_service 400 "service2" "wrong" "$CR_SERVICE_APP_PATH_0/2"
 
-        api_put_service 400 "service2" 100 "/test"
+        a1pms_api_put_service 400 "service2" 100 "/test"
 
-        api_put_service 400 "service2" 100 "test-path"
+        a1pms_api_put_service 400 "service2" 100 "test-path"
 
-        api_put_service 201 "service2" 300 "ftp://localhost:80/test"
+        a1pms_api_put_service 201 "service2" 300 "ftp://localhost:80/test"
 
-        api_get_services 200 "service1" "service1" 2000 "$CR_PATH/1"
+        a1pms_api_get_services 200 "service1" "service1" 2000 "$CR_SERVICE_APP_PATH_0/1"
 
-        api_get_service_ids 200 "service1" "service2" "ric-registration"
+        a1pms_api_get_service_ids 200 "service1" "service2" "ric-registration"
 
 
-        api_put_service 201 "service3" 5000 "$CR_PATH/3"
+        a1pms_api_put_service 201 "service3" 5000 "$CR_SERVICE_APP_PATH_0/3"
 
 
-        api_get_service_ids 200 "service1" "service2" "service3" "ric-registration"
+        a1pms_api_get_service_ids 200 "service1" "service2" "service3" "ric-registration"
 
 
-        api_get_services 200 "service1" "service1" 2000 "$CR_PATH/1"
+        a1pms_api_get_services 200 "service1" "service1" 2000 "$CR_SERVICE_APP_PATH_0/1"
 
-        api_get_services 200 NOSERVICE "service1" 2000 "$CR_PATH/1" "service2" 300 "ftp://localhost:80/test" "service3" 5000 "$CR_PATH/3"  "ric-registration" 0 "$CR_PATH/ric-registration"
+        a1pms_api_get_services 200 NOSERVICE "service1" 2000 "$CR_SERVICE_APP_PATH_0/1" "service2" 300 "ftp://localhost:80/test" "service3" 5000 "$CR_SERVICE_APP_PATH_0/3"  "ric-registration" 0 "$CR_SERVICE_APP_PATH_0/ric-registration"
 
-        api_get_services 200
+        a1pms_api_get_services 200
 
         deviation "TR2 - Keep alive shall return 200/201 according to doc, only 200 works - test combo $interface and $__httpx"
         #The below should work, keept here until fixed or other decision made
-        #api_put_services_keepalive 201 "service1"
+        #a1pms_api_put_services_keepalive 201 "service1"
         #Using the below until decision
-        api_put_services_keepalive 200 "service1"
+        a1pms_api_put_services_keepalive 200 "service1"
 
         deviation "TR2 - Keep alive shall return 200/201 according to doc, only 200 works - test combo $interface and $__httpx"
         #The below should work, keept here until fixed or other decision made
-        #api_put_services_keepalive 201 "service3"
+        #a1pms_api_put_services_keepalive 201 "service3"
         #Using the below until decision
-        api_put_services_keepalive 200 "service3"
+        a1pms_api_put_services_keepalive 200 "service3"
 
-        api_put_services_keepalive 200 "service1"
+        a1pms_api_put_services_keepalive 200 "service1"
 
-        api_put_services_keepalive 200 "service3"
+        a1pms_api_put_services_keepalive 200 "service3"
 
-        api_put_services_keepalive 404 "service5"
+        a1pms_api_put_services_keepalive 404 "service5"
 
-        api_get_service_ids 200 "service1" "service2" "service3"  "ric-registration"
+        a1pms_api_get_service_ids 200 "service1" "service2" "service3"  "ric-registration"
 
-        api_delete_services 204 "service1"
+        a1pms_api_delete_services 204 "service1"
 
-        api_get_service_ids 200 "service2" "service3" "ric-registration"
+        a1pms_api_get_service_ids 200 "service2" "service3" "ric-registration"
 
 
-        api_put_service 201 "service1" 50 "$CR_PATH/1"
+        a1pms_api_put_service 201 "service1" 50 "$CR_SERVICE_APP_PATH_0/1"
 
-        api_get_service_ids 200 "service1" "service2" "service3"  "ric-registration"
+        a1pms_api_get_service_ids 200 "service1" "service2" "service3"  "ric-registration"
 
 
-        api_delete_services 204 "service1"
-        api_delete_services 204 "service3"
+        a1pms_api_delete_services 204 "service1"
+        a1pms_api_delete_services 204 "service3"
 
-        api_equal json:services 2
+        a1pms_equal json:services 2
 
-        api_delete_services 204 "service2"
+        a1pms_api_delete_services 204 "service2"
 
-        api_equal json:services 1
+        a1pms_equal json:services 1
 
 
         echo "############################################"
         echo "############## RIC Repository ##############"
         echo "############################################"
 
-        if [ "$PMS_VERSION" == "V2" ]; then
-            api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE  ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0,STD_QOS2_0.1.0:AVAILABLE"
-        else
-            api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE  ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE"
-        fi
-        api_get_rics 200 1 "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE"
+        a1pms_api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE  ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0,STD_QOS2_0.1.0:AVAILABLE"
 
-        api_get_rics 404 47
+        a1pms_api_get_rics 200 1 "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE"
 
-        api_get_rics 404 "test"
+        a1pms_api_get_rics 404 47
 
-        if [ "$PMS_VERSION" == "V2" ]; then
-            api_get_ric 200 me1_ricsim_g1_1 NORIC "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE"
+        a1pms_api_get_rics 404 "test"
 
-            api_get_ric 200 me2_ricsim_g1_1 NORIC "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE"
+        a1pms_api_get_ric 200 me1_ricsim_g1_1 NORIC "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE"
 
-            api_get_ric 200 me1_ricsim_g2_1 NORIC "ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE"
+        a1pms_api_get_ric 200 me2_ricsim_g1_1 NORIC "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE"
 
-            api_get_ric 200 me2_ricsim_g2_1 NORIC "ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE"
+        a1pms_api_get_ric 200 me1_ricsim_g2_1 NORIC "ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE"
 
-            api_get_ric 200 me1_ricsim_g3_1 NORIC "ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0,STD_QOS2_0.1.0:AVAILABLE"
+        a1pms_api_get_ric 200 me2_ricsim_g2_1 NORIC "ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE"
 
-            api_get_ric 200 me2_ricsim_g3_1 NORIC "ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0,STD_QOS2_0.1.0:AVAILABLE"
+        a1pms_api_get_ric 200 me1_ricsim_g3_1 NORIC "ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0,STD_QOS2_0.1.0:AVAILABLE"
 
-            api_get_ric 200 NOME      ricsim_g1_1 "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE"
+        a1pms_api_get_ric 200 me2_ricsim_g3_1 NORIC "ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0,STD_QOS2_0.1.0:AVAILABLE"
 
-            api_get_ric 200 NOME      ricsim_g2_1 "ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE"
+        a1pms_api_get_ric 200 NOME      ricsim_g1_1 "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE"
 
-            api_get_ric 200 NOME      ricsim_g3_1 "ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0,STD_QOS2_0.1.0:AVAILABLE"
+        a1pms_api_get_ric 200 NOME      ricsim_g2_1 "ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE"
 
-            api_get_ric 404 NOME test1
+        a1pms_api_get_ric 200 NOME      ricsim_g3_1 "ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0,STD_QOS2_0.1.0:AVAILABLE"
 
-            api_get_ric 404 test NORIC
+        a1pms_api_get_ric 404 NOME test1
 
-            api_get_ric 400 me1_ricsim_g1_1 ricsim_g1_1
+        a1pms_api_get_ric 404 test NORIC
 
-            api_get_ric 400 me1_ricsim_g1_1 TESTRIC
+        a1pms_api_get_ric 400 me1_ricsim_g1_1 ricsim_g1_1
 
-            api_get_ric 400 TESTME ricsim_g1_1
-
-        else
-            api_get_ric 200 me1_ricsim_g1_1 ricsim_g1_1
+        a1pms_api_get_ric 400 me1_ricsim_g1_1 TESTRIC
 
-            api_get_ric 200 me2_ricsim_g1_1 ricsim_g1_1
-
-            api_get_ric 200 me1_ricsim_g2_1 ricsim_g2_1
-
-            api_get_ric 200 me2_ricsim_g2_1 ricsim_g2_1
-
-            api_get_ric 404 test
-        fi
+        a1pms_api_get_ric 400 TESTME ricsim_g1_1
 
         echo "############################################"
         echo "########### A1 Policy Management ###########"
         echo "############################################"
 
-        if [ "$PMS_VERSION" == "V2" ]; then
-            deviation "TR9 - agent modify the type with type id - test combo $interface and $__httpx"
-            #Behaviour accepted for now
-            api_get_policy_type 200 1 testdata/OSC/1-agent-modified.json
-            deviation "TR9 - agent modify the type with type id - test combo $interface and $__httpx"
-            #Behaviour accepted for now
-            api_get_policy_type 200 2 testdata/OSC/2-agent-modified.json
-            deviation "TR9 - agent modify the type with type id - test combo $interface and $__httpx"
-            #Behaviour accepted for now
-            api_get_policy_type 200 STD_QOS_0_2_0 testdata/STD2/qos-agent-modified.json
-            deviation "TR9 - agent modify the type with type id - test combo $interface and $__httpx"
-            #Behaviour accepted for now
-            api_get_policy_type 200 STD_QOS2_0.1.0 testdata/STD2/qos2-agent-modified.json
-
-            api_get_policy_type 404 3
-        else
-            deviation "TR9 - agent modify the type with type id - test combo $interface and $__httpx"
-            #Behaviour accepted for now
-            api_get_policy_schema 200 1 testdata/OSC/1-agent-modified.json
-            deviation "TR9 - agent modify the type with type id - test combo $interface and $__httpx"
-            #Behaviour accepted for now
-            api_get_policy_schema 200 2 testdata/OSC/2-agent-modified.json
-
-            api_get_policy_schema 404 3
-        fi
+        deviation "TR9 - a1pms modify the type with type id - test combo $interface and $__httpx"
+        #Behaviour accepted for now
+        a1pms_api_get_policy_type 200 1 testdata/OSC/1-a1pms-modified.json
+        deviation "TR9 - a1pms modify the type with type id - test combo $interface and $__httpx"
+        #Behaviour accepted for now
+        a1pms_api_get_policy_type 200 2 testdata/OSC/2-a1pms-modified.json
+        deviation "TR9 - a1pms modify the type with type id - test combo $interface and $__httpx"
+        #Behaviour accepted for now
+        a1pms_api_get_policy_type 200 STD_QOS_0_2_0 testdata/STD2/qos-a1pms-modified.json
+        deviation "TR9 - a1pms modify the type with type id - test combo $interface and $__httpx"
+        #Behaviour accepted for now
+        a1pms_api_get_policy_type 200 STD_QOS2_0.1.0 testdata/STD2/qos2-a1pms-modified.json
 
-        if [ "$PMS_VERSION" == "V2" ]; then
-            api_get_policy_schemas 404
-        else
-            deviation "TR9 - agent modify the type with type id - test combo $interface and $__httpx"
-            #Behaviour accepted for now
-            api_get_policy_schemas 200 NORIC testdata/OSC/1-agent-modified.json testdata/OSC/2-agent-modified.json NOFILE
-            deviation "TR9 - agent modify the type with type id - test combo $interface and $__httpx"
-            #Behaviour accepted for now
-            api_get_policy_schemas 200 ricsim_g1_1 testdata/OSC/1-agent-modified.json testdata/OSC/2-agent-modified.json
+        a1pms_api_get_policy_type 404 3
 
-            api_get_policy_schemas 200 ricsim_g2_1 NOFILE
+        a1pms_api_get_policy_schemas 404
 
-            api_get_policy_schemas 404 test
-        fi
 
+        a1pms_api_get_policy_types 200 NORIC 1 2 EMPTY STD_QOS_0_2_0 STD_QOS2_0.1.0
 
-        if [ "$PMS_VERSION" == "V2" ]; then
-            api_get_policy_types 200 NORIC 1 2 EMPTY STD_QOS_0_2_0 STD_QOS2_0.1.0
-        else
-            api_get_policy_types 200 NORIC 1 2 EMPTY
-        fi
+        a1pms_api_get_policy_types 200 ricsim_g1_1 1 2
 
-        api_get_policy_types 200 ricsim_g1_1 1 2
+        a1pms_api_get_policy_types 200 ricsim_g2_1 EMPTY
 
-        api_get_policy_types 200 ricsim_g2_1 EMPTY
+        a1pms_api_get_policy_types 200 ricsim_g3_1 STD_QOS_0_2_0 STD_QOS2_0.1.0
 
-        if [ "$PMS_VERSION" == "V2" ]; then
-            api_get_policy_types 200 ricsim_g3_1 STD_QOS_0_2_0 STD_QOS2_0.1.0
-        fi
+        a1pms_api_get_policy_types 404 dummy-ric
 
-        api_get_policy_types 404 dummy-ric
 
 
+        a1pms_api_put_service 201 "service10" 3600 "$CR_SERVICE_APP_PATH_0/1"
 
-        api_put_service 201 "service10" 3600 "$CR_PATH/1"
+        notificationurl=$CR_SERVICE_APP_PATH_0"/test"
 
-        if [ "$PMS_VERSION" == "V2" ]; then
-            notificationurl=$CR_PATH"/test"
-        else
-            notificationurl=""
+        if [[ $interface != *"DMAAP"* ]]; then
+            # Badly formatted json is not possible to send via dmaap
+            a1pms_api_put_policy 400 "unregistered-service" ricsim_g1_1 1 2000 NOTRANSIENT $notificationurl testdata/OSC/pi_bad_template.json
         fi
-        deviation "TR10 - agent allows policy creation on unregistered service (orig problem) - test combo $interface and $__httpx"
+        deviation "TR10 - a1pms allows policy creation on unregistered service (orig problem) - test combo $interface and $__httpx"
         #Kept until decison
-        #api_put_policy 400 "unregistered-service" ricsim_g1_1 1 2000 NOTRANSIENT testdata/OSC/pi1_template.json
+        #a1pms_api_put_policy 400 "unregistered-service" ricsim_g1_1 1 2000 NOTRANSIENT testdata/OSC/pi1_template.json
         #Allow 201 for now
-        api_put_policy 201 "unregistered-service" ricsim_g1_1 1 2000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json
+        a1pms_api_put_policy 201 "unregistered-service" ricsim_g1_1 1 2000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json
 
-        api_put_policy 201 "service10" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json
-        api_put_policy 200 "service10" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json
+        a1pms_api_put_policy 201 "service10" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json
+        a1pms_api_put_policy 200 "service10" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json
 
-        api_put_policy 200 "service10" ricsim_g1_1 1 5000 true $notificationurl testdata/OSC/pi1_template.json
-        api_put_policy 200 "service10" ricsim_g1_1 1 5000 false $notificationurl testdata/OSC/pi1_template.json
+        a1pms_api_put_policy 200 "service10" ricsim_g1_1 1 5000 true $notificationurl testdata/OSC/pi1_template.json
+        a1pms_api_put_policy 200 "service10" ricsim_g1_1 1 5000 false $notificationurl testdata/OSC/pi1_template.json
 
-        api_put_policy 201 "service10" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json
-        api_put_policy 200 "service10" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json
+        a1pms_api_put_policy 201 "service10" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json
+        a1pms_api_put_policy 200 "service10" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json
 
-        api_put_policy 200 "service10" ricsim_g2_1 NOTYPE 5100 true $notificationurl testdata/STD/pi1_template.json
-        api_put_policy 200 "service10" ricsim_g2_1 NOTYPE 5100 false $notificationurl testdata/STD/pi1_template.json
+        a1pms_api_put_policy 200 "service10" ricsim_g2_1 NOTYPE 5100 true $notificationurl testdata/STD/pi1_template.json
+        a1pms_api_put_policy 200 "service10" ricsim_g2_1 NOTYPE 5100 false $notificationurl testdata/STD/pi1_template.json
 
-        if [ "$PMS_VERSION" == "V2" ]; then
-            api_put_policy 201 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json
-            api_put_policy 200 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json
+        a1pms_api_put_policy 201 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json
+        a1pms_api_put_policy 200 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json
 
-            api_put_policy 200 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 true $notificationurl testdata/STD2/pi_qos2_template.json
-            api_put_policy 200 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 false $notificationurl testdata/STD2/pi_qos2_template.json
-        fi
+        a1pms_api_put_policy 200 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 true $notificationurl testdata/STD2/pi_qos2_template.json
+        a1pms_api_put_policy 200 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 false $notificationurl testdata/STD2/pi_qos2_template.json
 
+        a1pms_api_get_policy_status 404 1
+        a1pms_api_get_policy_status 404 2
         VAL='NOT IN EFFECT'
-        api_get_policy_status 200 5000 OSC "$VAL" "false"
-        api_get_policy_status 200 5100 STD "UNDEFINED"
-        if [ "$PMS_VERSION" == "V2" ]; then
-            api_get_policy_status 200 5200 STD2 EMPTY EMPTY
-        fi
+        a1pms_api_get_policy_status 200 5000 OSC "$VAL" "false"
+        a1pms_api_get_policy_status 200 5100 STD "UNDEFINED"
+        a1pms_api_get_policy_status 200 5200 STD2 EMPTY EMPTY
 
 
-        deviation "TR10 - agent allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx"
+        deviation "TR10 - a1pms allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx"
         #kept until decision
-        #api_equal json:policies 2
+        #a1pms_equal json:policies 2
         #Allow 3 for now
-        if [ "$PMS_VERSION" == "V2" ]; then
-            api_equal json:policies 4
-        else
-            api_equal json:policies 3
-        fi
+        a1pms_equal json:policies 4
 
-        deviation "TR10 - agent allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx"
+        deviation "TR10 - a1pms allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx"
         #kept until decision
-        #api_equal json:policy_ids 2
+        #a1pms_equal json:policy_ids 2
         #Allow 3 for now
-        if [ "$PMS_VERSION" == "V2" ]; then
-            api_equal json:policy-instances 4
-        else
-            api_equal json:policy_ids 3
-        fi
+        a1pms_equal json:policy-instances 4
 
-        deviation "TR10 - agent allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx"
+        deviation "TR10 - a1pms allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx"
         #kept until decision
-        #api_get_policy_ids 200 NORIC NOSERVICE NOTYPE 5000 5100
+        #a1pms_api_get_policy_ids 200 NORIC NOSERVICE NOTYPE 5000 5100
         #Allow policy create with unregistered service for now
-        if [ "$PMS_VERSION" == "V2" ]; then
-            api_get_policy_ids 200 NORIC NOSERVICE NOTYPE 5000 5100 2000 5200
-        else
-            api_get_policy_ids 200 NORIC NOSERVICE NOTYPE 5000 5100 2000
-        fi
+        a1pms_api_get_policy_ids 200 NORIC NOSERVICE NOTYPE 5000 5100 2000 5200
 
-        deviation "TR10 - agent allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx"
+        deviation "TR10 - a1pms allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx"
         #kept until decision
-        #api_get_policy_ids 200 ricsim_g1_1 NOSERVICE NOTYPE 5000
+        #a1pms_api_get_policy_ids 200 ricsim_g1_1 NOSERVICE NOTYPE 5000
         #Allow policy create with unregistered service for now
-        if [ "$PMS_VERSION" == "V2" ]; then
-            api_get_policy_ids 200 ricsim_g1_1 NOSERVICE NOTYPE 5000 2000
-
-            api_get_policy_ids 200 ricsim_g2_1 NOSERVICE NOTYPE 5100
+        a1pms_api_get_policy_ids 200 ricsim_g1_1 NOSERVICE NOTYPE 5000 2000
 
-            api_get_policy_ids 200 ricsim_g3_1 NOSERVICE NOTYPE 5200
+        a1pms_api_get_policy_ids 200 ricsim_g2_1 NOSERVICE NOTYPE 5100
 
-            api_get_policy_ids 200 NORIC "service10" NOTYPE 5000 5100 5200
-        else
-            api_get_policy_ids 200 ricsim_g1_1 NOSERVICE NOTYPE 5000 2000
-
-            api_get_policy_ids 200 ricsim_g2_1 NOSERVICE NOTYPE 5100
+        a1pms_api_get_policy_ids 200 ricsim_g3_1 NOSERVICE NOTYPE 5200
 
+        a1pms_api_get_policy_ids 200 NORIC "service10" NOTYPE 5000 5100 5200
 
-            api_get_policy_ids 200 NORIC "service10" NOTYPE 5000 5100
-        fi
-
-        deviation "TR10 - agent allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx"
+        deviation "TR10 - a1pms allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx"
         #kept until decision
-        #api_get_policy_ids 200 NORIC NOSERVICE 1 5000
+        #a1pms_api_get_policy_ids 200 NORIC NOSERVICE 1 5000
         #Allow policy create with unregistered service for now
 
-        api_get_policy_ids 200 NORIC NOSERVICE 1 5000 2000
+        a1pms_api_get_policy_ids 200 NORIC NOSERVICE 1 5000 2000
 
-        api_get_policy_ids 200 NORIC NOSERVICE 2 NOID
+        a1pms_api_get_policy_ids 200 NORIC NOSERVICE 2 NOID
 
-        if [ "$PMS_VERSION" == "V2" ]; then
-            api_get_policy_ids 200 NORIC NOSERVICE STD_QOS2_0.1.0 5200
-        fi
-
-        api_get_policy_ids 200 ricsim_g2_1 NOSERVICE 1 NOID
+        a1pms_api_get_policy_ids 200 NORIC NOSERVICE STD_QOS2_0.1.0 5200
 
-        if [ "$PMS_VERSION" == "V2" ]; then
-            api_get_policy 200 5000 testdata/OSC/pi1_template.json "service10" ricsim_g1_1 1 false $notificationurl
+        a1pms_api_get_policy_ids 200 ricsim_g2_1 NOSERVICE 1 NOID
 
-            api_get_policy 200 5100 testdata/STD/pi1_template.json "service10" ricsim_g2_1 NOTYPE false $notificationurl
+        a1pms_api_get_policy 200 5000 testdata/OSC/pi1_template.json "service10" ricsim_g1_1 1 false $notificationurl
 
-            api_get_policy 200 5200 testdata/STD2/pi_qos2_template.json "service10" ricsim_g3_1 STD_QOS2_0.1.0 false $notificationurl
+        a1pms_api_get_policy 200 5100 testdata/STD/pi1_template.json "service10" ricsim_g2_1 NOTYPE false $notificationurl
 
-            api_get_policies 200 ricsim_g1_1 "service10" 1 5000 ricsim_g1_1 "service10" 1 false $notificationurl testdata/OSC/pi1_template.json
-        else
-            api_get_policy 200 5000 testdata/OSC/pi1_template.json
+        a1pms_api_get_policy 200 5200 testdata/STD2/pi_qos2_template.json "service10" ricsim_g3_1 STD_QOS2_0.1.0 false $notificationurl
 
-            api_get_policy 200 5100 testdata/STD/pi1_template.json
+        a1pms_api_get_policies 200 ricsim_g1_1 "service10" 1 5000 ricsim_g1_1 "service10" 1 false $notificationurl testdata/OSC/pi1_template.json
 
-            api_get_policies 200 ricsim_g1_1 "service10" 1 5000 ricsim_g1_1 "service10" 1 testdata/OSC/pi1_template.json
-        fi
-
-        deviation "TR10 - agent allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx"
+        deviation "TR10 - a1pms allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx"
         #kept until decision
-        #api_delete_policy 404 2000
+        #a1pms_api_delete_policy 404 2000
         #Allow policy create with unregistered service for now
-        api_delete_policy 204 2000
+        a1pms_api_delete_policy 204 2000
 
-        api_delete_policy 404 1500
+        a1pms_api_delete_policy 404 1500
 
-        api_delete_policy 204 5000
+        a1pms_api_delete_policy 204 5000
 
-        if [ "$PMS_VERSION" == "V2" ]; then
+        a1pms_api_delete_policy 204 5200
 
-            api_delete_policy 204 5200
-        fi
+        a1pms_equal json:policies 1
 
-        api_equal json:policies 1
 
+        a1pms_equal json:policy-instances 1
 
-        if [ "$PMS_VERSION" == "V2" ]; then
-            api_equal json:policy-instances 1
-        else
-            api_equal json:policy_ids 1
-        fi
+        a1pms_api_delete_policy 204 5100
 
-        api_delete_policy 204 5100
+        a1pms_equal json:policies 0
 
-        api_equal json:policies 0
+        a1pms_equal json:policy-instances 0
 
-        if [ "$PMS_VERSION" == "V2" ]; then
-            api_equal json:policy-instances 0
-        else
-            api_equal json:policy_ids 0
-        fi
-
-        if [ "$PMS_VERSION" == "V2" ]; then
-            cr_equal received_callbacks 3
-        fi
+        cr_equal 0 received_callbacks 3
 
         if [[ $interface = *"DMAAP"* ]]; then
             mr_greater requests_submitted 0
@@ -525,25 +582,25 @@ for __httpx in $TESTED_PROTOCOLS ; do
             mr_equal current_requests 0
             mr_equal current_responses 0
         else
-            mr_equal requests_submitted 0
-        fi
-
-        if [[ $interface = *"SDNC"* ]]; then
-            sim_contains_str ricsim_g1_1 remote_hosts "a1-controller"
-            sim_contains_str ricsim_g2_1 remote_hosts "a1-controller"
-            if [ "$PMS_VERSION" == "V2" ]; then
-                sim_contains_str ricsim_g3_1 remote_hosts "a1-controller"
+            if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+                :
+            else
+                mr_equal requests_submitted 0
             fi
-        else
-            sim_contains_str ricsim_g1_1 remote_hosts "policy-agent"
-            sim_contains_str ricsim_g2_1 remote_hosts "policy-agent"
-            if [ "$PMS_VERSION" == "V2" ]; then
-                sim_contains_str ricsim_g3_1 remote_hosts "policy-agent"
+        fi
+        if [ $USE_ISTIO -eq 0 ]; then
+            if [[ $interface = *"SDNC"* ]]; then
+                sim_contains_str ricsim_g1_1 remote_hosts $SDNC_APP_NAME
+                sim_contains_str ricsim_g2_1 remote_hosts $SDNC_APP_NAME
+                sim_contains_str ricsim_g3_1 remote_hosts $SDNC_APP_NAME
+            else
+                sim_contains_str ricsim_g1_1 remote_hosts $A1PMS_APP_NAME
+                sim_contains_str ricsim_g2_1 remote_hosts $A1PMS_APP_NAME
+                sim_contains_str ricsim_g3_1 remote_hosts $A1PMS_APP_NAME
             fi
         fi
 
-        check_policy_agent_logs
-        check_control_panel_logs
+        check_a1pms_logs
 
         if [[ $interface = *"SDNC"* ]]; then
             check_sdnc_logs
@@ -560,4 +617,4 @@ done
 
 print_result
 
-auto_clean_containers
+auto_clean_environment