Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Further updates to the auto-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
ed298f1
..
25de2a9
100644
(file)
--- a/
test/common/controller_api_functions.sh
+++ b/
test/common/controller_api_functions.sh
@@
-62,7
+62,7
@@
__do_curl_to_controller() {
fi
body=${res:0:${#res}-3}
echo "$body" > .sdnc-reply.json
fi
body=${res:0:${#res}-3}
echo "$body" > .sdnc-reply.json
- res=$(python ../common/extract_sdnc_reply.py .sdnc-reply.json)
+ res=$(python
3
../common/extract_sdnc_reply.py .sdnc-reply.json)
echo " EXTRACED BODY+CODE: "$res >> $HTTPLOG
echo "$res"
return 0
echo " EXTRACED BODY+CODE: "$res >> $HTTPLOG
echo "$res"
return 0
@@
-122,7
+122,7
@@
controller_api_get_A1_policy_ids() {
echo " TARGET JSON: $targetJson" >> $HTTPLOG
echo " TARGET JSON: $targetJson" >> $HTTPLOG
- res=$(python ../common/compare_json.py "$targetJson" "$body")
+ res=$(python
3
../common/compare_json.py "$targetJson" "$body")
if [ $res -ne 0 ]; then
echo -e $RED" FAIL, returned body not correct"$ERED
if [ $res -ne 0 ]; then
echo -e $RED" FAIL, returned body not correct"$ERED
@@
-178,7
+178,7
@@
controller_api_get_A1_policy_type() {
targetJson=$(< $5)
echo " TARGET JSON: $targetJson" >> $HTTPLOG
targetJson=$(< $5)
echo " TARGET JSON: $targetJson" >> $HTTPLOG
- res=$(python ../common/compare_json.py "$targetJson" "$body")
+ res=$(python
3
../common/compare_json.py "$targetJson" "$body")
if [ $res -ne 0 ]; then
echo -e $RED" FAIL, returned body not correct"$ERED
if [ $res -ne 0 ]; then
echo -e $RED" FAIL, returned body not correct"$ERED
@@
-337,7
+337,7
@@
controller_api_get_A1_policy_status() {
body=${res:0:${#res}-3}
echo " TARGET JSON: $targetJson" >> $HTTPLOG
body=${res:0:${#res}-3}
echo " TARGET JSON: $targetJson" >> $HTTPLOG
- res=$(python ../common/compare_json.py "$targetJson" "$body")
+ res=$(python
3
../common/compare_json.py "$targetJson" "$body")
if [ $res -ne 0 ]; then
echo -e $RED" FAIL, returned body not correct"$ERED
if [ $res -ne 0 ]; then
echo -e $RED" FAIL, returned body not correct"$ERED