* Fixed: Datastore read on startup got fixed default values.
* Fixed: Default values only worked on leafs, not typedefs.
This commit is contained in:
Olof hagsand
parent
7425a3b520
commit
28fad0303a
7 changed files with 157 additions and 16 deletions
|
|
@ -39,8 +39,7 @@ Expected: Early March 2020
|
|||
[search](https://clixon-docs.readthedocs.io/en/latest/xml.html#searching-in-xml)
|
||||
|
||||
### API changes on existing features (you may need to change your code)
|
||||
* C-API change: `xml_new()` changed from:
|
||||
* `xml_new(name, xp, ys)` to `xml_new(name, prefix, xp, type)`
|
||||
* C-API change: `xml_new()` changed from `xml_new(name, xp, ys)` to `xml_new(name, prefix, xp, type)`
|
||||
* If you have used, `ys`, add `xml_spec_set(x, ys)` after the statement
|
||||
* If you have `xml_type_set(x, TYPE)` or `xml_prefix_set(x, PREFIX)` immediately after the statement, you can remove those and set them directly as: `xml_new(name, PREFIX, xp, TYPE)`
|
||||
* NACM datanode write rules have been changed from looking at datastore being chekend (eg running/candidate/startup) to *only* look at running.
|
||||
|
|
@ -102,6 +101,8 @@ Expected: Early March 2020
|
|||
|
||||
### Corrected Bugs
|
||||
|
||||
* Fixed: Datastore read on startup got fixed default values.
|
||||
* Fixed: Default values only worked on leafs, not typedefs.
|
||||
* Fixed: NACM datanode write problem: read/write/exec default rules did not work.
|
||||
* Fixed [Makefile syntax error *** mixed implicit and normal rules #104](https://github.com/clicon/clixon/issues/104). Make operator `|=` seems not to work on GNU make version < 4.
|
||||
* Yang specs with recursive grouping/use statement is now fixed: instead of stack overflow, you get an error message and an exit
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ typedef struct clixon_xml_vec clixon_xvec; /* struct defined in clicon_xvec.c */
|
|||
#define XML_FLAG_DEL 0x04 /* Node is deleted (commits) or parent deleted rec */
|
||||
#define XML_FLAG_CHANGE 0x08 /* Node is changed (commits) or child changed rec */
|
||||
#define XML_FLAG_NONE 0x10 /* Node is added as NONE */
|
||||
#define XML_FLAG_DEFAULT 0x20 /* Added as default value @see xml_default*/
|
||||
#define XML_FLAG_DEFAULT 0x20 /* Added as default value @see xml_default */
|
||||
|
||||
/*
|
||||
* Prototypes
|
||||
|
|
|
|||
|
|
@ -754,8 +754,6 @@ xmldb_get0_clear(clicon_handle h,
|
|||
{
|
||||
int retval = -1;
|
||||
|
||||
if (clicon_datastore_cache(h) != DATASTORE_CACHE_ZEROCOPY)
|
||||
goto ok;
|
||||
if (x == NULL)
|
||||
goto ok;
|
||||
/* clear XML tree of defaults */
|
||||
|
|
|
|||
|
|
@ -784,7 +784,7 @@ xml_tree_prune_flagged(cxobj *xt,
|
|||
x = NULL;
|
||||
xprev = NULL;
|
||||
while ((x = xml_child_each(xt, x, CX_ELMNT)) != NULL) {
|
||||
if (xml_flag(x, flag) == test?flag:0){ /* Pass test means purge */
|
||||
if (xml_flag(x, flag) == (test?flag:0)){ /* Pass test means purge */
|
||||
if (xml_purge(x) < 0)
|
||||
goto done;
|
||||
x = xprev;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,8 @@
|
|||
*
|
||||
***** BEGIN LICENSE BLOCK *****
|
||||
|
||||
Copyright (C) 2009-2020 Olof Hagsand
|
||||
Copyright (C) 2009-2019 Olof Hagsand
|
||||
Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
|
||||
|
||||
This file is part of CLIXON.
|
||||
|
||||
|
|
@ -1314,6 +1315,7 @@ ys_populate_leaf(clicon_handle h,
|
|||
char *origtype=NULL; /* original type */
|
||||
uint8_t fraction_digits;
|
||||
int options = 0x0;
|
||||
yang_stmt *ytypedef; /* where type is define */
|
||||
|
||||
yparent = ys->ys_parent; /* Find parent: list/container */
|
||||
/* 1. Find type specification and set cv type accordingly */
|
||||
|
|
@ -1335,8 +1337,12 @@ ys_populate_leaf(clicon_handle h,
|
|||
clicon_err(OE_YANG, errno, "cv_new_set");
|
||||
goto done;
|
||||
}
|
||||
/* get parent of where type is defined, can be original object */
|
||||
ytypedef = yrestype?yang_parent_get(yrestype):ys;
|
||||
|
||||
/* 3. Check if default value. Here we parse the string in the default-stmt
|
||||
* and add it to the leafs cv.
|
||||
* 3a) First check local default
|
||||
*/
|
||||
if ((ydef = yang_find(ys, Y_DEFAULT, NULL)) != NULL){
|
||||
if ((cvret = cv_parse1(ydef->ys_argument, cv, &reason)) < 0){ /* error */
|
||||
|
|
@ -1349,6 +1355,19 @@ ys_populate_leaf(clicon_handle h,
|
|||
goto done;
|
||||
}
|
||||
}
|
||||
/* 2. then check typedef default */
|
||||
else if (ytypedef != ys &&
|
||||
(ydef = yang_find(ytypedef, Y_DEFAULT, NULL)) != NULL) {
|
||||
if ((cvret = cv_parse1(ydef->ys_argument, cv, &reason)) < 0){ /* error */
|
||||
clicon_err(OE_YANG, errno, "parsing cv");
|
||||
goto done;
|
||||
}
|
||||
if (cvret == 0){ /* parsing failed */
|
||||
clicon_err(OE_YANG, errno, "Parsing CV: %s", reason);
|
||||
free(reason);
|
||||
goto done;
|
||||
}
|
||||
}
|
||||
else{
|
||||
/* 3b. If not default value, indicate empty cv. */
|
||||
cv_flag_set(cv, V_UNSET); /* no value (no default) */
|
||||
|
|
|
|||
|
|
@ -6,8 +6,9 @@
|
|||
# (o report-all-tagged)
|
||||
# o trim
|
||||
# o explicit
|
||||
# Clixon supports explicit, bit the testcases define the other cases as well
|
||||
# Clixon supports explicit, but the testcases define the other cases as well
|
||||
# in case others will be supported
|
||||
# XXX I dont think this is correct. Or at least it is not complete.
|
||||
|
||||
# Magic line must be first in script (see README.md)
|
||||
s="$_" ; . ./lib.sh || if [ "$s" = $0 ]; then exit 0; else return 0; fi
|
||||
|
|
@ -78,14 +79,10 @@ if [ $BE -ne 0 ]; then
|
|||
wait_backend
|
||||
fi
|
||||
|
||||
# This is the base XML with thre values in the server: noset, default, other
|
||||
# This is the base XML with three values in the server: notset, default, other
|
||||
XML='<c xmlns="urn:example:default"><x><k>default</k><y>42</y></x><x><k>notset</k></x><x><k>other</k><y>99</y></x></c>'
|
||||
|
||||
# report-all: doe not consider any data node to be default data,
|
||||
# even schema default data. (noset is set to 42)
|
||||
REPORT_ALL='<c xmlns="urn:example:default"><x><k>default</k><y>42</y></x><x><k>notset</k></x><x><k>other</k><y>99</y></x></c>'
|
||||
|
||||
# report-all: doe not consider any data node to be default data,
|
||||
# report-all: does not consider any data node to be default data,
|
||||
# even schema default data. (noset is set to 42)
|
||||
REPORT_ALL='<c xmlns="urn:example:default"><x><k>default</k><y>42</y></x><x><k>notset</k><y>42</y></x><x><k>other</k><y>99</y></x></c>'
|
||||
|
||||
|
|
@ -96,7 +93,7 @@ TRIM='<c xmlns="urn:example:default"><x><k>default</k></x><x><k>notset</k></x><x
|
|||
# explicit: MUST consider any data node that is not explicitly set data to
|
||||
# be default data.
|
||||
# (SAME AS Input XML)
|
||||
EXPLICIT='<c xmlns="urn:example:default"><x><k>default</k><y>42</y></x><x><k>notset</k></x><x><k>other</k><y>99</y></x></c>'
|
||||
EXPLICIT='<c xmlns="urn:example:default"><x><k>default</k><y>42</y></x><x><k>notset</k><y>42</y></x><x><k>other</k><y>99</y></x></c>'
|
||||
|
||||
new "Set defaults"
|
||||
expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><edit-config><target><candidate/></target><config>$XML</config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
|
||||
|
|
@ -104,7 +101,6 @@ expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><edit-config><target><candidate/></
|
|||
new "Check config (Clixon supports explicit)"
|
||||
expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>' "^<rpc-reply><data>$EXPLICIT</data></rpc-reply>]]>]]>$"
|
||||
|
||||
|
||||
if [ $BE -eq 0 ]; then
|
||||
exit # BE
|
||||
fi
|
||||
|
|
|
|||
127
test/test_yang_default.sh
Executable file
127
test/test_yang_default.sh
Executable file
|
|
@ -0,0 +1,127 @@
|
|||
#!/usr/bin/env bash
|
||||
# Default handling and datastores.
|
||||
# There was a bug with loading startup and writing it back to candidate/running
|
||||
# where default mode in startup being "explicit" was transformed to "report-all"
|
||||
# according to RFC 6243.
|
||||
# Ie, all default values were populated.
|
||||
# This test goes through (all) testcases where clixon writes data back to a datastore, and
|
||||
# ensures default values are not present in the datastore.
|
||||
# XXX two errors:
|
||||
# 1. Running is changed
|
||||
# XXX 2. type default not set
|
||||
|
||||
# Magic line must be first in script (see README.md)
|
||||
s="$_" ; . ./lib.sh || if [ "$s" = $0 ]; then exit 0; else return 0; fi
|
||||
|
||||
APPNAME=example
|
||||
|
||||
cfg=$dir/conf_yang.xml
|
||||
fyang=$dir/example-default.yang
|
||||
|
||||
cat <<EOF > $cfg
|
||||
<clixon-config xmlns="http://clicon.org/config">
|
||||
<CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
|
||||
<CLICON_FEATURE>ietf-netconf:startup</CLICON_FEATURE>
|
||||
<CLICON_MODULE_SET_ID>42</CLICON_MODULE_SET_ID>
|
||||
<CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
|
||||
<CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
|
||||
<CLICON_YANG_MAIN_FILE>$fyang</CLICON_YANG_MAIN_FILE>
|
||||
<CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
|
||||
<CLICON_BACKEND_DIR>/usr/local/lib/$APPNAME/backend</CLICON_BACKEND_DIR>
|
||||
<CLICON_BACKEND_REGEXP>example_backend.so$</CLICON_BACKEND_REGEXP>
|
||||
<CLICON_NETCONF_DIR>/usr/local/lib/$APPNAME/netconf</CLICON_NETCONF_DIR>
|
||||
<CLICON_RESTCONF_DIR>/usr/local/lib/$APPNAME/restconf</CLICON_RESTCONF_DIR>
|
||||
<CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
|
||||
<CLICON_CLI_MODE>$APPNAME</CLICON_CLI_MODE>
|
||||
<CLICON_SOCK>$dir/$APPNAME.sock</CLICON_SOCK>
|
||||
<CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
|
||||
<CLICON_XMLDB_DIR>$dir</CLICON_XMLDB_DIR>
|
||||
<CLICON_XMLDB_PRETTY>false</CLICON_XMLDB_PRETTY>
|
||||
</clixon-config>
|
||||
EOF
|
||||
|
||||
cat <<EOF > $fyang
|
||||
module example-default {
|
||||
namespace "urn:example:default";
|
||||
prefix "ex";
|
||||
typedef def {
|
||||
description "Just a base type with a default value of 42";
|
||||
type int32;
|
||||
default 42;
|
||||
}
|
||||
container a{
|
||||
list b {
|
||||
key c;
|
||||
leaf c{
|
||||
type string;
|
||||
}
|
||||
leaf d1 {
|
||||
description "direct default";
|
||||
type string;
|
||||
default "foo";
|
||||
}
|
||||
leaf d2 { /* <-- ys */
|
||||
description "default in type";
|
||||
type def;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
EOF
|
||||
|
||||
testrun(){
|
||||
|
||||
# Initial data (default y not given)
|
||||
XML='<a xmlns="urn:example:default"><b><c>0</c></b></a>'
|
||||
|
||||
db=startup
|
||||
if [ $db = startup ]; then
|
||||
sudo echo "<config>$XML</config>" > $dir/startup_db
|
||||
fi
|
||||
if [ $BE -ne 0 ]; then # Bring your own backend
|
||||
new "kill old backend"
|
||||
sudo clixon_backend -zf $cfg
|
||||
if [ $? -ne 0 ]; then
|
||||
err
|
||||
fi
|
||||
new "start backend -s $db -f $cfg"
|
||||
start_backend -s $db -f $cfg
|
||||
fi
|
||||
|
||||
new "waiting"
|
||||
wait_backend
|
||||
|
||||
# permission kludges
|
||||
sudo chmod 666 $dir/running_db
|
||||
sudo chmod 666 $dir/startup_db
|
||||
|
||||
new "Checking startup unchanged"
|
||||
ret=$(diff $dir/startup_db <(echo "<config>$XML</config>"))
|
||||
if [ $? -ne 0 ]; then
|
||||
err "<config>$XML</config>" "$ret"
|
||||
fi
|
||||
|
||||
new "Checking running unchanged"
|
||||
ret=$(diff $dir/running_db <(echo -n "<config>$XML</config>"))
|
||||
if [ $? -ne 0 ]; then
|
||||
err "<config>$XML</config>" "$ret"
|
||||
fi
|
||||
|
||||
new "check running defaults"
|
||||
expecteof "$clixon_netconf -qf $cfg" 0 '<rpc message-id="101" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><get-config><source><running/></source></get-config></rpc>]]>]]>' '^<rpc-reply message-id="101" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><data><a xmlns="urn:example:default"><b><c>0</c><d1>foo</d1><d2>42</d2></b></a></data></rpc-reply>]]>]]>$'
|
||||
|
||||
if [ $BE -ne 0 ]; then # Bring your own backend
|
||||
new "Kill backend"
|
||||
# Check if premature kill
|
||||
pid=$(pgrep -u root -f clixon_backend)
|
||||
if [ -z "$pid" ]; then
|
||||
err "backend already dead"
|
||||
fi
|
||||
# kill backend
|
||||
stop_backend -f $cfg
|
||||
fi
|
||||
} # testrun
|
||||
|
||||
testrun
|
||||
|
||||
rm -rf $dir
|
||||
Loading…
Add table
Add a link
Reference in a new issue