Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
NONRTRIC - 3PP dependency version update
[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
b3ef07b
..
68cf976
100644
(file)
--- a/
test/common/sdnc_api_functions.sh
+++ b/
test/common/sdnc_api_functions.sh
@@
-120,6
+120,12
@@
__SDNC_statisics_setup() {
fi
}
fi
}
+# Check application requirements, e.g. helm, the the test needs. Exit 1 if req not satisfied
+# args: -
+__SDNC_test_requirements() {
+ :
+}
+
#######################################################
# Set http as the protocol to use for all communication to SDNC
#######################################################
# Set http as the protocol to use for all communication to SDNC
@@
-140,15
+146,15
@@
use_sdnc_https() {
# args: <protocol> <internal-port> <external-port>
__sdnc_set_protocoll() {
echo -e $BOLD"$SDNC_DISPLAY_NAME protocol setting"$EBOLD
# args: <protocol> <internal-port> <external-port>
__sdnc_set_protocoll() {
echo -e $BOLD"$SDNC_DISPLAY_NAME protocol setting"$EBOLD
- echo -e " Using $BOLD
http
$EBOLD towards $SDNC_DISPLAY_NAME"
+ echo -e " Using $BOLD
$1
$EBOLD towards $SDNC_DISPLAY_NAME"
## Access to SDNC
SDNC_SERVICE_PATH=$1"://"$SDNC_APP_NAME":"$2 # docker access, container->container and script->container via proxy
## Access to SDNC
SDNC_SERVICE_PATH=$1"://"$SDNC_APP_NAME":"$2 # docker access, container->container and script->container via proxy
- SDNC_SERVICE_API_PATH=$1"://"$SDNC_USER":"$SDNC_PWD"@"$SDNC_APP_NAME":"$
1
$SDNC_API_URL
+ SDNC_SERVICE_API_PATH=$1"://"$SDNC_USER":"$SDNC_PWD"@"$SDNC_APP_NAME":"$
2
$SDNC_API_URL
if [ $RUNMODE == "KUBE" ]; then
SDNC_SERVICE_PATH=$1"://"$SDNC_APP_NAME.$KUBE_SDNC_NAMESPACE":"$3 # kube access, pod->svc and script->svc via proxy
if [ $RUNMODE == "KUBE" ]; then
SDNC_SERVICE_PATH=$1"://"$SDNC_APP_NAME.$KUBE_SDNC_NAMESPACE":"$3 # kube access, pod->svc and script->svc via proxy
- SDNC_SERVICE_API_PATH=$1"://"$SDNC_USER":"$SDNC_PWD"@"$SDNC_APP_NAME.
KUBE_SDNC_NAMESPACE":"$1
$SDNC_API_URL
+ SDNC_SERVICE_API_PATH=$1"://"$SDNC_USER":"$SDNC_PWD"@"$SDNC_APP_NAME.
$KUBE_SDNC_NAMESPACE":"$3
$SDNC_API_URL
fi
echo ""
fi
echo ""
@@
-380,16
+386,13
@@
__do_curl_to_controller() {
controller_api_get_A1_policy_ids() {
__log_test_start $@
controller_api_get_A1_policy_ids() {
__log_test_start $@
- ric_id=$3
- if [ $RUNMODE == "KUBE" ]; then
- ric_id=$(get_kube_sim_host $3)
- fi
+ ric_id=$(__find_sim_host $3)
paramError=1
if [ $# -gt 3 ] && [ $2 == "OSC" ]; then
paramError=1
if [ $# -gt 3 ] && [ $2 == "OSC" ]; then
- url="$
RIC_SIM_HTTPX://$ric_id:$RIC_SIM_PORT
/a1-p/policytypes/$4/policies"
+ url="$
ric_id
/a1-p/policytypes/$4/policies"
paramError=0
elif [ $# -gt 2 ] && [ $2 == "STD" ]; then
paramError=0
elif [ $# -gt 2 ] && [ $2 == "STD" ]; then
- url="$
RIC_SIM_HTTPX://$ric_id:$RIC_SIM_PORT
/A1-P/v1/policies"
+ url="$
ric_id
/A1-P/v1/policies"
paramError=0
fi
paramError=0
fi
@@
-446,13
+449,10
@@
controller_api_get_A1_policy_ids() {
controller_api_get_A1_policy_type() {
__log_test_start $@
controller_api_get_A1_policy_type() {
__log_test_start $@
- ric_id=$3
- if [ $RUNMODE == "KUBE" ]; then
- ric_id=$(get_kube_sim_host $3)
- fi
+ ric_id=$(__find_sim_host $3)
paramError=1
if [ $# -gt 3 ] && [ $2 == "OSC" ]; then
paramError=1
if [ $# -gt 3 ] && [ $2 == "OSC" ]; then
- url="$
RIC_SIM_HTTPX://$ric_id:$RIC_SIM_PORT
/a1-p/policytypes/$4"
+ url="$
ric_id
/a1-p/policytypes/$4"
paramError=0
fi
paramError=0
fi
@@
-500,16
+500,13
@@
controller_api_get_A1_policy_type() {
controller_api_delete_A1_policy() {
__log_test_start $@
controller_api_delete_A1_policy() {
__log_test_start $@
- ric_id=$3
- if [ $RUNMODE == "KUBE" ]; then
- ric_id=$(get_kube_sim_host $3)
- fi
+ ric_id=$(__find_sim_host $3)
paramError=1
if [ $# -eq 5 ] && [ $2 == "OSC" ]; then
paramError=1
if [ $# -eq 5 ] && [ $2 == "OSC" ]; then
- url="$
RIC_SIM_HTTPX://$ric_id:$RIC_SIM_PORT
/a1-p/policytypes/$4/policies/$UUID$5"
+ url="$
ric_id
/a1-p/policytypes/$4/policies/$UUID$5"
paramError=0
elif [ $# -eq 4 ] && [ $2 == "STD" ]; then
paramError=0
elif [ $# -eq 4 ] && [ $2 == "STD" ]; then
- url="$
RIC_SIM_HTTPX://$ric_id:$RIC_SIM_PORT
/A1-P/v1/policies/$UUID$4"
+ url="$
ric_id
/A1-P/v1/policies/$UUID$4"
paramError=0
fi
paramError=0
fi
@@
-542,18
+539,15
@@
controller_api_delete_A1_policy() {
controller_api_put_A1_policy() {
__log_test_start $@
controller_api_put_A1_policy() {
__log_test_start $@
- ric_id=$3
- if [ $RUNMODE == "KUBE" ]; then
- ric_id=$(get_kube_sim_host $3)
- fi
+ ric_id=$(__find_sim_host $3)
paramError=1
if [ $# -eq 6 ] && [ $2 == "OSC" ]; then
paramError=1
if [ $# -eq 6 ] && [ $2 == "OSC" ]; then
- url="$
RIC_SIM_HTTPX://$ric_id:$RIC_SIM_PORT
/a1-p/policytypes/$4/policies/$UUID$5"
+ url="$
ric_id
/a1-p/policytypes/$4/policies/$UUID$5"
body=$(sed 's/XXX/'${5}'/g' $6)
paramError=0
elif [ $# -eq 5 ] && [ $2 == "STD" ]; then
body=$(sed 's/XXX/'${5}'/g' $6)
paramError=0
elif [ $# -eq 5 ] && [ $2 == "STD" ]; then
- url="$
RIC_SIM_HTTPX://$ric_id:$RIC_SIM_PORT
/A1-P/v1/policies/$UUID$4"
+ url="$
ric_id
/A1-P/v1/policies/$UUID$4"
body=$(sed 's/XXX/'${4}'/g' $5)
paramError=0
fi
body=$(sed 's/XXX/'${4}'/g' $5)
paramError=0
fi
@@
-588,14
+582,11
@@
controller_api_put_A1_policy() {
controller_api_get_A1_policy_status() {
__log_test_start $@
controller_api_get_A1_policy_status() {
__log_test_start $@
- ric_id=$3
- if [ $RUNMODE == "KUBE" ]; then
- ric_id=$(get_kube_sim_host $3)
- fi
+ ric_id=$(__find_sim_host $3)
targetJson=""
paramError=1
if [ $# -ge 5 ] && [ $2 == "OSC" ]; then
targetJson=""
paramError=1
if [ $# -ge 5 ] && [ $2 == "OSC" ]; then
- url="$
RIC_SIM_HTTPX://$ric_id:$RIC_SIM_PORT
/a1-p/policytypes/$4/policies/$UUID$5/status"
+ 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\""
if [ $# -gt 5 ]; then
targetJson="{\"instance_status\":\"$6\""
targetJson=$targetJson",\"has_been_deleted\":\"$7\""
@@
-603,7
+594,7
@@
controller_api_get_A1_policy_status() {
fi
paramError=0
elif [ $# -ge 4 ] && [ $2 == "STD" ]; then
fi
paramError=0
elif [ $# -ge 4 ] && [ $2 == "STD" ]; then
- url="$
RIC_SIM_HTTPX://$ric_id:$RIC_SIM_PORT
/A1-P/v1/policies/$UUID$4/status"
+ url="$
ric_id
/A1-P/v1/policies/$UUID$4/status"
if [ $# -gt 4 ]; then
targetJson="{\"enforceStatus\":\"$5\""
if [ $# -eq 6 ]; then
if [ $# -gt 4 ]; then
targetJson="{\"enforceStatus\":\"$5\""
if [ $# -eq 6 ]; then