X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC110.sh;h=985fd465586164c5bbf71e91b95d662541befc84;hb=HEAD;hp=81aa95caae6ea0b0d05ad7df8e3503870ea7e5c9;hpb=e0b665e3ff544bb78411bdc7f6b3ba2818fdeed4;p=nonrtric.git

diff --git a/test/auto-test/FTC110.sh b/test/auto-test/FTC110.sh
index 81aa95ca..985fd465 100755
--- a/test/auto-test/FTC110.sh
+++ b/test/auto-test/FTC110.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
 #  ============LICENSE_START===============================================
-#  Copyright (C) 2020 Nordix Foundation. All rights reserved.
+#  Copyright (C) 2020-2023 Nordix Foundation. All rights reserved.
+#  Copyright (C) 2023 OpenInfra Foundation Europe. 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.
@@ -21,256 +22,274 @@
 TC_ONELINE_DESCR="Testing of service registration timeouts and keepalive"
 
 #App names to include in the test when running docker, space separated list
-DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM"
+DOCKER_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM NGW KUBEPROXY"
 
 #App names to include in the test when running kubernetes, space separated list
-KUBE_INCLUDED_IMAGES="CP CR MR PA RICSIM"
-#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
+KUBE_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM KUBEPROXY NGW"
+#Pre-started 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"
+
 #Supported test environment profiles
-SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU  ORAN-CHERRY ORAN-DAWN"
+SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL  ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE"
 #Supported run modes
 SUPPORTED_RUNMODES="DOCKER KUBE"
 
-. ../common/testcase_common.sh  $@
-. ../common/agent_api_functions.sh
-. ../common/consul_cbs_functions.sh
-. ../common/control_panel_api_functions.sh
-. ../common/cr_api_functions.sh
-. ../common/mr_api_functions.sh
-. ../common/ricsimulator_api_functions.sh
+. ../common/testcase_common.sh $@
 
-generate_uuid
+setup_testenvironment
 
-use_cr_http
-use_simulator_http
-use_mr_http
-use_agent_rest_http
+#### TEST BEGIN ####
+VERSIONS_TO_RUN=2
 
+if [ -n "$A1PMS_V3_FLAG" ] && [ "${A1PMS_V3_FLAG,,}" == "true" ]; then
+  VERSIONS_TO_RUN=3
+fi
 
-#### TEST BEGIN ####
+for version in $(seq 2 $VERSIONS_TO_RUN); do
 
-clean_environment
+  echo "#####################################################################"
+  echo "#####################################################################"
+  echo "### Testing a1pms: V${version}"
+  echo "#####################################################################"
+  echo "#####################################################################"
 
-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
-fi
+  if [ "$version" == "3" ]; then
+    if [ -n "$A1PMS_V3" ] && [ -n "$A1PMS_API_PREFIX_V3" ] && [ -n "$A1PMS_ALIVE_URL_V3" ]; then
+      export A1PMS_VERSION="$A1PMS_V3"
+      export A1PMS_API_PREFIX="$A1PMS_API_PREFIX_V3"
+      export A1PMS_ALIVE_URL="$A1PMS_API_PREFIX$A1PMS_ALIVE_URL_V3"
+    else
+      echo "One/All parameters not set in env file (<A1PMS_V3>, <A1PMS_API_PREFIX_V3>, <A1PMS_ALIVE_URL_V3>)"
+      break
+    fi
+  fi
+  sim_generate_policy_uuid
 
-start_mr
+  use_cr_http
+  use_simulator_http
+  use_mr_http
+  use_a1pms_rest_http
 
-start_cr
+  clean_environment
 
-if [ $RUNMODE == "DOCKER" ]; then
-    start_consul_cbs
-fi
+  start_kube_proxy
 
-start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/application.properties
+  start_ric_simulators ricsim_g1 1  OSC_2.1.0
+  start_ric_simulators ricsim_g2 1  STD_1.1.3
+  start_ric_simulators ricsim_g3 1  STD_2.0.0
 
-start_policy_agent NORPOXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/application.yaml
+  if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+      :
+  else
+      start_mr
+  fi
 
-prepare_consul_config      NOSDNC  ".consul_config.json"
+  start_cr 1
 
-if [ $RUNMODE == "KUBE" ]; then
-    agent_load_config                       ".consul_config.json"
-else
-    consul_config_app                      ".consul_config.json"
-fi
+  start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
 
-set_agent_debug
+  if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then
+      start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE
+  fi
 
-mr_equal requests_submitted 0
+  start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE
 
-#Check agent alive
-api_get_status 200
 
-#Print simulator interface version
-sim_print ricsim_g1_1 interface
-sim_print ricsim_g2_1 interface
-if [ "$PMS_VERSION" == "V2" ]; then
-    sim_print ricsim_g3_1 interface
-fi
+  prepare_a1pms_config      NOSDNC  ".a1pms_config.json"
 
