X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC10.sh;h=2e627fc899720912ed67c185b48d6b1570d09172;hb=caf750c05d1fdac7165b2368f5cc6882517c6390;hp=771ee55535b6ceb05b10ae7efc484781afbe35b2;hpb=6116e98837066075013c5ee22b39a2df4ff604ea;p=nonrtric.git

diff --git a/test/auto-test/FTC10.sh b/test/auto-test/FTC10.sh
index 771ee555..2e627fc8 100755
--- a/test/auto-test/FTC10.sh
+++ b/test/auto-test/FTC10.sh
@@ -28,10 +28,13 @@ EXCLUDED_IMAGES="SDNC SDNC_ONAP"
 
 #### TEST BEGIN ####
 
+generate_uuid
+
 #Local vars in test script
 ##########################
 # Path to callback receiver
 CR_PATH="http://$CR_APP_NAME:$CR_EXTERNAL_PORT/callbacks"
+use_cr_http
 
 clean_containers
 
@@ -77,7 +80,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
 
@@ -91,7 +94,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
 
@@ -108,7 +111,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
 
@@ -123,7 +126,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
 
@@ -137,11 +140,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
@@ -151,8 +154,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
@@ -162,7 +165,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"