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 "Storage of PM Data"
[nonrtric.git]
/
test
/
auto-test
/
PM_EI_DEMO.sh
diff --git
a/test/auto-test/PM_EI_DEMO.sh
b/test/auto-test/PM_EI_DEMO.sh
index
deff460
..
7b8a6ed
100755
(executable)
--- a/
test/auto-test/PM_EI_DEMO.sh
+++ b/
test/auto-test/PM_EI_DEMO.sh
@@
-17,13
+17,13
@@
# ============LICENSE_END=================================================
#
# ============LICENSE_END=================================================
#
-TC_ONELINE_DESCR="Preparation demo setup - policy management and
enrichment
information"
+TC_ONELINE_DESCR="Preparation demo setup - policy management and
information
information"
#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="C
BS CONSUL CP CR MR PA RICSIM SDNC E
CS PRODSTUB RC HTTPPROXY KUBEPROXY NGW"
+DOCKER_INCLUDED_IMAGES="C
P CR MR A1PMS RICSIM SDNC I
CS PRODSTUB RC HTTPPROXY KUBEPROXY NGW"
#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=" MR CR
PA RC PRODSTUB RICSIM CP E
CS SDNC HTTPPROXY KUBEPROXY NGW"
+KUBE_INCLUDED_IMAGES=" MR CR
A1PMS RC PRODSTUB RICSIM CP I
CS SDNC HTTPPROXY KUBEPROXY NGW"
#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,7
+33,7
@@
KUBE_PRESTARTED_IMAGES=""
CONDITIONALLY_IGNORED_IMAGES="NGW"
#Supported test environment profiles
CONDITIONALLY_IGNORED_IMAGES="NGW"
#Supported test environment profiles
-SUPPORTED_PROFILES="ONAP-
HONOLULU ONAP-ISTANBUL ORAN-CHERRY ORAN-D-RELEASE ORAN-E
-RELEASE"
+SUPPORTED_PROFILES="ONAP-
JAKARTA ONAP-KOHN ONAP-LONDON ORAN-F-RELEASE ORAN-G-RELEASE ORAN-H
-RELEASE"
#Supported run modes
SUPPORTED_RUNMODES="DOCKER KUBE"
#Supported run modes
SUPPORTED_RUNMODES="DOCKER KUBE"
@@
-47,24
+47,19
@@
setup_testenvironment
##########################
use_cr_https
##########################
use_cr_https
-use_a
gent
_rest_https
+use_a
1pms
_rest_https
use_sdnc_https
use_simulator_https
use_sdnc_https
use_simulator_https
-use_
e
cs_rest_https
+use_
i
cs_rest_https
use_prod_stub_https
use_prod_stub_https
-if [ $
E
CS_VERSION == "V1-1" ]; then
+if [ $
I
CS_VERSION == "V1-1" ]; then
use_rapp_catalogue_http # https not yet supported
else
use_rapp_catalogue_https
fi
use_rapp_catalogue_http # https not yet supported
else
use_rapp_catalogue_https
fi
-if [ "$PMS_VERSION" == "V2" ]; then
- notificationurl=$CR_SERVICE_APP_PATH_0"/test"
-else
- echo "PMS VERSION 2 (V2) is required"
- exit 1
-fi
+notificationurl=$CR_SERVICE_APP_PATH_0"/test"
clean_environment
clean_environment
@@
-76,7
+71,7
@@
STD_NUM_RICS=2
start_ric_simulators $RIC_SIM_PREFIX"_g3" $STD_NUM_RICS STD_2.0.0
start_ric_simulators $RIC_SIM_PREFIX"_g3" $STD_NUM_RICS STD_2.0.0
-start_mr #Just to prevent errors in the a
gent
log...
+start_mr #Just to prevent errors in the a
1pms
log...
start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
@@
-84,36
+79,34
@@
if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then
start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE
fi
start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE
fi
-start_sdnc # Comment this line to run PMS with proxy
+start_sdnc # Comment this line to run
A1
PMS with proxy
-start_
policy_agent PROXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/$POLICY_AGENT
_CONFIG_FILE
+start_
a1pms PROXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS
_CONFIG_FILE
-if [ $RUNMODE == "DOCKER" ]; then
- start_consul_cbs
-fi
-prepare_consul_config SDNC ".consul_config.json" #Change to NOSDNC if running PMS with proxy
+
+prepare_a1pms_config SDNC ".a1pms_config.json" #Change to NOSDNC if running A1PMS with proxy
if [ $RUNMODE == "KUBE" ]; then
if [ $RUNMODE == "KUBE" ]; then
- a
gent_load_config ".consul
_config.json"
+ a
1pms_load_config ".a1pms
_config.json"
else
else
-
consul_config_app ".consul
_config.json"
+
a1pms_api_put_configuration 200 ".a1pms
_config.json"
fi
start_cr 1
start_prod_stub
fi
start_cr 1
start_prod_stub
-start_
ecs PROXY $SIM_GROUP/$ECS_COMPOSE_DIR/$E
CS_CONFIG_FILE
+start_
ics PROXY $SIM_GROUP/$ICS_COMPOSE_DIR/$I
CS_CONFIG_FILE
start_rapp_catalogue
start_rapp_catalogue
-set_a
gent
_trace
+set_a
1pms
_trace
-set_
e
cs_trace
+set_
i
cs_trace
use_info_jobs=false #Set flag if interface supporting info-types is used
use_info_jobs=false #Set flag if interface supporting info-types is used
-if [[ "$
E
CS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
+if [[ "$
I
CS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
use_info_jobs=true
fi
use_info_jobs=true
fi
@@
-123,7
+116,9
@@
rapp_cat_api_put_service 201 "Emergency-response-app" v1 "Emergency-response-app
rapp_cat_api_get_services 200 "Emergency-response-app" v1 "Emergency-response-app" "Emergency-response-app"
rapp_cat_api_get_services 200 "Emergency-response-app" v1 "Emergency-response-app" "Emergency-response-app"
-api_get_status 200
+sleep_wait 120 "Let A1PMS cofiguration take effect"
+
+a1pms_api_get_status 200
# Print the A1 version for STD 2.X
for ((i=1; i<=$STD_NUM_RICS; i++))
# Print the A1 version for STD 2.X
for ((i=1; i<=$STD_NUM_RICS; i++))
@@
-138,32
+133,32
@@
do
done
#Check the number of schemas and the individual schemas in STD
done
#Check the number of schemas and the individual schemas in STD
-a
pi
_equal json:policy-types 2 120
+a
1pms
_equal json:policy-types 2 120
for ((i=1; i<=$STD_NUM_RICS; i++))
do
for ((i=1; i<=$STD_NUM_RICS; i++))
do
- a
pi
_equal json:policy-types?ric_id=$RIC_SIM_PREFIX"_g3_"$i 2 120
+ a
1pms
_equal json:policy-types?ric_id=$RIC_SIM_PREFIX"_g3_"$i 2 120
done
# Check the schemas in STD
for ((i=1; i<=$STD_NUM_RICS; i++))
do
done
# Check the schemas in STD
for ((i=1; i<=$STD_NUM_RICS; i++))
do
- a
pi_get_policy_type 200 STD_QOS_0_2_0 demo-testdata/STD2/qos-agent
-modified.json
- a
pi_get_policy_type 200 'STD_QOS2_0.1.0' demo-testdata/STD2/qos2-agent
-modified.json
+ a
1pms_api_get_policy_type 200 STD_QOS_0_2_0 demo-testdata/STD2/qos-a1pms
-modified.json
+ a
1pms_api_get_policy_type 200 'STD_QOS2_0.1.0' demo-testdata/STD2/qos2-a1pms
-modified.json
done
#Check the number of types
done
#Check the number of types
-a
pi
_equal json:policy-types 2 300
+a
1pms
_equal json:policy-types 2 300
-api_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_APP_PATH_0/1"
+a
1pms_a
pi_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_APP_PATH_0/1"
# Create policies in STD
for ((i=1; i<=$STD_NUM_RICS; i++))
do
generate_policy_uuid
# Create policies in STD
for ((i=1; i<=$STD_NUM_RICS; i++))
do
generate_policy_uuid
- api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 $((2300+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1
+ a
1pms_a
pi_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 $((2300+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1
generate_policy_uuid
generate_policy_uuid
- api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i 'STD_QOS2_0.1.0' $((2400+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1
+ a
1pms_a
pi_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i 'STD_QOS2_0.1.0' $((2400+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1
done
done
@@
-200,41
+195,41
@@
prodstub_arm_type 200 prod-a type1
prodstub_arm_job_create 200 prod-a job1
prodstub_arm_job_create 200 prod-a job2
prodstub_arm_job_create 200 prod-a job1
prodstub_arm_job_create 200 prod-a job2
-###
e
cs status
-
e
cs_api_service_status 200
+###
i
cs status
+
i
cs_api_service_status 200
## Setup prod-a
## Setup prod-a
-if [ $
E
CS_VERSION == "V1-1" ]; then
-
ecs_api_edp_put_producer 201 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 testdata/e
cs/ei-type-1.json
+if [ $
I
CS_VERSION == "V1-1" ]; then
+
ics_api_edp_put_producer 201 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 testdata/i
cs/ei-type-1.json
-
ecs_api_edp_get_producer 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 testdata/e
cs/ei-type-1.json
+
ics_api_edp_get_producer 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 testdata/i
cs/ei-type-1.json
else
else
-
ecs_api_edp_put_type_2 201 type1 testdata/e
cs/ei-type-1.json
+
ics_api_edp_put_type_2 201 type1 testdata/i
cs/ei-type-1.json
-
e
cs_api_edp_put_producer_2 201 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1
+
i
cs_api_edp_put_producer_2 201 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1
-
e
cs_api_edp_get_producer_2 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1
+
i
cs_api_edp_get_producer_2 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1
fi
fi
-
e
cs_api_edp_get_producer_status 200 prod-a ENABLED
+
i
cs_api_edp_get_producer_status 200 prod-a ENABLED
## Create a job for prod-a
## job1 - prod-a
if [ -z "$FLAT_A1_EI" ]; then
## Create a job for prod-a
## job1 - prod-a
if [ -z "$FLAT_A1_EI" ]; then
-
ecs_api_a1_put_job 201 type1 job1 $TARGET1 ricsim_g3_1 testdata/e
cs/job-template.json
+
ics_api_a1_put_job 201 type1 job1 $TARGET1 ricsim_g3_1 testdata/i
cs/job-template.json
else
else
-
ecs_api_a1_put_job 201 job1 type1 $TARGET1 ricsim_g3_1 $STATUS1 testdata/e
cs/job-template.json
+
ics_api_a1_put_job 201 job1 type1 $TARGET1 ricsim_g3_1 $STATUS1 testdata/i
cs/job-template.json
fi
# Check the job data in the producer
fi
# Check the job data in the producer
-if [ $
E
CS_VERSION == "V1-1" ]; then
- prodstub_check_jobdata 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/
e
cs/job-template.json
+if [ $
I
CS_VERSION == "V1-1" ]; then
+ prodstub_check_jobdata 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/
i
cs/job-template.json
else
if [ $use_info_jobs ]; then
else
if [ $use_info_jobs ]; then
- prodstub_check_jobdata_3 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/
e
cs/job-template.json
+ prodstub_check_jobdata_3 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/
i
cs/job-template.json
else
else
- prodstub_check_jobdata_2 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/
e
cs/job-template.json
+ prodstub_check_jobdata_2 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/
i
cs/job-template.json
fi
fi
fi
fi
@@
-242,24
+237,24
@@
fi
## Create a second job for prod-a
## job2 - prod-a
if [ -z "$FLAT_A1_EI" ]; then
## Create a second job for prod-a
## job2 - prod-a
if [ -z "$FLAT_A1_EI" ]; then
-
ecs_api_a1_put_job 201 type1 job2 $TARGET2 ricsim_g3_2 testdata/e
cs/job-template.json
+
ics_api_a1_put_job 201 type1 job2 $TARGET2 ricsim_g3_2 testdata/i
cs/job-template.json
else
else
-
ecs_api_a1_put_job 201 job2 type1 $TARGET2 ricsim_g3_2 $STATUS2 testdata/e
cs/job-template.json
+
ics_api_a1_put_job 201 job2 type1 $TARGET2 ricsim_g3_2 $STATUS2 testdata/i
cs/job-template.json
fi
# Check the job data in the producer
fi
# Check the job data in the producer
-if [ $
E
CS_VERSION == "V1-1" ]; then
- prodstub_check_jobdata 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/
e
cs/job-template.json
+if [ $
I
CS_VERSION == "V1-1" ]; then
+ prodstub_check_jobdata 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/
i
cs/job-template.json
else
if [ $use_info_jobs ]; then
else
if [ $use_info_jobs ]; then
- prodstub_check_jobdata_3 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/
e
cs/job-template.json
+ prodstub_check_jobdata_3 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/
i
cs/job-template.json
else
else
- prodstub_check_jobdata_2 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/
e
cs/job-template.json
+ prodstub_check_jobdata_2 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/
i
cs/job-template.json
fi
fi
fi
fi
-check_
policy_agent
_logs
-check_
e
cs_logs
+check_
a1pms
_logs
+check_
i
cs_logs
check_sdnc_logs
#### TEST COMPLETE ####
check_sdnc_logs
#### TEST COMPLETE ####