Fix: Restconf service did not close when restconf config was removed
This commit is contained in:
Olof hagsand
parent
15d01c58d8
commit
9f5176adf5
4 changed files with 241 additions and 19 deletions
|
|
@ -4,14 +4,18 @@
|
|||
# In comparison test_restconf_rpc.sh:
|
||||
# - uses externally started restconf, here started by backend
|
||||
# - generic tests, here specific
|
||||
# The first usecases is:
|
||||
# The first usecases is: empty status message
|
||||
# 1. Start a minimal restconf
|
||||
# 2. Kill it externally (or it exits)
|
||||
# 3. Start a server
|
||||
# 4. Query status (Error message is returned)
|
||||
# The second usecase is
|
||||
# The second usecase is: zombie process on exit
|
||||
# 1. Start server with bad address
|
||||
# 2. Zombie process appears
|
||||
# The third usecase is: restconf not removed
|
||||
# 1. Start server
|
||||
# 2. Remove server
|
||||
# 3. Check status (Error: still up)
|
||||
|
||||
# Magic line must be first in script (see README.md)
|
||||
s="$_" ; . ./lib.sh || if [ "$s" = $0 ]; then exit 0; else return 0; fi
|
||||
|
|
@ -23,6 +27,7 @@ startupdb=$dir/startup_db
|
|||
|
||||
# Restconf debug
|
||||
RESTCONFDBG=0
|
||||
RCPROTO=http # no ssl here
|
||||
|
||||
cat <<EOF > $cfg
|
||||
<clixon-config xmlns="http://clicon.org/config">
|
||||
|
|
@ -58,7 +63,6 @@ module example {
|
|||
}
|
||||
EOF
|
||||
|
||||
|
||||
function testrpc()
|
||||
{
|
||||
operation=$1
|
||||
|
|
@ -77,7 +81,7 @@ $DEFAULTHELLO
|
|||
EOF
|
||||
)
|
||||
|
||||
>&2 echo "ret:$ret" # debug
|
||||
# >&2 echo "ret:$ret" # debug
|
||||
|
||||
expect1="<pid xmlns=\"http://clicon.org/lib\">[0-9]*</pid>"
|
||||
match=$(echo "$ret" | grep --null -Go "$expect1")
|
||||
|
|
@ -87,7 +91,7 @@ EOF
|
|||
else
|
||||
pid=$(echo "$match" | awk -F'[<>]' '{print $3}')
|
||||
fi
|
||||
>&2 echo "pid:$pid" # debug
|
||||
# >&2 echo "pid:$pid" # debug
|
||||
|
||||
if [ -z "$pid" ]; then
|
||||
err "Running process" "$ret"
|
||||
|
|
@ -109,6 +113,10 @@ EOF
|
|||
sleep $DEMSLEEP
|
||||
}
|
||||
|
||||
# FIRST usecase
|
||||
|
||||
new "1. Empty status message"
|
||||
|
||||
new "kill old restconf"
|
||||
stop_restconf_pre
|
||||
|
||||
|
|
@ -146,8 +154,9 @@ new "netconf commit"
|
|||
expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO<rpc $DEFAULTNS><commit/></rpc>]]>]]>" "^<rpc-reply $DEFAULTNS><ok/></rpc-reply>]]>]]>$"
|
||||
|
||||
# Get pid2
|
||||
new "get pid"
|
||||
pid2=$(testrpc status 1)
|
||||
echo "pid:$pid2"
|
||||
echo "pid2:$pid2"
|
||||
|
||||
new "get status 2"
|
||||
ret=$($clixon_netconf -qf $cfg<<EOF
|
||||
|
|
@ -167,11 +176,19 @@ if [ -z "$match" ]; then
|
|||
fi
|
||||
|
||||
# Kill it
|
||||
new "kill $pid2"
|
||||
sudo kill $pid2
|
||||
sleep $DEMSLEEP
|
||||
|
||||
# Why kill it twice?
|
||||
# I should really debug this,... it happens in docker somethimes but its not the aim of the test
|
||||
new "kill $pid2 again"
|
||||
sudo kill $pid2
|
||||
sleep $DEMSLEEP
|
||||
|
||||
new "Check killed"
|
||||
# Ensure no pid
|
||||
pid2=$(testrpc status 0)
|
||||
testrpc status 0 > /dev/null
|
||||
|
||||
RESTCONFIG2=$(cat <<EOF
|
||||
<restconf xmlns="http://clicon.org/restconf">
|
||||
|
|
@ -201,7 +218,8 @@ if [ $BE -ne 0 ]; then
|
|||
stop_backend -f $cfg
|
||||
fi
|
||||
|
||||
sleep $DEMSLEEP # Lots of processes need to die before next test
|
||||
# SECOND usecase
|
||||
new "2. zombie process on exit"
|
||||
|
||||
new "kill old restconf"
|
||||
stop_restconf_pre
|
||||
|
|
@ -221,16 +239,13 @@ new "wait backend"
|
|||
wait_backend
|
||||
|
||||
new "get status 1"
|
||||
testrpc status 0
|
||||
testrpc status 0 > /dev/null
|
||||
|
||||
RESTCONFIG1=$(cat <<EOF
|
||||
<restconf xmlns="http://clicon.org/restconf">
|
||||
<enable>true</enable>
|
||||
<debug>$RESTCONFDBG</debug>
|
||||
<auth-type>none</auth-type>
|
||||
<server-cert-path>$srvcert</server-cert-path>
|
||||
<server-key-path>$srvkey</server-key-path>
|
||||
<server-ca-cert-path>$cakey</server-ca-cert-path>
|
||||
<pretty>false</pretty>
|
||||
<socket><namespace>default</namespace><address>221.0.0.1</address><port>80</port><ssl>false</ssl></socket>
|
||||
</restconf>
|
||||
|
|
@ -245,11 +260,105 @@ expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO<rpc $DEFAULTNS><commit/></
|
|||
|
||||
sleep $DEMSLEEP
|
||||
new "Check zombies"
|
||||
ret=$(ps aux|grep defunc | grep -v grep)
|
||||
# NOTE unsure where zombies actually appear
|
||||
ret=$(ps aux| grep clixon | grep defunc | grep -v grep)
|
||||
if [ -n "$ret" ]; then
|
||||
err "No zombie process" "$ret"
|
||||
fi
|
||||
|
||||
if [ $BE -ne 0 ]; then
|
||||
new "Kill backend"
|
||||
# Check if premature kill
|
||||
pid=$(pgrep -u root -f clixon_backend)
|
||||
if [ -z "$pid" ]; then
|
||||
err "backend already dead"
|
||||
fi
|
||||
# kill backend
|
||||
stop_backend -f $cfg
|
||||
fi
|
||||
|
||||
sleep $DEMSLEEP
|
||||
new "Check zombies again"
|
||||
# NOTE unsure where zombies actually appear
|
||||
ret=$(ps aux| grep clixon | grep defunc | grep -v grep)
|
||||
if [ -n "$ret" ]; then
|
||||
err "No zombie process" "$ret"
|
||||
fi
|
||||
|
||||
new "3. restconf not removed"
|
||||
|
||||
new "kill old restconf"
|
||||
stop_restconf_pre
|
||||
|
||||
new "test params: -f $cfg"
|
||||
if [ $BE -ne 0 ]; then
|
||||
new "kill old backend"
|
||||
sudo clixon_backend -z -f $cfg
|
||||
if [ $? -ne 0 ]; then
|
||||
err
|
||||
fi
|
||||
|
||||
new "start backend -s init -f $cfg"
|
||||
start_backend -s init -f $cfg
|
||||
fi
|
||||
new "wait backend"
|
||||
wait_backend
|
||||
|
||||
new "get status 1"
|
||||
testrpc status 0 > /dev/null
|
||||
|
||||
RESTCONFIG1=$(cat <<EOF
|
||||
<restconf xmlns="http://clicon.org/restconf">
|
||||
<enable>true</enable>
|
||||
<debug>$RESTCONFDBG</debug>
|
||||
<auth-type>none</auth-type>
|
||||
<pretty>false</pretty>
|
||||
<socket><namespace>default</namespace><address>0.0.0.0</address><port>80</port><ssl>false</ssl></socket>
|
||||
</restconf>
|
||||
EOF
|
||||
)
|
||||
|
||||
new "Create server"
|
||||
expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO<rpc $DEFAULTNS><edit-config><target><candidate/></target><config>$RESTCONFIG1</config></edit-config></rpc>]]>]]>" "^<rpc-reply $DEFAULTNS><ok/></rpc-reply>]]>]]>$"
|
||||
|
||||
new "commit create"
|
||||
expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO<rpc $DEFAULTNS><commit/></rpc>]]>]]>" "^<rpc-reply $DEFAULTNS><ok/></rpc-reply>]]>]]>$"
|
||||
|
||||
# pid
|
||||
pid1=$(testrpc status 1)
|
||||
|
||||
sleep $DEMSLEEP
|
||||
|
||||
new "Get restconf config 1"
|
||||
expectpart "$(curl $CURLOPTS -X GET -H 'Accept: application/yang-data+xml' $RCPROTO://localhost/restconf/data/clixon-restconf:restconf)" 0 "HTTP/1.1 200 OK" "<restconf xmlns=\"http://clicon.org/restconf\"><enable>true</enable><auth-type>none</auth-type><debug>0</debug><pretty>false</pretty><socket><namespace>default</namespace><address>0.0.0.0</address><port>80</port><ssl>false</ssl></socket></restconf>"
|
||||
|
||||
# remove it
|
||||
new "Delete server"
|
||||
expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO<rpc $DEFAULTNS xmlns:nc=\"$BASENS\"><edit-config><target><candidate/></target><default-operation>none</default-operation><config><restconf xmlns=\"http://clicon.org/restconf\"><socket nc:operation=\"remove\"><namespace>default</namespace><address>0.0.0.0</address><port>80</port></socket></restconf></config></edit-config></rpc>]]>]]>" "^<rpc-reply $DEFAULTNS xmlns:nc=\"$BASENS\"><ok/></rpc-reply>]]>]]>$"
|
||||
|
||||
new "commit delete"
|
||||
expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO<rpc $DEFAULTNS><commit/></rpc>]]>]]>" "^<rpc-reply $DEFAULTNS><ok/></rpc-reply>]]>]]>$"
|
||||
|
||||
new "Get restconf config 2"
|
||||
expectpart "$(curl $CURLOPTS -X GET -H 'Accept: application/yang-data+xml' $RCPROTO://localhost/restconf/data/clixon-restconf:restconf)" 0 "HTTP/1.1 200 OK" "<restconf xmlns=\"http://clicon.org/restconf\"><enable>true</enable><auth-type>none</auth-type><debug>0</debug><pretty>false</pretty></restconf>"
|
||||
|
||||
pid2=$(testrpc status 1)
|
||||
|
||||
if [ $pid1 -ne $pid2 ]; then
|
||||
err "Same pid:$pid1" "$pid2"
|
||||
fi
|
||||
|
||||
if [ $BE -ne 0 ]; then
|
||||
new "Kill backend"
|
||||
# Check if premature kill
|
||||
pid=$(pgrep -u root -f clixon_backend)
|
||||
if [ -z "$pid" ]; then
|
||||
err "backend already dead"
|
||||
fi
|
||||
# kill backend
|
||||
stop_backend -f $cfg
|
||||
fi
|
||||
|
||||
new "endtest"
|
||||
endtest
|
||||
|
||||
|
|
@ -257,6 +366,7 @@ endtest
|
|||
unset RESTCONFIG1
|
||||
unset RESTCONFIG2
|
||||
unset RESTCONFDBG
|
||||
unset RCPROTO
|
||||
|
||||
rm -rf $dir
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue