Name alignment, agent to a1pms, in test env
Possibility to set kube context for tests in remote clusters
Issue-ID: NONRTRIC-728
Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
Change-Id: I697853aa54798526527a4c5999bd2c2291568399
diff --git a/test/auto-test/PM_DEMO.sh b/test/auto-test/PM_DEMO.sh
index f0ade77..d80dd6d 100755
--- a/test/auto-test/PM_DEMO.sh
+++ b/test/auto-test/PM_DEMO.sh
@@ -20,10 +20,10 @@
TC_ONELINE_DESCR="Preparation demo setup - populating a number of ric simulators with types and instances"
#App names to include in the test when running docker, space separated list
-DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC NGW KUBEPROXY"
+DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR A1PMS RICSIM SDNC NGW KUBEPROXY"
#App names to include in the test when running kubernetes, space separated list
-KUBE_INCLUDED_IMAGES="CP CR MR PA RICSIM SDNC KUBEPROXY NGW"
+KUBE_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM SDNC KUBEPROXY NGW"
#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=""
@@ -47,11 +47,11 @@
##########################
use_cr_https
-use_agent_rest_https
+use_a1pms_rest_https
use_sdnc_https
use_simulator_https
-if [ "$PMS_VERSION" == "V2" ]; then
+if [ "$A1PMS_VERSION" == "V2" ]; then
notificationurl=$CR_SERVICE_APP_PATH_0"/test"
else
notificationurl=""
@@ -68,11 +68,11 @@
start_ric_simulators $RIC_SIM_PREFIX"_g2" $STD_NUM_RICS STD_1.1.3
-if [ "$PMS_VERSION" == "V2" ]; then
+if [ "$A1PMS_VERSION" == "V2" ]; then
start_ric_simulators $RIC_SIM_PREFIX"_g3" $STD_NUM_RICS STD_2.0.0
fi
-start_mr #Just to prevent errors in the agent log...
+start_mr #Just to prevent errors in the a1pms log...
start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
@@ -82,24 +82,24 @@
start_sdnc
-start_policy_agent NORPOXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/$POLICY_AGENT_CONFIG_FILE
+start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE
-set_agent_trace
+set_a1pms_trace
prepare_consul_config SDNC ".consul_config.json"
if [ $RUNMODE == "KUBE" ]; then
- agent_load_config ".consul_config.json"
+ a1pms_load_config ".consul_config.json"
else
- if [[ "$PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then
- api_put_configuration 200 ".consul_config.json"
+ if [[ "$A1PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then
+ a1pms_api_put_configuration 200 ".consul_config.json"
else
start_consul_cbs
consul_config_app ".consul_config.json"
fi
fi
-api_get_status 200
+a1pms_api_get_status 200
# Print the A1 version for OSC
for ((i=1; i<=$OSC_NUM_RICS; i++))
@@ -114,7 +114,7 @@
sim_print $RIC_SIM_PREFIX"_g2_"$i interface
done
-if [ "$PMS_VERSION" == "V2" ]; then
+if [ "$A1PMS_VERSION" == "V2" ]; then
# Print the A1 version for STD 2.X
for ((i=1; i<=$STD_NUM_RICS; i++))
do
@@ -132,41 +132,41 @@
#Check the number of schemas and the individual schemas in OSC
-if [ "$PMS_VERSION" == "V2" ]; then
+if [ "$A1PMS_VERSION" == "V2" ]; then
- api_equal json:policy-types 3 300
+ a1pms_equal json:policy-types 3 300
for ((i=1; i<=$OSC_NUM_RICS; i++))
do
- api_equal json:policy-types?ric_id=$RIC_SIM_PREFIX"_g1_"$i 2 120
+ a1pms_equal json:policy-types?ric_id=$RIC_SIM_PREFIX"_g1_"$i 2 120
done
# Check the schemas in OSC
for ((i=1; i<=$OSC_NUM_RICS; i++))
do
- api_get_policy_type 200 100 demo-testdata/OSC/qos-agent-modified.json
- api_get_policy_type 200 20008 demo-testdata/OSC/tsa-agent-modified.json
+ a1pms_api_get_policy_type 200 100 demo-testdata/OSC/qos-a1pms-modified.json
+ a1pms_api_get_policy_type 200 20008 demo-testdata/OSC/tsa-a1pms-modified.json
done
else
- api_equal json:policy_types 3 300
+ a1pms_equal json:policy_types 3 300
for ((i=1; i<=$OSC_NUM_RICS; i++))
do
- api_equal json:policy_types?ric=$RIC_SIM_PREFIX"_g1_"$i 2 120
+ a1pms_equal json:policy_types?ric=$RIC_SIM_PREFIX"_g1_"$i 2 120
done
# Check the schemas in OSC
for ((i=1; i<=$OSC_NUM_RICS; i++))
do
- api_get_policy_schema 200 100 demo-testdata/OSC/qos-agent-modified.json
- api_get_policy_schema 200 20008 demo-testdata/OSC/tsa-agent-modified.json
+ a1pms_api_get_policy_schema 200 100 demo-testdata/OSC/qos-a1pms-modified.json
+ a1pms_api_get_policy_schema 200 20008 demo-testdata/OSC/tsa-a1pms-modified.json
done
fi
-if [ "$PMS_VERSION" == "V2" ]; then
+if [ "$A1PMS_VERSION" == "V2" ]; then
# Load the polictypes in std
for ((i=1; i<=$STD_NUM_RICS; i++))
@@ -176,41 +176,41 @@
done
#Check the number of schemas and the individual schemas in STD
- api_equal json:policy-types 5 120
+ a1pms_equal json:policy-types 5 120
for ((i=1; i<=$STD_NUM_RICS; i++))
do
- api_equal json:policy-types?ric_id=$RIC_SIM_PREFIX"_g3_"$i 2 120
+ a1pms_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
- api_get_policy_type 200 STD_QOS_0_2_0 demo-testdata/STD2/qos-agent-modified.json
- api_get_policy_type 200 'STD_QOS2_0.1.0' demo-testdata/STD2/qos2-agent-modified.json
+ a1pms_api_get_policy_type 200 STD_QOS_0_2_0 demo-testdata/STD2/qos-a1pms-modified.json
+ a1pms_api_get_policy_type 200 'STD_QOS2_0.1.0' demo-testdata/STD2/qos2-a1pms-modified.json
done
fi
#Check the number of types
-if [ "$PMS_VERSION" == "V2" ]; then
- api_equal json:policy-types 5 120
+if [ "$A1PMS_VERSION" == "V2" ]; then
+ a1pms_equal json:policy-types 5 120
else
- api_equal json:policy_types 3 120
+ a1pms_equal json:policy_types 3 120
fi
# Create policies
-use_agent_rest_http
+use_a1pms_rest_http
-api_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_APP_PATH_0/1"
+a1pms_api_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_APP_PATH_0/1"
# Create policies in OSC
for ((i=1; i<=$OSC_NUM_RICS; i++))
do
generate_policy_uuid
- api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 100 $((3000+$i)) NOTRANSIENT $notificationurl demo-testdata/OSC/piqos_template.json 1
+ a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 100 $((3000+$i)) NOTRANSIENT $notificationurl demo-testdata/OSC/piqos_template.json 1
generate_policy_uuid
- api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 20008 $((4000+$i)) NOTRANSIENT $notificationurl demo-testdata/OSC/pitsa_template.json 1
+ a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 20008 $((4000+$i)) NOTRANSIENT $notificationurl demo-testdata/OSC/pitsa_template.json 1
done
@@ -225,12 +225,12 @@
for ((i=1; i<=$STD_NUM_RICS; i++))
do
generate_policy_uuid
- api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g2_"$i NOTYPE $((2100+$i)) NOTRANSIENT $notificationurl demo-testdata/STD/pi1_template.json 1
- if [ "$PMS_VERSION" == "V2" ]; then
+ a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g2_"$i NOTYPE $((2100+$i)) NOTRANSIENT $notificationurl demo-testdata/STD/pi1_template.json 1
+ if [ "$A1PMS_VERSION" == "V2" ]; then
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
+ a1pms_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
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
+ a1pms_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
fi
done
@@ -239,12 +239,12 @@
for ((i=1; i<=$STD_NUM_RICS; i++))
do
sim_equal $RIC_SIM_PREFIX"_g2_"$i num_instances 1
- if [ "$PMS_VERSION" == "V2" ]; then
+ if [ "$A1PMS_VERSION" == "V2" ]; then
sim_equal $RIC_SIM_PREFIX"_g3_"$i num_instances 2
fi
done
-check_policy_agent_logs
+check_a1pms_logs
check_sdnc_logs
#### TEST COMPLETE ####