TC_ONELINE_DESCR="Basic use case, register service, create/update policy, delete policy, de-register service using both STD and OSC interface while mixing REST and Dmaap"
-#App names to exclude checking pulling images for, space separated list
-EXCLUDED_IMAGES="SDNC SDNC_ONAP"
+#App names to include in the test when running docker, space separated list
+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=" MR CR A1PMS RICSIM CP KUBEPROXY NGW"
+#Prestarted 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-JAKARTA ONAP-KOHN ONAP-LONDON ORAN-F-RELEASE ORAN-G-RELEASE ORAN-H-RELEASE"
+#Supported run modes
+SUPPORTED_RUNMODES="DOCKER KUBE"
. ../common/testcase_common.sh $@
-. ../common/agent_api_functions.sh
-. ../common/ricsimulator_api_functions.sh
+
+setup_testenvironment
#### TEST BEGIN ####
-generate_uuid
+generate_policy_uuid
+
+use_simulator_http
+use_mr_http
+use_a1pms_rest_http
-#Local vars in test script
-##########################
-# Path to callback receiver
-CR_PATH="http://$CR_APP_NAME:$CR_EXTERNAL_PORT/callbacks"
-clean_containers
+clean_environment
+
+start_kube_proxy
start_ric_simulators ricsim_g1 3 OSC_2.1.0
start_ric_simulators ricsim_g2 5 STD_1.1.3
+start_ric_simulators ricsim_g3 1 STD_2.0.0
+
start_mr
-start_cr
+start_cr 1
+
+
+start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
-start_consul_cbs
+if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then
+ start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE
+fi
-prepare_consul_config NOSDNC ".consul_config.json"
-consul_config_app ".consul_config.json"
+start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE
-start_control_panel
+set_a1pms_debug
-start_policy_agent
+use_a1pms_rest_http
-set_agent_debug
-use_agent_rest_http
+prepare_a1pms_config NOSDNC ".a1pms_config.json"
-api_get_status 200
+if [ $RUNMODE == "KUBE" ]; then
+ a1pms_load_config ".a1pms_config.json"
+else
+ a1pms_api_put_configuration 200 ".a1pms_config.json"
+fi
+
+sleep_wait 120 "Let A1PMS cofiguration take effect"
+
+a1pms_api_get_status 200
sim_print ricsim_g1_1 interface
sim_print ricsim_g2_1 interface
-sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json
+sim_print ricsim_g3_1 interface
-api_equal json:policy_types 2 60
+sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json
+sim_put_policy_type 201 ricsim_g3_1 STD_QOS_0_2_0 testdata/STD2/sim_qos.json
+a1pms_equal json:policy-types 3 300
# Create policies
-use_agent_rest_http
-api_put_service 201 "service1" 3600 "$CR_PATH/1"
+notificationurl=$CR_SERVICE_APP_PATH_0"/test"
+
+use_a1pms_rest_http
-api_put_policy 201 "service1" ricsim_g1_1 1 2000 NOTRANSIENT testdata/OSC/pi1_template.json 1
+a1pms_api_put_service 201 "service1" 3600 "$CR_SERVICE_APP_PATH_0/1"
+
+a1pms_api_put_policy 201 "service1" ricsim_g1_1 1 2000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json 1
sim_equal ricsim_g1_1 num_instances 1
-use_agent_dmaap
+use_a1pms_dmaap_http
-api_put_policy 201 "service1" ricsim_g1_1 1 3000 NOTRANSIENT testdata/OSC/pi1_template.json 1
+a1pms_api_put_policy 201 "service1" ricsim_g1_1 1 3000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json 1
sim_equal ricsim_g1_1 num_instances 2
-use_agent_rest_http
+use_a1pms_rest_http
-api_put_policy 201 "service1" ricsim_g2_1 NOTYPE 2100 NOTRANSIENT testdata/STD/pi1_template.json 1
+a1pms_api_put_policy 201 "service1" ricsim_g2_1 NOTYPE 2100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1
sim_equal ricsim_g2_1 num_instances 1
-use_agent_dmaap
+use_a1pms_dmaap_http
-api_put_policy 201 "service1" ricsim_g2_1 NOTYPE 3100 NOTRANSIENT testdata/STD/pi1_template.json 1
+a1pms_api_put_policy 201 "service1" ricsim_g2_1 NOTYPE 3100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1
sim_equal ricsim_g2_1 num_instances 2
+use_a1pms_rest_http
+
+a1pms_api_put_policy 201 "service1" ricsim_g3_1 STD_QOS_0_2_0 2200 true $notificationurl testdata/STD2/pi_qos_template.json 1
+
+sim_equal ricsim_g3_1 num_instances 1
+
+use_a1pms_dmaap_http
+
+a1pms_api_put_policy 201 "service1" ricsim_g3_1 STD_QOS_0_2_0 3200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos_template.json 1
+
+sim_equal ricsim_g3_1 num_instances 2
#Update policies
-use_agent_rest_http
+use_a1pms_rest_http
-api_put_service 200 "service1" 3600 "$CR_PATH/1"
+a1pms_api_put_service 200 "service1" 3600 "$CR_SERVICE_APP_PATH_0/1"
-api_put_policy 200 "service1" ricsim_g1_1 1 2000 NOTRANSIENT testdata/OSC/pi1_template.json 1
+a1pms_api_put_policy 200 "service1" ricsim_g1_1 1 2000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json 1
sim_equal ricsim_g1_1 num_instances 2
-use_agent_dmaap
+use_a1pms_dmaap_http
-api_put_policy 200 "service1" ricsim_g1_1 1 3000 NOTRANSIENT testdata/OSC/pi1_template.json 1
+a1pms_api_put_policy 200 "service1" ricsim_g1_1 1 3000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json 1
sim_equal ricsim_g1_1 num_instances 2
-use_agent_rest_http
+use_a1pms_rest_http
-api_put_policy 200 "service1" ricsim_g2_1 NOTYPE 2100 NOTRANSIENT testdata/STD/pi1_template.json 1
+a1pms_api_put_policy 200 "service1" ricsim_g2_1 NOTYPE 2100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1
sim_equal ricsim_g2_1 num_instances 2
-use_agent_dmaap
+use_a1pms_dmaap_http
-api_put_policy 200 "service1" ricsim_g2_1 NOTYPE 3100 NOTRANSIENT testdata/STD/pi1_template.json 1
+a1pms_api_put_policy 200 "service1" ricsim_g2_1 NOTYPE 3100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1
sim_equal ricsim_g2_1 num_instances 2
+use_a1pms_rest_http
+
+a1pms_api_put_policy 200 "service1" ricsim_g3_1 STD_QOS_0_2_0 2200 true $notificationurl testdata/STD2/pi_qos_template.json 1
+
+sim_equal ricsim_g3_1 num_instances 2
+
+
+use_a1pms_dmaap_http
+
+a1pms_api_put_policy 200 "service1" ricsim_g3_1 STD_QOS_0_2_0 3200 true $notificationurl testdata/STD2/pi_qos_template.json 1
+
+sim_equal ricsim_g3_1 num_instances 2
+
# Check policies
-api_get_policy 200 2000 testdata/OSC/pi1_template.json
-api_get_policy 200 3000 testdata/OSC/pi1_template.json
-api_get_policy 200 2100 testdata/STD/pi1_template.json
-api_get_policy 200 3100 testdata/STD/pi1_template.json
+a1pms_api_get_policy 200 2000 testdata/OSC/pi1_template.json "service1" ricsim_g1_1 1 false $notificationurl
+a1pms_api_get_policy 200 3000 testdata/OSC/pi1_template.json "service1" ricsim_g1_1 1 false $notificationurl
+a1pms_api_get_policy 200 2100 testdata/STD/pi1_template.json "service1" ricsim_g2_1 NOTYPE false $notificationurl
+a1pms_api_get_policy 200 3100 testdata/STD/pi1_template.json "service1" ricsim_g2_1 NOTYPE false $notificationurl
+a1pms_api_get_policy 200 2200 testdata/STD2/pi_qos_template.json "service1" ricsim_g3_1 STD_QOS_0_2_0 true $notificationurl
+a1pms_api_get_policy 200 3200 testdata/STD2/pi_qos_template.json "service1" ricsim_g3_1 STD_QOS_0_2_0 true $notificationurl
+
+sim_equal ricsim_g1_1 num_instances 2
+sim_equal ricsim_g2_1 num_instances 2
+
+sim_equal ricsim_g3_1 num_instances 2
# Remove policies
-use_agent_dmaap
-api_delete_policy 204 2000
-use_agent_rest_http
-api_delete_policy 204 3000
-use_agent_dmaap
-api_delete_policy 204 2100
-use_agent_rest_http
-api_delete_policy 204 3100
+use_a1pms_dmaap_http
+a1pms_api_delete_policy 204 2000
+use_a1pms_rest_http
+a1pms_api_delete_policy 204 3000
+use_a1pms_dmaap_http
+a1pms_api_delete_policy 204 2100
+use_a1pms_rest_http
+a1pms_api_delete_policy 204 3100
+use_a1pms_dmaap_http
+a1pms_api_delete_policy 204 2200
+use_a1pms_rest_http
+a1pms_api_delete_policy 204 3200
sim_equal ricsim_g1_1 num_instances 0
sim_equal ricsim_g2_1 num_instances 0
+sim_equal ricsim_g3_1 num_instances 0
+
# Check remote host access to simulator
-sim_contains_ste ricsim_g1_1 hosts "policy-agent"
-sim_contains_ste ricsim_g2_1 hosts "policy-agent"
+sim_contains_str ricsim_g1_1 remote_hosts $A1PMS_APP_NAME
+sim_contains_str ricsim_g2_1 remote_hosts $A1PMS_APP_NAME
+sim_contains_str ricsim_g3_1 remote_hosts $A1PMS_APP_NAME
# Check policy removal
-use_agent_rest_http
-api_get_policy 404 2000
-api_get_policy 404 3000
-api_get_policy 404 2100
-api_get_policy 404 3100
-
-# Remove the service
-use_agent_dmaap
-api_delete_services 204 "service1"
+use_a1pms_rest_http
+a1pms_api_get_policy 404 2000
+a1pms_api_get_policy 404 3000
+a1pms_api_get_policy 404 2100
+a1pms_api_get_policy 404 3100
-api_get_services 404 "service1"
+a1pms_api_get_policy 404 2200
+a1pms_api_get_policy 404 3200
+# Remove the service
+use_a1pms_dmaap_http
+a1pms_api_delete_services 204 "service1"
+a1pms_api_get_services 404 "service1"
-check_policy_agent_logs
+check_a1pms_logs
#### TEST COMPLETE ####
print_result
-auto_clean_containers
\ No newline at end of file
+auto_clean_environment
\ No newline at end of file
Code Review / nonrtric.git / blobdiff