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

test fix breaking actions. Minor doc changes

Browse source
This commit is contained in:
Olof hagsand 2023-04-25 16:22:25 +02:00
parent 54dc7a9a57
commit 447b8eb1d3
4 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -73,6 +73,9 @@ Developers may need to change their code
### Minor features ### Minor features
* Removed previous backward compatible compile-time options introduced in 6.0:
* NETCONF_DEFAULT_RETRIEVAL_REPORT_AL
* AUTOCLI_OBSOLETE_SKIP
* Unified netconf input function * Unified netconf input function
* Three different implementations were used in external, internal and controller code * Three different implementations were used in external, internal and controller code
* The new clixon_netconf_input API unifies all three uses * The new clixon_netconf_input API unifies all three uses
@ -90,7 +93,7 @@ Developers may need to change their code
### Corrected Bugs ### Corrected Bugs
* Fixed RESTCONF race conditions on SSL_shutdown sslerr ZERO_RETURN appears occasionally and exist. * Fixed RESTCONF race conditions on SSL_shutdown sslerr ZERO_RETURN appears occasionally and exist.
* Fixed: RESTCONF: some client cert failure leads to restconf exit. Instead close and continue * Fixed: RESTCONF: some client cert failure leads to restconf exit. Instead close and continue
## 6.1.0 ## 6.1.0
19 Feb 2023 19 Feb 2023

2
apps/netconf/netconf_main.c
View file

@ -546,7 +546,7 @@ netconf_input_cb(int s,
int i32; int i32;
int eom = 0; int eom = 0;
int eof = 0; int eof = 0;
int framing_type; netconf_framing_type framing_type;
cxobj *xtop = NULL; cxobj *xtop = NULL;
cxobj *xreq; cxobj *xreq;
cxobj *xerr = NULL; cxobj *xerr = NULL;

10
include/clixon_custom.h
View file

@ -189,16 +189,12 @@
* This may lead to changes in behavior for clients retrieving configs without an explicit * This may lead to changes in behavior for clients retrieving configs without an explicit
* <with-defaults> parameter. * <with-defaults> parameter.
* To keep the previous behavior (as in 6.0) set this option with #define * To keep the previous behavior (as in 6.0) set this option with #define
* Introduced in 6.1, remove in 6.3
*/ */
#undef NETCONF_DEFAULT_RETRIEVAL_REPORT_ALL #undef NETCONF_DEFAULT_RETRIEVAL_REPORT_ALL
/*! Temporary backward-compatible option for not generating CLI for obsolete YANG
* Introduced in 6.1, remove in 6.2
*/
#define AUTOCLI_OBSOLETE_SKIP
/*! Temporary backward-compatible option for hiding CLI for deprecated YANG /*! Temporary backward-compatible option for hiding CLI for deprecated YANG
* Introduced in 6.1, remove in 6.2 * Introduced in 6.1, remove in 6.3
*/ */
#define AUTOCLI_DEPRECATED_HIDE #define AUTOCLI_DEPRECATED_HIDE
@ -214,9 +210,11 @@
* - controller device control * - controller device control
*/ */
/*! Use unified netconf input function for external use /*! Use unified netconf input function for external use
* Introduced in 6.2
*/ */
#define NETCONF_INPUT_UNIFIED_EXTERN #define NETCONF_INPUT_UNIFIED_EXTERN
/*! Use unified netconf input function for internal use /*! Use unified netconf input function for internal use
* Introduced in 6.2
*/ */
#undef NETCONF_INPUT_UNIFIED_INTERNAL #undef NETCONF_INPUT_UNIFIED_INTERNAL

10
test/test_xpath_canonical.sh
View file

@ -56,14 +56,14 @@ expectpart "$($clixon_util_xpath -c -y $ydir -p "/i:x[.='42']" -n i:urn:example:
new "xpath canonical form descendants" new "xpath canonical form descendants"
expectpart "$($clixon_util_xpath -c -y $ydir -p "//x[.='42']" -n null:urn:example:a -n j:urn:example:b)" 0 "//a:x\[.='42'\]" '0 : a = "urn:example:a"' expectpart "$($clixon_util_xpath -c -y $ydir -p "//x[.='42']" -n null:urn:example:a -n j:urn:example:b)" 0 "//a:x\[.='42'\]" '0 : a = "urn:example:a"'
new "xpath canonical form (no default should fail)"
expectpart "$($clixon_util_xpath -c -y $ydir -p /x/j:y -n i:urn:example:a -n j:urn:example:b 2>&1)" 0 "/x/j:y: No namespace found for prefix"
if false; then if false; then
# No, with mointpoints I cant fail unknown prefix, see comment in xpath2canonical # No, with mointpoints I cant fail unknown prefix, see comment in xpath2canonical
new "xpath canonical form (no default should fail)" new "xpath canonical form (wrong namespace should fail)"
expectpart "$($clixon_util_xpath -c -y $ydir -p /x/j:y -n i:urn:example:a -n j:urn:example:b 2>&1)" 0 "/x/j:y: No namespace found for prefix" expectpart "$($clixon_util_xpath -c -y $ydir -p /i:x/j:y -n i:urn:example:c -n j:urn:example:b 2>&1)" 0 "/i:x/j:y: No yang found for namespace"
fi fi
new "xpath canonical form (wrong namespace should fail)"
expectpart "$($clixon_util_xpath -c -y $ydir -p /i:x/j:y -n i:urn:example:c -n j:urn:example:b 2>&1)" 0 "/i:x/j:y: No yang found for namespace"
rm -rf $dir rm -rf $dir
new "endtest" new "endtest"