Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Removal of older test profiles
[nonrtric.git]
/
test
/
auto-test
/
FTC_HELM_E_RELEASE.sh
diff --git
a/test/auto-test/FTC_HELM_E_RELEASE.sh
b/test/auto-test/FTC_HELM_E_RELEASE.sh
index
0f7e30a
..
f6433ad
100755
(executable)
--- a/
test/auto-test/FTC_HELM_E_RELEASE.sh
+++ b/
test/auto-test/FTC_HELM_E_RELEASE.sh
@@
-27,7
+27,7
@@
DOCKER_INCLUDED_IMAGES="" # Not used - KUBE only test script
#App names to include in the test when running kubernetes, space separated list
KUBE_INCLUDED_IMAGES=" MR DMAAPMR CR PRODSTUB KUBEPROXY KAFKAPC"
#Prestarted app (not started by script) 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 DMAAPMR CR PRODSTUB KUBEPROXY KAFKAPC"
#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
-KUBE_PRESTARTED_IMAGES="
PA
RICSIM CP ICS RC SDNC DMAAPMED DMAAPADP"
+KUBE_PRESTARTED_IMAGES="
A1PMS
RICSIM CP ICS RC SDNC DMAAPMED DMAAPADP"
#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
#the image is not configured in the supplied env_file
#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
#the image is not configured in the supplied env_file
@@
-47,7
+47,7
@@
setup_testenvironment
use_mr_https
use_cr_https
use_mr_https
use_cr_https
-use_a
gent
_rest_https
+use_a
1pms
_rest_https
use_sdnc_https
use_simulator_https
use_ics_rest_https
use_sdnc_https
use_simulator_https
use_ics_rest_https
@@
-66,16
+66,11
@@
echo -e "$RED CHECK WHY RC HTTPS DOES NOT WORK $ERED"
###############################use_control_panel_https
use_control_panel_http
###############################use_control_panel_https
use_control_panel_http
-if [ "$PMS_VERSION" == "V1" ]; then
- echo "PMS VERSION 2 (V2) is required"
- exit 1
-fi
-
clean_environment
ics_kube_pvc_reset
clean_environment
ics_kube_pvc_reset
-pms_kube_pvc_reset
+
a1
pms_kube_pvc_reset
start_kube_proxy
start_kube_proxy
@@
-109,7
+104,7
@@
start_control_panel
start_sdnc
start_sdnc
-start_
policy_agent
+start_
a1pms
start_cr 1
start_cr 1
@@
-121,7
+116,7
@@
set_ics_trace
start_rapp_catalogue
start_rapp_catalogue
-set_a
gent
_trace
+set_a
1pms
_trace
#### Test RAPP Catalogue ####
#### Test RAPP Catalogue ####
@@
-134,7
+129,9
@@
rapp_cat_api_get_services 200 "Emergency-response-app" v1 "Emergency-response-ap
#Check the number of services
rc_equal json:services 1
#Check the number of services
rc_equal json:services 1
-api_get_status 200
+sleep_wait 120 "Let A1PMS cofiguration take effect"
+
+a1_a1pms_api_get_status 200
#### Test Policy Management Service ####
#### Test Policy Management Service ####
@@
-170,7
+167,7
@@
do
done
#Check the number of schemas
done
#Check the number of schemas
-a
pi
_equal json:policy-types 1
+a
1pms
_equal json:policy-types 1
# Load the polictypes in STD 2
for ((i=0; i<$STD_NUM_RICS; i++))
# Load the polictypes in STD 2
for ((i=0; i<$STD_NUM_RICS; i++))
@@
-187,72
+184,60
@@
do
done
# Check that all rics are synced in
done
# Check that all rics are synced in
-a
pi
_equal json:rics 6 300
+a
1pms
_equal json:rics 6 300
#Check the number of schemas and the individual schemas
#Check the number of schemas and the individual schemas
-a
pi
_equal json:policy-types 5 300
+a
1pms
_equal json:policy-types 5 300
for ((i=0; i<$STD_NUM_RICS; i++))
do
ricid=$((3+$i))
for ((i=0; i<$STD_NUM_RICS; i++))
do
ricid=$((3+$i))
- a
pi
_equal json:policy-types?ric_id=ric$ricid 1 120
+ a
1pms
_equal json:policy-types?ric_id=ric$ricid 1 120
done
for ((i=0; i<$STD_NUM_RICS; i++))
do
ricid=$((5+$i))
done
for ((i=0; i<$STD_NUM_RICS; i++))
do
ricid=$((5+$i))
- a
pi
_equal json:policy-types?ric_id=ric$ricid 2 120
+ a
1pms
_equal json:policy-types?ric_id=ric$ricid 2 120
done
for ((i=0; i<$OSC_NUM_RICS; i++))
do
ricid=$((1+$i))
done
for ((i=0; i<$OSC_NUM_RICS; i++))
do
ricid=$((1+$i))
- a
pi
_equal json:policy-types?ric_id=ric$ricid 2 120
+ a
1pms
_equal json:policy-types?ric_id=ric$ricid 2 120
done
#Check the schemas in STD 2
for ((i=0; i<$OSC_NUM_RICS; i++))
do
ricid=$((5+$i))
done
#Check the schemas in STD 2
for ((i=0; i<$OSC_NUM_RICS; i++))
do
ricid=$((5+$i))
- a
pi_get_policy_type 200 STD_QOS_0_2_0 testdata/STD2/qos-agent
-modified.json
- a
pi_get_policy_type 200 STD_QOS2_0.1.0 testdata/STD2/qos2-agent
-modified.json
+ a
1_a1pms_api_get_policy_type 200 STD_QOS_0_2_0 testdata/STD2/qos-a1pms
-modified.json
+ a
1_a1pms_api_get_policy_type 200 STD_QOS2_0.1.0 testdata/STD2/qos2-a1pms
-modified.json
done
# Check the schemas in OSC
for ((i=0; i<$OSC_NUM_RICS; i++))
do
done
# Check the schemas in OSC
for ((i=0; i<$OSC_NUM_RICS; i++))
do
- a
pi_get_policy_type 200 1 testdata/OSC/1-agent
-modified.json
- a
pi_get_policy_type 200 2 testdata/OSC/2-agent
-modified.json
+ a
1_a1pms_api_get_policy_type 200 1 testdata/OSC/1-a1pms
-modified.json
+ a
1_a1pms_api_get_policy_type 200 2 testdata/OSC/2-a1pms
-modified.json
done
done
-if [ "$PMS_VERSION" == "V2" ]; then
+a1pms_equal json:policy-types 5 120
-
api_equal json:policy-types 5 12
0
+
a1pms_equal json:policies
0
- api_equal json:policies 0
-
- api_equal json:policy-instances 0
-else
+a1pms_equal json:policy-instances 0
- api_equal json:policy_schemas 5 120
-
- api_equal json:policy_types 5
-
- api_equal json:policies 0
-
- api_equal json:policy_ids 0
-fi
-
-api_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_APP_PATH_0/ER-app"
+a1pms_api_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_APP_PATH_0/ER-app"
# Create policies in STD
for ((i=0; i<$STD_NUM_RICS; i++))
do
ricid=$((3+$i))
generate_policy_uuid
# Create policies in STD
for ((i=0; i<$STD_NUM_RICS; i++))
do
ricid=$((3+$i))
generate_policy_uuid
- api_put_policy 201 "Emergency-response-app" ric$ricid NOTYPE $((1100+$i)) NOTRANSIENT $CR_SERVICE_APP_PATH_0/"std2" testdata/STD/pi1_template.json 1
+ a
1pms_a
pi_put_policy 201 "Emergency-response-app" ric$ricid NOTYPE $((1100+$i)) NOTRANSIENT $CR_SERVICE_APP_PATH_0/"std2" testdata/STD/pi1_template.json 1
generate_policy_uuid
generate_policy_uuid
- api_put_policy 201 "Emergency-response-app" ric$ricid NOTYPE $((1200+$i)) NOTRANSIENT $CR_SERVICE_APP_PATH_0/"std2" testdata/STD/pi1_template.json 1
+ a
1pms_a
pi_put_policy 201 "Emergency-response-app" ric$ricid NOTYPE $((1200+$i)) NOTRANSIENT $CR_SERVICE_APP_PATH_0/"std2" testdata/STD/pi1_template.json 1
done
#Create policies in STD 2
done
#Create policies in STD 2
@@
-260,9
+245,9
@@
for ((i=0; i<$STD_NUM_RICS; i++))
do
ricid=$((5+$i))
generate_policy_uuid
do
ricid=$((5+$i))
generate_policy_uuid
- api_put_policy 201 "Emergency-response-app" ric$ricid STD_QOS_0_2_0 $((2100+$i)) NOTRANSIENT $CR_SERVICE_APP_PATH_0/"std2" testdata/STD2/pi_qos_template.json 1
+ a
1pms_a
pi_put_policy 201 "Emergency-response-app" ric$ricid STD_QOS_0_2_0 $((2100+$i)) NOTRANSIENT $CR_SERVICE_APP_PATH_0/"std2" testdata/STD2/pi_qos_template.json 1
generate_policy_uuid
generate_policy_uuid
- api_put_policy 201 "Emergency-response-app" ric$ricid STD_QOS2_0.1.0 $((2200+$i)) NOTRANSIENT $CR_SERVICE_APP_PATH_0/"std2" testdata/STD2/pi_qos2_template.json 1
+ a
1pms_a
pi_put_policy 201 "Emergency-response-app" ric$ricid STD_QOS2_0.1.0 $((2200+$i)) NOTRANSIENT $CR_SERVICE_APP_PATH_0/"std2" testdata/STD2/pi_qos2_template.json 1
done
# Create policies in OSC
done
# Create policies in OSC
@@
-270,9
+255,9
@@
for ((i=0; i<$OSC_NUM_RICS; i++))
do
ricid=$((1+$i))
generate_policy_uuid
do
ricid=$((1+$i))
generate_policy_uuid
- api_put_policy 201 "Emergency-response-app" ric$ricid 1 $((3100+$i)) NOTRANSIENT $CR_SERVICE_APP_PATH_0/"osc" testdata/OSC/pi1_template.json 1
+ a
1pms_a
pi_put_policy 201 "Emergency-response-app" ric$ricid 1 $((3100+$i)) NOTRANSIENT $CR_SERVICE_APP_PATH_0/"osc" testdata/OSC/pi1_template.json 1
generate_policy_uuid
generate_policy_uuid
- api_put_policy 201 "Emergency-response-app" ric$ricid 2 $((3200+$i)) NOTRANSIENT $CR_SERVICE_APP_PATH_0/"osc" testdata/OSC/pi2_template.json 1
+ a
1pms_a
pi_put_policy 201 "Emergency-response-app" ric$ricid 2 $((3200+$i)) NOTRANSIENT $CR_SERVICE_APP_PATH_0/"osc" testdata/OSC/pi2_template.json 1
done
done
@@
-289,31
+274,19
@@
do
sim_equal "a1-sim-osc-"$i num_instances 2
done
sim_equal "a1-sim-osc-"$i num_instances 2
done
-stop_
policy_agent
+stop_
a1pms
-start_stopped_
policy_agent
+start_stopped_
a1pms
-# Check PMS state after restart
+# Check
A1
PMS state after restart
sleep_wait 200
sleep_wait 200
-if [ "$PMS_VERSION" == "V2" ]; then
-
- api_equal json:policy-types 5 120
-
- api_equal json:policies 12
-
- api_equal json:policy-instances 12
-else
-
- api_equal json:policy_schemas 5 120
+a1pms_equal json:policy-types 5 120
- api_equal json:policy_types 5
+a1pms_equal json:policies 12
- api_equal json:policies 12
-
- api_equal json:policy_ids 12
-fi
+a1pms_equal json:policy-instances 12
# Check the number of policies in STD and STD2
for ((i=0; i<$STD_NUM_RICS; i++))
# Check the number of policies in STD and STD2
for ((i=0; i<$STD_NUM_RICS; i++))
@@
-411,7
+384,7
@@
else
fi
# Dmaap mediator and adapter
fi
# Dmaap mediator and adapter
-start_dmaapadp NOPROXY $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_CONFIG_FILE $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_DATA_FILE
+start_dmaapadp NOPROXY $SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_CONFIG_FILE
_TEMPLATE
$SIM_GROUP/$DMAAP_ADP_COMPOSE_DIR/$DMAAP_ADP_DATA_FILE
start_dmaapmed NOPROXY $SIM_GROUP/$DMAAP_MED_COMPOSE_DIR/$DMAAP_MED_HOST_DATA_FILE
start_dmaapmed NOPROXY $SIM_GROUP/$DMAAP_MED_COMPOSE_DIR/$DMAAP_MED_HOST_DATA_FILE
@@
-427,12
+400,12
@@
NUM_JOBS=1
for ((i=1; i<=$NUM_JOBS; i++))
do
for ((i=1; i<=$NUM_JOBS; i++))
do
- ics_api_idc_put_job 201 jobx$i STD_Fault_Messages $CR_SERVICE_MR_PATH_0/jobx-data$i info-ownerx$i $CR_SERVICE_MR_PATH_0/job_status_info-ownerx$i testdata/dmaap-adapter/job-template.json
+ ics_api_idc_put_job 201 jobx$i STD_Fault_Messages $CR_SERVICE_MR_PATH_0/jobx-data$i info-ownerx$i $CR_SERVICE_MR_PATH_0/job_status_info-ownerx$i testdata/dmaap-adapter/job-template
1
.json
done
for ((i=1; i<=$NUM_JOBS; i++))
do
done
for ((i=1; i<=$NUM_JOBS; i++))
do
- 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
+ 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
1
.json
ics_api_idc_put_job 201 jobz$i ExampleInformationTypeKafka $CR_SERVICE_MR_PATH_0/jobz-data$i info-ownerz$i $CR_SERVICE_MR_PATH_0/job_status_info-ownerz$i testdata/dmaap-adapter/job-template-1-kafka.json
done
ics_api_idc_put_job 201 jobz$i ExampleInformationTypeKafka $CR_SERVICE_MR_PATH_0/jobz-data$i info-ownerz$i $CR_SERVICE_MR_PATH_0/job_status_info-ownerz$i testdata/dmaap-adapter/job-template-1-kafka.json
done
@@
-486,7
+459,7
@@
else
ics_api_a1_get_job_status 200 job2 DISABLED
fi
ics_api_a1_get_job_status 200 job2 DISABLED
fi
-check_
policy_agent
_logs
+check_
a1pms
_logs
check_ics_logs
check_sdnc_logs
check_ics_logs
check_sdnc_logs