X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC810.sh;h=5db4279f5e9fc4b5656a77a2f9ddcc5ab2e98413;hb=refs%2Fchanges%2F33%2F9733%2F1;hp=02b8db989ec066eb923bd3a48b071177b9be825a;hpb=6f48adb69090799c74c29204dd2cd1737cc9d6ac;p=nonrtric.git

diff --git a/test/auto-test/FTC810.sh b/test/auto-test/FTC810.sh
index 02b8db98..5db4279f 100755
--- a/test/auto-test/FTC810.sh
+++ b/test/auto-test/FTC810.sh
@@ -17,36 +17,27 @@
 #  ============LICENSE_END=================================================
 #
 
-TC_ONELINE_DESCR="Repeatedly create and delete policies in each RICs for 24h (or configured number of days). Via agent REST/DMAAP/DMAAP_BATCH and SDNC using http or https"
+TC_ONELINE_DESCR="Repeatedly create and delete policies in each RICs for 24h (or configured number of days). Via a1pms REST/DMAAP/DMAAP_BATCH and SDNC using http or https"
 
 #App names to include in the test when running docker, space separated list
-DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC NGW KUBEPROXY"
+DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR A1PMS RICSIM SDNC NGW KUBEPROXY"
 
 #App names to include in the test when running kubernetes, space separated list
-KUBE_INCLUDED_IMAGES="CP CR MR PA RICSIM SDNC KUBEPROXY NGW"
+KUBE_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM SDNC KUBEPROXY NGW"
 #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="NGW"
+CONDITIONALLY_IGNORED_IMAGES="CBS CONSUL NGW"
 
 #Supported test environment profiles
-SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU ONAP-ISTANBUL ORAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE"
+SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU ONAP-ISTANBUL ONAP-JAKARTA ONAP-KOHN ONAP-LONDON  ORAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE ORAN-F-RELEASE ORAN-G-RELEASE"
 #Supported run modes
 SUPPORTED_RUNMODES="DOCKER KUBE"
 
-. ../common/testcase_common.sh  $@
-. ../common/agent_api_functions.sh
-. ../common/ricsimulator_api_functions.sh
-. ../common/cr_api_functions.sh
-. ../common/mr_api_functions.sh
-. ../common/control_panel_api_functions.sh
-. ../common/controller_api_functions.sh
-. ../common/consul_cbs_functions.sh
-. ../common/kube_proxy_api_functions.sh
-. ../common/gateway_api_functions.sh
+. ../common/testcase_common.sh $@
 
 setup_testenvironment
 
@@ -59,7 +50,7 @@ generate_policy_uuid
 
 # Number of RICs per interface type (OSC and STD)
 NUM_RICS=30
-if [ "$PMS_VERSION" == "V2" ]; then
+if [ "$A1PMS_VERSION" == "V2" ]; then
    NUM_RICS=20 # 3 A1 interfaces test, less sims per interface. total sims will be same
 fi
 
@@ -77,12 +68,12 @@ HTTPX=HTTPS
 
 if [ $HTTPX == "HTTP" ]; then
    use_cr_http
-   use_agent_rest_http
+   use_a1pms_rest_http
    use_sdnc_http
    use_simulator_http
 else
    use_cr_https
-   use_agent_rest_https
+   use_a1pms_rest_https
    use_sdnc_https
    use_simulator_https
 fi
@@ -91,13 +82,13 @@ start_ric_simulators ricsim_g1 $NUM_RICS OSC_2.1.0
 
 start_ric_simulators ricsim_g2 $NUM_RICS STD_1.1.3
 
-if [ "$PMS_VERSION" == "V2" ]; then
+if [ "$A1PMS_VERSION" == "V2" ]; then
    start_ric_simulators ricsim_g3 $NUM_RICS  STD_2.0.0
 fi
 
 start_mr
 
-start_cr
+start_cr 1
 
 start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
 
@@ -105,24 +96,36 @@ if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then
    start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE
 fi
 
