X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC805.sh;h=24ef2b61bbe47dd377517b51f602c6473fe6988f;hb=refs%2Fchanges%2F89%2F10889%2F2;hp=02f67584be9987fa7349a916477c9a42410b1a7b;hpb=d0c7f9207203ce9a502fc15c09f9938eebfd44f7;p=nonrtric.git

diff --git a/test/auto-test/FTC805.sh b/test/auto-test/FTC805.sh
index 02f67584..24ef2b61 100755
--- a/test/auto-test/FTC805.sh
+++ b/test/auto-test/FTC805.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.
@@ -17,13 +17,13 @@
 #  ============LICENSE_END=================================================
 #
 
-TC_ONELINE_DESCR="PMS Create 10000 policies and restart, test polices persistency"
+TC_ONELINE_DESCR="A1PMS Create 10000 policies and restart, test polices persistency"
 
 #App names to include in the test when running docker, space separated list
-DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR PA RICSIM SDNC NGW KUBEPROXY"
+DOCKER_INCLUDED_IMAGES="CP CR A1PMS RICSIM SDNC NGW KUBEPROXY"
 
 #App names to include in the test when running kubernetes, space separated list
-KUBE_INCLUDED_IMAGES="CP CR PA RICSIM SDNC KUBEPROXY NGW"
+KUBE_INCLUDED_IMAGES="CP CR 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=""
 
@@ -33,19 +33,11 @@ KUBE_PRESTARTED_IMAGES=""
 CONDITIONALLY_IGNORED_IMAGES="NGW"
 
 #Supported test environment profiles
-SUPPORTED_PROFILES="ONAP-ISTANBUL ORAN-D-RELEASE ORAN-E-RELEASE"
+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  $@
-. ../common/agent_api_functions.sh
-. ../common/ricsimulator_api_functions.sh
-. ../common/control_panel_api_functions.sh
-. ../common/controller_api_functions.sh
-. ../common/consul_cbs_functions.sh
-. ../common/cr_api_functions.sh
-. ../common/kube_proxy_api_functions.sh
-. ../common/gateway_api_functions.sh
+. ../common/testcase_common.sh $@
 
 setup_testenvironment
 
@@ -57,27 +49,23 @@ setup_testenvironment
 # Tested variants of REST/DMAAP/SDNC config
 TESTED_VARIANTS="REST"
 
-#Test agent and simulator protocol versions (others are http only)
+#Test a1pms and simulator protocol versions (others are http only)
 TESTED_PROTOCOLS="HTTP"
 
 NUM_RICS=5
 NUM_POLICIES_PER_RIC=2000
 
 
-generate_policy_uuid
+sim_generate_policy_uuid
 
-if [ "$PMS_VERSION" == "V2" ]; then
-    notificationurl=$CR_SERVICE_APP_PATH"/test"
-else
-    notificationurl=""
-fi
+notificationurl=$CR_SERVICE_APP_PATH_0"/test"
 
 for __httpx in $TESTED_PROTOCOLS ; do
     for interface in $TESTED_VARIANTS ; do
 
         echo "#####################################################################"
         echo "#####################################################################"
-        echo "### Testing agent: "$interface" and "$__httpx
+        echo "### Testing a1pms: "$interface" and "$__httpx
         echo "#####################################################################"
         echo "#####################################################################"
 
@@ -85,16 +73,21 @@ for __httpx in $TESTED_PROTOCOLS ; do
             use_cr_https
             use_simulator_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
-            use_agent_rest_https
+            use_a1pms_rest_https
         else
             use_cr_http
             use_simulator_http
             if [[ $interface = *"SDNC"* ]]; then
                 use_sdnc_http
             fi
-            use_agent_rest_http
+            use_a1pms_rest_http
         fi
 
         # Clean container and start all needed containers #
@@ -110,30 +103,31 @@ for __httpx in $TESTED_PROTOCOLS ; do
             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
+        start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE
+
+        set_a1pms_debug
 
-        set_agent_debug
 
-        if [ $RUNMODE == "DOCKER" ]; then
-            start_consul_cbs
-        fi
 
         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
 
         if [ $RUNMODE == "KUBE" ]; then
-            agent_load_config                       ".consul_config.json"
+            a1pms_load_config                       ".a1pms_config.json"
         else
-            consul_config_app                      ".consul_config.json"
+            a1pms_api_put_configuration 200 ".a1pms_config.json"
         fi
 
-        start_cr
+        start_cr 1
+
+        sleep_wait 120 "Let A1PMS cofiguration take effect"
 
-        api_get_status 200
+        a1pms_api_get_status 200
 
         for ((i=1; i<=$NUM_RICS; i++))
         do
@@ -146,51 +140,47 @@ for __httpx in $TESTED_PROTOCOLS ; do
             sim_put_policy_type 201 ricsim_g1_$i STD_QOS_0_2_0 testdata/STD2/sim_qos.json
         done
 
-        if [ "$PMS_VERSION" == "V2" ]; then
-            api_equal json:policy-types 1 300  #Wait for the agent to refresh types from the simulator
-        else
-            api_equal json:policy_types 1 300  #Wait for the agent to refresh types from the simulator
-        fi
+        a1pms_equal json:policy-types 1 300  #Wait for the a1pms to refresh types from the simulator
 
