#
-TC_ONELINE_DESCR="Full agent API walk through using agent REST/DMAAP and with/without SDNC A1 Controller"
+TC_ONELINE_DESCR="Full agent API walkthrough using agent REST/DMAAP and with/without SDNC A1 Controller"
-#App names to include in the test, space separated list
-INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC"
+#App names to include in the test when running docker, space separated list
+DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC NGW KUBEPROXY"
+#App names to include in the test when running kubernetes, space separated list
+KUBE_INCLUDED_IMAGES="CP CR MR PA RICSIM SDNC KUBEPROXY NGW"
+#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
+KUBE_PRESTARTED_IMAGES=""
-#SUPPORTED TEST ENV FILE
-SUPPORTED_PROFILES="ONAP-MASTER ONAP-GUILIN"
+#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"
-. ../common/testcase_common.sh $@
-. ../common/agent_api_functions.sh
-. ../common/ricsimulator_api_functions.sh
-. ../common/cr_api_functions.sh
+#Supported test environment profiles
+SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU ONAP-ISTANBUL ORAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE"
+#Supported run modes
+SUPPORTED_RUNMODES="DOCKER KUBE"
+
+. ../common/testcase_common.sh $@
+
+setup_testenvironment
#### TEST BEGIN ####
-generate_uuid
+generate_policy_uuid
# Tested variants of REST/DMAAP/SDNC config
TESTED_VARIANTS="REST DMAAP REST+SDNC DMAAP+SDNC"
echo "#####################################################################"
# Clean container and start all needed containers #
- clean_containers
+ clean_environment
+
+ start_kube_proxy
if [ $__httpx == "HTTPS" ]; then
+ use_cr_https
use_agent_rest_https
else
use_agent_rest_http
+ use_cr_http
fi
- start_policy_agent
+ start_policy_agent NORPOXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/$POLICY_AGENT_CONFIG_FILE
- set_agent_trace
+ set_agent_debug
# 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_APP_PATH_0/ric-registration"
if [ $__httpx == "HTTPS" ]; then
- use_cr_https
use_simulator_https
use_mr_https
if [[ $interface = *"SDNC"* ]]; then
use_agent_rest_https
fi
else
- use_cr_http
use_simulator_http
use_mr_http
if [[ $interface = *"SDNC"* ]]; then
start_mr
- start_cr
+ start_cr 1
+
+ start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
- start_control_panel
+ if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then
+ start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE
+ fi
- start_consul_cbs
+ if [ $RUNMODE == "DOCKER" ]; then
+ start_consul_cbs
+ fi
if [[ $interface = *"SDNC"* ]]; then
start_sdnc
prepare_consul_config NOSDNC ".consul_config.json"
fi
- consul_config_app ".consul_config.json"
+ if [ $RUNMODE == "KUBE" ]; then
+ agent_load_config ".consul_config.json"
+ else
+ consul_config_app ".consul_config.json"
+ fi
sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json
sim_put_policy_type 201 ricsim_g1_1 2 testdata/OSC/sim_2.json
sim_put_policy_type 201 ricsim_g3_1 STD_QOS_0_2_0 testdata/STD2/sim_qos.json
sim_put_policy_type 201 ricsim_g3_1 STD_QOS2_0.1.0 testdata/STD2/sim_qos2.json
- api_equal json:rics 3 60
+ api_equal json:rics 3 300
api_equal json:policy-types 5 120
api_equal json:policy-instances 0
else
- api_equal json:rics 2 60
+ api_equal json:rics 2 300
api_equal json:policy_schemas 3 120
fi
if [ "$PMS_VERSION" == "V2" ]; then
- cr_equal received_callbacks 3 120
- cr_api_check_all_sync_events 200 ric-registration ricsim_g1_1 ricsim_g2_1 ricsim_g3_1
+ cr_equal 0 received_callbacks 3 120
+ cr_api_check_all_sync_events 200 0 ric-registration ricsim_g1_1 ricsim_g2_1 ricsim_g3_1
fi
mr_equal requests_submitted 0
api_get_services 404 "service1"
- api_put_service 201 "service1" 1000 "$CR_PATH/1"
+ api_put_service 201 "service1" 1000 "$CR_SERVICE_APP_PATH_0/1"
- api_put_service 200 "service1" 2000 "$CR_PATH/1"
+ api_put_service 200 "service1" 2000 "$CR_SERVICE_APP_PATH_0/1"
- api_put_service 400 "service2" -1 "$CR_PATH/2"
+ api_put_service 400 "service2" -1 "$CR_SERVICE_APP_PATH_0/2"
- api_put_service 400 "service2" "wrong" "$CR_PATH/2"
+ api_put_service 400 "service2" "wrong" "$CR_SERVICE_APP_PATH_0/2"
api_put_service 400 "service2" 100 "/test"
api_put_service 201 "service2" 300 "ftp://localhost:80/test"
- api_get_services 200 "service1" "service1" 2000 "$CR_PATH/1"
+ api_get_services 200 "service1" "service1" 2000 "$CR_SERVICE_APP_PATH_0/1"
api_get_service_ids 200 "service1" "service2" "ric-registration"
- api_put_service 201 "service3" 5000 "$CR_PATH/3"
+ api_put_service 201 "service3" 5000 "$CR_SERVICE_APP_PATH_0/3"
api_get_service_ids 200 "service1" "service2" "service3" "ric-registration"
- api_get_services 200 "service1" "service1" 2000 "$CR_PATH/1"
+ api_get_services 200 "service1" "service1" 2000 "$CR_SERVICE_APP_PATH_0/1"
- api_get_services 200 NOSERVICE "service1" 2000 "$CR_PATH/1" "service2" 300 "ftp://localhost:80/test" "service3" 5000 "$CR_PATH/3" "ric-registration" 0 "$CR_PATH/ric-registration"
+ api_get_services 200 NOSERVICE "service1" 2000 "$CR_SERVICE_APP_PATH_0/1" "service2" 300 "ftp://localhost:80/test" "service3" 5000 "$CR_SERVICE_APP_PATH_0/3" "ric-registration" 0 "$CR_SERVICE_APP_PATH_0/ric-registration"
api_get_services 200
api_get_service_ids 200 "service2" "service3" "ric-registration"
- api_put_service 201 "service1" 50 "$CR_PATH/1"
+ api_put_service 201 "service1" 50 "$CR_SERVICE_APP_PATH_0/1"
api_get_service_ids 200 "service1" "service2" "service3" "ric-registration"
- api_put_service 201 "service10" 3600 "$CR_PATH/1"
+ api_put_service 201 "service10" 3600 "$CR_SERVICE_APP_PATH_0/1"
if [ "$PMS_VERSION" == "V2" ]; then
- notificationurl=$CR_PATH"/test"
+ notificationurl=$CR_SERVICE_APP_PATH_0"/test"
else
notificationurl=""
fi
api_get_policy_status 200 5000 OSC "$VAL" "false"
api_get_policy_status 200 5100 STD "UNDEFINED"
if [ "$PMS_VERSION" == "V2" ]; then
- api_get_policy_status 200 5200 STD "UNDEFINED"
+ api_get_policy_status 200 5200 STD2 EMPTY EMPTY
fi
api_get_policy 200 5100 testdata/STD/pi1_template.json "service10" ricsim_g2_1 NOTYPE false $notificationurl
- api_get_policy 200 5200 testdata/STD2/pi_qos2_template.json "service10" ricsim_g3_1 NOTYPE false $notificationurl
+ api_get_policy 200 5200 testdata/STD2/pi_qos2_template.json "service10" ricsim_g3_1 STD_QOS2_0.1.0 false $notificationurl
- api_get_policies 200 ricsim_g1_1 "service10" 1 5000 ricsim_g1_1 "service10" STD_QOS2_0 true $notificationurl testdata/OSC/pi1_template.json
+ api_get_policies 200 ricsim_g1_1 "service10" 1 5000 ricsim_g1_1 "service10" 1 false $notificationurl testdata/OSC/pi1_template.json
else
api_get_policy 200 5000 testdata/OSC/pi1_template.json
fi
if [ "$PMS_VERSION" == "V2" ]; then
- cr_equal received_callbacks 3
+ cr_equal 0 received_callbacks 3
fi
if [[ $interface = *"DMAAP"* ]]; then
fi
if [[ $interface = *"SDNC"* ]]; then
- sim_contains_str ricsim_g1_1 remote_hosts "a1-controller"
- sim_contains_str ricsim_g2_1 remote_hosts "a1-controller"
+ sim_contains_str ricsim_g1_1 remote_hosts $SDNC_APP_NAME
+ sim_contains_str ricsim_g2_1 remote_hosts $SDNC_APP_NAME
if [ "$PMS_VERSION" == "V2" ]; then
- sim_contains_str ricsim_g3_1 remote_hosts "a1-controller"
+ sim_contains_str ricsim_g3_1 remote_hosts $SDNC_APP_NAME
fi
else
- sim_contains_str ricsim_g1_1 remote_hosts "policy-agent"
- sim_contains_str ricsim_g2_1 remote_hosts "policy-agent"
+ sim_contains_str ricsim_g1_1 remote_hosts $POLICY_AGENT_APP_NAME
+ sim_contains_str ricsim_g2_1 remote_hosts $POLICY_AGENT_APP_NAME
if [ "$PMS_VERSION" == "V2" ]; then
- sim_contains_str ricsim_g3_1 remote_hosts "policy-agent"
+ sim_contains_str ricsim_g3_1 remote_hosts $POLICY_AGENT_APP_NAME
fi
fi
check_policy_agent_logs
- check_control_panel_logs
if [[ $interface = *"SDNC"* ]]; then
check_sdnc_logs
print_result
-auto_clean_containers
+auto_clean_environment
Code Review / nonrtric.git / blobdiff