-start_policy_agent NORPOXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/$POLICY_AGENT_CONFIG_FILE
+A1PMS_RETRY_CODES=423
+start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE
 
-if [ $RUNMODE == "DOCKER" ]; then
-   start_consul_cbs
+__CONFIG_HEADER="NOHEADER"
+if [ $RUNMODE == "KUBE" ]; then
+   __CONFIG_HEADER="HEADER"
+else
+   if [[ "$A1PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then
+   __CONFIG_HEADER="HEADER"
+   fi
 fi
 
-prepare_consul_config      SDNC  ".consul_config.json"
+prepare_consul_config      SDNC  ".consul_config.json" $__CONFIG_HEADER
 
 if [ $RUNMODE == "KUBE" ]; then
-   agent_load_config                       ".consul_config.json"
+    a1pms_load_config                       ".consul_config.json"
 else
-   consul_config_app                      ".consul_config.json"
+    if [[ "$A1PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then
+        a1pms_api_put_configuration 200 ".consul_config.json"
+    else
+        start_consul_cbs
+        consul_config_app                   ".consul_config.json"
+    fi
 fi
 
 start_sdnc
 
+sleep_wait 120 "Let A1PMS cofiguration take effect"
 
-api_get_status 200
+a1pms_api_get_status 200
 
 echo "Print the interface for group 1 simulators, shall be OSC"
 for ((i=1; i<=$NUM_RICS; i++))
@@ -136,7 +139,7 @@ do
    sim_print ricsim_g2_$i interface
 done
 
-if [ "$PMS_VERSION" == "V2" ]; then
+if [ "$A1PMS_VERSION" == "V2" ]; then
    echo "Print the interface for group 2 simulators, shall be STD 2"
    for ((i=1; i<=$NUM_RICS; i++))
    do
@@ -150,7 +153,7 @@ do
    sim_put_policy_type 201 ricsim_g1_$i 1 testdata/OSC/sim_1.json
 done
 
-if [ "$PMS_VERSION" == "V2" ]; then
+if [ "$A1PMS_VERSION" == "V2" ]; then
    echo "Load policy type in group 3 simulators"
    for ((i=1; i<=$NUM_RICS; i++))
    do
@@ -170,7 +173,7 @@ do
    sim_equal ricsim_g2_$i num_instances 0
 done
 
-if [ "$PMS_VERSION" == "V2" ]; then
+if [ "$A1PMS_VERSION" == "V2" ]; then
    echo "Check the number of instances in group 3 simulators, shall be 0"
    for ((i=1; i<=$NUM_RICS; i++))
    do
@@ -178,36 +181,36 @@ if [ "$PMS_VERSION" == "V2" ]; then
    done
 fi
 
-echo "Wait for the agent to refresh types from the simulator"
-if [ "$PMS_VERSION" == "V2" ]; then
-   api_equal json:policy-types 3 300
+echo "Wait for the a1pms to refresh types from the simulator"
+if [ "$A1PMS_VERSION" == "V2" ]; then
+   a1pms_equal json:policy-types 3 300
 else
-   api_equal json:policy_types 2 300
+   a1pms_equal json:policy_types 2 300
 fi
 
-echo "Check the number of types in the agent for each ric is 1"
+echo "Check the number of types in the a1pms for each ric is 1"
 for ((i=1; i<=$NUM_RICS; i++))
 do
-   if [ "$PMS_VERSION" == "V2" ]; then
-      api_equal json:policy-types?ric_id=ricsim_g1_$i 1 120
-      api_equal json:policy-types?ric_id=ricsim_g3_$i 1 120
+   if [ "$A1PMS_VERSION" == "V2" ]; then
+      a1pms_equal json:policy-types?ric_id=ricsim_g1_$i 1 120
+      a1pms_equal json:policy-types?ric_id=ricsim_g3_$i 1 120
    else
-      api_equal json:policy_types?ric=ricsim_g1_$i 1 120
+      a1pms_equal json:policy_types?ric=ricsim_g1_$i 1 120
    fi
 done
 
 echo "Register a service"
-api_put_service 201 "serv1" 0 "$CR_SERVICE_APP_PATH/1"
+a1pms_api_put_service 201 "serv1" 0 "$CR_SERVICE_APP_PATH_0/1"
 
 TEST_DURATION=$((24*3600*$DAYS))
 TEST_START=$SECONDS
 
-AGENT_INTERFACES="REST REST_PARALLEL DMAAP DMAAP-BATCH"
+A1PMS_INTERFACES="REST REST_PARALLEL DMAAP DMAAP-BATCH"
 
 MR_MESSAGES=0
 
-if [ "$PMS_VERSION" == "V2" ]; then
-      notificationurl=$CR_SERVICE_APP_PATH"/test"
+if [ "$A1PMS_VERSION" == "V2" ]; then
+      notificationurl=$CR_SERVICE_APP_PATH_0"/test"
 else
       notificationurl=""
 fi
@@ -220,25 +223,25 @@ while [ $(($SECONDS-$TEST_START)) -lt $TEST_DURATION ]; do
     echo "#########################################################################################################"
     echo ""
 
-   for interface in $AGENT_INTERFACES ; do
+   for interface in $A1PMS_INTERFACES ; do
 
       echo "############################################"
-      echo "## Testing using agent interface: $interface ##"
+      echo "## Testing using a1pms interface: $interface ##"
       echo "############################################"
 
       if [ $interface == "REST" ] || [ $interface == "REST_PARALLEL" ]; then
          if [ $HTTPX == "HTTP" ]; then
-            use_agent_rest_http
+            use_a1pms_rest_http
          else
-            use_agent_rest_https
+            use_a1pms_rest_https
          fi
       else
          if [ $HTTPX == "HTTPS" ]; then
                echo "Using secure ports towards dmaap"
-               use_agent_dmaap_https
+               use_a1pms_dmaap_https
          else
                echo "Using non-secure ports towards dmaap"
-               use_agent_dmaap_http
+               use_a1pms_dmaap_http
          fi
       fi
 
@@ -246,14 +249,14 @@ while [ $(($SECONDS-$TEST_START)) -lt $TEST_DURATION ]; do
       INSTANCE_ID=200000
       INSTANCES=0
       if [ $interface == "REST_PARALLEL" ]; then
-         api_put_policy_parallel 201 "serv1" ricsim_g1_ $NUM_RICS 1 $INSTANCE_ID NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json $NUM_INSTANCES 3
+         a1pms_api_put_policy_parallel 201 "serv1" ricsim_g1_ $NUM_RICS 1 $INSTANCE_ID NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json $NUM_INSTANCES 3
       fi
       for ((i=1; i<=$NUM_RICS; i++))
       do
          if [ $interface == "DMAAP-BATCH" ]; then
-            api_put_policy_batch 201 "serv1" ricsim_g1_$i 1 $INSTANCE_ID NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json $NUM_INSTANCES
+            a1pms_api_put_policy_batch 201 "serv1" ricsim_g1_$i 1 $INSTANCE_ID NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json $NUM_INSTANCES
          elif [ $interface == "DMAAP" ] || [ $interface == "REST" ]; then
-            api_put_policy 201 "serv1" ricsim_g1_$i 1 $INSTANCE_ID NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json $NUM_INSTANCES
+            a1pms_api_put_policy 201 "serv1" ricsim_g1_$i 1 $INSTANCE_ID NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json $NUM_INSTANCES
          fi
          if [ $interface == "DMAAP" ] || [ $interface == "DMAAP-BATCH" ]; then
             MR_MESSAGES=$(($MR_MESSAGES+$NUM_INSTANCES))
@@ -263,22 +266,22 @@ while [ $(($SECONDS-$TEST_START)) -lt $TEST_DURATION ]; do
          INSTANCES=$(($INSTANCES+$NUM_INSTANCES))
       done
 
-      if [ "$PMS_VERSION" == "V2" ]; then
-         api_equal json:policy-instances $INSTANCES
+      if [ "$A1PMS_VERSION" == "V2" ]; then
+         a1pms_equal json:policy-instances $INSTANCES
       else
-         api_equal json:policy_ids $INSTANCES
+         a1pms_equal json:policy_ids $INSTANCES
       fi
 
       echo "Create $NUM_INSTANCES instances in each STD RIC"
       if [ $interface == "REST_PARALLEL" ]; then
-         api_put_policy_parallel 201 "serv1" ricsim_g2_ $NUM_RICS NOTYPE $INSTANCE_ID NOTRANSIENT $notificationurl testdata/STD/pi1_template.json $NUM_INSTANCES 3
+         a1pms_api_put_policy_parallel 201 "serv1" ricsim_g2_ $NUM_RICS NOTYPE $INSTANCE_ID NOTRANSIENT $notificationurl testdata/STD/pi1_template.json $NUM_INSTANCES 3
       fi
       for ((i=1; i<=$NUM_RICS; i++))
       do
          if [ $interface == "DMAAP-BATCH" ]; then
-            api_put_policy_batch 201 "serv1" ricsim_g2_$i NOTYPE $INSTANCE_ID NOTRANSIENT $notificationurl testdata/STD/pi1_template.json $NUM_INSTANCES
+            a1pms_api_put_policy_batch 201 "serv1" ricsim_g2_$i NOTYPE $INSTANCE_ID NOTRANSIENT $notificationurl testdata/STD/pi1_template.json $NUM_INSTANCES
          elif [ $interface == "DMAAP" ] || [ $interface == "REST" ]; then
-            api_put_policy 201 "serv1" ricsim_g2_$i NOTYPE $INSTANCE_ID NOTRANSIENT $notificationurl testdata/STD/pi1_template.json $NUM_INSTANCES
+            a1pms_api_put_policy 201 "serv1" ricsim_g2_$i NOTYPE $INSTANCE_ID NOTRANSIENT $notificationurl testdata/STD/pi1_template.json $NUM_INSTANCES
          fi
          if [ $interface == "DMAAP" ] || [ $interface == "DMAAP-BATCH" ]; then
             MR_MESSAGES=$(($MR_MESSAGES+$NUM_INSTANCES))
@@ -288,23 +291,23 @@ while [ $(($SECONDS-$TEST_START)) -lt $TEST_DURATION ]; do
          INSTANCES=$(($INSTANCES+$NUM_INSTANCES))
       done
 
-      if [ "$PMS_VERSION" == "V2" ]; then
-         api_equal json:policy-instances $INSTANCES
+      if [ "$A1PMS_VERSION" == "V2" ]; then
+         a1pms_equal json:policy-instances $INSTANCES
       else
-         api_equal json:policy_ids $INSTANCES
+         a1pms_equal json:policy_ids $INSTANCES
       fi
 
-      if [ "$PMS_VERSION" == "V2" ]; then
+      if [ "$A1PMS_VERSION" == "V2" ]; then
          echo "Create $NUM_INSTANCES instances in each STD 2 RIC"
          if [ $interface == "REST_PARALLEL" ]; then
-            api_put_policy_parallel 201 "serv1" ricsim_g3_ $NUM_RICS STD_QOS2_0.1.0 $INSTANCE_ID NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json $NUM_INSTANCES 3
+            a1pms_api_put_policy_parallel 201 "serv1" ricsim_g3_ $NUM_RICS STD_QOS2_0.1.0 $INSTANCE_ID NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json $NUM_INSTANCES 3
          fi
          for ((i=1; i<=$NUM_RICS; i++))
          do
             if [ $interface == "DMAAP-BATCH" ]; then
-               api_put_policy_batch 201 "serv1" ricsim_g3_$i STD_QOS2_0.1.0 $INSTANCE_ID NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json $NUM_INSTANCES
+               a1pms_api_put_policy_batch 201 "serv1" ricsim_g3_$i STD_QOS2_0.1.0 $INSTANCE_ID NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json $NUM_INSTANCES
             elif [ $interface == "DMAAP" ] || [ $interface == "REST" ]; then
-               api_put_policy 201 "serv1" ricsim_g3_$i STD_QOS2_0.1.0 $INSTANCE_ID NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json $NUM_INSTANCES
+               a1pms_api_put_policy 201 "serv1" ricsim_g3_$i STD_QOS2_0.1.0 $INSTANCE_ID NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json $NUM_INSTANCES
             fi
             if [ $interface == "DMAAP" ] || [ $interface == "DMAAP-BATCH" ]; then
                MR_MESSAGES=$(($MR_MESSAGES+$NUM_INSTANCES))
@@ -314,10 +317,10 @@ while [ $(($SECONDS-$TEST_START)) -lt $TEST_DURATION ]; do
             INSTANCES=$(($INSTANCES+$NUM_INSTANCES))
          done
 
-         if [ "$PMS_VERSION" == "V2" ]; then
-            api_equal json:policy-instances $INSTANCES
+         if [ "$A1PMS_VERSION" == "V2" ]; then
+            a1pms_equal json:policy-instances $INSTANCES
          else
-            api_equal json:policy_ids $INSTANCES
+            a1pms_equal json:policy_ids $INSTANCES
          fi
       fi
 
@@ -326,14 +329,14 @@ while [ $(($SECONDS-$TEST_START)) -lt $TEST_DURATION ]; do
 
       INSTANCE_ID=200000
       if [ $interface == "REST_PARALLEL" ]; then
-         api_delete_policy_parallel 204 $NUM_RICS $INSTANCE_ID $NUM_INSTANCES 3
+         a1pms_api_delete_policy_parallel 204 $NUM_RICS $INSTANCE_ID $NUM_INSTANCES 3
       fi
       for ((i=1; i<=$NUM_RICS; i++))
       do
          if [ $interface == "DMAAP-BATCH" ]; then
-            api_delete_policy_batch 204 $INSTANCE_ID $NUM_INSTANCES
+            a1pms_api_delete_policy_batch 204 $INSTANCE_ID $NUM_INSTANCES
          elif [ $interface == "DMAAP" ] || [ $interface == "REST" ]; then
-            api_delete_policy 204 $INSTANCE_ID $NUM_INSTANCES
+            a1pms_api_delete_policy 204 $INSTANCE_ID $NUM_INSTANCES
          fi
          if [ $interface == "DMAAP" ] || [ $interface == "DMAAP-BATCH" ]; then
             MR_MESSAGES=$(($MR_MESSAGES+$NUM_INSTANCES))
@@ -343,23 +346,23 @@ while [ $(($SECONDS-$TEST_START)) -lt $TEST_DURATION ]; do
          INSTANCE_ID=$(($INSTANCE_ID+$NUM_INSTANCES))
       done
 
-      if [ "$PMS_VERSION" == "V2" ]; then
-         api_equal json:policy-instances $INSTANCES
+      if [ "$A1PMS_VERSION" == "V2" ]; then
+         a1pms_equal json:policy-instances $INSTANCES
       else
-         api_equal json:policy_ids $INSTANCES
+         a1pms_equal json:policy_ids $INSTANCES
       fi
 
       echo "Delete all instances in each STD RIC"
 
       if [ $interface == "REST_PARALLEL" ]; then
-         api_delete_policy_parallel 204 $NUM_RICS $INSTANCE_ID $NUM_INSTANCES 3
+         a1pms_api_delete_policy_parallel 204 $NUM_RICS $INSTANCE_ID $NUM_INSTANCES 3
       fi
       for ((i=1; i<=$NUM_RICS; i++))
       do
          if [ $interface == "DMAAP-BATCH" ]; then
-            api_delete_policy_batch 204 $INSTANCE_ID $NUM_INSTANCES
+            a1pms_api_delete_policy_batch 204 $INSTANCE_ID $NUM_INSTANCES
          elif [ $interface == "DMAAP" ] || [ $interface == "REST" ]; then
-            api_delete_policy 204 $INSTANCE_ID $NUM_INSTANCES
+            a1pms_api_delete_policy 204 $INSTANCE_ID $NUM_INSTANCES
          fi
          if [ $interface == "DMAAP" ] || [ $interface == "DMAAP-BATCH" ]; then
             MR_MESSAGES=$(($MR_MESSAGES+$NUM_INSTANCES))
@@ -369,24 +372,24 @@ while [ $(($SECONDS-$TEST_START)) -lt $TEST_DURATION ]; do
          INSTANCE_ID=$(($INSTANCE_ID+$NUM_INSTANCES))
       done
 
-      if [ "$PMS_VERSION" == "V2" ]; then
-         api_equal json:policy-instances $INSTANCES
+      if [ "$A1PMS_VERSION" == "V2" ]; then
+         a1pms_equal json:policy-instances $INSTANCES
       else
-         api_equal json:policy_ids $INSTANCES
+         a1pms_equal json:policy_ids $INSTANCES
       fi
 
-      if [ "$PMS_VERSION" == "V2" ]; then
+      if [ "$A1PMS_VERSION" == "V2" ]; then
          echo "Delete all instances in each STD 2 RIC"
 
          if [ $interface == "REST_PARALLEL" ]; then
-            api_delete_policy_parallel 204 $NUM_RICS $INSTANCE_ID $NUM_INSTANCES 3
+            a1pms_api_delete_policy_parallel 204 $NUM_RICS $INSTANCE_ID $NUM_INSTANCES 3
          fi
          for ((i=1; i<=$NUM_RICS; i++))
          do
             if [ $interface == "DMAAP-BATCH" ]; then
-               api_delete_policy_batch 204 $INSTANCE_ID $NUM_INSTANCES
+               a1pms_api_delete_policy_batch 204 $INSTANCE_ID $NUM_INSTANCES
             elif [ $interface == "DMAAP" ] || [ $interface == "REST" ]; then
-               api_delete_policy 204 $INSTANCE_ID $NUM_INSTANCES
+               a1pms_api_delete_policy 204 $INSTANCE_ID $NUM_INSTANCES
             fi
             if [ $interface == "DMAAP" ] || [ $interface == "DMAAP-BATCH" ]; then
                MR_MESSAGES=$(($MR_MESSAGES+$NUM_INSTANCES))
@@ -396,10 +399,10 @@ while [ $(($SECONDS-$TEST_START)) -lt $TEST_DURATION ]; do
             INSTANCE_ID=$(($INSTANCE_ID+$NUM_INSTANCES))
          done
 
-         if [ "$PMS_VERSION" == "V2" ]; then
-            api_equal json:policy-instances $INSTANCES
+         if [ "$A1PMS_VERSION" == "V2" ]; then
+            a1pms_equal json:policy-instances $INSTANCES
          else
-            api_equal json:policy_ids $INSTANCES
+            a1pms_equal json:policy_ids $INSTANCES
          fi
       fi
 
@@ -416,7 +419,7 @@ while [ $(($SECONDS-$TEST_START)) -lt $TEST_DURATION ]; do
          sim_contains_str ricsim_g1_$i remote_hosts $SDNC_APP_NAME
          sim_contains_str ricsim_g2_$i remote_hosts $SDNC_APP_NAME
 
-         if [ "$PMS_VERSION" == "V2" ]; then
+         if [ "$A1PMS_VERSION" == "V2" ]; then
             sim_contains_str ricsim_g3_$i remote_hosts $SDNC_APP_NAME
          fi
       done
@@ -425,7 +428,7 @@ while [ $(($SECONDS-$TEST_START)) -lt $TEST_DURATION ]; do
 
 done
 
-check_policy_agent_logs
+check_a1pms_logs
 check_sdnc_logs
 
 #### TEST COMPLETE ####