Updated test env documentation
Added support to set target architecture for built/pulled images
Corrected spelling errors
Issue-ID: NONRTRIC-858
Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
Change-Id: I74b3cbff591e3ba194f590e8c99b858eafca5828
diff --git a/test/auto-test/FTC1.sh b/test/auto-test/FTC1.sh
index 4ab8aff..8683a9d 100755
--- a/test/auto-test/FTC1.sh
+++ b/test/auto-test/FTC1.sh
@@ -25,7 +25,7 @@
#App names to include in the test when running kubernetes, space separated list
KUBE_INCLUDED_IMAGES="CP CR MR DMAAPMR A1PMS RICSIM SDNC NGW KUBEPROXY "
-#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
+#Pre-started app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=""
#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
@@ -151,7 +151,7 @@
if [ $RUNMODE == "KUBE" ]; then
a1pms_load_config ".a1pms_config.json"
else
- #Temporary switch to http/https if dmaap use. Otherwise it is not possibble to push config
+ #Temporary switch to http/https if dmaap use. Otherwise it is not possible to push config
if [ $__httpx == "HTTPS" ]; then
use_a1pms_rest_https
else
@@ -199,7 +199,7 @@
echo "############## Health check ################"
echo "############################################"
- sleep_wait 120 "Let A1PMS cofiguration take effect"
+ sleep_wait 120 "Let A1PMS configuration take effect"
a1pms_api_get_status 200
diff --git a/test/auto-test/FTC10.sh b/test/auto-test/FTC10.sh
index e109d83..6fb5003 100755
--- a/test/auto-test/FTC10.sh
+++ b/test/auto-test/FTC10.sh
@@ -24,7 +24,7 @@
#App names to include in the test when running kubernetes, space separated list
KUBE_INCLUDED_IMAGES=" MR CR A1PMS RICSIM CP KUBEPROXY NGW"
-#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
+#Pre-started app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=""
#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
@@ -90,7 +90,7 @@
a1pms_api_put_configuration 200 ".a1pms_config.json"
fi
-sleep_wait 120 "Let A1PMS cofiguration take effect"
+sleep_wait 120 "Let A1PMS configuration take effect"
a1pms_api_get_status 200
diff --git a/test/auto-test/FTC100.sh b/test/auto-test/FTC100.sh
index a5348a8..f048cdb 100755
--- a/test/auto-test/FTC100.sh
+++ b/test/auto-test/FTC100.sh
@@ -31,7 +31,7 @@
else
KUBE_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM SDNC KUBEPROXY NGW KEYCLOAK ISTIO AUTHSIDECAR"
fi
-#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
+#Pre-started app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=""
#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
@@ -248,7 +248,7 @@
if [ $RUNMODE == "KUBE" ]; then
a1pms_load_config ".a1pms_config.json"
else
- #Temporary switch to http/https if dmaap use. Otherwise it is not possibble to push config
+ #Temporary switch to http/https if dmaap use. Otherwise it is not possible to push config
if [ $__httpx == "HTTPS" ]; then
use_a1pms_rest_https
else
@@ -299,7 +299,7 @@
echo "############## Health check ################"
echo "############################################"
- sleep_wait 120 "Let A1PMS cofiguration take effect"
+ sleep_wait 120 "Let A1PMS configuration take effect"
a1pms_api_get_status 200
diff --git a/test/auto-test/FTC110.sh b/test/auto-test/FTC110.sh
index 6d14589..ea3a7f2 100755
--- a/test/auto-test/FTC110.sh
+++ b/test/auto-test/FTC110.sh
@@ -25,7 +25,7 @@
#App names to include in the test when running kubernetes, space separated list
KUBE_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM KUBEPROXY NGW"
-#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
+#Pre-started app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=""
#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
@@ -92,7 +92,7 @@
mr_equal requests_submitted 0
fi
-sleep_wait 120 "Let A1PMS cofiguration take effect"
+sleep_wait 120 "Let A1PMS configuration take effect"
#Check a1pms alive
a1pms_api_get_status 200
diff --git a/test/auto-test/FTC1100.sh b/test/auto-test/FTC1100.sh
index 749b725..5abaee5 100755
--- a/test/auto-test/FTC1100.sh
+++ b/test/auto-test/FTC1100.sh
@@ -31,7 +31,7 @@
else
KUBE_INCLUDED_IMAGES="PRODSTUB CR ICS RICSIM CP HTTPPROXY KUBEPROXY NGW KEYCLOAK ISTIO AUTHSIDECAR"
fi
-#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
+#Pre-started app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=""
#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
diff --git a/test/auto-test/FTC150.sh b/test/auto-test/FTC150.sh
index f30f3e9..4d921d8 100755
--- a/test/auto-test/FTC150.sh
+++ b/test/auto-test/FTC150.sh
@@ -24,7 +24,7 @@
DOCKER_INCLUDED_IMAGES="RICSIM SDNC KUBEPROXY"
#App names to include in the test when running kubernetes, space separated list
KUBE_INCLUDED_IMAGES=" RICSIM SDNC KUBEPROXY"
-#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
+#Pre-started app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=" "
#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
diff --git a/test/auto-test/FTC1800.sh b/test/auto-test/FTC1800.sh
index d6215c7..ac21238 100755
--- a/test/auto-test/FTC1800.sh
+++ b/test/auto-test/FTC1800.sh
@@ -25,7 +25,7 @@
#App names to include in the test when running kubernetes, space separated list
KUBE_INCLUDED_IMAGES="ICS PRODSTUB CP CR KUBEPROXY NGW"
-#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
+#Pre-started app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=""
#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
diff --git a/test/auto-test/FTC1_A1PMS_ADAPTER.sh b/test/auto-test/FTC1_A1PMS_ADAPTER.sh
index 9228ee7..3e27282 100755
--- a/test/auto-test/FTC1_A1PMS_ADAPTER.sh
+++ b/test/auto-test/FTC1_A1PMS_ADAPTER.sh
@@ -25,7 +25,7 @@
#App names to include in the test when running kubernetes, space separated list
KUBE_INCLUDED_IMAGES="CP CR A1PMS RICSIM SDNC NGW KUBEPROXY "
-#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
+#Pre-started app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=""
#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
@@ -100,7 +100,7 @@
fi
start_ric_simulators ricsim_g1 1 STD_2.0.0
- start_ric_simulators ricsim_g2 1 STD_2.0.0 #APMS will use adapter class towards this sim
+ start_ric_simulators ricsim_g2 1 STD_2.0.0 #A1PMS will use adapter class towards this sim
start_cr 1
@@ -125,7 +125,7 @@
if [ $RUNMODE == "KUBE" ]; then
a1pms_load_config ".a1pms_config.json"
else
- #Temporary switch to http/https if dmaap use. Otherwise it is not possibble to push config
+ #Temporary switch to http/https if dmaap use. Otherwise it is not possible to push config
if [ $__httpx == "HTTPS" ]; then
use_a1pms_rest_https
else
@@ -158,7 +158,7 @@
echo "############## Health check ################"
echo "############################################"
- sleep_wait 120 "Let A1PMS cofiguration take effect"
+ sleep_wait 120 "Let A1PMS configuration take effect"
a1pms_api_get_status 200
@@ -205,7 +205,7 @@
if [[ $interface = *"SDNC"* ]]; then
sim_contains_str ricsim_g1_1 remote_hosts $SDNC_APP_NAME
- # Adatper does not go through SDNC
+ # Adapter does not go through SDNC
sim_contains_str ricsim_g2_1 remote_hosts $A1PMS_APP_NAME
else
sim_contains_str ricsim_g1_1 remote_hosts $A1PMS_APP_NAME
diff --git a/test/auto-test/FTC1_RICMEDIATOR.sh b/test/auto-test/FTC1_RICMEDIATOR.sh
index e34d8aa..8761a36 100755
--- a/test/auto-test/FTC1_RICMEDIATOR.sh
+++ b/test/auto-test/FTC1_RICMEDIATOR.sh
@@ -25,7 +25,7 @@
#App names to include in the test when running kubernetes, space separated list
KUBE_INCLUDED_IMAGES="CP CR A1PMS RICSIM RICMEDIATORSIM SDNC NGW KUBEPROXY "
-#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
+#Pre-started app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=""
#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
@@ -132,7 +132,7 @@
if [ $RUNMODE == "KUBE" ]; then
a1pms_load_config ".a1pms_config.json"
else
- #Temporary switch to http/https if dmaap use. Otherwise it is not possibble to push config
+ #Temporary switch to http/https if dmaap use. Otherwise it is not possible to push config
if [ $__httpx == "HTTPS" ]; then
use_a1pms_rest_https
else
@@ -168,7 +168,7 @@
echo "############## Health check ################"
echo "############################################"
- sleep_wait 120 "Let A1PMS cofiguration take effect"
+ sleep_wait 120 "Let A1PMS configuration take effect"
a1pms_api_get_status 200
diff --git a/test/auto-test/FTC2001.sh b/test/auto-test/FTC2001.sh
index d94b3d7..651762a 100755
--- a/test/auto-test/FTC2001.sh
+++ b/test/auto-test/FTC2001.sh
@@ -24,7 +24,7 @@
#App names to include in the test when running kubernetes, space separated list
KUBE_INCLUDED_IMAGES=" MR CR A1PMS PRODSTUB RICSIM CP ICS HTTPPROXY KUBEPROXY NGW"
-#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
+#Pre-started app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=""
#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
@@ -98,7 +98,7 @@
set_ics_debug
-sleep_wait 120 "Let A1PMS cofiguration take effect"
+sleep_wait 120 "Let A1PMS configuration take effect"
a1pms_api_get_status 200
@@ -107,7 +107,7 @@
do
sim_print $RIC_SIM_PREFIX"_g3_"$i interface
done
-# Load the polictypes in std
+# Load the policytypes in std
for ((i=1; i<=$STD_NUM_RICS; i++))
do
sim_put_policy_type 201 $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 demo-testdata/STD2/sim_qos.json
diff --git a/test/auto-test/FTC2002.sh b/test/auto-test/FTC2002.sh
index 28afcf4..3e07eea 100755
--- a/test/auto-test/FTC2002.sh
+++ b/test/auto-test/FTC2002.sh
@@ -23,7 +23,7 @@
DOCKER_INCLUDED_IMAGES="RICSIM SDNC HTTPPROXY KUBEPROXY"
#App names to include in the test when running kubernetes, space separated list
KUBE_INCLUDED_IMAGES=""
-#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
+#Pre-started app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=" "
#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
diff --git a/test/auto-test/FTC2003.sh b/test/auto-test/FTC2003.sh
index e4a8f79..3268e5b 100755
--- a/test/auto-test/FTC2003.sh
+++ b/test/auto-test/FTC2003.sh
@@ -24,7 +24,7 @@
#App names to include in the test when running kubernetes, space separated list
KUBE_INCLUDED_IMAGES=" CR MR ICS HTTPPROXY KUBEPROXY DMAAPADP"
-#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
+#Pre-started app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=""
#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
@@ -117,8 +117,8 @@
for ((i=1; i<=$NUM_JOBS; i++))
do
- 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"}'
+ cr_api_check_single_generic_json_event 200 0 joby-data$i '{"msg":"msg-1"}'
+ cr_api_check_single_generic_json_event 200 0 joby-data$i '{"msg":"msg-3"}'
done
cr_contains_str 0 remote_hosts $HTTP_PROXY_APP_NAME
diff --git a/test/auto-test/FTC300.sh b/test/auto-test/FTC300.sh
index 0e32eaf..bf8ca5f 100755
--- a/test/auto-test/FTC300.sh
+++ b/test/auto-test/FTC300.sh
@@ -24,7 +24,7 @@
#App names to include in the test when running kubernetes, space separated list
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
+#Pre-started app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=""
#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
@@ -143,7 +143,7 @@
if [ $RUNMODE == "KUBE" ]; then
a1pms_load_config ".a1pms_config.json"
else
- #Temporary switch to http/https if dmaap use. Otherwise it is not possibble to push config
+ #Temporary switch to http/https if dmaap use. Otherwise it is not possible to push config
if [ $__httpx == "HTTPS" ]; then
use_a1pms_rest_https
else
@@ -165,7 +165,7 @@
fi
fi
- sleep_wait 120 "Let A1PMS cofiguration take effect"
+ sleep_wait 120 "Let A1PMS configuration take effect"
a1pms_api_get_status 200
diff --git a/test/auto-test/FTC3000.sh b/test/auto-test/FTC3000.sh
index db0f56d..66b7139 100755
--- a/test/auto-test/FTC3000.sh
+++ b/test/auto-test/FTC3000.sh
@@ -25,7 +25,7 @@
#App names to include in the test when running kubernetes, space separated list
KUBE_INCLUDED_IMAGES=" ICS DMAAPMED DMAAPADP KUBEPROXY MR DMAAPMR CR KAFKAPC"
-#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
+#Pre-started app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=""
#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
@@ -243,11 +243,11 @@
for ((i=1; i<=$NUM_JOBS; i++))
do
cr_index=$(($i%$NUM_CR))
- cr_api_check_single_genric_event_md5_file 200 $cr_index job-adp-data$i ./tmp/data_for_dmaap_test.json
- cr_api_check_single_genric_event_md5_file 200 $cr_index job-adp-data$i ./tmp/data_for_dmaap_test.json
- cr_api_check_single_genric_event_md5_file 200 $cr_index job-adp-data$i ./tmp/data_for_dmaap_test.json
- cr_api_check_single_genric_event_md5_file 200 $cr_index job-adp-data$i ./tmp/data_for_dmaap_test.json
- cr_api_check_single_genric_event_md5_file 200 $cr_index job-adp-data$i ./tmp/data_for_dmaap_test.json
+ cr_api_check_single_generic_event_md5_file 200 $cr_index job-adp-data$i ./tmp/data_for_dmaap_test.json
+ cr_api_check_single_generic_event_md5_file 200 $cr_index job-adp-data$i ./tmp/data_for_dmaap_test.json
+ cr_api_check_single_generic_event_md5_file 200 $cr_index job-adp-data$i ./tmp/data_for_dmaap_test.json
+ cr_api_check_single_generic_event_md5_file 200 $cr_index job-adp-data$i ./tmp/data_for_dmaap_test.json
+ cr_api_check_single_generic_event_md5_file 200 $cr_index job-adp-data$i ./tmp/data_for_dmaap_test.json
done
@@ -307,11 +307,11 @@
for ((i=1; i<=$NUM_JOBS; i++))
do
cr_index=$(($i%$NUM_CR))
- cr_api_check_single_genric_event_md5_file 200 $cr_index job-adp-kafka-data$i ./tmp/data_for_dmaap_test.txt
- cr_api_check_single_genric_event_md5_file 200 $cr_index job-adp-kafka-data$i ./tmp/data_for_dmaap_test.txt
- cr_api_check_single_genric_event_md5_file 200 $cr_index job-adp-kafka-data$i ./tmp/data_for_dmaap_test.txt
- cr_api_check_single_genric_event_md5_file 200 $cr_index job-adp-kafka-data$i ./tmp/data_for_dmaap_test.txt
- cr_api_check_single_genric_event_md5_file 200 $cr_index job-adp-kafka-data$i ./tmp/data_for_dmaap_test.txt
+ cr_api_check_single_generic_event_md5_file 200 $cr_index job-adp-kafka-data$i ./tmp/data_for_dmaap_test.txt
+ cr_api_check_single_generic_event_md5_file 200 $cr_index job-adp-kafka-data$i ./tmp/data_for_dmaap_test.txt
+ cr_api_check_single_generic_event_md5_file 200 $cr_index job-adp-kafka-data$i ./tmp/data_for_dmaap_test.txt
+ cr_api_check_single_generic_event_md5_file 200 $cr_index job-adp-kafka-data$i ./tmp/data_for_dmaap_test.txt
+ cr_api_check_single_generic_event_md5_file 200 $cr_index job-adp-kafka-data$i ./tmp/data_for_dmaap_test.txt
done
## Send json file via message-router to mediator
@@ -365,11 +365,11 @@
for ((i=1; i<=$NUM_JOBS; i++))
do
cr_index=$(($i%$NUM_CR))
- cr_api_check_single_genric_event_md5_file 200 $cr_index job-med-data$i ./tmp/data_for_dmaap_test.json
- cr_api_check_single_genric_event_md5_file 200 $cr_index job-med-data$i ./tmp/data_for_dmaap_test.json
- cr_api_check_single_genric_event_md5_file 200 $cr_index job-med-data$i ./tmp/data_for_dmaap_test.json
- cr_api_check_single_genric_event_md5_file 200 $cr_index job-med-data$i ./tmp/data_for_dmaap_test.json
- cr_api_check_single_genric_event_md5_file 200 $cr_index job-med-data$i ./tmp/data_for_dmaap_test.json
+ cr_api_check_single_generic_event_md5_file 200 $cr_index job-med-data$i ./tmp/data_for_dmaap_test.json
+ cr_api_check_single_generic_event_md5_file 200 $cr_index job-med-data$i ./tmp/data_for_dmaap_test.json
+ cr_api_check_single_generic_event_md5_file 200 $cr_index job-med-data$i ./tmp/data_for_dmaap_test.json
+ cr_api_check_single_generic_event_md5_file 200 $cr_index job-med-data$i ./tmp/data_for_dmaap_test.json
+ cr_api_check_single_generic_event_md5_file 200 $cr_index job-med-data$i ./tmp/data_for_dmaap_test.json
done
if [[ "$DMAAP_MED_FEATURE_LEVEL" == *"KAFKATYPES"* ]]; then
@@ -429,11 +429,11 @@
for ((i=1; i<=$NUM_JOBS; i++))
do
cr_index=$(($i%$NUM_CR))
- cr_api_check_single_genric_event_md5_file 200 $cr_index job-med-kafka-data$i ./tmp/data_for_dmaap_test.txt
- cr_api_check_single_genric_event_md5_file 200 $cr_index job-med-kafka-data$i ./tmp/data_for_dmaap_test.txt
- cr_api_check_single_genric_event_md5_file 200 $cr_index job-med-kafka-data$i ./tmp/data_for_dmaap_test.txt
- cr_api_check_single_genric_event_md5_file 200 $cr_index job-med-kafka-data$i ./tmp/data_for_dmaap_test.txt
- cr_api_check_single_genric_event_md5_file 200 $cr_index job-med-kafka-data$i ./tmp/data_for_dmaap_test.txt
+ cr_api_check_single_generic_event_md5_file 200 $cr_index job-med-kafka-data$i ./tmp/data_for_dmaap_test.txt
+ cr_api_check_single_generic_event_md5_file 200 $cr_index job-med-kafka-data$i ./tmp/data_for_dmaap_test.txt
+ cr_api_check_single_generic_event_md5_file 200 $cr_index job-med-kafka-data$i ./tmp/data_for_dmaap_test.txt
+ cr_api_check_single_generic_event_md5_file 200 $cr_index job-med-kafka-data$i ./tmp/data_for_dmaap_test.txt
+ cr_api_check_single_generic_event_md5_file 200 $cr_index job-med-kafka-data$i ./tmp/data_for_dmaap_test.txt
done
fi
@@ -450,7 +450,7 @@
DATA_DELIV_JOBS=7 #Each job will eventually get 5+2 msgs
-# Wait for data recetption, adapter
+# Wait for data reception, adapter
EXPECTED_DATA_DELIV=$(($NUM_JOBS*2/$NUM_CR+$EXPECTED_DATA_DELIV))
start_timer "Data delivery adapter, 2 json per job"
for ((i=0; i<$NUM_CR; i++))
@@ -464,7 +464,7 @@
kafkapc_api_post_msg 200 "unauthenticated.dmaapadp_kafka.text" "text/plain" 'Message-------3'
kafkapc_equal topics/unauthenticated.dmaapadp_kafka.text/counters/sent 7 30
-# Wait for data recetption, adapter kafka
+# Wait for data reception, adapter kafka
EXPECTED_DATA_DELIV=$(($NUM_JOBS*2/$NUM_CR+$EXPECTED_DATA_DELIV))
start_timer "Data delivery adapter kafka, 2 strings per job"
for ((i=0; i<$NUM_CR; i++))
@@ -492,7 +492,7 @@
kafkapc_api_post_msg 200 "unauthenticated.dmaapmed_kafka.text" "text/plain" 'Message-------2'
kafkapc_equal topics/unauthenticated.dmaapmed_kafka.text/counters/sent 7 30
- # Wait for data recetption, adapter kafka
+ # Wait for data reception, adapter kafka
EXPECTED_DATA_DELIV=$(($NUM_JOBS*2/$NUM_CR+$EXPECTED_DATA_DELIV))
start_timer "Data delivery mediator kafka, 2 strings per job"
for ((i=0; i<$NUM_CR; i++))
@@ -518,15 +518,15 @@
for ((i=1; i<=$NUM_JOBS; i++))
do
cr_index=$(($i%$NUM_CR))
- cr_api_check_single_genric_event_md5 200 $cr_index job-med-data$i '{"msg":"msg-0"}'
- cr_api_check_single_genric_event_md5 200 $cr_index job-med-data$i '{"msg":"msg-2"}'
- cr_api_check_single_genric_event_md5 200 $cr_index job-adp-data$i '{"msg":"msg-1"}'
- cr_api_check_single_genric_event_md5 200 $cr_index job-adp-data$i '{"msg":"msg-3"}'
- cr_api_check_single_genric_event_md5 200 $cr_index job-adp-kafka-data$i 'Message-------1'
- cr_api_check_single_genric_event_md5 200 $cr_index job-adp-kafka-data$i 'Message-------3'
+ cr_api_check_single_generic_event_md5 200 $cr_index job-med-data$i '{"msg":"msg-0"}'
+ cr_api_check_single_generic_event_md5 200 $cr_index job-med-data$i '{"msg":"msg-2"}'
+ cr_api_check_single_generic_event_md5 200 $cr_index job-adp-data$i '{"msg":"msg-1"}'
+ cr_api_check_single_generic_event_md5 200 $cr_index job-adp-data$i '{"msg":"msg-3"}'
+ cr_api_check_single_generic_event_md5 200 $cr_index job-adp-kafka-data$i 'Message-------1'
+ cr_api_check_single_generic_event_md5 200 $cr_index job-adp-kafka-data$i 'Message-------3'
if [[ "$DMAAP_MED_FEATURE_LEVEL" == *"KAFKATYPES"* ]]; then
- cr_api_check_single_genric_event_md5 200 $cr_index job-med-kafka-data$i 'Message-------0'
- cr_api_check_single_genric_event_md5 200 $cr_index job-med-kafka-data$i 'Message-------2'
+ cr_api_check_single_generic_event_md5 200 $cr_index job-med-kafka-data$i 'Message-------0'
+ cr_api_check_single_generic_event_md5 200 $cr_index job-med-kafka-data$i 'Message-------2'
fi
done
@@ -541,7 +541,7 @@
mr_api_send_json "/events/unauthenticated.dmaapadp.json" '{"msg":"msg-5"}'
mr_api_send_json "/events/unauthenticated.dmaapadp.json" '{"msg":"msg-7"}'
-# Wait for data recetption, adapter
+# Wait for data reception, adapter
EXPECTED_DATA_DELIV=$(($NUM_JOBS*2/$NUM_CR+$EXPECTED_DATA_DELIV))
start_timer "Data delivery adapter with $SEC_DELAY seconds delay in consumer, 2 json per job"
for ((i=0; i<$NUM_CR; i++))
@@ -556,7 +556,7 @@
kafkapc_api_post_msg 200 "unauthenticated.dmaapadp_kafka.text" "text/plain" 'Message-------7'
kafkapc_equal topics/unauthenticated.dmaapadp_kafka.text/counters/sent 9 30
-# Wait for data recetption, adapter kafka
+# Wait for data reception, adapter kafka
EXPECTED_DATA_DELIV=$(($NUM_JOBS*2/$NUM_CR+$EXPECTED_DATA_DELIV))
start_timer "Data delivery adapter kafka with $SEC_DELAY seconds delay in consumer, 2 strings per job"
for ((i=0; i<$NUM_CR; i++))
@@ -585,7 +585,7 @@
kafkapc_api_post_msg 200 "unauthenticated.dmaapmed_kafka.text" "text/plain" 'Message-------6'
kafkapc_equal topics/unauthenticated.dmaapmed_kafka.text/counters/sent 9 30
- # Wait for data recetption, mediator kafka
+ # Wait for data reception, mediator kafka
EXPECTED_DATA_DELIV=$(($NUM_JOBS*2/$NUM_CR+$EXPECTED_DATA_DELIV))
start_timer "Data delivery mediator kafka with $SEC_DELAY seconds delay in consumer, 2 strings per job"
for ((i=0; i<$NUM_CR; i++))
@@ -611,15 +611,15 @@
for ((i=1; i<=$NUM_JOBS; i++))
do
cr_index=$(($i%$NUM_CR))
- cr_api_check_single_genric_event_md5 200 $cr_index job-med-data$i '{"msg":"msg-4"}'
- cr_api_check_single_genric_event_md5 200 $cr_index job-med-data$i '{"msg":"msg-6"}'
- cr_api_check_single_genric_event_md5 200 $cr_index job-adp-data$i '{"msg":"msg-5"}'
- cr_api_check_single_genric_event_md5 200 $cr_index job-adp-data$i '{"msg":"msg-7"}'
- cr_api_check_single_genric_event_md5 200 $cr_index job-adp-kafka-data$i 'Message-------5'
- cr_api_check_single_genric_event_md5 200 $cr_index job-adp-kafka-data$i 'Message-------7'
+ cr_api_check_single_generic_event_md5 200 $cr_index job-med-data$i '{"msg":"msg-4"}'
+ cr_api_check_single_generic_event_md5 200 $cr_index job-med-data$i '{"msg":"msg-6"}'
+ cr_api_check_single_generic_event_md5 200 $cr_index job-adp-data$i '{"msg":"msg-5"}'
+ cr_api_check_single_generic_event_md5 200 $cr_index job-adp-data$i '{"msg":"msg-7"}'
+ cr_api_check_single_generic_event_md5 200 $cr_index job-adp-kafka-data$i 'Message-------5'
+ cr_api_check_single_generic_event_md5 200 $cr_index job-adp-kafka-data$i 'Message-------7'
if [[ "$DMAAP_MED_FEATURE_LEVEL" == *"KAFKATYPES"* ]]; then
- cr_api_check_single_genric_event_md5 200 $cr_index job-med-kafka-data$i 'Message-------4'
- cr_api_check_single_genric_event_md5 200 $cr_index job-med-kafka-data$i 'Message-------6'
+ cr_api_check_single_generic_event_md5 200 $cr_index job-med-kafka-data$i 'Message-------4'
+ cr_api_check_single_generic_event_md5 200 $cr_index job-med-kafka-data$i 'Message-------6'
fi
done
diff --git a/test/auto-test/FTC3001.sh b/test/auto-test/FTC3001.sh
index 1426d66..3f50abe 100755
--- a/test/auto-test/FTC3001.sh
+++ b/test/auto-test/FTC3001.sh
@@ -25,7 +25,7 @@
#App names to include in the test when running kubernetes, space separated list
KUBE_INCLUDED_IMAGES=" ICS DMAAPMED DMAAPADP KUBEPROXY MR DMAAPMR CR KAFKAPC HTTPPROXY"
-#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
+#Pre-started app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=""
#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
@@ -144,7 +144,7 @@
start_timer "Create adapter (kafka) jobs: $NUM_JOBS"
for ((i=1; i<=$NUM_JOBS; i++))
do
- # Max buffer timeout for is about 160 sec for Adator jobs"
+ # Max buffer timeout for is about 160 sec for Adapter jobs"
adp_timeout=$(($i*1000))
if [[ "$DMAAP_ADP_FEATURE_LEVEL" == *"FILTERSPEC"* ]]; then
deviation "It is possible to give filter without filtertype without error indication"
@@ -219,7 +219,7 @@
kafkapc_equal topics/unauthenticated.dmaapadp_kafka.text$i/counters/sent 3 30
done
-# Wait for data recetption, adapter kafka
+# Wait for data reception, adapter kafka
EXPECTED_DATA_DELIV=$(($NUM_JOBS*2/$NUM_CR+$EXPECTED_DATA_DELIV))
EXPECTED_BATCHES_DELIV=$(($NUM_JOBS/$NUM_CR+$EXPECTED_BATCHES_DELIV))
@@ -235,8 +235,8 @@
for ((i=1; i<=$NUM_JOBS; i++))
do
cr_index=$(($i%$NUM_CR))
- cr_api_check_single_genric_event_md5 200 $cr_index job-adp-kafka-data$i 'Message-------1'$i
- cr_api_check_single_genric_event_md5 200 $cr_index job-adp-kafka-data$i 'Message-------3'$i
+ cr_api_check_single_generic_event_md5 200 $cr_index job-adp-kafka-data$i 'Message-------1'$i
+ cr_api_check_single_generic_event_md5 200 $cr_index job-adp-kafka-data$i 'Message-------3'$i
done
if [[ "$DMAAP_MED_FEATURE_LEVEL" == *"KAFKATYPES"* ]]; then
@@ -255,7 +255,7 @@
kafkapc_equal topics/unauthenticated.dmaapmed_kafka.text$i/counters/sent 2 30
done
- # Wait for data recetption, adapter kafka
+ # Wait for data reception, adapter kafka
EXPECTED_DATA_DELIV=$(($NUM_JOBS*2/$NUM_CR+$PREV_DATA_DELIV))
EXPECTED_BATCHES_DELIV=$(($NUM_JOBS/$NUM_CR+$PREV_BATCHES_DELIV))
@@ -273,8 +273,8 @@
for ((i=1; i<=$NUM_JOBS; i++))
do
cr_index=$(($i%$NUM_CR))
- cr_api_check_single_genric_event_md5 200 $cr_index job-med-kafka-data$i 'Message-------0'$i
- cr_api_check_single_genric_event_md5 200 $cr_index job-med-kafka-data$i 'Message-------2'$i
+ cr_api_check_single_generic_event_md5 200 $cr_index job-med-kafka-data$i 'Message-------0'$i
+ cr_api_check_single_generic_event_md5 200 $cr_index job-med-kafka-data$i 'Message-------2'$i
done
fi
diff --git a/test/auto-test/FTC350.sh b/test/auto-test/FTC350.sh
index f3fee12..a9faebc 100755
--- a/test/auto-test/FTC350.sh
+++ b/test/auto-test/FTC350.sh
@@ -24,7 +24,7 @@
#App names to include in the test when running kubernetes, space separated list
KUBE_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM SDNC KUBEPROXY"
-#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
+#Pre-started app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=""
#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
@@ -106,7 +106,7 @@
set_a1pms_trace
- sleep_wait 120 "Let A1PMS cofiguration take effect"
+ sleep_wait 120 "Let A1PMS configuration take effect"
a1pms_api_get_status 200
diff --git a/test/auto-test/FTC4000.sh b/test/auto-test/FTC4000.sh
index d8783ba..5050d42 100755
--- a/test/auto-test/FTC4000.sh
+++ b/test/auto-test/FTC4000.sh
@@ -24,7 +24,7 @@
#App names to include in the test when running kubernetes, space separated list
KUBE_INCLUDED_IMAGES="KUBEPROXY CHARTMUS LOCALHELM HELMMANAGER"
-#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
+#Pre-started app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=""
#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
diff --git a/test/auto-test/FTC800.sh b/test/auto-test/FTC800.sh
index d1ee766..62c6d1d 100755
--- a/test/auto-test/FTC800.sh
+++ b/test/auto-test/FTC800.sh
@@ -24,7 +24,7 @@
#App names to include in the test when running kubernetes, space separated list
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
+#Pre-started app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=""
#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
@@ -130,7 +130,7 @@
a1pms_api_put_configuration 200 ".a1pms_config.json"
fi
- sleep_wait 120 "Let A1PMS cofiguration take effect"
+ sleep_wait 120 "Let A1PMS configuration take effect"
a1pms_api_get_status 200
diff --git a/test/auto-test/FTC805.sh b/test/auto-test/FTC805.sh
index 24ef2b6..1346d69 100755
--- a/test/auto-test/FTC805.sh
+++ b/test/auto-test/FTC805.sh
@@ -24,7 +24,7 @@
#App names to include in the test when running kubernetes, space separated list
KUBE_INCLUDED_IMAGES="CP CR A1PMS RICSIM SDNC KUBEPROXY NGW"
-#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
+#Pre-started app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=""
#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
@@ -125,7 +125,7 @@
start_cr 1
- sleep_wait 120 "Let A1PMS cofiguration take effect"
+ sleep_wait 120 "Let A1PMS configuration take effect"
a1pms_api_get_status 200
diff --git a/test/auto-test/FTC810.sh b/test/auto-test/FTC810.sh
index f977d14..f03199e 100755
--- a/test/auto-test/FTC810.sh
+++ b/test/auto-test/FTC810.sh
@@ -24,7 +24,7 @@
#App names to include in the test when running kubernetes, space separated list
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
+#Pre-started app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=""
#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
@@ -116,7 +116,7 @@
start_sdnc
controller_api_wait_for_status_ok 200 ricsim_g1_1
-sleep_wait 120 "Let A1PMS cofiguration take effect"
+sleep_wait 120 "Let A1PMS configuration take effect"
a1pms_api_get_status 200
diff --git a/test/auto-test/FTC850.sh b/test/auto-test/FTC850.sh
index 54c4b3a..a8c09cb 100755
--- a/test/auto-test/FTC850.sh
+++ b/test/auto-test/FTC850.sh
@@ -24,7 +24,7 @@
#App names to include in the test when running kubernetes, space separated list
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
+#Pre-started app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=""
#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
@@ -140,7 +140,7 @@
start_cr 1
- sleep_wait 120 "Let A1PMS cofiguration take effect"
+ sleep_wait 120 "Let A1PMS configuration take effect"
a1pms_api_get_status 200
diff --git a/test/auto-test/FTC900.sh b/test/auto-test/FTC900.sh
index a85eed2..19891a5 100755
--- a/test/auto-test/FTC900.sh
+++ b/test/auto-test/FTC900.sh
@@ -24,7 +24,7 @@
#App names to include in the test when running kubernetes, space separated list
KUBE_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM KUBEPROXY NGW"
-#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
+#Pre-started app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=""
#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
@@ -82,7 +82,7 @@
a1pms_api_put_configuration 200 ".a1pms_config.json"
fi
-sleep_wait 120 "Let A1PMS cofiguration take effect"
+sleep_wait 120 "Let A1PMS configuration take effect"
a1pms_api_get_status 200
@@ -105,7 +105,7 @@
sim_print $RIC_SIM_PREFIX"_g3_"$i interface
done
-# Load the polictypes in osc
+# Load the policytypes in osc
for ((i=1; i<=$OSC_NUM_RICS; i++))
do
sim_put_policy_type 201 $RIC_SIM_PREFIX"_g1_"$i 2 testdata/OSC/sim_hw.json
@@ -130,7 +130,7 @@
a1pms_api_get_policy_type 200 20008 testdata/OSC/tsa-a1pms-modified.json
done
-# Load the polictypes in std
+# Load the policytypes in std
for ((i=1; i<=$STD_NUM_RICS; i++))
do
sim_put_policy_type 201 $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 demo-testdata/STD2/sim_qos.json
diff --git a/test/auto-test/FTC_HELM_E_RELEASE.sh b/test/auto-test/FTC_HELM_E_RELEASE.sh
index 8178551..1b63f61 100755
--- a/test/auto-test/FTC_HELM_E_RELEASE.sh
+++ b/test/auto-test/FTC_HELM_E_RELEASE.sh
@@ -26,7 +26,7 @@
#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
+#Pre-started app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=" A1PMS RICSIM CP ICS RC SDNC DMAAPMED DMAAPADP"
#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
@@ -125,7 +125,7 @@
#Check the number of services
rc_equal json:services 1
-sleep_wait 120 "Let A1PMS cofiguration take effect"
+sleep_wait 120 "Let A1PMS configuration take effect"
a1_a1pms_api_get_status 200
@@ -165,14 +165,14 @@
#Check the number of schemas
a1pms_equal json:policy-types 1
-# Load the polictypes in STD 2
+# Load the policytypes in STD 2
for ((i=0; i<$STD_NUM_RICS; i++))
do
sim_put_policy_type 201 "a1-sim-std2-"$i STD_QOS_0_2_0 testdata/STD2/sim_qos.json
sim_put_policy_type 201 "a1-sim-std2-"$i STD_QOS2_0.1.0 testdata/STD2/sim_qos2.json
done
-# Load the polictypes in OSC
+# Load the policytypes in OSC
for ((i=0; i<$OSC_NUM_RICS; i++))
do
sim_put_policy_type 201 "a1-sim-osc-"$i 1 testdata/OSC/sim_1.json
@@ -400,12 +400,12 @@
for ((i=1; i<=$NUM_JOBS; i++))
do
- cr_api_check_single_genric_json_event 200 0 jobx-data$i '{"msg":"msg-0"}'
- cr_api_check_single_genric_json_event 200 0 jobx-data$i '{"msg":"msg-2"}'
- 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"}'
- cr_api_check_single_genric_json_event 200 0 jobz-data$i 'Message-------4'
- cr_api_check_single_genric_json_event 200 0 jobz-data$i 'Message-------6'
+ cr_api_check_single_generic_json_event 200 0 jobx-data$i '{"msg":"msg-0"}'
+ cr_api_check_single_generic_json_event 200 0 jobx-data$i '{"msg":"msg-2"}'
+ cr_api_check_single_generic_json_event 200 0 joby-data$i '{"msg":"msg-1"}'
+ cr_api_check_single_generic_json_event 200 0 joby-data$i '{"msg":"msg-3"}'
+ cr_api_check_single_generic_json_event 200 0 jobz-data$i 'Message-------4'
+ cr_api_check_single_generic_json_event 200 0 jobz-data$i 'Message-------6'
done
diff --git a/test/auto-test/ONAP_UC.sh b/test/auto-test/ONAP_UC.sh
index c41c725..9a8f055 100755
--- a/test/auto-test/ONAP_UC.sh
+++ b/test/auto-test/ONAP_UC.sh
@@ -24,7 +24,7 @@
#App names to include in the test when running kubernetes, space separated list
KUBE_INCLUDED_IMAGES="CP CR MR DMAAPMR A1PMS RICSIM SDNC KUBEPROXY NGW"
-#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
+#Pre-started app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=""
#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
@@ -131,7 +131,7 @@
if [ $RUNMODE == "KUBE" ]; then
a1pms_load_config ".a1pms_config.json"
else
- #Temporary switch to http/https if dmaap use. Otherwise it is not possibble to push config
+ #Temporary switch to http/https if dmaap use. Otherwise it is not possible to push config
if [ $__httpx == "HTTPS" ]; then
use_a1pms_rest_https
else
@@ -181,7 +181,7 @@
## REQ: Synchronize A1 Policy Information in RAN
#################################################################
- # Load the polictypes in osc
+ # Load the policytypes in osc
for ((i=1; i<=$OSC_NUM_RICS; i++))
do
sim_put_policy_type 201 $RIC_SIM_PREFIX"_g1_"$i 100 demo-testdata/OSC/sim_qos.json
@@ -204,7 +204,7 @@
done
- # Load the polictypes in std
+ # Load the policytypes in std
for ((i=1; i<=$STD_NUM_RICS; i++))
do
sim_put_policy_type 201 $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 demo-testdata/STD2/sim_qos.json
diff --git a/test/auto-test/PM_DEMO.sh b/test/auto-test/PM_DEMO.sh
index 6da3ef5..6e4bd44 100755
--- a/test/auto-test/PM_DEMO.sh
+++ b/test/auto-test/PM_DEMO.sh
@@ -24,7 +24,7 @@
#App names to include in the test when running kubernetes, space separated list
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
+#Pre-started app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=""
#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
@@ -100,7 +100,7 @@
a1pms_api_put_configuration 200 ".a1pms_config.json"
fi
-sleep_wait 120 "Let A1PMS cofiguration take effect"
+sleep_wait 120 "Let A1PMS configuration take effect"
a1pms_api_get_status 200
@@ -124,7 +124,7 @@
done
-# Load the polictypes in osc
+# Load the policytypes in osc
for ((i=1; i<=$OSC_NUM_RICS; i++))
do
sim_put_policy_type 201 $RIC_SIM_PREFIX"_g1_"$i 100 demo-testdata/OSC/sim_qos.json
@@ -148,7 +148,7 @@
done
-# Load the polictypes in std
+# Load the policytypes in std
for ((i=1; i<=$STD_NUM_RICS; i++))
do
sim_put_policy_type 201 $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 demo-testdata/STD2/sim_qos.json
diff --git a/test/auto-test/PM_EI_DEMO.sh b/test/auto-test/PM_EI_DEMO.sh
index e252e1d..57bc2cb 100755
--- a/test/auto-test/PM_EI_DEMO.sh
+++ b/test/auto-test/PM_EI_DEMO.sh
@@ -24,7 +24,7 @@
#App names to include in the test when running kubernetes, space separated list
KUBE_INCLUDED_IMAGES=" MR CR A1PMS RC PRODSTUB RICSIM CP ICS SDNC HTTPPROXY KUBEPROXY NGW"
-#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
+#Pre-started app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=""
#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
@@ -117,7 +117,7 @@
rapp_cat_api_get_services 200 "Emergency-response-app" v1 "Emergency-response-app" "Emergency-response-app"
-sleep_wait 120 "Let A1PMS cofiguration take effect"
+sleep_wait 120 "Let A1PMS configuration take effect"
a1pms_api_get_status 200
@@ -126,7 +126,7 @@
do
sim_print $RIC_SIM_PREFIX"_g3_"$i interface
done
-# Load the polictypes in std
+# Load the policytypes in std
for ((i=1; i<=$STD_NUM_RICS; i++))
do
sim_put_policy_type 201 $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 demo-testdata/STD2/sim_qos.json
diff --git a/test/auto-test/README.md b/test/auto-test/README.md
index d29c752..30cf27b 100644
--- a/test/auto-test/README.md
+++ b/test/auto-test/README.md
@@ -8,7 +8,9 @@
There are two types of scripts, filenames in the format FTCXXX.sh test one or more components of the Non-RT RIC. Filenames in the format SuiteZZZZ.sh tests a number of FTCXXX.sh script as one suite. (XXX is an integer selected from the categories described further below).
FTC is short for Function Test Case. In addition, there are also other test scripts with other naming format used for demo setup etc (e.g PM_DEMO.sh).
-The requirements, in terms of the execution enviroment, to run a script or a suite is to have docker, docker-compose and python3 installed (the scripts warns if not installed). As an option, the scripts can also be executed in a Minikube or Kubernetes installation. The additional requirement is to have a clean minikube/kubernetes installation, perferably with the kube dashboard installed.
+To list all test case files with a s short description, do `grep TC_ONELINE_DESCR *.sh` for a complete list.
+
+The requirements, in terms of the execution environment, to run a script or a suite is to have docker, docker-compose and python3 installed (the scripts warns if not installed). As an option, the scripts can also be executed in a Minikube or Kubernetes installation. The additional requirement is to have a clean minikube/kubernetes installation, preferably with the kube dashboard installed.
The scripts have been tested to work on both MacOS and Ubuntu using docker. They should work also in git-bash on windows (for docker) but only partly verified. Running using minikube has only been verified on Ubuntu and running on kubernetes has been verified on MacOS and Ubuntu. Successful sample tests has been made on google cloud.
## Configuration
@@ -20,72 +22,65 @@
A test script, for example FTC1, is executed from the cmd line using the script filename and one or more parameters:
- >```./FTC1.sh remote docker --env-file ../common/test_env-oran-cherry.sh```
+ >```./FTC1.sh remote docker --env-file ../common/test_env-oran-h-release.sh```
-Note that not is running on a released verion, the parameter "release" shall be included to run the released images.
+Note that this script will use the staging images. Once the release images are available,add the parameter "release" to run with released images.
See the README.md in `../common/` for all details about available parameters and their meaning.
Each test script prints out the overall result of the tests in the end of the execution.
-The test scripts produce quite a number of logs; all container logs, a log of all http/htps calls from the test scripts including the payload, some configuration created during test and also a test case log (same as what is printed on the screen during execution). All these logs are stored in `logs/FTCXXX/`. So each test script is using its own log directory.
+The test scripts produce quite a number of logs; all container logs, a log of all http/https calls from the test scripts including the payload, some configuration created during test and also a test case log (same as what is printed on the screen during execution). All these logs are stored in `logs/FTCXXX/` - basically in a dir with the same name as the script. So each test script is using its own log directory. If the same test is started again, any existing logs will be moved to a subdirectory called `previous`.
To test all components on a very basic level, run the demo test script(s) for the desired release.
Note that oran tests only include components from oran (exception is the onap sdnc).
-Note that onap test uses components from onap combined with released oran components available at that onap release (e.g. Honolulu contains onap images from honolulu and oran images from cherry)
+Note that onap test uses components from onap combined with released oran components available at that onap release (e.g. London contains onap images from London and oran images (released images from g-release).
+
+In general, the test scripts support the current ongoing release as well as two previous releases.
-ORAN CHERRY
-===========
->```./PM_EI_DEMO.sh remote-remove docker release --env-file ../common/test_env-oran-cherry.sh```
-
->```./PM_EI_DEMO.sh remote-remove kube release --env-file ../common/test_env-oran-cherry.sh```
-
-ORAN D-RELEASE
-=========
->```./PM_EI_DEMO.sh remote-remove docker release --env-file ../common/test_env-oran-d-release.sh --use-release-image SDNC```
-
->```./PM_EI_DEMO.sh remote-remove kube release --env-file ../common/test_env-oran-d-release.sh --use-release-image SDNC```
-
-ORAN E-RELEASE
-=========
->```./PM_EI_DEMO.sh remote-remove docker release --env-file ../common/test_env-oran-e-release.sh```
-
->```./PM_EI_DEMO.sh remote-remove kube release --env-file ../common/test_env-oran-e-release.sh```
-
-ORAN E-RELEASE with nonrtric deployed with helm charts for the "dep" repo
->```../FTC_HELM_E_RELEASE.sh remote-remove kube release --env-file ../common/test_env-oran-e-release.sh --override override_ftc_helm_e_release.sh```
ORAN F-RELEASE
=========
->```./PM_EI_DEMO.sh remote-remove docker --env-file ../common/test_env-oran-f-release.sh```
+>```./PM_EI_DEMO.sh remote-remove docker release --env-file ../common/test_env-oran-f-release.sh --use-release-image SDNC```
->```./PM_EI_DEMO.sh remote-remove kube --env-file ../common/test_env-oran-f-release.sh```
+>```./PM_EI_DEMO.sh remote-remove kube release --env-file ../common/test_env-oran-f-release.sh --use-release-image SDNC```
-ONAP GUILIN
-===========
->```./PM_DEMO.sh remote-remove docker release --env-file ../common/test_env-onap-guilin.sh```
+ORAN G-RELEASE
+=========
+>```./PM_EI_DEMO.sh remote-remove docker release --env-file ../common/test_env-oran-g-release.sh --use-release-image SDNC```
->```./PM_DEMO.sh remote-remove kube release --env-file ../common/test_env-onap-guilin.sh```
+>```./PM_EI_DEMO.sh remote-remove kube release --env-file ../common/test_env-oran-g-release.sh --use-release-image SDNC```
-Note that ICS was not available before oran cherry so a test script without ICS is used.
+ORAN H-RELEASE - current on master (april 2023)
+=========
+>```./PM_EI_DEMO.sh remote-remove docker --env-file ../common/test_env-oran-h-release.sh```
-ONAP HONOLULU
+>```./PM_EI_DEMO.sh remote-remove kube --env-file ../common/test_env-oran-h-release.sh```
+
+
+ONAP JAKARTA
=============
->```./PM_EI_DEMO.sh remote-remove docker release --env-file ../common/test_env-onap-honolulu.sh```
+>```./PM_EI_DEMO.sh remote-remove docker release --env-file ../common/test_env-onap-jakarta.sh```
->```./PM_EI_DEMO.sh remote-remove kube release --env-file ../common/test_env-onap-honolulu.sh```
+>```./PM_EI_DEMO.sh remote-remove kube release --env-file ../common/test_env-onap-jakarta.sh```
-ONAP ISTANBUL
+
+ONAP KOHN
=============
->```./PM_EI_DEMO.sh remote-remove docker release --env-file ../common/test_env-onap-istanbul.sh```
+>```./PM_EI_DEMO.sh remote-remove docker release --env-file ../common/test_env-onap-kohn.sh```
->```./PM_EI_DEMO.sh remote-remove kube release --env-file ../common/test_env-onap-istanbul.sh```
+>```./PM_EI_DEMO.sh remote-remove kube release --env-file ../common/test_env-onap-kohn.sh```
+ONAP LONDON - current on master (april 2023)
+=============
+>```./PM_EI_DEMO.sh remote-remove docker --env-file ../common/test_env-onap-london.sh```
+
+>```./PM_EI_DEMO.sh remote-remove kube --env-file ../common/test_env-onap-london.sh```
## Test case categories
-The test script are number using these basic categories where 0-999 are releated to the policy managment and 1000-1999 are related to information management. 2000-2999 are for southbound http proxy. There are also demo test cases that test more or less all components. These test scripts does not use the numbering scheme below.
+The test script are number using these basic categories where 0-999 are related to the policy management and 1000-1999 are related to information management. 2000-2999 are for southbound http proxy. There are also demo test cases that test more or less all components. These test scripts does not use the numbering scheme below.
The numbering in each series corresponds to the following groupings
1-99 - Basic sanity tests, A1PMS
@@ -113,6 +108,8 @@
To get an overview of the available test scripts, use the following command to print the test script description:
'grep ONELINE *.sh' in the dir of the test scripts.
+
+
## Test case file - template
A test script contains a number of steps to verify a certain functionality.
@@ -125,12 +122,14 @@
```
#!/bin/bash
+<license text>
+
TC_ONELINE_DESCR="<test case description>"
DOCKER_INCLUDED_IMAGES=<list of used apps in this test case - for docker>
KUBE_INCLUDED_IMAGES=<list of used apps (started by the script) in this test case - for kube>
-KUBE_PRESTARTED_IMAGES=<list of used apps (prestarte - i.e. not started by the script) in this test case - for kube>
+KUBE_PRESTARTED_IMAGES=<list of used apps (pre-started - i.e. not started by the script) in this test case - for kube>
SUPPORTED_PROFILES=<list of supported profile names>
@@ -160,7 +159,7 @@
## License
-Copyright (C) 2020 Nordix Foundation. All rights reserved.
+Copyright (C) 2020-2023 Nordix Foundation. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
diff --git a/test/auto-test/override-adapter.sh b/test/auto-test/override-adapter.sh
index 5edb9e6..faef149 100644
--- a/test/auto-test/override-adapter.sh
+++ b/test/auto-test/override-adapter.sh
@@ -16,4 +16,4 @@
################################################################################
A1PMS_ADAPTER_CLASS="" # adapter java class
-A1PMS_ADAPTER_POLICY_NAME="" # policy type for adaper
+A1PMS_ADAPTER_POLICY_NAME="" # policy type for adapter
diff --git a/test/auto-test/startMR.sh b/test/auto-test/startMR.sh
index 823a72e..3b4f3db 100755
--- a/test/auto-test/startMR.sh
+++ b/test/auto-test/startMR.sh
@@ -24,7 +24,7 @@
#App names to include in the test when running kubernetes, space separated list
KUBE_INCLUDED_IMAGES="MR DMAAPMR KUBEPROXY KAFKAPC"
-#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
+#Pre-started app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=""
#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
diff --git a/test/common/README.md b/test/common/README.md
index 492f204..bd7b0d6 100644
--- a/test/common/README.md
+++ b/test/common/README.md
@@ -1,15 +1,18 @@
# Introduction #
-This dir contains most scripts needed for the auto-test environment. There are scripts with functions to adapt to the apis of the components of the Non-RT RIC; Policy Managerment Service, Information Coordinator Service , A1 simulator as well as other components and simulators. The test environment supports both test with docker and kubernetes.
+This dir contains most scripts needed for the auto-test environment. There are scripts with functions to adapt to the apis of the components of the Non-RT RIC; Policy Management Service, Information Coordinator Service , A1 simulator as well as other components and simulators. The test environment supports both test with docker and kubernetes.
Some of the scripts can also be used for other kinds of tests, for example basic tests.
## Overview for common test scripts and files ##
+`a1pms_api_functions.sh` \
+Contains functions for adapting towards the Policy Management Service (A1PMS) API.
+
`api_curl.sh` \
A common curl based function for the a1pms and ics apis. Also partly used for the Callback receiver and RAPP Catalogue apis.
-`cbs_api_function.sh` \
-All functions are implemented in `consul_api_function.sh`.
+`authsidecar_api_functions.sh` \
+Image handling functions for the auth_token_fetch image.
`chartmus_api_functions.sh` \
Contains functions for managing a Chartmuseum instance.
@@ -20,11 +23,11 @@
`clean-kube.sh` \
Cleans all services, deployments, pods, replica set etc started by the test environment in kubernetes.
-`compare_json.py` \
-A python script to compare two json obects for equality. Note that the comparsion always sort json-arrays before comparing (that is, it does not care about the order of items within the array). In addition, the target json object may specify individual parameter values where equality is 'dont care'.
+`clean-kube_ns.sh` \
+Cleans all namespaces created by the test environment in kubernetes.
-`consul_api_function.sh` \
-Contains functions for managing Consul and CBS.
+`compare_json.py` \
+A python script to compare two json objects for equality. Note that the comparison always sort json-arrays before comparing (that is, it does not care about the order of items within the array). In addition, the target json object may specify individual parameter values where equality is 'don't care'.
`count_json_elements.py` \
A python script calculate the length of json array or size of a json dictionary'.
@@ -42,16 +45,16 @@
A python script to create a batch of policies. The script is intended to run in a number of processes to create policies in parallel.
`create_rics_json.py` \
-A python script to create a json file from a formatted string of ric info. Helper for the test enviroment.
+A python script to create a json file from a formatted string of ric info. Helper for the test environment.
`delete_policies_process.py` \
A python script to delete a batch of policies. The script is intended to run in a number of processes to delete policies in parallel.
`dmaapadp_api_function.sh`
-Contains funnctions for managing the Dmaap Adapter.
+Contains functions for managing the Dmaap Adapter.
`dmaapmed_api_function.sh`
-Contains funnctions for managing the Dmaap Mediator Service.
+Contains functions for managing the Dmaap Mediator Service.
`dmaapmr_api_function.sh`
All functions are implemented in `mr_api_functions.sh`.
@@ -62,6 +65,9 @@
`extract_sdnc_reply.py` \
A python script to extract the information from an sdnc (A1 Controller) reply json. Helper for the test environment.
+`format_endpoint_stats.sh` \
+This script formats API statistics into a test report - data is collected only if the flag `--endpoint-stats` is given to the test script .
+
`genstat.sh` \
This script collects container statistics to a file. Works both in docker and kubernetes (only for docker runtime).
@@ -74,9 +80,15 @@
`ics_api_functions.sh` \
Contains functions for adapting towards the Information Coordinator Service API.
+`istio_api_functions.sh` \
+Contains functions for istio configurations.
+
`kafkapc_api_functions.sh` \
Contains functions for managing the kafka producer/consumer. Kafka is started by the dmaap message router component.
+`keycloak_api_functions.sh` \
+Contains functions for keycloak configuration.
+
`kube_proxy_api_functions.sh` \
Contains functions for managing the Kube Proxy - to gain access to all services pod inside a kube cluster or all containers in a private docker network.
@@ -89,9 +101,6 @@
`ngw_api_functions.sh` \
Contains functions for managing the Non-RT RIC Gateway
-`a1pms_api_functions.sh` \
-Contains functions for adapting towards the Policy Management Service (A1PMS) API, also via dmaap (using a message-router stub interface)
-
`prodstub_api_functions.sh` \
Contains functions for adapting towards the Producer stub interface - simulates a producer.
@@ -104,6 +113,9 @@
`ricsim_api_functions.sh` \
Contains functions for adapting towards the RIC (A1) simulator admin API.
+`ricmediatorsim_api_functions.sh` \
+Contains functions for adapting towards the ricmediator simulator (A1) API.
+
`sdnc_api_functions.sh` \
Contains functions for adaping towards the SDNC (used as an A1 controller).
@@ -112,11 +124,11 @@
Used by the auto test scripts/suites but could be used for other test script as well. The test cases shall be started with the file for the intended target using command line argument '--env-file'.
`testcase_common.sh` \
-Common functions for auto test cases in the auto-test dir. This script is the foundation of test auto environment which sets up images and enviroment variables needed by this script as well as the script adapting to the APIs.
+Common functions for auto test cases in the auto-test dir. This script is the foundation of test auto environment which sets up images and environment variables needed by this script as well as the script adapting to the APIs.
The included functions are described in detail further below.
`testengine_config.sh` \
-Configuration file to setup the applications (components and simulators) the test enviroment handles.
+Configuration file to setup the applications (components and simulators) the test environment handles.
`testsuite_common.sh` \
Common functions for running two or more auto test scripts as a suite.
@@ -125,11 +137,13 @@
Integration a new application to the test environment involves the following steps.
-* Choose a short name for the application. Should be a uppcase name. For example, the NonRTRIC Gateway has NGW as short name.
+* Choose a short name for the application. Should be a uppercase name. For example, the NonRTRIC Gateway has NGW as short name.
This short name shall be added to the testengine_config.sh. See that file for detailed instructions.
+Depending if the image is a locally built simulator image or an official image, the following env vara may need to be updated with the app short name: `PROJECT_IMAGES_APP_NAMES ORAN_IMAGES_APP_NAMES ORAN_IMAGES_APP_NAMES`.
+
* Create a file in this directory using the pattern `<application-name>_api_functions.sh`.
-This file must implement the following functions used by the test engine. Note that functions must include the application short name in the function name. If the application does not run in kubernetes, then the last three functions in the list can be omitted.
+This file must implement the following functions used by the test engine. Note that functions must include the application short name in the function name. If the application does not run in kubernetes, then the functions with kube prefix does not need to be implemented.
| Function |
|--|
@@ -142,16 +156,16 @@
| __<app-short_name>_kube_delete_all |
| __<app-short_name>_store_docker_logs |
| __<app-short_name>_initial_setup |
-| __<app-short_name>_statisics_setup |
+| __<app-short_name>_statistics_setup |
| __<app-short_name>_test_requirements |
In addition, all other functions used for testing of the application shall also be added to the file. For example functions to start the application, setting interface parameters as well as functions to send rest call towards the api of the application and validating the result.
-* Add the application variables to api_curl.sh. This file contains a generic function to make rest calls to an api. It also supports switching betweeen direct rest calls or rest calls via messsage router.
+* Add the application variables to api_curl.sh. This file contains a generic function to make rest calls to an api. It also supports switching between direct rest calls or rest calls via message router.
* Create a directory beneath in the simulator-group dir. This new directory shall contain docker-compose files, config files (with or without variable substitutions) and kubernetes resource files.
-All docker-compose files and all kubernetes resource files need to defined special lables. These lables are used by the test enginge to identify containers and resources started and used by the test engine.
+All docker-compose files and all kubernetes resource files need to defined special labels. These labels are used by the test engine to identify containers and resources started and used by the test engine.
| Label for docker compose | Description |
|--|--|
@@ -173,14 +187,41 @@
| arg list |
|--|
-| `remote\|remote-remove docker\|kube --env-file <environment-filename> [release] [auto-clean] [--stop-at-error] [--ricsim-prefix <prefix> ] [--use-local-image <app-nam>+] [--use-snapshot-image <app-nam>+] [--use-staging-image <app-nam>+] [--use-release-image <app-nam>+] [--use-external-image <app-nam>+] [--image-repo <repo-address>] [--repo-policy local\|remote] [--cluster-timeout <timeout-in-seconds>] [--print-stats]` |
+| `remote\|remote-remove `
+` docker\|kube `
+` --env-file <environment-filename> `
+` [release] `
+` [auto-clean]`
+` [--stop-at-error]`
+` [--ricsim-prefix <prefix> ]`
+` [--use-local-image <app-nam>+]`
+` [--use-snapshot-image <app-nam>+]`
+` [--use-staging-image <app-nam>+]`
+` [--use-release-image <app-nam>+]`
+` [--use-external-image <app-nam>+]`
+` [--image-repo <repo-address>]`
+` [--repo-policy local\|remote]`
+` [--cluster-timeout <timeout-in-seconds>]`
+` [--print-stats]`
+` [--override <override-environment-filename>]`
+` [--pre-clean]`
+` [--gen-stats]`
+` [--delete-namespaces]`
+` [--delete-containers]`
+` [--endpoint-stats]`
+` [--kubeconfig <config-file>]`
+` [--host-path-dir <local-host-dir>]`
+` [--kubecontext <context-name>]`
+` [--docker-host <docker-host-url>]`
+` [--docker-proxy <host-or-ip>] `
+` ["--target-platform <platform> ]` |
| parameter | description |
|-|-|
| `remote` | Use images from remote repositories. Can be overridden for individual images using the '--use_xxx' flags |
| `remote-remove` | Same as 'remote' but will also try to pull fresh images from remote repositories |
| `docker` | Use docker environment for test |
-| `kuber` | Use kubernetes environment for test. Requires a kubernetes minikube installation |
+| `kube` | Use kubernetes environment for test. Requires access to a local or remote kubernetes cluster (or or more nodes). For example docker desktop, minikube, external kubernetes cluster, google cloud etc |
| `--env-file` | The script will use the supplied file to read environment variables from |
| `release` | If this flag is given the script will use release version of the images |
| `auto-clean` | If the function 'auto_clean_containers' is present in the end of the test script then all containers will be stopped and removed. If 'auto-clean' is not given then the function has no effect |
@@ -192,15 +233,23 @@
| `--use-release-image` | The script will use images from the nexus release repo for the supplied apps, space separated list of app short names |
| `--use-external-image` | The script will use images from an external repo for the supplied apps, space separated list of app short names |
| `--image-repo` | Url to optional image repo. Only locally built images will be re-tagged and pushed to this repo |
-| `-repo-policy` | Policy controlling which images to re-tag and push to image repo in param --image-repo. Can be set to 'local' (push only locally built images) or 'remote' (push locally built images and images from nexus repo). Default is 'local' |
+| `--repo-policy` | Policy controlling which images to re-tag and push to image repo in param --image-repo. Can be set to 'local' (push only locally built images) or 'remote' (push locally built images and images from nexus repo). Default is 'local' |
| `--cluster-timeout` | Optional timeout for cluster where it takes time to obtain external ip/host-name. Timeout in seconds |
| `--print-stats` | Prints the number of tests, failed tests, failed configuration and deviations after each individual test or config |
| `--override <file>` | Override setting from the file supplied by --env-file |
-| `--pre-clean` | Clean kube resouces when running docker and vice versa |
+| `--pre-clean` | Clean kube resources when running docker and vice versa |
| `--gen-stats` | Collect container/pod runtime statistics |
-| `--delete-namespaces` | Delete kubernetes namespaces before starting tests - but only those created by the test scripts. Kube mode only. Ignored if running with prestarted apps. |
+| `--delete-namespaces` | Delete kubernetes namespaces before starting tests - but only those created by the test scripts. Kube mode only. Ignored if running with pre-started apps. |
| `--delete-containers` | Delete docker containers before starting tests - but only those created by the test scripts. Docker mode only. |
| `--endpoint-stats` | Collect http endpoint statistics |
+| `--kubeconfig` | Kubernetes config file for kubectl, when running with non local kubernetes |
+| `--host-path-dir` | Path for storing persistent data in kubernetes. Must be available on all nodes. Default is `/tmp` |
+| `--kubecontext` | Kubernetes context name for kubectl, when running with non local kubernetes |
+| `--docker-host` | Url to docker host, host and port. For non local docker |
+| `--docker-proxy` | Host or IP of the docker instance, for non local docker |
+| `--target-platform` | Build and pull images for this target platform |
+
+
| `help` | Print this info along with the test script description and the list of app short names supported |
## Function: setup_testenvironment ##
@@ -297,7 +346,567 @@
|--|
| None |
-# Description of functions in chartmus_api_function.sh #
+# Description of functions in a1pms_api_functions.sh #
+
+## General ##
+
+Both A1PMS version 1 and 2 are supported. The version is controlled by the env variable `$A1PMS_VERSION` set in the test env file.
+For api function in version 2, an url prefix is added if configured.
+
+## Function: use_a1pms_rest_http ##
+
+Use http for all API calls to the A1PMS. This is the default.
+| arg list |
+|--|
+| None |
+
+## Function: use_a1pms_rest_https ##
+
+Use https for all API calls to the A1PMS.
+| arg list |
+|--|
+| None |
+
+## Function: use_a1pms_dmaap_http ##
+
+Send and receive all API calls to the A1PMS over Dmaap via the MR over http.
+| arg list |
+|--|
+| None |
+
+## Function: use_a1pms_dmaap_https ##
+
+Send and receive all API calls to the A1PMS over Dmaap via the MR over https.
+| arg list |
+|--|
+| None |
+
+## Function: start_a1pms ##
+
+Start the A1PMS container or corresponding kube resources depending on docker/kube mode.
+| arg list |
+|--|
+| `<logfile-prefix>` |
+| (docker) `PROXY\|NOPROXY <config-file>` |
+| (kube) `PROXY\|NOPROXY <config-file> [ <data-file> ]` |
+
+| parameter | description |
+| --------- | ----------- |
+| `PROXY` | Configure with http proxy, if proxy is started |
+| `NOPROXY` | Configure without http proxy |
+| `<config-file>`| Path to application.yaml |
+| `<data-file>` | Optional path to application_configuration.json |
+
+## Function: stop_a1pms ##
+
+Stop the a1pms container (docker) or scale it to zero (kubernetes).
+| arg list |
+|--|
+| None |
+
+## Function: start_stopped_a1pms ##
+
+Start a previously stopped a1pms container (docker) or scale it to 1 (kubernetes).
+| arg list |
+|--|
+| None |
+
+## Function: prepare_a1pms_config ##
+
+Function to prepare an a1pms config based on the previously configured (and started simulators). Note that all simulator must be running and the test script has to configure if http or https shall be used for the components (this is done by the functions 'use_simulator_http', 'use_simulator_https', 'use_sdnc_http', 'use_sdnc_https', 'use_mr_http', 'use_mr_https')
+| arg list |
+|--|
+| `SDNC|NOSDNC <output-file>` |
+
+| parameter | description |
+| --------- | ----------- |
+| `SDNC` | Configure with controller |
+| `NOSDNC` | Configure without controller |
+| `<output-file>` | The path to the json output file containing the prepared config. This file is used in 'a1pms_load_config' |
+
+## Function: a1pms_load_config ##
+
+Load the config into a config map (kubernetes only).
+| arg list |
+|--|
+| `<data-file>` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<data-file>` | Path to application_configuration.json |
+
+## Function: set_a1pms_debug ##
+
+Configure the A1PMS log on debug level. The A1PMS must be running.
+| arg list |
+|--|
+| None |
+
+## Function: set_a1pms_trace ##
+
+Configure the A1PMS log on trace level. The A1PMS must be running.
+| arg list |
+|--|
+| None |
+
+## Function: use_a1pms_retries ##
+
+Configure the A1PMS to make up-to 5 retries if an API call returns any of the specified http return codes.
+| arg list |
+|--|
+| `[<response-code>]*` |
+
+## Function: check_a1pms_logs ##
+
+Check the A1PMS log for any warnings and errors and print the count of each.
+| arg list |
+|--|
+| None |
+
+## Function: a1pms_equal ##
+
+Tests if the array length of a json array in the A1PMS simulator is equal to a target value.
+Without the timeout, the test sets pass or fail immediately depending on if the array length is equal to the target or not.
+With the timeout, the test waits up to the timeout seconds before setting pass or fail depending on if the array length becomes equal to the target value or not.
+See the 'cr' dir for more details.
+
+| arg list |
+|--|
+| `<variable-name> <target-value> [ <timeout-in-sec> ]` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<variable-name>` | Relative url. Example 'json:policy_types' - checks the json array length of the url /policy_types |
+| `<target-value>` | Target value for the length |
+| `<timeout-in-sec>` | Max time to wait for the length to reach the target value |
+
+## Function: a1pms_api_get_policies ##
+
+Test of GET '/policies' or V2 GET '/v2/policy-instances' and optional check of the array of returned policies.
+To test the response code only, provide the response code parameter as well as the following three parameters.
+To also test the response payload add the 'NOID' for an expected empty array or repeat the last five/seven parameters for each expected policy.
+
+| arg list |
+|--|
+| `<response-code> <ric-id>\|NORIC <service-id>\|NOSERVICE <policy-type-id>\|NOTYPE [ NOID \| [<policy-id> <ric-id> <service-id> EMPTY\|<policy-type-id> <template-file>]*]` |
+
+| arg list V2 |
+|--|
+| `<response-code> <ric-id>\|NORIC <service-id>\|NOSERVICE <policy-type-id>\|NOTYPE [ NOID \| [<policy-id> <ric-id> <service-id> EMPTY\|<policy-type-id> <transient> <notification-url> <template-file>]*]` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<ric-id>` | Id of the ric |
+| `NORIC` | Indicator that no ric is provided |
+| `<service-id>` | Id of the service |
+| `NOSERVICE` | Indicator that no service id is provided |
+| `<policy-type-id>` | Id of the policy type |
+| `NOTYPE` | Indicator that no type id is provided |
+| `NOID` | Indicator that no policy id is provided - indicate empty list of policies|
+| `<policy-id>` | Id of the policy |
+| `EMPTY` | Indicate for the special empty policy type |
+| `transient` | Transient, true or false |
+| `notification-url` | Url for notifications |
+| `<template-file>` | Path to the template file for the policy (same template used when creating the policy) |
+
+## Function: a1pms_api_get_policy ##
+
+Test of GET '/policy' or V2 GET '/v2/policies/{policy_id}' and optional check of the returned json payload.
+To test the the response code only, provide the expected response code and policy id.
+To test the contents of the returned json payload, add a path to the template file used when creating the policy.
+
+| arg list |
+|--|
+| `<response-code> <policy-id> [<template-file>]` |
+
+| arg list V2|
+|--|
+| `<response-code> <policy-id> [ <template-file> <service-name> <ric-id> <policytype-id>\|NOTYPE <transient> <notification-url>\|NOURL ]` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<policy-id>` | Id of the policy |
+| `<template-file>` | Path to the template file for the policy (same template used when creating the policy) |
+| `<service-id>` | Id of the service |
+| `<ric-id>` | Id of the ric |
+| `<policy-type-id>` | Id of the policy type |
+| `NOTYPE` | Indicator that no type id is provided |
+| `transient` | Transient, true or false |
+| `notification-url` | Url for notifications |
+
+## Function: a1pms_api_put_policy ##
+
+Test of PUT '/policy' or V2 PUT '/policies'.
+If more than one policy shall be created, add a count value to indicate the number of policies to create. Note that if more than one policy shall be created the provided policy-id must be numerical (will be used as the starting id).
+
+| arg list |
+|--|
+| `<response-code> <service-name> <ric-id> <policytype-id> <policy-id> <transient> <template-file> [<count>]` |
+
+| arg list V2 |
+|--|
+| `<response-code> <service-name> <ric-id> <policytype-id>\|NOTYPE <policy-id> <transient>\|NOTRANSIENT <notification-url>\|NOURL <template-file> [<count>]` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<service-id>` | Id of the service |
+| `<ric-id>` | Id of the ric |
+| `<policy-type-id>` | Id of the policy type |
+| `<policy-id>` | Id of the policy. This value shall be a numeric value if more than one policy shall be created |
+| `transient>` | Transient 'true' or 'false'. 'NOTRANSIENT' can be used to indicate using the default value (no transient value provided) |
+| `notification-url` | Url for notifications |
+|`NOURL`| Indicator for no url |
+| `<template-file>` | Path to the template file for the policy |
+| `<count>` | An optional count (default is 1). If a value greater than 1 is given, the policy ids will use the given policy id as the first id and add 1 to that id for each new policy |
+
+## Function: a1pms_api_put_policy_batch ##
+
+This tests the same as function 'a1pms_api_put_policy' except that all put requests are sent to dmaap in one go and then the responses are polled one by one.
+If the a1pms api is not configured to use dmaap (see 'use_a1pms_dmaap', 'use_a1pms_rest_http' and 'use_a1pms_rest_https'), an error message is printed.
+For arg list and parameters, see 'a1pms_api_put_policy'.
+
+## Function: a1pms_api_put_policy_parallel ##
+
+This tests the same as function 'a1pms_api_put_policy' except that the policy created is spread out over a number of processes and it only uses the a1pms rest API. The total number of policies created is determined by the product of the parameters 'number-of-rics' and 'count'. The parameter 'number-of-threads' should not be evenly divisible by the product of the parameters 'number-of-rics' and 'count' - this is to ensure that one process does not handle the creation of all the policies in one ric.
+
+| arg list |
+|--|
+| `<response-code> <service-name> <ric-id-base> <number-of-rics> <policytype-id> <policy-start-id> <transient> <template-file> <count-per-ric> <number-of-threads>`
+
+| arg list |
+|--|
+| `<response-code> <service-name> <ric-id-base> <number-of-rics> <policytype-id> <policy-start-id> <transient> <notification-url>\|NOURL <template-file> <count-per-ric> <number-of-threads>`
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<service-id>` | Id of the service |
+| `<ric-id-base>` | The base id of the rics, ie ric id without the sequence number. The sequence number is added during processing |
+| `<number-of-rics>` | The number of rics, assuming the first index is '1'. The index is added to the 'ric-id-base' id |
+| `<policy-type-id>` | Id of the policy type |
+| `<policy-start-id>` | Id of the policy. This value shall be a numeric value and will be the id of the first policy |
+| `transient>` | Transient 'true' or 'false'. 'NOTRANSIENT' can be used to indicate using the default value (no transient value provide) |
+| `notification-url` | Url for notifications |
+| `<template-file>` | Path to the template file for the policy |
+| `<count-per-ric>` | Number of policies per ric |
+| `<number-of-threads>` | Number of threads (processes) to run in parallel |
+
+## Function: a1pms_api_delete_policy ##
+
+This tests the DELETE '/policy' or V2 DELETE '/v2/policies/{policy_id}'. Removes the indicated policy or a 'count' number of policies starting with 'policy-id' as the first id.
+
+| arg list |
+|--|
+| `<response-code> <policy-id> [<count>]`
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<policy-id>` | Id of the policy |
+| `<count>` | An optional count of policies to delete. The 'policy-id' will be the first id to be deleted. |
+
+## Function: a1pms_api_delete_policy_batch ##
+
+This tests the same as function 'a1pms_api_delete_policy' except that all delete requests are sent to dmaap in one go and then the responses are polled one by one.
+If the a1pms api is not configured to used dmaap (see 'use_a1pms_dmaap', 'use_a1pms_rest_http' and 'use_a1pms_rest_https'), an error message is printed.
+For arg list and parameters, see 'a1pms_api_delete_policy'.
+
+## Function: a1pms_api_delete_policy_parallel ##
+
+This tests the same as function 'a1pms_api_delete_policy' except that the policy deleted is spread out over a number of processes and it only uses the a1pms rest API. The total number of policies deleted is determined by the product of the parameters 'number-of-rics' and 'count'. The parameter 'number-of-threads' shall be selected to be not evenly divisible by the product of the parameters 'number-of-rics' and 'count' - this is to ensure that one process does not handle the deletion of all the policies in one ric.
+
+| arg list |
+|--|
+| `<response-code> <ric-id-base> <number-of-rics> <policy-start-id> <count-per-ric> <number-of-threads>`
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<ric-id-base>` | The base id of the rics, ie ric id without the sequence number. The sequence number is added during processing |
+| `<number-of-rics>` | The number of rics, assuming the first index is '1' |
+| `<policy-start-id>` | Id of the policy. This value shall be a numeric value and will be the id of the first policy |
+| `<count-per-ric>` | Number of policies per ric |
+| `<number-of-threads>` | Number of threads (processes) to run in parallel |
+
+## Function: a1pms_api_get_policy_ids ##
+
+Test of GET '/policy_ids' or V2 GET '/v2/policies'.
+To test response code only, provide the response code parameter as well as the following three parameters.
+To also test the response payload add the 'NOID' for an expected empty array or repeat the 'policy-instance-id' for each expected policy id.
+
+| arg list |
+|--|
+| `<response-code> <ric-id>\|NORIC <service-id>\|NOSERVICE <type-id>\|NOTYPE ([<policy-instance-id]*\|NOID)` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<ric-id>` | Id of the ric |
+| `NORIC` | Indicator that no ric is provided |
+| `<service-id>` | Id of the service |
+| `NOSERVICE` | Indicator that no service id is provided |
+| `type-id>` | Id of the policy type |
+| `NOTYPE` | Indicator that no type id is provided |
+| `NOID` | Indicator that no policy id is provided - indicate empty list of policies|
+| `<policy-instance-id>` | Id of the policy |
+
+## Function: a1pms_api_get_policy_schema ##
+
+Test of V2 GET '/v2/policy-types/{policyTypeId}' and optional check of the returned json schema.
+To test the response code only, provide the expected response code and policy type id.
+To test the contents of the returned json schema, add a path to a schema file to compare with.
+
+| arg list |
+|--|
+| `<response-code> <policy-type-id> [<schema-file>]` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<policy-type-id>` | Id of the policy type |
+| `<schema-file>` | Path to the schema file for the policy type |
+
+## Function: a1pms_api_get_policy_schema ##
+
+Test of GET '/policy_schema' and optional check of the returned json schema.
+To test the response code only, provide the expected response code and policy type id.
+To test the contents of the returned json schema, add a path to a schema file to compare with.
+
+| arg list |
+|--|
+| `<response-code> <policy-type-id> [<schema-file>]` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<policy-type-id>` | Id of the policy type |
+| `<schema-file>` | Path to the schema file for the policy type |
+
+## Function: a1pms_api_get_policy_schemas ##
+
+Test of GET '/policy_schemas' and optional check of the returned json schemas.
+To test the response code only, provide the expected response code and ric id (or NORIC if no ric is given).
+To test the contents of the returned json schema, add a path to a schema file to compare with (or NOFILE to represent an empty '{}' type)
+
+| arg list |
+|--|
+| `<response-code> <ric-id>\|NORIC [<schema-file>\|NOFILE]*` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<ric-id>` | Id of the ric |
+| `NORIC` | No ric id given |
+| `<schema-file>` | Path to the schema file for the policy type |
+| `NOFILE` | Indicate the template for an empty type |
+
+## Function: a1pms_api_get_policy_status ##
+
+Test of GET '/policy_status' or V2 GET '/policies/{policy_id}/status'.
+
+| arg list |
+|--|
+| `<response-code> <policy-id> (STD\|STD2 <enforce-status>\|EMPTY [<reason>\|EMPTY])\|(OSC <instance-status> <has-been-deleted>)` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<policy-id>` | Id of the policy |
+| `STD` | Indicator of status of Standarized A1 |
+| `STD2` | Indicator of status of Standarized A1 version 2 |
+| `<enforce-status>` | Enforcement status |
+| `<reason>` | Optional reason |
+| `EMPTY` | Indicator of empty string status or reason |
+| `OSC` | Indicator of status of Non-Standarized OSC A1 |
+| `<instance-status>` | Instance status |
+| `<has-been-deleted>` | Deleted status, true or false |
+
+## Function: a1pms_api_get_policy_types ##
+
+Test of GET '/policy_types' or V2 GET '/v2/policy-types' and optional check of the returned ids.
+To test the response code only, provide the expected response code and ric id (or NORIC if no ric is given).
+To test the contents of the returned json payload, add the list of expected policy type id (or 'EMPTY' for the '{}' type)
+
+| arg list |
+|--|
+| `<response-code> [<ric-id>\|NORIC [<policy-type-id>\|EMPTY [<policy-type-id>]*]]` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<ric-id>` | Id of the ric |
+| `NORIC` | No ric id given |
+| `<policy-type-id>` | Id of the policy type |
+| `EMPTY` | Indicate the empty type |
+
+## Function: a1pms_api_get_status ##
+
+Test of GET /status or V2 GET /status
+
+| arg list |
+|--|
+| `<response-code>` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+
+## Function: a1pms_api_get_ric ##
+
+Test of GET '/ric' or V2 GET '/v2/rics/ric'
+To test the response code only, provide the expected response code and managed element id.
+To test the returned ric id, provide the expected ric id.
+
+| arg list |
+|--|
+| `<reponse-code> <managed-element-id> [<ric-id>]` |
+
+| arg list V2 |
+|--|
+| `<reponse-code> <management-element-id>\|NOME <ric-id>\|<NORIC> [<string-of-ricinfo>]` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<managed-element-id>` | Id of the managed element |
+| `NOME` | Indicator for no ME |
+| `ric-id` | Id of the ric |
+| `NORIC` | Indicator no RIC |
+| `string-of-ricinfo` | String of ric info |
+
+## Function: a1pms_api_get_rics ##
+
+Test of GET '/rics' or V2 GET '/v2/rics' and optional check of the returned json payload (ricinfo).
+To test the response code only, provide the expected response code and policy type id (or NOTYPE if no type is given).
+To test also the returned payload, add the formatted string of info in the returned payload.
+Format of ricinfo: <br>`<ric-id>:<list-of-mes>:<list-of-policy-type-ids>`<br>
+Example <br>`<space-separate-string-of-ricinfo> = "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2,4 ricsim_g1_1:me2_........."`
+
+| arg list |
+|--|
+| `<reponse-code> <policy-type-id>\|NOTYPE [<space-separate-string-of-ricinfo>]` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<policy-type-id>` | Policy type id of the ric |
+| `NOTYPE>` | No type given |
+| `<space-separate-string-of-ricinfo>` | A space separated string of ric info - needs to be quoted |
+
+## Function: a1pms_api_put_service ##
+
+Test of PUT '/service' or V2 PUT '/service'.
+| arg list |
+|--|
+| `<response-code> <service-name> <keepalive-timeout> <callbackurl>` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<service-name>` | Service name |
+| `<keepalive-timeout>` | Timeout value |
+| `<callbackurl>` | Callback url |
+
+## Function: a1pms_api_get_services ##
+
+Test of GET '/service' or V2 GET '/v2/services' and optional check of the returned json payload.
+To test only the response code, omit all parameters except the expected response code.
+To test the returned json, provide the parameters after the response code.
+
+| arg list |
+|--|
+| `<response-code> [ (<query-service-name> <target-service-name> <keepalive-timeout> <callbackurl>) \| (NOSERVICE <target-service-name> <keepalive-timeout> <callbackurl> [<target-service-name> <keepalive-timeout> <callbackurl>]* )]` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<query-service-name>` | Service name for the query |
+| `<target-service-name>` | Target service name|
+| `<keepalive-timeout>` | Timeout value |
+| `<callbackurl>` | Callback url |
+| `NOSERVICE` | Indicator of no target service name |
+
+## Function: a1pms_api_get_service_ids ##
+
+Test of GET '/services' or V2 GET /'v2/services'. Only check of service ids.
+
+| arg list |
+|--|
+| `<response-code> [<service-name>]*` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<service-name>` | Service name |
+
+## Function: a1pms_api_delete_services ##
+
+Test of DELETE '/services' or V2 DELETE '/v2/services/{serviceId}'
+
+| arg list |
+|--|
+| `<response-code> [<service-name>]*` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<service-name>` | Service name |
+
+## Function: a1pms_api_put_services_keepalive ##
+
+Test of PUT '/services/keepalive' or V2 PUT '/v2/services/{service_id}/keepalive'
+
+| arg list |
+|--|
+| `<response-code> <service-name>` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<service-name>` | Service name |
+
+## Function: a1pms_api_put_configuration ##
+
+Test of PUT '/v2/configuration'
+
+| arg list |
+|--|
+| `<response-code> <config-file>` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<config-file>` | Path json config file |
+
+## Function: a1pms_api_get_configuration ##
+
+Test of GET '/v2/configuration'
+
+| arg list |
+|--|
+| `<response-code> [<config-file>]` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<config-file>` | Path json config file to compare the retrieved config with |
+
+## Function: a1pms_kube_pvc_reset ##
+Admin reset to remove all policies and services
+All types and instances etc are removed - types and instances in a1 sims need to be removed separately
+NOTE - only works in kubernetes and the pod should not be running
+
+| arg list |
+|--|
+| None |
+
+
+# Description of functions in authsidecar_api_function.sh #
+Only common API functions in this file.
+
## Function: start_chart_museum ##
@@ -517,7 +1126,7 @@
| --------- | ----------- |
| `<cr-path-id>` | Variable index for CR |
-## Function: cr_api_check_all_genric_json_events ##
+## Function: cr_api_check_all_generic_json_events ##
Check the contents of all json events for path
@@ -533,7 +1142,7 @@
| `EMPTY` | Indicator for an empty list |
| `json-msg` | Json msg string to compare with |
-## Function: cr_api_check_single_genric_json_event ##
+## Function: cr_api_check_single_generic_json_event ##
Check a single (oldest) json event (or none if empty) for path
@@ -549,7 +1158,7 @@
| `EMPTY` | Indicator for no msg |
| `json-msg` | Json msg string to compare with |
-## Function: cr_api_check_single_genric_event_md5 ##
+## Function: cr_api_check_single_generic_event_md5 ##
Check a single (oldest) json in md5 format (or none if empty) for path.
Note that if a json message is given, it shall be compact, no ws except inside string.
@@ -567,7 +1176,7 @@
| `EMPTY` | Indicator for no msg |
| `data-msg` | msg string to compare with |
-## Function: cr_api_check_single_genric_event_md5_file ##
+## Function: cr_api_check_single_generic_event_md5_file ##
Check a single (oldest) event in md5 format (or none if empty) for path.
Note that if a file with json message is given, the json shall be compact, no ws except inside string and not newlines.
@@ -651,29 +1260,6 @@
|--|
| None |
-# Description of functions in httpproxy_api_functions.sh #
-
-## Function: use_http_proxy_http ##
-
-Use http for all proxy requests. Note that this only applicable to the actual proxy request, the proxied protocol can still be http and https.
-| arg list |
-|--|
-| None |
-
-## Function: use_http_proxy_https ##
-
-Use https for all proxy requests. Note that this only applicable to the actual proxy request, the proxied protocol can still be http and https.
-| arg list |
-|--|
-| None |
-
-## Function: start_http_proxy ##
-
-Start the http proxy container in docker or kube depending on running mode.
-| arg list |
-|--|
-| None |
-
# Description of functions in helmmanager_api_functions.sh #
## Function: use_helm_manager_http ##
@@ -797,6 +1383,29 @@
| `<repo-name>`| Name of the repo |
| `<repo-url>`| Full url to the repo. Url must be accessible by the container |
+# Description of functions in httpproxy_api_functions.sh #
+
+## Function: use_http_proxy_http ##
+
+Use http for all proxy requests. Note that this only applicable to the actual proxy request, the proxied protocol can still be http and https.
+| arg list |
+|--|
+| None |
+
+## Function: use_http_proxy_https ##
+
+Use https for all proxy requests. Note that this only applicable to the actual proxy request, the proxied protocol can still be http and https.
+| arg list |
+|--|
+| None |
+
+## Function: start_http_proxy ##
+
+Start the http proxy container in docker or kube depending on running mode.
+| arg list |
+|--|
+| None |
+
# Description of functions in ics_api_functions.sh #
@@ -1520,6 +2129,76 @@
|--|
| None |
+# Description of functions in istio_api_functions.sh #
+
+## Function: istio_enable_istio_namespace ##
+Enable istio on a namespace
+
+| arg list |
+|--|
+| `<namespace>` |
+
+| parameter | description |
+| --------- | ----------- |
+| `namespace` | Namespace name to enable istio on |
+
+## Function: istio_req_auth_by_jwksuri ##
+Set isto authentication by jwks uri
+
+| arg list |
+|--|
+| `<app-name> <namespace> <realm>>` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<app-name>` | App-name, short name |
+| `<namespace>` | Namespace of app |
+| `<realm>` | Name of realm |
+
+## Function: istio_req_auth_by_jwks ##
+Set isto authentication by jwks keys (inline)
+
+| arg list |
+|--|
+| `<app> <namespace> <issuer> <key>` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<app-name>` | App-name, short name |
+| `<namespace>` | Namespace of app |
+| `<issuer>` | Name of issuer |
+| `key` | Inline key |
+
+## Function: istio_auth_policy_by_realm ##
+Set isio authorization by realm
+
+| arg list |
+|--|
+| `<app> <namespace> <realam> [<client-id> <client-role>]` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<app-name>` | App-name, short name |
+| `<namespace>` | Namespace of app |
+| `<realm>` | Name of realm |
+| `<client-id>` | Client id to authorize |
+| `<client-role>` | Client role to authorize |
+
+
+## Function: istio_auth_policy_by_issuer ##
+Set isio authorization by issuer
+
+| arg list |
+|--|
+| `<app> <namespace> <issuer>` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<app-name>` | App-name, short name |
+| `<namespace>` | Namespace of app |
+| `<issuer>` | Name of issuer |
+
+
# Description of functions in kafkapc_api_functions.sh #
## Function: use_kafkapc_http ##
@@ -1709,6 +2388,146 @@
| `<size-in-kb>` | Generated size in kb |
| `<filename>` | Path to output file |
+# Description of functions in keycloak_api_functions.sh #
+
+## Function: start_keycloak ##
+
+Start the KEYCLOAK app in docker or kube depending on start mode
+| arg list |
+|--|
+| None |
+
+## Function: keycloak_api_obtain_admin_token ##
+
+Get the admin token to use for subsequent rest calls to keycloak
+| arg list |
+|--|
+| None |
+
+## Function: keycloak_api_create_realm ##
+
+Create a realm
+| arg list |
+|--|
+| `<realm-name> <enabled> <token-expiry>` |
+
+| parameter | description |
+| --------- | ----------- |
+| `realm-name` | Name of the realm |
+| `enabled` | Enabled, true or false |
+| `token-expiry` | Token lifespan in seconds |
+
+## Function: keycloak_api_update_realm ##
+
+Update a realm
+| arg list |
+|--|
+| `<realm-name> <enabled> <token-expiry>` |
+
+| parameter | description |
+| --------- | ----------- |
+| `realm-name` | Name of the realm |
+| `enabled` | Enabled, true or false |
+| `token-expiry` | Token lifespan in seconds |
+
+## Function: keycloak_api_create_confidential_client ##
+
+Create a client
+| arg list |
+|--|
+| `<realm-name> <client-name>` |
+
+| parameter | description |
+| --------- | ----------- |
+| `realm-name` | Name of the realm |
+| `client-name` | Name of the client |
+
+## Function: keycloak_api_generate_client_secret ##
+
+Generate secret for client
+| arg list |
+|--|
+| `<realm-name> <client-name>` |
+
+| parameter | description |
+| --------- | ----------- |
+| `realm-name` | Name of the realm |
+| `client-name` | Name of the client |
+
+## Function: keycloak_api_get_client_secret ##
+
+Get a secret for client
+| arg list |
+|--|
+| `<realm-name> <client-name>` |
+
+| parameter | description |
+| --------- | ----------- |
+| `realm-name` | Name of the realm |
+| `client-name` | Name of the client |
+
+## Function: keycloak_api_create_client_roles ##
+
+Create client roles
+| arg list |
+|--|
+| `<realm-name> <client-name> <role>+` |
+
+| parameter | description |
+| --------- | ----------- |
+| `realm-name` | Name of the realm |
+| `client-name` | Name of the client |
+| `role` | Name of the role |
+
+## Function: keycloak_api_map_client_roles ##
+
+Map roles to a client
+| arg list |
+|--|
+| `<realm-name> <client-name> <role>+` |
+
+| parameter | description |
+| --------- | ----------- |
+| `realm-name` | Name of the realm |
+| `client-name` | Name of the client |
+| `role` | Name of the role |
+
+## Function: keycloak_api_get_client_token ##
+
+Get a client token
+| arg list |
+|--|
+| `<realm-name> <client-name>` |
+
+| parameter | description |
+| --------- | ----------- |
+| `realm-name` | Name of the realm |
+| `client-name` | Name of the client |
+
+## Function: keycloak_api_read_client_token ##
+
+Read a client token
+| arg list |
+|--|
+| `<realm-name> <client-name>` |
+
+| parameter | description |
+| --------- | ----------- |
+| `realm-name` | Name of the realm |
+| `client-name` | Name of the client |
+
+## Function: keycloak_api_read_client_secret ##
+
+Read the secret for client
+| arg list |
+|--|
+| `<realm-name> <client-name>` |
+
+| parameter | description |
+| --------- | ----------- |
+| `realm-name` | Name of the realm |
+| `client-name` | Name of the client |
+
# Description of functions in kubeproxy_api_functions.sh #
## Function: use_kube_proxy_http ##
@@ -1775,7 +2594,8 @@
## Function: use_mr_http ##
-Use http for all Dmaap calls to the MR. This is the default. The admin API is not affected. Note that this function shall be called before preparing the config for Consul.
+Use http for all Dmaap calls to the MR. This is the default. The admin API is not affected.
+
| arg list |
|--|
| None |
@@ -1993,563 +2813,6 @@
| --------- | ----------- |
| `<response-code>` | Expected http response code |
-# Description of functions in a1pms_api_functions.sh #
-
-## General ##
-
-Both A1PMS version 1 and 2 are supported. The version is controlled by the env variable `$A1PMS_VERSION` set in the test env file.
-For api function in version 2, an url prefix is added if configured.
-
-## Function: use_a1pms_rest_http ##
-
-Use http for all API calls to the A1PMS. This is the default.
-| arg list |
-|--|
-| None |
-
-## Function: use_a1pms_rest_https ##
-
-Use https for all API calls to the A1PMS.
-| arg list |
-|--|
-| None |
-
-## Function: use_a1pms_dmaap_http ##
-
-Send and recieve all API calls to the A1PMS over Dmaap via the MR over http.
-| arg list |
-|--|
-| None |
-
-## Function: use_a1pms_dmaap_https ##
-
-Send and recieve all API callss to the A1PMS over Dmaap via the MR over https.
-| arg list |
-|--|
-| None |
-
-## Function: start_a1pms ##
-
-Start the A1PMS container or corresponding kube resources depending on docker/kube mode.
-| arg list |
-|--|
-| `<logfile-prefix>` |
-| (docker) `PROXY\|NOPROXY <config-file>` |
-| (kube) `PROXY\|NOPROXY <config-file> [ <data-file> ]` |
-
-| parameter | description |
-| --------- | ----------- |
-| `PROXY` | Configure with http proxy, if proxy is started |
-| `NOPROXY` | Configure without http proxy |
-| `<config-file>`| Path to application.yaml |
-| `<data-file>` | Optional path to application_configuration.json |
-
-## Function: stop_a1pms ##
-
-Stop the a1pms container (docker) or scale it to zero (kubernetes).
-| arg list |
-|--|
-| None |
-
-## Function: start_stopped_a1pms ##
-
-Start a previousely stopped a1pms container (docker) or scale it to 1 (kubernetes).
-| arg list |
-|--|
-| None |
-
-## Function: prepare_a1pms_config ##
-
-Function to prepare an a1pms config based on the previously configured (and started simulators). Note that all simulator must be running and the test script has to configure if http or https shall be used for the components (this is done by the functions 'use_simulator_http', 'use_simulator_https', 'use_sdnc_http', 'use_sdnc_https', 'use_mr_http', 'use_mr_https')
-| arg list |
-|--|
-| `SDNC|NOSDNC <output-file>` |
-
-| parameter | description |
-| --------- | ----------- |
-| `SDNC` | Configure with controller |
-| `NOSDNC` | Configure without controller |
-| `<output-file>` | The path to the json output file containing the prepared config. This file is used in 'consul_config_app' |
-
-## Function: a1pms_load_config ##
-
-Load the config into a config map (kubernetes only).
-| arg list |
-|--|
-| `<data-file>` |
-
-| parameter | description |
-| --------- | ----------- |
-| `<data-file>` | Path to application_configuration.json |
-
-## Function: set_a1pms_debug ##
-
-Configure the A1PMS log on debug level. The A1PMS must be running.
-| arg list |
-|--|
-| None |
-
-## Function: set_a1pms_trace ##
-
-Configure the A1PMS log on trace level. The A1PMS must be running.
-| arg list |
-|--|
-| None |
-
-## Function: use_a1pms_retries ##
-
-Configure the A1PMS to make upto 5 retries if an API calls return any of the specified http return codes.
-| arg list |
-|--|
-| `[<response-code>]*` |
-
-## Function: check_a1pms_logs ##
-
-Check the A1PMS log for any warnings and errors and print the count of each.
-| arg list |
-|--|
-| None |
-
-## Function: a1pms_equal ##
-
-Tests if the array length of a json array in the A1PMS simulator is equal to a target value.
-Without the timeout, the test sets pass or fail immediately depending on if the array length is equal to the target or not.
-With the timeout, the test waits up to the timeout seconds before setting pass or fail depending on if the array length becomes equal to the target value or not.
-See the 'cr' dir for more details.
-
-| arg list |
-|--|
-| `<variable-name> <target-value> [ <timeout-in-sec> ]` |
-
-| parameter | description |
-| --------- | ----------- |
-| `<variable-name>` | Relative url. Example 'json:policy_types' - checks the json array length of the url /policy_types |
-| `<target-value>` | Target value for the length |
-| `<timeout-in-sec>` | Max time to wait for the length to reach the target value |
-
-## Function: a1pms_api_get_policies ##
-
-Test of GET '/policies' or V2 GET '/v2/policy-instances' and optional check of the array of returned policies.
-To test the response code only, provide the response code parameter as well as the following three parameters.
-To also test the response payload add the 'NOID' for an expected empty array or repeat the last five/seven parameters for each expected policy.
-
-| arg list |
-|--|
-| `<response-code> <ric-id>\|NORIC <service-id>\|NOSERVICE <policy-type-id>\|NOTYPE [ NOID \| [<policy-id> <ric-id> <service-id> EMPTY\|<policy-type-id> <template-file>]*]` |
-
-| arg list V2 |
-|--|
-| `<response-code> <ric-id>\|NORIC <service-id>\|NOSERVICE <policy-type-id>\|NOTYPE [ NOID \| [<policy-id> <ric-id> <service-id> EMPTY\|<policy-type-id> <transient> <notification-url> <template-file>]*]` |
-
-| parameter | description |
-| --------- | ----------- |
-| `<response-code>` | Expected http response code |
-| `<ric-id>` | Id of the ric |
-| `NORIC` | Indicator that no ric is provided |
-| `<service-id>` | Id of the service |
-| `NOSERVICE` | Indicator that no service id is provided |
-| `<policy-type-id>` | Id of the policy type |
-| `NOTYPE` | Indicator that no type id is provided |
-| `NOID` | Indicator that no policy id is provided - indicate empty list of policies|
-| `<policy-id>` | Id of the policy |
-| `EMPTY` | Indicate for the special empty policy type |
-| `transient` | Transient, true or false |
-| `notification-url` | Url for notifications |
-| `<template-file>` | Path to the template file for the policy (same template used when creating the policy) |
-
-## Function: a1pms_api_get_policy ##
-
-Test of GET '/policy' or V2 GET '/v2/policies/{policy_id}' and optional check of the returned json payload.
-To test the the response code only, provide the expected response code and policy id.
-To test the contents of the returned json payload, add a path to the template file used when creating the policy.
-
-| arg list |
-|--|
-| `<response-code> <policy-id> [<template-file>]` |
-
-| arg list V2|
-|--|
-| `<response-code> <policy-id> [ <template-file> <service-name> <ric-id> <policytype-id>\|NOTYPE <transient> <notification-url>\|NOURL ]` |
-
-| parameter | description |
-| --------- | ----------- |
-| `<response-code>` | Expected http response code |
-| `<policy-id>` | Id of the policy |
-| `<template-file>` | Path to the template file for the policy (same template used when creating the policy) |
-| `<service-id>` | Id of the service |
-| `<ric-id>` | Id of the ric |
-| `<policy-type-id>` | Id of the policy type |
-| `NOTYPE` | Indicator that no type id is provided |
-| `transient` | Transient, true or false |
-| `notification-url` | Url for notifications |
-
-## Function: a1pms_api_put_policy ##
-
-Test of PUT '/policy' or V2 PUT '/policies'.
-If more than one policy shall be created, add a count value to indicate the number of policies to create. Note that if more than one policy shall be created the provided policy-id must be numerical (will be used as the starting id).
-
-| arg list |
-|--|
-| `<response-code> <service-name> <ric-id> <policytype-id> <policy-id> <transient> <template-file> [<count>]` |
-
-| arg list V2 |
-|--|
-| `<response-code> <service-name> <ric-id> <policytype-id>\|NOTYPE <policy-id> <transient>\|NOTRANSIENT <notification-url>\|NOURL <template-file> [<count>]` |
-
-| parameter | description |
-| --------- | ----------- |
-| `<response-code>` | Expected http response code |
-| `<service-id>` | Id of the service |
-| `<ric-id>` | Id of the ric |
-| `<policy-type-id>` | Id of the policy type |
-| `<policy-id>` | Id of the policy. This value shall be a numeric value if more than one policy shall be created |
-| `transient>` | Transient 'true' or 'false'. 'NOTRANSIENT' can be used to indicate using the default value (no transient value provided) |
-| `notification-url` | Url for notifications |
-|`NOURL`| Indicator for no url |
-| `<template-file>` | Path to the template file for the policy |
-| `<count>` | An optional count (default is 1). If a value greater than 1 is given, the policy ids will use the given policy id as the first id and add 1 to that id for each new policy |
-
-## Function: a1pms_api_put_policy_batch ##
-
-This tests the same as function 'a1pms_api_put_policy' except that all put requests are sent to dmaap in one go and then the responses are polled one by one.
-If the a1pms api is not configured to use dmaap (see 'use_a1pms_dmaap', 'use_a1pms_rest_http' and 'use_a1pms_rest_https'), an error message is printed.
-For arg list and parameters, see 'a1pms_api_put_policy'.
-
-## Function: a1pms_api_put_policy_parallel ##
-
-This tests the same as function 'a1pms_api_put_policy' except that the policy create is spread out over a number of processes and it only uses the a1pms rest API. The total number of policies created is determined by the product of the parameters 'number-of-rics' and 'count'. The parameter 'number-of-threads' shall be selected to be not evenly divisible by the product of the parameters 'number-of-rics' and 'count' - this is to ensure that one process does not handle the creation of all the policies in one ric.
-
-| arg list |
-|--|
-| `<response-code> <service-name> <ric-id-base> <number-of-rics> <policytype-id> <policy-start-id> <transient> <template-file> <count-per-ric> <number-of-threads>`
-
-| arg list |
-|--|
-| `<response-code> <service-name> <ric-id-base> <number-of-rics> <policytype-id> <policy-start-id> <transient> <notification-url>\|NOURL <template-file> <count-per-ric> <number-of-threads>`
-
-| parameter | description |
-| --------- | ----------- |
-| `<response-code>` | Expected http response code |
-| `<service-id>` | Id of the service |
-| `<ric-id-base>` | The base id of the rics, ie ric id without the sequence number. The sequence number is added during processing |
-| `<number-of-rics>` | The number of rics, assuming the first index is '1'. The index is added to the 'ric-id-base' id |
-| `<policy-type-id>` | Id of the policy type |
-| `<policy-start-id>` | Id of the policy. This value shall be a numeric value and will be the id of the first policy |
-| `transient>` | Transient 'true' or 'false'. 'NOTRANSIENT' can be used to indicate using the default value (no transient value provide) |
-| `notification-url` | Url for notifications |
-| `<template-file>` | Path to the template file for the policy |
-| `<count-per-ric>` | Number of policies per ric |
-| `<number-of-threads>` | Number of threads (processes) to run in parallel |
-
-## Function: a1pms_api_delete_policy ##
-
-This tests the DELETE '/policy' or V2 DELETE '/v2/policies/{policy_id}'. Removes the indicated policy or a 'count' number of policies starting with 'policy-id' as the first id.
-
-| arg list |
-|--|
-| `<response-code> <policy-id> [<count>]`
-
-| parameter | description |
-| --------- | ----------- |
-| `<response-code>` | Expected http response code |
-| `<policy-id>` | Id of the policy |
-| `<count>` | An optional count of policies to delete. The 'policy-id' will be the first id to be deleted. |
-
-## Function: a1pms_api_delete_policy_batch ##
-
-This tests the same as function 'a1pms_api_delete_policy' except that all delete requests are sent to dmaap in one go and then the responses are polled one by one.
-If the a1pms api is not configured to used dmaap (see 'use_a1pms_dmaap', 'use_a1pms_rest_http' and 'use_a1pms_rest_https'), an error message is printed.
-For arg list and parameters, see 'a1pms_api_delete_policy'.
-
-## Function: a1pms_api_delete_policy_parallel ##
-
-This tests the same as function 'a1pms_api_delete_policy' except that the policy delete is spread out over a number of processes and it only uses the a1pms rest API. The total number of policies deleted is determined by the product of the parameters 'number-of-rics' and 'count'. The parameter 'number-of-threads' shall be selected to be not evenly divisible by the product of the parameters 'number-of-rics' and 'count' - this is to ensure that one process does not handle the deletion of all the policies in one ric.
-
-| arg list |
-|--|
-| `<response-code> <ric-id-base> <number-of-rics> <policy-start-id> <count-per-ric> <number-of-threads>`
-
-| parameter | description |
-| --------- | ----------- |
-| `<response-code>` | Expected http response code |
-| `<ric-id-base>` | The base id of the rics, ie ric id without the sequence number. The sequence number is added during processing |
-| `<number-of-rics>` | The number of rics, assuming the first index is '1' |
-| `<policy-start-id>` | Id of the policy. This value shall be a numeric value and will be the id of the first policy |
-| `<count-per-ric>` | Number of policies per ric |
-| `<number-of-threads>` | Number of threads (processes) to run in parallel |
-
-## Function: a1pms_api_get_policy_ids ##
-
-Test of GET '/policy_ids' or V2 GET '/v2/policies'.
-To test response code only, provide the response code parameter as well as the following three parameters.
-To also test the response payload add the 'NOID' for an expected empty array or repeat the 'policy-instance-id' for each expected policy id.
-
-| arg list |
-|--|
-| `<response-code> <ric-id>\|NORIC <service-id>\|NOSERVICE <type-id>\|NOTYPE ([<policy-instance-id]*\|NOID)` |
-
-| parameter | description |
-| --------- | ----------- |
-| `<response-code>` | Expected http response code |
-| `<ric-id>` | Id of the ric |
-| `NORIC` | Indicator that no ric is provided |
-| `<service-id>` | Id of the service |
-| `NOSERVICE` | Indicator that no service id is provided |
-| `type-id>` | Id of the policy type |
-| `NOTYPE` | Indicator that no type id is provided |
-| `NOID` | Indicator that no policy id is provided - indicate empty list of policies|
-| `<policy-instance-id>` | Id of the policy |
-
-## Function: a1pms_api_get_policy_schema ##
-
-Test of V2 GET '/v2/policy-types/{policyTypeId}' and optional check of the returned json schema.
-To test the response code only, provide the expected response code and policy type id.
-To test the contents of the returned json schema, add a path to a schema file to compare with.
-
-| arg list |
-|--|
-| `<response-code> <policy-type-id> [<schema-file>]` |
-
-| parameter | description |
-| --------- | ----------- |
-| `<response-code>` | Expected http response code |
-| `<policy-type-id>` | Id of the policy type |
-| `<schema-file>` | Path to the schema file for the policy type |
-
-## Function: a1pms_api_get_policy_schema ##
-
-Test of GET '/policy_schema' and optional check of the returned json schema.
-To test the response code only, provide the expected response code and policy type id.
-To test the contents of the returned json schema, add a path to a schema file to compare with.
-
-| arg list |
-|--|
-| `<response-code> <policy-type-id> [<schema-file>]` |
-
-| parameter | description |
-| --------- | ----------- |
-| `<response-code>` | Expected http response code |
-| `<policy-type-id>` | Id of the policy type |
-| `<schema-file>` | Path to the schema file for the policy type |
-
-## Function: a1pms_api_get_policy_schemas ##
-
-Test of GET '/policy_schemas' and optional check of the returned json schemas.
-To test the response code only, provide the expected response code and ric id (or NORIC if no ric is given).
-To test the contents of the returned json schema, add a path to a schema file to compare with (or NOFILE to represent an empty '{}' type)
-
-| arg list |
-|--|
-| `<response-code> <ric-id>\|NORIC [<schema-file>\|NOFILE]*` |
-
-| parameter | description |
-| --------- | ----------- |
-| `<response-code>` | Expected http response code |
-| `<ric-id>` | Id of the ric |
-| `NORIC` | No ric id given |
-| `<schema-file>` | Path to the schema file for the policy type |
-| `NOFILE` | Indicate the template for an empty type |
-
-## Function: a1pms_api_get_policy_status ##
-
-Test of GET '/policy_status' or V2 GET '/policies/{policy_id}/status'.
-
-| arg list |
-|--|
-| `<response-code> <policy-id> (STD\|STD2 <enforce-status>\|EMPTY [<reason>\|EMPTY])\|(OSC <instance-status> <has-been-deleted>)` |
-
-| parameter | description |
-| --------- | ----------- |
-| `<response-code>` | Expected http response code |
-| `<policy-id>` | Id of the policy |
-| `STD` | Indicator of status of Standarized A1 |
-| `STD2` | Indicator of status of Standarized A1 version 2 |
-| `<enforce-status>` | Enforcement status |
-| `<reason>` | Optional reason |
-| `EMPTY` | Indicator of empty string status or reason |
-| `OSC` | Indicator of status of Non-Standarized OSC A1 |
-| `<instance-status>` | Instance status |
-| `<has-been-deleted>` | Deleted status, true or false |
-
-## Function: a1pms_api_get_policy_types ##
-
-Test of GET '/policy_types' or V2 GET '/v2/policy-types' and optional check of the returned ids.
-To test the response code only, provide the expected response code and ric id (or NORIC if no ric is given).
-To test the contents of the returned json payload, add the list of expected policy type id (or 'EMPTY' for the '{}' type)
-
-| arg list |
-|--|
-| `<response-code> [<ric-id>\|NORIC [<policy-type-id>\|EMPTY [<policy-type-id>]*]]` |
-
-| parameter | description |
-| --------- | ----------- |
-| `<response-code>` | Expected http response code |
-| `<ric-id>` | Id of the ric |
-| `NORIC` | No ric id given |
-| `<policy-type-id>` | Id of the policy type |
-| `EMPTY` | Indicate the empty type |
-
-## Function: a1pms_api_get_status ##
-
-Test of GET /status or V2 GET /status
-
-| arg list |
-|--|
-| `<response-code>` |
-
-| parameter | description |
-| --------- | ----------- |
-| `<response-code>` | Expected http response code |
-
-## Function: a1pms_api_get_ric ##
-
-Test of GET '/ric' or V2 GET '/v2/rics/ric'
-To test the response code only, provide the expected response code and managed element id.
-To test the returned ric id, provide the expected ric id.
-
-| arg list |
-|--|
-| `<reponse-code> <managed-element-id> [<ric-id>]` |
-
-| arg list V2 |
-|--|
-| `<reponse-code> <management-element-id>\|NOME <ric-id>\|<NORIC> [<string-of-ricinfo>]` |
-
-| parameter | description |
-| --------- | ----------- |
-| `<response-code>` | Expected http response code |
-| `<managed-element-id>` | Id of the managed element |
-| `NOME` | Indicator for no ME |
-| `ric-id` | Id of the ric |
-| `NORIC` | Indicator no RIC |
-| `string-of-ricinfo` | String of ric info |
-
-## Function: a1pms_api_get_rics ##
-
-Test of GET '/rics' or V2 GET '/v2/rics' and optional check of the returned json payload (ricinfo).
-To test the response code only, provide the expected response code and policy type id (or NOTYPE if no type is given).
-To test also the returned payload, add the formatted string of info in the returned payload.
-Format of ricinfo: <br>`<ric-id>:<list-of-mes>:<list-of-policy-type-ids>`<br>
-Example <br>`<space-separate-string-of-ricinfo> = "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2,4 ricsim_g1_1:me2_........."`
-
-| arg list |
-|--|
-| `<reponse-code> <policy-type-id>\|NOTYPE [<space-separate-string-of-ricinfo>]` |
-
-| parameter | description |
-| --------- | ----------- |
-| `<response-code>` | Expected http response code |
-| `<policy-type-id>` | Policy type id of the ric |
-| `NOTYPE>` | No type given |
-| `<space-separate-string-of-ricinfo>` | A space separated string of ric info - needs to be quoted |
-
-## Function: a1pms_api_put_service ##
-
-Test of PUT '/service' or V2 PUT '/service'.
-| arg list |
-|--|
-| `<response-code> <service-name> <keepalive-timeout> <callbackurl>` |
-
-| parameter | description |
-| --------- | ----------- |
-| `<response-code>` | Expected http response code |
-| `<service-name>` | Service name |
-| `<keepalive-timeout>` | Timeout value |
-| `<callbackurl>` | Callback url |
-
-## Function: a1pms_api_get_services ##
-
-Test of GET '/service' or V2 GET '/v2/services' and optional check of the returned json payload.
-To test only the response code, omit all parameters except the expected response code.
-To test the returned json, provide the parameters after the response code.
-
-| arg list |
-|--|
-| `<response-code> [ (<query-service-name> <target-service-name> <keepalive-timeout> <callbackurl>) \| (NOSERVICE <target-service-name> <keepalive-timeout> <callbackurl> [<target-service-name> <keepalive-timeout> <callbackurl>]* )]` |
-
-| parameter | description |
-| --------- | ----------- |
-| `<response-code>` | Expected http response code |
-| `<query-service-name>` | Service name for the query |
-| `<target-service-name>` | Target service name|
-| `<keepalive-timeout>` | Timeout value |
-| `<callbackurl>` | Callback url |
-| `NOSERVICE` | Indicator of no target service name |
-
-## Function: a1pms_api_get_service_ids ##
-
-Test of GET '/services' or V2 GET /'v2/services'. Only check of service ids.
-
-| arg list |
-|--|
-| `<response-code> [<service-name>]*` |
-
-| parameter | description |
-| --------- | ----------- |
-| `<response-code>` | Expected http response code |
-| `<service-name>` | Service name |
-
-## Function: a1pms_api_delete_services ##
-
-Test of DELETE '/services' or V2 DELETE '/v2/services/{serviceId}'
-
-| arg list |
-|--|
-| `<response-code> [<service-name>]*` |
-
-| parameter | description |
-| --------- | ----------- |
-| `<response-code>` | Expected http response code |
-| `<service-name>` | Service name |
-
-## Function: a1pms_api_put_services_keepalive ##
-
-Test of PUT '/services/keepalive' or V2 PUT '/v2/services/{service_id}/keepalive'
-
-| arg list |
-|--|
-| `<response-code> <service-name>` |
-
-| parameter | description |
-| --------- | ----------- |
-| `<response-code>` | Expected http response code |
-| `<service-name>` | Service name |
-
-## Function: a1pms_api_put_configuration ##
-
-Test of PUT '/v2/configuration'
-
-| arg list |
-|--|
-| `<response-code> <config-file>` |
-
-| parameter | description |
-| --------- | ----------- |
-| `<response-code>` | Expected http response code |
-| `<config-file>` | Path json config file |
-
-## Function: a1pms_api_get_configuration ##
-
-Test of GET '/v2/configuration'
-
-| arg list |
-|--|
-| `<response-code> [<config-file>]` |
-
-| parameter | description |
-| --------- | ----------- |
-| `<response-code>` | Expected http response code |
-| `<config-file>` | Path json config file to compare the retrieved config with |
-
-## Function: a1pms_kube_pvc_reset ##
-Admin reset to remove all policies and services
-All types and instances etc are removed - types and instances in a1 sims need to be removed separately
-NOTE - only works in kubernetes and the pod should not be running
-
-| arg list |
-|--|
-| None |
-
# Description of functions in prodstub_api_functions.sh #
@@ -2829,20 +3092,102 @@
| `<response-code>` | Expected http response code |
| `<service-id>` | Id of the service |
+
+# Description of functions in ricmediatorsim_api_functions.sh #
+
+The functions below only use the admin interface of the ricmediator, no usage of the A1 interface.
+
+## Function: use_ricmediator_simulator_http ##
+
+Use http for all API calls (A1) toward the simulator. This is the default. Admin API calls to the simulator are not affected. Note that this function shall be called before preparing the config for A1PMS.
+| arg list |
+|--|
+| None |
+
+## Function: use_ricmediator_simulator_https ##
+
+Use https for all API calls (A1) toward the simulator. Admin API calls to the simulator are not affected. Note that this function shall be called before preparing the config for A1PMS.
+| arg list |
+|--|
+| None |
+
+## Function: start_ricmediator_simulators ##
+
+Start a group of simulator where a group may contain 1 more simulators. Started in docker or kube depending on start mode
+| arg list |
+|--|
+| `ricsim_g1\|ricsim_g2\|ricsim_g3 <count> <interface-id>` |
+
+| parameter | description |
+| --------- | ----------- |
+| `ricsim_g1\|ricsim_g2\|ricsim_g3` | Base name of the simulator. Each instance will have an postfix instance id added, starting on '1'. For examplle 'ricsim_g1_1', 'ricsim_g1_2' etc |
+|`<count>`| And integer, 1 or greater. Specifies the number of simulators to start|
+|`<interface-id>`| Shall be the interface id of the simulator. See the repo 'a1-interface' for the available ids. |
+
+## Function: get_kube_ricmediatorsim_host ##
+
+Translate ric name to kube host name.
+| arg list |
+|--|
+| `<ric-name>` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<ric-name>` | The name of the ric to translate into a host name (ip) |
+
+## Function: nearsim_generate_policy_uuid ##
+
+Geneate a UUID prefix to use along with the policy instance number when creating/deleting policies. Sets the env var UUID.
+UUID is then automatically added to the policy id in GET/PUT/DELETE.
+| arg list |
+|--|
+| None |
+
+
+## Function: ricmediatorsim_put_policy_type ##
+
+Loads a policy type to the simulator
+
+| arg list |
+|--|
+| `<response-code> <ric-id> <policy-type-id> <policy-type-file>` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<ric-id>` | Id of the ric |
+| `<policy-type-id>` | Id of the policy type |
+| `<policy-type-file>` | Path to the schema file of the policy type |
+
+## Function: ricmediatorsim_delete_policy_type ##
+
+Deletes a policy type from the simulator
+
+| arg list |
+|--|
+| `<response-code> <ric-id> <policy_type_id>` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<ric-id>` | Id of the ric |
+| `<policy-type-id>` | Id of the policy type |
+
+
# Description of functions in ricsim_api_functions.sh #
The functions below only use the admin interface of the simulator, no usage of the A1 interface.
## Function: use_simulator_http ##
-Use http for all API calls (A1) toward the simulator. This is the default. Admin API calls to the simulator are not affected. Note that this function shall be called before preparing the config for Consul.
+Use http for all API calls (A1) toward the simulator. This is the default. Admin API calls to the simulator are not affected. Note that this function shall be called before preparing the config for A1PMS.
| arg list |
|--|
| None |
## Function: use_simulator_https ##
-Use https for all API calls (A1) toward the simulator. Admin API calls to the simulator are not affected. Note that this function shall be called before preparing the config for Consul.
+Use https for all API calls (A1) toward the simulator. Admin API calls to the simulator are not affected. Note that this function shall be called before preparing the config for A1PMS.
| arg list |
|--|
| None |
@@ -3017,14 +3362,14 @@
## Function: use_sdnc_http ##
-Use http for all API calls towards the SDNC A1 Controller. This is the default. Note that this function shall be called before preparing the config for Consul.
+Use http for all API calls towards the SDNC A1 Controller. This is the default. Note that this function shall be called before preparing the config for A1PMS.
| arg list |
|--|
| None |
## Function: use_sdnc_https ##
-Use https for all API calls towards the SDNC A1 Controller. Note that this function shall be called before preparing the config for Consul.
+Use https for all API calls towards the SDNC A1 Controller. Note that this function shall be called before preparing the config for A1PMS.
| arg list |
|--|
| None |
diff --git a/test/common/a1pms_api_functions.sh b/test/common/a1pms_api_functions.sh
index e391872..a114134 100644
--- a/test/common/a1pms_api_functions.sh
+++ b/test/common/a1pms_api_functions.sh
@@ -25,7 +25,7 @@
# arg: <image-tag-suffix> (selects staging, snapshot, release etc)
# <image-tag-suffix> is present only for images with staging, snapshot,release tags
__A1PMS_imagesetup() {
- __check_and_create_image_var A1PMS "A1PMS_IMAGE" "A1PMS_IMAGE_BASE" "A1PMS_IMAGE_TAG" $1 "$A1PMS_DISPLAY_NAME"
+ __check_and_create_image_var A1PMS "A1PMS_IMAGE" "A1PMS_IMAGE_BASE" "A1PMS_IMAGE_TAG" $1 "$A1PMS_DISPLAY_NAME" ""
}
# Pull image from remote repo or use locally built image
@@ -62,12 +62,12 @@
}
# Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
-# This function is called for prestarted apps not managed by the test script.
+# This function is called for pre-started apps not managed by the test script.
__A1PMS_kube_scale_zero_and_wait() {
__kube_scale_and_wait_all_resources $KUBE_NONRTRIC_NAMESPACE app "$KUBE_NONRTRIC_NAMESPACE"-policymanagementservice
}
-# Delete all kube resouces for the app
+# Delete all kube resources for the app
# This function is called for apps managed by the test script.
__A1PMS_kube_delete_all() {
__kube_delete_all_resources $KUBE_NONRTRIC_NAMESPACE autotest A1PMS
@@ -75,7 +75,7 @@
# Store docker logs
# This function is called for apps managed by the test script.
-# args: <log-dir> <file-prexix>
+# args: <log-dir> <file-prefix>
__A1PMS_store_docker_logs() {
if [ $RUNMODE == "KUBE" ]; then
kubectl $KUBECONF logs -l "autotest=A1PMS" -n $KUBE_NONRTRIC_NAMESPACE --tail=-1 > $1$2_a1pms.log 2>&1
@@ -92,11 +92,11 @@
export A1PMS_SIDECAR_JWT_FILE=""
}
-# Set app short-name, app name and namespace for logging runtime statistics of kubernets pods or docker containers
+# Set app short-name, app name and namespace for logging runtime statistics of kubernetes pods or docker containers
# For docker, the namespace shall be excluded
-# This function is called for apps managed by the test script as well as for prestarted apps.
+# This function is called for apps managed by the test script as well as for pre-started apps.
# args: -
-__A1PMS_statisics_setup() {
+__A1PMS_statistics_setup() {
if [ $RUNMODE == "KUBE" ]; then
echo "A1PMS $A1PMS_APP_NAME $KUBE_NONRTRIC_NAMESPACE"
else
@@ -238,7 +238,7 @@
__check_included_image "A1PMS"
retcode_i=$?
- # Check if app shall only be used by the testscipt
+ # Check if app shall only be used by the test script
__check_prestarted_image "A1PMS"
retcode_p=$?
@@ -456,13 +456,13 @@
}
-# Function to perpare the consul configuration according to the current simulator configuration
+# Function to prepare the a1pms configuration according to the current simulator configuration
# args: SDNC|NOSDNC <output-file> [ <sim-group> <adapter-class> ]
# (Function for test scripts)
prepare_a1pms_config() {
echo -e $BOLD"Prepare A1PMS config"$EBOLD
- echo " Writing consul config for "$A1PMS_APP_NAME" to file: "$2
+ echo " Writing a1pms config for "$A1PMS_APP_NAME" to file: "$2
if [ $# != 2 ] && [ $# != 4 ]; then
((RES_CONF_FAIL++))
diff --git a/test/common/api_curl.sh b/test/common/api_curl.sh
index 6058e08..a6a526b 100644
--- a/test/common/api_curl.sh
+++ b/test/common/api_curl.sh
@@ -19,7 +19,7 @@
# Generic function to query the A1PMS/ICS via the REST or DMAAP interface.
# Used by all other A1PMS/ICS api test functions
-# If operation sufffix is '_BATCH' the the send and get response is split in two sequences,
+# If operation suffix is '_BATCH' the the send and get response is split in two sequences,
# one for sending the requests and one for receiving the response
# but only when using the DMAAP interface
# REST or DMAAP is controlled of the base url of $XX_ADAPTER
diff --git a/test/common/authsidecar_api_functions.sh b/test/common/authsidecar_api_functions.sh
index 594aa31..7975562 100644
--- a/test/common/authsidecar_api_functions.sh
+++ b/test/common/authsidecar_api_functions.sh
@@ -26,7 +26,7 @@
# arg: <image-tag-suffix> (selects staging, snapshot, release etc)
# <image-tag-suffix> is present only for images with staging, snapshot,release tags
__AUTHSIDECAR_imagesetup() {
- __check_and_create_image_var AUTHSIDECAR "AUTHSIDECAR_IMAGE" "AUTHSIDECAR_IMAGE_BASE" "AUTHSIDECAR_IMAGE_TAG" $1 "$AUTHSIDECAR_DISPLAY_NAME"
+ __check_and_create_image_var AUTHSIDECAR "AUTHSIDECAR_IMAGE" "AUTHSIDECAR_IMAGE_BASE" "AUTHSIDECAR_IMAGE_TAG" $1 "$AUTHSIDECAR_DISPLAY_NAME" ""
}
# Pull image from remote repo or use locally built image
@@ -63,12 +63,12 @@
}
# Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
-# This function is called for prestarted apps not managed by the test script.
+# This function is called for pre-started apps not managed by the test script.
__AUTHSIDECAR_kube_scale_zero_and_wait() {
:
}
-# Delete all kube resouces for the app
+# Delete all kube resources for the app
# This function is called for apps managed by the test script.
__AUTHSIDECAR_kube_delete_all() {
:
@@ -76,7 +76,7 @@
# Store docker logs
# This function is called for apps managed by the test script.
-# args: <log-dir> <file-prexix>
+# args: <log-dir> <file-prefix>
__AUTHSIDECAR_store_docker_logs() {
if [ $RUNMODE == "KUBE" ]; then
kubectl $KUBECONF logs -l "autotest=AUTHSIDECAR" -A --tail=-1 > $1$2_authsidecar.log 2>&1
@@ -90,11 +90,11 @@
:
}
-# Set app short-name, app name and namespace for logging runtime statistics of kubernets pods or docker containers
+# Set app short-name, app name and namespace for logging runtime statistics of kubernetes pods or docker containers
# For docker, the namespace shall be excluded
-# This function is called for apps managed by the test script as well as for prestarted apps.
+# This function is called for apps managed by the test script as well as for pre-started apps.
# args: -
-__AUTHSIDECAR_statisics_setup() {
+__AUTHSIDECAR_statistics_setup() {
echo ""
}
@@ -106,4 +106,4 @@
#######################################################
-# This app is intended as a sidecard container - no specific test functions
\ No newline at end of file
+# This app is intended as a sidecar container - no specific test functions
\ No newline at end of file
diff --git a/test/common/cbs_api_functions.sh b/test/common/cbs_api_functions.sh
deleted file mode 100644
index f08b250..0000000
--- a/test/common/cbs_api_functions.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-# ============LICENSE_START===============================================
-# Copyright (C) 2021 Nordix Foundation. All rights reserved.
-# ========================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=================================================
-#
-
-# Functions for CBS is included in consul_api_functions.sh
-
-
-
diff --git a/test/common/chartmus_api_functions.sh b/test/common/chartmus_api_functions.sh
index 3cd8b33..814d8b1 100644
--- a/test/common/chartmus_api_functions.sh
+++ b/test/common/chartmus_api_functions.sh
@@ -26,7 +26,7 @@
# arg: <image-tag-suffix> (selects staging, snapshot, release etc)
# <image-tag-suffix> is present only for images with staging, snapshot,release tags
__CHARTMUS_imagesetup() {
- __check_and_create_image_var CHARTMUS "CHART_MUS_IMAGE" "CHART_MUS_IMAGE_BASE" "CHART_MUS_IMAGE_TAG" REMOTE_OTHER "$CHART_MUS_DISPLAY_NAME"
+ __check_and_create_image_var CHARTMUS "CHART_MUS_IMAGE" "CHART_MUS_IMAGE_BASE" "CHART_MUS_IMAGE_TAG" REMOTE_OTHER "$CHART_MUS_DISPLAY_NAME" ""
}
# Pull image from remote repo or use locally built image
@@ -63,12 +63,12 @@
}
# Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
-# This function is called for prestarted apps not managed by the test script.
+# This function is called for pre-started apps not managed by the test script.
__CHARTMUS_kube_scale_zero_and_wait() {
echo -e $RED" CHARTMUS app is not scaled in this state"$ERED
}
-# Delete all kube resouces for the app
+# Delete all kube resources for the app
# This function is called for apps managed by the test script.
__CHARTMUS_kube_delete_all() {
__kube_delete_all_resources $KUBE_SIM_NAMESPACE autotest CHARTMUS
@@ -76,7 +76,7 @@
# Store docker logs
# This function is called for apps managed by the test script.
-# args: <log-dir> <file-prexix>
+# args: <log-dir> <file-prefix>
__CHARTMUS_store_docker_logs() {
if [ $RUNMODE == "KUBE" ]; then
kubectl $KUBECONF logs -l "autotest=CHARTMUS" -n $KUBE_SIM_NAMESPACE --tail=-1 > $1$2_chartmuseum.log 2>&1
@@ -92,11 +92,11 @@
use_chart_mus_http
}
-# Set app short-name, app name and namespace for logging runtime statistics of kubernets pods or docker containers
+# Set app short-name, app name and namespace for logging runtime statistics of kubernetes pods or docker containers
# For docker, the namespace shall be excluded
-# This function is called for apps managed by the test script as well as for prestarted apps.
+# This function is called for apps managed by the test script as well as for pre-started apps.
# args: -
-__CHARTMUS_statisics_setup() {
+__CHARTMUS_statistics_setup() {
if [ $RUNMODE == "KUBE" ]; then
echo "CHARTMUS $CHART_MUS_APP_NAME $KUBE_SIM_NAMESPACE"
else
@@ -184,7 +184,7 @@
__check_included_image "CHARTMUS"
retcode_i=$?
- # Check if app shall only be used by the testscipt
+ # Check if app shall only be used by the test script
__check_prestarted_image "CHARTMUS"
retcode_p=$?
@@ -244,7 +244,7 @@
return 0
}
-# Excute a curl cmd towards the chartmuseum simulator and check the response code.
+# Execute a curl cmd towards the chartmuseum simulator and check the response code.
# args: TEST|CONF <expected-response-code> <curl-cmd-string>
__execute_curl_to_chartmuseum() {
TIMESTAMP=$(date "+%Y-%m-%d %H:%M:%S")
diff --git a/test/common/compare_json.py b/test/common/compare_json.py
index 44477d9..31a47c8 100644
--- a/test/common/compare_json.py
+++ b/test/common/compare_json.py
@@ -15,7 +15,7 @@
# ============LICENSE_END=================================================
#
-# This script compare two jsons for eqaulity, taken into account that the parameter values
+# This script compare two jsons for equality, taken into account that the parameter values
# marked with '????' are not checked (only the parameter name need to exist)
# Example of target json with '????'
# [
@@ -57,7 +57,7 @@
return True
-# Deep compare of two json obects
+# Deep compare of two json objects
# If a parameter value in the target json is set to '????' then the result json value is not checked for the that parameter
# Return true for equal json, false for not equal json
def compare_json_obj(obj1, obj2):
diff --git a/test/common/cp_api_functions.sh b/test/common/cp_api_functions.sh
index 9d32c37..8e720dd 100644
--- a/test/common/cp_api_functions.sh
+++ b/test/common/cp_api_functions.sh
@@ -26,7 +26,7 @@
# arg: <image-tag-suffix> (selects staging, snapshot, release etc)
# <image-tag-suffix> is present only for images with staging, snapshot,release tags
__CP_imagesetup() {
- __check_and_create_image_var CP "CONTROL_PANEL_IMAGE" "CONTROL_PANEL_IMAGE_BASE" "CONTROL_PANEL_IMAGE_TAG" $1 "$CONTROL_PANEL_DISPLAY_NAME"
+ __check_and_create_image_var CP "CONTROL_PANEL_IMAGE" "CONTROL_PANEL_IMAGE_BASE" "CONTROL_PANEL_IMAGE_TAG" $1 "$CONTROL_PANEL_DISPLAY_NAME" ""
}
# Pull image from remote repo or use locally built image
@@ -63,12 +63,12 @@
}
# Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
-# This function is called for prestarted apps not managed by the test script.
+# This function is called for pre-started apps not managed by the test script.
__CP_kube_scale_zero_and_wait() {
echo -e " CP replicas kept as is"
}
-# Delete all kube resouces for the app
+# Delete all kube resources for the app
# This function is called for apps managed by the test script.
__CP_kube_delete_all() {
__kube_delete_all_resources $KUBE_NONRTRIC_NAMESPACE autotest CP
@@ -76,7 +76,7 @@
# Store docker logs
# This function is called for apps managed by the test script.
-# args: <log-dir> <file-prexix>
+# args: <log-dir> <file-prefix>
__CP_store_docker_logs() {
if [ $RUNMODE == "KUBE" ]; then
kubectl $KUBECONF logs -l "autotest=CP" -n $KUBE_NONRTRIC_NAMESPACE --tail=-1 > $1$2_control-panel.log 2>&1
@@ -92,11 +92,11 @@
use_control_panel_http
}
-# Set app short-name, app name and namespace for logging runtime statistics of kubernets pods or docker containers
+# Set app short-name, app name and namespace for logging runtime statistics of kubernetes pods or docker containers
# For docker, the namespace shall be excluded
-# This function is called for apps managed by the test script as well as for prestarted apps.
+# This function is called for apps managed by the test script as well as for pre-started apps.
# args: -
-__CP_statisics_setup() {
+__CP_statistics_setup() {
if [ $RUNMODE == "KUBE" ]; then
echo "CP $CONTROL_PANEL_APP_NAME $KUBE_NONRTRIC_NAMESPACE"
else
@@ -200,7 +200,7 @@
__check_included_image "CP"
retcode_i=$?
- # Check if app shall only be used by the testscipt
+ # Check if app shall only be used by the test script
__check_prestarted_image "CP"
retcode_p=$?
diff --git a/test/common/cr_api_functions.sh b/test/common/cr_api_functions.sh
index a29d010..00d729c 100644
--- a/test/common/cr_api_functions.sh
+++ b/test/common/cr_api_functions.sh
@@ -17,7 +17,7 @@
# ============LICENSE_END=================================================
#
-# This is a script that contains container/service managemnt functions test functions for the Callback Reciver
+# This is a script that contains container/service management functions test functions for the Callback Receiver
################ Test engine functions ################
@@ -26,7 +26,7 @@
# arg: <image-tag-suffix> (selects staging, snapshot, release etc)
# <image-tag-suffix> is present only for images with staging, snapshot,release tags
__CR_imagesetup() {
- __check_and_create_image_var CR "CR_IMAGE" "CR_IMAGE_BASE" "CR_IMAGE_TAG" LOCAL "$CR_DISPLAY_NAME"
+ __check_and_create_image_var CR "CR_IMAGE" "CR_IMAGE_BASE" "CR_IMAGE_TAG" LOCAL "$CR_DISPLAY_NAME" $IMAGE_TARGET_PLATFORM_IMG_TAG
}
# Pull image from remote repo or use locally built image
@@ -44,7 +44,7 @@
__CR_imagebuild() {
cd ../cr
echo " Building CR - $CR_DISPLAY_NAME - image: $CR_IMAGE"
- docker build --build-arg NEXUS_PROXY_REPO=$NEXUS_PROXY_REPO -t $CR_IMAGE . &> .dockererr
+ docker build $IMAGE_TARGET_PLATFORM_CMD_PARAM --build-arg NEXUS_PROXY_REPO=$NEXUS_PROXY_REPO -t $CR_IMAGE . &> .dockererr
if [ $? -eq 0 ]; then
echo -e $GREEN" Build Ok"$EGREEN
__retag_and_push_image CR_IMAGE
@@ -78,12 +78,12 @@
}
# Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
-# This function is called for prestarted apps not managed by the test script.
+# This function is called for pre-started apps not managed by the test script.
__CR_kube_scale_zero_and_wait() {
echo -e $RED" CR app is not scaled in this state"$ERED
}
-# Delete all kube resouces for the app
+# Delete all kube resources for the app
# This function is called for apps managed by the test script.
__CR_kube_delete_all() {
__kube_delete_all_resources $KUBE_SIM_NAMESPACE autotest CR
@@ -91,7 +91,7 @@
# Store docker logs
# This function is called for apps managed by the test script.
-# args: <log-dir> <file-prexix>
+# args: <log-dir> <file-prefix>
__CR_store_docker_logs() {
if [ $RUNMODE == "KUBE" ]; then
for podname in $(kubectl $KUBECONF get pods -n $KUBE_SIM_NAMESPACE -l "autotest=CR" -o custom-columns=":metadata.name"); do
@@ -112,11 +112,11 @@
use_cr_http
}
-# Set app short-name, app name and namespace for logging runtime statistics of kubernets pods or docker containers
+# Set app short-name, app name and namespace for logging runtime statistics of kubernetes pods or docker containers
# For docker, the namespace shall be excluded
-# This function is called for apps managed by the test script as well as for prestarted apps.
+# This function is called for apps managed by the test script as well as for pre-started apps.
# args: -
-__CR_statisics_setup() {
+__CR_statistics_setup() {
for ((CR_INSTANCE=MAX_CR_APP_COUNT; CR_INSTANCE>0; CR_INSTANCE-- )); do
if [ $RUNMODE == "KUBE" ]; then
CR_INSTANCE_KUBE=$(($CR_INSTANCE-1))
@@ -214,7 +214,7 @@
export CR_APP_COUNT
}
-# Start the Callback reciver in the simulator group
+# Start the Callback receiver in the simulator group
# args: <app-count>
# (Function for test scripts)
start_cr() {
@@ -237,7 +237,7 @@
__check_included_image "CR"
retcode_i=$?
- # Check if app shall only be used by the testscipt
+ # Check if app shall only be used by the test script
__check_prestarted_image "CR"
retcode_p=$?
@@ -680,7 +680,7 @@
# CR API: Check the contents of all json events for path
# <response-code> <cr-path-id> <topic-url> (EMPTY | <json-msg>+ )
# (Function for test scripts)
-cr_api_check_all_genric_json_events() {
+cr_api_check_all_generic_json_events() {
__log_test_start $@
if [ $# -lt 4 ]; then
@@ -736,7 +736,7 @@
# CR API: Check a single (oldest) json event (or none if empty) for path
# <response-code> <cr-path-id> <topic-url> (EMPTY | <json-msg> )
# (Function for test scripts)
-cr_api_check_single_genric_json_event() {
+cr_api_check_single_generic_json_event() {
__log_test_start $@
if [ $# -ne 4 ]; then
@@ -783,7 +783,7 @@
# The MD5 will generate different hash if ws is present or not in otherwise equivalent json
# arg: <response-code> <cr-path-id> <topic-url> (EMPTY | <data-msg> )
# (Function for test scripts)
-cr_api_check_single_genric_event_md5() {
+cr_api_check_single_generic_event_md5() {
__log_test_start $@
if [ $# -ne 4 ]; then
@@ -846,7 +846,7 @@
# The MD5 will generate different hash if ws/newlines is present or not in otherwise equivalent json
# arg: <response-code> <cr-path-id> <topic-url> (EMPTY | <data-file> )
# (Function for test scripts)
-cr_api_check_single_genric_event_md5_file() {
+cr_api_check_single_generic_event_md5_file() {
__log_test_start $@
if [ $# -ne 4 ]; then
diff --git a/test/common/dmaapadp_api_functions.sh b/test/common/dmaapadp_api_functions.sh
index d7e8c0d..7f4046e 100644
--- a/test/common/dmaapadp_api_functions.sh
+++ b/test/common/dmaapadp_api_functions.sh
@@ -17,7 +17,7 @@
# ============LICENSE_END=================================================
#
-# This is a script that contains container/service managemnt functions test functions for the Dmaap Adatper
+# This is a script that contains container/service management functions test functions for the Dmaap Adapter
################ Test engine functions ################
@@ -26,7 +26,7 @@
# arg: <image-tag-suffix> (selects staging, snapshot, release etc)
# <image-tag-suffix> is present only for images with staging, snapshot,release tags
__DMAAPADP_imagesetup() {
- __check_and_create_image_var DMAAPADP "DMAAP_ADP_IMAGE" "DMAAP_ADP_IMAGE_BASE" "DMAAP_ADP_IMAGE_TAG" $1 "$DMAAP_ADP_DISPLAY_NAME"
+ __check_and_create_image_var DMAAPADP "DMAAP_ADP_IMAGE" "DMAAP_ADP_IMAGE_BASE" "DMAAP_ADP_IMAGE_TAG" $1 "$DMAAP_ADP_DISPLAY_NAME" ""
}
# Pull image from remote repo or use locally built image
@@ -63,12 +63,12 @@
}
# Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
-# This function is called for prestarted apps not managed by the test script.
+# This function is called for pre-started apps not managed by the test script.
__DMAAPADP_kube_scale_zero_and_wait() {
__kube_scale_and_wait_all_resources $KUBE_NONRTRIC_NAMESPACE app "$KUBE_NONRTRIC_NAMESPACE"-dmaapadapterservice
}
-# Delete all kube resouces for the app
+# Delete all kube resources for the app
# This function is called for apps managed by the test script.
__DMAAPADP_kube_delete_all() {
__kube_delete_all_resources $KUBE_NONRTRIC_NAMESPACE autotest DMAAPADP
@@ -76,7 +76,7 @@
# Store docker logs
# This function is called for apps managed by the test script.
-# args: <log-dir> <file-prexix>
+# args: <log-dir> <file-prefix>
__DMAAPADP_store_docker_logs() {
if [ $RUNMODE == "KUBE" ]; then
kubectl $KUBECONF logs -l "autotest=DMAAPADP" -n $KUBE_NONRTRIC_NAMESPACE --tail=-1 > $1$2_dmaapadapter.log 2>&1
@@ -92,11 +92,11 @@
use_dmaapadp_http
}
-# Set app short-name, app name and namespace for logging runtime statistics of kubernets pods or docker containers
+# Set app short-name, app name and namespace for logging runtime statistics of kubernetes pods or docker containers
# For docker, the namespace shall be excluded
-# This function is called for apps managed by the test script as well as for prestarted apps.
+# This function is called for apps managed by the test script as well as for pre-started apps.
# args: -
-__DMAAPADP_statisics_setup() {
+__DMAAPADP_statistics_setup() {
if [ $RUNMODE == "KUBE" ]; then
echo "DMAAPADP $DMAAP_ADP_APP_NAME $KUBE_NONRTRIC_NAMESPACE"
else
@@ -210,7 +210,7 @@
__check_included_image "DMAAPADP"
retcode_i=$?
- # Check if app shall only be used by the testscipt
+ # Check if app shall only be used by the test script
__check_prestarted_image "DMAAPADP"
retcode_p=$?
diff --git a/test/common/dmaapmed_api_functions.sh b/test/common/dmaapmed_api_functions.sh
index c9c9c15..4c34ad6 100644
--- a/test/common/dmaapmed_api_functions.sh
+++ b/test/common/dmaapmed_api_functions.sh
@@ -17,7 +17,7 @@
# ============LICENSE_END=================================================
#
-# This is a script that contains container/service managemnt functions test functions for the Dmaap Adatper
+# This is a script that contains container/service management functions test functions for the Dmaap Mediator
################ Test engine functions ################
@@ -26,7 +26,7 @@
# arg: <image-tag-suffix> (selects staging, snapshot, release etc)
# <image-tag-suffix> is present only for images with staging, snapshot,release tags
__DMAAPMED_imagesetup() {
- __check_and_create_image_var DMAAPMED "DMAAP_MED_IMAGE" "DMAAP_MED_IMAGE_BASE" "DMAAP_MED_IMAGE_TAG" $1 "$DMAAP_MED_DISPLAY_NAME"
+ __check_and_create_image_var DMAAPMED "DMAAP_MED_IMAGE" "DMAAP_MED_IMAGE_BASE" "DMAAP_MED_IMAGE_TAG" $1 "$DMAAP_MED_DISPLAY_NAME" ""
}
# Pull image from remote repo or use locally built image
@@ -63,12 +63,12 @@
}
# Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
-# This function is called for prestarted apps not managed by the test script.
+# This function is called for pre-started apps not managed by the test script.
__DMAAPMED_kube_scale_zero_and_wait() {
__kube_scale_and_wait_all_resources $KUBE_NONRTRIC_NAMESPACE app "$KUBE_NONRTRIC_NAMESPACE"-dmaapmediatorservice
}
-# Delete all kube resouces for the app
+# Delete all kube resources for the app
# This function is called for apps managed by the test script.
__DMAAPMED_kube_delete_all() {
__kube_delete_all_resources $KUBE_NONRTRIC_NAMESPACE autotest DMAAPMED
@@ -76,7 +76,7 @@
# Store docker logs
# This function is called for apps managed by the test script.
-# args: <log-dir> <file-prexix>
+# args: <log-dir> <file-prefix>
__DMAAPMED_store_docker_logs() {
if [ $RUNMODE == "KUBE" ]; then
kubectl $KUBECONF logs -l "autotest=DMAAPMED" -n $KUBE_NONRTRIC_NAMESPACE --tail=-1 > $1$2_dmaapmediator.log 2>&1
@@ -92,11 +92,11 @@
use_dmaapmed_http
}
-# Set app short-name, app name and namespace for logging runtime statistics of kubernets pods or docker containers
+# Set app short-name, app name and namespace for logging runtime statistics of kubernetes pods or docker containers
# For docker, the namespace shall be excluded
-# This function is called for apps managed by the test script as well as for prestarted apps.
+# This function is called for apps managed by the test script as well as for pre-started apps.
# args: -
-__DMAAPMED_statisics_setup() {
+__DMAAPMED_statistics_setup() {
if [ $RUNMODE == "KUBE" ]; then
echo "DMAAPMED $DMAAP_MED_APP_NAME $KUBE_NONRTRIC_NAMESPACE"
else
@@ -205,7 +205,7 @@
__check_included_image "DMAAPMED"
retcode_i=$?
- # Check if app shall only be used by the testscipt
+ # Check if app shall only be used by the test script
__check_prestarted_image "DMAAPMED"
retcode_p=$?
diff --git a/test/common/format_endpoint_stats.sh b/test/common/format_endpoint_stats.sh
index 9edd01a..80809fe 100755
--- a/test/common/format_endpoint_stats.sh
+++ b/test/common/format_endpoint_stats.sh
@@ -17,7 +17,7 @@
# ============LICENSE_END=================================================
#
-# This script format http endpoint stats generated by testscripts
+# This script format http endpoint stats generated by test scripts
print_usage() {
echo "Usage: format_endpoint_stats <log-base-dir> <app-id> <app-description> [tc-id]+ "
diff --git a/test/common/helmmanager_api_functions.sh b/test/common/helmmanager_api_functions.sh
index 42d2bca..80239f9 100644
--- a/test/common/helmmanager_api_functions.sh
+++ b/test/common/helmmanager_api_functions.sh
@@ -17,7 +17,7 @@
# ============LICENSE_END=================================================
#
-# This is a script that contains container/service managemnt functions test functions for Helm Manager
+# This is a script that contains container/service management functions test functions for Helm Manager
################ Test engine functions ################
@@ -25,7 +25,7 @@
# arg: [<image-tag-suffix>] (selects staging, snapshot, release etc)
# <image-tag-suffix> is present only for images with staging, snapshot,release tags
__HELMMANAGER_imagesetup() {
- __check_and_create_image_var HELMMANAGER "HELM_MANAGER_IMAGE" "HELM_MANAGER_IMAGE_BASE" "HELM_MANAGER_IMAGE_TAG" $1 "$HELM_MANAGER_DISPLAY_NAME"
+ __check_and_create_image_var HELMMANAGER "HELM_MANAGER_IMAGE" "HELM_MANAGER_IMAGE_BASE" "HELM_MANAGER_IMAGE_TAG" $1 "$HELM_MANAGER_DISPLAY_NAME" ""
}
# Pull image from remote repo or use locally built image
@@ -55,12 +55,12 @@
}
# Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
-# This function is called for prestarted apps not managed by the test script.
+# This function is called for pre-started apps not managed by the test script.
__HELMMANAGER_kube_scale_zero_and_wait() {
__kube_scale_and_wait_all_resources $KUBE_NONRTRIC_NAMESPACE app "$KUBE_NONRTRIC_NAMESPACE"-"$HELM_MANAGER_APP_NAME"
}
-# Delete all kube resouces for the app
+# Delete all kube resources for the app
# This function is called for apps managed by the test script.
__HELMMANAGER_kube_delete_all() {
__kube_delete_all_resources $KUBE_NONRTRIC_NAMESPACE autotest HELMMANAGER
@@ -68,7 +68,7 @@
# Store docker logs
# This function is called for apps managed by the test script.
-# args: <log-dir> <file-prexix>
+# args: <log-dir> <file-prefix>
__HELMMANAGER_store_docker_logs() {
if [ $RUNMODE == "KUBE" ]; then
kubectl $KUBECONF logs -l "autotest=HELMMANAGER" -n $KUBE_NONRTRIC_NAMESPACE --tail=-1 > $1$2_helmmanager.log 2>&1
@@ -84,11 +84,11 @@
use_helm_manager_http
}
-# Set app short-name, app name and namespace for logging runtime statistics of kubernets pods or docker containers
+# Set app short-name, app name and namespace for logging runtime statistics of kubernetes pods or docker containers
# For docker, the namespace shall be excluded
-# This function is called for apps managed by the test script as well as for prestarted apps.
+# This function is called for apps managed by the test script as well as for pre-started apps.
# args: -
-__HELMMANAGER_statisics_setup() {
+__HELMMANAGER_statistics_setup() {
if [ $RUNMODE == "KUBE" ]; then
echo "HELMMANAGER $HELM_MANAGER_APP_NAME $KUBE_NONRTRIC_NAMESPACE"
else
@@ -178,7 +178,7 @@
__check_included_image "HELMMANAGER"
retcode_i=$?
- # Check if app shall only be used by the testscipt
+ # Check if app shall only be used by the test script
__check_prestarted_image "HELMMANAGER"
retcode_p=$?
@@ -243,7 +243,7 @@
echo ""
}
-# Excute a curl cmd towards the helm manager.
+# Execute a curl cmd towards the helm manager.
# args: GET <path>
# args: POST <path> <file-to-post>
# args: POST3 <path> <name> <file-to-post> <name> <file-to-post> <name> <file-to-post>
diff --git a/test/common/httpproxy_api_functions.sh b/test/common/httpproxy_api_functions.sh
index ce7fcad..2ff505f 100644
--- a/test/common/httpproxy_api_functions.sh
+++ b/test/common/httpproxy_api_functions.sh
@@ -17,7 +17,7 @@
# ============LICENSE_END=================================================
#
-# This is a script that contains container/service managemnt functions for Http Proxy
+# This is a script that contains container/service management functions for Http Proxy
################ Test engine functions ################
@@ -25,7 +25,7 @@
# arg: <image-tag-suffix> (selects staging, snapshot, release etc)
# <image-tag-suffix> is present only for images with staging, snapshot,release tags
__HTTPPROXY_imagesetup() {
- __check_and_create_image_var HTTPPROXY "HTTP_PROXY_IMAGE" "HTTP_PROXY_IMAGE_BASE" "HTTP_PROXY_IMAGE_TAG" LOCAL "$HTTP_PROXY_DISPLAY_NAME"
+ __check_and_create_image_var HTTPPROXY "HTTP_PROXY_IMAGE" "HTTP_PROXY_IMAGE_BASE" "HTTP_PROXY_IMAGE_TAG" LOCAL "$HTTP_PROXY_DISPLAY_NAME" $IMAGE_TARGET_PLATFORM_IMG_TAG
}
# Pull image from remote repo or use locally built image
@@ -43,7 +43,7 @@
__HTTPPROXY_imagebuild() {
cd ../$HTTP_PROXY_BUILD_DIR # Note: Reusing same impl as for kube proxy
echo " Building HTTPPROXY - $HTTP_PROXY_DISPLAY_NAME - image: $HTTP_PROXY_IMAGE"
- docker build --build-arg NEXUS_PROXY_REPO=$NEXUS_PROXY_REPO -t $HTTP_PROXY_IMAGE . &> .dockererr
+ docker build $IMAGE_TARGET_PLATFORM_CMD_PARAM --build-arg NEXUS_PROXY_REPO=$NEXUS_PROXY_REPO -t $HTTP_PROXY_IMAGE . &> .dockererr
if [ $? -eq 0 ]; then
echo -e $GREEN" Build Ok"$EGREEN
__retag_and_push_image HTTP_PROXY_IMAGE
@@ -77,12 +77,12 @@
}
# Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
-# This function is called for prestarted apps not managed by the test script.
+# This function is called for pre-started apps not managed by the test script.
__HTTPPROXY_kube_scale_zero_and_wait() {
echo -e $RED" HTTPPROXY app is not scaled in this state"$ERED
}
-# Delete all kube resouces for the app
+# Delete all kube resources for the app
# This function is called for apps managed by the test script.
__HTTPPROXY_kube_delete_all() {
__kube_delete_all_resources $KUBE_SIM_NAMESPACE autotest HTTPPROXY
@@ -90,7 +90,7 @@
# Store docker logs
# This function is called for apps managed by the test script.
-# args: <log-dir> <file-prexix>
+# args: <log-dir> <file-prefix>
__HTTPPROXY_store_docker_logs() {
if [ $RUNMODE == "KUBE" ]; then
kubectl $KUBECONF logs -l "autotest=HTTPPROXY" -n $KUBE_SIM_NAMESPACE --tail=-1 > $1$2_httpproxy.log 2>&1
@@ -106,11 +106,11 @@
use_http_proxy_http
}
-# Set app short-name, app name and namespace for logging runtime statistics of kubernets pods or docker containers
+# Set app short-name, app name and namespace for logging runtime statistics of kubernetes pods or docker containers
# For docker, the namespace shall be excluded
-# This function is called for apps managed by the test script as well as for prestarted apps.
+# This function is called for apps managed by the test script as well as for pre-started apps.
# args: -
-__HTTPPROXY_statisics_setup() {
+__HTTPPROXY_statistics_setup() {
if [ $RUNMODE == "KUBE" ]; then
echo "HTTPPROXY $HTTP_PROXY_APP_NAME $KUBE_SIM_NAMESPACE"
else
@@ -198,7 +198,7 @@
__check_included_image "HTTPPROXY"
retcode_i=$?
- # Check if app shall only be used by the testscipt
+ # Check if app shall only be used by the test script
__check_prestarted_image "HTTPPROXY"
retcode_p=$?
diff --git a/test/common/ics_api_functions.sh b/test/common/ics_api_functions.sh
index 3676fdc..9a80bcc 100644
--- a/test/common/ics_api_functions.sh
+++ b/test/common/ics_api_functions.sh
@@ -25,7 +25,7 @@
# arg: <image-tag-suffix> (selects staging, snapshot, release etc)
# <image-tag-suffix> is present only for images with staging, snapshot,release tags
__ICS_imagesetup() {
- __check_and_create_image_var ICS "ICS_IMAGE" "ICS_IMAGE_BASE" "ICS_IMAGE_TAG" $1 "$ICS_DISPLAY_NAME"
+ __check_and_create_image_var ICS "ICS_IMAGE" "ICS_IMAGE_BASE" "ICS_IMAGE_TAG" $1 "$ICS_DISPLAY_NAME" ""
}
# Pull image from remote repo or use locally built image
@@ -62,12 +62,12 @@
}
# Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
-# This function is called for prestarted apps not managed by the test script.
+# This function is called for pre-started apps not managed by the test script.
__ICS_kube_scale_zero_and_wait() {
__kube_scale_and_wait_all_resources $KUBE_NONRTRIC_NAMESPACE app "$KUBE_NONRTRIC_NAMESPACE"-informationservice
}
-# Delete all kube resouces for the app
+# Delete all kube resources for the app
# This function is called for apps managed by the test script.
__ICS_kube_delete_all() {
__kube_delete_all_resources $KUBE_NONRTRIC_NAMESPACE autotest ICS
@@ -75,7 +75,7 @@
# Store docker logs
# This function is called for apps managed by the test script.
-# args: <log-dir> <file-prexix>
+# args: <log-dir> <file-prefix>
__ICS_store_docker_logs() {
if [ $RUNMODE == "KUBE" ]; then
kubectl $KUBECONF logs -l "autotest=ICS" -n $KUBE_NONRTRIC_NAMESPACE --tail=-1 > $1$2_ics.log 2>&1
@@ -92,11 +92,11 @@
export ICS_SIDECAR_JWT_FILE=""
}
-# Set app short-name, app name and namespace for logging runtime statistics of kubernets pods or docker containers
+# Set app short-name, app name and namespace for logging runtime statistics of kubernetes pods or docker containers
# For docker, the namespace shall be excluded
-# This function is called for apps managed by the test script as well as for prestarted apps.
+# This function is called for apps managed by the test script as well as for pre-started apps.
# args: -
-__ICS_statisics_setup() {
+__ICS_statistics_setup() {
if [ $RUNMODE == "KUBE" ]; then
echo "ICS $ICS_APP_NAME $KUBE_NONRTRIC_NAMESPACE"
else
@@ -224,7 +224,7 @@
__check_included_image "ICS"
retcode_i=$?
- # Check if app shall only be used by the testscipt
+ # Check if app shall only be used by the test script
__check_prestarted_image "ICS"
retcode_p=$?
diff --git a/test/common/istio_api_functions.sh b/test/common/istio_api_functions.sh
index dbbc6a5..e0fee9b 100644
--- a/test/common/istio_api_functions.sh
+++ b/test/common/istio_api_functions.sh
@@ -17,7 +17,7 @@
# ============LICENSE_END=================================================
#
-# This is a script that contains function to handle helm on localhost
+# This is a script that contain functions to handle istio configuration
################ Test engine functions ################
@@ -60,12 +60,12 @@
}
# Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
-# This function is called for prestarted apps not managed by the test script.
+# This function is called for pre-started apps not managed by the test script.
__ISTIO_kube_scale_zero_and_wait() {
:
}
-# Delete all kube resouces for the app
+# Delete all kube resources for the app
# This function is called for apps managed by the test script.
__ISTIO_kube_delete_all() {
__kube_delete_all_resources $KUBE_NONRTRIC_NAMESPACE autotest ISTIO
@@ -78,7 +78,7 @@
# Store docker logs
# This function is called for apps managed by the test script.
-# args: <log-dir> <file-prexix>
+# args: <log-dir> <file-prefix>
__ISTIO_store_docker_logs() {
:
}
@@ -92,11 +92,11 @@
KUBE_PROXY_ISTIO_JWKS_KEYS=$ISTIO_GENERIC_JWKS_KEY
}
-# Set app short-name, app name and namespace for logging runtime statistics of kubernets pods or docker containers
+# Set app short-name, app name and namespace for logging runtime statistics of kubernetes pods or docker containers
# For docker, the namespace shall be excluded
-# This function is called for apps managed by the test script as well as for prestarted apps.
+# This function is called for apps managed by the test script as well as for pre-started apps.
# args: -
-__ISTIO_statisics_setup() {
+__ISTIO_statistics_setup() {
:
}
@@ -194,11 +194,11 @@
}
# Authorization policy - by realm
-# args: <app> <namespace> <realam> [<client-id> <client-role>]
+# args: <app> <namespace> <realm> [<client-id> <client-role>]
istio_auth_policy_by_realm() {
__log_conf_start $@
if [ $# -ne 3 ] && [ $# -ne 5 ]; then
- __print_err "<app> <namespace> <realam> [<client-id> <client-role>]" $@
+ __print_err "<app> <namespace> <realm> [<client-id> <client-role>]" $@
return 1
fi
name="ap-realm-"$3"-"$1"-"$2
diff --git a/test/common/kafkapc_api_functions.sh b/test/common/kafkapc_api_functions.sh
index fee52ae..61d45ba 100644
--- a/test/common/kafkapc_api_functions.sh
+++ b/test/common/kafkapc_api_functions.sh
@@ -17,7 +17,7 @@
# ============LICENSE_END=================================================
#
-# This is a script that contains container/service managemnt functions for Kafka producer/consumer
+# This is a script that contains container/service management functions for Kafka producer/consumer
################ Test engine functions ################
@@ -25,7 +25,7 @@
# arg: <image-tag-suffix> (selects staging, snapshot, release etc)
# <image-tag-suffix> is present only for images with staging, snapshot,release tags
__KAFKAPC_imagesetup() {
- __check_and_create_image_var KAFKAPC "KAFKAPC_IMAGE" "KAFKAPC_IMAGE_BASE" "KAFKAPC_IMAGE_TAG" LOCAL "$KAFKAPC_DISPLAY_NAME"
+ __check_and_create_image_var KAFKAPC "KAFKAPC_IMAGE" "KAFKAPC_IMAGE_BASE" "KAFKAPC_IMAGE_TAG" LOCAL "$KAFKAPC_DISPLAY_NAME" $IMAGE_TARGET_PLATFORM_IMG_TAG
}
# Pull image from remote repo or use locally built image
@@ -44,7 +44,7 @@
cd ../$KAFKAPC_BUILD_DIR
echo " Building KAFKAPC - $KAFKAPC_DISPLAY_NAME - image: $KAFKAPC_IMAGE"
- docker build --build-arg NEXUS_PROXY_REPO=$NEXUS_PROXY_REPO -t $KAFKAPC_IMAGE . &> .dockererr
+ docker build $IMAGE_TARGET_PLATFORM_CMD_PARAM --build-arg NEXUS_PROXY_REPO=$NEXUS_PROXY_REPO -t $KAFKAPC_IMAGE . &> .dockererr
if [ $? -eq 0 ]; then
echo -e $GREEN" Build Ok"$EGREEN
__retag_and_push_image KAFKAPC_IMAGE
@@ -78,12 +78,12 @@
}
# Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
-# This function is called for prestarted apps not managed by the test script.
+# This function is called for pre-started apps not managed by the test script.
__KAFKAPC_kube_scale_zero_and_wait() {
echo -e $RED" KAFKAPC app is not scaled in this state"$ERED
}
-# Delete all kube resouces for the app
+# Delete all kube resources for the app
# This function is called for apps managed by the test script.
__KAFKAPC_kube_delete_all() {
__kube_delete_all_resources $KUBE_SIM_NAMESPACE autotest KAFKAPC
@@ -91,7 +91,7 @@
# Store docker logs
# This function is called for apps managed by the test script.
-# args: <log-dir> <file-prexix>
+# args: <log-dir> <file-prefix>
__KAFKAPC_store_docker_logs() {
if [ $RUNMODE == "KUBE" ]; then
kubectl $KUBECONF logs -l "autotest=KAFKAPC" -n $KUBE_SIM_NAMESPACE --tail=-1 > $1$2_kafkapc.log 2>&1
@@ -107,11 +107,11 @@
use_kafkapc_http
}
-# Set app short-name, app name and namespace for logging runtime statistics of kubernets pods or docker containers
+# Set app short-name, app name and namespace for logging runtime statistics of kubernetes pods or docker containers
# For docker, the namespace shall be excluded
-# This function is called for apps managed by the test script as well as for prestarted apps.
+# This function is called for apps managed by the test script as well as for pre-started apps.
# args: -
-__KAFKAPC_statisics_setup() {
+__KAFKAPC_statistics_setup() {
if [ $RUNMODE == "KUBE" ]; then
echo "KAFKAPC $KAFKAPC_APP_NAME $KUBE_SIM_NAMESPACE"
else
@@ -200,7 +200,7 @@
__check_included_image "KAFKAPC"
retcode_i=$?
- # Check if app shall only be used by the testscipt
+ # Check if app shall only be used by the test script
__check_prestarted_image "KAFKAPC"
retcode_p=$?
diff --git a/test/common/keycloak_api_functions.sh b/test/common/keycloak_api_functions.sh
index 7f49595..858c3ec 100644
--- a/test/common/keycloak_api_functions.sh
+++ b/test/common/keycloak_api_functions.sh
@@ -26,7 +26,7 @@
# arg: <image-tag-suffix> (selects staging, snapshot, release etc)
# <image-tag-suffix> is present only for images with staging, snapshot,release tags
__KEYCLOAK_imagesetup() {
- __check_and_create_image_var KEYCLOAK "KEYCLOAK_IMAGE" "KEYCLOAK_IMAGE_BASE" "KEYCLOAK_IMAGE_TAG" REMOTE_OTHER "$KEYCLOAK_DISPLAY_NAME"
+ __check_and_create_image_var KEYCLOAK "KEYCLOAK_IMAGE" "KEYCLOAK_IMAGE_BASE" "KEYCLOAK_IMAGE_TAG" REMOTE_OTHER "$KEYCLOAK_DISPLAY_NAME" ""
}
# Pull image from remote repo or use locally built image
@@ -63,12 +63,12 @@
}
# Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
-# This function is called for prestarted apps not managed by the test script.
+# This function is called for pre-started apps not managed by the test script.
__KEYCLOAK_kube_scale_zero_and_wait() {
echo -e $RED" KEYCLOAK app is not scaled in this state"$ERED
}
-# Delete all kube resouces for the app
+# Delete all kube resources for the app
# This function is called for apps managed by the test script.
__KEYCLOAK_kube_delete_all() {
__kube_delete_all_resources $KUBE_KEYCLOAK_NAMESPACE autotest KEYCLOAK
@@ -76,7 +76,7 @@
# Store docker logs
# This function is called for apps managed by the test script.
-# args: <log-dir> <file-prexix>
+# args: <log-dir> <file-prefix>
__KEYCLOAK_store_docker_logs() {
if [ $RUNMODE == "KUBE" ]; then
kubectl $KUBECONF logs -l "autotest=KEYCLOAK" -n $KUBE_KEYCLOAK_NAMESPACE --tail=-1 > $1$2_keycloak.log 2>&1
@@ -92,11 +92,11 @@
use_keycloak_http
}
-# Set app short-name, app name and namespace for logging runtime statistics of kubernets pods or docker containers
+# Set app short-name, app name and namespace for logging runtime statistics of kubernetes pods or docker containers
# For docker, the namespace shall be excluded
-# This function is called for apps managed by the test script as well as for prestarted apps.
+# This function is called for apps managed by the test script as well as for pre-started apps.
# args: -
-__KEYCLOAK_statisics_setup() {
+__KEYCLOAK_statistics_setup() {
if [ $RUNMODE == "KUBE" ]; then
echo "KEYCLOAK $KEYCLOAK_APP_NAME $KUBE_KEYCLOAK_NAMESPACE"
else
@@ -191,7 +191,7 @@
__check_included_image "KEYCLOAK"
retcode_i=$?
- # Check if app shall only be used by the testscipt
+ # Check if app shall only be used by the test script
__check_prestarted_image "KEYCLOAK"
retcode_p=$?
@@ -247,7 +247,7 @@
return 0
}
-# Excute a curl cmd towards the keycloak and check the response code is 2XX.
+# Execute a curl cmd towards the keycloak and check the response code is 2XX.
# args: <curl-cmd-string>
# resp: <returned-payload> if return code is 0 otherwise <error-info>
__execute_curl_to_keycloak() {
@@ -280,7 +280,7 @@
return 0
}
-# Excute a curl cmd towards the keycloak and check the response code is 2XX.
+# Execute a curl cmd towards the keycloak and check the response code is 2XX.
# args: <operation> <url> <token> <json>
# resp: <returned-payload> if return code is 0 otherwise <error-info>
__execute_curl_to_keycloak2() {
@@ -561,18 +561,6 @@
return 1
fi
-
-
-
- # while [ $# -gt 0 ]; do
- # __json='{"name":"'$1'"}'
- # res=$(__execute_curl_to_keycloak2 POST "$KEYCLOAK_SERVICE_PATH$KEYCLOAK_REALM_URL_PREFIX/$__realm/clients/$__c_id/roles" "$__KEYCLOAK_ADMIN_TOKEN" "$__json")
- # if [ $? -ne 0 ]; then
- # __log_conf_fail_general " Fatal error when adding client role, response: "$?
- # return 1
- # fi
- # shift
- # done
__log_conf_ok
return 0
}
diff --git a/test/common/kubeproxy_api_functions.sh b/test/common/kubeproxy_api_functions.sh
index c66e63c..2b1caa1 100644
--- a/test/common/kubeproxy_api_functions.sh
+++ b/test/common/kubeproxy_api_functions.sh
@@ -17,8 +17,8 @@
# ============LICENSE_END=================================================
#
-# This is a script that contains container/service managemnt functions for Kube Http Proxy
-# This http proxy is to provide full access for the test script to all adressable kube object in a clister
+# This is a script that contains container/service management functions for Kube Http Proxy
+# This http proxy is to provide full access for the test script to all addressable kube object in a cluster
################ Test engine functions ################
@@ -26,7 +26,7 @@
# arg: <image-tag-suffix> (selects staging, snapshot, release etc)
# <image-tag-suffix> is present only for images with staging, snapshot,release tags
__KUBEPROXY_imagesetup() {
- __check_and_create_image_var KUBEPROXY "KUBE_PROXY_IMAGE" "KUBE_PROXY_IMAGE_BASE" "KUBE_PROXY_IMAGE_TAG" LOCAL "$KUBE_PROXY_DISPLAY_NAME"
+ __check_and_create_image_var KUBEPROXY "KUBE_PROXY_IMAGE" "KUBE_PROXY_IMAGE_BASE" "KUBE_PROXY_IMAGE_TAG" LOCAL "$KUBE_PROXY_DISPLAY_NAME" $IMAGE_TARGET_PLATFORM_IMG_TAG
}
# Pull image from remote repo or use locally built image
@@ -44,7 +44,7 @@
__KUBEPROXY_imagebuild() {
cd ../http-https-proxy
echo " Building KUBEPROXY - $KUBE_PROXY_DISPLAY_NAME - image: $KUBE_PROXY_IMAGE"
- docker build --build-arg NEXUS_PROXY_REPO=$NEXUS_PROXY_REPO -t $KUBE_PROXY_IMAGE . &> .dockererr
+ docker build $IMAGE_TARGET_PLATFORM_CMD_PARAM --build-arg NEXUS_PROXY_REPO=$NEXUS_PROXY_REPO -t $KUBE_PROXY_IMAGE . &> .dockererr
if [ $? -eq 0 ]; then
echo -e $GREEN" Build Ok"$EGREEN
__retag_and_push_image KUBE_PROXY_IMAGE
@@ -78,12 +78,12 @@
}
# Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
-# This function is called for prestarted apps not managed by the test script.
+# This function is called for pre-started apps not managed by the test script.
__KUBEPROXY_kube_scale_zero_and_wait() {
echo -e $RED" KUBEPROXY app is not scaled in this state"$ERED
}
-# Delete all kube resouces for the app
+# Delete all kube resources for the app
# This function is called for apps managed by the test script.
__KUBEPROXY_kube_delete_all() {
__kube_delete_all_resources $KUBE_SIM_NAMESPACE autotest KUBEPROXY
@@ -91,7 +91,7 @@
# Store docker logs
# This function is called for apps managed by the test script.
-# args: <log-dir> <file-prexix>
+# args: <log-dir> <file-prefix>
__KUBEPROXY_store_docker_logs() {
if [ $RUNMODE == "KUBE" ]; then
kubectl $KUBECONF logs -l "autotest=KUBEPROXY" -n $KUBE_SIM_NAMESPACE --tail=-1 > $1$2_kubeproxy.log 2>&1
@@ -107,11 +107,11 @@
use_kube_proxy_http
}
-# Set app short-name, app name and namespace for logging runtime statistics of kubernets pods or docker containers
+# Set app short-name, app name and namespace for logging runtime statistics of kubernetes pods or docker containers
# For docker, the namespace shall be excluded
-# This function is called for apps managed by the test script as well as for prestarted apps.
+# This function is called for apps managed by the test script as well as for pre-started apps.
# args: -
-__KUBEPROXY_statisics_setup() {
+__KUBEPROXY_statistics_setup() {
if [ $RUNMODE == "KUBE" ]; then
echo "KUBEPROXXY $KUBE_PROXY_APP_NAME $KUBE_SIM_NAMESPACE"
else
@@ -202,7 +202,7 @@
__check_included_image "KUBEPROXY"
retcode_i=$?
- # Check if app shall only be used by the testscipt
+ # Check if app shall only be used by the test script
__check_prestarted_image "KUBEPROXY"
retcode_p=$?
diff --git a/test/common/localhelm_api_functions.sh b/test/common/localhelm_api_functions.sh
index c7a6d3d..78c6767 100644
--- a/test/common/localhelm_api_functions.sh
+++ b/test/common/localhelm_api_functions.sh
@@ -60,12 +60,12 @@
}
# Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
-# This function is called for prestarted apps not managed by the test script.
+# This function is called for pre-started apps not managed by the test script.
__LOCALHELM_kube_scale_zero_and_wait() {
:
}
-# Delete all kube resouces for the app
+# Delete all kube resources for the app
# This function is called for apps managed by the test script.
__LOCALHELM_kube_delete_all() {
:
@@ -73,7 +73,7 @@
# Store docker logs
# This function is called for apps managed by the test script.
-# args: <log-dir> <file-prexix>
+# args: <log-dir> <file-prefix>
__LOCALHELM_store_docker_logs() {
:
}
@@ -85,11 +85,11 @@
:
}
-# Set app short-name, app name and namespace for logging runtime statistics of kubernets pods or docker containers
+# Set app short-name, app name and namespace for logging runtime statistics of kubernetes pods or docker containers
# For docker, the namespace shall be excluded
-# This function is called for apps managed by the test script as well as for prestarted apps.
+# This function is called for apps managed by the test script as well as for pre-started apps.
# args: -
-__LOCALHELM_statisics_setup() {
+__LOCALHELM_statistics_setup() {
:
}
diff --git a/test/common/mr_api_functions.sh b/test/common/mr_api_functions.sh
index 977c3da..7bd7118 100755
--- a/test/common/mr_api_functions.sh
+++ b/test/common/mr_api_functions.sh
@@ -26,16 +26,16 @@
# arg: <image-tag-suffix> (selects staging, snapshot, release etc)
# <image-tag-suffix> is present only for images with staging, snapshot,release tags
__MR_imagesetup() {
- __check_and_create_image_var MR "MRSTUB_IMAGE" "MRSTUB_IMAGE_BASE" "MRSTUB_IMAGE_TAG" LOCAL "$MR_STUB_DISPLAY_NAME"
+ __check_and_create_image_var MR "MRSTUB_IMAGE" "MRSTUB_IMAGE_BASE" "MRSTUB_IMAGE_TAG" LOCAL "$MR_STUB_DISPLAY_NAME" $IMAGE_TARGET_PLATFORM_IMG_TAG
}
# Create the image var used during the test
# arg: <image-tag-suffix> (selects staging, snapshot, release etc)
# <image-tag-suffix> is present only for images with staging, snapshot,release tags
__DMAAPMR_imagesetup() {
- __check_and_create_image_var DMAAPMR "ONAP_DMAAPMR_IMAGE" "ONAP_DMAAPMR_IMAGE_BASE" "ONAP_DMAAPMR_IMAGE_TAG" REMOTE_RELEASE_ONAP "DMAAP Message Router"
- __check_and_create_image_var DMAAPMR "ONAP_ZOOKEEPER_IMAGE" "ONAP_ZOOKEEPER_IMAGE_BASE" "ONAP_ZOOKEEPER_IMAGE_TAG" REMOTE_RELEASE_ONAP "ZooKeeper"
- __check_and_create_image_var DMAAPMR "ONAP_KAFKA_IMAGE" "ONAP_KAFKA_IMAGE_BASE" "ONAP_KAFKA_IMAGE_TAG" REMOTE_RELEASE_ONAP "Kafka"
+ __check_and_create_image_var DMAAPMR "ONAP_DMAAPMR_IMAGE" "ONAP_DMAAPMR_IMAGE_BASE" "ONAP_DMAAPMR_IMAGE_TAG" REMOTE_RELEASE_ONAP "DMAAP Message Router" ""
+ __check_and_create_image_var DMAAPMR "ONAP_ZOOKEEPER_IMAGE" "ONAP_ZOOKEEPER_IMAGE_BASE" "ONAP_ZOOKEEPER_IMAGE_TAG" REMOTE_RELEASE_ONAP "ZooKeeper" ""
+ __check_and_create_image_var DMAAPMR "ONAP_KAFKA_IMAGE" "ONAP_KAFKA_IMAGE_BASE" "ONAP_KAFKA_IMAGE_TAG" REMOTE_RELEASE_ONAP "Kafka" ""
}
# Pull image from remote repo or use locally built image
@@ -64,7 +64,7 @@
__MR_imagebuild() {
cd ../mrstub
echo " Building MR - $MR_STUB_DISPLAY_NAME - image: $MRSTUB_IMAGE"
- docker build --build-arg NEXUS_PROXY_REPO=$NEXUS_PROXY_REPO -t $MRSTUB_IMAGE . &> .dockererr
+ docker build $IMAGE_TARGET_PLATFORM_CMD_PARAM --build-arg NEXUS_PROXY_REPO=$NEXUS_PROXY_REPO -t $MRSTUB_IMAGE . &> .dockererr
if [ $? -eq 0 ]; then
echo -e $GREEN" Build Ok"$EGREEN
__retag_and_push_image MRSTUB_IMAGE
@@ -130,24 +130,24 @@
}
# Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
-# This function is called for prestarted apps not managed by the test script.
+# This function is called for pre-started apps not managed by the test script.
__MR_kube_scale_zero_and_wait() {
echo -e " MR replicas kept as is"
}
# Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
-# This function is called for prestarted apps not managed by the test script.
+# This function is called for pre-started apps not managed by the test script.
__DMAAPMR_kube_scale_zero_and_wait() {
echo -e " DMAAP replicas kept as is"
}
-# Delete all kube resouces for the app
+# Delete all kube resources for the app
# This function is called for apps managed by the test script.
__MR_kube_delete_all() {
__kube_delete_all_resources $KUBE_ONAP_NAMESPACE autotest MR
}
-# Delete all kube resouces for the app
+# Delete all kube resources for the app
# This function is called for apps managed by the test script.
__DMAAPMR_kube_delete_all() {
__kube_delete_all_resources $KUBE_ONAP_NAMESPACE autotest DMAAPMR
@@ -155,7 +155,7 @@
# Store docker logs
# This function is called for apps managed by the test script.
-# args: <log-dir> <file-prexix>
+# args: <log-dir> <file-prefix>
__MR_store_docker_logs() {
if [ $RUNMODE == "KUBE" ]; then
kubectl $KUBECONF logs -l "autotest=MR" -n $KUBE_ONAP_NAMESPACE --tail=-1 > $1$2_mr_stub.log 2>&1
@@ -166,7 +166,7 @@
# Store docker logs
# This function is called for apps managed by the test script.
-# args: <log-dir> <file-prexix>
+# args: <log-dir> <file-prefix>
__DMAAPMR_store_docker_logs() {
if [ $RUNMODE == "KUBE" ]; then
for podname in $(kubectl $KUBECONF get pods -n $KUBE_ONAP_NAMESPACE -l "autotest=DMAAPMR" -o custom-columns=":metadata.name"); do
@@ -193,11 +193,11 @@
: # handle by __MR_initial_setup
}
-# Set app short-name, app name and namespace for logging runtime statistics of kubernets pods or docker containers
+# Set app short-name, app name and namespace for logging runtime statistics of kubernetes pods or docker containers
# For docker, the namespace shall be excluded
-# This function is called for apps managed by the test script as well as for prestarted apps.
+# This function is called for apps managed by the test script as well as for pre-started apps.
# args: -
-__MR_statisics_setup() {
+__MR_statistics_setup() {
if [ $RUNMODE == "KUBE" ]; then
echo "MR-STUB $MR_STUB_APP_NAME $KUBE_ONAP_NAMESPACE"
else
@@ -205,11 +205,11 @@
fi
}
-# Set app short-name, app name and namespace for logging runtime statistics of kubernets pods or docker containers
+# Set app short-name, app name and namespace for logging runtime statistics of kubernetes pods or docker containers
# For docker, the namespace shall be excluded
-# This function is called for apps managed by the test script as well as for prestarted apps.
+# This function is called for apps managed by the test script as well as for pre-started apps.
# args: -
-__DMAAPMR_statisics_setup() {
+__DMAAPMR_statistics_setup() {
if [ $RUNMODE == "KUBE" ]; then
echo "KAFKA $MR_KAFKA_APP_NAME $KUBE_ONAP_NAMESPACE MESSAGE-ROUTER $MR_DMAAP_APP_NAME $KUBE_ONAP_NAMESPACE ZOOKEEPER $MR_ZOOKEEPER_APP_NAME $KUBE_ONAP_NAMESPACE"
else
@@ -302,7 +302,7 @@
# Access via test script
MR_STUB_PATH=$MR_HTTPX"://"$MR_STUB_APP_NAME":"$INT_PORT # access from script via proxy, docker
MR_DMAAP_PATH=$MR_HTTPX"://"$MR_DMAAP_APP_NAME":"$INT_PORT # access from script via proxy, docker
- MR_DMAAP_ADAPTER_HTTP="" # Access to dmaap mr via proyx - set only if app is included
+ MR_DMAAP_ADAPTER_HTTP="" # Access to dmaap mr via proxy - set only if app is included
MR_SERVICE_PATH=$MR_STUB_PATH # access container->container, docker - access pod->svc, kube
MR_KAFKA_SERVICE_PATH=""
@@ -316,7 +316,7 @@
MR_ZOOKEEPER_SERVICE_PATH=$MR_ZOOKEEPER_APP_NAME":"$MR_ZOOKEEPER_PORT
fi
- # For directing calls from script to e.g.A1PMS via message rounter
+ # For directing calls from script to e.g.A1PMS via message router
# These cases shall always go though the mr-stub
MR_ADAPTER_HTTP="http://"$MR_STUB_APP_NAME":"$2
MR_ADAPTER_HTTPS="https://"$MR_STUB_APP_NAME":"$4
@@ -345,7 +345,7 @@
MR_ZOOKEEPER_SERVICE_PATH=$MR_ZOOKEEPER_APP_NAME"."$KUBE_ONAP_NAMESPACE":"$MR_ZOOKEEPER_PORT
fi
- # For directing calls from script to e.g.A1PMS, via message rounter
+ # For directing calls from script to e.g.A1PMS, via message router
# These calls shall always go though the mr-stub
MR_ADAPTER_HTTP="http://"$MR_STUB_APP_NAME.$KUBE_ONAP_NAMESPACE":"$3
MR_ADAPTER_HTTPS="https://"$MR_STUB_APP_NAME.$KUBE_ONAP_NAMESPACE":"$5
@@ -422,15 +422,15 @@
if [ $RUNMODE == "KUBE" ]; then
- # Table of possible combinations of included mr and included/prestarted dmaap-mr
- # mr can never be prestarted
+ # Table of possible combinations of included mr and included/pre-started dmaap-mr
+ # mr can never be pre-started
# mr can be used stand alone
- # if dmaapmr is included/prestarted, then mr is needed as well as frontend
+ # if dmaapmr is included/pre-started, then mr is needed as well as frontend
# Inverted logic - 0 mean true, 1 means false
- # mr prestarted 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1
+ # mr pre-started 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1
# mr included 0 0 1 1 0 0 1 1 0 0 1 1 0 0 1 1
- # dmaap prestarted 0 0 0 0 1 1 1 1 0 0 0 0 1 1 1 1
+ # dmaap pre-started 0 0 0 0 1 1 1 1 0 0 0 0 1 1 1 1
# dmaap included 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1
# ==================================================
# OK 1 1 1 1 1 0 1 1 1 0 1 1 1 0 1 1
diff --git a/test/common/ngw_api_functions.sh b/test/common/ngw_api_functions.sh
index a1e6145..6c2ba33 100644
--- a/test/common/ngw_api_functions.sh
+++ b/test/common/ngw_api_functions.sh
@@ -26,7 +26,7 @@
# arg: <image-tag-suffix> (selects staging, snapshot, release etc)
# <image-tag-suffix> is present only for images with staging, snapshot,release tags
__NGW_imagesetup() {
- __check_and_create_image_var NGW "NRT_GATEWAY_IMAGE" "NRT_GATEWAY_IMAGE_BASE" "NRT_GATEWAY_IMAGE_TAG" $1 "$NRT_GATEWAY_DISPLAY_NAME"
+ __check_and_create_image_var NGW "NRT_GATEWAY_IMAGE" "NRT_GATEWAY_IMAGE_BASE" "NRT_GATEWAY_IMAGE_TAG" $1 "$NRT_GATEWAY_DISPLAY_NAME" ""
}
# Pull image from remote repo or use locally built image
@@ -63,12 +63,12 @@
}
# Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
-# This function is called for prestarted apps not managed by the test script.
+# This function is called for pre-started apps not managed by the test script.
__NGW_kube_scale_zero_and_wait() {
echo -e " NGW replicas kept as is"
}
-# Delete all kube resouces for the app
+# Delete all kube resources for the app
# This function is called for apps managed by the test script.
__NGW_kube_delete_all() {
__kube_delete_all_resources $KUBE_NONRTRIC_NAMESPACE autotest NGW
@@ -76,7 +76,7 @@
# Store docker logs
# This function is called for apps managed by the test script.
-# args: <log-dir> <file-prexix>
+# args: <log-dir> <file-prefix>
__NGW_store_docker_logs() {
if [ $RUNMODE == "KUBE" ]; then
kubectl $KUBECONF logs -l "autotest=NGW" -n $KUBE_NONRTRIC_NAMESPACE --tail=-1 > $1$2_gateway.log 2>&1
@@ -92,11 +92,11 @@
use_gateway_http
}
-# Set app short-name, app name and namespace for logging runtime statistics of kubernets pods or docker containers
+# Set app short-name, app name and namespace for logging runtime statistics of kubernetes pods or docker containers
# For docker, the namespace shall be excluded
-# This function is called for apps managed by the test script as well as for prestarted apps.
+# This function is called for apps managed by the test script as well as for pre-started apps.
# args: -
-__NGW_statisics_setup() {
+__NGW_statistics_setup() {
if [ $RUNMODE == "KUBE" ]; then
echo "NGW $NRT_GATEWAY_APP_NAME $KUBE_NONRTRIC_NAMESPACE"
else
@@ -227,7 +227,7 @@
__check_included_image "NGW"
retcode_i=$?
- # Check if app shall only be used by the testscipt
+ # Check if app shall only be used by the test script
__check_prestarted_image "NGW"
retcode_p=$?
diff --git a/test/common/prodstub_api_functions.sh b/test/common/prodstub_api_functions.sh
index c70cd13..9a58292 100644
--- a/test/common/prodstub_api_functions.sh
+++ b/test/common/prodstub_api_functions.sh
@@ -26,7 +26,7 @@
# arg: <image-tag-suffix> (selects staging, snapshot, release etc)
# <image-tag-suffix> is present only for images with staging, snapshot,release tags
__PRODSTUB_imagesetup() {
- __check_and_create_image_var PRODSTUB "PROD_STUB_IMAGE" "PROD_STUB_IMAGE_BASE" "PROD_STUB_IMAGE_TAG" LOCAL "$PROD_STUB_DISPLAY_NAME"
+ __check_and_create_image_var PRODSTUB "PROD_STUB_IMAGE" "PROD_STUB_IMAGE_BASE" "PROD_STUB_IMAGE_TAG" LOCAL "$PROD_STUB_DISPLAY_NAME" $IMAGE_TARGET_PLATFORM_IMG_TAG
}
# Pull image from remote repo or use locally built image
@@ -44,7 +44,7 @@
__PRODSTUB_imagebuild() {
cd ../prodstub
echo " Building PRODSTUB - $PROD_STUB_DISPLAY_NAME - image: $PROD_STUB_IMAGE"
- docker build --build-arg NEXUS_PROXY_REPO=$NEXUS_PROXY_REPO -t $PROD_STUB_IMAGE . &> .dockererr
+ docker build $IMAGE_TARGET_PLATFORM_CMD_PARAM --build-arg NEXUS_PROXY_REPO=$NEXUS_PROXY_REPO -t $PROD_STUB_IMAGE . &> .dockererr
if [ $? -eq 0 ]; then
echo -e $GREEN" Build Ok"$EGREEN
__retag_and_push_image PROD_STUB_IMAGE
@@ -78,12 +78,12 @@
}
# Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
-# This function is called for prestarted apps not managed by the test script.
+# This function is called for pre-started apps not managed by the test script.
__PRODSTUB_kube_scale_zero_and_wait() {
echo -e $RED" PRODSTUB app is not scaled in this state"$ERED
}
-# Delete all kube resouces for the app
+# Delete all kube resources for the app
# This function is called for apps managed by the test script.
__PRODSTUB_kube_delete_all() {
__kube_delete_all_resources $KUBE_SIM_NAMESPACE autotest PRODSTUB
@@ -91,7 +91,7 @@
# Store docker logs
# This function is called for apps managed by the test script.
-# args: <log-dir> <file-prexix>
+# args: <log-dir> <file-prefix>
__PRODSTUB_store_docker_logs() {
if [ $RUNMODE == "KUBE" ]; then
kubectl $KUBECONF logs -l "autotest=PRODSTUB" -n $KUBE_SIM_NAMESPACE --tail=-1 > $1$2_prodstub.log 2>&1
@@ -107,11 +107,11 @@
use_prod_stub_http
}
-# Set app short-name, app name and namespace for logging runtime statistics of kubernets pods or docker containers
+# Set app short-name, app name and namespace for logging runtime statistics of kubernetes pods or docker containers
# For docker, the namespace shall be excluded
-# This function is called for apps managed by the test script as well as for prestarted apps.
+# This function is called for apps managed by the test script as well as for pre-started apps.
# args: -
-__PRODSTUB_statisics_setup() {
+__PRODSTUB_statistics_setup() {
if [ $RUNMODE == "KUBE" ]; then
echo "PRODSTUB $PROD_STUB_APP_NAME $KUBE_SIM_NAMESPACE"
else
@@ -193,7 +193,7 @@
__check_included_image "PRODSTUB"
retcode_i=$?
- # Check if app shall only be used by the testscipt
+ # Check if app shall only be used by the test script
__check_prestarted_image "PRODSTUB"
retcode_p=$?
@@ -261,7 +261,7 @@
return 0
}
-# Excute a curl cmd towards the prodstub simulator and check the response code.
+# Execute a curl cmd towards the prodstub simulator and check the response code.
# args: TEST|CONF <expected-response-code> <curl-cmd-string> [<json-file-to-compare-output>]
__execute_curl_to_prodstub() {
TIMESTAMP=$(date "+%Y-%m-%d %H:%M:%S")
diff --git a/test/common/pvccleaner_api_functions.sh b/test/common/pvccleaner_api_functions.sh
index 4ffb522..4b48e32 100644
--- a/test/common/pvccleaner_api_functions.sh
+++ b/test/common/pvccleaner_api_functions.sh
@@ -26,7 +26,7 @@
# arg: <image-tag-suffix> (selects staging, snapshot, release etc)
# <image-tag-suffix> is present only for images with staging, snapshot,release tags
__PVCCLEANER_imagesetup() {
- __check_and_create_image_var PVCCLEANER "PVC_CLEANER_IMAGE" "PVC_CLEANER_IMAGE_BASE" "PVC_CLEANER_IMAGE_TAG" REMOTE_PROXY "$PVC_CLEANER_DISPLAY_NAME"
+ __check_and_create_image_var PVCCLEANER "PVC_CLEANER_IMAGE" "PVC_CLEANER_IMAGE_BASE" "PVC_CLEANER_IMAGE_TAG" REMOTE_PROXY "$PVC_CLEANER_DISPLAY_NAME" ""
}
# Pull image from remote repo or use locally built image
@@ -63,12 +63,12 @@
}
# Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
-# This function is called for prestarted apps not managed by the test script.
+# This function is called for pre-started apps not managed by the test script.
__PVCCLEANER_kube_scale_zero_and_wait() {
:
}
-# Delete all kube resouces for the app
+# Delete all kube resources for the app
# This function is called for apps managed by the test script.
__PVCCLEANER_kube_delete_all() {
:
@@ -76,7 +76,7 @@
# Store docker logs
# This function is called for apps managed by the test script.
-# args: <log-dir> <file-prexix>
+# args: <log-dir> <file-prefix>
__PVCCLEANER_store_docker_logs() {
if [ $RUNMODE == "KUBE" ]; then
kubectl $KUBECONF logs -l "autotest=PVCCLEANER" -A --tail=-1 > $1$2_pvs_cleaner.log 2>&1
@@ -90,11 +90,11 @@
:
}
-# Set app short-name, app name and namespace for logging runtime statistics of kubernets pods or docker containers
+# Set app short-name, app name and namespace for logging runtime statistics of kubernetes pods or docker containers
# For docker, the namespace shall be excluded
-# This function is called for apps managed by the test script as well as for prestarted apps.
+# This function is called for apps managed by the test script as well as for pre-started apps.
# args: -
-__PVCCLEANER_statisics_setup() {
+__PVCCLEANER_statistics_setup() {
echo ""
}
diff --git a/test/common/rc_api_functions.sh b/test/common/rc_api_functions.sh
index 050ddd1..bb085d6 100644
--- a/test/common/rc_api_functions.sh
+++ b/test/common/rc_api_functions.sh
@@ -17,7 +17,7 @@
# ============LICENSE_END=================================================
#
-# This is a script that contains container/service managemnt functions test functions for RAPP Catalogue API
+# This is a script that contains container/service management functions test functions for RAPP Catalogue API
################ Test engine functions ################
@@ -25,7 +25,7 @@
# arg: [<image-tag-suffix>] (selects staging, snapshot, release etc)
# <image-tag-suffix> is present only for images with staging, snapshot,release tags
__RC_imagesetup() {
- __check_and_create_image_var RC "RAPP_CAT_IMAGE" "RAPP_CAT_IMAGE_BASE" "RAPP_CAT_IMAGE_TAG" $1 "$RAPP_CAT_DISPLAY_NAME"
+ __check_and_create_image_var RC "RAPP_CAT_IMAGE" "RAPP_CAT_IMAGE_BASE" "RAPP_CAT_IMAGE_TAG" $1 "$RAPP_CAT_DISPLAY_NAME" ""
}
# Pull image from remote repo or use locally built image
@@ -55,12 +55,12 @@
}
# Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
-# This function is called for prestarted apps not managed by the test script.
+# This function is called for pre-started apps not managed by the test script.
__RC_kube_scale_zero_and_wait() {
__kube_scale_and_wait_all_resources $KUBE_NONRTRIC_NAMESPACE app "$KUBE_NONRTRIC_NAMESPACE"-rappcatalogueservice
}
-# Delete all kube resouces for the app
+# Delete all kube resources for the app
# This function is called for apps managed by the test script.
__RC_kube_delete_all() {
__kube_delete_all_resources $KUBE_NONRTRIC_NAMESPACE autotest RC
@@ -68,7 +68,7 @@
# Store docker logs
# This function is called for apps managed by the test script.
-# args: <log-dir> <file-prexix>
+# args: <log-dir> <file-prefix>
__RC_store_docker_logs() {
if [ $RUNMODE == "KUBE" ]; then
kubectl $KUBECONF logs -l "autotest=RC" -n $KUBE_NONRTRIC_NAMESPACE --tail=-1 > $1$2_rc.log 2>&1
@@ -84,11 +84,11 @@
use_rapp_catalogue_http
}
-# Set app short-name, app name and namespace for logging runtime statistics of kubernets pods or docker containers
+# Set app short-name, app name and namespace for logging runtime statistics of kubernetes pods or docker containers
# For docker, the namespace shall be excluded
-# This function is called for apps managed by the test script as well as for prestarted apps.
+# This function is called for apps managed by the test script as well as for pre-started apps.
# args: -
-__RC_statisics_setup() {
+__RC_statistics_setup() {
if [ $RUNMODE == "KUBE" ]; then
echo "RC $RAPP_CAT_APP_NAME $KUBE_NONRTRIC_NAMESPACE"
else
@@ -168,7 +168,7 @@
__check_included_image "RC"
retcode_i=$?
- # Check if app shall only be used by the testscipt
+ # Check if app shall only be used by the test script
__check_prestarted_image "RC"
retcode_p=$?
diff --git a/test/common/ricmediatorsim_api_functions.sh b/test/common/ricmediatorsim_api_functions.sh
index 93c2db2..6449a68 100644
--- a/test/common/ricmediatorsim_api_functions.sh
+++ b/test/common/ricmediatorsim_api_functions.sh
@@ -25,8 +25,8 @@
# arg: <image-tag-suffix> (selects staging, snapshot, release etc)
# <image-tag-suffix> is present only for images with staging, snapshot,release tags
__RICMEDIATORSIM_imagesetup() {
- __check_and_create_image_var RICMEDIATORSIM "RICMEDIATOR_SIM_IMAGE" "RICMEDIATOR_SIM_IMAGE_BASE" "RICMEDIATOR_SIM_IMAGE_TAG" REMOTE_RELEASE_ORAN "$RICMEDIATOR_SIM_DISPLAY_NAME"
- __check_and_create_image_var RICMEDIATORSIM "RICMEDIATOR_SIM_DB_IMAGE" "RICMEDIATOR_SIM_DB_IMAGE_BASE" "RICMEDIATOR_SIM_DB_IMAGE_TAG" REMOTE_RELEASE_ORAN "$RICMEDIATOR_SIM_DB_DISPLAY_NAME"
+ __check_and_create_image_var RICMEDIATORSIM "RICMEDIATOR_SIM_IMAGE" "RICMEDIATOR_SIM_IMAGE_BASE" "RICMEDIATOR_SIM_IMAGE_TAG" REMOTE_RELEASE_ORAN "$RICMEDIATOR_SIM_DISPLAY_NAME" ""
+ __check_and_create_image_var RICMEDIATORSIM "RICMEDIATOR_SIM_DB_IMAGE" "RICMEDIATOR_SIM_DB_IMAGE_BASE" "RICMEDIATOR_SIM_DB_IMAGE_TAG" REMOTE_RELEASE_ORAN "$RICMEDIATOR_SIM_DB_DISPLAY_NAME" ""
}
# Pull image from remote repo or use locally built image
@@ -68,12 +68,12 @@
}
# Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
-# This function is called for prestarted apps not managed by the test script.
+# This function is called for pre-started apps not managed by the test script.
__RICMEDIATORSIM_kube_scale_zero_and_wait() {
__kube_scale_and_wait_all_resources $KUBE_A1SIM_NAMESPACE app $KUBE_A1SIM_NAMESPACE"-neara1simulator"
}
-# Delete all kube resouces for the app
+# Delete all kube resources for the app
# This function is called for apps managed by the test script.
__RICMEDIATORSIM_kube_delete_all() {
__kube_delete_all_resources $KUBE_A1SIM_NAMESPACE autotest RICMEDIATORSIM
@@ -81,7 +81,7 @@
# Store docker logs
# This function is called for apps managed by the test script.
-# args: <log-dir> <file-prexix>
+# args: <log-dir> <file-prefix>
__RICMEDIATORSIM_store_docker_logs() {
if [ $RUNMODE == "KUBE" ]; then
for podname in $(kubectl $KUBECONF get pods -n $KUBE_A1SIM_NAMESPACE -l "autotest=RICMEDIATORSIM" -o custom-columns=":metadata.name"); do
@@ -103,11 +103,11 @@
use_ricmediator_simulator_http
}
-# Set app short-name, app name and namespace for logging runtime statistics of kubernets pods or docker containers
+# Set app short-name, app name and namespace for logging runtime statistics of kubernetes pods or docker containers
# For docker, the namespace shall be excluded
-# This function is called for apps managed by the test script as well as for prestarted apps.
+# This function is called for apps managed by the test script as well as for pre-started apps.
# args: -
-__RICMEDIATORSIM_statisics_setup() {
+__RICMEDIATORSIM_statistics_setup() {
for ((RICMEDIATOR_SIMINSTANCE=10; RICMEDIATOR_SIMINSTANCE>0; RICMEDIATOR_SIMINSTANCE-- )); do
if [ $RUNMODE == "KUBE" ]; then
RICMEDIATOR_SIMINSTANCE_KUBE=$(($RICMEDIATOR_SIMINSTANCE-1))
@@ -182,7 +182,7 @@
__check_included_image "RICMEDIATORSIM"
retcode_i=$?
- # Check if app shall only be used by the testscipt
+ # Check if app shall only be used by the test script
__check_prestarted_image "RICMEDIATORSIM"
retcode_p=$?
@@ -300,7 +300,7 @@
docker_args=" --scale $RICMEDIATOR_SIMCOMPOSE_SERVICE_NAME=$2"
- #Create a list of contsiner names
+ #Create a list of container names
#Will be <ricsim-prefix>_<service-name>_<index>
# or
# <ricsim-prefix>-<service-name>-<index>
@@ -376,7 +376,7 @@
UUID=${UUID:0:${#UUID}-4}"a"
}
-# Excute a curl cmd towards a ricsimulator and check the response code.
+# Execute a curl cmd towards a ricsimulator and check the response code.
# args: <expected-response-code> <curl-cmd-string>
__execute_curl_to_ricmediatorsim() {
echo ${FUNCNAME[1]} "line: "${BASH_LINENO[1]} >> $HTTPLOG
@@ -423,14 +423,6 @@
# (Function for test scripts)
ricmediatorsim_equal() {
__log_test_fail_not_supported
- # if [ $# -eq 3 ] || [ $# -eq 4 ]; then
- # host=$(__find_ricmediatorsim_host $1)
- # __var_test $1 "$host/counter/" $2 "=" $3 $4
- # return 0
- # else
- # __print_err "needs three or four args: <ric-id> <sim-param> <target-value> [ timeout ]"
- # return 1
- # fi
}
# Print a variable value from the RICMEDIATOR sim.
@@ -438,12 +430,6 @@
# (Function for test scripts)
ricmediatorsim_print() {
__log_test_info_not_supported
- # if [ $# != 2 ]; then
- # __print_err "need two args, <ric-id> <sim-param>" $@
- # exit 1
- # fi
- # host=$(__find_ricmediatorsim_host $1)
- # echo -e $BOLD"INFO(${BASH_LINENO[0]}): $1, $2 = $(__do_curl $host/counter/$2)"$EBOLD
}
# Tests if a variable value in the RICMEDIATOR simulator contains the target string and and optional timeout
@@ -455,14 +441,6 @@
# (Function for test scripts)
ricmediatorsim_contains_str() {
__log_test_fail_not_supported
- # if [ $# -eq 3 ] || [ $# -eq 4 ]; then
- # host=$(__find_ricmediatorsim_host $1)
- # __var_test $1 "$host/counter/" $2 "contain_str" $3 $4
- # return 0
- # else
- # __print_err "needs three or four args: <ric-id> <sim-param> <target-value> [ timeout ]"
- # return 1
- # fi
}
# Simulator API: Put a policy type in a ric
@@ -500,15 +478,6 @@
# (Function for test scripts)
ricmediatorsim_post_delete_instances() {
__log_test_fail_not_supported
- # __log_conf_start $@
- # if [ $# -ne 2 ]; then
- # __print_err "<response-code> <ric-id>" $@
- # return 1
- # fi
- # host=$(__find_ricmediatorsim_host $2)
- # curlString="curl -X POST -skw %{http_code} "$host"/deleteinstances"
- # __execute_curl_to_ricmediatorsim $1 "$curlString"
- # return $?
}
# Simulator API: Delete all (instances/types/statuses/settings), for one ric
@@ -516,15 +485,6 @@
# (Function for test scripts)
ricmediatorsim_post_delete_all() {
__log_test_fail_not_supported
- # __log_conf_start $@
- # if [ $# -ne 2 ]; then
- # __print_err "<response-code> <numericic-id>" $@
- # return 1
- # fi
- # host=$(__find_ricmediatorsim_host $2)
- # curlString="curl -X POST -skw %{http_code} "$host"/deleteall"
- # __execute_curl_to_ricmediatorsim $1 "$curlString"
- # return $?
}
# Simulator API: Set (or reset) response code for next A1 message, for one ric
@@ -532,18 +492,6 @@
# (Function for test scripts)
ricmediatorsim_post_forcedresponse() {
__log_test_fail_not_supported
- # __log_conf_start $@
- # if [ $# -ne 3 ]; then
- # __print_err "<response-code> <ric-id> <forced_response_code>" $@
- # return 1
- # fi
- # host=$(__find_ricmediatorsim_host $2)
- # curlString="curl -X POST -skw %{http_code} "$host"/forceresponse"
- # if [ $# -eq 3 ]; then
- # curlString=$curlString"?code="$3
- # fi
- # __execute_curl_to_ricmediatorsim $1 "$curlString"
- # return $?
}
# Simulator API: Set (or reset) A1 response delay, for one ric
@@ -551,16 +499,4 @@
# (Function for test scripts)
ricmediatorsim_post_forcedelay() {
__log_test_fail_not_supported
- # __log_conf_start $@
- # if [ $# -ne 3 ]; then
- # __print_err "<response-code> <ric-id> [<delay-in-seconds>]" $@
- # return 1
- # fi
- # host=$(__find_ricmediatorsim_host $2)
- # curlString="curl -X POST -skw %{http_code} $host/forcedelay"
- # if [ $# -eq 3 ]; then
- # curlString=$curlString"?delay="$3
- # fi
- # __execute_curl_to_ricmediatorsim $1 "$curlString"
- # return $?
}
\ No newline at end of file
diff --git a/test/common/ricsim_api_functions.sh b/test/common/ricsim_api_functions.sh
index 5e039b7..1bdcf1d 100644
--- a/test/common/ricsim_api_functions.sh
+++ b/test/common/ricsim_api_functions.sh
@@ -25,7 +25,7 @@
# arg: <image-tag-suffix> (selects staging, snapshot, release etc)
# <image-tag-suffix> is present only for images with staging, snapshot,release tags
__RICSIM_imagesetup() {
- __check_and_create_image_var RICSIM "RIC_SIM_IMAGE" "RIC_SIM_IMAGE_BASE" "RIC_SIM_IMAGE_TAG" $1 "$RIC_SIM_DISPLAY_NAME"
+ __check_and_create_image_var RICSIM "RIC_SIM_IMAGE" "RIC_SIM_IMAGE_BASE" "RIC_SIM_IMAGE_TAG" $1 "$RIC_SIM_DISPLAY_NAME" ""
}
# Pull image from remote repo or use locally built image
@@ -55,13 +55,13 @@
}
# Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
-# This function is called for prestarted apps not managed by the test script.
+# This function is called for pre-started apps not managed by the test script.
__RICSIM_kube_scale_zero_and_wait() {
#__kube_scale_and_wait_all_resources $KUBE_A1SIM_NAMESPACE app $KUBE_A1SIM_NAMESPACE"-"$RIC_SIM_PREFIX
__kube_scale_and_wait_all_resources $KUBE_A1SIM_NAMESPACE app $KUBE_A1SIM_NAMESPACE"-a1simulator"
}
-# Delete all kube resouces for the app
+# Delete all kube resources for the app
# This function is called for apps managed by the test script.
__RICSIM_kube_delete_all() {
__kube_delete_all_resources $KUBE_A1SIM_NAMESPACE autotest RICSIM
@@ -69,7 +69,7 @@
# Store docker logs
# This function is called for apps managed by the test script.
-# args: <log-dir> <file-prexix>
+# args: <log-dir> <file-prefix>
__RICSIM_store_docker_logs() {
if [ $RUNMODE == "KUBE" ]; then
for podname in $(kubectl $KUBECONF get pods -n $KUBE_A1SIM_NAMESPACE -l "autotest=RICSIM" -o custom-columns=":metadata.name"); do
@@ -91,11 +91,11 @@
use_simulator_http
}
-# Set app short-name, app name and namespace for logging runtime statistics of kubernets pods or docker containers
+# Set app short-name, app name and namespace for logging runtime statistics of kubernetes pods or docker containers
# For docker, the namespace shall be excluded
-# This function is called for apps managed by the test script as well as for prestarted apps.
+# This function is called for apps managed by the test script as well as for pre-started apps.
# args: -
-__RICSIM_statisics_setup() {
+__RICSIM_statistics_setup() {
for ((RICSIM_INSTANCE=10; RICSIM_INSTANCE>0; RICSIM_INSTANCE-- )); do
if [ $RUNMODE == "KUBE" ]; then
RICSIM_INSTANCE_KUBE=$(($RICSIM_INSTANCE-1))
@@ -171,7 +171,7 @@
__check_included_image "RICSIM"
retcode_i=$?
- # Check if app shall only be used by the testscipt
+ # Check if app shall only be used by the test script
__check_prestarted_image "RICSIM"
retcode_p=$?
@@ -209,7 +209,7 @@
fi
echo " $2 simulators using basename: $1 on interface: $3"
- #Set env var for simulator count and A1 interface vesion for the given group
+ #Set env var for simulator count and A1 interface version for the given group
if [ $1 == "$RIC1" ]; then
G1_COUNT=$2
elif [ $1 == "$RIC2" ]; then
@@ -289,7 +289,7 @@
echo -e $BOLD$YELLOW" Warning: Using docker compose --force-recreate "$EYELLOW$EBOLD
docker_args="--force-recreate --scale $RICSIM_COMPOSE_SERVICE_NAME=$2"
- #Create a list of contsiner names
+ #Create a list of container names
#Will be <ricsim-prefix>_<service-name>_<index>
# or
# <ricsim-prefix>-<service-name>-<index>
@@ -365,7 +365,7 @@
UUID=${UUID:0:${#UUID}-4}"a"
}
-# Excute a curl cmd towards a ricsimulator and check the response code.
+# Execute a curl cmd towards a ricsimulator and check the response code.
# args: <expected-response-code> <curl-cmd-string>
__execute_curl_to_sim() {
echo ${FUNCNAME[1]} "line: "${BASH_LINENO[1]} >> $HTTPLOG
diff --git a/test/common/sdnc_api_functions.sh b/test/common/sdnc_api_functions.sh
index 2701957..511d258 100644
--- a/test/common/sdnc_api_functions.sh
+++ b/test/common/sdnc_api_functions.sh
@@ -33,8 +33,8 @@
sdnc_suffix_tag="REMOTE_RELEASE_ONAP"
fi
done
- __check_and_create_image_var SDNC "SDNC_A1_CONTROLLER_IMAGE" "SDNC_A1_CONTROLLER_IMAGE_BASE" "SDNC_A1_CONTROLLER_IMAGE_TAG" $sdnc_suffix_tag "$SDNC_DISPLAY_NAME"
- __check_and_create_image_var SDNC "SDNC_DB_IMAGE" "SDNC_DB_IMAGE_BASE" "SDNC_DB_IMAGE_TAG" REMOTE_PROXY "SDNC DB"
+ __check_and_create_image_var SDNC "SDNC_A1_CONTROLLER_IMAGE" "SDNC_A1_CONTROLLER_IMAGE_BASE" "SDNC_A1_CONTROLLER_IMAGE_TAG" $sdnc_suffix_tag "$SDNC_DISPLAY_NAME" ""
+ __check_and_create_image_var SDNC "SDNC_DB_IMAGE" "SDNC_DB_IMAGE_BASE" "SDNC_DB_IMAGE_TAG" REMOTE_PROXY "SDNC DB" ""
}
@@ -77,12 +77,12 @@
}
# Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
-# This function is called for prestarted apps not managed by the test script.
+# This function is called for pre-started apps not managed by the test script.
__SDNC_kube_scale_zero_and_wait() {
echo -e " SDNC replicas kept as is"
}
-# Delete all kube resouces for the app
+# Delete all kube resources for the app
# This function is called for apps managed by the test script.
__SDNC_kube_delete_all() {
__kube_delete_all_resources $KUBE_SDNC_NAMESPACE autotest SDNC
@@ -90,7 +90,7 @@
# Store docker logs
# This function is called for apps managed by the test script.
-# args: <log-dir> <file-prexix>
+# args: <log-dir> <file-prefix>
__SDNC_store_docker_logs() {
if [ $RUNMODE == "KUBE" ]; then
kubectl $KUBECONF logs -l "autotest=SDNC" -n $KUBE_SDNC_NAMESPACE --tail=-1 > $1$2_SDNC.log 2>&1
@@ -108,11 +108,11 @@
use_sdnc_http
}
-# Set app short-name, app name and namespace for logging runtime statistics of kubernets pods or docker containers
+# Set app short-name, app name and namespace for logging runtime statistics of kubernetes pods or docker containers
# For docker, the namespace shall be excluded
-# This function is called for apps managed by the test script as well as for prestarted apps.
+# This function is called for apps managed by the test script as well as for pre-started apps.
# args: -
-__SDNC_statisics_setup() {
+__SDNC_statistics_setup() {
if [ $RUNMODE == "KUBE" ]; then
echo "SDNC $SDNC_APP_NAME $KUBE_SDNC_NAMESPACE"
else
@@ -198,7 +198,7 @@
__check_included_image "SDNC"
retcode_i=$?
- # Check if app shall only be used by the testscipt
+ # Check if app shall only be used by the test script
__check_prestarted_image "SDNC"
retcode_p=$?
diff --git a/test/common/test_env-onap-jakarta.sh b/test/common/test_env-onap-jakarta.sh
index 98a016b..49c4ec6 100644
--- a/test/common/test_env-onap-jakarta.sh
+++ b/test/common/test_env-onap-jakarta.sh
@@ -43,7 +43,7 @@
# The variable is created by removing the suffix "_BASE" from the base image variable name.
# Example: A1PMS_IMAGE_BASE -> A1PMS_IMAGE
# This var will point to the local or remote image depending on cmd line arguments.
-# In addition, the repo and the image tag version are selected from the list of image tags based on the cmd line argurment.
+# In addition, the repo and the image tag version are selected from the list of image tags based on the cmd line argument.
# For images built by the script, only tag #1 shall be specified
# For project images, only tag #1, #2, #3 and #4 shall be specified
# For ORAN images (non project), only tag #5 shall be specified
@@ -59,7 +59,7 @@
#############################################################################
# Note:
-# The imgage tags for a1pms and sdnc are updated AFTER the release.
+# The image tags for a1pms and sdnc are updated AFTER the release.
# This means that the latest staging/snapshot images for these two components have
# version one step (0.0.1 - bug-level) higher than the
# latest release image version.
@@ -273,7 +273,7 @@
PROD_STUB_EXTERNAL_SECURE_PORT=8093 # Producer stub container external secure port (host -> container)
PROD_STUB_INTERNAL_SECURE_PORT=8093 # Producer stub container internal secure port (container -> container)
PROD_STUB_JOB_CALLBACK="/callbacks/job" # Callback path for job create/update/delete
-PROD_STUB_SUPERVISION_CALLBACK="/callbacks/supervision" # Callback path for producre supervision
+PROD_STUB_SUPERVISION_CALLBACK="/callbacks/supervision" # Callback path for producer supervision
PROD_STUB_ALIVE_URL="/" # Base path for alive check
PROD_STUB_COMPOSE_DIR="prodstub" # Dir in simulator_group for docker-compose
@@ -295,7 +295,7 @@
SDNC_DISPLAY_NAME="SDNC A1 Controller"
SDNC_EXTERNAL_PORT=8282 # SNDC A1 Controller container external port (host -> container)
SDNC_INTERNAL_PORT=8181 # SNDC A1 Controller container internal port (container -> container)
-SDNC_EXTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container external securee port (host -> container)
+SDNC_EXTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container external secure port (host -> container)
SDNC_INTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container internal secure port (container -> container)
SDNC_DB_APP_NAME="sdncdb" # Name of the SDNC DB container
SDNC_A1_TRUSTSTORE_PASSWORD="a1adapter" # SDNC truststore password
@@ -328,7 +328,7 @@
CONTROL_PANEL_EXTERNAL_PORT=8080 # Control Panel container external port (host -> container)
CONTROL_PANEL_INTERNAL_PORT=8080 # Control Panel container internal port (container -> container)
CONTROL_PANEL_EXTERNAL_SECURE_PORT=8880 # Control Panel container external port (host -> container)
-CONTROL_PANEL_INTERNAL_SECURE_PORT=8082 # Control Panel container intternal port (container -> container)
+CONTROL_PANEL_INTERNAL_SECURE_PORT=8082 # Control Panel container internal port (container -> container)
CONTROL_PANEL_LOGPATH="/logs/nonrtric-controlpanel.log" # Path the application log in the Control Panel container
CONTROL_PANEL_ALIVE_URL="/" # Base path for alive check
CONTROL_PANEL_COMPOSE_DIR="control_panel" # Dir in simulator_group for docker-compose
@@ -378,10 +378,10 @@
KUBE_PROXY_WEB_EXTERNAL_SECURE_PORT=8783 # Kube Proxy container external secure port (host -> container)
KUBE_PROXY_WEB_INTERNAL_SECURE_PORT=8434 # Kube Proxy container internal secure port (container -> container
-KUBE_PROXY_DOCKER_EXTERNAL_PORT=8732 # Kube Http Proxy container external port, doocker (host -> container)
-KUBE_PROXY_DOCKER_EXTERNAL_SECURE_PORT=8784 # Kube Proxy container external secure port, doocker (host -> container)
-KUBE_PROXY_WEB_DOCKER_EXTERNAL_PORT=8733 # Kube Http Proxy container external port, doocker (host -> container)
-KUBE_PROXY_WEB_DOCKER_EXTERNAL_SECURE_PORT=8785 # Kube Proxy container external secure port, doocker (host -> container)
+KUBE_PROXY_DOCKER_EXTERNAL_PORT=8732 # Kube Http Proxy container external port, docker (host -> container)
+KUBE_PROXY_DOCKER_EXTERNAL_SECURE_PORT=8784 # Kube Proxy container external secure port, docker (host -> container)
+KUBE_PROXY_WEB_DOCKER_EXTERNAL_PORT=8733 # Kube Http Proxy container external port, docker (host -> container)
+KUBE_PROXY_WEB_DOCKER_EXTERNAL_SECURE_PORT=8785 # Kube Proxy container external secure port, docker (host -> container)
KUBE_PROXY_PATH="" # Proxy url path, will be set if proxy is started
KUBE_PROXY_ALIVE_URL="/" # Base path for alive check
@@ -396,4 +396,4 @@
########################################
UUID="" # UUID used as prefix to the policy id to simulate a real UUID
- # Testscript need to set the UUID to use other this empty prefix is used
+ # Test script need to set the UUID to use other this empty prefix is used
diff --git a/test/common/test_env-onap-kohn.sh b/test/common/test_env-onap-kohn.sh
index 35aba16..9a34596 100644
--- a/test/common/test_env-onap-kohn.sh
+++ b/test/common/test_env-onap-kohn.sh
@@ -43,7 +43,7 @@
# The variable is created by removing the suffix "_BASE" from the base image variable name.
# Example: A1PMS_IMAGE_BASE -> A1PMS_IMAGE
# This var will point to the local or remote image depending on cmd line arguments.
-# In addition, the repo and the image tag version are selected from the list of image tags based on the cmd line argurment.
+# In addition, the repo and the image tag version are selected from the list of image tags based on the cmd line argument.
# For images built by the script, only tag #1 shall be specified
# For project images, only tag #1, #2, #3 and #4 shall be specified
# For ORAN images (non project), only tag #5 shall be specified
@@ -59,7 +59,7 @@
#############################################################################
# Note:
-# The imgage tags for a1pms and sdnc are updated AFTER the release.
+# The image tags for a1pms and sdnc are updated AFTER the release.
# This means that the latest staging/snapshot images for these two components have
# version one step (0.0.1 - bug-level) higher than the
# latest release image version.
@@ -273,7 +273,7 @@
PROD_STUB_EXTERNAL_SECURE_PORT=8093 # Producer stub container external secure port (host -> container)
PROD_STUB_INTERNAL_SECURE_PORT=8093 # Producer stub container internal secure port (container -> container)
PROD_STUB_JOB_CALLBACK="/callbacks/job" # Callback path for job create/update/delete
-PROD_STUB_SUPERVISION_CALLBACK="/callbacks/supervision" # Callback path for producre supervision
+PROD_STUB_SUPERVISION_CALLBACK="/callbacks/supervision" # Callback path for producer supervision
PROD_STUB_ALIVE_URL="/" # Base path for alive check
PROD_STUB_COMPOSE_DIR="prodstub" # Dir in simulator_group for docker-compose
@@ -295,7 +295,7 @@
SDNC_DISPLAY_NAME="SDNC A1 Controller"
SDNC_EXTERNAL_PORT=8282 # SNDC A1 Controller container external port (host -> container)
SDNC_INTERNAL_PORT=8181 # SNDC A1 Controller container internal port (container -> container)
-SDNC_EXTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container external securee port (host -> container)
+SDNC_EXTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container external secure port (host -> container)
SDNC_INTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container internal secure port (container -> container)
SDNC_DB_APP_NAME="sdncdb" # Name of the SDNC DB container
SDNC_A1_TRUSTSTORE_PASSWORD="a1adapter" # SDNC truststore password
@@ -328,7 +328,7 @@
CONTROL_PANEL_EXTERNAL_PORT=8080 # Control Panel container external port (host -> container)
CONTROL_PANEL_INTERNAL_PORT=8080 # Control Panel container internal port (container -> container)
CONTROL_PANEL_EXTERNAL_SECURE_PORT=8880 # Control Panel container external port (host -> container)
-CONTROL_PANEL_INTERNAL_SECURE_PORT=8082 # Control Panel container intternal port (container -> container)
+CONTROL_PANEL_INTERNAL_SECURE_PORT=8082 # Control Panel container internal port (container -> container)
CONTROL_PANEL_LOGPATH="/logs/nonrtric-controlpanel.log" # Path the application log in the Control Panel container
CONTROL_PANEL_ALIVE_URL="/" # Base path for alive check
CONTROL_PANEL_COMPOSE_DIR="control_panel" # Dir in simulator_group for docker-compose
@@ -378,10 +378,10 @@
KUBE_PROXY_WEB_EXTERNAL_SECURE_PORT=8783 # Kube Proxy container external secure port (host -> container)
KUBE_PROXY_WEB_INTERNAL_SECURE_PORT=8434 # Kube Proxy container internal secure port (container -> container
-KUBE_PROXY_DOCKER_EXTERNAL_PORT=8732 # Kube Http Proxy container external port, doocker (host -> container)
-KUBE_PROXY_DOCKER_EXTERNAL_SECURE_PORT=8784 # Kube Proxy container external secure port, doocker (host -> container)
-KUBE_PROXY_WEB_DOCKER_EXTERNAL_PORT=8733 # Kube Http Proxy container external port, doocker (host -> container)
-KUBE_PROXY_WEB_DOCKER_EXTERNAL_SECURE_PORT=8785 # Kube Proxy container external secure port, doocker (host -> container)
+KUBE_PROXY_DOCKER_EXTERNAL_PORT=8732 # Kube Http Proxy container external port, docker (host -> container)
+KUBE_PROXY_DOCKER_EXTERNAL_SECURE_PORT=8784 # Kube Proxy container external secure port, docker (host -> container)
+KUBE_PROXY_WEB_DOCKER_EXTERNAL_PORT=8733 # Kube Http Proxy container external port, docker (host -> container)
+KUBE_PROXY_WEB_DOCKER_EXTERNAL_SECURE_PORT=8785 # Kube Proxy container external secure port, docker (host -> container)
KUBE_PROXY_PATH="" # Proxy url path, will be set if proxy is started
KUBE_PROXY_ALIVE_URL="/" # Base path for alive check
diff --git a/test/common/test_env-onap-london.sh b/test/common/test_env-onap-london.sh
index 1ddf958..c7d6094 100644
--- a/test/common/test_env-onap-london.sh
+++ b/test/common/test_env-onap-london.sh
@@ -43,7 +43,7 @@
# The variable is created by removing the suffix "_BASE" from the base image variable name.
# Example: A1PMS_IMAGE_BASE -> A1PMS_IMAGE
# This var will point to the local or remote image depending on cmd line arguments.
-# In addition, the repo and the image tag version are selected from the list of image tags based on the cmd line argurment.
+# In addition, the repo and the image tag version are selected from the list of image tags based on the cmd line argument.
# For images built by the script, only tag #1 shall be specified
# For project images, only tag #1, #2, #3 and #4 shall be specified
# For ORAN images (non project), only tag #5 shall be specified
@@ -59,7 +59,7 @@
#############################################################################
# Note:
-# The imgage tags for a1pms and sdnc are updated AFTER the release.
+# The image tags for a1pms and sdnc are updated AFTER the release.
# This means that the latest staging/snapshot images for these two components have
# version one step (0.0.1 - bug-level) higher than the
# latest release image version.
@@ -275,7 +275,7 @@
PROD_STUB_EXTERNAL_SECURE_PORT=8093 # Producer stub container external secure port (host -> container)
PROD_STUB_INTERNAL_SECURE_PORT=8093 # Producer stub container internal secure port (container -> container)
PROD_STUB_JOB_CALLBACK="/callbacks/job" # Callback path for job create/update/delete
-PROD_STUB_SUPERVISION_CALLBACK="/callbacks/supervision" # Callback path for producre supervision
+PROD_STUB_SUPERVISION_CALLBACK="/callbacks/supervision" # Callback path for producer supervision
PROD_STUB_ALIVE_URL="/" # Base path for alive check
PROD_STUB_COMPOSE_DIR="prodstub" # Dir in simulator_group for docker-compose
@@ -297,7 +297,7 @@
SDNC_DISPLAY_NAME="SDNC A1 Controller"
SDNC_EXTERNAL_PORT=8282 # SNDC A1 Controller container external port (host -> container)
SDNC_INTERNAL_PORT=8181 # SNDC A1 Controller container internal port (container -> container)
-SDNC_EXTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container external securee port (host -> container)
+SDNC_EXTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container external secure port (host -> container)
SDNC_INTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container internal secure port (container -> container)
SDNC_DB_APP_NAME="sdncdb" # Name of the SDNC DB container
SDNC_A1_TRUSTSTORE_PASSWORD="a1adapter" # SDNC truststore password
@@ -330,7 +330,7 @@
CONTROL_PANEL_EXTERNAL_PORT=8080 # Control Panel container external port (host -> container)
CONTROL_PANEL_INTERNAL_PORT=8080 # Control Panel container internal port (container -> container)
CONTROL_PANEL_EXTERNAL_SECURE_PORT=8880 # Control Panel container external port (host -> container)
-CONTROL_PANEL_INTERNAL_SECURE_PORT=8082 # Control Panel container intternal port (container -> container)
+CONTROL_PANEL_INTERNAL_SECURE_PORT=8082 # Control Panel container internal port (container -> container)
CONTROL_PANEL_LOGPATH="/logs/nonrtric-controlpanel.log" # Path the application log in the Control Panel container
CONTROL_PANEL_ALIVE_URL="/" # Base path for alive check
CONTROL_PANEL_COMPOSE_DIR="control_panel" # Dir in simulator_group for docker-compose
@@ -380,10 +380,10 @@
KUBE_PROXY_WEB_EXTERNAL_SECURE_PORT=8783 # Kube Proxy container external secure port (host -> container)
KUBE_PROXY_WEB_INTERNAL_SECURE_PORT=8434 # Kube Proxy container internal secure port (container -> container
-KUBE_PROXY_DOCKER_EXTERNAL_PORT=8732 # Kube Http Proxy container external port, doocker (host -> container)
-KUBE_PROXY_DOCKER_EXTERNAL_SECURE_PORT=8784 # Kube Proxy container external secure port, doocker (host -> container)
-KUBE_PROXY_WEB_DOCKER_EXTERNAL_PORT=8733 # Kube Http Proxy container external port, doocker (host -> container)
-KUBE_PROXY_WEB_DOCKER_EXTERNAL_SECURE_PORT=8785 # Kube Proxy container external secure port, doocker (host -> container)
+KUBE_PROXY_DOCKER_EXTERNAL_PORT=8732 # Kube Http Proxy container external port, docker (host -> container)
+KUBE_PROXY_DOCKER_EXTERNAL_SECURE_PORT=8784 # Kube Proxy container external secure port, docker (host -> container)
+KUBE_PROXY_WEB_DOCKER_EXTERNAL_PORT=8733 # Kube Http Proxy container external port, docker (host -> container)
+KUBE_PROXY_WEB_DOCKER_EXTERNAL_SECURE_PORT=8785 # Kube Proxy container external secure port, docker (host -> container)
KUBE_PROXY_PATH="" # Proxy url path, will be set if proxy is started
KUBE_PROXY_ALIVE_URL="/" # Base path for alive check
diff --git a/test/common/test_env-oran-f-release.sh b/test/common/test_env-oran-f-release.sh
index 9af7d91..1cb8def 100755
--- a/test/common/test_env-oran-f-release.sh
+++ b/test/common/test_env-oran-f-release.sh
@@ -43,7 +43,7 @@
# The variable is created by removing the suffix "_BASE" from the base image variable name.
# Example: A1PMS_IMAGE_BASE -> A1PMS_IMAGE
# This var will point to the local or remote image depending on cmd line arguments.
-# In addition, the repo and the image tag version are selected from the list of image tags based on the cmd line argurment.
+# In addition, the repo and the image tag version are selected from the list of image tags based on the cmd line argument.
# For images built by the script, only tag #1 shall be specified
# For project images, only tag #1, #2, #3 and #4 shall be specified
# For ORAN images (non project), only tag #5 shall be specified
@@ -240,10 +240,10 @@
# Port number vars <name>_EXTERNAL_PORT and <name>_EXTERNAL_SECURE_PORT are set as svc port in kube and localhost port in docker
#
# For some components, eg. MR, can be represented as the MR-STUB and/or the DMAAP MR. For these components
-# special vars nameed <name>_LOSTHOST_PORT and <name>_LOCALHOST_SECURE_PORT are used as localhost ports instead of
-# name>_EXTERNAL_PORT and <name>_EXTERNAL_SECURE_PORT ports in docker in order to prevent overalapping ports on local host
+# special vars named <name>_LOCALHOST_PORT and <name>_LOCALHOST_SECURE_PORT are used as localhost ports instead of
+# name>_EXTERNAL_PORT and <name>_EXTERNAL_SECURE_PORT ports in docker in order to prevent overlapping ports on local host
#
-# For KUBE PROXY there are special external port for docker as the proyx exposes also the kube svc port on localhost,
+# For KUBE PROXY there are special external port for docker as the proxy exposes also the kube svc port on localhost,
# therefore a special set of external port are needed for docker <name>_DOCKER_EXTERNAL_PORT and <name>_DOCKER_EXTERNAL_SECURE_PORT
DOCKER_SIM_NWNAME="nonrtric-docker-net" # Name of docker private network
@@ -348,7 +348,7 @@
PROD_STUB_EXTERNAL_SECURE_PORT=8093 # Producer stub container external secure port (host -> container)
PROD_STUB_INTERNAL_SECURE_PORT=8093 # Producer stub container internal secure port (container -> container)
PROD_STUB_JOB_CALLBACK="/callbacks/job" # Callback path for job create/update/delete
-PROD_STUB_SUPERVISION_CALLBACK="/callbacks/supervision" # Callback path for producre supervision
+PROD_STUB_SUPERVISION_CALLBACK="/callbacks/supervision" # Callback path for producer supervision
PROD_STUB_ALIVE_URL="/" # Base path for alive check
PROD_STUB_COMPOSE_DIR="prodstub" # Dir in simulator_group for docker-compose
@@ -372,7 +372,7 @@
SDNC_DISPLAY_NAME="SDNC A1 Controller"
SDNC_EXTERNAL_PORT=8282 # SNDC A1 Controller container external port (host -> container)
SDNC_INTERNAL_PORT=8181 # SNDC A1 Controller container internal port (container -> container)
-SDNC_EXTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container external securee port (host -> container)
+SDNC_EXTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container external secure port (host -> container)
SDNC_INTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container internal secure port (container -> container)
SDNC_DB_APP_NAME="sdncdb" # Name of the SDNC DB container
SDNC_A1_TRUSTSTORE_PASSWORD="a1adapter" # SDNC truststore password
@@ -459,10 +459,10 @@
KUBE_PROXY_WEB_EXTERNAL_SECURE_PORT=8783 # Kube Proxy container external secure port (host -> container)
KUBE_PROXY_WEB_INTERNAL_SECURE_PORT=8434 # Kube Proxy container internal secure port (container -> container
-KUBE_PROXY_DOCKER_EXTERNAL_PORT=8732 # Kube Http Proxy container external port, doocker (host -> container)
-KUBE_PROXY_DOCKER_EXTERNAL_SECURE_PORT=8784 # Kube Proxy container external secure port, doocker (host -> container)
-KUBE_PROXY_WEB_DOCKER_EXTERNAL_PORT=8733 # Kube Http Proxy container external port, doocker (host -> container)
-KUBE_PROXY_WEB_DOCKER_EXTERNAL_SECURE_PORT=8785 # Kube Proxy container external secure port, doocker (host -> container)
+KUBE_PROXY_DOCKER_EXTERNAL_PORT=8732 # Kube Http Proxy container external port, docker (host -> container)
+KUBE_PROXY_DOCKER_EXTERNAL_SECURE_PORT=8784 # Kube Proxy container external secure port, docker (host -> container)
+KUBE_PROXY_WEB_DOCKER_EXTERNAL_PORT=8733 # Kube Http Proxy container external port, docker (host -> container)
+KUBE_PROXY_WEB_DOCKER_EXTERNAL_SECURE_PORT=8785 # Kube Proxy container external secure port, docker (host -> container)
KUBE_PROXY_PATH="" # Proxy url path, will be set if proxy is started
KUBE_PROXY_ALIVE_URL="/" # Base path for alive check
diff --git a/test/common/test_env-oran-g-release.sh b/test/common/test_env-oran-g-release.sh
index b07cb06..5a71de5 100755
--- a/test/common/test_env-oran-g-release.sh
+++ b/test/common/test_env-oran-g-release.sh
@@ -43,7 +43,7 @@
# The variable is created by removing the suffix "_BASE" from the base image variable name.
# Example: A1PMS_IMAGE_BASE -> A1PMS_IMAGE
# This var will point to the local or remote image depending on cmd line arguments.
-# In addition, the repo and the image tag version are selected from the list of image tags based on the cmd line argurment.
+# In addition, the repo and the image tag version are selected from the list of image tags based on the cmd line argument.
# For images built by the script, only tag #1 shall be specified
# For project images, only tag #1, #2, #3 and #4 shall be specified
# For ORAN images (non project), only tag #5 shall be specified
@@ -240,10 +240,10 @@
# Port number vars <name>_EXTERNAL_PORT and <name>_EXTERNAL_SECURE_PORT are set as svc port in kube and localhost port in docker
#
# For some components, eg. MR, can be represented as the MR-STUB and/or the DMAAP MR. For these components
-# special vars nameed <name>_LOSTHOST_PORT and <name>_LOCALHOST_SECURE_PORT are used as localhost ports instead of
-# name>_EXTERNAL_PORT and <name>_EXTERNAL_SECURE_PORT ports in docker in order to prevent overalapping ports on local host
+# special vars named <name>_LOCALHOST_PORT and <name>_LOCALHOST_SECURE_PORT are used as localhost ports instead of
+# name>_EXTERNAL_PORT and <name>_EXTERNAL_SECURE_PORT ports in docker in order to prevent overlapping ports on local host
#
-# For KUBE PROXY there are special external port for docker as the proyx exposes also the kube svc port on localhost,
+# For KUBE PROXY there are special external port for docker as the proxy exposes also the kube svc port on localhost,
# therefore a special set of external port are needed for docker <name>_DOCKER_EXTERNAL_PORT and <name>_DOCKER_EXTERNAL_SECURE_PORT
DOCKER_SIM_NWNAME="nonrtric-docker-net" # Name of docker private network
@@ -348,7 +348,7 @@
PROD_STUB_EXTERNAL_SECURE_PORT=8093 # Producer stub container external secure port (host -> container)
PROD_STUB_INTERNAL_SECURE_PORT=8093 # Producer stub container internal secure port (container -> container)
PROD_STUB_JOB_CALLBACK="/callbacks/job" # Callback path for job create/update/delete
-PROD_STUB_SUPERVISION_CALLBACK="/callbacks/supervision" # Callback path for producre supervision
+PROD_STUB_SUPERVISION_CALLBACK="/callbacks/supervision" # Callback path for producer supervision
PROD_STUB_ALIVE_URL="/" # Base path for alive check
PROD_STUB_COMPOSE_DIR="prodstub" # Dir in simulator_group for docker-compose
@@ -372,7 +372,7 @@
SDNC_DISPLAY_NAME="SDNC A1 Controller"
SDNC_EXTERNAL_PORT=8282 # SNDC A1 Controller container external port (host -> container)
SDNC_INTERNAL_PORT=8181 # SNDC A1 Controller container internal port (container -> container)
-SDNC_EXTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container external securee port (host -> container)
+SDNC_EXTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container external secure port (host -> container)
SDNC_INTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container internal secure port (container -> container)
SDNC_DB_APP_NAME="sdncdb" # Name of the SDNC DB container
SDNC_A1_TRUSTSTORE_PASSWORD="a1adapter" # SDNC truststore password
@@ -459,10 +459,10 @@
KUBE_PROXY_WEB_EXTERNAL_SECURE_PORT=8783 # Kube Proxy container external secure port (host -> container)
KUBE_PROXY_WEB_INTERNAL_SECURE_PORT=8434 # Kube Proxy container internal secure port (container -> container
-KUBE_PROXY_DOCKER_EXTERNAL_PORT=8732 # Kube Http Proxy container external port, doocker (host -> container)
-KUBE_PROXY_DOCKER_EXTERNAL_SECURE_PORT=8784 # Kube Proxy container external secure port, doocker (host -> container)
-KUBE_PROXY_WEB_DOCKER_EXTERNAL_PORT=8733 # Kube Http Proxy container external port, doocker (host -> container)
-KUBE_PROXY_WEB_DOCKER_EXTERNAL_SECURE_PORT=8785 # Kube Proxy container external secure port, doocker (host -> container)
+KUBE_PROXY_DOCKER_EXTERNAL_PORT=8732 # Kube Http Proxy container external port, docker (host -> container)
+KUBE_PROXY_DOCKER_EXTERNAL_SECURE_PORT=8784 # Kube Proxy container external secure port, docker (host -> container)
+KUBE_PROXY_WEB_DOCKER_EXTERNAL_PORT=8733 # Kube Http Proxy container external port, docker (host -> container)
+KUBE_PROXY_WEB_DOCKER_EXTERNAL_SECURE_PORT=8785 # Kube Proxy container external secure port, docker (host -> container)
KUBE_PROXY_PATH="" # Proxy url path, will be set if proxy is started
KUBE_PROXY_ALIVE_URL="/" # Base path for alive check
diff --git a/test/common/test_env-oran-h-release.sh b/test/common/test_env-oran-h-release.sh
index 365c06b..cc41c49 100755
--- a/test/common/test_env-oran-h-release.sh
+++ b/test/common/test_env-oran-h-release.sh
@@ -43,7 +43,7 @@
# The variable is created by removing the suffix "_BASE" from the base image variable name.
# Example: A1PMS_IMAGE_BASE -> A1PMS_IMAGE
# This var will point to the local or remote image depending on cmd line arguments.
-# In addition, the repo and the image tag version are selected from the list of image tags based on the cmd line argurment.
+# In addition, the repo and the image tag version are selected from the list of image tags based on the cmd line argument.
# For images built by the script, only tag #1 shall be specified
# For project images, only tag #1, #2, #3 and #4 shall be specified
# For ORAN images (non project), only tag #5 shall be specified
@@ -248,10 +248,10 @@
# Port number vars <name>_EXTERNAL_PORT and <name>_EXTERNAL_SECURE_PORT are set as svc port in kube and localhost port in docker
#
# For some components, eg. MR, can be represented as the MR-STUB and/or the DMAAP MR. For these components
-# special vars nameed <name>_LOSTHOST_PORT and <name>_LOCALHOST_SECURE_PORT are used as localhost ports instead of
-# name>_EXTERNAL_PORT and <name>_EXTERNAL_SECURE_PORT ports in docker in order to prevent overalapping ports on local host
+# special vars named <name>_LOCALHOST_PORT and <name>_LOCALHOST_SECURE_PORT are used as localhost ports instead of
+# name>_EXTERNAL_PORT and <name>_EXTERNAL_SECURE_PORT ports in docker in order to prevent overlapping ports on local host
#
-# For KUBE PROXY there are special external port for docker as the proyx exposes also the kube svc port on localhost,
+# For KUBE PROXY there are special external port for docker as the proxy exposes also the kube svc port on localhost,
# therefore a special set of external port are needed for docker <name>_DOCKER_EXTERNAL_PORT and <name>_DOCKER_EXTERNAL_SECURE_PORT
DOCKER_SIM_NWNAME="nonrtric-docker-net" # Name of docker private network
@@ -358,7 +358,7 @@
PROD_STUB_EXTERNAL_SECURE_PORT=8093 # Producer stub container external secure port (host -> container)
PROD_STUB_INTERNAL_SECURE_PORT=8093 # Producer stub container internal secure port (container -> container)
PROD_STUB_JOB_CALLBACK="/callbacks/job" # Callback path for job create/update/delete
-PROD_STUB_SUPERVISION_CALLBACK="/callbacks/supervision" # Callback path for producre supervision
+PROD_STUB_SUPERVISION_CALLBACK="/callbacks/supervision" # Callback path for producer supervision
PROD_STUB_ALIVE_URL="/" # Base path for alive check
PROD_STUB_COMPOSE_DIR="prodstub" # Dir in simulator_group for docker-compose
@@ -400,7 +400,7 @@
SDNC_DISPLAY_NAME="SDNC A1 Controller"
SDNC_EXTERNAL_PORT=8282 # SNDC A1 Controller container external port (host -> container)
SDNC_INTERNAL_PORT=8181 # SNDC A1 Controller container internal port (container -> container)
-SDNC_EXTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container external securee port (host -> container)
+SDNC_EXTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container external secure port (host -> container)
SDNC_INTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container internal secure port (container -> container)
SDNC_DB_APP_NAME="sdncdb" # Name of the SDNC DB container
SDNC_A1_TRUSTSTORE_PASSWORD="a1adapter" # SDNC truststore password
@@ -487,10 +487,10 @@
KUBE_PROXY_WEB_EXTERNAL_SECURE_PORT=8783 # Kube Proxy container external secure port (host -> container)
KUBE_PROXY_WEB_INTERNAL_SECURE_PORT=8434 # Kube Proxy container internal secure port (container -> container
-KUBE_PROXY_DOCKER_EXTERNAL_PORT=8732 # Kube Http Proxy container external port, doocker (host -> container)
-KUBE_PROXY_DOCKER_EXTERNAL_SECURE_PORT=8784 # Kube Proxy container external secure port, doocker (host -> container)
-KUBE_PROXY_WEB_DOCKER_EXTERNAL_PORT=8733 # Kube Http Proxy container external port, doocker (host -> container)
-KUBE_PROXY_WEB_DOCKER_EXTERNAL_SECURE_PORT=8785 # Kube Proxy container external secure port, doocker (host -> container)
+KUBE_PROXY_DOCKER_EXTERNAL_PORT=8732 # Kube Http Proxy container external port, docker (host -> container)
+KUBE_PROXY_DOCKER_EXTERNAL_SECURE_PORT=8784 # Kube Proxy container external secure port, docker (host -> container)
+KUBE_PROXY_WEB_DOCKER_EXTERNAL_PORT=8733 # Kube Http Proxy container external port, docker (host -> container)
+KUBE_PROXY_WEB_DOCKER_EXTERNAL_SECURE_PORT=8785 # Kube Proxy container external secure port, docker (host -> container)
KUBE_PROXY_PATH="" # Proxy url path, will be set if proxy is started
KUBE_PROXY_ALIVE_URL="/" # Base path for alive check
diff --git a/test/common/testcase_common.sh b/test/common/testcase_common.sh
index 33e2a38..83889f1 100755
--- a/test/common/testcase_common.sh
+++ b/test/common/testcase_common.sh
@@ -31,6 +31,7 @@
echo " [--override <override-environment-filename>] [--pre-clean] [--gen-stats] [--delete-namespaces]"
echo " [--delete-containers] [--endpoint-stats] [--kubeconfig <config-file>] [--host-path-dir <local-host-dir>]"
echo " [--kubecontext <context-name>] [--docker-host <docker-host-url>] [--docker-proxy <host-or-ip>]"
+ echo " [--target-platform <platform> ]"
}
if [ $# -eq 1 ] && [ "$1" == "help" ]; then
@@ -63,7 +64,7 @@
echo "--override <file> - Override setting from the file supplied by --env-file"
echo "--pre-clean - Will clean kube resouces when running docker and vice versa"
echo "--gen-stats - Collect container/pod runtime statistics"
- echo "--delete-namespaces - Delete kubernetes namespaces before starting tests - but only those created by the test scripts. Kube mode only. Ignored if running with prestarted apps."
+ echo "--delete-namespaces - Delete kubernetes namespaces before starting tests - but only those created by the test scripts. Kube mode only. Ignored if running with pre-started apps."
echo "--delete-containers - Delete docker containers before starting tests - but only those created by the test scripts. Docker mode only."
echo "--endpoint-stats - Collect endpoint statistics"
echo "--kubeconfig - Configure kubectl to use cluster specific cluster config file"
@@ -71,6 +72,7 @@
echo "--kubecontext - Configure kubectl to use a certain context, e.g 'minikube'"
echo "--docker-host - Configure docker to use docker in e.g. a VM"
echo "--docker-proxy - Configure ip/host to docker when docker is running in a VM"
+ echo "--target-platform - Build and pull images for this target platform"
echo ""
echo "List of app short names supported: "$APP_SHORT_NAMES
exit 0
@@ -109,7 +111,7 @@
# Var to hold 'auto' in case containers shall be stopped when test case ends
AUTO_CLEAN=""
-# Var to indicate pre clean, if flag --pre-clean is set the script will clean kube resouces when running docker and vice versa
+# Var to indicate pre clean, if flag --pre-clean is set the script will clean kube resources when running docker and vice versa
PRE_CLEAN="0"
# Var to hold the app names to use local images for
@@ -131,7 +133,7 @@
STOP_AT_ERROR=0
# The default value "DEV" indicate that development image tags (SNAPSHOT) and nexus repos (nexus port 10002) are used.
-# The value "RELEASE" indicate that relase image tag and nexus repos (nexus port) are used
+# The value "RELEASE" indicate that released image tag and nexus repos (nexus port) are used
# Applies only to images defined in the test-env files with image names and tags defined as XXXX_RELEASE
IMAGE_CATEGORY="DEV"
@@ -140,6 +142,12 @@
#V2 names replicated containers <proj-name>-<service-name>-<index>
DOCKER_COMPOSE_VERSION="V1"
+# Name of target platform, if set by start cmd
+IMAGE_TARGET_PLATFORM=""
+IMAGE_TARGET_PLATFORM_CMD_PARAM="" # Docker cmd param for setting target platform
+IMAGE_TARGET_PLATFORM_IMG_TAG="" # Will be set to target platform if cmd parameter is set
+IMAGE_TARGET_PLATFORM_IMG_TAG=$(docker info --format '{{json . }}' | jq -r .Architecture | sed 's/\//_/g')
+
# Function to indent cmd output with one space
indent1() { sed 's/^/ /'; }
@@ -249,7 +257,7 @@
echo $(date) > $TESTLOGS/$ATC/endpoint_tc_start.log
echo "$TC_ONELINE_DESCR" > $TESTLOGS/$ATC/endpoint_tc_slogan.log
-echo "Test failed" > $TESTLOGS/$ATC/endpoint_tc_end.log # Will be overritten if test is ok
+echo "Test failed" > $TESTLOGS/$ATC/endpoint_tc_end.log # Will be overwritten if test is ok
#Variables for counting tests as well as passed and failed tests
RES_TEST=0
@@ -261,7 +269,7 @@
#Var to control if current stats shall be printed
PRINT_CURRENT_STATS=0
-#Var to control if container/pod runtim statistics shall be collected
+#Var to control if container/pod runtime statistics shall be collected
COLLECT_RUNTIME_STATS=0
COLLECT_RUNTIME_STATS_PID=0
@@ -280,7 +288,7 @@
#Localhost, may be set to another host/ip by cmd parameter
LOCALHOST_NAME="localhost"
-#Reseting vars related to token/keys used by kubeproxy when istio is enabled
+#Resetting vars related to token/keys used by kubeproxy when istio is enabled
#The vars are populated if istio is used in the testcase
KUBE_PROXY_CURL_JWT=""
KUBE_PROXY_ISTIO_JWKS_KEYS=""
@@ -345,7 +353,7 @@
# Function to log a test case failed due to incorrect response code
__log_test_fail_status_code() {
- echo -e $RED" FAIL. Exepected status "$1", got "$2 $3 $ERED
+ echo -e $RED" FAIL. Expected status "$1", got "$2 $3 $ERED
((RES_FAIL++))
__print_current_stats
__check_stop_at_error
@@ -404,7 +412,7 @@
# Function to log a failed configuration setup due to incorrect response code
__log_conf_fail_status_code() {
- echo -e $RED" FAIL. Exepected status "$1", got "$2 $3 $ERED
+ echo -e $RED" FAIL. Expected status "$1", got "$2 $3 $ERED
((RES_CONF_FAIL++))
__print_current_stats
__check_stop_at_error
@@ -479,7 +487,7 @@
#Vars to hold the start time and timer text for a custom timer
TC_TIMER_STARTTIME=""
TC_TIMER_TIMER_TEXT=""
-TC_TIMER_CURRENT_FAILS="" # Then numer of failed test when timer starts.
+TC_TIMER_CURRENT_FAILS="" # Then number of failed test when timer starts.
# Compared with the current number of fails at timer stop
# to judge the measurement reliability
@@ -838,7 +846,7 @@
else
if [ -z "KUBE_PRESTARTED_IMAGES" ]; then
DELETE_KUBE_NAMESPACES=0
- echo "Option ignored - Delete namespaces (ignored when using prestarted apps)"
+ echo "Option ignored - Delete namespaces (ignored when using pre-started apps)"
else
DELETE_KUBE_NAMESPACES=1
echo "Option set - Delete namespaces"
@@ -985,6 +993,32 @@
fi
fi
fi
+ if [ $paramerror -eq 0 ]; then
+ if [ "$1" == "--target-platform" ]; then
+ shift;
+ if [ -z "$1" ]; then
+ paramerror=1
+ if [ -z "$paramerror_str" ]; then
+ paramerror_str="No platform string found for : '--target-platform'"
+ fi
+ else
+ if [ "$1" != "linux/amd64" ]; then
+ paramerror=1
+ if [ -z "$paramerror_str" ]; then
+ paramerror_str="Only target platform 'linux/amd64' currently supported"
+ fi
+ else
+ export IMAGE_TARGET_PLATFORM=$1
+ export IMAGE_TARGET_PLATFORM_CMD_PARAM="--platform $1"
+ echo "Option set - Build and pull platform set to: "$1
+ IMAGE_TARGET_PLATFORM_IMG_TAG=$(echo "$1" | sed 's/\//_/g')
+ echo "Setting 'docker build' as alias for 'docker buildx'" | indent2
+ shift
+ foundparm=0
+ fi
+ fi
+ fi
+ fi
done
echo ""
@@ -1225,11 +1259,11 @@
echo -e "Application\tApp short name\tImage\ttag\ttag-switch" > $image_list_file
# Check if image env var is set and if so export the env var with image to use (used by docker compose files)
-# arg: <app-short-name> <target-variable-name> <image-variable-name> <image-tag-variable-name> <tag-suffix> <image name>
+# arg: <app-short-name> <target-variable-name> <image-variable-name> <image-tag-variable-name> <tag-suffix> <image name> <target-platform>
__check_and_create_image_var() {
-
- if [ $# -ne 6 ]; then
- echo "Expected arg: <app-short-name> <target-variable-name> <image-variable-name> <image-tag-variable-name> <tag-suffix> <image name>"
+ echo $@
+ if [ $# -ne 7 ]; then
+ echo "Expected arg: <app-short-name> <target-variable-name> <image-variable-name> <image-tag-variable-name> <tag-suffix> <image name> <target-platform>"
((IMAGE_ERR++))
return
fi
@@ -1245,7 +1279,9 @@
image="${!3}"
tmptag=$4"_"$5
tag="${!tmptag}"
-
+ if [ ! -z "$7" ]; then
+ tag=$tag-$7 # add platform to tag - for local images built by the test script
+ fi
optional_image_repo_target=""
if [ -z $image ]; then
@@ -1574,7 +1610,7 @@
fi
if [ -z "$tmp_im" ]; then
echo -ne " Pulling image${SAMELINE}"
- out=$(docker pull $source_image)
+ out=$(docker pull $IMAGE_TARGET_PLATFORM_CMD_PARAM $source_image)
if [ $? -ne 0 ]; then
echo ""
echo -e " Pulling image -$RED could not be pulled"$ERED
@@ -1915,7 +1951,7 @@
function_pointer="__"$imagename"_initial_setup"
$function_pointer
- function_pointer="__"$imagename"_statisics_setup"
+ function_pointer="__"$imagename"_statistics_setup"
LOG_STAT_ARGS=$LOG_STAT_ARGS" "$($function_pointer)
fi
done
@@ -2758,7 +2794,7 @@
# This function is called and is expected to exist in the imported
# file for the ricsim test functions
# The resulting function impl shall scale the resources to 0
- # For prestarted apps, the function waits until the resources are 0
+ # For pre-started apps, the function waits until the resources are 0
# For included (not prestated) apps, the scaling is just ordered
__check_prestarted_image $imagename
if [ $? -eq 0 ]; then
diff --git a/test/cr/README.md b/test/cr/README.md
index a745529..e93fd1b 100644
--- a/test/cr/README.md
+++ b/test/cr/README.md
@@ -23,12 +23,12 @@
The following REST operations are available:
>Send a message to CR<br>
-This method puts a request message from A1PMS to notify that sychronization between A1PMS and certain RIC happens.<br>
+This method puts a request message from A1PMS to notify that synchronization between A1PMS and certain RIC happens.<br>
```URI and payload, (PUT or POST): /callbacks/<id> <json messages>```<br>
```response: OK 200 or 500 for other errors```
>Fetch one message for an id from CR<br>
-This method fetches the oldes message for an id, and removes the message.<br>
+This method fetches the oldest message for an id, and removes the message.<br>
```URI and payload, (GET): /get-event/<id>```<br>
```response: <json messages> 200 or 500 for other errors```
@@ -37,7 +37,7 @@
```URI and payload, (GET): /get-all-events/<id>```<br>
```response: <json array of json messages> 200 or 500 for other errors```
->Dump all currently wating callback messages in CR<br>
+>Dump all currently waiting callback messages in CR<br>
This method fetches all message in an array for an id. Messages are left intact in the CR.<br>
```URI and payload, (GET): /db```<br>
```response: <json> 200```
@@ -67,7 +67,7 @@
file "generate_cert_and_key.sh" is a shell script to generate certificate and key
file "pass" stores the password when you run the shell script
-This certificates/key can be overriden by mounting a volume when using "docker run" or "docker-compose"
+This certificates/key can be overridden by mounting a volume when using "docker run" or "docker-compose"
In 'docker run', use field:<br>
>```-v "$PWD/certificate:/usr/src/app/cert"```<br/>
diff --git a/test/cr/app/cr.py b/test/cr/app/cr.py
index 2066e14..de1f1ee 100644
--- a/test/cr/app/cr.py
+++ b/test/cr/app/cr.py
@@ -229,7 +229,7 @@
global cntr_msg_callbacks
global cntr_batch_callbacks
- storeas=request.args.get('storeas') #If set, store payload as a md5 hascode and dont log the payload
+ storeas=request.args.get('storeas') #If set, store payload as a md5 hash code and dont log the payload
#Large payloads will otherwise overload the server
try:
print("Received callback (mr) for id: "+id +", content-type="+request.content_type)
@@ -308,7 +308,7 @@
global cntr_msg_callbacks
global cntr_batch_callbacks
- storeas=request.args.get('storeas') #If set, store payload as a md5 hascode and dont log the payload
+ storeas=request.args.get('storeas') #If set, store payload as a md5 hash code and dont log the payload
#Large payloads will otherwise overload the server
try:
print("Received callback for id: "+id +", content-type="+request.content_type)
@@ -446,7 +446,7 @@
#Set force delay response, in seconds, for all callbacks
-#/froceesponse?delay=<seconds>
+#/forceresponse?delay=<seconds>
@app.route('/forcedelay', methods=['POST'])
def forcedelay():
@@ -469,7 +469,7 @@
return Response("Force delay : " + str(forced_settings['delay']) + " sec failed", 500, mimetype=MIME_TEXT)
### Admin ###
-# Reset all messsages and counters
+# Reset all messages and counters
@app.route('/reset',
methods=['GET', 'POST', 'PUT'])
def reset():
diff --git a/test/http-https-proxy/README.md b/test/http-https-proxy/README.md
index 20413f3..21283a5 100644
--- a/test/http-https-proxy/README.md
+++ b/test/http-https-proxy/README.md
@@ -2,7 +2,7 @@
The http proxy is a generic http proxy which is able to proxy both http and https destination calls.
The call to the proxy (to control the proxy call) also supports both http and https (https is using a self signed cert).
-The main usage for the proxy is as a gateway to all services and pod inside a kubernetest cluster.
+The main usage for the proxy is as a gateway to all services and pod inside a kubernetes cluster.
However, it can be used a basic standard http proxy as well.
## Ports and certificates
diff --git a/test/http-https-proxy/http_proxy.js b/test/http-https-proxy/http_proxy.js
index e90dfca..178b75f 100644
--- a/test/http-https-proxy/http_proxy.js
+++ b/test/http-https-proxy/http_proxy.js
@@ -30,9 +30,9 @@
const proxyport = 8080;
// Proxy server port for https
const proxyporthttps = 8433;
-// Proyx server alive check, port for http
+// Proxy server alive check, port for http
const aliveport = 8081;
-// Proyx server alive check, port for https
+// Proxy server alive check, port for https
const aliveporthttps = 8434;
// Default https destination port
@@ -112,7 +112,7 @@
}
);
- // Handle the connection and data transfer between source and desitnation
+ // Handle the connection and data transfer between source and destination
proxyrequest.on('error', function (error) {
clientresponse.writeHead(500);
stats['http-requests-failed']++;
@@ -158,7 +158,7 @@
}
);
- // Handle the connection and data transfer between source and desitnation
+ // Handle the connection and data transfer between source and destination
proxysocket.on('data', function (chunk) {
socketrequest.write(chunk);
});
@@ -191,7 +191,7 @@
function main() {
// -------------------- Alive server ----------------------------------
- // Responde with '200' and statistics for any path (except for GET|PUT|DELETE on /debug) on the alive address
+ // Respond with '200' and statistics for any path (except for GET|PUT|DELETE on /debug) on the alive address
const alivelistener = function (req, res) {
if (req.url == "/debug") {
if (req.method == "GET") {
diff --git a/test/kafka-procon/main.go b/test/kafka-procon/main.go
index e562b26..75f3163 100644
--- a/test/kafka-procon/main.go
+++ b/test/kafka-procon/main.go
@@ -40,13 +40,13 @@
// Note: consumer 'group' and consumer 'user' both uses hardcoded values specific to this interface
// globalCounters var holding the "global counters"
-// recieved number of received messages from all topics (int)
+// received number of received messages from all topics (int)
// sent number of sent messages to all topics (int)
// topics var holding all topic related info
// <topic-name> name of a topic (present after topic is created)
// content-type data type of the topic (string)
// counters
-// recieved number of received messages from the topic (int)
+// received number of received messages from the topic (int)
// sent number of sent messages to the topic (int)
// messages
// send messages waiting to be sent (set when sending is started) (fifo)
diff --git a/test/kafka-procon/start_local.sh b/test/kafka-procon/start_local.sh
index bfc1a1b..4ec520b 100755
--- a/test/kafka-procon/start_local.sh
+++ b/test/kafka-procon/start_local.sh
@@ -17,7 +17,7 @@
# ============LICENSE_END=================================================
#
-echo "This script requires golang to be installed and a running kafka instance on (or availble to) localhost"
+echo "This script requires golang to be installed and a running kafka instance on (or available to) localhost"
# Script to build and start app locally
if [ $# -ne 1 ]; then
diff --git a/test/mrstub/README.md b/test/mrstub/README.md
index 202c1e5..54aae2f 100644
--- a/test/mrstub/README.md
+++ b/test/mrstub/README.md
@@ -15,7 +15,7 @@
| 3906 | https |
The dir cert contains a self-signed cert. Use the script generate_cert_and_key.sh to generate a new certificate and key. The password of the certificate must be set 'test'.
-The same urls are availables on both the http port 3905 and the https port 3906. If using curl and https, the flag -k shall be given to make curl ignore checking the certificate.
+The same urls are available on both the http port 3905 and the https port 3906. If using curl and https, the flag -k shall be given to make curl ignore checking the certificate.
### Message Router interface
@@ -37,7 +37,7 @@
The following REST operations are available:
>Send a message to MR<br>
-This method puts a request message in the queue for the a1pms to pick up. The returned correlationId (auto generated by the mrstub) is used when polling for the reposone message of this particular request.<br>
+This method puts a request message in the queue for the a1pms to pick up. The returned correlationId (auto generated by the mrstub) is used when polling for the response message of this particular request.<br>
```URI and parameters (GET): /send-request?operation=<GET|PUT|POST|DELETE>&url=<url>```<br><br>
```response: <correlation-id> (http 200) or 400 for parameter error or 500 for other errors```
@@ -70,12 +70,12 @@
file "generate_cert_and_key.sh" is a shell script to generate certificate and key
file "pass" stores the password when you run the shell script
->Start the a1-interface container without specifing external certificates:<br>
+>Start the a1-interface container without specifying external certificates:<br>
```docker run --rm -it -p 3905:3905 -p 3906:3906 mrstub```
It will listen to http 3905 port and https 3906 port(using default certificates) at the same time.
-This certificates/key can be overriden by mounting a volume when using "docker run" or "docker-compose"
+This certificates/key can be overridden by mounting a volume when using "docker run" or "docker-compose"
In 'docker run', use field:<br>
>```-v "$PWD/certificate:/usr/src/app/cert"```<br>
diff --git a/test/mrstub/app/main.py b/test/mrstub/app/main.py
index 0995428..c0df8c1 100644
--- a/test/mrstub/app/main.py
+++ b/test/mrstub/app/main.py
@@ -544,7 +544,7 @@
### Admin ###
-# Reset all messsages and counters
+# Reset all messages and counters
@app.route('/reset',
methods=['GET', 'POST', 'PUT'])
def reset():
diff --git a/test/prodstub/README.md b/test/prodstub/README.md
index 60a190b..6128b9a 100644
--- a/test/prodstub/README.md
+++ b/test/prodstub/README.md
@@ -2,7 +2,7 @@
The producer stub is intended for function tests of simulate data producers.
The simulator handles the callbacks for supervision of producers as well as create/update and delete jobs.
-As an intial step, the indended job and producers, with supported types, are setup (armed) in the simulator.
+As an initial step, the intended job and producers, with supported types, are setup (armed) in the simulator.
In addition, specific response codes can configured for each callback request.
## Ports and certificates
@@ -16,7 +16,7 @@
| 8093 | https |
The dir cert contains a self-signed cert. Use the script generate_cert_and_key.sh to generate a new certificate and key. The password of the certificate must be set 'test'.
-The same urls are availables on both the http port 8092 and the https port 8093. If using curl and https, the flag -k shall be given to make curl ignore checking the certificate.
+The same urls are available on both the http port 8092 and the https port 8093. If using curl and https, the flag -k shall be given to make curl ignore checking the certificate.
### Prodstub interface
@@ -42,16 +42,16 @@
>Arm a job create<br>
This method arms a job for creation and sets an optional response code for create/update<br>
-```URI and payload, (PUT): /arm/create/<producer_id>/<job_id>[?response=<resonsecode>]```<br>
+```URI and payload, (PUT): /arm/create/<producer_id>/<job_id>[?response=<responsecode>]```<br>
```response: 200 or 400 for other errors```
>Arm a job delete<br>
This method arms a job for deletion and sets an optional response code for delete<br>
-```URI and payload, (PUT): /arm/delete/<producer_id>/<job_id>[?response=<resonsecode>]```<br>
+```URI and payload, (PUT): /arm/delete/<producer_id>/<job_id>[?response=<responsecode>]```<br>
```response: 200 or 400 for other errors```
>Arm a producer supervision<br>
This method arms a supervision and sets an optional response code for supervision calls<br>
-```URI and payload, (PUT): /arm/delete/<producer_id>[?response=<resonsecode>]```<br>
+```URI and payload, (PUT): /arm/delete/<producer_id>[?response=<responsecode>]```<br>
```response: 200 or 400 for other errors```
>Arm a type for a producer<br>
@@ -121,12 +121,12 @@
file "generate_cert_and_key.sh" is a shell script to generate certificate and key
file "pass" stores the password when you run the shell script
->Start the container without specifing external certificates:<br>
+>Start the container without specifying external certificates:<br>
```docker run --rm -it --p 8092:8092 -p 8093:8093 producer-stub```
It will listen to http 8092 port and https 8093 port(using default certificates) at the same time.
-This certificates/key can be overriden by mounting a volume when using "docker run" or "docker-compose"
+This certificates/key can be overridden by mounting a volume when using "docker run" or "docker-compose"
In 'docker run', use field:
>```-v "$PWD/certificate:/usr/src/app/cert"```
diff --git a/test/prodstub/app/prodstub.py b/test/prodstub/app/prodstub.py
index 13eefb3..d760440 100644
--- a/test/prodstub/app/prodstub.py
+++ b/test/prodstub/app/prodstub.py
@@ -63,7 +63,7 @@
STATUS="/status"
-#Constsants
+#Constants
APPL_JSON='application/json'
UNKNOWN_QUERY_PARAMETERS="Unknown query parameter(s)"
RETURNING_CONFIGURED_RESP="returning configured response code"
@@ -185,7 +185,7 @@
# Arm the create callback with a response code
# Omitting the query parameter switch to response back to the standard 200/201 response
-# URI and parameters (PUT): /arm/create/<producer_id>/<job_id>[?response=<resonsecode>]
+# URI and parameters (PUT): /arm/create/<producer_id>/<job_id>[?response=<repsonsecode>]
# Setting
# response: 200 (400 if incorrect query params)
@app.route(ARM_CREATE_RESPONSE,
@@ -218,7 +218,7 @@
# Arm the delete callback with a response code
# Omitting the query parameter switch to response back to the standard 204 response
-# URI and parameters (PUT): /arm/delete/<producer_id>/<job-id>[?response=<resonsecode>]
+# URI and parameters (PUT): /arm/delete/<producer_id>/<job-id>[?response=<responsecode>]
# response: 200 (400 if incorrect query params)
@app.route(ARM_DELETE_RESPONSE,
methods=['PUT'])
@@ -239,7 +239,7 @@
job_dict=setup_callback_dict(producer_id, job_id)
- if (arm_response is None): #Reset the response depening if a job exists or not
+ if (arm_response is None): #Reset the response depending if a job exists or not
if (job_dict['json'] is None):
job_dict['delete_response']=404
else:
@@ -251,7 +251,7 @@
# Arm the supervision callback with a response code
# Omitting the query parameter switch to response back to the standard 200 response
-# URI and parameters (PUT): /arm/supervision/<producer_id>[?response=<resonsecode>]
+# URI and parameters (PUT): /arm/supervision/<producer_id>[?response=<responsecode>]
# response: 200 (400 if incorrect query params)
@app.route(ARM_SUPERVISION_RESPONSE,
methods=['PUT'])
diff --git a/test/simulator-group/sim-monitor.js b/test/simulator-group/sim-monitor.js
index f993410..eb5d1c6 100644
--- a/test/simulator-group/sim-monitor.js
+++ b/test/simulator-group/sim-monitor.js
@@ -48,7 +48,7 @@
try {
http.get(url, (resp) => {
- // A chunk of data has been recieved.
+ // A chunk of data has been received.
resp.on('data', (chunk) => {
data += chunk;
});
@@ -73,7 +73,7 @@
}
-//Format a comma separated list of data to a html-safe string with fixed fieldsizes
+//Format a comma separated list of data to a html-safe string with fixed field sizes
function formatDataRow(commaList) {
var str = "";
var tmp=commaList.split(',');
@@ -89,7 +89,7 @@
return str;
}
-//Format a comma separated list of ids to a html-safe string with fixed fieldsizes
+//Format a comma separated list of ids to a html-safe string with fixed field sizes
function formatIdRow(commaList) {
var str = "";
var tmp=commaList.split(',');