##########################
# Path to callback receiver
CR_PATH="http://$CR_APP_NAME:$CR_EXTERNAL_PORT/callbacks"
+use_cr_http
clean_containers
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
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
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
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
# 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
# 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
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"