X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC2001.sh;h=f39eb022379e5aa382eb31b6bb3ee1849f0b1b23;hb=85d61ba735e5c00a377361b6d57081a4279f2dde;hp=f63e5d1dac885d82bc356f84fa5d1902b42f0c5e;hpb=30cbd4c1f33d1e97f9dca55731b9bf0811583be9;p=nonrtric.git

diff --git a/test/auto-test/FTC2001.sh b/test/auto-test/FTC2001.sh
index f63e5d1d..f39eb022 100755
--- a/test/auto-test/FTC2001.sh
+++ b/test/auto-test/FTC2001.sh
@@ -43,205 +43,249 @@ SUPPORTED_RUNMODES="DOCKER KUBE"
 setup_testenvironment
 
 #### TEST BEGIN ####
+VERSIONS_TO_RUN=2
 
-#Local vars in test script
-##########################
-
-use_cr_https
-use_a1pms_rest_https
-use_simulator_https
-use_ics_rest_https
-use_prod_stub_https
-
-notificationurl=$CR_SERVICE_APP_PATH_0"/test"
-
-clean_environment
-
-start_kube_proxy
-
-STD_NUM_RICS=2
-
-start_http_proxy
-
-start_ric_simulators $RIC_SIM_PREFIX"_g3" $STD_NUM_RICS STD_2.0.0
-
-if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
-    :
-else
-    start_mr #Just to prevent errors in the a1pms log...
-fi
-
-start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
-
-if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then
-    start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE
-fi
-
-start_a1pms PROXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE
-
-
-
-prepare_a1pms_config      NOSDNC  ".a1pms_config.json"
-
-if [ $RUNMODE == "KUBE" ]; then
-    a1pms_load_config                       ".a1pms_config.json"
-else
-    a1pms_api_put_configuration 200 ".a1pms_config.json"
+if [ -n "$A1PMS_V3_FLAG" ] && [ "${A1PMS_V3_FLAG,,}" == "true" ]; then
+  VERSIONS_TO_RUN=3
 fi
 
-start_cr 1
+for version in $(seq 2 $VERSIONS_TO_RUN); do
 
-start_prod_stub
+  echo "#####################################################################"
+  echo "#####################################################################"
+  echo "### Testing a1pms: V${version}"
+  echo "#####################################################################"
+  echo "#####################################################################"
 
-start_ics PROXY $SIM_GROUP/$ICS_COMPOSE_DIR/$ICS_CONFIG_FILE
+  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
+  #Local vars in test script
+  ##########################
 
-set_a1pms_trace
+  use_cr_https
+  use_a1pms_rest_https
+  use_simulator_https
+  use_ics_rest_https
+  use_prod_stub_https
 
-set_ics_debug
+  notificationurl=$CR_SERVICE_APP_PATH_0"/test"
 
-sleep_wait 120 "Let A1PMS configuration take effect"
+  clean_environment
+
+  start_kube_proxy
+
+  STD_NUM_RICS=2
+
+  start_http_proxy
+
+  start_ric_simulators $RIC_SIM_PREFIX"_g3" $STD_NUM_RICS STD_2.0.0
+
+  if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+      :
+  else
+      start_mr #Just to prevent errors in the a1pms log...
+  fi
+
+  start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
+
+  if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then
+      start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE
+  fi
+
+  start_a1pms PROXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE
+
+
+
+  prepare_a1pms_config      NOSDNC  ".a1pms_config.json"
+
+  if [ $RUNMODE == "KUBE" ]; then
+      a1pms_load_config                       ".a1pms_config.json"
+  else
+      a1pms_api_put_configuration 200 ".a1pms_config.json"
+  fi
+
+  start_cr 1
+
+  start_prod_stub
+
+  start_ics PROXY $SIM_GROUP/$ICS_COMPOSE_DIR/$ICS_CONFIG_FILE
+
+  set_a1pms_trace
+
+  set_ics_debug
+
+  sleep_wait 120 "Let A1PMS configuration take effect"
+
+  a1pms_api_get_status 200
+
+  # Print the A1 version for STD 2.X
+  for ((i=1; i<=$STD_NUM_RICS; i++))
+  do
+      sim_print $RIC_SIM_PREFIX"_g3_"$i interface
+  done
+  total_policy_types=2
+  # Load the policytypes in std
+  for ((i=1; i<=$STD_NUM_RICS; i++))
+  do
+      sim_put_policy_type 201 $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 demo-testdata/STD2/sim_qos.json
+      sim_put_policy_type 201 $RIC_SIM_PREFIX"_g3_"$i STD_QOS2_0.1.0 demo-testdata/STD2/sim_qos2.json
+  done
+
+  #Check the number of schemas and the individual schemas in STD
+  if [ "$A1PMS_VERSION" == "V3" ]; then
+    total_policy_type_entries=$((STD_NUM_RICS * total_policy_types))
+    a1pms_equal json:policytypes ${total_policy_type_entries} 120
+  else
+    a1pms_equal json:policy-types ${total_policy_types} 120
+  fi
 
