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

* Bumped version to 5.7.0_PRE

Browse source 
* Fixed: SEGV in cli show yang
This commit is contained in:
Olof hagsand 2022-03-14 12:13:45 +01:00
parent 60e6477be2
commit 9a88cb5f0d
7 changed files with 45 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CHANGELOG.md
View file

@ -1,5 +1,6 @@
# Clixon Changelog
* [5.7.0](#560) Expected: May 2022
* [5.6.0](#560) 8 March 2022
* [5.5.0](#550) 20 January 2022
* [5.4.0](#540) 30 November 2021
@ -33,6 +34,13 @@
* [3.3.2](#332) Aug 27 2017
* [3.3.1](#331) June 7 2017
## 5.7.0
Expected: May 2022
### Corrected Bugs
* Fixed: SEGV in cli show yang
## 5.6.0
8 March 2022

4
configure vendored
View file

@ -2266,9 +2266,9 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
CLIXON_VERSION_MAJOR="5"
CLIXON_VERSION_MINOR="6"
CLIXON_VERSION_MINOR="7"
CLIXON_VERSION_PATCH="0"
CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}\""
CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}_PRE\""
# Debug flag
# Check whether --enable-debug was given.

4
configure.ac
View file

@ -48,9 +48,9 @@ AC_INIT(lib/clixon/clixon.h.in)
AC_CONFIG_AUX_DIR(config-aux)
CLIXON_VERSION_MAJOR="5"
CLIXON_VERSION_MINOR="6"
CLIXON_VERSION_MINOR="7"
CLIXON_VERSION_PATCH="0"
CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}\""
CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}_PRE\""
# Debug flag
AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug],[Build with debug symbols, default: no]),[

3
example/main/example_cli.cli
View file

@ -91,6 +91,9 @@ show("Show a particular state of the system"){
state("Show configuration and state"), cli_auto_show("datamodel", "running", "text", true, true); {
xml("Show configuration and state as XML"), cli_auto_show("datamodel", "running", "xml", true, true);
}
yang("Show yang specs"), show_yang(); {
clixon-example("Show clixon-example yang spec"), show_yang("clixon-example");
}
}
save("Save candidate configuration to XML file") <filename:string>("Filename (local filename)"), save_config_file("candidate","filename", "xml");{

3
lib/src/clixon_yang.c
View file

@ -1854,9 +1854,6 @@ yang_print_cbuf(cbuf *cb,
else
cprintf(cb, " %s", ys->ys_argument);
}
if (ys->ys_cv){
cprintf(cb, " %s", cv_string_get(ys->ys_cv));
}
if (ys->ys_len){
cprintf(cb, " {\n");
yang_print_cbuf(cb, ys, marginal+3);

1
lib/src/clixon_yang_internal.h
View file

@ -86,6 +86,7 @@ struct yang_stmt{
mandatory: boolean true or false
require-instance: true or false
fraction-digits for fraction-digits
revision (uint32)
unknown-stmt (optional argument)
*/
cvec *ys_cvec; /* List of stmt-specific variables

32
test/test_yang.sh
View file

@ -10,6 +10,8 @@ cfg=$dir/conf_yang.xml
fyang=$dir/$APPNAME.yang
fsubmod=$dir/example-types.yang
fyangerr=$dir/err.yang
clispec=$dir/clispec
test -d $clispec || mkdir $clispec
cat <<EOF > $cfg
<clixon-config xmlns="http://clicon.org/config">
@ -17,9 +19,9 @@ cat <<EOF > $cfg
<CLICON_YANG_DIR>${YANG_INSTALLDIR}</CLICON_YANG_DIR>
<CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
<CLICON_YANG_MAIN_FILE>$fyang</CLICON_YANG_MAIN_FILE>
<CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
<CLICON_CLISPEC_DIR>$clispec</CLICON_CLISPEC_DIR>
<CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
<CLICON_CLI_MODE>$APPNAME</CLICON_CLI_MODE>
<CLICON_CLI_MODE>example</CLICON_CLI_MODE>
<CLICON_SOCK>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
<CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
<CLICON_XMLDB_DIR>/usr/local/var/$APPNAME</CLICON_XMLDB_DIR>
@ -32,6 +34,9 @@ module $APPNAME{
prefix ex;
namespace "urn:example:clixon";
include example-types;
revision 2020-12-01 {
description "Added table/parameter/value as the primary data example";
}
extension c-define {
description "Example from RFC 6020";
argument "name";
@ -139,6 +144,24 @@ module $APPNAME{
}
EOF
cat <<EOF > $clispec/example.cli
CLICON_MODE="example";
CLICON_PROMPT="cli> ";
# Reference generated data model
set @datamodel, cli_set();
commit("Commit the changes"), cli_commit();
quit("Quit"), cli_quit();
show("Show a particular state of the system"){
configuration("Show configuration"), cli_show_config("candidate", "text", "/");
version("Show version"), cli_show_version("candidate", "text", "/");
xpath("Show configuration") <xpath:string>("XPATH expression") <ns:string>("Namespace"), show_conf_xpath("candidate");
yang("Show yang specs"), show_yang(); {
example("Show example yang spec"), show_yang("example");
}
}
EOF
new "test params: -f $cfg"
if [ "$BE" -ne 0 ]; then
@ -154,9 +177,12 @@ fi
new "wait backend"
wait_backend
new "cli defined extension"
new "cli show version"
expectpart "$($clixon_cli -1f $cfg show version)" 0 "${CLIXON_VERSION}"
new "cli show yang example"
expectpart "$($clixon_cli -1f $cfg show yang example)" 0 "revision 2020-12-01" "Added table/parameter/value as the primary data example"
new "empty values in leaf-list"
expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO<rpc $DEFAULTNS><edit-config><target><candidate/></target><config><x xmlns=\"urn:example:clixon\"><f><e>a</e></f></x></config></edit-config></rpc>]]>]]>" "^<rpc-reply $DEFAULTNS><ok/></rpc-reply>]]>]]>$"