-api_put_service 201 "service1" 15 "$CR_SERVICE_PATH/service1"
+  if [ $RUNMODE == "KUBE" ]; then
+      a1pms_load_config                       ".a1pms_config.json"
+  else
+      a1pms_api_put_configuration 200 ".a1pms_config.json"
+  fi
 
-api_get_services 200 "service1" "service1" 15 "$CR_SERVICE_PATH/service1"
+  set_a1pms_debug
 
-api_put_service 201 "service2" 120 "$CR_SERVICE_PATH/service2"
+  if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+      :
+  else
+      mr_equal requests_submitted 0
+  fi
 
-api_get_services 200 "service2" "service2" 120 "$CR_SERVICE_PATH/service2"
+  sleep_wait 120 "Let A1PMS configuration take effect"
 
-api_put_service 200 "service1" 50 "$CR_SERVICE_PATH/service1"
-api_put_service 200 "service2" 180 "$CR_SERVICE_PATH/service2"
+  #Check a1pms alive
+  a1pms_api_get_status 200
 
-api_get_services 200 "service1" "service1" 50 "$CR_SERVICE_PATH/service1"
-api_get_services 200 "service2" "service2" 180 "$CR_SERVICE_PATH/service2"
+  #Print simulator interface version
+  sim_print ricsim_g1_1 interface
+  sim_print ricsim_g2_1 interface
+  sim_print ricsim_g3_1 interface
 
-api_get_service_ids 200 "service1" "service2"
+  a1pms_api_put_service 201 "service1" 15 "$CR_SERVICE_APP_PATH_0/service1"
 
-sleep_wait 30 "Waiting for keep alive timeout"
+  a1pms_api_get_services 200 "service1" "service1" 15 "$CR_SERVICE_APP_PATH_0/service1"
 
-api_get_services 200 "service1" "service1" 50 "$CR_SERVICE_PATH/service1"
-api_get_services 200 "service2" "service2" 180 "$CR_SERVICE_PATH/service2"
+  a1pms_api_put_service 201 "service2" 120 "$CR_SERVICE_APP_PATH_0/service2"
 
-sleep_wait 100 "Waiting for keep alive timeout"
+  a1pms_api_get_services 200 "service2" "service2" 120 "$CR_SERVICE_APP_PATH_0/service2"
 
-api_get_services 404 "service1"
-api_get_services 200 "service2" "service2" 180 "$CR_SERVICE_PATH/service2"
+  a1pms_api_put_service 200 "service1" 50 "$CR_SERVICE_APP_PATH_0/service1"
+  a1pms_api_put_service 200 "service2" 180 "$CR_SERVICE_APP_PATH_0/service2"
 
-api_delete_services 204 "service2"
+  a1pms_api_get_services 200 "service1" "service1" 50 "$CR_SERVICE_APP_PATH_0/service1"
+  a1pms_api_get_services 200 "service2" "service2" 180 "$CR_SERVICE_APP_PATH_0/service2"
 
-api_get_services 404 "service1"
-api_get_services 404 "service2"
+  a1pms_api_get_service_ids 200 "service1" "service2"
 
-api_put_service 201 "service3" 60 "$CR_SERVICE_PATH/service3"
+  sleep_wait 30 "Waiting for keep alive timeout"
 
-api_get_services 200 "service3" "service3" 60 "$CR_SERVICE_PATH/service3"
+  a1pms_api_get_services 200 "service1" "service1" 50 "$CR_SERVICE_APP_PATH_0/service1"
+  a1pms_api_get_services 200 "service2" "service2" 180 "$CR_SERVICE_APP_PATH_0/service2"
 
-sleep_wait 30 "Waiting for keep alive timeout"
+  sleep_wait 100 "Waiting for keep alive timeout"
 
-api_put_service 200 "service3" 60 "$CR_SERVICE_PATH/service3"
+  a1pms_api_get_services 404 "service1"
+  a1pms_api_get_services 200 "service2" "service2" 180 "$CR_SERVICE_APP_PATH_0/service2"
 
-sleep_wait 100 "Waiting for keep alive timeout"
+  a1pms_api_delete_services 204 "service2"
 
-api_get_services 404 "service3"
+  a1pms_api_get_services 404 "service1"
+  a1pms_api_get_services 404 "service2"
 
-api_put_service 201 "service4" 120 "$CR_SERVICE_PATH/service4"
+  a1pms_api_put_service 201 "service3" 60 "$CR_SERVICE_APP_PATH_0/service3"
 
-sleep_wait 60 "Waiting for keep alive timeout"
+  a1pms_api_get_services 200 "service3" "service3" 60 "$CR_SERVICE_APP_PATH_0/service3"
 
-api_get_services 200 "service4" "service4" 120 "$CR_SERVICE_PATH/service4"
+  sleep_wait 30 "Waiting for keep alive timeout"
 
-api_put_services_keepalive 200 "service4"
+  a1pms_api_put_service 200 "service3" 60 "$CR_SERVICE_APP_PATH_0/service3"
 
-sleep_wait 90 "Waiting for keep alive timeout"
+  sleep_wait 100 "Waiting for keep alive timeout"
 
-api_get_services 200 "service4" "service4" 120 "$CR_SERVICE_PATH/service4"
+  a1pms_api_get_services 404 "service3"
 
-api_delete_services 204 "service4"
+  a1pms_api_put_service 201 "service4" 120 "$CR_SERVICE_APP_PATH_0/service4"
 
-api_get_services 404 "service4"
+  sleep_wait 60 "Waiting for keep alive timeout"
 
-api_get_services 404 "service1"
-api_get_services 404 "service2"
-api_get_services 404 "service3"
+  a1pms_api_get_services 200 "service4" "service4" 120 "$CR_SERVICE_APP_PATH_0/service4"
 
-api_get_service_ids 200
+  a1pms_api_put_services_keepalive 200 "service4"
 
-api_delete_services 404 "service1"
-api_delete_services 404 "service2"
-api_delete_services 404 "service3"
-api_delete_services 404 "service4"
+  sleep_wait 90 "Waiting for keep alive timeout"
 
-api_put_services_keepalive 404 "service1"
-api_put_services_keepalive 404 "service2"
-api_put_services_keepalive 404 "service3"
-api_put_services_keepalive 404 "service4"
+  a1pms_api_get_services 200 "service4" "service4" 120 "$CR_SERVICE_APP_PATH_0/service4"
 
-# Policy delete after timeout
-api_put_service 201 "service10" 600 "$CR_SERVICE_PATH/service10"
+  a1pms_api_delete_services 204 "service4"
 
-sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json
+  a1pms_api_get_services 404 "service4"
 
-if [ "$PMS_VERSION" == "V2" ]; then
+  a1pms_api_get_services 404 "service1"
+  a1pms_api_get_services 404 "service2"
+  a1pms_api_get_services 404 "service3"
 
-    sim_put_policy_type 201 ricsim_g3_1 STD_QOS2_0.1.0 testdata/STD2/sim_qos2.json
+  a1pms_api_get_service_ids 200
 
-    api_equal json:rics 3 300
+  a1pms_api_delete_services 404 "service1"
+  a1pms_api_delete_services 404 "service2"
+  a1pms_api_delete_services 404 "service3"
+  a1pms_api_delete_services 404 "service4"
 
-    #api_equal json:policy_schemas 2 120
+  a1pms_api_put_services_keepalive 404 "service1"
+  a1pms_api_put_services_keepalive 404 "service2"
+  a1pms_api_put_services_keepalive 404 "service3"
+  a1pms_api_put_services_keepalive 404 "service4"
 
-    api_equal json:policy-types 3 120
+  # Policy delete after timeout
+  a1pms_api_put_service 201 "service10" 600 "$CR_SERVICE_APP_PATH_0/service10"
 
-    api_equal json:policies 0
-else
-    api_equal json:rics 2 300
+  sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json
 
-    api_equal json:policy_schemas 2 120
+  sim_put_policy_type 201 ricsim_g3_1 STD_QOS2_0.1.0 testdata/STD2/sim_qos2.json
 
-    api_equal json:policy_types 2
+  a1pms_equal json:rics 3 300
 
-    api_equal json:policies 0
-fi
+  #a1pms_equal json:policy_schemas 2 120
 
-if [ "$PMS_VERSION" == "V2" ]; then
-    notificationurl=$CR_SERVICE_PATH"/test"
-else
-    notificationurl=""
-fi
+  a1pms_equal json:policies 0
 
-api_put_policy 201 "service10" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json
-api_put_policy 201 "service10" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json
+  notificationurl=$CR_SERVICE_APP_PATH_0"/test"
 
-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_equal json:policies 3
-else
-    api_equal json:policies 2
-fi
+  if [ "$A1PMS_VERSION" == "V3" ]; then
+    a1pms_equal json:policytypes 3 120
+    a1pms_api_post_policy_v3 201 "service10" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json
+    a1pms_api_post_policy_v3 201 "service10" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json
 
-sim_equal ricsim_g1_1 num_instances 1
-sim_equal ricsim_g2_1 num_instances 1
+    a1pms_api_post_policy_v3 201 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json
 
