diff --git a/apps/netconf/netconf_main.c b/apps/netconf/netconf_main.c index ccc81172..799cb87e 100644 --- a/apps/netconf/netconf_main.c +++ b/apps/netconf/netconf_main.c @@ -371,7 +371,8 @@ netconf_input_cb(int s, if ((ptr = clicon_hash_value(cdat, NETCONF_HASH_BUF, &cdatlen)) != NULL){ 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; } cb = *(cbuf**)ptr; diff --git a/test/test_perf_state_only.sh b/test/test_perf_state_only.sh index 1b588959..4da26a55 100755 --- a/test/test_perf_state_only.sh +++ b/test/test_perf_state_only.sh @@ -201,8 +201,9 @@ fi rm -rf $dir -# Define default restconfig config: RESTCONFIG -restconf_config none +# Set by restconf_config +unset RESTCONFIG + # unset conditional parameters unset format unset perfnr diff --git a/test/test_restconf.sh b/test/test_restconf.sh index a641ea92..31a230d3 100755 --- a/test/test_restconf.sh +++ b/test/test_restconf.sh @@ -31,7 +31,7 @@ if [ -d ${TOP_SRCDIR}/example/main/$y ]; then else cp /usr/local/share/clixon/$y $dir/ fi -y=clixon-restconf@2020-10-30.yang +y=clixon-restconf@2020-12-30.yang if [ -d ${TOP_SRCDIR}/yang/clixon ]; then cp ${TOP_SRCDIR}/yang/clixon/$y $dir/ else diff --git a/test/test_restconf_netns.sh b/test/test_restconf_netns.sh index 3760803b..24e94c72 100755 --- a/test/test_restconf_netns.sh +++ b/test/test_restconf_netns.sh @@ -8,7 +8,7 @@ # Magic line must be first in script (see README.md) 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 [ "$s" = $0 ]; then exit 0; else return 0; fi # skip fi @@ -18,6 +18,14 @@ if [ $valgrindtest -eq 3 ]; then if [ "$s" = $0 ]; then exit 0; else return 0; fi # skip 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 cfg=$dir/conf.xml diff --git a/test/test_restconf_patch.sh b/test/test_restconf_patch.sh index f37e2234..dd21af8b 100755 --- a/test/test_restconf_patch.sh +++ b/test/test_restconf_patch.sh @@ -3,7 +3,6 @@ # Use nacm module in example/main/example_restconf.c hardcoded to # andy:bar and wilma:bar - # Magic line must be first in script (see README.md) s="$_" ; . ./lib.sh || if [ "$s" = $0 ]; then exit 0; else return 0; fi diff --git a/util/clixon_netconf_ssh_callhome.c b/util/clixon_netconf_ssh_callhome.c index bc552064..03608fa3 100644 --- a/util/clixon_netconf_ssh_callhome.c +++ b/util/clixon_netconf_ssh_callhome.c @@ -203,7 +203,7 @@ usage(char *argv0) "\t-f ipv4|ipv6 \tSocket address family(ipv4 default)\n" "\t-a \tIP address (eg 1.2.3.4) - mandatory\n" "\t-p \tPort (default 4334)\n" - "\t-c \tCLixon config file - (default /usr/local/etc/clixon.xml)\n" + "\t-c \tClixon config file - (default /usr/local/etc/clixon.xml)\n" "\t-C \tSSHD config file - (default /dev/null)\n" "\t-s \tPath to sshd binary, default %s\n" ,