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.
112 lines
4.3 KiB
Bash
Executable file
112 lines
4.3 KiB
Bash
Executable file
#!/usr/bin/env bash
|
|
# Parse yang openconfig yangs from https://github.com/openconfig/public
|
|
# Notes:
|
|
# - openconfig test suites are patched to counter Clixon issues as follows:
|
|
# - release/models/mpls/openconfig-mpls-te.yang
|
|
# issue: https://github.com/clicon/clixon/issues/6
|
|
# - Env-var MODELS should be 1
|
|
# - Env-var OPENCONFIG should point to checkout place. (define it in site.sh for example)
|
|
|
|
# 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/test.yang
|
|
|
|
new "openconfig"
|
|
if [ ! -d "$OPENCONFIG" ]; then
|
|
# err "Hmm Openconfig dir does not seem to exist, try git clone https://github.com/openconfig/public?"
|
|
if [ "$s" = $0 ]; then exit 0; else return 0; fi
|
|
fi
|
|
|
|
OCDIR=$OPENCONFIG/release/models
|
|
|
|
cat <<EOF > $cfg
|
|
<clixon-config xmlns="http://clicon.org/config">
|
|
<CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
|
|
<CLICON_YANG_DIR>$OCDIR</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/acl</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/aft</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/bfd</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/bgp</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/catalog</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/interfaces</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/isis</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/lacp</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/lldp</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/local-routing</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/macsec</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/mpls</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/multicast</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/network-instance</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/openflow</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/optical-transport</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/ospf</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/platform</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/policy</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/policy-forwarding</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/probes</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/qos</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/relay-agent</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/rib</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/segment-routing</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/stp</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/system</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/telemetry</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/types</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/vlan</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/wifi</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/wifi/access-points</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/wifi/ap-manager</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/wifi/mac</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/wifi/phy</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$OCDIR/wifi/types</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
|
|
<CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
|
|
<CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
|
|
<CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
|
|
<CLICON_CLI_MODE>$APPNAME</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>
|
|
<CLICON_MODULE_LIBRARY_RFC7895>true</CLICON_MODULE_LIBRARY_RFC7895>
|
|
</clixon-config>
|
|
EOF
|
|
|
|
files=$(find $OPENCONFIG -name "*.yang")
|
|
# Count nr of modules (exclude submodule) Assume "module" or "submodule"
|
|
# first word on first line
|
|
let ms=0; # Nr of modules
|
|
let ss=0; # Nr of smodules
|
|
for f in $files; do
|
|
let m=0; # Nr of modules
|
|
let s=0; # Nr of modules
|
|
if [ -n "$(head -15 $f|grep '^[ ]*module')" ]; then
|
|
let m++;
|
|
let ms++;
|
|
elif [ -n "$(head -15 $f|grep '^[ ]*submodule')" ]; then
|
|
let s++;
|
|
let ss++;
|
|
else
|
|
echo "No module or submodule found $f"
|
|
exit
|
|
fi
|
|
if [ $m -eq 1 -a $s -eq 1 ]; then
|
|
echo "Double match $f"
|
|
exit
|
|
fi
|
|
done
|
|
|
|
new "Openconfig test: $clixon_cli -1f $cfg -y $f show version ($m modules)"
|
|
for f in $files; do
|
|
if [ -n "$(head -1 $f|grep '^module')" ]; then
|
|
new "$clixon_cli -1f $cfg -y $f show version"
|
|
expectfn "$clixon_cli -1f $cfg -y $f show version" 0 "$version."
|
|
fi
|
|
|
|
done
|
|
|
|
rm -rf $dir
|
|
|