X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC900.sh;h=abe648b9b41e5d9409a97984277a7fbd3cad6d37;hb=bf3700b1064ec3526af205cab454bd1964ce8650;hp=5a71916189df95126e8904335ea8ffaa0a0df7a9;hpb=048aaa15f061228fd7f340fa6fb0b6ac3d564ba8;p=nonrtric.git

diff --git a/test/auto-test/FTC900.sh b/test/auto-test/FTC900.sh
index 5a719161..abe648b9 100755
--- a/test/auto-test/FTC900.sh
+++ b/test/auto-test/FTC900.sh
@@ -17,10 +17,10 @@
 #  ============LICENSE_END=================================================
 #
 
-TC_ONELINE_DESCR="Testing of the Control Panel and the Health Check app - populating with types and instances"
+TC_ONELINE_DESCR="Preparation for test of the Control Panel and the Health Check app - populating a number of ric simulators with types and instances"
 
 #App names to exclude checking pulling images for, space separated list
-EXCLUDED_IMAGES="SDNC SDNC_ONAP"
+EXCLUDED_IMAGES="SDNC ECS"
 
 . ../common/testcase_common.sh $@
 . ../common/agent_api_functions.sh
@@ -32,15 +32,16 @@ EXCLUDED_IMAGES="SDNC SDNC_ONAP"
 ##########################
 # Path to callback receiver
 CR_PATH="http://$CR_APP_NAME:$CR_EXTERNAL_PORT/callbacks"
+use_cr_http
 
 clean_containers
 
 OSC_NUM_RICS=6
 STD_NUM_RICS=5
 
-start_ric_simulators  ricsim_g1 $OSC_NUM_RICS OSC_2.1.0
+start_ric_simulators  $RIC_SIM_PREFIX"_g1" $OSC_NUM_RICS OSC_2.1.0
 
-start_ric_simulators  ricsim_g2 $STD_NUM_RICS STD_1.1.3
+start_ric_simulators  $RIC_SIM_PREFIX"_g2" $STD_NUM_RICS STD_1.1.3
 
 start_mr #Just to prevent errors in the agent log...
 
@@ -60,37 +61,39 @@ api_get_status 200
 # Print the A1 version for OSC
 for ((i=1; i<=$OSC_NUM_RICS; i++))
 do
-    sim_print ricsim_g1_$i interface
+    sim_print $RIC_SIM_PREFIX"_g1_"$i interface
 done
 
 
 # Print the A1 version for STD
 for ((i=1; i<=$STD_NUM_RICS; i++))
 do
-    sim_print ricsim_g2_$i interface
+    sim_print $RIC_SIM_PREFIX"_g2_"$i interface
 done
 
 
 # Load the polictypes in osc
 for ((i=1; i<=$OSC_NUM_RICS; i++))
 do
-    sim_put_policy_type 201 ricsim_g1_$i 2 testdata/OSC/sim_hw.json
-    sim_put_policy_type 201 ricsim_g1_$i 20008 testdata/OSC/sim_tsa.json
+    sim_put_policy_type 201 $RIC_SIM_PREFIX"_g1_"$i 2 testdata/OSC/sim_hw.json
+    sim_put_policy_type 201 $RIC_SIM_PREFIX"_g1_"$i 100 testdata/OSC/sim_qos.json
+    sim_put_policy_type 201 $RIC_SIM_PREFIX"_g1_"$i 20008 testdata/OSC/sim_tsa.json
 done
 
 
 #Check the number of schemas and the individual schemas in OSC
-api_equal json:policy_types 3 120
+api_equal json:policy_types 4 120
 
 for ((i=1; i<=$OSC_NUM_RICS; i++))
 do
-    api_equal json:policy_types?ric=ricsim_g1_$i 2 120
+    api_equal json:policy_types?ric=$RIC_SIM_PREFIX"_g1_"$i 3 120
 done
 
 # Check the schemas in OSC
 for ((i=1; i<=$OSC_NUM_RICS; i++))
 do
     api_get_policy_schema 200 2 testdata/OSC/hw-agent-modified.json
+    api_get_policy_schema 200 100 testdata/OSC/qos-agent-modified.json
     api_get_policy_schema 200 20008 testdata/OSC/tsa-agent-modified.json
 done
 
@@ -98,34 +101,39 @@ done
 # Create policies
 use_agent_rest_http
 
-api_put_service 201 "rapp1" 0 "$CR_PATH/1"
+api_put_service 201 "Emergency-response-app" 0 "$CR_PATH/1"
 
 # Create policies in OSC
 for ((i=1; i<=$OSC_NUM_RICS; i++))
 do
-    api_put_policy 201 "rapp1" ricsim_g1_$i 2 $((2000+$i)) NOTRANSIENT testdata/OSC/pihw_template.json 1
-    api_put_policy 201 "rapp1" ricsim_g1_$i 20008 $((2050+$i*10)) NOTRANSIENT testdata/OSC/pitsa_template.json 1
+    generate_uuid
+    api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 2 $((2000+$i)) NOTRANSIENT testdata/OSC/pihw_template.json 1
+    generate_uuid
+    api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 100 $((3000+$i)) NOTRANSIENT testdata/OSC/piqos_template.json 1
+    generate_uuid
+    api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 20008 $((4000+$i)) NOTRANSIENT testdata/OSC/pitsa_template.json 1
 done
 
 
 # Check the number of policies in OSC
 for ((i=1; i<=$OSC_NUM_RICS; i++))
 do
-    sim_equal ricsim_g1_$i num_instances 2
+    sim_equal $RIC_SIM_PREFIX"_g1_"$i num_instances 3
 done
 
 
 # Create policies in STD
 for ((i=1; i<=$STD_NUM_RICS; i++))
 do
-    api_put_policy 201 "rapp1" ricsim_g2_$i NOTYPE $((2100+$i)) NOTRANSIENT testdata/STD/pi1_template.json 1
+    generate_uuid
+    api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g2_"$i NOTYPE $((2100+$i)) NOTRANSIENT testdata/STD/pi1_template.json 1
 done
 
 
 # Check the number of policies in STD
 for ((i=1; i<=$STD_NUM_RICS; i++))
 do
-    sim_equal ricsim_g2_$i num_instances 1
+    sim_equal $RIC_SIM_PREFIX"_g2_"$i num_instances 1
 done
 
 check_policy_agent_logs