TC_ONELINE_DESCR="Resync of RIC via changes in the consul config or pushed config"
-#App names to include in the test, space separated list
-INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM"
+#App names to include in the test when running docker, space separated list
+DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM NGW"
-#SUPPORTED TEST ENV FILE
-SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU ORAN-CHERRY ORAN-DAWN"
+#Supported test environment profiles
+SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU ONAP-ISTANBUL ORAN-CHERRY ORAN-D-RELEASE"
+#Supported run modes
+SUPPORTED_RUNMODES="DOCKER"
. ../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
+
+setup_testenvironment
#### TEST BEGIN ####
fi
for consul_conf in $TESTED_VARIANTS ; do
- generate_uuid
+ generate_policy_uuid
# Clean container and start all needed containers #
- clean_containers
+ clean_environment
- start_policy_agent
+ start_policy_agent NOPROXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/$POLICY_AGENT_CONFIG_FILE
set_agent_trace
# Create service to be able to receive events when rics becomes available
# Must use rest towards the agent since dmaap is not configured yet
- api_put_service 201 "ric-registration" 0 "$CR_PATH/ric-registration"
+ api_put_service 201 "ric-registration" 0 "$CR_SERVICE_PATH/ric-registration"
# Start one RIC of each type
start_ric_simulators ricsim_g1 1 OSC_2.1.0
fi
if [ "$PMS_VERSION" == "V2" ]; then
- api_equal json:rics 3 120
+ api_equal json:rics 3 300
cr_equal received_callbacks 3 120
cr_api_check_all_sync_events 200 ric-registration ricsim_g1_1 ricsim_g2_1 ricsim_g3_1
else
- api_equal json:rics 2 120
+ api_equal json:rics 2 300
fi
# Add an STD RIC and check
fi
check_policy_agent_logs
- check_control_panel_logs
+
# Remove one RIC RIC and check
start_ric_simulators ricsim_g2 1 STD_1.1.3
fi
check_policy_agent_logs
- check_control_panel_logs
+ check_sdnc_logs
store_logs END_$consul_conf
done
print_result
-auto_clean_containers
+auto_clean_environment