-a1pms_api_get_status 200
+  for ((i=1; i<=$STD_NUM_RICS; i++))
+  do
+    if [ "$A1PMS_VERSION" == "V3" ]; then
+      a1pms_equal json:policytypes?nearRtRicId=$RIC_SIM_PREFIX"_g3_"$i ${total_policy_types} 120
+    else
+      a1pms_equal json:policy-types?ric_id=$RIC_SIM_PREFIX"_g3_"$i ${total_policy_types} 120
+    fi
+  done
 
-# Print the A1 version for STD 2.X
-for ((i=1; i<=$STD_NUM_RICS; i++))
-do
-    sim_print $RIC_SIM_PREFIX"_g3_"$i interface
-done
-# Load the policytypes in std
-for ((i=1; i<=$STD_NUM_RICS; i++))
-do
-    sim_put_policy_type 201 $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 demo-testdata/STD2/sim_qos.json
-    sim_put_policy_type 201 $RIC_SIM_PREFIX"_g3_"$i STD_QOS2_0.1.0 demo-testdata/STD2/sim_qos2.json
-done
+  # Check the schemas in STD
+  for ((i=1; i<=$STD_NUM_RICS; i++))
+  do
+      a1pms_api_get_policy_type 200 STD_QOS_0_2_0 demo-testdata/STD2/qos-a1pms-modified.json
+      a1pms_api_get_policy_type 200 'STD_QOS2_0.1.0' demo-testdata/STD2/qos2-a1pms-modified.json
+  done
 
-#Check the number of schemas and the individual schemas in STD
-a1pms_equal json:policy-types 2 120
+  #Check the number of types
+  if [ "$A1PMS_VERSION" == "V3" ]; then
+    total_policy_type_entries=$((STD_NUM_RICS * total_policy_types))
+    a1pms_equal json:policytypes ${total_policy_type_entries} 300
+  else
+    a1pms_equal json:policy-types ${total_policy_types} 300
+  fi
 
-for ((i=1; i<=$STD_NUM_RICS; i++))
-do
-    a1pms_equal json:policy-types?ric_id=$RIC_SIM_PREFIX"_g3_"$i 2 120
-done
+  a1pms_api_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_APP_PATH_0/1"
 
