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

fixed tests after updates

Browse source
This commit is contained in:
Olof hagsand 2021-02-10 20:48:57 +01:00
parent 6b08a22f04
commit 72dd31395e
6 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
apps/netconf/netconf_main.c
View file

@ -371,7 +371,8 @@ netconf_input_cb(int s,
if ((ptr = clicon_hash_value(cdat, NETCONF_HASH_BUF, &cdatlen)) != NULL){ if ((ptr = clicon_hash_value(cdat, NETCONF_HASH_BUF, &cdatlen)) != NULL){
if (cdatlen != sizeof(cb)){ if (cdatlen != sizeof(cb)){
clicon_err(OE_XML, errno, "size mismatch %lu %lu", cdatlen, sizeof(cb)); clicon_err(OE_XML, errno, "size mismatch %lu %lu",
(unsigned long)cdatlen, (unsigned long)sizeof(cb));
goto done; goto done;
} }
cb = *(cbuf**)ptr; cb = *(cbuf**)ptr;

5
test/test_perf_state_only.sh
View file

@ -201,8 +201,9 @@ fi
rm -rf $dir rm -rf $dir
# Define default restconfig config: RESTCONFIG # Set by restconf_config
restconf_config none unset RESTCONFIG
# unset conditional parameters # unset conditional parameters
unset format unset format
unset perfnr unset perfnr

2
test/test_restconf.sh
View file

@ -31,7 +31,7 @@ if [ -d ${TOP_SRCDIR}/example/main/$y ]; then
else else
cp /usr/local/share/clixon/$y $dir/ cp /usr/local/share/clixon/$y $dir/
fi fi
y=clixon-restconf@2020-10-30.yang y=clixon-restconf@2020-12-30.yang
if [ -d ${TOP_SRCDIR}/yang/clixon ]; then if [ -d ${TOP_SRCDIR}/yang/clixon ]; then
cp ${TOP_SRCDIR}/yang/clixon/$y $dir/ cp ${TOP_SRCDIR}/yang/clixon/$y $dir/
else else

10
test/test_restconf_netns.sh
View file

@ -8,7 +8,7 @@
# 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
# Skip it other than evhtp # Skip if other than evhtp
if [ "${WITH_RESTCONF}" != "evhtp" ]; then if [ "${WITH_RESTCONF}" != "evhtp" ]; then
if [ "$s" = $0 ]; then exit 0; else return 0; fi # skip if [ "$s" = $0 ]; then exit 0; else return 0; fi # skip
fi fi
@ -18,6 +18,14 @@ if [ $valgrindtest -eq 3 ]; then
if [ "$s" = $0 ]; then exit 0; else return 0; fi # skip if [ "$s" = $0 ]; then exit 0; else return 0; fi # skip
fi fi
# Check if ip netns is implemented (Alpine does not have it)
ip netns 2> /dev/null
if [ $? -ne 0 ]; then
echo "...ip netns does not work"
if [ "$s" = $0 ]; then exit 0; else return 0; fi # skip
fi
APPNAME=example APPNAME=example
cfg=$dir/conf.xml cfg=$dir/conf.xml

1
test/test_restconf_patch.sh
View file

@ -3,7 +3,6 @@
# Use nacm module in example/main/example_restconf.c hardcoded to # Use nacm module in example/main/example_restconf.c hardcoded to
# andy:bar and wilma:bar # andy:bar and wilma:bar
# 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

2
util/clixon_netconf_ssh_callhome.c
View file

@ -203,7 +203,7 @@ usage(char *argv0)
"\t-f ipv4|ipv6 \tSocket address family(ipv4 default)\n" "\t-f ipv4|ipv6 \tSocket address family(ipv4 default)\n"
"\t-a <addrstr> \tIP address (eg 1.2.3.4) - mandatory\n" "\t-a <addrstr> \tIP address (eg 1.2.3.4) - mandatory\n"
"\t-p <port> \tPort (default 4334)\n" "\t-p <port> \tPort (default 4334)\n"
"\t-c <file> \tCLixon config file - (default /usr/local/etc/clixon.xml)\n" "\t-c <file> \tClixon config file - (default /usr/local/etc/clixon.xml)\n"
"\t-C <file> \tSSHD config file - (default /dev/null)\n" "\t-C <file> \tSSHD config file - (default /dev/null)\n"
"\t-s <sshd> \tPath to sshd binary, default %s\n" "\t-s <sshd> \tPath to sshd binary, default %s\n"
, ,