Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Restructure test cases and upgraded test environment
[nonrtric.git]
/
test
/
auto-test
/
FTC850.sh
diff --git
a/test/auto-test/FTC850.sh
b/test/auto-test/FTC850.sh
index
32e450f
..
d6cc001
100755
(executable)
--- a/
test/auto-test/FTC850.sh
+++ b/
test/auto-test/FTC850.sh
@@
-20,7
+20,7
@@
TC_ONELINE_DESCR="Create/delete policies in parallel over a number of ric using a number of child process"
#App names to exclude checking pulling images for, space separated list
TC_ONELINE_DESCR="Create/delete policies in parallel over a number of ric using a number of child process"
#App names to exclude checking pulling images for, space separated list
-EXCLUDED_IMAGES="
SDNC_ONAP
"
+EXCLUDED_IMAGES="
ECS
"
. ../common/testcase_common.sh $@
. ../common/agent_api_functions.sh
. ../common/testcase_common.sh $@
. ../common/agent_api_functions.sh
@@
-30,8
+30,6
@@
EXCLUDED_IMAGES="SDNC_ONAP"
#Local vars in test script
##########################
#Local vars in test script
##########################
-# Path to callback receiver
-CR_PATH="http://$CR_APP_NAME:$CR_EXTERNAL_PORT/callbacks"
# Tested variants of REST/DMAAP/SDNC config
TESTED_VARIANTS="REST REST+SDNC"
# Tested variants of REST/DMAAP/SDNC config
TESTED_VARIANTS="REST REST+SDNC"
@@
-53,20
+51,29
@@
for __httpx in $TESTED_PROTOCOLS ; do
echo "#####################################################################"
echo "#####################################################################"
echo "#####################################################################"
echo "#####################################################################"
-
- # Clean container and start all needed containers #
- clean_containers
-
if [ $__httpx == "HTTPS" ]; then
if [ $__httpx == "HTTPS" ]; then
- echo "Using secure ports towards simulators and sdnc"
+ CR_PATH="https://$CR_APP_NAME:$CR_EXTERNAL_SECURE_PORT/callbacks"
+ use_cr_https
use_simulator_https
use_simulator_https
- use_sdnc_https
+ use_mr_https
+ if [[ $interface = *"SDNC"* ]]; then
+ use_sdnc_https
+ fi
+ use_agent_rest_https
else
else
- echo "Using non-secure ports towards simulators and sdnc"
+ CR_PATH="http://$CR_APP_NAME:$CR_EXTERNAL_PORT/callbacks"
+ use_cr_http
use_simulator_http
use_simulator_http
- use_sdnc_http
+ use_mr_http
+ if [[ $interface = *"SDNC"* ]]; then
+ use_sdnc_http
+ fi
+ use_agent_rest_http
fi
fi
+ # Clean container and start all needed containers #
+ clean_containers
+
start_ric_simulators ricsim_g1 $NUM_RICS OSC_2.1.0
start_consul_cbs
start_ric_simulators ricsim_g1 $NUM_RICS OSC_2.1.0
start_consul_cbs
@@
-88,14
+95,6
@@
for __httpx in $TESTED_PROTOCOLS ; do
set_agent_debug
set_agent_debug
- if [ $__httpx == "HTTPS" ]; then
- echo "Using secure ports towards the agent"
- use_agent_rest_https
- else
- echo "Using non-secure ports towards the agent"
- use_agent_rest_http
- fi
-
api_get_status 200
for ((i=1; i<=$NUM_RICS; i++))
api_get_status 200
for ((i=1; i<=$NUM_RICS; i++))