Restructure test cases and upgraded test environment

[nonrtric.git] / test / auto-test / FTC10.sh

diff --git a/test/auto-test/FTC10.sh b/test/auto-test/FTC10.sh
index eaa6de2..754260e 100755 (executable)
--- a/test/auto-test/FTC10.sh
+++ b/test/auto-test/FTC10.sh
@@ -20,7 +20,7 @@
 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"
+EXCLUDED_IMAGES="SDNC ECS"
 
 . ../common/testcase_common.sh $@
 . ../common/agent_api_functions.sh
@@ -35,6 +35,12 @@ generate_uuid
 # Path to callback receiver
 CR_PATH="http://$CR_APP_NAME:$CR_EXTERNAL_PORT/callbacks"
 
+use_cr_http
+use_simulator_http
+use_mr_http
+use_agent_rest_http
+
+
 clean_containers
 
 start_ric_simulators  ricsim_g1 3 OSC_2.1.0
@@ -79,7 +85,7 @@ api_put_policy 201 "service1" ricsim_g1_1 1 2000 NOTRANSIENT testdata/OSC/pi1_te
 sim_equal ricsim_g1_1 num_instances 1
 
 
-use_agent_dmaap
+use_agent_dmaap_http
 
 api_put_policy 201 "service1" ricsim_g1_1 1 3000 NOTRANSIENT testdata/OSC/pi1_template.json 1
 
@@ -93,7 +99,7 @@ api_put_policy 201 "service1" ricsim_g2_1 NOTYPE 2100 NOTRANSIENT testdata/STD/p
 sim_equal ricsim_g2_1 num_instances 1
 
 
-use_agent_dmaap
+use_agent_dmaap_http
 
 api_put_policy 201 "service1" ricsim_g2_1 NOTYPE 3100 NOTRANSIENT testdata/STD/pi1_template.json 1
 
@@ -110,7 +116,7 @@ api_put_policy 200 "service1" ricsim_g1_1 1 2000 NOTRANSIENT testdata/OSC/pi1_te
 sim_equal ricsim_g1_1 num_instances 2
 
 
-use_agent_dmaap
+use_agent_dmaap_http
 
 api_put_policy 200 "service1" ricsim_g1_1 1 3000 NOTRANSIENT testdata/OSC/pi1_template.json 1
 
@@ -125,7 +131,7 @@ api_put_policy 200 "service1" ricsim_g2_1 NOTYPE 2100 NOTRANSIENT testdata/STD/p
 sim_equal ricsim_g2_1 num_instances 2
 
 
-use_agent_dmaap
+use_agent_dmaap_http
 
 api_put_policy 200 "service1" ricsim_g2_1 NOTYPE 3100 NOTRANSIENT testdata/STD/pi1_template.json 1
 
@@ -139,11 +145,11 @@ api_get_policy 200 3100 testdata/STD/pi1_template.json
 
 # Remove policies
 
-use_agent_dmaap
+use_agent_dmaap_http
 api_delete_policy 204 2000
 use_agent_rest_http
 api_delete_policy 204 3000
-use_agent_dmaap
+use_agent_dmaap_http
 api_delete_policy 204 2100
 use_agent_rest_http
 api_delete_policy 204 3100
@@ -153,8 +159,8 @@ sim_equal ricsim_g2_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 "policy-agent"
+sim_contains_str ricsim_g2_1 remote_hosts "policy-agent"
 
 # Check policy removal
 use_agent_rest_http
@@ -164,7 +170,7 @@ api_get_policy 404 2100
 api_get_policy 404 3100
 
 # Remove the service
-use_agent_dmaap
+use_agent_dmaap_http
 api_delete_services 204 "service1"
 
 api_get_services 404 "service1"