Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Restructure test cases and upgraded test environment
[nonrtric.git]
/
test
/
common
/
controller_api_functions.sh
diff --git
a/test/common/controller_api_functions.sh
b/test/common/controller_api_functions.sh
index
c4ba71c
..
378a6d4
100644
(file)
--- a/
test/common/controller_api_functions.sh
+++ b/
test/common/controller_api_functions.sh
@@
-79,10
+79,10
@@
controller_api_get_A1_policy_ids() {
paramError=1
if [ $# -gt 3 ] && [ $2 == "OSC" ]; then
paramError=1
if [ $# -gt 3 ] && [ $2 == "OSC" ]; then
- url="
http://$3:$RIC_SIM_INTERNAL
_PORT/a1-p/policytypes/$4/policies"
+ url="
$RIC_SIM_HTTPX://$3:$RIC_SIM
_PORT/a1-p/policytypes/$4/policies"
paramError=0
elif [ $# -gt 2 ] && [ $2 == "STD" ]; then
paramError=0
elif [ $# -gt 2 ] && [ $2 == "STD" ]; then
- url="
http://$3:$RIC_SIM_INTERNAL
_PORT/A1-P/v1/policies"
+ url="
$RIC_SIM_HTTPX://$3:$RIC_SIM
_PORT/A1-P/v1/policies"
paramError=0
fi
paramError=0
fi
@@
-98,12
+98,14
@@
controller_api_get_A1_policy_ids() {
if [ $? -ne 0 ]; then
echo -e $RED" FAIL. Exepected status "$1", got "$status "(likely remote server error)"$ERED
((RES_FAIL++))
if [ $? -ne 0 ]; then
echo -e $RED" FAIL. Exepected status "$1", got "$status "(likely remote server error)"$ERED
((RES_FAIL++))
+ __check_stop_at_error
return 1
fi
if [ $status -ne $1 ]; then
echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
((RES_FAIL++))
return 1
fi
if [ $status -ne $1 ]; then
echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
((RES_FAIL++))
+ __check_stop_at_error
return 1
fi
body=${res:0:${#res}-3}
return 1
fi
body=${res:0:${#res}-3}
@@
-117,7
+119,7
@@
controller_api_get_A1_policy_ids() {
if [ "$targetJson" != "[" ]; then
targetJson=$targetJson","
fi
if [ "$targetJson" != "[" ]; then
targetJson=$targetJson","
fi
- targetJson=$targetJson"\"$pid\""
+ targetJson=$targetJson"\"$
UUID$
pid\""
done
targetJson=$targetJson"]"
done
targetJson=$targetJson"]"
@@
-128,6
+130,7
@@
controller_api_get_A1_policy_ids() {
if [ $res -ne 0 ]; then
echo -e $RED" FAIL, returned body not correct"$ERED
((RES_FAIL++))
if [ $res -ne 0 ]; then
echo -e $RED" FAIL, returned body not correct"$ERED
((RES_FAIL++))
+ __check_stop_at_error
return 1
fi
return 1
fi
@@
-147,7
+150,7
@@
controller_api_get_A1_policy_type() {
paramError=1
if [ $# -gt 3 ] && [ $2 == "OSC" ]; then
paramError=1
if [ $# -gt 3 ] && [ $2 == "OSC" ]; then
- url="
http://$3:$RIC_SIM_INTERNAL
_PORT/a1-p/policytypes/$4"
+ url="
$RIC_SIM_HTTPX://$3:$RIC_SIM
_PORT/a1-p/policytypes/$4"
paramError=0
fi
paramError=0
fi
@@
-163,12
+166,14
@@
controller_api_get_A1_policy_type() {
if [ $? -ne 0 ]; then
echo -e $RED" FAIL. Exepected status "$1", got "$status "(likely remote server error)"$ERED
((RES_FAIL++))
if [ $? -ne 0 ]; then
echo -e $RED" FAIL. Exepected status "$1", got "$status "(likely remote server error)"$ERED
((RES_FAIL++))
+ __check_stop_at_error
return 1
fi
if [ $status -ne $1 ]; then
echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
((RES_FAIL++))
return 1
fi
if [ $status -ne $1 ]; then
echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
((RES_FAIL++))
+ __check_stop_at_error
return 1
fi
body=${res:0:${#res}-3}
return 1
fi
body=${res:0:${#res}-3}
@@
-184,6
+189,7
@@
controller_api_get_A1_policy_type() {
if [ $res -ne 0 ]; then
echo -e $RED" FAIL, returned body not correct"$ERED
((RES_FAIL++))
if [ $res -ne 0 ]; then
echo -e $RED" FAIL, returned body not correct"$ERED
((RES_FAIL++))
+ __check_stop_at_error
return 1
fi
fi
return 1
fi
fi
@@
-203,10
+209,10
@@
controller_api_delete_A1_policy() {
paramError=1
if [ $# -eq 5 ] && [ $2 == "OSC" ]; then
paramError=1
if [ $# -eq 5 ] && [ $2 == "OSC" ]; then
- url="
http://$3:$RIC_SIM_INTERNAL_PORT/a1-p/policytypes/$4/policies/
$5"
+ url="
$RIC_SIM_HTTPX://$3:$RIC_SIM_PORT/a1-p/policytypes/$4/policies/$UUID
$5"
paramError=0
elif [ $# -eq 4 ] && [ $2 == "STD" ]; then
paramError=0
elif [ $# -eq 4 ] && [ $2 == "STD" ]; then
- url="
http://$3:$RIC_SIM_INTERNAL_PORT/A1-P/v1/policies/
$4"
+ url="
$RIC_SIM_HTTPX://$3:$RIC_SIM_PORT/A1-P/v1/policies/$UUID
$4"
paramError=0
fi
paramError=0
fi
@@
-222,12
+228,14
@@
controller_api_delete_A1_policy() {
if [ $? -ne 0 ]; then
echo -e $RED" FAIL. Exepected status "$1", got "$status "(likely remote server error)"$ERED
((RES_FAIL++))
if [ $? -ne 0 ]; then
echo -e $RED" FAIL. Exepected status "$1", got "$status "(likely remote server error)"$ERED
((RES_FAIL++))
+ __check_stop_at_error
return 1
fi
if [ $status -ne $1 ]; then
echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
((RES_FAIL++))
return 1
fi
if [ $status -ne $1 ]; then
echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
((RES_FAIL++))
+ __check_stop_at_error
return 1
fi
return 1
fi
@@
-246,12
+254,12
@@
controller_api_put_A1_policy() {
paramError=1
if [ $# -eq 6 ] && [ $2 == "OSC" ]; then
paramError=1
if [ $# -eq 6 ] && [ $2 == "OSC" ]; then
- url="
http://$3:$RIC_SIM_INTERNAL_PORT/a1-p/policytypes/$4/policies/
$5"
+ url="
$RIC_SIM_HTTPX://$3:$RIC_SIM_PORT/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="
http://$3:$RIC_SIM_INTERNAL_PORT/A1-P/v1/policies/
$4"
+ url="
$RIC_SIM_HTTPX://$3:$RIC_SIM_PORT/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
@@
-268,12
+276,14
@@
controller_api_put_A1_policy() {
if [ $? -ne 0 ]; then
echo -e $RED" FAIL. Exepected status "$1", got "$status "(likely remote server error)"$ERED
((RES_FAIL++))
if [ $? -ne 0 ]; then
echo -e $RED" FAIL. Exepected status "$1", got "$status "(likely remote server error)"$ERED
((RES_FAIL++))
+ __check_stop_at_error
return 1
fi
if [ $status -ne $1 ]; then
echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
((RES_FAIL++))
return 1
fi
if [ $status -ne $1 ]; then
echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
((RES_FAIL++))
+ __check_stop_at_error
return 1
fi
return 1
fi
@@
-294,7
+304,7
@@
controller_api_get_A1_policy_status() {
targetJson=""
paramError=1
if [ $# -ge 5 ] && [ $2 == "OSC" ]; then
targetJson=""
paramError=1
if [ $# -ge 5 ] && [ $2 == "OSC" ]; then
- url="
http://$3:$RIC_SIM_INTERNAL_PORT/a1-p/policytypes/$4/policies/
$5/status"
+ url="
$RIC_SIM_HTTPX://$3:$RIC_SIM_PORT/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\""
@@
-302,7
+312,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="
http://$3:$RIC_SIM_INTERNAL_PORT/A1-P/v1/policies/
$4/status"
+ url="
$RIC_SIM_HTTPX://$3:$RIC_SIM_PORT/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
@@
-325,12
+335,14
@@
controller_api_get_A1_policy_status() {
if [ $? -ne 0 ]; then
echo -e $RED" FAIL. Exepected status "$1", got "$status "(likely remote server error)"$ERED
((RES_FAIL++))
if [ $? -ne 0 ]; then
echo -e $RED" FAIL. Exepected status "$1", got "$status "(likely remote server error)"$ERED
((RES_FAIL++))
+ __check_stop_at_error
return 1
fi
if [ $status -ne $1 ]; then
echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
((RES_FAIL++))
return 1
fi
if [ $status -ne $1 ]; then
echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
((RES_FAIL++))
+ __check_stop_at_error
return 1
fi
return 1
fi
@@
-343,6
+355,7
@@
controller_api_get_A1_policy_status() {
if [ $res -ne 0 ]; then
echo -e $RED" FAIL, returned body not correct"$ERED
((RES_FAIL++))
if [ $res -ne 0 ]; then
echo -e $RED" FAIL, returned body not correct"$ERED
((RES_FAIL++))
+ __check_stop_at_error
return 1
fi
fi
return 1
fi
fi