-# Check the schemas in STD
-for ((i=1; i<=$STD_NUM_RICS; i++))
-do
-    a1pms_api_get_policy_type 200 STD_QOS_0_2_0 demo-testdata/STD2/qos-a1pms-modified.json
-    a1pms_api_get_policy_type 200 'STD_QOS2_0.1.0' demo-testdata/STD2/qos2-a1pms-modified.json
-done
-
-#Check the number of types
-a1pms_equal json:policy-types 2 300
-
-a1pms_api_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_APP_PATH_0/1"
+  # Create policies in STD
+  for ((i=1; i<=$STD_NUM_RICS; i++))
+  do
+      sim_generate_policy_uuid
+      if [ "$A1PMS_VERSION" == "V3" ]; then
+        a1pms_api_post_policy_v3 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 $((2300+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1
+        sim_generate_policy_uuid
+        a1pms_api_post_policy_v3 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i 'STD_QOS2_0.1.0' $((2400+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1
+      else
+        a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 $((2300+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1
+        sim_generate_policy_uuid
+        a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i 'STD_QOS2_0.1.0' $((2400+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1
+      fi
+  done
 
-# Create policies in STD
-for ((i=1; i<=$STD_NUM_RICS; i++))
-do
-    sim_generate_policy_uuid
-    a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 $((2300+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1
-    sim_generate_policy_uuid
-    a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i 'STD_QOS2_0.1.0' $((2400+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1
-done
 
+  # Check the number of policies in STD
+  for ((i=1; i<=$STD_NUM_RICS; i++))
+  do
+      sim_equal $RIC_SIM_PREFIX"_g3_"$i num_instances 2
+  done
+
+  # Print calling hosts STD 2.X
+  for ((i=1; i<=$STD_NUM_RICS; i++))
+  do
+      sim_print $RIC_SIM_PREFIX"_g3_"$i remote_hosts
+      sim_contains_str $RIC_SIM_PREFIX"_g3_"$i remote_hosts proxy
+  done
+
+
+  CB_JOB="$PROD_STUB_SERVICE_PATH$PROD_STUB_JOB_CALLBACK"
+  CB_SV="$PROD_STUB_SERVICE_PATH$PROD_STUB_SUPERVISION_CALLBACK"
+  RIC_G1_1=$RIC_SIM_PREFIX"_g3_1"
+  RIC_G1_2=$RIC_SIM_PREFIX"_g3_2"
+  if [ $RUNMODE == "KUBE" ]; then
+      RIC_G1_1=$(get_kube_sim_host $RIC_G1_1)
+      RIC_G1_2=$(get_kube_sim_host $RIC_G1_2)
+  fi
+  TARGET1="$RIC_SIM_HTTPX://$RIC_G1_1:$RIC_SIM_PORT/datadelivery"
+  TARGET2="$RIC_SIM_HTTPX://$RIC_G1_1:$RIC_SIM_PORT/datadelivery"
+
+  STATUS1="$CR_SERVICE_APP_PATH_0/job1-status"
+  STATUS2="$CR_SERVICE_APP_PATH_0/job2-status"
+
+  prodstub_arm_producer 200 prod-a
+  prodstub_arm_type 200 prod-a type1
+  prodstub_arm_job_create 200 prod-a job1
+  prodstub_arm_job_create 200 prod-a job2
+
+  ### ics status
+  ics_api_service_status 200
+
+  if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then
+      #Type registration status callbacks
+      TYPESTATUS1="$CR_SERVICE_APP_PATH_0/type-status1"
+
+      ics_api_idc_put_subscription 201 subscription-id-1 owner1 $TYPESTATUS1
+
+      ics_api_idc_get_subscription_ids 200 owner1 subscription-id-1
+  fi
+
+  ## Setup prod-a
+  ics_api_edp_put_type_2 201 type1 testdata/ics/ei-type-1.json
+
+  ics_api_edp_put_producer_2 201 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1
+
+  ics_api_edp_get_producer_2 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1
+
+  ics_api_edp_get_producer_status 200 prod-a ENABLED
+
+
+  ## Create a job for prod-a
+  ## job1 - prod-a
+  ics_api_a1_put_job 201 job1 type1 $TARGET1 ricsim_g3_1 $STATUS1 testdata/ics/job-template.json
+
+  # Check the job data in the producer
+  prodstub_check_jobdata_3 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json
+
+  ## Create a second job for prod-a
+  ## job2 - prod-a
+  ics_api_a1_put_job 201 job2 type1 $TARGET2 ricsim_g3_2 $STATUS2 testdata/ics/job-template.json
+
+  # Check the job data in the producer
+  prodstub_check_jobdata_3 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json
+
+  # Arm producer prod-a for supervision failure
+  prodstub_arm_producer 200 prod-a 400
+
+  # Wait for producer prod-a to go disabled
+  ics_api_edp_get_producer_status 200 prod-a DISABLED 360
+
+  ics_equal json:data-producer/v1/info-producers 0 1000
+
+  if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then
+      cr_equal 0 received_callbacks 3 30
+      cr_api_check_all_ics_subscription_events 200 0 type-status1 type1 testdata/ics/ei-type-1.json REGISTERED
+      cr_api_check_all_ics_events 200 0 job1-status DISABLED
+      cr_api_check_all_ics_events 200 0 job2-status DISABLED
+  else
+      cr_equal 0 received_callbacks 2 30
+      cr_api_check_all_ics_events 200 0 job1-status DISABLED
+      cr_api_check_all_ics_events 200 0 job2-status DISABLED
+  fi
 
-# Check the number of policies in STD
-for ((i=1; i<=$STD_NUM_RICS; i++))
-do
-    sim_equal $RIC_SIM_PREFIX"_g3_"$i num_instances 2
-done
+  cr_contains_str 0 remote_hosts $HTTP_PROXY_APP_NAME
 
-# Print calling hosts STD 2.X
-for ((i=1; i<=$STD_NUM_RICS; i++))
-do
-    sim_print $RIC_SIM_PREFIX"_g3_"$i remote_hosts
-    sim_contains_str $RIC_SIM_PREFIX"_g3_"$i remote_hosts proxy
+  check_a1pms_logs
+  check_ics_logs
 done
-
-
-CB_JOB="$PROD_STUB_SERVICE_PATH$PROD_STUB_JOB_CALLBACK"
-CB_SV="$PROD_STUB_SERVICE_PATH$PROD_STUB_SUPERVISION_CALLBACK"
-RIC_G1_1=$RIC_SIM_PREFIX"_g3_1"
-RIC_G1_2=$RIC_SIM_PREFIX"_g3_2"
-if [ $RUNMODE == "KUBE" ]; then
-    RIC_G1_1=$(get_kube_sim_host $RIC_G1_1)
-    RIC_G1_2=$(get_kube_sim_host $RIC_G1_2)
-fi
-TARGET1="$RIC_SIM_HTTPX://$RIC_G1_1:$RIC_SIM_PORT/datadelivery"
-TARGET2="$RIC_SIM_HTTPX://$RIC_G1_1:$RIC_SIM_PORT/datadelivery"
-
-STATUS1="$CR_SERVICE_APP_PATH_0/job1-status"
-STATUS2="$CR_SERVICE_APP_PATH_0/job2-status"
-
-prodstub_arm_producer 200 prod-a
-prodstub_arm_type 200 prod-a type1
-prodstub_arm_job_create 200 prod-a job1
-prodstub_arm_job_create 200 prod-a job2
-
-### ics status
-ics_api_service_status 200
-
-if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then
-    #Type registration status callbacks
-    TYPESTATUS1="$CR_SERVICE_APP_PATH_0/type-status1"
-
-    ics_api_idc_put_subscription 201 subscription-id-1 owner1 $TYPESTATUS1
-
-    ics_api_idc_get_subscription_ids 200 owner1 subscription-id-1
-fi
-
-## Setup prod-a
-ics_api_edp_put_type_2 201 type1 testdata/ics/ei-type-1.json
-
-ics_api_edp_put_producer_2 201 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1
-
-ics_api_edp_get_producer_2 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1
-
-ics_api_edp_get_producer_status 200 prod-a ENABLED
-
-
-## Create a job for prod-a
-## job1 - prod-a
-ics_api_a1_put_job 201 job1 type1 $TARGET1 ricsim_g3_1 $STATUS1 testdata/ics/job-template.json
-
-# Check the job data in the producer
-prodstub_check_jobdata_3 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json
-
-## Create a second job for prod-a
-## job2 - prod-a
-ics_api_a1_put_job 201 job2 type1 $TARGET2 ricsim_g3_2 $STATUS2 testdata/ics/job-template.json
-
-# Check the job data in the producer
-prodstub_check_jobdata_3 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json
-
-# Arm producer prod-a for supervision failure
-prodstub_arm_producer 200 prod-a 400
-
-# Wait for producer prod-a to go disabled
-ics_api_edp_get_producer_status 200 prod-a DISABLED 360
-
-ics_equal json:data-producer/v1/info-producers 0 1000
-
-if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then
-    cr_equal 0 received_callbacks 3 30
-    cr_api_check_all_ics_subscription_events 200 0 type-status1 type1 testdata/ics/ei-type-1.json REGISTERED
-    cr_api_check_all_ics_events 200 0 job1-status DISABLED
-    cr_api_check_all_ics_events 200 0 job2-status DISABLED
-else
-    cr_equal 0 received_callbacks 2 30
-    cr_api_check_all_ics_events 200 0 job1-status DISABLED
-    cr_api_check_all_ics_events 200 0 job2-status DISABLED
-fi
-
-cr_contains_str 0 remote_hosts $HTTP_PROXY_APP_NAME
-
-check_a1pms_logs
-check_ics_logs
-
-#### TEST COMPLETE ####
+  #### TEST COMPLETE ####
 
 store_logs          END
 
 print_result
 
-auto_clean_environment
\ No newline at end of file
+auto_clean_environment