-        api_put_service 201 "serv1" 0 "$CR_SERVICE_APP_PATH/1"
+        a1pms_api_put_service 201 "serv1" 0 "$CR_SERVICE_APP_PATH_0/1"
 
-        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
-            else
-                api_equal json:policy_types?ric=ricsim_g1_$i 1 120
-            fi
+            a1pms_equal json:policy-types?ric_id=ricsim_g1_$i 1 120
         done
 
         START_ID=2000
 
         start_timer "Create $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using "$__httpx
 
-        api_put_policy_parallel 201 "serv1" ricsim_g1_ $NUM_RICS STD_QOS_0_2_0 $START_ID NOTRANSIENT $notificationurl testdata/STD/pi1_template.json $NUM_POLICIES_PER_RIC 7
+        a1pms_api_put_policy_parallel 201 "serv1" ricsim_g1_ $NUM_RICS STD_QOS_0_2_0 $START_ID NOTRANSIENT $notificationurl testdata/STD/pi1_template.json $NUM_POLICIES_PER_RIC 7
 
         print_timer "Create $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using "$__httpx
 
         INSTANCES=$(($NUM_RICS*$NUM_POLICIES_PER_RIC))
-        api_equal json:policies $INSTANCES
+        a1pms_equal json:policies $INSTANCES
 
         for ((i=1; i<=$NUM_RICS; i++))
         do
             sim_equal ricsim_g1_$i num_instances $NUM_POLICIES_PER_RIC
         done
 
-        api_get_services 200 "serv1" "serv1" 0 "$CR_SERVICE_APP_PATH/1"
+        a1pms_api_get_services 200 "serv1" "serv1" 0 "$CR_SERVICE_APP_PATH_0/1"
+
+        stop_a1pms
 
-        stop_policy_agent
+        sleep_wait 60
 
-        start_stopped_policy_agent
+        start_stopped_a1pms
 
-        set_agent_debug
+        set_a1pms_debug
 
-        api_equal json:policies $INSTANCES 500
+        a1pms_equal json:policies $INSTANCES 500
 
-        stop_policy_agent
+        stop_a1pms
+
+        sleep_wait 60
 
         for ((i=1; i<=$NUM_RICS; i++))
         do
@@ -202,13 +192,13 @@ for __httpx in $TESTED_PROTOCOLS ; do
             sim_equal ricsim_g1_$i num_instances 0
         done
 
-        start_stopped_policy_agent
+        start_stopped_a1pms
 
-        set_agent_debug
+        set_a1pms_debug
 
         start_timer "Restore $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices after restart over $interface using "$__httpx
 
-        api_equal json:policies $INSTANCES 500
+        a1pms_equal json:policies $INSTANCES 500
 
         for ((i=1; i<=$NUM_RICS; i++))
         do
@@ -217,28 +207,30 @@ for __httpx in $TESTED_PROTOCOLS ; do
 
         print_timer "Restore $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices after restart over $interface using "$__httpx
 
-        api_get_services 200 "serv1" "serv1" 0 "$CR_SERVICE_APP_PATH/1"
+        a1pms_api_get_services 200 "serv1" "serv1" 0 "$CR_SERVICE_APP_PATH_0/1"
 
         start_timer "Delete $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using "$__httpx
 
-        api_delete_policy_parallel 204 $NUM_RICS $START_ID $NUM_POLICIES_PER_RIC 7
+        a1pms_api_delete_policy_parallel 204 $NUM_RICS $START_ID $NUM_POLICIES_PER_RIC 7
 
         print_timer "Delete $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using "$__httpx
 
-        api_equal json:policies 0
+        a1pms_equal json:policies 0
 
         for ((i=1; i<=$NUM_RICS; i++))
         do
             sim_equal ricsim_g1_$i num_instances 0
         done
 
-        stop_policy_agent
+        stop_a1pms
+
+        sleep_wait 60
 
-        start_stopped_policy_agent
+        start_stopped_a1pms
 
-        set_agent_debug
+        set_a1pms_debug
 
-        api_equal json:policies 0
+        a1pms_equal json:policies 0
 
         for ((i=1; i<=$NUM_RICS; i++))
         do
@@ -247,9 +239,9 @@ for __httpx in $TESTED_PROTOCOLS ; do
 
         sleep_wait 200
 
-        api_get_services 200 "serv1" "serv1" 0 "$CR_SERVICE_APP_PATH/1"
+        a1pms_api_get_services 200 "serv1" "serv1" 0 "$CR_SERVICE_APP_PATH_0/1"
 
-        api_equal json:policies 0
+        a1pms_equal json:policies 0
 
         for ((i=1; i<=$NUM_RICS; i++))
         do
@@ -261,11 +253,11 @@ for __httpx in $TESTED_PROTOCOLS ; do
             if [ $interface == "REST+SDNC" ]; then
                 sim_contains_str ricsim_g1_$i remote_hosts $SDNC_APP_NAME
             else
-                sim_contains_str ricsim_g1_$i remote_hosts $POLICY_AGENT_APP_NAME
+                sim_contains_str ricsim_g1_$i remote_hosts $A1PMS_APP_NAME
             fi
         done
 
-        check_policy_agent_logs
+        check_a1pms_logs
         if [[ $interface = *"SDNC"* ]]; then
             check_sdnc_logs
         fi