From 01002ab14aaef039b40ca762d626f94f9c12bed3 Mon Sep 17 00:00:00 2001 From: Olof hagsand Date: Tue, 30 Nov 2021 16:00:41 +0100 Subject: [PATCH] vagrant script updates --- CHANGELOG.md | 7 ++++++- test/vagrant/vagrant.sh | 12 +++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d4a1576e..90dc4c0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -106,6 +106,12 @@ Developers may need to change their code char *xpath, cxobj *xstate) ``` +* Changed signature of `rpc_callback_call()` + * from: `clicon_handle h, cxobj *xe, cbuf *cbret, void *arg` + * to: `clicon_handle h, cxobj *xe, void *arg, int *nrp, cbuf *cbret)` +* Changed signature of `yang_extension_value()` + * from: `yang_stmt *ys, char *name, char *ns, char **value` + * to: `yang_stmt *ys, char *name, char *ns, int *exist, char **value` ### Minor features @@ -128,7 +134,6 @@ Developers may need to change their code * Added: [OpenConfig Path Compression Support](https://github.com/clicon/clixon/issues/274) * PR: [OpenConfig path compression](https://github.com/clicon/clixon/pull/276) * C API: Added set/get pointer API to clixon_data: - * Changed signature of `rpc_callback_call()` * Added json/cli support for cli save/load * clicon_ptr_get(), clicon_ptr_set(), * Restconf YANG PATCH according to RFC 8072 diff --git a/test/vagrant/vagrant.sh b/test/vagrant/vagrant.sh index d8ebbe97..46545cde 100755 --- a/test/vagrant/vagrant.sh +++ b/test/vagrant/vagrant.sh @@ -288,7 +288,7 @@ $sshcmd ./clixon.sh $release $wwwuser ${with_restconf} # Tests require yangmodels and openconfig cat< $dir/yangmodels.sh cd /usr/local/share -mkdir yang +test -d yang || mkdir yang cd yang git init git remote add -f origin https://github.com/YangModels/yang @@ -296,11 +296,13 @@ git config core.sparseCheckout true echo "standard/" >> .git/info/sparse-checkout echo "experimental/" >> .git/info/sparse-checkout git pull origin master -mkdir /usr/local/share/openconfig -cd /usr/local/share/openconfig -git clone https://github.com/openconfig/public # Patch yang syntax errors -sed -i s/=\ olt\'/=\ \'olt\'/g /usr/local/share/yang/standard/ieee/published/802.3/ieee802-ethernet-pon.yang +sed s/=\ olt\'/=\ \'olt\'/g /usr/local/share/yang/standard/ieee/published/802.3/ieee802-ethernet-pon.yang > ieee802-ethernet-pon2.yang +mv ieee802-ethernet-pon2.yang /usr/local/share/yang/standard/ieee/published/802.3/ieee802-ethernet-pon.yang +# openconfig +cd /usr/local/share +test -d openconfig || mkdir openconfig +git clone https://github.com/openconfig/public EOF chmod 755 $dir/yangmodels.sh $scpcmd $dir/yangmodels.sh vagrant@127.0.0.1: