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

Vagrant and test updates for restconf /www-data mods

Browse source
This commit is contained in:
Olof hagsand 2021-05-23 19:55:01 +02:00
parent 637c68aed6
commit 603f70e51f
5 changed files with 28 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -39,7 +39,7 @@ Expected: June 2021
* Do not extend default values if when statements evaluate to false * Do not extend default values if when statements evaluate to false
* Do not allow edit-config of nodes if when statements evaluate to false (Sec 8.3.2) * Do not allow edit-config of nodes if when statements evaluate to false (Sec 8.3.2)
* If a key leaf is defined in a grouping that is used in a list, the "uses" statement MUST NOT have a "when" statement. (See 7.21.5) * If a key leaf is defined in a grouping that is used in a list, the "uses" statement MUST NOT have a "when" statement. (See 7.21.5)
* See [yang uses's substatement when has no effect #218](https://github.com/clicon/clixon/issues/2$ * See [yang uses's substatement when has no effect #218](https://github.com/clicon/clixon/issues/218)
* YANG deviation [deviation statement not yet support #211](https://github.com/clicon/clixon/issues/211) * YANG deviation [deviation statement not yet support #211](https://github.com/clicon/clixon/issues/211)
* See RFC7950 Sec 5.6.3 * See RFC7950 Sec 5.6.3

8
example/main/README.md
View file

@ -56,11 +56,11 @@ Send netconf command:
``` ```
Start clixon restconf daemon Start clixon restconf daemon
``` ```
sudo su -c "/www-data/clixon_restconf -f /usr/local/etc/example.xml " -s /bin/sh www-data sudo /usr/local/bin/clixon_restconf -f /usr/local/etc/example.xml
``` ```
Send restconf command Send restconf command
``` ```
curl -G http://127.0.0.1/restconf/data curl -X GET http://127.0.0.1/restconf/data
``` ```
## Using the CLI ## Using the CLI
@ -148,7 +148,7 @@ Start nginx daemon
``` ```
Start the clixon restconf daemon Start the clixon restconf daemon
``` ```
sudo su -c "/www-data/clixon_restconf -f /usr/local/etc/example.xml " -s /bin/sh www-data sudo /usr/local/sbin/clixon_restconf -f /usr/local/etc/example.xml
``` ```
then access using curl or wget: then access using curl or wget:
``` ```
@ -206,7 +206,7 @@ clixon_netconf -qf /usr/local/etc/example.xml
``` ```
Restconf (assuming nginx started): Restconf (assuming nginx started):
``` ```
sudo su -c "/www-data/clixon_restconf -f /usr/local/etc/example.xml " -s /bin/sh www-data& sudo /usr/local/sbin/clixon_restconf -f /usr/local/etc/example.xml
curl -X POST http://localhost/restconf/operations/clixon-example:example -H "Content-Type: application/yang-data+json" -d '{"clixon-example:input":{"x":"ipv4"}}' curl -X POST http://localhost/restconf/operations/clixon-example:example -H "Content-Type: application/yang-data+json" -d '{"clixon-example:input":{"x":"ipv4"}}'
{ {
"clixon-example:output": { "clixon-example:output": {

15
test/test_restconf_internal_usecases.sh
View file

@ -20,6 +20,7 @@
# 1. Start two servers, where one fails # 1. Start two servers, where one fails
# 2. Reach one not the other # 2. Reach one not the other
# (Wanted to bind an invalid port, but then such a port must be bound and later killed) # (Wanted to bind an invalid port, but then such a port must be bound and later killed)
# Note there are debug printfs marked as XXX for a race condition in travis
# Magic line must be first in script (see README.md) # Magic line must be first in script (see README.md)
s="$_" ; . ./lib.sh || if [ "$s" = $0 ]; then exit 0; else return 0; fi s="$_" ; . ./lib.sh || if [ "$s" = $0 ]; then exit 0; else return 0; fi
@ -117,7 +118,7 @@ EOF
if [ -z "$pid" ]; then if [ -z "$pid" ]; then
err "No pid return value" "$retx" err "No pid return value" "$retx"
fi fi
echo "retx:$retx" echo "retx:$retx" # XXX
if $active; then if $active; then
expect="^<rpc-reply $DEFAULTNS><active $LIBNS>$active</active><description $LIBNS>Clixon RESTCONF process</description><command $LIBNS>/.*/clixon_restconf -f $cfg -D [0-9] -l ${LOGDST_CMD}</command><status $LIBNS>$status</status><starttime $LIBNS>20[0-9][0-9]\-[0-9][0-9]\-[0-9][0-9]T[0-9][0-9]:[0-9][0-9]:[0-9][0-9]\.[0-9]*Z</starttime><pid $LIBNS>$pid</pid></rpc-reply>]]>]]>$" expect="^<rpc-reply $DEFAULTNS><active $LIBNS>$active</active><description $LIBNS>Clixon RESTCONF process</description><command $LIBNS>/.*/clixon_restconf -f $cfg -D [0-9] -l ${LOGDST_CMD}</command><status $LIBNS>$status</status><starttime $LIBNS>20[0-9][0-9]\-[0-9][0-9]\-[0-9][0-9]T[0-9][0-9]:[0-9][0-9]:[0-9][0-9]\.[0-9]*Z</starttime><pid $LIBNS>$pid</pid></rpc-reply>]]>]]>$"
else else
@ -169,16 +170,16 @@ expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO<rpc $DEFAULTNS><edit-confi
new "commit minimal server" new "commit minimal server"
expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO<rpc $DEFAULTNS><commit/></rpc>]]>]]>" "^<rpc-reply $DEFAULTNS><ok/></rpc-reply>]]>]]>$" expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO<rpc $DEFAULTNS><commit/></rpc>]]>]]>" "^<rpc-reply $DEFAULTNS><ok/></rpc-reply>]]>]]>$"
echo "pid:$pid" echo "pid:$pid" # XXX
ps aux|grep clixon_ ps aux|grep clixon_ # XXX
new "2. get status, get pid1" new "2. get status, get pid1"
rpcstatus true running rpcstatus true running
pid1=$pid pid1=$pid
if [ $pid1 -eq 0 ]; then err "Pid" 0; fi if [ $pid1 -eq 0 ]; then err "Pid" 0; fi
echo "pid1:$pid1" echo "pid1:$pid1" # XXX
ps aux|grep clixon_ ps aux|grep clixon_ # XXX
new "Check $pid1 exists" new "Check $pid1 exists"
while sudo kill -0 $pid1 2> /dev/null; do while sudo kill -0 $pid1 2> /dev/null; do
@ -187,8 +188,8 @@ while sudo kill -0 $pid1 2> /dev/null; do
sleep $DEMSLEEP sleep $DEMSLEEP
done done
echo "pid1:$pid1" echo "pid1:$pid1" # XXX
ps aux|grep clixon_ ps aux|grep clixon_ # XXX
new "3. get status: Check killed" new "3. get status: Check killed"
rpcstatus false stopped rpcstatus false stopped

8
test/vagrant/README.md
View file

@ -29,3 +29,11 @@ The current vagrant boxes are verified continuously:
For other vagrant boxes, see [search vagrant boxes](https://vagrantcloud.com/search) For other vagrant boxes, see [search vagrant boxes](https://vagrantcloud.com/search)
Inaccessible
------------
Sometimes Vagrant says: ”Your VM has become inaccessible”
```
VBoxManage list vms
VBoxManage unregistervm xxx
```

7
test/vagrant/clixon.sh
View file

@ -26,6 +26,13 @@ if [ ! $(id -u clicon) ]; then
fi fi
fi fi
# Fcgi restconf requires /www-data directory for fcgi socket
if [ ${with_restconf} = fcgi ]; then
sudo mkdir /www-data
sudo chown $wwwuser /www-data
sudo chgrp $wwwuser /www-data
fi
# cligen # cligen
test -d src || mkdir src test -d src || mkdir src
test -d src/cligen || (cd src;git clone https://github.com/clicon/cligen.git) test -d src/cligen || (cd src;git clone https://github.com/clicon/cligen.git)