-api_put_policy 201 "service10" ricsim_g1_1 1 5001 true $notificationurl testdata/OSC/pi1_template.json
-api_put_policy 201 "service10" ricsim_g2_1 NOTYPE 5101 true $notificationurl testdata/STD/pi1_template.json
+  else
+    a1pms_equal json:policy-types 3 120
+    a1pms_api_put_policy 201 "service10" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json
+    a1pms_api_put_policy 201 "service10" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json
 
-if [ "$PMS_VERSION" == "V2" ]; then
-    api_put_policy 201 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5201 true $notificationurl testdata/STD2/pi_qos2_template.json
-    api_equal json:policies 6
-else
-    api_equal json:policies 4
-fi
+    a1pms_api_put_policy 201 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json
 
-sim_equal ricsim_g1_1 num_instances 2
-sim_equal ricsim_g2_1 num_instances 2
-if [ "$PMS_VERSION" == "V2" ]; then
-    sim_equal ricsim_g3_1 num_instances 2
-fi
+  fi
 
-sim_post_delete_instances 200 ricsim_g1_1
-sim_post_delete_instances 200 ricsim_g2_1
+  a1pms_equal json:policies 3
 
-if [ "$PMS_VERSION" == "V2" ]; then
-    sim_post_delete_instances 200 ricsim_g3_1
-fi
+  sim_equal ricsim_g1_1 num_instances 1
+  sim_equal ricsim_g2_1 num_instances 1
 
-#Wait for recreate of non transient policy
-if [ "$PMS_VERSION" == "V2" ]; then
-    api_equal json:policies 3 180
-else
-    api_equal json:policies 2 180
-fi
+  if [ "$A1PMS_VERSION" == "V3" ]; then
+    a1pms_api_post_policy_v3 201 "service10" ricsim_g1_1 1 5001 true $notificationurl testdata/OSC/pi1_template.json
+    a1pms_api_post_policy_v3 201 "service10" ricsim_g2_1 NOTYPE 5101 true $notificationurl testdata/STD/pi1_template.json
 
-sim_equal ricsim_g1_1 num_instances 1
-sim_equal ricsim_g2_1 num_instances 1
-if [ "$PMS_VERSION" == "V2" ]; then
-    sim_equal ricsim_g3_1 num_instances 1
-fi
+    a1pms_api_post_policy_v3 201 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5201 true $notificationurl testdata/STD2/pi_qos2_template.json
+  else
+    a1pms_api_put_policy 201 "service10" ricsim_g1_1 1 5001 true $notificationurl testdata/OSC/pi1_template.json
+    a1pms_api_put_policy 201 "service10" ricsim_g2_1 NOTYPE 5101 true $notificationurl testdata/STD/pi1_template.json
 
-api_put_service 200 "service10" 10 "$CR_SERVICE_PATH/service10"
+    a1pms_api_put_policy 201 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5201 true $notificationurl testdata/STD2/pi_qos2_template.json
+  fi
+  a1pms_equal json:policies 6
 
-#Wait for service expiry
-api_equal json:policies 0 120
+  sim_equal ricsim_g1_1 num_instances 2
+  sim_equal ricsim_g2_1 num_instances 2
+  sim_equal ricsim_g3_1 num_instances 2
 
-sim_equal ricsim_g1_1 num_instances 0
-sim_equal ricsim_g2_1 num_instances 0
-if [ "$PMS_VERSION" == "V2" ]; then
-    sim_equal ricsim_g3_1 num_instances 0
-fi
+  sim_post_delete_instances 200 ricsim_g1_1
+  sim_post_delete_instances 200 ricsim_g2_1
+
+  sim_post_delete_instances 200 ricsim_g3_1
+
+  #Wait for recreate of non transient policy
+  a1pms_equal json:policies 3 180
+
+  sim_equal ricsim_g1_1 num_instances 1
+  sim_equal ricsim_g2_1 num_instances 1
+  sim_equal ricsim_g3_1 num_instances 1
+
+  a1pms_api_put_service 200 "service10" 10 "$CR_SERVICE_APP_PATH_0/service10"
+
+  #Wait for service expiry
+  a1pms_equal json:policies 0 120
+
+  sim_equal ricsim_g1_1 num_instances 0
+  sim_equal ricsim_g2_1 num_instances 0
+  sim_equal ricsim_g3_1 num_instances 0
 
-api_get_service_ids 200
+  a1pms_api_get_service_ids 200
 
-mr_equal requests_submitted 0
+  if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+      :
+  else
+      mr_equal requests_submitted 0
+  fi
 
-check_policy_agent_logs
-check_control_panel_logs
+  check_a1pms_logs
 
-#### TEST COMPLETE ####
+  #### TEST COMPLETE ####
 
-store_logs          END
+  store_logs          END
 
-print_result
+  print_result
 
-auto_clean_environment
\ No newline at end of file
+  auto_clean_environment
+done
\ No newline at end of file