Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Restart tests form sample app producer and consumer
[nonrtric.git]
/
test
/
common
/
sdnc_api_functions.sh
diff --git
a/test/common/sdnc_api_functions.sh
b/test/common/sdnc_api_functions.sh
index
2701957
..
4fd9de4
100644
(file)
--- a/
test/common/sdnc_api_functions.sh
+++ b/
test/common/sdnc_api_functions.sh
@@
-33,8
+33,8
@@
__SDNC_imagesetup() {
sdnc_suffix_tag="REMOTE_RELEASE_ONAP"
fi
done
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
@@
__SDNC_kube_scale_zero() {
}
# Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
}
# 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"
}
__SDNC_kube_scale_zero_and_wait() {
echo -e " SDNC replicas kept as is"
}
-# Delete all kube resouces for the app
+# Delete all kube resou
r
ces 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
# 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
@@
__SDNC_kube_delete_all() {
# Store docker logs
# This function is called for apps managed by the test script.
# Store docker logs
# This function is called for apps managed by the test script.
-# args: <log-dir> <file-pre
x
ix>
+# args: <log-dir> <file-pre
f
ix>
__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
__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
@@
__SDNC_initial_setup() {
use_sdnc_http
}
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 kubernet
e
s pods or docker containers
# For docker, the namespace shall be excluded
# 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: -
# args: -
-__SDNC_statisics_setup() {
+__SDNC_statis
t
ics_setup() {
if [ $RUNMODE == "KUBE" ]; then
echo "SDNC $SDNC_APP_NAME $KUBE_SDNC_NAMESPACE"
else
if [ $RUNMODE == "KUBE" ]; then
echo "SDNC $SDNC_APP_NAME $KUBE_SDNC_NAMESPACE"
else
@@
-198,7
+198,7
@@
start_sdnc() {
__check_included_image "SDNC"
retcode_i=$?
__check_included_image "SDNC"
retcode_i=$?
- # Check if app shall only be used by the test
sc
ipt
+ # Check if app shall only be used by the test
scr
ipt
__check_prestarted_image "SDNC"
retcode_p=$?
__check_prestarted_image "SDNC"
retcode_p=$?
@@
-588,9
+588,8
@@
controller_api_get_A1_policy_status() {
if [ $# -ge 5 ] && [ $2 == "OSC" ]; then
url="$ric_id/a1-p/policytypes/$4/policies/$UUID$5/status"
if [ $# -gt 5 ]; then
if [ $# -ge 5 ] && [ $2 == "OSC" ]; then
url="$ric_id/a1-p/policytypes/$4/policies/$UUID$5/status"
if [ $# -gt 5 ]; then
- targetJson="{\"instance_status\":\"$6\""
- targetJson=$targetJson",\"has_been_deleted\":\"$7\""
- targetJson=$targetJson",\"created_at\":\"????\"}"
+ targetJson="{\"enforceStatus\":\"$6\""
+ targetJson=$targetJson",\"enforceReason\":\"$7\"}"
fi
paramError=0
elif [ $# -ge 4 ] && [ $2 == "STD" ]; then
fi
paramError=0
elif [ $# -ge 4 ] && [ $2 == "STD" ]; then