Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge changes Id5e8969d,I56437e93
[nonrtric.git]
/
test
/
auto-test
/
FTC10.sh
diff --git
a/test/auto-test/FTC10.sh
b/test/auto-test/FTC10.sh
index
eaa6de2
..
2e627fc
100755
(executable)
--- a/
test/auto-test/FTC10.sh
+++ b/
test/auto-test/FTC10.sh
@@
-34,6
+34,7
@@
generate_uuid
##########################
# Path to callback receiver
CR_PATH="http://$CR_APP_NAME:$CR_EXTERNAL_PORT/callbacks"
##########################
# Path to callback receiver
CR_PATH="http://$CR_APP_NAME:$CR_EXTERNAL_PORT/callbacks"
+use_cr_http
clean_containers
clean_containers
@@
-79,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
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
api_put_policy 201 "service1" ricsim_g1_1 1 3000 NOTRANSIENT testdata/OSC/pi1_template.json 1
@@
-93,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
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
api_put_policy 201 "service1" ricsim_g2_1 NOTYPE 3100 NOTRANSIENT testdata/STD/pi1_template.json 1
@@
-110,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
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
api_put_policy 200 "service1" ricsim_g1_1 1 3000 NOTRANSIENT testdata/OSC/pi1_template.json 1
@@
-125,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
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
api_put_policy 200 "service1" ricsim_g2_1 NOTYPE 3100 NOTRANSIENT testdata/STD/pi1_template.json 1
@@
-139,11
+140,11
@@
api_get_policy 200 3100 testdata/STD/pi1_template.json
# Remove policies
# Remove policies
-use_agent_dmaap
+use_agent_dmaap
_http
api_delete_policy 204 2000
use_agent_rest_http
api_delete_policy 204 3000
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
api_delete_policy 204 2100
use_agent_rest_http
api_delete_policy 204 3100
@@
-153,8
+154,8
@@
sim_equal ricsim_g2_1 num_instances 0
# Check remote host access to simulator
# Check remote host access to simulator
-sim_contains_st
e ricsim_g1_1
hosts "policy-agent"
-sim_contains_st
e ricsim_g2_1
hosts "policy-agent"
+sim_contains_st
r ricsim_g1_1 remote_
hosts "policy-agent"
+sim_contains_st
r ricsim_g2_1 remote_
hosts "policy-agent"
# Check policy removal
use_agent_rest_http
# Check policy removal
use_agent_rest_http
@@
-164,7
+165,7
@@
api_get_policy 404 2100
api_get_policy 404 3100
# Remove the service
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"
api_delete_services 204 "service1"
api_get_services 404 "service1"