experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

further restconf refactoring

Browse source
This commit is contained in:
Olof hagsand 2020-06-11 21:54:09 +02:00
parent ff5462ecac
commit e2d9c046af
23 changed files with 1424 additions and 399 deletions
Download patch file Download diff file Expand all files Collapse all files

16
test/lib.sh
View file

@ -90,9 +90,6 @@ fi
# RESTCONF protocol, eg http or https
: ${RCPROTO:=http}
# RESTCONF port
: ${RCPORT:=80}
# RESTCONF error message (if not up)
: ${RCERROR:="HTTP/1.1 502 Bad Gateway"}
@ -229,8 +226,11 @@ wait_backend(){
done
}
# Start restconf daemon
# @see wait_restconf
start_restconf(){
# Start in background
# echo "sudo -u $wwwuser -s $clixon_restconf $RCLOG -D $DBG $*"
sudo -u $wwwuser -s $clixon_restconf $RCLOG -D $DBG $* &
if [ $? -ne 0 ]; then
err
@ -246,12 +246,16 @@ stop_restconf(){
}
# Wait for restconf to stop sending 502 Bad Gateway
# @see start_restconf
wait_restconf(){
hdr=$(curl --head -sS $RCPROTO://localhost:$RCPORT/restconf)
# echo "curl -kis $RCPROTO://localhost/restconf"
hdr=$(curl -kis $RCPROTO://localhost/restconf)
# echo "hdr:\"$hdr\""
let i=0;
while [[ $hdr == "$RCERROR"* ]]; do
while [[ $hdr != *"200 OK"* ]]; do
sleep 1
hdr=$(curl --head -sS http://localhost/restconf)
hdr=$(curl -kis $RCPROTO://localhost/restconf)
# echo "hdr:\"$hdr\""
let i++;
# echo "wait_restconf $i"
if [ $i -ge $RCWAIT ]; then