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

Fixed static build typo

Browse source 
Test: grep --null -Eo not supported on ubunti 20
Enable IPv6 for ubuntu
Vagrant: enable insecure downloads
This commit is contained in:
Olof Hagsand 2022-04-09 15:12:13 +00:00
parent a51abd0063
commit ac7673bc35
4 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
apps/netconf/Makefile.in
View file

@ -54,6 +54,7 @@ includedir = @includedir@
HOST_VENDOR = @host_vendor@ HOST_VENDOR = @host_vendor@
SH_SUFFIX = @SH_SUFFIX@ SH_SUFFIX = @SH_SUFFIX@
LIBSTATIC_SUFFIX = @LIBSTATIC_SUFFIX@
CLIXON_MAJOR = @CLIXON_VERSION_MAJOR@ CLIXON_MAJOR = @CLIXON_VERSION_MAJOR@
CLIXON_MINOR = @CLIXON_VERSION_MINOR@ CLIXON_MINOR = @CLIXON_VERSION_MINOR@

2
test/test_nacm_module_read.sh
View file

@ -229,7 +229,7 @@ expectpart "$(curl -u andy:bar $CURLOPTS -X GET $RCPROTO://localhost/restconf/da
new "admin read top ok (all)" new "admin read top ok (all)"
ret=$(curl -u andy:bar $CURLOPTS -X GET $RCPROTO://localhost/restconf/data) ret=$(curl -u andy:bar $CURLOPTS -X GET $RCPROTO://localhost/restconf/data)
expect='{"ietf-restconf:data":{"clixon-example:table":' expect='{"ietf-restconf:data":{"clixon-example:table":'
match=`echo $ret | grep --null -Eo "$expect"` match=`echo $ret | grep "$expect"`
if [ -z "$match" ]; then if [ -z "$match" ]; then
err "$expect" "$ret" err "$expect" "$ret"
fi fi

2
test/test_yang_namespace.sh
View file

@ -122,7 +122,7 @@ expectpart "$(curl $CURLOPTS -X POST -H "Content-Type: application/yang-data+jso
new "restconf get config example1 and example2" new "restconf get config example1 and example2"
ret=$(curl $CURLOPTS -X GET $RCPROTO://localhost/restconf/data) ret=$(curl $CURLOPTS -X GET $RCPROTO://localhost/restconf/data)
expect='"example1:x":42,"example2:x":{"y":99}' expect='"example1:x":42,"example2:x":{"y":99}'
match=`echo $ret | grep --null -Eo "$expect"` match=`echo $ret | grep "$expect"`
if [ -z "$match" ]; then if [ -z "$match" ]; then
err "$expect" "$ret" err "$expect" "$ret"
fi fi

5
test/vagrant/vagrant.sh
View file

@ -73,6 +73,7 @@ Vagrant.configure("2") do |config|
# Every Vagrant development environment requires a box. You can search for # Every Vagrant development environment requires a box. You can search for
# boxes at https://vagrantcloud.com/search. # boxes at https://vagrantcloud.com/search.
config.vm.box = "$box" config.vm.box = "$box"
config.vm.box_download_insecure=true # 2021-04 required, hope this changes?
if Vagrant.has_plugin?("vagrant-vbguest") if Vagrant.has_plugin?("vagrant-vbguest")
config.vbguest.auto_update = false config.vbguest.auto_update = false
end end
@ -195,6 +196,9 @@ case $release in
esac esac
;; ;;
ubuntu) # ubuntu/apt based ubuntu) # ubuntu/apt based
# enable ipv6
$sshcmd sudo sysctl -w net.ipv6.conf.all.disable_ipv6=0
$sshcmd sudo apt-get update --fix-missing $sshcmd sudo apt-get update --fix-missing
$sshcmd sudo apt install -y git $sshcmd sudo apt install -y git
# restconf user: $wwwuser # restconf user: $wwwuser
@ -300,6 +304,7 @@ chmod 755 $dir/yangmodels.sh
$scpcmd $dir/yangmodels.sh vagrant@127.0.0.1: $scpcmd $dir/yangmodels.sh vagrant@127.0.0.1:
$sshcmd sudo ./yangmodels.sh $sshcmd sudo ./yangmodels.sh
# Run tests # Run tests
$sshcmd "(cd src/cligen/test; ./sum.sh)" $sshcmd "(cd src/cligen/test; ./sum.sh)"
$sshcmd "(cd src/clixon/test; ./sum.sh)" $sshcmd "(cd src/clixon/test; ./sum.sh)"