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

Merge branch 'master' into develop

Browse source
This commit is contained in:
Olof hagsand 2017-06-07 21:11:36 +02:00
commit 5926c34f25
7 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CHANGELOG.md
View file

@ -1,6 +1,11 @@
# Clixon CHANGELOG # Clixon CHANGELOG
- removed api_path extension from internal netconf ## 3.3.1
- Fixed yang leafref cli completion.
- Removed non-standard api_path extension from internal netconf so that the internal com.
- Strings in xmldb_put not properly encoded, eg eth/0 became eth.00000 - Strings in xmldb_put not properly encoded, eg eth/0 became eth.00000
## 3.3.0 ## 3.3.0

2
README.md
View file

@ -39,7 +39,7 @@ generated CLI and configuration interface.
Dependencies Dependencies
============ ============
Clixon is dependend on the following software packages, which need to exist on the target machine. Clixon depends on the following software packages, which need to exist on the target machine.
- [CLIgen](http://www.cligen.se) is required for building Clixon. If you need - [CLIgen](http://www.cligen.se) is required for building Clixon. If you need
to build and install CLIgen: to build and install CLIgen:
``` ```

6
configure vendored
View file

@ -2136,7 +2136,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
CLIXON_VERSION_MAJOR="3" CLIXON_VERSION_MAJOR="3"
CLIXON_VERSION_MINOR="3" CLIXON_VERSION_MINOR="3"
CLIXON_VERSION_PATCH="0" CLIXON_VERSION_PATCH="1"
CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}\"" CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}\""
# Fix to specific version (eg 3.5) or head (3) # Fix to specific version (eg 3.5) or head (3)
CLIGEN_VERSION="3" CLIGEN_VERSION="3"
@ -2172,8 +2172,8 @@ _ACEOF
# Bind to specific CLIgen version # Bind to specific CLIgen version
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: CLIXON version is ${CLIXON_VERSION}_PRE1" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: CLIXON version is ${CLIXON_VERSION}" >&5
$as_echo "CLIXON version is ${CLIXON_VERSION}_PRE1" >&6; } $as_echo "CLIXON version is ${CLIXON_VERSION}" >&6; }
ac_aux_dir= ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do

2
configure.ac
View file

@ -62,7 +62,7 @@ AC_SUBST(CLIXON_VERSION_MAJOR)
AC_SUBST(CLIXON_VERSION_MINOR) AC_SUBST(CLIXON_VERSION_MINOR)
AC_SUBST(CLIGEN_VERSION) # Bind to specific CLIgen version AC_SUBST(CLIGEN_VERSION) # Bind to specific CLIgen version
AC_MSG_RESULT(CLIXON version is ${CLIXON_VERSION}_PRE1) AC_MSG_RESULT(CLIXON version is ${CLIXON_VERSION})
AC_CANONICAL_TARGET AC_CANONICAL_TARGET
AC_SUBST(CC) AC_SUBST(CC)

6
datastore/keyvalue/Makefile.in
View file

@ -80,13 +80,13 @@ distclean: clean
$(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -c $< $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -c $<
install: $(PLUGIN) install: $(PLUGIN)
install -d $(DESTDIR)$(clixon_LIBDIR)/xmldb install -d $(DESTDIR)$(libdir)/xmldb
install $(PLUGIN) $(DESTDIR)$(clixon_LIBDIR)/xmldb install $(PLUGIN) $(DESTDIR)$(libdir)/xmldb
install-include: install-include:
uninstall: uninstall:
rm -rf $(DESTDIR)$(clixon_LIBDIR)/xmldb/$(PLUGIN) rm -rf $(DESTDIR)$(libdir)/xmldb/$(PLUGIN)
TAGS: TAGS:
find . -name '*.[chyl]' -print | etags - find . -name '*.[chyl]' -print | etags -

4
datastore/text/Makefile.in
View file

@ -79,8 +79,8 @@ distclean: clean
$(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -c $< $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -c $<
install: $(PLUGIN) install: $(PLUGIN)
install -d $(DESTDIR)$(clixon_LIBDIR)/xmldb install -d $(DESTDIR)$(libdir)/xmldb
install $(PLUGIN) $(DESTDIR)$(clixon_LIBDIR)/xmldb install $(PLUGIN) $(DESTDIR)$(libdir)/xmldb
install-include: install-include:

3
datastore/text/clixon_xmldb_text.c
View file

@ -266,7 +266,7 @@ xml_spec_populate(cxobj *x,
else else
y = yang_find_topnode(yspec, name); /* still NULL for config */ y = yang_find_topnode(yspec, name); /* still NULL for config */
if (y==NULL){ if (y==NULL){
clicon_err(OE_XML, EBADF, "yang spec not found for xml node '%s' xml parent name: '%s' yangspec:'", clicon_err(OE_XML, EBADF, "yang spec not found for xml node '%s' xml parent name: '%s' yangspec:'%s']",
name, name,
xp?xml_name(xp):"", yp?yp->ys_argument:""); xp?xml_name(xp):"", yp?yp->ys_argument:"");
goto done; goto done;
@ -799,6 +799,7 @@ text_put(xmldb_handle xh,
} }
/* 2. File is not empty <top><config>...</config></top> -> replace root */ /* 2. File is not empty <top><config>...</config></top> -> replace root */
else{ else{
/* There should only be one element and called config */ /* There should only be one element and called config */
if (singleconfigroot(x0, &x0) < 0) if (singleconfigroot(x0, &x0) < 0)
goto done; goto done;