Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
First version of service exposure
[nonrtric.git]
/
test
/
auto-test
/
FTC2003.sh
diff --git
a/test/auto-test/FTC2003.sh
b/test/auto-test/FTC2003.sh
index
6e22ced
..
3076bb1
100755
(executable)
--- a/
test/auto-test/FTC2003.sh
+++ b/
test/auto-test/FTC2003.sh
@@
-17,13
+17,13
@@
# ============LICENSE_END=================================================
#
# ============LICENSE_END=================================================
#
-TC_ONELINE_DESCR="Testing southbound proxy for Dmaap Adapt
o
r"
+TC_ONELINE_DESCR="Testing southbound proxy for Dmaap Adapt
e
r"
#App names to include in the test when running docker, space separated list
#App names to include in the test when running docker, space separated list
-DOCKER_INCLUDED_IMAGES="CR MR
E
CS HTTPPROXY KUBEPROXY DMAAPADP"
+DOCKER_INCLUDED_IMAGES="CR MR
I
CS HTTPPROXY KUBEPROXY DMAAPADP"
#App names to include in the test when running kubernetes, space separated list
#App names to include in the test when running kubernetes, space separated list
-KUBE_INCLUDED_IMAGES=" CR MR
E
CS HTTPPROXY KUBEPROXY DMAAPADP"
+KUBE_INCLUDED_IMAGES=" CR MR
I
CS HTTPPROXY KUBEPROXY DMAAPADP"
#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=""
#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=""
@@
-33,17
+33,11
@@
KUBE_PRESTARTED_IMAGES=""
CONDITIONALLY_IGNORED_IMAGES=""
#Supported test environment profiles
CONDITIONALLY_IGNORED_IMAGES=""
#Supported test environment profiles
-SUPPORTED_PROFILES="ORAN-E-RELEASE"
+SUPPORTED_PROFILES="ORAN-E-RELEASE
ORAN-F-RELEASE
"
#Supported run modes
SUPPORTED_RUNMODES="DOCKER KUBE"
. ../common/testcase_common.sh $@
#Supported run modes
SUPPORTED_RUNMODES="DOCKER KUBE"
. ../common/testcase_common.sh $@
-. ../common/ecs_api_functions.sh
-. ../common/cr_api_functions.sh
-. ../common/mr_api_functions.sh
-. ../common/http_proxy_api_functions.sh
-. ../common/kube_proxy_api_functions.sh
-. ../common/dmaapadp_api_functions.sh
setup_testenvironment
setup_testenvironment
@@
-58,7
+52,7
@@
NUM_JOBS=10
clean_environment
use_cr_https
clean_environment
use_cr_https
-use_
e
cs_rest_https
+use_
i
cs_rest_https
use_mr_https
use_dmaapadp_https
use_mr_https
use_dmaapadp_https
@@
-66,38
+60,38
@@
start_kube_proxy
start_http_proxy
start_http_proxy
-start_cr
+start_cr
1
-start_
ecs NOPROXY $SIM_GROUP/$ECS_COMPOSE_DIR/$E
CS_CONFIG_FILE
+start_
ics NOPROXY $SIM_GROUP/$ICS_COMPOSE_DIR/$I
CS_CONFIG_FILE
-set_
e
cs_trace
+set_
i
cs_trace
start_mr
start_mr
-start_dmaapadp PROXY $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_CONFIG_FILE $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_DATA_FILE
+start_dmaapadp PROXY $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_CONFIG_FILE
_TEMPLATE
$SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_DATA_FILE
set_dmaapadp_trace
set_dmaapadp_trace
-if [[ "$
E
CS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
-
e
cs_equal json:data-producer/v1/info-producers 1 60
+if [[ "$
I
CS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
+
i
cs_equal json:data-producer/v1/info-producers 1 60
else
else
-
e
cs_equal json:ei-producer/v1/eiproducers 1 60
+
i
cs_equal json:ei-producer/v1/eiproducers 1 60
fi
fi
-
e
cs_api_idc_get_job_ids 200 NOTYPE NOWNER EMPTY
-
e
cs_api_idc_get_type_ids 200 ExampleInformationType
+
i
cs_api_idc_get_job_ids 200 NOTYPE NOWNER EMPTY
+
i
cs_api_idc_get_type_ids 200 ExampleInformationType
-
e
cs_api_edp_get_producer_ids_2 200 NOTYPE DmaapGenericInfoProducer
+
i
cs_api_edp_get_producer_ids_2 200 NOTYPE DmaapGenericInfoProducer
for ((i=1; i<=$NUM_JOBS; i++))
do
for ((i=1; i<=$NUM_JOBS; i++))
do
-
ecs_api_idc_put_job 201 joby$i ExampleInformationType $CR_SERVICE_MR_PATH/joby-data$i info-ownery$i $CR_SERVICE_MR_PATH
/job_status_info-ownery$i testdata/dmaap-adapter/job-template.json
+
ics_api_idc_put_job 201 joby$i ExampleInformationType $CR_SERVICE_MR_PATH_0/joby-data$i info-ownery$i $CR_SERVICE_MR_PATH_0
/job_status_info-ownery$i testdata/dmaap-adapter/job-template.json
done
for ((i=1; i<=$NUM_JOBS; i++))
do
done
for ((i=1; i<=$NUM_JOBS; i++))
do
-
e
cs_api_a1_get_job_status 200 joby$i ENABLED 30
+
i
cs_api_a1_get_job_status 200 joby$i ENABLED 30
done
done
@@
-105,20
+99,20
@@
done
mr_api_send_json "/events/unauthenticated.dmaapadp.json" '{"msg":"msg-1"}'
mr_api_send_json "/events/unauthenticated.dmaapadp.json" '{"msg":"msg-3"}'
mr_api_send_json "/events/unauthenticated.dmaapadp.json" '{"msg":"msg-1"}'
mr_api_send_json "/events/unauthenticated.dmaapadp.json" '{"msg":"msg-3"}'
-cr_equal received_callbacks $(($NUM_JOBS*2)) 60
+cr_equal
0
received_callbacks $(($NUM_JOBS*2)) 60
for ((i=1; i<=$NUM_JOBS; i++))
do
for ((i=1; i<=$NUM_JOBS; i++))
do
- cr_equal received_callbacks?id=joby-data$i 2
+ cr_equal
0
received_callbacks?id=joby-data$i 2
done
for ((i=1; i<=$NUM_JOBS; i++))
do
done
for ((i=1; i<=$NUM_JOBS; i++))
do
- cr_api_check_single_genric_json_event 200 joby-data$i '{"msg":"msg-1"}'
- cr_api_check_single_genric_json_event 200 joby-data$i '{"msg":"msg-3"}'
+ cr_api_check_single_genric_json_event 200
0
joby-data$i '{"msg":"msg-1"}'
+ cr_api_check_single_genric_json_event 200
0
joby-data$i '{"msg":"msg-3"}'
done
done
-cr_contains_str remote_hosts $HTTP_PROXY_APP_NAME
+cr_contains_str
0
remote_hosts $HTTP_PROXY_APP_NAME
#### TEST COMPLETE ####
#### TEST COMPLETE ####
@@
-126,4
+120,4
@@
store_logs END
print_result
print_result
-auto_clean_environment
\ No newline at end of file
+auto_clean_environment