19e21be0bc
Major New features
* New and updated search functions using xpath, api-path and instance-id
* New search functions using api-path and instance_id:
* C search functions: `clixon_find_instance_id()` and `clixon_find_api_path()`
* Binary search optimization in lists for indexed leafs in all three formats.
* This improves search performance to O(logN) which is drastical improvements for large lists.
* You can also register explicit indexes for making binary search (not only list keys)
* For more info, see docs at [paths](https://clixon-docs.readthedocs.io/en/latest/paths.html) and
[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)
* On failed validation of leafrefs, error message changed from: `No such leaf` to `No leaf <name> matching path <path>`.
* CLI Error message (clicon_rpc_generate_error()) changed when backend returns netconf error to be more descriptive:
* Original: `Config error: Validate failed. Edit and try again or discard changes: Invalid argument`
* New (example): `Netconf error: application operation-failed Identityref validation failed, undefined not derived from acl-base . Validate failed. Edit and try again or discard changes"
Minor changes
* Test framework
* Added `-- -S <file>` command-line to main example to be able to return any state to main example.
* Added `test/cicd` test scripts for running on a set of other hosts
* C-code restructuring
* clixon_yang.c partitioned and moved code into clixon_yang_parse_lib.c and clixon_yang_module.c and move back some code from clixon_yang_type.c.
* partly to reduce size, but most important to limit code that accesses internal yang structures, only clixon_yang.c does this now.
170 lines
4.6 KiB
Bash
Executable file
170 lines
4.6 KiB
Bash
Executable file
#!/usr/bin/env bash
|
|
# Magic line must be first in script (see README.md)
|
|
s="$_" ; . ./lib.sh || if [ "$s" = $0 ]; then exit 0; else return 0; fi
|
|
|
|
# datastore tests.
|
|
# Just run a binary direct to datastore. No clixon.
|
|
|
|
fyang=$dir/ietf-ip.yang
|
|
|
|
: ${clixon_util_datastore:=clixon_util_datastore}
|
|
|
|
cat <<EOF > $fyang
|
|
module ietf-ip{
|
|
yang-version 1.1;
|
|
namespace "urn:example:clixon";
|
|
prefix ip;
|
|
container x {
|
|
list y {
|
|
key "a b";
|
|
leaf a {
|
|
type string;
|
|
}
|
|
leaf b {
|
|
type string;
|
|
}
|
|
leaf c {
|
|
type string;
|
|
}
|
|
}
|
|
leaf d {
|
|
type empty;
|
|
}
|
|
container f {
|
|
leaf-list e {
|
|
type string;
|
|
}
|
|
}
|
|
leaf g {
|
|
type string;
|
|
}
|
|
container h {
|
|
leaf j {
|
|
type string;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
EOF
|
|
|
|
xml='<config><x xmlns="urn:example:clixon"><y><a>1</a><b>2</b><c>first-entry</c></y><y><a>1</a><b>3</b><c>second-entry</c></y><y><a>2</a><b>3</b><c>third-entry</c></y><d/><f><e>a</e><e>b</e><e>c</e></f><g>astring</g></x></config>'
|
|
|
|
|
|
name=text
|
|
|
|
|
|
mydir=$dir/$name
|
|
|
|
if [ ! -d $mydir ]; then
|
|
mkdir $mydir
|
|
fi
|
|
rm -rf $mydir/*
|
|
|
|
conf="-d candidate -b $mydir -y $dir/ietf-ip.yang"
|
|
|
|
new "datastore init"
|
|
expectfn "$clixon_util_datastore $conf init" 0 ""
|
|
|
|
new "datastore put all replace"
|
|
ret=$($clixon_util_datastore $conf put replace "$xml")
|
|
expectmatch "$ret" $? "0" ""
|
|
|
|
new "datastore get"
|
|
expectfn "$clixon_util_datastore $conf get /" 0 "^$xml$"
|
|
|
|
new "datastore put all remove"
|
|
expectfn "$clixon_util_datastore $conf put remove <config/>" 0 ""
|
|
|
|
new "datastore get"
|
|
expectfn "$clixon_util_datastore $conf get /" 0 "^<config/>$"
|
|
|
|
new "datastore put all merge"
|
|
ret=$($clixon_util_datastore $conf put merge "$xml")
|
|
expectmatch "$ret" $? "0" ""
|
|
|
|
# expectfn "$clixon_util_datastore $conf put merge $xml" 0 ""
|
|
|
|
new "datastore get"
|
|
expectfn "$clixon_util_datastore $conf get /" 0 "^$xml$"
|
|
|
|
new "datastore put all delete"
|
|
expectfn "$clixon_util_datastore $conf put remove <config/>" 0 ""
|
|
|
|
new "datastore get"
|
|
expectfn "$clixon_util_datastore $conf get /" 0 "^<config/>$"
|
|
|
|
new "datastore put all create"
|
|
ret=$($clixon_util_datastore $conf put create "$xml")
|
|
expectmatch "$ret" $? "0" ""
|
|
|
|
new "datastore get"
|
|
expectfn "$clixon_util_datastore $conf get /" 0 "^$xml$"
|
|
|
|
new "datastore put top create"
|
|
expectfn "$clixon_util_datastore $conf put create <config><x/></config>" 0 "" # error
|
|
|
|
# Single key operations
|
|
# leaf
|
|
new "datastore put all delete"
|
|
expectfn "$clixon_util_datastore $conf delete" 0 ""
|
|
|
|
new "datastore init"
|
|
expectfn "$clixon_util_datastore $conf init" 0 ""
|
|
|
|
new "datastore create leaf"
|
|
expectfn "$clixon_util_datastore $conf put create <config><x><y><a>1</a><b>3</b><c>newentry</c></y></x></config>" 0 ""
|
|
|
|
new "datastore create leaf"
|
|
expectfn "$clixon_util_datastore $conf put create <config><x><y><a>1</a><b>3</b><c>newentry</c></y></x></config>" 0 ""
|
|
|
|
new "datastore delete leaf"
|
|
expectfn "$clixon_util_datastore $conf put delete <config><x><y><a>1</a><b>3</b></y></x></config>" 0 ""
|
|
|
|
new "datastore replace leaf"
|
|
expectfn "$clixon_util_datastore $conf put create <config><x><y><a>1</a><b>3</b><c>newentry</c></y></x></config>" 0 ""
|
|
|
|
new "datastore remove leaf"
|
|
expectfn "$clixon_util_datastore $conf put remove <config><x><g/></x></config>" 0 ""
|
|
|
|
new "datastore remove leaf"
|
|
expectfn "$clixon_util_datastore $conf put remove <config><x><y><a>1</a><b>3</b><c/></y></x></config>" 0 ""
|
|
|
|
new "datastore delete leaf"
|
|
expectfn "$clixon_util_datastore $conf put delete <config><x><g/></x></config>" 0 ""
|
|
|
|
new "datastore merge leaf"
|
|
expectfn "$clixon_util_datastore $conf put merge <config><x><g>nalle</g></x></config>" 0 ""
|
|
|
|
new "datastore replace leaf"
|
|
expectfn "$clixon_util_datastore $conf put replace <config><x><g>nalle</g></x></config>" 0 ""
|
|
|
|
new "datastore merge leaf"
|
|
expectfn "$clixon_util_datastore $conf put merge <config><x><y><a>1</a><b>3</b><c>newentry</c></y></x></config>" 0 ""
|
|
|
|
new "datastore replace leaf"
|
|
expectfn "$clixon_util_datastore $conf put replace <config><x><y><a>1</a><b>3</b><c>newentry</c></y></x></config>" 0 ""
|
|
|
|
new "datastore create leaf"
|
|
expectfn "$clixon_util_datastore $conf put create <config><x><h><j>aaa</j></h></x></config>" 0 ""
|
|
|
|
new "datastore create leaf"
|
|
expectfn "$clixon_util_datastore $conf put create <config><x><y><a>1</a><b>3</b><c>newentry</c></y></x></config>" 0 ""
|
|
|
|
new "datastore other db init"
|
|
expectfn "$clixon_util_datastore -d kalle -b $mydir -y $dir/ietf-ip.yang init" 0 ""
|
|
|
|
new "datastore other db copy"
|
|
expectfn "$clixon_util_datastore $conf copy kalle" 0 ""
|
|
|
|
diff $mydir/kalle_db $mydir/candidate_db
|
|
|
|
new "datastore lock"
|
|
expectfn "$clixon_util_datastore $conf lock 756" 0 ""
|
|
|
|
# unset conditional parameters
|
|
unset clixon_util_datastore
|
|
|
|
rm -rf $mydir
|
|
|
|
rm -rf $dir
|
|
|