From 9bd0dc42c6df7fbf3878187638da8c8276a1254b Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sun, 11 Nov 2018 12:20:51 +0100
Subject: [PATCH 01/72] 3.9 develop branch

---
 CHANGELOG.md                    | 11 +++++++++++
 README_DEVELOP.md => DEVELOP.md | 10 +++++++++-
 configure                       |  4 ++--
 configure.ac                    |  4 ++--
 docker/Makefile.in              |  2 +-
 5 files changed, 25 insertions(+), 6 deletions(-)
 rename README_DEVELOP.md => DEVELOP.md (92%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0fdfe034..dccf9718 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Clixon Changelog
 
+## 3.9.0 (Preliminary Target: 31 December 2018)
+
+### Planned new features
+* [Roadmap](ROADMAP.md) (Uncommitted and unprioritized)
+
+### Major New features
+### API changes on existing features (you may need to change your code)
+### Minor changes
+### Corrected Bugs
+### Known issues
+
 ## 3.8.0 (6 Nov 2018)
 
 ### Major New features
diff --git a/README_DEVELOP.md b/DEVELOP.md
similarity index 92%
rename from README_DEVELOP.md
rename to DEVELOP.md
index 350d3636..fb66e641 100644
--- a/README_DEVELOP.md
+++ b/DEVELOP.md
@@ -4,6 +4,7 @@
   * [How to work in git (branching)](#branching)
   * [How the meta-configure stuff works](#meta-configure)
   * [How to debug](#debug)
+  * [New release](#new-release)
 
 ## Documentation
 How to document the code
@@ -92,4 +93,11 @@ EOF
   valgrind --leak-check=full --show-leak-kinds=all clixon_netconf -qf /tmp/myconf.xml -y /tmp/my.yang
   valgrind --tool=callgrind clixon_netconf -qf /tmp/myconf.xml -y /tmp/my.yang
   sudo kcachegrind
- ```
\ No newline at end of file
+ ```
+
+## New release
+What to think about when doing a new release.
+* git merge --no-ff develop
+* change CLIXON_VERSION in configure.ac
+* git tag -a <version"
+* git push origin <version>
diff --git a/configure b/configure
index 27dc733f..9428e91f 100755
--- a/configure
+++ b/configure
@@ -2161,9 +2161,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 : ${INSTALLFLAGS="-s"}
 
 CLIXON_VERSION_MAJOR="3"
-CLIXON_VERSION_MINOR="8"
+CLIXON_VERSION_MINOR="9"
 CLIXON_VERSION_PATCH="0"
-CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}\""
+CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}.PRE\""
 
 # Fix to specific CLIgen version (eg 3.5) or head (3)
 CLIGEN_VERSION="3"
diff --git a/configure.ac b/configure.ac
index e6c08194..c46628fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,9 +43,9 @@ AC_INIT(lib/clixon/clixon.h.in)
 : ${INSTALLFLAGS="-s"}
 
 CLIXON_VERSION_MAJOR="3"
-CLIXON_VERSION_MINOR="8"
+CLIXON_VERSION_MINOR="9"
 CLIXON_VERSION_PATCH="0"
-CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}\""
+CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}.PRE\""
 
 # Fix to specific CLIgen version (eg 3.5) or head (3) 
 CLIGEN_VERSION="3" 
diff --git a/docker/Makefile.in b/docker/Makefile.in
index 23d0a7e8..c18b9fad 100644
--- a/docker/Makefile.in
+++ b/docker/Makefile.in
@@ -55,7 +55,7 @@ distclean: clean
 	rm -f Makefile *~ .depend
 
 docker:
-	sudo docker build -t $(IMAGE) .
+	sudo docker build -t $(IMAGE) .  # --no-cache
 	echo "cd ../example; make docker to build example application"
 
 push:

From 9c57902b966e6d8b5f5dec9635341b48d2ea006f Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sun, 18 Nov 2018 13:22:08 +0100
Subject: [PATCH 02/72] * XML parser conformance to W3 spec   * Names lexically
 correct (NCName)   * Syntactically Correct handling of '<?' (processing
 instructions) and '<?xml' (XML declaration)   * XML prolog syntax for
 'well-formed' XML   * <!DOCTYPE (ie DTD) is not supported.

---
 README.md                  |   3 +
 lib/src/clixon_xml.c       |  23 ++++++-
 lib/src/clixon_xml_parse.l |  61 +++++++++++++-----
 lib/src/clixon_xml_parse.y | 124 +++++++++++++++++++++++++------------
 test/lib.sh                |   9 ++-
 test/test_xml.sh           |  84 +++++++++++++++++++++++++
 util/Makefile.in           |   2 +-
 util/clixon_util_xml.c     |  38 +++++++++---
 util/clixon_util_xpath.c   |   5 +-
 9 files changed, 280 insertions(+), 69 deletions(-)

diff --git a/README.md b/README.md
index 9c52da1b..bbe3f324 100644
--- a/README.md
+++ b/README.md
@@ -101,6 +101,9 @@ The standards covered include:
 - [Namespaces](https://www.w3.org/TR/2009/REC-xml-names-20091208)
 - [XPATH](https://www.w3.org/TR/xpath-10)
 
+Not supported:
+- <!DOCTYPE
+
 Yang
 ====
 YANG and XML is at the heart of Clixon.  Yang modules are used as a
diff --git a/lib/src/clixon_xml.c b/lib/src/clixon_xml.c
index 9b09d34c..16183ef2 100644
--- a/lib/src/clixon_xml.c
+++ b/lib/src/clixon_xml.c
@@ -99,10 +99,26 @@
  *   <x>a</<x>
  *   <x>b</<x>
  * </c>
+ * From https://www.w3.org/TR/2009/REC-xml-names-20091208
+ * Definitions:
+ * - XML namespace: is identified by a URI reference [RFC3986]; element and 
+ *   attribute names may be placed in an XML namespace using the mechanisms 
+ *   described in this specification.
+ * - Expanded name: is a pair consisting of a namespace name and a local name.
+ * - Namespace name: For a name N in a namespace identified by a URI I, the 
+ *   "namespace name" is I.
+ *   For a name N that is not in a namespace, the "namespace name" has no value.
+ * - Local name: In either case the "local name" is N.
+ * It is this combination of the universally managed URI namespace with the 
+ * vocabulary's local names that is effective in avoiding name clashes.
  */
 struct xml{
     char             *x_name;       /* name of node */
     char             *x_namespace;  /* namespace, if any */
+#ifdef notyet
+    char             *x_namespacename;  /* namespace name (or NULL) */
+    char             *x_localname;  /* Local name N as defined above */
+#endif
     struct xml       *x_up;         /* parent node in hierarchy if any */
     struct xml      **x_childvec;   /* vector of children nodes */
     int               x_childvec_len;/* length of vector */
@@ -224,7 +240,7 @@ xmlns_check(cxobj *xn,
     return NULL;
 }
 
-/*! Check namespace of xml node by searhing recursively among ancestors 
+/*! Check namespace of xml node by searching recursively among ancestors 
  * @param[in]  xn         xml node
  * @param[in]  namespace  check validity of namespace
  * @retval     0          Found / validated or no yang spec
@@ -1258,15 +1274,18 @@ xmltree2cbuf(cbuf  *cb,
  * @see xml_parse_file
  * @see xml_parse_string
  * @see xml_parse_va
+ * @note special case is empty XML where the parser is not invoked.
  */
 static int 
-_xml_parse(const char *str, 
+_xml_parse(const char  *str, 
 	   yang_spec   *yspec,
 	   cxobj       *xt)
 {
     int                       retval = -1;
     struct xml_parse_yacc_arg ya = {0,};
 
+    if (strlen(str) == 0)
+	return 0; /* OK */
     if (xt == NULL){
 	clicon_err(OE_XML, errno, "Unexpected NULL XML");
 	return -1;	
diff --git a/lib/src/clixon_xml_parse.l b/lib/src/clixon_xml_parse.l
index 4e9b297a..39173634 100644
--- a/lib/src/clixon_xml_parse.l
+++ b/lib/src/clixon_xml_parse.l
@@ -34,6 +34,8 @@
  * XML parser
  * @see https://www.w3.org/TR/2008/REC-xml-20081126
  *      https://www.w3.org/TR/2009/REC-xml-names-20091208
+ * 
+
  */
 
 %{
@@ -72,8 +74,22 @@ int clixon_xml_parsewrap(void)
   return 1;
 }
 
+/*
+ * From https://www.w3.org/TR/2008/REC-xml-20081126:
+ * [4]* NameStartChar ::= ":" | [A-Z] | "_" | [a-z]   | [#xC0-#xD6] | [#xD8-#xF6] ...
+ * [4a] NameChar      ::= NameStartChar | "-" | "." | [0-9]     | #xB7| 
+ * [5]  Name	      ::= NameStartChar (NameChar)*
+ * NOTE: From https://www.w3.org/TR/2009/REC-xml-names-20091208:
+ * [4] 	NCName	      ::= Name - (Char* ':' Char*)  An XML Name, minus the ":"
+ * --> namestart and name below is NCNAME
+ */
+
 %}
 
+namestart  [A-Z_a-z]
+namechar   [A-Z_a-z\-\.0-9]
+ncname     {namestart}{namechar}*
+
 %x START
 %s STATEA
 %s AMPERSAND
@@ -81,36 +97,42 @@ int clixon_xml_parsewrap(void)
 %s CMNT
 %s STR
 %s TEXTDECL
+%s PIDECL
+%s PIDECL2
 %s STRDQ
 %s STRSQ
 
 %%
-<START>[0-9A-Za-z_\-]+ { clixon_xml_parselval.string = strdup(yytext);
+
+<START,TEXTDECL>[ \t]   ;
+<START,STATEA,CMNT,TEXTDECL>\n   { _YA->ya_linenum++; }
+
+<START>{ncname}        { clixon_xml_parselval.string = strdup(yytext);
                             return NAME; /* rather be catch-all */
                           }
-<START>[ \t]+          ;
 <START>\:               return *clixon_xml_parsetext;
 <START>\n             { _YA->ya_linenum++;}
-<START>"<?xml"        { BEGIN(TEXTDECL); return BTEXT;}
+<START><<EOF>>        { return MY_EOF; }
+<START>"<?xml"        { BEGIN(TEXTDECL); return BXMLDCL;}
+<START>"<?"           { BEGIN(PIDECL); return BQMARK;}
 <START>"/>"           { BEGIN(STATEA); return ESLASH; }
 <START>"<!--"         { BEGIN(CMNT); return BCOMMENT; }
 <START>"</"             return BSLASH;
 <START>[/=]             return *clixon_xml_parsetext; 
 <START>\<               return *clixon_xml_parsetext;
 <START>\>             { BEGIN(STATEA); return *clixon_xml_parsetext; }
-
 <START>\"             { _YA->ya_lex_state=START;BEGIN(STRDQ); return *clixon_xml_parsetext; }
 <START>\'             { _YA->ya_lex_state=START;BEGIN(STRSQ); return *clixon_xml_parsetext; }
-<START>.              { clixon_xml_parselval.string = yytext; return CHARDATA; /*XXX:optimize*/ }
+<START>.              { clixon_xml_parselval.string = yytext; return CHARDATA; /* optimize? */}
 
 <STATEA>"</"          { BEGIN(START); return BSLASH; }
+<STATEA><<EOF>>       { return MY_EOF; }
 <STATEA>"<!--"        { BEGIN(CMNT); return BCOMMENT; }
 <STATEA>"<![CDATA["   { BEGIN(CDATA); _YA->ya_lex_state = STATEA; clixon_xml_parselval.string = yytext; return CHARDATA;}
+<STATEA>"<?"          { BEGIN(PIDECL); return BQMARK; }
 <STATEA>\<            { BEGIN(START); return *clixon_xml_parsetext; }
 <STATEA>&             { _YA->ya_lex_state =STATEA;BEGIN(AMPERSAND);}
-<STATEA>\n            { clixon_xml_parselval.string = yytext;_YA->ya_linenum++; return (CHARDATA);}
-
-<STATEA>.             { clixon_xml_parselval.string = yytext;        return CHARDATA; /*XXX:optimize*/}
+<STATEA>.             { clixon_xml_parselval.string = yytext; return CHARDATA; }
 
 	/* @see xml_chardata_encode */
 <AMPERSAND>"amp;"    { BEGIN(_YA->ya_lex_state); clixon_xml_parselval.string = "&"; return CHARDATA;}
@@ -124,21 +146,30 @@ int clixon_xml_parsewrap(void)
 <CDATA>"]]>"          { BEGIN(_YA->ya_lex_state); clixon_xml_parselval.string = yytext; return CHARDATA;}
 
 <CMNT>"-->"           { BEGIN(START); return ECOMMENT; }
-<CMNT>\n                _YA->ya_linenum++;
 <CMNT>.               
 <TEXTDECL>encoding      return ENC;
 <TEXTDECL>version       return VER; 
-<TEXTDECL>"="           return *clixon_xml_parsetext;
-<TEXTDECL>"?>"        { BEGIN(START);return ETEXT;}
+<TEXTDECL>standalone    return SD; 
+<TEXTDECL>"="         { return *clixon_xml_parsetext; }
+<TEXTDECL>"?>"        { BEGIN(START);return EQMARK;}
 <TEXTDECL>\"          { _YA->ya_lex_state =TEXTDECL;BEGIN(STRDQ); return *clixon_xml_parsetext; }
 <TEXTDECL>\'          { _YA->ya_lex_state =TEXTDECL;BEGIN(STRSQ); return *clixon_xml_parsetext; }
+<TEXTDECL>.           { clixon_xml_parselval.string = yytext; return CHARDATA; /* optimize? */}
 
-<STRDQ>1\.[0-9]+      { clixon_xml_parselval.string = strdup(yytext);  return CHARDATA; }
-<STRDQ>[^\"]+         { clixon_xml_parselval.string = strdup(yytext);  return CHARDATA; }
+<PIDECL>{ncname}      { clixon_xml_parselval.string = strdup(yytext);
+                            return NAME; /* rather be catch-all */
+                          }
+<PIDECL>[ \t]         { BEGIN(PIDECL2);}
+<PIDECL>.             { clixon_xml_parselval.string = yytext; return CHARDATA; /* optimize? */}
+<PIDECL2>"?>"         { BEGIN(START);return EQMARK;}
+<PIDECL2>[^{?>}]+     { clixon_xml_parselval.string = strdup(yytext);  return STRING; }
+
+<STRDQ>1\.[0-9]+      { clixon_xml_parselval.string = strdup(yytext);  return STRING; }
+<STRDQ>[^\"]+         { clixon_xml_parselval.string = strdup(yytext); return STRING; }
 <STRDQ>\"             { BEGIN(_YA->ya_lex_state); return *clixon_xml_parsetext; }
 
-<STRSQ>1\.[0-9]+      { clixon_xml_parselval.string = strdup(yytext);   return CHARDATA; }
-<STRSQ>[^\']+         { clixon_xml_parselval.string = strdup(yytext);   return CHARDATA; }
+<STRSQ>1\.[0-9]+      { clixon_xml_parselval.string = strdup(yytext); return STRING; }
+<STRSQ>[^\']+         { clixon_xml_parselval.string = strdup(yytext); return STRING; }
 <STRSQ>\'             { BEGIN(_YA->ya_lex_state); return *clixon_xml_parsetext; }
 
 %%
diff --git a/lib/src/clixon_xml_parse.y b/lib/src/clixon_xml_parse.y
index ef9f78a9..a86c7276 100644
--- a/lib/src/clixon_xml_parse.y
+++ b/lib/src/clixon_xml_parse.y
@@ -39,12 +39,13 @@
   char *string;
 }
 
-%start topxml
+%start document
 
-%token <string> NAME CHARDATA 
-%token VER ENC
+%token <string> NAME CHARDATA STRING
+%token MY_EOF
+%token VER ENC SD
 %token BSLASH ESLASH
-%token BTEXT ETEXT
+%token BXMLDCL BQMARK EQMARK
 %token BCOMMENT ECOMMENT 
 
 %type <string> attvalue 
@@ -120,7 +121,8 @@ xml_parse_version(struct xml_parse_yacc_arg *ya,
 	free(ver);
 	return -1;
     }
-    free(ver);
+    if (ver)
+	free(ver);
     return 0;
 }
 
@@ -299,6 +301,11 @@ xml_parse_bslash2(struct xml_parse_yacc_arg *ya,
     return retval;
 }
 
+/*! Parse XML attribute
+ * Special cases:
+ *  - DefaultAttName:  xmlns
+ *  - PrefixedAttName: xmlns:NAME 
+ */
 static int
 xml_parse_attr(struct xml_parse_yacc_arg *ya,
 	       char                      *prefix,
@@ -308,6 +315,12 @@ xml_parse_attr(struct xml_parse_yacc_arg *ya,
     int    retval = -1;
     cxobj *xa; 
 
+#ifdef notyet
+    if (prefix && strcmp(prefix,"xmlns")==0)
+	fprintf(stderr, "PrefixedAttName NCNAME:%s = %s\n", name, attval);
+    if (prefix==NULL && strcmp(name,"xmlns")==0)
+	fprintf(stderr, "DefaultAttName = %s\n", attval);
+#endif /* notyet */
     if ((xa = xml_new(name, ya->ya_xelement, NULL)) == NULL)
 	goto done;
     xml_type_set(xa, CX_ATTR);
@@ -327,69 +340,100 @@ xml_parse_attr(struct xml_parse_yacc_arg *ya,
 %} 
  
 %%
-
-topxml      : list
-                    { clicon_debug(3, "topxml->list ACCEPT"); 
-                      YYACCEPT; }
-            | dcl list
-	            { clicon_debug(3, "topxml->dcl list ACCEPT"); 
-                      YYACCEPT; }
+ /* [1] document ::= prolog element Misc* */
+document    : prolog element misclist  MY_EOF
+                 { clicon_debug(2, "document->prolog element misc* ACCEPT"); 
+		   YYACCEPT; }
+            | elist MY_EOF
+	    { clicon_debug(2, "document->elist ACCEPT");  /* internal exception*/
+		   YYACCEPT; }
+            ;
+/* [22] prolog ::=  XMLDecl? Misc* (doctypedecl Misc*)? */
+prolog      : xmldcl misclist
+                { clicon_debug(2, "prolog->xmldcl misc*"); }
+            | misclist
+	        { clicon_debug(2, "prolog->misc*"); }
             ;
 
-dcl         : BTEXT info encode ETEXT { clicon_debug(3, "dcl->info encode"); }
+misclist    : misclist misc { clicon_debug(2, "misclist->misclist misc"); }
+            |      { clicon_debug(2, "misclist->"); }
             ;
 
-info        : VER '=' '\"' CHARDATA '\"' 
-                 { if (xml_parse_version(_YA, $4) <0) YYABORT; }
-            | VER '=' '\'' CHARDATA '\'' 
-         	 { if (xml_parse_version(_YA, $4) <0) YYABORT; }
+/* [27]	Misc ::=  Comment | PI | S */
+misc        : comment { clicon_debug(2, "misc->comment"); }
+	    | pi      { clicon_debug(2, "misc->pi"); }
+	    ;
+
+xmldcl      : BXMLDCL verinfo encodingdecl sddecl EQMARK
+	          { clicon_debug(2, "xmldcl->verinfo encodingdecl? sddecl?"); }
+            ;
+
+verinfo     : VER '=' '\"' STRING '\"' 
+                 { if (xml_parse_version(_YA, $4) <0) YYABORT;
+		     clicon_debug(2, "verinfo->version=\"STRING\"");}
+            | VER '=' '\'' STRING '\'' 
+         	 { if (xml_parse_version(_YA, $4) <0) YYABORT;
+		     clicon_debug(2, "verinfo->version='STRING'");}
+            ;
+
+encodingdecl : ENC '=' '\"' STRING '\"' {if ($4)free($4);}
+            | ENC '=' '\'' STRING '\'' {if ($4)free($4);}
             |
             ;
 
-encode      : ENC '=' '\"' CHARDATA '\"' {free($4);}
-            | ENC '=' '\'' CHARDATA '\'' {free($4);}
+sddecl      : SD '=' '\"' STRING '\"' {if ($4)free($4);}
+            | SD '=' '\'' STRING '\'' {if ($4)free($4);}
+            |
             ;
-
+/* [39] element ::= EmptyElemTag | STag content ETag */
 element     : '<' qname  attrs element1 
-                   { clicon_debug(3, "element -> < qname attrs element1"); }
-	      ;
+                   { clicon_debug(2, "element -> < qname attrs element1"); }
+	    ;
 
 qname       : NAME           { if (xml_parse_unprefixed_name(_YA, $1) < 0) YYABORT; 
-                                clicon_debug(3, "qname -> NAME %s", $1);}
+                                clicon_debug(2, "qname -> NAME %s", $1);}
             | NAME ':' NAME  { if (xml_parse_prefixed_name(_YA, $1, $3) < 0) YYABORT; 
-                                clicon_debug(3, "qname -> NAME : NAME");}
+                                clicon_debug(2, "qname -> NAME : NAME");}
             ;
 
 element1    :  ESLASH         {_YA->ya_xelement = NULL; 
-                               clicon_debug(3, "element1 -> />");} 
+                               clicon_debug(2, "element1 -> />");} 
             | '>'             { xml_parse_endslash_pre(_YA); }
-              list            { xml_parse_endslash_mid(_YA); }
-              etg             { xml_parse_endslash_post(_YA); 
-                               clicon_debug(3, "element1 -> > list etg");} 
+              elist           { xml_parse_endslash_mid(_YA); }
+              endtag          { xml_parse_endslash_post(_YA); 
+                               clicon_debug(2, "element1 -> > elist endtag");} 
             ;
 
-etg         : BSLASH NAME '>'          
-{ 			   clicon_debug(3, "etg -> < </ NAME %s>", $2); if (xml_parse_bslash1(_YA, $2) < 0) YYABORT; }
+endtag      : BSLASH NAME '>'          
+                       { clicon_debug(2, "endtag -> < </ NAME>");
+		         if (xml_parse_bslash1(_YA, $2) < 0) YYABORT; }
 
             | BSLASH NAME ':' NAME '>' 
                        { if (xml_parse_bslash2(_YA, $2, $4) < 0) YYABORT; 
-			 clicon_debug(3, "etg -> < </ NAME:NAME >"); }
+			 clicon_debug(2, "endtag -> < </ NAME:NAME >"); }
             ;
 
-list        : list content { clicon_debug(3, "list -> list content"); }
-            | content      { clicon_debug(3, "list -> content"); }
+elist       : elist content { clicon_debug(2, "elist -> elist content"); }
+            | content      { clicon_debug(2, "elist -> content"); }
             ;
 
-content     : element      { clicon_debug(3, "content -> element"); }
-            | comment      { clicon_debug(3, "content -> comment"); }
-            | CHARDATA         { if (xml_parse_content(_YA, $1) < 0) YYABORT;  
-                             clicon_debug(3, "content -> CHARDATA %s", $1); }
-            |              { clicon_debug(3, "content -> "); }
+/* Rule 43 */
+content     : element      { clicon_debug(2, "content -> element"); }
+            | comment      { clicon_debug(2, "content -> comment"); }
+            | pi           { clicon_debug(2, "content -> pi"); }
+            | CHARDATA     { if (xml_parse_content(_YA, $1) < 0) YYABORT;  
+                             clicon_debug(2, "content -> CHARDATA %s", $1); }
+            |              { clicon_debug(2, "content -> "); }
             ;
 
 comment     : BCOMMENT ECOMMENT
             ;
 
+pi          : BQMARK NAME EQMARK {clicon_debug(2, "pi -> <? NAME ?>"); free($2); }
+            | BQMARK NAME STRING EQMARK
+	    {clicon_debug(2, "pi -> <? NAME STRING ?>"); free($2); free($3);}
+            ;
+
 
 attrs       : attrs attr
             |
@@ -399,9 +443,9 @@ attr        : NAME '=' attvalue          { if (xml_parse_attr(_YA, NULL, $1, $3)
             | NAME ':' NAME '=' attvalue { if (xml_parse_attr(_YA, $1, $3, $5) < 0) YYABORT; }
             ;
 
-attvalue    : '\"' CHARDATA '\"'   { $$=$2; /* $2 must be consumed */}
+attvalue    : '\"' STRING '\"'   { $$=$2; /* $2 must be consumed */}
             | '\"'  '\"'       { $$=strdup(""); /* $2 must be consumed */}
-            | '\'' CHARDATA '\''   { $$=$2; /* $2 must be consumed */}
+            | '\'' STRING '\''   { $$=$2; /* $2 must be consumed */}
             | '\''  '\''       { $$=strdup(""); /* $2 must be consumed */}
             ;
 
diff --git a/test/lib.sh b/test/lib.sh
index 6a5138ac..52e5b119 100755
--- a/test/lib.sh
+++ b/test/lib.sh
@@ -78,6 +78,9 @@ expectfn(){
       expect2=
   fi
   ret=$($cmd)
+#  echo "cmd:\"$cmd\""
+#  echo "retval:\"$retval\""
+#  echo "ret:\"$ret\""
   if [ $? -ne $retval ]; then
       echo -e "\e[31m\nError in Test$testnr [$testname]:"
       echo -e "\e[0m:"
@@ -134,11 +137,15 @@ $input
 EOF
 )
   r=$? 
-  if [ $r -ne $retval ]; then
+  if [ $r != $retval ]; then
       echo -e "\e[31m\nError ($r != $retval) in Test$testnr [$testname]:"
       echo -e "\e[0m:"
       exit -1
   fi
+  # If error dont match output strings
+  if [ $r != 0 ]; then
+      return
+  fi
 
   # Match if both are empty string
   if [ -z "$ret" -a -z "$expect" ]; then
diff --git a/test/test_xml.sh b/test/test_xml.sh
index b2937201..2aa931e3 100755
--- a/test/test_xml.sh
+++ b/test/test_xml.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 # Test: XML parser tests
+#  @see https://www.w3.org/TR/2008/REC-xml-20081126
+#       https://www.w3.org/TR/2009/REC-xml-names-20091208
 #PROG="valgrind --leak-check=full --show-leak-kinds=all ../util/clixon_util_xml"
 PROG=../util/clixon_util_xml
 
@@ -9,6 +11,18 @@ PROG=../util/clixon_util_xml
 new "xml parse"
 expecteof "$PROG" 0 "<a><b/></a>" "^<a><b/></a>$"
 
+new "xml parse strange names"
+expecteof "$PROG" 0 "<_-><b0.><c-.-._/></b0.></_->" "^<_-><b0.><c-.-._/></b0.></_->$"
+
+new "xml parse name errors"
+expecteof "$PROG" 255 "<-a/>" ""
+
+new "xml parse name errors"
+expecteof "$PROG" 255 "<9/>" ""
+
+new "xml parse name errors"
+expecteof "$PROG" 255 "<a%/>" ""
+
 XML=$(cat <<EOF
 <a><description>An example of escaped CENDs</description>
 <sometext>
@@ -52,5 +66,75 @@ expecteof "$PROG" 0 "<x a='t'/>" '^<x a="t"/>$'
 new "Mixed quotes"
 expecteof "$PROG" 0 "<x a='t' b=\"q\"/>" '^<x a="t" b="q"/>$'
 
+new "XMLdecl version"
+expecteof "$PROG" 0 '<?xml version="1.0"?><a/>' '<a/>'
+
+new "XMLdecl version, single quotes"
+expecteof "$PROG" 0 "<?xml version='1.0'?><a/>" '<a/>'
+
+new "XMLdecl version no element"
+expecteof "$PROG" 255 '<?xml version="1.0"?>' ''
+
+new "XMLdecl no version"
+expecteof "$PROG" 255 '<?xml ?><a/>' ''
+
+new "XMLdecl misspelled version"
+expecteof "$PROG" 255 '<?xml verion="1.0"?><a/>' '<a/>'
+
+new "XMLdecl version + encoding"
+expecteof "$PROG" 0 '<?xml version="1.0" encoding="UTF-16"?><a/>' '<a/>'
+
+new "XMLdecl version + misspelled encoding"
+expecteof "$PROG" 255 '<?xml version="1.0" encding="UTF-16"?><a/>' '<a/>'
+
+new "XMLdecl version + standalone"
+expecteof "$PROG" 0 '<?xml version="1.0" standalone="yes"?><a/>' '<a/>'
+
+new "PI - Processing instruction empty"
+expecteof "$PROG" 0 '<?foo ?><a/>' '<a/>'
+
+new "PI some content"
+expecteof "$PROG" 0 '<?foo something else ?><a/>' '<a/>'
+
+new "prolog element misc*"
+expecteof "$PROG" 0 '<?foo something ?><a/><?bar more stuff ?><!-- a comment-->' '<a/>'
+
+# We allow it as an internal necessity for parsing of xml fragments
+#new "double element error"
+#expecteof "$PROG" 255 '<a/><b/>' ''
+
+new "namespace: DefaultAttName"
+expecteof "$PROG" 0 '<x xmlns="n1">hello</x>' '^<x xmlns="n1">hello</x>$'
+
+new "namespace: PrefixedAttName"
+expecteof "$PROG" 0 '<x xmlns:n2="urn:example:des"><n2:y>hello</n2:y></x>' '^<x xmlns:n2="urn:example:des"><n2:y>hello</n2:y></x>$'
+
+new "First example 6.1 from https://www.w3.org/TR/2009/REC-xml-names-20091208"
+XML=$(cat <<EOF
+<?xml version="1.0"?>
+
+<html:html xmlns:html='http://www.w3.org/1999/xhtml'>
+
+  <html:head><html:title>Frobnostication</html:title></html:head>
+  <html:body><html:p>Moved to 
+    <html:a href='http://frob.example.com'>here.</html:a></html:p></html:body>
+</html:html>
+EOF
+)
+expecteof "$PROG" 0 "$XML" "$XML"
+
+new "Second example 6.1 from https://www.w3.org/TR/2009/REC-xml-names-20091208"
+XML=$(cat <<EOF
+<?xml version="1.0"?>
+<!-- both namespace prefixes are available throughout -->
+<bk:book xmlns:bk='urn:loc.gov:books'
+         xmlns:isbn='urn:ISBN:0-395-36341-6'>
+    <bk:title>Cheaper by the Dozen</bk:title>
+    <isbn:number>1568491379</isbn:number>
+</bk:book>
+EOF
+)
+expecteof "$PROG" 0 "$XML" "$XML"
+      
 rm -rf $dir
 
diff --git a/util/Makefile.in b/util/Makefile.in
index 4814e91a..5095b612 100644
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -78,7 +78,7 @@ all:	 $(APPS)
 	 @echo "You may want to make clixon_util_stream separately (curl dependency)"
 
 clean:
-	rm -f $(APPS) *.core
+	rm -f $(APPS) clixon_util_stream *.core
 
 # APPS
 clixon_util_xml: clixon_util_xml.c $(MYLIB)
diff --git a/util/clixon_util_xml.c b/util/clixon_util_xml.c
index 72730000..29734f40 100644
--- a/util/clixon_util_xml.c
+++ b/util/clixon_util_xml.c
@@ -48,6 +48,7 @@
 #include <limits.h>
 #include <fnmatch.h>
 #include <stdint.h>
+#include <syslog.h>
 #include <assert.h>
 
 /* cligen */
@@ -68,21 +69,40 @@
 static int
 usage(char *argv0)
 {
-    fprintf(stderr, "usage:%s.\n\tInput on stdin\n", argv0);
+    fprintf(stderr, "usage:%s [options]\n"
+	    "where options are\n"
+            "\t-h \t\tHelp\n"
+    	    "\t-D <level> \tDebug\n",
+	    argv0);
     exit(0);
 }
 
 int
-main(int argc, char **argv)
+main(int    argc,
+     char **argv)
 {
     cxobj *xt = NULL;
     cxobj *xc;
     cbuf  *cb = cbuf_new();
+    int   retval = -1;
+    char  c;
 
-    if (argc != 1){
-	usage(argv[0]);
-	return 0;
-    }
+    clicon_log_init("xpath", LOG_DEBUG, CLICON_LOG_STDERR); 
+    optind = 1;
+    opterr = 0;
+    while ((c = getopt(argc, argv, "hD:")) != -1)
+	switch (c) {
+	case 'h':
+	    usage(argv[0]);
+	    break;
+    	case 'D':
+	    if (sscanf(optarg, "%d", &debug) != 1)
+		usage(argv[0]);
+	    break;
+	default:
+	    usage(argv[0]);
+	    break;
+	}
     if (xml_parse_file(0, "</config>", NULL, &xt) < 0){
 	fprintf(stderr, "xml parse error %s\n", clicon_err_reason);
 	goto done;
@@ -90,18 +110,20 @@ main(int argc, char **argv)
     xc = NULL;
     while ((xc = xml_child_each(xt, xc, -1)) != NULL) 
 	clicon_xml2cbuf(cb, xc, 0, 0); /* print xml */
-    fprintf(stdout, "%s\n", cbuf_get(cb));
+    fprintf(stdout, "%s", cbuf_get(cb));
+    fflush(stdout);
 #if 0
     cbuf_reset(cb);
     xmltree2cbuf(cb, xt, 0);       /* dump data structures */
     fprintf(stderr, "%s\n", cbuf_get(cb));
 #endif
+    retval = 0;
  done:
     if (xt)
 	xml_free(xt);
     if (cb)
 	cbuf_free(cb);
-    return 0;
+    return retval;
 }
 
 
diff --git a/util/clixon_util_xpath.c b/util/clixon_util_xpath.c
index 2ee8d2e8..dcbee236 100644
--- a/util/clixon_util_xpath.c
+++ b/util/clixon_util_xpath.c
@@ -133,13 +133,14 @@ main(int argc, char **argv)
     clicon_log_init("xpath", LOG_DEBUG, CLICON_LOG_STDERR); 
     optind = 1;
     opterr = 0;
-    while ((c = getopt(argc, argv, "hDf:p:i:")) != -1)
+    while ((c = getopt(argc, argv, "hD:f:p:i:")) != -1)
 	switch (c) {
 	case 'h':
 	    usage(argv0);
 	    break;
     	case 'D':
-	    debug++;
+	    if (sscanf(optarg, "%d", &debug) != 1)
+		usage(argv0);
 	    break;
 	case 'f': /* XML file */
 	    filename = optarg;

From a8f0aad4110f2c0df2507666bcca4f931cee6a3f Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sun, 18 Nov 2018 20:55:57 +0100
Subject: [PATCH 03/72] * Yang parser is stricter (see cardinality below) which
 may break parsing of slack yang specs. * YANG parser cardinality checked
 (only modules level yet)   * See https://github.com/clicon/clixon/issues/48

---
 CHANGELOG.md                       |  8 ++++++
 README.md                          |  1 +
 example/example.yang               |  2 ++
 lib/clixon/clixon_yang.h           |  5 +++-
 lib/src/Makefile.in                |  1 +
 lib/src/clixon_yang.c              | 44 ++++++++++++++++++++++++++++++
 lib/src/clixon_yang_parse.l        |  1 +
 lib/src/clixon_yang_parse.y        |  1 +
 test/lib.sh                        |  9 +++---
 test/test_datastore.sh             |  3 ++
 test/test_feature.sh               |  6 ++--
 test/test_leafref.sh               |  2 ++
 test/test_list.sh                  |  3 ++
 test/test_nacm.sh                  |  2 ++
 test/test_nacm_ext.sh              |  2 ++
 test/test_netconf.sh               |  2 ++
 test/test_order.sh                 |  3 ++
 test/test_perf.sh                  |  3 ++
 test/test_restconf.sh              |  2 ++
 test/test_restconf2.sh             |  3 ++
 test/test_type.sh                  |  3 ++
 test/test_when_must.sh             |  2 ++
 test/test_xml.sh                   |  4 +--
 test/test_yang.sh                  |  8 +++++-
 test/test_yang_parse.sh            | 31 ++++++---------------
 util/clixon_util_xml.c             | 13 ++++++---
 util/clixon_util_yang.c            | 39 ++++++++++++++++++++------
 yang/clixon-config@2018-10-21.yang |  3 +-
 28 files changed, 159 insertions(+), 47 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dccf9718..749d361e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,15 @@
 
 ### Major New features
 ### API changes on existing features (you may need to change your code)
+* Yang parser is stricter (see cardinality below) which may break parsing of slack yang specs.
 ### Minor changes
+* YANG parser cardinality checked (only modules level yet)
+  * See https://github.com/clicon/clixon/issues/48
+* XML parser conformance to W3 spec
+  * Names lexically correct (NCName)
+  * Syntactically Correct handling of '<?' (processing instructions) and '<?xml' (XML declaration)
+  * XML prolog syntax for 'well-formed' XML
+  * <!DOCTYPE (ie DTD) is not supported.
 ### Corrected Bugs
 ### Known issues
 
diff --git a/README.md b/README.md
index bbe3f324..9cbb2e32 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,7 @@ support.
   * [Clixon project page](http://www.clicon.org)
   * [Tests](test/)
   * [Docker](docker/)
+  * [Roadmap](ROADMAP.md)
   * [Reference manual](http://www.clicon.org/doxygen/index.html) (Note: the link may not be up-to-date. It is better to build your own: `cd doc; make doc`)
   
 Background
diff --git a/example/example.yang b/example/example.yang
index 1bba52d3..0ee76e30 100644
--- a/example/example.yang
+++ b/example/example.yang
@@ -1,4 +1,6 @@
 module example {
+    yang-version 1.1;
+    namespace "urn:example:clixon";
     prefix ex;
     import ietf-interfaces {
 	prefix if;
diff --git a/lib/clixon/clixon_yang.h b/lib/clixon/clixon_yang.h
index 3399d4fa..5b3b01e2 100644
--- a/lib/clixon/clixon_yang.h
+++ b/lib/clixon/clixon_yang.h
@@ -55,9 +55,11 @@
  * Wanted to unify these (K_ and Y_) but gave up for several reasons:
  * - Dont want to expose a generated yacc file to the API
  * - Cant use the symbols in this file because yacc needs token definitions
+ * - Use 0 as no keyword --> therefore start enumeration with 1.
  */
 enum rfc_6020{
-    Y_ACTION = 0,
+    Y_ACTION = 1,
+    Y_ANYDATA,
     Y_ANYXML,
     Y_ARGUMENT,
     Y_AUGMENT,
@@ -252,6 +254,7 @@ yang_stmt *ys_module(yang_stmt *ys);
 yang_spec *ys_spec(yang_stmt *ys);
 yang_stmt *yang_find_module_by_prefix(yang_stmt *ys, char *prefix);
 yang_stmt *yang_find(yang_node *yn, int keyword, char *argument);
+int        yang_match(yang_node *yn, int keyword, char *argument);
 yang_stmt *yang_find_datanode(yang_node *yn, char *argument);
 yang_stmt *yang_find_schemanode(yang_node *yn, char *argument);
 yang_stmt *yang_find_topnode(yang_spec *ysp, char *name, yang_class class);
diff --git a/lib/src/Makefile.in b/lib/src/Makefile.in
index 787c19c8..eefa969f 100644
--- a/lib/src/Makefile.in
+++ b/lib/src/Makefile.in
@@ -70,6 +70,7 @@ SRC     = clixon_sig.c clixon_log.c clixon_err.c clixon_event.c \
 	  clixon_string.c clixon_handle.c  \
 	  clixon_xml.c clixon_xml_sort.c clixon_xml_map.c clixon_file.c \
 	  clixon_json.c clixon_yang.c clixon_yang_type.c clixon_yang_module.c \
+          clixon_yang_cardinality.c \
 	  clixon_hash.c clixon_options.c clixon_plugin.c \
 	  clixon_proto.c clixon_proto_client.c \
 	  clixon_xpath.c clixon_xpath_ctx.c clixon_sha1.c \
diff --git a/lib/src/clixon_yang.c b/lib/src/clixon_yang.c
index 778f2717..13c060c5 100644
--- a/lib/src/clixon_yang.c
+++ b/lib/src/clixon_yang.c
@@ -76,12 +76,17 @@
 #include "clixon_options.h"
 #include "clixon_yang_type.h"
 #include "clixon_yang_parse.h"
+#include "clixon_yang_cardinality.h"
 
 /* Size of json read buffer when reading from file*/
 #define BUFLEN 1024
 
+/*
+ * Local variables
+ */
 /* Mapping between yang keyword string <--> clicon constants */
 static const map_str2int ykmap[] = {
+    {"anydata",          Y_ANYDATA}, 
     {"anyxml",           Y_ANYXML}, 
     {"argument",         Y_ARGUMENT}, 
     {"augment",          Y_AUGMENT}, 
@@ -393,9 +398,11 @@ yn_each(yang_node *yn,
  * @param[in]  yn         Yang node, current context node.
  * @param[in]  keyword    if 0 match any keyword
  * @param[in]  argument   String compare w argument. if NULL, match any.
+ * @retval     ys         Yang statement, if any
  * This however means that if you actually want to match only a yang-stmt with 
  * argument==NULL you cannot, but I have not seen any such examples.
  * @see yang_find_datanode
+ * @see yang_match  returns number of matches
  */
 yang_stmt *
 yang_find(yang_node *yn, 
@@ -420,6 +427,38 @@ yang_find(yang_node *yn,
     }
     return match ? ys : NULL;
 }
+
+/*! Count number of children that matches keyword and argument
+ *
+ * @param[in]  yn         Yang node, current context node.
+ * @param[in]  keyword    if 0 match any keyword
+ * @param[in]  argument   String compare w argument. if NULL, match any.
+ * @retval     n          Number of matches
+ * This however means that if you actually want to match only a yang-stmt with 
+ * argument==NULL you cannot, but I have not seen any such examples.
+ * @see yang_find
+ */
+int
+yang_match(yang_node *yn, 
+	   int        keyword, 
+	   char      *argument)
+{
+    yang_stmt *ys = NULL;
+    int        i;
+    int        match = 0;
+
+    for (i=0; i<yn->yn_len; i++){
+	ys = yn->yn_stmt[i];
+	if (keyword == 0 || ys->ys_keyword == keyword){
+	    if (argument == NULL)
+		match++;
+	    else
+		if (ys->ys_argument && strcmp(argument, ys->ys_argument) == 0)
+		    match++;
+	}
+    }
+    return match;
+}
 #ifdef NOTYET
 /*! Prototype more generic than yang_find_datanode and yang_find_schemanode
  */
@@ -2140,6 +2179,11 @@ yang_parse(clicon_handle h,
     if (yang_parse_recurse(ymod, dir, ysp) < 0)
 	goto done;
 
+    /* Check cardinality maybe this should be done after grouping/augment */
+    for (i=modnr; i<ysp->yp_len; i++) /* XXX */
+	if (yang_cardinality(h, ysp->yp_stmt[i], ysp->yp_stmt[i]->ys_argument) < 0)
+	    goto done;
+
     /* Step 2: check features: check if enabled and remove disabled features */
     for (i=modnr; i<ysp->yp_len; i++) /* XXX */
 	if (yang_features(h, ysp->yp_stmt[i]) < 0)
diff --git a/lib/src/clixon_yang_parse.l b/lib/src/clixon_yang_parse.l
index d059993a..9b9c7fad 100644
--- a/lib/src/clixon_yang_parse.l
+++ b/lib/src/clixon_yang_parse.l
@@ -112,6 +112,7 @@ clixon_yang_parsewrap(void)
 
  /* RFC 6020 keywords */
 <KEYWORD>action           { BEGIN(ARGUMENT); return K_ACTION; }
+<KEYWORD>anydata          { BEGIN(ARGUMENT); return K_ANYDATA; }
 <KEYWORD>anyxml           { BEGIN(ARGUMENT); return K_ANYXML; }
 <KEYWORD>argument         { BEGIN(ARGUMENT); return K_ARGUMENT; }
 <KEYWORD>augment          { BEGIN(ARGUMENT); return K_AUGMENT; }
diff --git a/lib/src/clixon_yang_parse.y b/lib/src/clixon_yang_parse.y
index 78cb172f..0a1fd81c 100644
--- a/lib/src/clixon_yang_parse.y
+++ b/lib/src/clixon_yang_parse.y
@@ -65,6 +65,7 @@
  * - Cant use the symbols in this file because yacc needs token definitions
  */
 %token K_ACTION
+%token K_ANYDATA
 %token K_ANYXML
 %token K_ARGUMENT
 %token K_AUGMENT
diff --git a/test/lib.sh b/test/lib.sh
index 52e5b119..ab0a5ed9 100755
--- a/test/lib.sh
+++ b/test/lib.sh
@@ -142,11 +142,10 @@ EOF
       echo -e "\e[0m:"
       exit -1
   fi
-  # If error dont match output strings
-  if [ $r != 0 ]; then
-      return
-  fi
-
+  # If error dont match output strings (why not?)
+#  if [ $r != 0 ]; then
+#      return
+#  fi
   # Match if both are empty string
   if [ -z "$ret" -a -z "$expect" ]; then
       return
diff --git a/test/test_datastore.sh b/test/test_datastore.sh
index 8427ed9f..27f3b4bf 100755
--- a/test/test_datastore.sh
+++ b/test/test_datastore.sh
@@ -10,6 +10,9 @@ datastore=../datastore/datastore_client
 
 cat <<EOF > $fyang
 module ietf-ip{
+   yang-version 1.1;
+   namespace "urn:example:clixon";
+   prefix ip;
    container x {
     list y {
       key "a b";
diff --git a/test/test_feature.sh b/test/test_feature.sh
index a4a8a532..e5279f6c 100755
--- a/test/test_feature.sh
+++ b/test/test_feature.sh
@@ -28,6 +28,8 @@ EOF
 
 cat <<EOF > $fyang
 module $APPNAME{
+   yang-version 1.1;
+   namespace "urn:example:clixon";
    prefix ex;
    import ietf-routing {
 	prefix rt;
@@ -93,7 +95,7 @@ expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candid
 new "netconf disabled feature"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><A>foo</A></config></edit-config></rpc>]]>]]>" '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>XML node config/A has no corresponding yang specification (Invalid XML or wrong Yang spec?'
 
-# This test has been broken up into all differetn modules instead of one large
+# This test has been broken up into all different modules instead of one large
 # reply since the modules change so often
 new "netconf schema resource, RFC 7895"
 ret=$($clixon_netconf -qf $cfg -y $fyang<<EOF 
@@ -101,7 +103,7 @@ ret=$($clixon_netconf -qf $cfg -y $fyang<<EOF
 EOF
 )
 new "netconf module A"
-expect="<module><name>example</name><revision/><namespace/><feature>A</feature><conformance-type>implement</conformance-type></module>"
+expect="<module><name>example</name><revision/><namespace>urn:example:clixon</namespace><feature>A</feature><conformance-type>implement</conformance-type></module>"
 match=`echo "$ret" | grep -GZo "$expect"`
 if [ -z "$match" ]; then
       err "$expect" "$ret"
diff --git a/test/test_leafref.sh b/test/test_leafref.sh
index 58aa8e85..6a146916 100755
--- a/test/test_leafref.sh
+++ b/test/test_leafref.sh
@@ -24,6 +24,8 @@ EOF
 
 cat <<EOF > $fyang
 module example{
+    yang-version 1.1;
+    namespace "urn:example:clixon";
     prefix ex;
     import ietf-interfaces {
 	prefix if;
diff --git a/test/test_list.sh b/test/test_list.sh
index 69b0f7b0..67c3f953 100755
--- a/test/test_list.sh
+++ b/test/test_list.sh
@@ -26,6 +26,9 @@ EOF
 
 cat <<EOF > $fyang
 module $APPNAME{
+  yang-version 1.1;
+  namespace "urn:example:clixon";
+  prefix ex;
   container c{
     presence true;
     list a0{
diff --git a/test/test_nacm.sh b/test/test_nacm.sh
index 7f98fe4a..586e5538 100755
--- a/test/test_nacm.sh
+++ b/test/test_nacm.sh
@@ -31,6 +31,8 @@ EOF
 
 cat <<EOF > $fyang
 module $APPNAME{
+  yang-version 1.1;
+  namespace "urn:example:clixon";
   prefix ex;
   import ietf-netconf-acm {
 	prefix nacm;
diff --git a/test/test_nacm_ext.sh b/test/test_nacm_ext.sh
index 10b01170..ee5ae60b 100755
--- a/test/test_nacm_ext.sh
+++ b/test/test_nacm_ext.sh
@@ -37,6 +37,8 @@ EOF
 
 cat <<EOF > $fyang
 module $APPNAME{
+  yang-version 1.1;
+  namespace "urn:example:clixon";
   prefix ex;
   container authentication {
 	description "Example code for enabling www basic auth and some example 
diff --git a/test/test_netconf.sh b/test/test_netconf.sh
index b0265345..2d3d2b0c 100755
--- a/test/test_netconf.sh
+++ b/test/test_netconf.sh
@@ -30,6 +30,8 @@ EOF
 
 cat <<EOF > $fyang
 module example{
+    yang-version 1.1;
+    namespace "urn:example:clixon";
     prefix ex;
     import ietf-interfaces {
 	prefix if;
diff --git a/test/test_order.sh b/test/test_order.sh
index 53e91b44..da1ecb87 100755
--- a/test/test_order.sh
+++ b/test/test_order.sh
@@ -41,6 +41,9 @@ EOF
 
 cat <<EOF > $fyang
 module example{
+    yang-version 1.1;
+    namespace "urn:example:clixon";
+    prefix ex;
     container c{
       leaf d{
          type string;
diff --git a/test/test_perf.sh b/test/test_perf.sh
index 2e7147fa..e6dde054 100755
--- a/test/test_perf.sh
+++ b/test/test_perf.sh
@@ -24,6 +24,9 @@ fconfig=$dir/config
 
 cat <<EOF > $fyang
 module ietf-ip{
+   yang-version 1.1;
+   namespace "urn:example:clixon";
+   prefix ip;
    container x {
     list y {
       key "a";
diff --git a/test/test_restconf.sh b/test/test_restconf.sh
index 107e7f57..260d7eb9 100755
--- a/test/test_restconf.sh
+++ b/test/test_restconf.sh
@@ -30,6 +30,8 @@ EOF
 
 cat <<EOF > $fyang
 module example{
+    yang-version 1.1;
+    namespace "urn:example:clixon";
     prefix ex;
     import ietf-interfaces {
 	prefix if;
diff --git a/test/test_restconf2.sh b/test/test_restconf2.sh
index 663a7c3d..52364f2f 100755
--- a/test/test_restconf2.sh
+++ b/test/test_restconf2.sh
@@ -22,6 +22,9 @@ EOF
 
 cat <<EOF > $fyang
 module example{
+   yang-version 1.1;
+   namespace "urn:example:clixon";
+   prefix ex;
    container cont1{
       list interface{
         key name;
diff --git a/test/test_type.sh b/test/test_type.sh
index e8254d0f..a2126e1c 100755
--- a/test/test_type.sh
+++ b/test/test_type.sh
@@ -26,6 +26,9 @@ EOF
 
 cat <<EOF > $fyang
 module example{
+  yang-version 1.1;
+  namespace "urn:example:clixon";
+  prefix ex;
   typedef ab {
        type string {
          pattern
diff --git a/test/test_when_must.sh b/test/test_when_must.sh
index 9f4974e9..da629784 100755
--- a/test/test_when_must.sh
+++ b/test/test_when_must.sh
@@ -27,6 +27,8 @@ EOF
 
 cat <<EOF > $fyang
 module $APPNAME{
+  yang-version 1.1;
+  namespace "urn:example:clixon";
   prefix ex;
   identity routing-protocol {
      description
diff --git a/test/test_xml.sh b/test/test_xml.sh
index 2aa931e3..6416e29f 100755
--- a/test/test_xml.sh
+++ b/test/test_xml.sh
@@ -79,13 +79,13 @@ new "XMLdecl no version"
 expecteof "$PROG" 255 '<?xml ?><a/>' ''
 
 new "XMLdecl misspelled version"
-expecteof "$PROG" 255 '<?xml verion="1.0"?><a/>' '<a/>'
+expecteof "$PROG -l o" 255 '<?xml verion="1.0"?><a/>' 'yntax error: at or before: v'
 
 new "XMLdecl version + encoding"
 expecteof "$PROG" 0 '<?xml version="1.0" encoding="UTF-16"?><a/>' '<a/>'
 
 new "XMLdecl version + misspelled encoding"
-expecteof "$PROG" 255 '<?xml version="1.0" encding="UTF-16"?><a/>' '<a/>'
+expecteof "$PROG -l o" 255 '<?xml version="1.0" encding="UTF-16"?><a/>' 'syntax error: at or before: e'
 
 new "XMLdecl version + standalone"
 expecteof "$PROG" 0 '<?xml version="1.0" standalone="yes"?><a/>' '<a/>'
diff --git a/test/test_yang.sh b/test/test_yang.sh
index 5176490d..a15bf6cb 100755
--- a/test/test_yang.sh
+++ b/test/test_yang.sh
@@ -27,7 +27,9 @@ EOF
 
 cat <<EOF > $fyang
 module $APPNAME{
+   yang-version 1.1;
    prefix ex;
+   namespace "urn:example:clixon";
    extension c-define {
       description "Example from RFC 6020";
       argument "name";
@@ -89,6 +91,8 @@ EOF
 # This yang definition uses an extension which is not defined. Error when loading
 cat <<EOF > $fyangerr
 module $APPNAME{
+   yang-version 1.1;
+   namespace "urn:example:clixon";
    prefix ex;
    extension c-define {
       description "Example from RFC 6020";
@@ -126,7 +130,9 @@ expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><cand
 new "netconf discard-changes"
 expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
-new "cli not defined extension"
+#new "cli not defined extension"
+#new "netconf not defined extension"
+#expecteof "$clixon_netconf -qf $cfg -l o" 0 "$YANG" "Extension ex:not-defined not found"
 # This text yields an error, but the test cannot detect the error message yet
 #expectfn "$clixon_cli -1f $cfg -y $fyangerr show version" 0 "Yang error: Extension ex:not-defined not found"
 
diff --git a/test/test_yang_parse.sh b/test/test_yang_parse.sh
index 9cc52da2..c8024a3d 100755
--- a/test/test_yang_parse.sh
+++ b/test/test_yang_parse.sh
@@ -1,41 +1,26 @@
 #!/bin/bash
 # Test: YANG parser tests
 # First an example yang, second all openconfig yangs
+# Problem with this is that util only parses single file. it should
+# call yang_parse().
 #PROG="valgrind --leak-check=full --show-leak-kinds=all ../util/clixon_util_yang"
 PROG=../util/clixon_util_yang
 OPENCONFIG=~/syssrc/openconfig
-
+exit 0 # nyi
 # include err() and new() functions and creates $dir
 . ./lib.sh
 
-YANG=$(cat <<EOF
-module test{
-   prefix ex;
-   extension c-define {
-      description "Example from RFC 6020";
-      argument "name";
-   }
-   ex:not-defined ARGUMENT;
-}
-EOF
-)
-
-new "yang parse"
-#expecteof "$PROG" 0 "$YANG" "^$YANG$"
-
-if [ ! -d $OPENCONFIG ]; then
-    echo "$OPENCONFIG not found. Do git clone https://github.com/openconfig/public and point DIR to it to run these tests"
-    rm -rf $dir
-    exit 0
-fi
-
 # Openconfig
+# Files not parseable:
+# - openconfig-access-points.yang
+# - openconfig-access-points.yang
 new "Openconfig"
 files=$(find $OPENCONFIG -name "*.yang")
 for f in $files; do
     new "$f"
     YANG=$(cat $f)
- #   expecteof "$PROG" 0 "$YANG" "module"
+ # NYI
+  expecteof "$PROG" 0 "$YANG" "module"
 done
 rm -rf $dir
 
diff --git a/util/clixon_util_xml.c b/util/clixon_util_xml.c
index 29734f40..5938eacb 100644
--- a/util/clixon_util_xml.c
+++ b/util/clixon_util_xml.c
@@ -46,7 +46,6 @@
 #include <errno.h>
 #include <string.h>
 #include <limits.h>
-#include <fnmatch.h>
 #include <stdint.h>
 #include <syslog.h>
 #include <assert.h>
@@ -72,7 +71,8 @@ usage(char *argv0)
     fprintf(stderr, "usage:%s [options]\n"
 	    "where options are\n"
             "\t-h \t\tHelp\n"
-    	    "\t-D <level> \tDebug\n",
+    	    "\t-D <level> \tDebug\n"
+	    "\t-l <s|e|o> \tLog on (s)yslog, std(e)rr, std(o)ut (stderr is default)\n",
 	    argv0);
     exit(0);
 }
@@ -86,11 +86,11 @@ main(int    argc,
     cbuf  *cb = cbuf_new();
     int   retval = -1;
     char  c;
+    int   logdst = CLICON_LOG_STDERR;
 
-    clicon_log_init("xpath", LOG_DEBUG, CLICON_LOG_STDERR); 
     optind = 1;
     opterr = 0;
-    while ((c = getopt(argc, argv, "hD:")) != -1)
+    while ((c = getopt(argc, argv, "hD:l:")) != -1)
 	switch (c) {
 	case 'h':
 	    usage(argv[0]);
@@ -99,10 +99,15 @@ main(int    argc,
 	    if (sscanf(optarg, "%d", &debug) != 1)
 		usage(argv[0]);
 	    break;
+	case 'l': /* Log destination: s|e|o|f */
+	    if ((logdst = clicon_log_opt(optarg[0])) < 0)
+		usage(argv[0]);
+	    break;
 	default:
 	    usage(argv[0]);
 	    break;
 	}
+    clicon_log_init("clixon_util_xml", debug?LOG_DEBUG:LOG_INFO, logdst);
     if (xml_parse_file(0, "</config>", NULL, &xt) < 0){
 	fprintf(stderr, "xml parse error %s\n", clicon_err_reason);
 	goto done;
diff --git a/util/clixon_util_yang.c b/util/clixon_util_yang.c
index 9ebe991f..9232b535 100644
--- a/util/clixon_util_yang.c
+++ b/util/clixon_util_yang.c
@@ -40,6 +40,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
+#include <unistd.h>
 #include <limits.h>
 #include <ctype.h>
 #define __USE_GNU /* strverscmp */
@@ -65,20 +66,42 @@
 static int
 usage(char *argv0)
 {
-    fprintf(stderr, "usage:%s.\n\tInput on stdin\n", argv0);
+    fprintf(stderr, "usage:%s [options]\n"
+	    "where options are\n"
+            "\t-h \t\tHelp\n"
+    	    "\t-D <level> \tDebug\n"
+	    "\t-l <s|e|o> \tLog on (s)yslog, std(e)rr, std(o)ut (stderr is default)\n",
+	    argv0);
     exit(0);
 }
 
 int
 main(int argc, char **argv)
 {
-    yang_spec    *yspec = NULL;
-
-    if (argc != 1){
-	usage(argv[0]);
-	return -1;
-    }
-    clicon_log_init("clixon_util_yang", LOG_INFO, CLICON_LOG_STDERR);
+    yang_spec *yspec = NULL;
+    char      c;
+    int       logdst = CLICON_LOG_STDERR;
+    
+    optind = 1;
+    opterr = 0;
+    while ((c = getopt(argc, argv, "hD:l:")) != -1)
+	switch (c) {
+	case 'h':
+	    usage(argv[0]);
+	    break;
+    	case 'D':
+	    if (sscanf(optarg, "%d", &debug) != 1)
+		usage(argv[0]);
+	    break;
+	case 'l': /* Log destination: s|e|o|f */
+	    if ((logdst = clicon_log_opt(optarg[0])) < 0)
+		usage(argv[0]);
+	    break;
+	default:
+	    usage(argv[0]);
+	    break;
+	}
+    clicon_log_init("clixon_util_yang", debug?LOG_DEBUG:LOG_INFO, logdst);
     if ((yspec = yspec_new()) == NULL)
 	goto done;
     if (yang_parse_file(0, "yang test", yspec) == NULL){
diff --git a/yang/clixon-config@2018-10-21.yang b/yang/clixon-config@2018-10-21.yang
index fb07efa1..839e16b0 100644
--- a/yang/clixon-config@2018-10-21.yang
+++ b/yang/clixon-config@2018-10-21.yang
@@ -1,5 +1,6 @@
 module clixon-config {
-
+    yang-version 1.1;
+    namespace "http://clicon.org";
     prefix cc;
 
     organization

From 43034069577985e2fe591136a67110df77d16b76 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sun, 18 Nov 2018 20:58:18 +0100
Subject: [PATCH 04/72] clixon_yang_cardinality files added

---
 lib/src/clixon_yang_cardinality.c | 246 ++++++++++++++++++++++++++++++
 lib/src/clixon_yang_cardinality.h |  42 +++++
 2 files changed, 288 insertions(+)
 create mode 100644 lib/src/clixon_yang_cardinality.c
 create mode 100644 lib/src/clixon_yang_cardinality.h

diff --git a/lib/src/clixon_yang_cardinality.c b/lib/src/clixon_yang_cardinality.c
new file mode 100644
index 00000000..ab6a43d6
--- /dev/null
+++ b/lib/src/clixon_yang_cardinality.c
@@ -0,0 +1,246 @@
+/*
+ *
+  ***** BEGIN LICENSE BLOCK *****
+ 
+  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+
+  This file is part of CLIXON.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  Alternatively, the contents of this file may be used under the terms of
+  the GNU General Public License Version 3 or later (the "GPL"),
+  in which case the provisions of the GPL are applicable instead
+  of those above. If you wish to allow use of your version of this file only
+  under the terms of the GPL, and not to allow others to
+  use your version of this file under the terms of Apache License version 2, 
+  indicate your decision by deleting the provisions above and replace them with
+  the  notice and other provisions required by the GPL. If you do not delete
+  the provisions above, a recipient may use your version of this file under
+  the terms of any one of the Apache License version 2 or the GPL.
+
+  ***** END LICENSE BLOCK *****
+
+ * Yang cardinality functions according to RFC 7950 
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "clixon_config.h" /* generated by config & autoconf */
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <limits.h>
+#include <ctype.h>
+#include <unistd.h>
+#define __USE_GNU /* strverscmp */
+#include <string.h>
+#include <arpa/inet.h>
+#include <regex.h>
+#include <dirent.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <syslog.h>
+#include <assert.h>
+#include <sys/stat.h>
+#include <netinet/in.h>
+
+/* cligen */
+#include <cligen/cligen.h>
+
+/* clicon */
+#include "clixon_queue.h"
+#include "clixon_hash.h"
+#include "clixon_handle.h"
+#include "clixon_err.h"
+#include "clixon_yang.h"
+#include "clixon_yang_cardinality.h"
+
+/*
+ * Types
+ */
+/* Encode cardinality according to RFC 7950 
+ * Example:
+ * 7.20.3.1.  The deviation's Substatements
+ *
+ *               +--------------+----------+-------------+
+ *               | substatement | section  | cardinality |
+ *               +--------------+----------+-------------+
+ *               | description  | 7.21.3   | 0..1        |
+ *               | deviate      | 7.20.3.2 | 1..n        |
+ *               | reference    | 7.21.4   | 0..1        |
+ *               +--------------+----------+-------------+
+ * The cardinalities are (and how many time they occur)
+ *   0..1  149 See ycardmap_01
+ *   1..n, 1
+ *   0..n  176 (no restrictions)
+ *   1     10
+ */
+struct ycard{
+    enum rfc_6020 yc_parent;
+    enum rfc_6020 yc_child;
+    int           yc_min;
+    int           yc_max;
+};
+
+/*
+ * Local variables
+ */
+/* Yang statements cardinality map
+ * The cardinalities are (and how many time they occur)
+ *   1..n, 1
+ *   1     10
+ *   0..1  149
+ *   0..n  176 (no restrictions)
+ * @note assume array is ordered wrt parent
+ * @note yang-version is optional in RFC6020 but mandatory in RFC7950, if not given, it defaults to 1.
+ */
+#define NMAX 1000000 /* Just a large number */
+static const struct ycard yclist[] = {
+    {Y_MODULE, Y_ANYDATA,      0, NMAX},
+    {Y_MODULE, Y_ANYXML,       0, NMAX},
+    {Y_MODULE, Y_AUGMENT,      0, NMAX},
+    {Y_MODULE, Y_CHOICE,       0, NMAX},
+    {Y_MODULE, Y_CONTACT,      0, 1},
+    {Y_MODULE, Y_CONTAINER,    0, NMAX},
+    {Y_MODULE, Y_DESCRIPTION,  0, 1},
+    {Y_MODULE, Y_DEVIATION,    0, NMAX},
+    {Y_MODULE, Y_EXTENSION,    0, NMAX},
+    {Y_MODULE, Y_FEATURE,      0, NMAX},
+    {Y_MODULE, Y_GROUPING,     0, NMAX},
+    {Y_MODULE, Y_IDENTITY,     0, NMAX},
+    {Y_MODULE, Y_IMPORT,       0, NMAX},
+    {Y_MODULE, Y_INCLUDE,      0, NMAX},
+    {Y_MODULE, Y_LEAF,         0, NMAX},
+    {Y_MODULE, Y_LEAF_LIST,    0, NMAX},
+    {Y_MODULE, Y_LIST,         0, NMAX},
+    {Y_MODULE, Y_NAMESPACE,    1, 1},
+    {Y_MODULE, Y_NOTIFICATION, 0, NMAX},
+    {Y_MODULE, Y_ORGANIZATION, 0, 1},
+    {Y_MODULE, Y_PREFIX,       1, 1},
+    {Y_MODULE, Y_REFERENCE,    0, 1},
+    {Y_MODULE, Y_REVISION,     0, NMAX},
+    {Y_MODULE, Y_RPC,          0, NMAX},
+    {Y_MODULE, Y_TYPEDEF,      0, NMAX},
+    {Y_MODULE, Y_USES,         0, NMAX},
+    {Y_MODULE, Y_YANG_VERSION, 0, 1}, 
+    {0,}
+};
+
+/*! Find yang parent and child combination in yang cardinality table
+ * @param[in] parent Parent Yang spec
+ * @param[in] child  Child yang spec if -1 first
+ * @param[in] yc     Yang cardinality map
+ * @param[in] p      If set, quit as soon as parents dont match
+ * @retval    NULL   Not found
+ * @retval    yp     Found
+ */
+static const struct ycard *
+ycard_find(enum rfc_6020       parent,
+	   enum rfc_6020       child,
+	   const struct ycard *yclist,
+	   int                 p)
+
+{
+     const struct ycard *yc;
+    
+     for (yc = &yclist[0]; (int)yc->yc_parent; yc++){
+	 if (yc->yc_parent == parent){
+	     if (!child || yc->yc_child == child)
+		 return yc;
+	 }
+	 else
+	     if (p)
+		 return NULL; /* premature quit */
+     }
+    return NULL;
+}
+
+/*! Check cardinality, ie if each yang node has the expected nr of children 
+ * @param[in] h        Clicon handle
+ * @param[in] yt       Yang statement
+ * @param[in] modname  Name of module (for debug message)
+ * 1) For all children, if neither in 0..n, 0..1, 1 or 1..n   ->ERROR 
+ * 2) For all in 1 and 1..n list, if 0 such children          ->ERROR
+ * 3) For all in 0..1 and 1 list, if >1 such children         ->ERROR
+ * 4) Recurse
+ * @note always accept UNKNOWN (due to extension)
+ */
+int
+yang_cardinality(clicon_handle h,
+		 yang_stmt    *yt,
+		 char         *modname)
+{
+    int        retval = -1;
+    yang_stmt *ys = NULL;
+    int        pk;
+    int        ck;
+    int        i;
+    int        nr;
+    const struct ycard *ycplist; /* ycard parent table*/
+    const struct ycard *yc;
+    
+    pk = yt->ys_keyword;
+    /* 0) Find parent sub-parts of cardinality vector */
+    ycplist = ycard_find(pk, 0, yclist, 0);
+    /* 1) For all children, if neither in 0..n, 0..1, 1 or 1..n   ->ERROR  */
+    i = 0;
+    while (i<yt->ys_len){
+	ys = yt->ys_stmt[i++];
+	ck = ys->ys_keyword;
+	if (ck == Y_UNKNOWN) /* special case */
+	    continue;
+	if ((yc = ycard_find(pk, ck, ycplist, 1)) == NULL){
+	    clicon_err(OE_YANG, 0, "%s: \"%s\" is child of \"%s\", but should not be",
+		       modname, yang_key2str(ck), yang_key2str(pk));
+	    goto done;
+	}
+    }
+    /* 2) For all in 1 and 1..n list, if 0 such children          ->ERROR */
+    for (yc = &ycplist[0]; (int)yc->yc_parent == pk; yc++){
+	if (yc->yc_min  &&
+	    yang_find((yang_node*)yt, yc->yc_child, NULL) == NULL){
+	    clicon_err(OE_YANG, 0, "%s: \"%s\" is missing but is mandatory child of \"%s\"",
+		       modname, yang_key2str(yc->yc_child), yang_key2str(pk));
+	    goto done;
+	}
+    }
+    /* 3) For all in 0..1 and 1 list, if >1 such children         ->ERROR */
+    for (yc = &ycplist[0]; (int)yc->yc_parent == pk; yc++){
+	if (yc->yc_max<NMAX &&
+	    (nr = yang_match((yang_node*)yt, yc->yc_child, NULL)) > yc->yc_max){
+	    clicon_err(OE_YANG, 0, "%s: \"%s\" has %d children of type \"%s\", but only %d allowed",
+		       modname,
+		       yang_key2str(pk),
+		       nr,
+		       yang_key2str(yc->yc_child),
+		       yc->yc_max);
+	    goto done;
+	}
+    }
+    
+    if (0) { /* Notyet */
+    /* 4) Recurse */
+    i = 0;
+    while (i<yt->ys_len){ /* Note, children may be removed */
+	ys = yt->ys_stmt[i++];
+	if (yang_cardinality(h, ys, modname) < 0)
+	    goto done;
+    }
+    }
+    retval = 0;
+ done:
+    return retval;
+}
+
diff --git a/lib/src/clixon_yang_cardinality.h b/lib/src/clixon_yang_cardinality.h
new file mode 100644
index 00000000..eb71e8ea
--- /dev/null
+++ b/lib/src/clixon_yang_cardinality.h
@@ -0,0 +1,42 @@
+/*
+  ***** BEGIN LICENSE BLOCK *****
+ 
+  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+
+  This file is part of CLIXON.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  Alternatively, the contents of this file may be used under the terms of
+  the GNU General Public License Version 3 or later (the "GPL"),
+  in which case the provisions of the GPL are applicable instead
+  of those above. If you wish to allow use of your version of this file only
+  under the terms of the GPL, and not to allow others to
+  use your version of this file under the terms of Apache License version 2, 
+  indicate your decision by deleting the provisions above and replace them with
+  the  notice and other provisions required by the GPL. If you do not delete
+  the provisions above, a recipient may use your version of this file under
+  the terms of any one of the Apache License version 2 or the GPL.
+
+  ***** END LICENSE BLOCK *****
+ * Yang cardinality functions according to RFC 7950 
+ */
+#ifndef _CLIXON_YANG_CARDINALITY_H_
+#define _CLIXON_YANG_CARDINALITY_H_
+
+/*
+ * Prototypes
+ */
+int yang_cardinality(clicon_handle h, yang_stmt *yt, char *modname);
+
+#endif	/* _CLIXON_YANG_CARDINALITY_H_ */

From 56da97cb5beb7ec9d55819b8b852bea24e7c9618 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sun, 25 Nov 2018 18:24:13 +0100
Subject: [PATCH 05/72]  Openconfig yang specs parsed:
 https://github.com/openconfig/public

---
 CHANGELOG.md                |   10 +-
 lib/src/clixon_yang.c       |    2 +-
 lib/src/clixon_yang_parse.l |  225 ++---
 lib/src/clixon_yang_parse.y | 1679 +++++++++++++++++++----------------
 test/test_openconfig.sh     |   24 +
 test/test_yang_parse.sh     |   18 +-
 6 files changed, 1065 insertions(+), 893 deletions(-)
 create mode 100755 test/test_openconfig.sh

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 749d361e..a80cdd9a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,11 +6,15 @@
 * [Roadmap](ROADMAP.md) (Uncommitted and unprioritized)
 
 ### Major New features
+* More complete Yang parser 
+  * YANG parser cardinality checked (only modules level yet)
+    * See https://github.com/clicon/clixon/issues/84
+  * Openconfig yang specs parsed: https://github.com/openconfig/public
+
 ### API changes on existing features (you may need to change your code)
-* Yang parser is stricter (see cardinality below) which may break parsing of slack yang specs.
+* Yang parser is stricter (see above) which may break parsing of existing yang specs.
+
 ### Minor changes
-* YANG parser cardinality checked (only modules level yet)
-  * See https://github.com/clicon/clixon/issues/48
 * XML parser conformance to W3 spec
   * Names lexically correct (NCName)
   * Syntactically Correct handling of '<?' (processing instructions) and '<?xml' (XML declaration)
diff --git a/lib/src/clixon_yang.c b/lib/src/clixon_yang.c
index 13c060c5..2afb0b6b 100644
--- a/lib/src/clixon_yang.c
+++ b/lib/src/clixon_yang.c
@@ -2412,7 +2412,7 @@ yang_abs_schema_nodeid(yang_spec    *yspec,
     }
     /* split <prefix>:<id> */
     if ((id = strchr(vec[1], ':')) == NULL){ /* no prefix */
-	clicon_log(LOG_WARNING, "%s: Absolute schema nodeid must have prefix", __FUNCTION__);
+	clicon_log(LOG_WARNING, "%s: Absolute schema nodeid %s must have prefix", __FUNCTION__, schema_nodeid);
 	goto ok;
     }
     if ((prefix = strdup(vec[1])) == NULL){
diff --git a/lib/src/clixon_yang_parse.l b/lib/src/clixon_yang_parse.l
index 9b9c7fad..58715c0c 100644
--- a/lib/src/clixon_yang_parse.l
+++ b/lib/src/clixon_yang_parse.l
@@ -33,6 +33,7 @@
  * Yang parser. Hopefully useful but not complete
  * @see https://tools.ietf.org/html/rfc6020 YANG 1.0
  * @see https://tools.ietf.org/html/rfc7950 YANG 1.1
+* 
  */
 
 %{
@@ -81,20 +82,20 @@ clixon_yang_parsewrap(void)
    The argument is a string
 
    Example: keyword argument ; keyword ; keyword { keyword argument; } keyword
-
-   STRING0 corresponds to string rule
-   ARGUMENT corresponds to identifier-arg-str,unique-arg-str,key-arg-str, etc.
-                           more to do here.
 */
 
 
 %}
 
+identifier      [A-Za-z_][A-Za-z0-9_\-\.]*
+
 %x KEYWORD
-%s ARGUMENT
-%s STRING0
-%s STRING1
-%s STRING2
+%s BOOLEAN
+%s INTEGER
+%s STRARG
+%s STRING
+%s STRINGDQ
+%s STRINGSQ
 %s ESCAPE
 %s COMMENT1
 %s COMMENT2
@@ -102,84 +103,91 @@ clixon_yang_parsewrap(void)
 
 %%
  /* Common tokens */
-<KEYWORD,ARGUMENT,STRING0>[ \t]            
-<KEYWORD,ARGUMENT,STRING0,UNKNOWN><<EOF>> { return MY_EOF; }
-<KEYWORD,ARGUMENT,STRING0,COMMENT1,UNKNOWN>\n   { _YY->yy_linenum++; }
-<KEYWORD,ARGUMENT,STRING0>"/*"    { _YY->yy_lex_state = YYSTATE; BEGIN(COMMENT1); }
-<KEYWORD,ARGUMENT,STRING0>"//"    { _YY->yy_lex_state = YYSTATE; BEGIN(COMMENT2); }
+<KEYWORD,BOOLEAN,INTEGER,STRARG,ARGUMENT,STRING>[ \t]            
+<KEYWORD,STRING,UNKNOWN><<EOF>> { return MY_EOF; }
+<KEYWORD,BOOLEAN,INTEGER,STRARG,STRING,COMMENT1,UNKNOWN>\n   { _YY->yy_linenum++; }
+<KEYWORD,STRING>"/*"    { _YY->yy_lex_state = YYSTATE; BEGIN(COMMENT1); }
+<KEYWORD,STRING>"//"    { _YY->yy_lex_state = YYSTATE; BEGIN(COMMENT2); }
 
-<KEYWORD>\}               { return *yytext; }
 
- /* RFC 6020 keywords */
-<KEYWORD>action           { BEGIN(ARGUMENT); return K_ACTION; }
-<KEYWORD>anydata          { BEGIN(ARGUMENT); return K_ANYDATA; }
-<KEYWORD>anyxml           { BEGIN(ARGUMENT); return K_ANYXML; }
-<KEYWORD>argument         { BEGIN(ARGUMENT); return K_ARGUMENT; }
-<KEYWORD>augment          { BEGIN(ARGUMENT); return K_AUGMENT; }
-<KEYWORD>base             { BEGIN(ARGUMENT); return K_BASE; }
-<KEYWORD>belongs-to       { BEGIN(ARGUMENT); return K_BELONGS_TO; }
-<KEYWORD>bit              { BEGIN(ARGUMENT); return K_BIT; }
-<KEYWORD>case             { BEGIN(ARGUMENT); return K_CASE; }
-<KEYWORD>choice           { BEGIN(ARGUMENT); return K_CHOICE; }
-<KEYWORD>config           { BEGIN(ARGUMENT); return K_CONFIG; }
-<KEYWORD>contact          { BEGIN(STRING0);  return K_CONTACT; }
-<KEYWORD>container        { BEGIN(ARGUMENT); return K_CONTAINER; }
-<KEYWORD>default          { BEGIN(STRING0);  return K_DEFAULT; }
-<KEYWORD>description      { BEGIN(STRING0);  return K_DESCRIPTION; }
-<KEYWORD>deviate          { BEGIN(ARGUMENT); return K_DEVIATE; }
-<KEYWORD>deviation        { BEGIN(ARGUMENT); return K_DEVIATION; }
-<KEYWORD>enum             { BEGIN(STRING0);  return K_ENUM; }
-<KEYWORD>error-app-tag    { BEGIN(STRING0);  return K_ERROR_APP_TAG; }
-<KEYWORD>error-message    { BEGIN(STRING0);  return K_ERROR_MESSAGE; }
-<KEYWORD>extension        { BEGIN(ARGUMENT); return K_EXTENSION; }
-<KEYWORD>feature          { BEGIN(ARGUMENT); return K_FEATURE; }
-<KEYWORD>fraction-digits  { BEGIN(ARGUMENT); return K_FRACTION_DIGITS; }
-<KEYWORD>grouping         { BEGIN(ARGUMENT); return K_GROUPING; }
-<KEYWORD>identity         { BEGIN(ARGUMENT); return K_IDENTITY; }
-<KEYWORD>if-feature       { BEGIN(ARGUMENT); return K_IF_FEATURE; }
-<KEYWORD>import           { BEGIN(ARGUMENT); return K_IMPORT; }
-<KEYWORD>include          { BEGIN(ARGUMENT); return K_INCLUDE; }
-<KEYWORD>input            { BEGIN(ARGUMENT); return K_INPUT; }
-<KEYWORD>key              { BEGIN(ARGUMENT); return K_KEY; }
-<KEYWORD>leaf             { BEGIN(ARGUMENT); return K_LEAF; }
-<KEYWORD>leaf-list        { BEGIN(ARGUMENT); return K_LEAF_LIST; }
-<KEYWORD>length           { BEGIN(ARGUMENT); return K_LENGTH; }
-<KEYWORD>list             { BEGIN(ARGUMENT); return K_LIST; }
-<KEYWORD>mandatory        { BEGIN(ARGUMENT); return K_MANDATORY; }
-<KEYWORD>max-elements     { BEGIN(ARGUMENT); return K_MAX_ELEMENTS; }
-<KEYWORD>min-elements     { BEGIN(ARGUMENT); return K_MIN_ELEMENTS; }
-<KEYWORD>module           { BEGIN(ARGUMENT); return K_MODULE; }
-<KEYWORD>must             { BEGIN(STRING0);  return K_MUST; }
-<KEYWORD>namespace        { BEGIN(ARGUMENT); return K_NAMESPACE; }
-<KEYWORD>notification     { BEGIN(ARGUMENT); return K_NOTIFICATION; }
-<KEYWORD>ordered-by       { BEGIN(ARGUMENT); return K_ORDERED_BY; }
-<KEYWORD>organization     { BEGIN(STRING0);  return K_ORGANIZATION; }
-<KEYWORD>output           { BEGIN(ARGUMENT); return K_OUTPUT; }
-<KEYWORD>path             { BEGIN(ARGUMENT); return K_PATH; }
-<KEYWORD>pattern          { BEGIN(STRING0);  return K_PATTERN; }
-<KEYWORD>position         { BEGIN(ARGUMENT); return K_POSITION; }
-<KEYWORD>prefix           { BEGIN(ARGUMENT); return K_PREFIX; }
-<KEYWORD>presence         { BEGIN(STRING0);  return K_PRESENCE; }
-<KEYWORD>range            { BEGIN(ARGUMENT); return K_RANGE; }
-<KEYWORD>reference        { BEGIN(STRING0);  return K_REFERENCE; }
-<KEYWORD>refine           { BEGIN(ARGUMENT); return K_REFINE; }
-<KEYWORD>require-instance { BEGIN(ARGUMENT); return K_REQUIRE_INSTANCE; }
-<KEYWORD>revision         { BEGIN(ARGUMENT); return K_REVISION; }
-<KEYWORD>revision-date    { BEGIN(ARGUMENT); return K_REVISION_DATE; }
-<KEYWORD>rpc              { BEGIN(ARGUMENT); return K_RPC; }
-<KEYWORD>status           { BEGIN(ARGUMENT); return K_STATUS; }
-<KEYWORD>submodule        { BEGIN(ARGUMENT); return K_SUBMODULE; }
-<KEYWORD>type             { BEGIN(ARGUMENT); return K_TYPE; }
-<KEYWORD>typedef          { BEGIN(ARGUMENT); return K_TYPEDEF; }
-<KEYWORD>unique           { BEGIN(ARGUMENT); return K_UNIQUE; }
-<KEYWORD>units            { BEGIN(STRING0);  return K_UNITS; }
-<KEYWORD>uses             { BEGIN(ARGUMENT); return K_USES; }
-<KEYWORD>value            { BEGIN(ARGUMENT); return K_VALUE; }
-<KEYWORD>when             { BEGIN(STRING0);  return K_WHEN; }
-<KEYWORD>yang-version     { BEGIN(ARGUMENT); return K_YANG_VERSION; }
-<KEYWORD>yin-element      { BEGIN(ARGUMENT); return K_YIN_ELEMENT; }
+<KEYWORD>input            { return K_INPUT; } /* No argument */
+<KEYWORD>output           { return K_OUTPUT;} /* No argument */
 
+ /* RFC 7950 keywords using identifier */
+<KEYWORD>action           { BEGIN(STRARG);  return K_ACTION; }
+<KEYWORD>anydata          { BEGIN(STRARG);  return K_ANYDATA; }
+<KEYWORD>anyxml           { BEGIN(STRARG);  return K_ANYXML; }
+<KEYWORD>argument         { BEGIN(STRARG);  return K_ARGUMENT; }
+<KEYWORD>base             { BEGIN(STRARG);  return K_BASE; }
+<KEYWORD>belongs-to       { BEGIN(STRARG);  return K_BELONGS_TO; }
+<KEYWORD>bit              { BEGIN(STRARG);  return K_BIT; }
+<KEYWORD>case             { BEGIN(STRARG);  return K_CASE; }
+<KEYWORD>choice           { BEGIN(STRARG);  return K_CHOICE; }
+<KEYWORD>container        { BEGIN(STRARG);  return K_CONTAINER; }
+<KEYWORD>extension        { BEGIN(STRARG);  return K_EXTENSION; }
+<KEYWORD>feature          { BEGIN(STRARG);  return K_FEATURE; }
+<KEYWORD>grouping         { BEGIN(STRARG);  return K_GROUPING; }
+<KEYWORD>identity         { BEGIN(STRARG);  return K_IDENTITY; }
+<KEYWORD>import           { BEGIN(STRARG);  return K_IMPORT; }
+<KEYWORD>include          { BEGIN(STRARG);  return K_INCLUDE; }
+<KEYWORD>leaf             { BEGIN(STRARG);  return K_LEAF; }
+<KEYWORD>leaf-list        { BEGIN(STRARG);  return K_LEAF_LIST; }
+<KEYWORD>list             { BEGIN(STRARG);  return K_LIST; }
+<KEYWORD>module           { BEGIN(STRARG);  return K_MODULE; }
+<KEYWORD>notification     { BEGIN(STRARG);  return K_NOTIFICATION; }
+<KEYWORD>prefix           { BEGIN(STRARG);  return K_PREFIX; }
+<KEYWORD>refine           { BEGIN(STRARG);  return K_REFINE; }
+<KEYWORD>rpc              { BEGIN(STRARG);  return K_RPC; }
+<KEYWORD>submodule        { BEGIN(STRARG);  return K_SUBMODULE; }
+<KEYWORD>type             { BEGIN(STRARG);  return K_TYPE; }
+<KEYWORD>typedef          { BEGIN(STRARG);  return K_TYPEDEF; }
+<KEYWORD>uses             { BEGIN(STRARG);  return K_USES; }
+
+ /* RFC 7950 keywords using boolean string arguments */
+<KEYWORD>config           { BEGIN(BOOLEAN); return K_CONFIG; }
+<KEYWORD>mandatory        { BEGIN(BOOLEAN); return K_MANDATORY; }
+<KEYWORD>require-instance { BEGIN(BOOLEAN); return K_REQUIRE_INSTANCE; }
+<KEYWORD>yin-element      { BEGIN(BOOLEAN); return K_YIN_ELEMENT;  }
+
+ /* RFC 7950 keywords using integer string argument */
+<KEYWORD>min-elements     { BEGIN(INTEGER);  return K_MIN_ELEMENTS; }
+<KEYWORD>position         { BEGIN(INTEGER);  return K_POSITION; }
+<KEYWORD>value            { BEGIN(INTEGER);  return K_VALUE; }
+
+ /* RFC 7950 keywords using strings  */
+<KEYWORD>augment          { BEGIN(STRING);  return K_AUGMENT; }
+<KEYWORD>contact          { BEGIN(STRING);  return K_CONTACT; }
+<KEYWORD>default          { BEGIN(STRING);  return K_DEFAULT; }
+<KEYWORD>description      { BEGIN(STRING);  return K_DESCRIPTION; }
+<KEYWORD>deviate          { BEGIN(STRING);  return K_DEVIATE; }
+<KEYWORD>deviation        { BEGIN(STRING);  return K_DEVIATION; }
+<KEYWORD>enum             { BEGIN(STRING);  return K_ENUM; }
+<KEYWORD>error-app-tag    { BEGIN(STRING);  return K_ERROR_APP_TAG; }
+<KEYWORD>error-message    { BEGIN(STRING);  return K_ERROR_MESSAGE; }
+<KEYWORD>fraction-digits  { BEGIN(STRING);  return K_FRACTION_DIGITS; }
+<KEYWORD>if-feature       { BEGIN(STRING);  return K_IF_FEATURE; }
+<KEYWORD>key              { BEGIN(STRING);  return K_KEY; }
+<KEYWORD>length           { BEGIN(STRING);  return K_LENGTH; }
+<KEYWORD>max-elements     { BEGIN(STRING);  return K_MAX_ELEMENTS; }
+<KEYWORD>must             { BEGIN(STRING);  return K_MUST; }
+<KEYWORD>namespace        { BEGIN(STRING);  return K_NAMESPACE; }
+<KEYWORD>ordered-by       { BEGIN(STRING);  return K_ORDERED_BY; }
+<KEYWORD>organization     { BEGIN(STRING);  return K_ORGANIZATION; }
+<KEYWORD>path             { BEGIN(STRING);  return K_PATH; }
+<KEYWORD>pattern          { BEGIN(STRING);  return K_PATTERN; }
+<KEYWORD>presence         { BEGIN(STRING);  return K_PRESENCE; }
+<KEYWORD>unique           { BEGIN(STRING);  return K_UNIQUE; }
+<KEYWORD>range            { BEGIN(STRING);   return K_RANGE; }
+<KEYWORD>reference        { BEGIN(STRING);  return K_REFERENCE; }
+<KEYWORD>revision         { BEGIN(STRING);  return K_REVISION; }
+<KEYWORD>revision-date    { BEGIN(STRING);  return K_REVISION_DATE; }
+<KEYWORD>status           { BEGIN(STRING);  return K_STATUS; }
+<KEYWORD>units            { BEGIN(STRING);  return K_UNITS; }
+<KEYWORD>when             { BEGIN(STRING);  return K_WHEN; }
+<KEYWORD>yang-version     { BEGIN(STRING);  return K_YANG_VERSION; }
 <KEYWORD>:                { return *yytext; }
+<KEYWORD>\{               { return *yytext; }
+<KEYWORD>\}               { return *yytext; }
 <KEYWORD>;                { return *yytext; }
 <KEYWORD>.                { clixon_yang_parselval.string = strdup(yytext);
                              BEGIN(UNKNOWN); return CHAR; }
@@ -190,34 +198,43 @@ clixon_yang_parsewrap(void)
 <UNKNOWN>.                { clixon_yang_parselval.string = strdup(yytext);
                             return CHAR; }
 
+<BOOLEAN>true             { clixon_yang_parselval.string = strdup(yytext);
+                            return BOOL; }
+<BOOLEAN>false            { clixon_yang_parselval.string = strdup(yytext);
+                            return BOOL; }
+<BOOLEAN>;                { BEGIN(KEYWORD); return *yytext; }
+<BOOLEAN>\{               { BEGIN(KEYWORD); return *yytext; }
+<BOOLEAN>.                { return *yytext; }
 
+<INTEGER>[0-9][0-9]*      { clixon_yang_parselval.string = strdup(yytext);
+                            return INT; }
+<INTEGER>;                { BEGIN(KEYWORD); return *yytext; }
+<INTEGER>\{                { BEGIN(KEYWORD); return *yytext; }
+<INTEGER>.                { return *yytext; }
 
-<ARGUMENT>;                { BEGIN(KEYWORD); return *yytext; }
-<ARGUMENT>\{               { BEGIN(KEYWORD); return *yytext; }
-<ARGUMENT>\"               { _YY->yy_lex_string_state =ARGUMENT; BEGIN(STRING1); return DQ; }
-<ARGUMENT>\'               { _YY->yy_lex_string_state =ARGUMENT; BEGIN(STRING2); return DQ; }
-<ARGUMENT>\+               { return *yytext; /* many arg rules dont like this */ }
-<ARGUMENT>:                { return *yytext; /* many arg rules dont like this */ }
-<ARGUMENT>.                { clixon_yang_parselval.string = strdup(yytext);
-                             return CHAR;}
+<STRARG>\{                 { BEGIN(KEYWORD); return *yytext; }
+<STRARG>;                  { BEGIN(KEYWORD); return *yytext; }
+<STRARG>{identifier}       { clixon_yang_parselval.string = strdup(yytext);
+                             return IDENTIFIER;}
+<STRARG>.                  { return *yytext; }
 
-<STRING0>\{                { BEGIN(KEYWORD); return *yytext; }
-<STRING0>;                 { BEGIN(KEYWORD); return *yytext; }
-<STRING0>\"                { _YY->yy_lex_string_state =STRING0; BEGIN(STRING1); return DQ; }
-<STRING0>\'                { _YY->yy_lex_string_state =STRING0; BEGIN(STRING2); return DQ; }
-<STRING0>\+               { return *yytext; }
-<STRING0>.                 { clixon_yang_parselval.string = strdup(yytext);
+<STRING>\{                { BEGIN(KEYWORD); return *yytext; }
+<STRING>;                 { BEGIN(KEYWORD); return *yytext; }
+<STRING>\"                { _YY->yy_lex_string_state =STRING; BEGIN(STRINGDQ); return DQ; }
+<STRING>\'                { _YY->yy_lex_string_state =STRING; BEGIN(STRINGSQ); return SQ; }
+<STRING>\+                { return *yytext; }
+<STRING>.                 { clixon_yang_parselval.string = strdup(yytext);
                             return CHAR;}
 
-<STRING1>\\                { _YY->yy_lex_state = STRING1; BEGIN(ESCAPE); }
-<STRING1>\"                { BEGIN(_YY->yy_lex_string_state); return DQ; }
-<STRING1>\n                { _YY->yy_linenum++; clixon_yang_parselval.string = strdup(yytext); return CHAR;}
-<STRING1>.                 { clixon_yang_parselval.string = strdup(yytext);
-                            return CHAR;}
+<STRINGDQ>\\                { _YY->yy_lex_state = STRINGDQ; BEGIN(ESCAPE); }
+<STRINGDQ>\"                { BEGIN(_YY->yy_lex_string_state); return DQ; }
+<STRINGDQ>\n                { _YY->yy_linenum++; clixon_yang_parselval.string = strdup(yytext); return CHAR;}
+<STRINGDQ>.                 { clixon_yang_parselval.string = strdup(yytext);
+                              return CHAR;}
 
-<STRING2>\'                { BEGIN(_YY->yy_lex_string_state); return DQ; }
-<STRING2>\n                { _YY->yy_linenum++; clixon_yang_parselval.string = strdup(yytext); return CHAR;}
-<STRING2>.                 { clixon_yang_parselval.string = strdup(yytext);
+<STRINGSQ>\'                { BEGIN(_YY->yy_lex_string_state); return SQ; }
+<STRINGSQ>\n                { _YY->yy_linenum++; clixon_yang_parselval.string = strdup(yytext); return CHAR;}
+<STRINGSQ>.                 { clixon_yang_parselval.string = strdup(yytext);
                              return CHAR;}
 
 <ESCAPE>.                 { BEGIN(_YY->yy_lex_state); 
diff --git a/lib/src/clixon_yang_parse.y b/lib/src/clixon_yang_parse.y
index 0a1fd81c..f947c833 100644
--- a/lib/src/clixon_yang_parse.y
+++ b/lib/src/clixon_yang_parse.y
@@ -34,9 +34,23 @@
  * Yang parser. Hopefully useful but not complete
  * @see https://tools.ietf.org/html/rfc6020 YANG 1.0
  * @see https://tools.ietf.org/html/rfc7950 YANG 1.1
+ *
+ * How identifiers map
+ * IDENTIFIER     = [A-Za-z_][A-Za-z0-9_\-\.]
+ * prefix         = IDENTIFIER
+ * identifier_arg = IDENTIFIER
+ * identifier_ref = prefix : IDENTIFIER
+ * node_identier  = prefix : IDENTIFIER
+ *
+ * Missing top-level statements (will break parser if in yang spec): 
+ * - error-app-tag-stmt
+ * - any-data-stmt
+ * Missing args (just strings);
+ * - length-arg-str
+ * - path-arg-str
+ * - date-arg-str
  */
 
-
 %start file
 
 %union {
@@ -46,16 +60,25 @@
 
 %token MY_EOF 
 %token DQ           /* Double quote: " */
-%token <string> CHAR
+%token SQ           /* Single quote: ' */
+%token <string>   CHAR
+%token <string>   IDENTIFIER
+%token <string>   BOOL
+%token <string>   INT
 
 %type <string>    ustring
 %type <string>    qstrings
 %type <string>    qstring
 %type <string>    string
-%type <string>    id_arg_str
-%type <string>    config_arg_str
-%type <string>    integer_value
-%type <string>    identifier_ref_arg_str
+%type <string>    integer_value_str
+%type <string>    identifier_ref
+%type <string>    abs_schema_nodeid
+%type <string>    desc_schema_node_str
+%type <string>    desc_schema_nodeid
+%type <string>    node_identifier
+%type <string>    identifier_str
+%type <string>    identifier_ref_str
+%type <string>    bool_str
 
 
 /* rfc 6020 keywords 
@@ -295,31 +318,38 @@ ysp_add_push(struct clicon_yang_yacc_arg *yy,
     return ys;
 }
 
-/* identifier-ref-arg-str has a [prefix :] id and prefix_id joins the id with an 
-   optional prefix into a single string */
+/*! Join two string with delimiter.
+ * @param[in] str1   string 1 (will be freed) (optional)
+ * @param[in] del    delimiter string (not freed) cannot be NULL (but "")
+ * @param[in] str2   string 2 (will be freed)
+ */
 static char*
-prefix_id_join(char *prefix,
-	       char *id)
+string_del_join(char *str1,
+		char *del,
+		char *str2)
 {
     char *str;
     int   len;
     
-    if (prefix){
-	len = strlen(prefix) + strlen(id) + 2;
-	if ((str = malloc(len)) == NULL){
-	    clicon_err(OE_UNIX, errno, "malloc");
-	    return NULL;
-	}
-	snprintf(str, len, "%s:%s", prefix, id);
-	free(prefix);
-	free(id);
+    len = strlen(str2) + 1;
+
+    if (str1)
+	len += strlen(str1);
+    len += strlen(del);
+    if ((str = malloc(len)) == NULL){
+	clicon_err(OE_UNIX, errno, "malloc");
+	return NULL;
+    }
+    if (str1){
+	snprintf(str, len, "%s%s%s", str1, del, str2);
+	free(str1);
     }
     else
-	str = id;
+	snprintf(str, len, "%s%s", del, str2);
+    free(str2);
     return str;
 }
 
-
 %} 
  
 %%
@@ -339,20 +369,20 @@ file          : module_stmt MY_EOF
 
   /* For extensions */
 unknown_stmt  : ustring  ':' ustring ';'
-               { char *id; if ((id=prefix_id_join($1, $3)) == NULL) _YYERROR("0");
+                 { char *id; if ((id=string_del_join($1, ":", $3)) == NULL) _YYERROR("0");
 		   if (ysp_add(_yy, Y_UNKNOWN, id, NULL) == NULL) _YYERROR("0"); 
 		   clicon_debug(2,"unknown-stmt -> ustring : ustring");
 	       }
               | ustring  ':' ustring ' ' string ';'
-               { char *id; if ((id=prefix_id_join($1, $3)) == NULL) _YYERROR("0");
+	        { char *id; if ((id=string_del_join($1, ":", $3)) == NULL) _YYERROR("0");
 		   if (ysp_add(_yy, Y_UNKNOWN, id, $5) == NULL){ _YYERROR("0"); }
 		   clicon_debug(2,"unknown-stmt -> ustring : ustring string");
                    if ($5) free($5);
 	       }
 	      ;
 
-/* module */
-module_stmt   : K_MODULE id_arg_str 
+/* module identifier-arg-str */
+module_stmt   : K_MODULE identifier_str 
                   { if ((_YY->yy_module = ysp_add_push(_yy, Y_MODULE, $2)) == NULL) _YYERROR("1");
                         } 
                 '{' module_substmts '}' 
@@ -376,7 +406,7 @@ module_substmt : module_header_stmts { clicon_debug(2,"module-substmt -> module-
                ;
 
 /* submodule */
-submodule_stmt : K_SUBMODULE id_arg_str '{' submodule_substmts '}' 
+submodule_stmt : K_SUBMODULE identifier_str '{' submodule_substmts '}' 
 		{ if ((_YY->yy_module = ysp_add_push(_yy, Y_SUBMODULE, $2)) == NULL) _YYERROR("3"); 
                         clicon_debug(2,"submodule -> id-arg-str { submodule-stmts }"); 
                       }
@@ -398,6 +428,17 @@ submodule_substmt : submodule_header_stmts
                |                { clicon_debug(2,"submodule-substmt ->");} 
               ;
 
+/* linkage */
+linkage_stmts : linkage_stmts linkage_stmt 
+                       { clicon_debug(2,"linkage-stmts -> linkage-stmts linkage-stmt"); }
+              | linkage_stmt
+                       { clicon_debug(2,"linkage-stmts -> linkage-stmt"); }
+              ;
+
+linkage_stmt  : import_stmt  { clicon_debug(2,"linkage-stmt -> import-stmt"); }
+              | include_stmt { clicon_debug(2,"linkage-stmt -> include-stmt"); }
+              ;
+
 /* module-header */
 module_header_stmts : module_header_stmts module_header_stmt
                   { clicon_debug(2,"module-header-stmts -> module-header-stmts module-header-stmt"); }
@@ -422,22 +463,81 @@ submodule_header_stmt : yang_version_stmt
               | belongs_to_stmt { clicon_debug(2,"submodule-header-stmt -> belongs-to-stmt"); }
               ;
 
-/* linkage */
-linkage_stmts : linkage_stmts linkage_stmt 
-                       { clicon_debug(2,"linkage-stmts -> linkage-stmts linkage-stmt"); }
-              | linkage_stmt
-                       { clicon_debug(2,"linkage-stmts -> linkage-stmt"); }
+/* yang-version-stmt = yang-version-keyword  yang-version-arg-str */
+yang_version_stmt : K_YANG_VERSION string ';' 
+		{ if (ysp_add(_yy, Y_YANG_VERSION, $2, NULL) == NULL) _YYERROR("83");
+                            clicon_debug(2,"yang-version-stmt -> YANG-VERSION string"); }
               ;
 
-linkage_stmt  : import_stmt  { clicon_debug(2,"linkage-stmt -> import-stmt"); }
-              | include_stmt { clicon_debug(2,"linkage-stmt -> include-stmt"); }
+/* import */
+import_stmt   : K_IMPORT identifier_str
+                          { if (ysp_add_push(_yy, Y_IMPORT, $2) == NULL) _YYERROR("81"); }
+                '{' import_substmts '}' 
+                        { if (ystack_pop(_yy) < 0) _YYERROR("82");
+			  clicon_debug(2,"import-stmt -> IMPORT id-arg-str { import-substmts }");} 
               ;
 
-/* revision */
-revision_stmts : revision_stmts revision_stmt 
-                       { clicon_debug(2,"revision-stmts -> revision-stmts revision-stmt"); }
-              | revision_stmt
-                       { clicon_debug(2,"revision-stmts -> "); }
+import_substmts : import_substmts import_substmt 
+                      { clicon_debug(2,"import-substmts -> import-substmts import-substm");} 
+              | import_substmt 
+                      { clicon_debug(2,"import-substmts ->");} 
+              ;
+
+import_substmt : prefix_stmt {  clicon_debug(2,"import-stmt -> prefix-stmt"); }
+              |  revision_date_stmt {  clicon_debug(2,"import-stmt -> revision-date-stmt"); }
+              ;
+
+include_stmt  : K_INCLUDE identifier_str ';'
+		{ if (ysp_add(_yy, Y_INCLUDE, $2, NULL)== NULL) _YYERROR("97"); 
+                           clicon_debug(2,"include-stmt -> id-arg-str"); }
+              | K_INCLUDE identifier_str '{' revision_date_stmt '}'
+		{ if (ysp_add(_yy, Y_INCLUDE, $2, NULL)== NULL) _YYERROR("98"); 
+                           clicon_debug(2,"include-stmt -> id-arg-str { revision-date-stmt }"); }
+              ;
+
+/* namespace-stmt = namespace-keyword sep uri-str */
+namespace_stmt : K_NAMESPACE string stmtend  
+		{ if (ysp_add(_yy, Y_NAMESPACE, $2, NULL)== NULL) _YYERROR("99"); 
+                            clicon_debug(2,"namespace-stmt -> NAMESPACE string"); }
+              ;
+
+prefix_stmt   : K_PREFIX identifier_str ';' /* XXX prefix-arg-str */
+		{ if (ysp_add(_yy, Y_PREFIX, $2, NULL)== NULL) _YYERROR("100"); 
+			     clicon_debug(2,"prefix-stmt -> PREFIX string ;");}
+              ;
+
+belongs_to_stmt : K_BELONGS_TO identifier_str ';' 
+
+                 { if (ysp_add(_yy, Y_BELONGS_TO, $2, NULL)== NULL) _YYERROR("100"); 
+			     clicon_debug(2,"belongs-to-stmt -> BELONGS-TO id-arg-str ;");}
+                | K_BELONGS_TO identifier_str '{' prefix_stmt '}'
+				{ if (ysp_add(_yy, Y_BELONGS_TO, $2, NULL)== NULL) _YYERROR("98"); 
+			     clicon_debug(2,"belongs-to-stmt -> BELONGS-TO id-arg-str { prefix-stmt } ");}
+                 ;
+
+organization_stmt: K_ORGANIZATION string ';'
+		{ if (ysp_add(_yy, Y_ORGANIZATION, $2, NULL)== NULL) _YYERROR("102"); 
+			   clicon_debug(2,"organization-stmt -> ORGANIZATION string ;");}
+              ;
+
+contact_stmt  : K_CONTACT string ';'
+		{ if (ysp_add(_yy, Y_CONTACT, $2, NULL)== NULL) _YYERROR("95"); 
+                            clicon_debug(2,"contact-stmt -> CONTACT string"); }
+              ;
+
+description_stmt: K_DESCRIPTION string ';' 
+		{ if (ysp_add(_yy, Y_DESCRIPTION, $2, NULL)== NULL) _YYERROR("101"); 
+			   clicon_debug(2,"description-stmt -> DESCRIPTION string ;");}
+              ;
+
+reference_stmt: K_REFERENCE string ';'
+		{ if (ysp_add(_yy, Y_REFERENCE, $2, NULL)== NULL) _YYERROR("105"); 
+			   clicon_debug(2,"reference-stmt -> REFERENCE string ;");}
+              ;
+
+units_stmt    : K_UNITS string ';'
+		{ if (ysp_add(_yy, Y_UNITS, $2, NULL)== NULL) _YYERROR("93"); 
+                            clicon_debug(2,"units-stmt -> UNITS string"); }
               ;
 
 revision_stmt : K_REVISION string ';'  /* XXX date-arg-str */
@@ -463,469 +563,118 @@ revision_substmt : description_stmt { clicon_debug(2,"revision-substmt -> descri
               ;
 
 
-
-/* meta */
-meta_stmts    : meta_stmts meta_stmt { clicon_debug(2,"meta-stmts -> meta-stmts meta-stmt"); }
-              | meta_stmt            { clicon_debug(2,"meta-stmts -> meta-stmt"); }
+/* revision */
+revision_stmts : revision_stmts revision_stmt 
+                       { clicon_debug(2,"revision-stmts -> revision-stmts revision-stmt"); }
+              | revision_stmt
+                       { clicon_debug(2,"revision-stmts -> "); }
               ;
 
-meta_stmt     : organization_stmt    { clicon_debug(2,"meta-stmt -> organization-stmt"); }
-              | contact_stmt         { clicon_debug(2,"meta-stmt -> contact-stmt"); }
-              | description_stmt     { clicon_debug(2,"meta-stmt -> description-stmt"); }
-              | reference_stmt       { clicon_debug(2,"meta-stmt -> reference-stmt"); }
+revision_date_stmt : K_REVISION_DATE string ';'  /* XXX date-arg-str */
+		{ if (ysp_add(_yy, Y_REVISION_DATE, $2, NULL) == NULL) _YYERROR("96"); 
+			 clicon_debug(2,"revision-date-stmt -> date;"); }
               ;
 
-/* body */
-body_stmts    : body_stmts body_stmt { clicon_debug(2,"body-stmts -> body-stmts body-stmt"); } 
-              | body_stmt            { clicon_debug(2,"body-stmts -> body-stmt");}
+/* Extension */
+extension_stmt: K_EXTENSION identifier_str ';' 
+	       { if (ysp_add(_yy, Y_EXTENSION, $2, NULL) == NULL) _YYERROR("59");
+                    clicon_debug(2,"extenstion-stmt -> EXTENSION id-arg-str ;"); }
+              | K_EXTENSION identifier_str 
+ 	          { if (ysp_add_push(_yy, Y_EXTENSION, $2) == NULL) _YYERROR("60"); }
+	       '{' extension_substmts '}' 
+	       { if (ystack_pop(_yy) < 0) _YYERROR("61");
+                    clicon_debug(2,"extension-stmt -> FEATURE id-arg-str { extension-substmts }"); }
+	      ;
+
+
+/* extension substmts */
+extension_substmts : extension_substmts extension_substmt 
+                  { clicon_debug(2,"extension-substmts -> extension-substmts extension-substmt"); }
+              | extension_substmt 
+                  { clicon_debug(2,"extension-substmts -> extension-substmt"); }
               ;
 
-body_stmt     : extension_stmt       { clicon_debug(2,"body-stmt -> extension-stmt");}
-              | feature_stmt         { clicon_debug(2,"body-stmt -> feature-stmt");}
-              | identity_stmt        { clicon_debug(2,"body-stmt -> identity-stmt");}
-              | typedef_stmt         { clicon_debug(2,"body-stmt -> typedef-stmt");}
-              | grouping_stmt        { clicon_debug(2,"body-stmt -> grouping-stmt");}
-              | data_def_stmt        { clicon_debug(2,"body-stmt -> data-def-stmt");}
-              | augment_stmt         { clicon_debug(2,"body-stmt -> augment-stmt");}
-              | rpc_stmt             { clicon_debug(2,"body-stmt -> rpc-stmt");}
-              | notification_stmt    { clicon_debug(2,"body-stmt -> notification-stmt");}
+extension_substmt : argument_stmt    { clicon_debug(2,"extension-substmt -> argument-stmt"); }
+              | status_stmt          { clicon_debug(2,"extension-substmt -> status-stmt"); }
+              | description_stmt     { clicon_debug(2,"extension-substmt -> description-stmt"); }
+              | reference_stmt       { clicon_debug(2,"extension-substmt -> reference-stmt"); }
+              | unknown_stmt         { clicon_debug(2,"extension-substmt -> unknown-stmt");} 
+              |                      { clicon_debug(2,"extension-substmt -> "); }
               ;
 
-data_def_stmt : container_stmt       { clicon_debug(2,"data-def-stmt -> container-stmt");}
-              | leaf_stmt            { clicon_debug(2,"data-def-stmt -> leaf-stmt");}
-              | leaf_list_stmt       { clicon_debug(2,"data-def-stmt -> leaf-list-stmt");}
-              | list_stmt            { clicon_debug(2,"data-def-stmt -> list-stmt");}
-              | choice_stmt          { clicon_debug(2,"data-def-stmt -> choice-stmt");}
-              | anyxml_stmt          { clicon_debug(2,"data-def-stmt -> anyxml-stmt");}
-              | uses_stmt            { clicon_debug(2,"data-def-stmt -> uses-stmt");}
+argument_stmt  : K_ARGUMENT identifier_str ';'     { free($2); }
+               | K_ARGUMENT identifier_str '{' yin_element_stmt1 '}' { free($2); }
+               ;
+
+/* Example of optional rule, eg [yin-element-stmt] */
+yin_element_stmt1 : K_YIN_ELEMENT bool_str stmtend {free($2);}
+               ;
+
+/* Identity */
+identity_stmt  : K_IDENTITY identifier_str ';' 
+	      { if (ysp_add(_yy, Y_IDENTITY, $2, NULL) == NULL) _YYERROR("65"); 
+			   clicon_debug(2,"identity-stmt -> IDENTITY string ;"); }
+
+              | K_IDENTITY identifier_str
+                          { if (ysp_add_push(_yy, Y_IDENTITY, $2) == NULL) _YYERROR("66"); }
+	       '{' identity_substmts '}' 
+                           { if (ystack_pop(_yy) < 0) _YYERROR("67");
+			     clicon_debug(2,"identity-stmt -> IDENTITY string { identity-substmts }"); }
               ;
 
-/* container */
-container_stmt : K_CONTAINER id_arg_str ';'
-		{ if (ysp_add(_yy, Y_CONTAINER, $2, NULL) == NULL) _YYERROR("7"); 
-                             clicon_debug(2,"container-stmt -> CONTAINER id-arg-str ;");}
-              | K_CONTAINER id_arg_str 
-                          { if (ysp_add_push(_yy, Y_CONTAINER, $2) == NULL) _YYERROR("8"); }
-                '{' container_substmts '}'
-                           { if (ystack_pop(_yy) < 0) _YYERROR("9");
-                             clicon_debug(2,"container-stmt -> CONTAINER id-arg-str { container-substmts }");}
+identity_substmts : identity_substmts identity_substmt 
+                      { clicon_debug(2,"identity-substmts -> identity-substmts identity-substmt"); }
+              | identity_substmt 
+                      { clicon_debug(2,"identity-substmts -> identity-substmt"); }
               ;
 
-container_substmts : container_substmts container_substmt 
-              | container_substmt 
+identity_substmt : base_stmt         { clicon_debug(2,"identity-substmt -> base-stmt"); }
+              | status_stmt          { clicon_debug(2,"identity-substmt -> status-stmt"); }
+              | description_stmt     { clicon_debug(2,"identity-substmt -> description-stmt"); }
+              | reference_stmt       { clicon_debug(2,"identity-substmt -> reference-stmt"); }
+              | unknown_stmt         { clicon_debug(2,"identity-substmt -> unknown-stmt");} 
+              |                      { clicon_debug(2,"identity-substmt -> "); }
               ;
 
-container_substmt : when_stmt       { clicon_debug(2,"container-substmt -> when-stmt"); }
-              | if_feature_stmt     { clicon_debug(2,"container-substmt -> if-feature-stmt"); }
-              | must_stmt           { clicon_debug(2,"container-substmt -> must-stmt"); }
-              | presence_stmt       { clicon_debug(2,"container-substmt -> presence-stmt"); }
-              | config_stmt         { clicon_debug(2,"container-substmt -> config-stmt"); }
-              | status_stmt         { clicon_debug(2,"container-substmt -> status-stmt"); }
-              | description_stmt    { clicon_debug(2,"container-substmt -> description-stmt");} 
-              | reference_stmt      { clicon_debug(2,"container-substmt -> reference-stmt"); }
-              | typedef_stmt        { clicon_debug(2,"container-substmt -> typedef-stmt"); }
-              | grouping_stmt       { clicon_debug(2,"container-substmt -> grouping-stmt"); }
-              | data_def_stmt       { clicon_debug(2,"container-substmt -> data-def-stmt");}
-              | action_stmt         { clicon_debug(2,"container-substmt -> action-stmt");} 
-              | notification_stmt   { clicon_debug(2,"container-substmt -> notification-stmt");} 
-              | unknown_stmt        { clicon_debug(2,"container-substmt -> unknown-stmt");} 
-              |                     { clicon_debug(2,"container-substmt ->");} 
+base_stmt     : K_BASE identifier_ref_str ';' 
+		{ if (ysp_add(_yy, Y_BASE, $2, NULL)== NULL) _YYERROR("90"); 
+                            clicon_debug(2,"base-stmt -> BASE identifier-ref-arg-str"); }
               ;
 
-/* leaf */
-leaf_stmt     : K_LEAF id_arg_str ';'
-		{ if (ysp_add(_yy, Y_LEAF, $2, NULL) == NULL) _YYERROR("10"); 
-			   clicon_debug(2,"leaf-stmt -> LEAF id-arg-str ;");}
-              | K_LEAF id_arg_str 
-                          { if (ysp_add_push(_yy, Y_LEAF, $2) == NULL) _YYERROR("11"); }
-                '{' leaf_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("12");
-                             clicon_debug(2,"leaf-stmt -> LEAF id-arg-str { lead-substmts }");}
+/* Feature */
+feature_stmt  : K_FEATURE identifier_str ';' 
+	       { if (ysp_add(_yy, Y_FEATURE, $2, NULL) == NULL) _YYERROR("62");
+		      clicon_debug(2,"feature-stmt -> FEATURE id-arg-str ;"); }
+              | K_FEATURE identifier_str
+                  { if (ysp_add_push(_yy, Y_FEATURE, $2) == NULL) _YYERROR("63"); }
+              '{' feature_substmts '}' 
+                  { if (ystack_pop(_yy) < 0) _YYERROR("64");
+                    clicon_debug(2,"feature-stmt -> FEATURE id-arg-str { feature-substmts }"); }
               ;
 
-leaf_substmts : leaf_substmts leaf_substmt
-              | leaf_substmt
+/* feature substmts */
+feature_substmts : feature_substmts feature_substmt 
+                      { clicon_debug(2,"feature-substmts -> feature-substmts feature-substmt"); }
+              | feature_substmt 
+                      { clicon_debug(2,"feature-substmts -> feature-substmt"); }
               ;
 
-leaf_substmt  : when_stmt            { clicon_debug(2,"leaf-substmt -> when-stmt"); }
-              | if_feature_stmt      { clicon_debug(2,"leaf-substmt -> if-feature-stmt"); }
-              | type_stmt            { clicon_debug(2,"leaf-substmt -> type-stmt"); }
-              | units_stmt           { clicon_debug(2,"leaf-substmt -> units-stmt"); }
-              | must_stmt            { clicon_debug(2,"leaf-substmt -> must-stmt"); }
-              | default_stmt         { clicon_debug(2,"leaf-substmt -> default-stmt"); }
-              | config_stmt          { clicon_debug(2,"leaf-substmt -> config-stmt"); }
-              | mandatory_stmt       { clicon_debug(2,"leaf-substmt -> mandatory-stmt"); }
-              | status_stmt          { clicon_debug(2,"leaf-substmt -> status-stmt"); }
-              | description_stmt     { clicon_debug(2,"leaf-substmt -> description-stmt"); }
-              | reference_stmt       { clicon_debug(2,"leaf-substmt -> reference-stmt"); }
-              | unknown_stmt         { clicon_debug(2,"leaf-substmt -> unknown-stmt");} 
-              |                      { clicon_debug(2,"leaf-substmt ->"); }
+feature_substmt : if_feature_stmt    { clicon_debug(2,"feature-substmt -> if-feature-stmt"); }
+              | status_stmt          { clicon_debug(2,"feature-substmt -> status-stmt"); }
+              | description_stmt     { clicon_debug(2,"feature-substmt -> description-stmt"); }
+              | reference_stmt       { clicon_debug(2,"feature-substmt -> reference-stmt"); }
+              | unknown_stmt         { clicon_debug(2,"feature-substmt -> unknown-stmt");} 
+              |                      { clicon_debug(2,"feature-substmt -> "); }
               ;
 
-/* leaf-list */
-leaf_list_stmt : K_LEAF_LIST id_arg_str ';'
-		{ if (ysp_add(_yy, Y_LEAF_LIST, $2, NULL) == NULL) _YYERROR("13"); 
-			   clicon_debug(2,"leaf-list-stmt -> LEAF id-arg-str ;");}
-              | K_LEAF_LIST id_arg_str 
-                          { if (ysp_add_push(_yy, Y_LEAF_LIST, $2) == NULL) _YYERROR("14"); }
-                '{' leaf_list_substmts '}'
-                           { if (ystack_pop(_yy) < 0) _YYERROR("15");
-                             clicon_debug(2,"leaf-list-stmt -> LEAF-LIST id-arg-str { lead-substmts }");}
+/* if-feature-stmt = if-feature-keyword sep if-feature-expr-str */
+if_feature_stmt : K_IF_FEATURE string stmtend 
+		{ if (ysp_add(_yy, Y_IF_FEATURE, $2, NULL) == NULL) _YYERROR("85"); 
+                            clicon_debug(2,"if-feature-stmt -> IF-FEATURE identifier-ref-arg-str"); }
               ;
 
-leaf_list_substmts : leaf_list_substmts leaf_list_substmt
-              | leaf_list_substmt
-              ;
-
-leaf_list_substmt : when_stmt        { clicon_debug(2,"leaf-list-substmt -> when-stmt"); } 
-              | if_feature_stmt      { clicon_debug(2,"leaf-list-substmt -> if-feature-stmt"); }
-              | type_stmt            { clicon_debug(2,"leaf-list-substmt -> type-stmt"); }
-              | units_stmt           { clicon_debug(2,"leaf-list-substmt -> units-stmt"); }
-              | must_stmt            { clicon_debug(2,"leaf-list-substmt -> must-stmt"); }
-              | config_stmt          { clicon_debug(2,"leaf-list-substmt -> config-stmt"); }
-              | min_elements_stmt    { clicon_debug(2,"leaf-list-substmt -> min-elements-stmt"); }
-              | max_elements_stmt    { clicon_debug(2,"leaf-list-substmt -> max-elements-stmt"); }
-              | ordered_by_stmt      { clicon_debug(2,"leaf-list-substmt -> ordered-by-stmt"); }
-              | status_stmt          { clicon_debug(2,"leaf-list-substmt -> status-stmt"); }
-              | description_stmt     { clicon_debug(2,"leaf-list-substmt -> description-stmt"); }
-              | reference_stmt       { clicon_debug(2,"leaf-list-substmt -> reference-stmt"); }
-              | unknown_stmt         { clicon_debug(2,"leaf-list-substmt -> unknown-stmt");} 
-              |                      { clicon_debug(2,"leaf-list-stmt ->"); }
-              ;
-
-/* list */
-list_stmt     : K_LIST id_arg_str ';' 
-		{ if (ysp_add(_yy, Y_LIST, $2, NULL) == NULL) _YYERROR("16"); 
-			   clicon_debug(2,"list-stmt -> LIST id-arg-str ;"); }
-              | K_LIST id_arg_str 
-                          { if (ysp_add_push(_yy, Y_LIST, $2) == NULL) _YYERROR("17"); }
-	       '{' list_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("18");
-			     clicon_debug(2,"list-stmt -> LIST id-arg-str { list-substmts }"); }
-              ;
-
-list_substmts : list_substmts list_substmt 
-                      { clicon_debug(2,"list-substmts -> list-substmts list-substmt"); }
-              | list_substmt 
-                      { clicon_debug(2,"list-substmts -> list-substmt"); }
-              ;
-
-list_substmt  : when_stmt            { clicon_debug(2,"list-substmt -> when-stmt"); }
-              | if_feature_stmt      { clicon_debug(2,"list-substmt -> if-feature-stmt"); }
-              | must_stmt            { clicon_debug(2,"list-substmt -> must-stmt"); }
-              | key_stmt             { clicon_debug(2,"list-substmt -> key-stmt"); }
-              | unique_stmt          { clicon_debug(2,"list-substmt -> unique-stmt"); }
-              | config_stmt          { clicon_debug(2,"list-substmt -> config-stmt"); }
-              | min_elements_stmt    { clicon_debug(2,"list-substmt -> min-elements-stmt"); }
-              | max_elements_stmt    { clicon_debug(2,"list-substmt -> max-elements-stmt"); }
-              | ordered_by_stmt      { clicon_debug(2,"list-substmt -> ordered-by-stmt"); }
-              | status_stmt          { clicon_debug(2,"list-substmt -> status-stmt"); }
-              | description_stmt     { clicon_debug(2,"list-substmt -> description-stmt"); }
-              | reference_stmt       { clicon_debug(2,"list-substmt -> reference-stmt"); }
-              | typedef_stmt         { clicon_debug(2,"list-substmt -> typedef-stmt"); }
-              | grouping_stmt        { clicon_debug(2,"list-substmt -> grouping-stmt"); }
-              | data_def_stmt        { clicon_debug(2,"list-substmt -> data-def-stmt"); }
-              | action_stmt          { clicon_debug(2,"list-substmt -> action-stmt"); }
-              | notification_stmt    { clicon_debug(2,"list-substmt -> notification-stmt"); }
-              | unknown_stmt         { clicon_debug(2,"list-substmt -> unknown-stmt");} 
-              |                      { clicon_debug(2,"list-substmt -> "); }
-              ;
-
-/* choice */
-choice_stmt   : K_CHOICE id_arg_str ';' 
-	       { if (ysp_add(_yy, Y_CHOICE, $2, NULL) == NULL) _YYERROR("19"); 
-			   clicon_debug(2,"choice-stmt -> CHOICE id-arg-str ;"); }
-              | K_CHOICE id_arg_str 
-                          { if (ysp_add_push(_yy, Y_CHOICE, $2) == NULL) _YYERROR("20"); }
-	       '{' choice_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("21");
-			     clicon_debug(2,"choice-stmt -> CHOICE id-arg-str { choice-substmts }"); }
-              ;
-
-choice_substmts : choice_substmts choice_substmt 
-                      { clicon_debug(2,"choice-substmts -> choice-substmts choice-substmt"); }
-              | choice_substmt 
-                      { clicon_debug(2,"choice-substmts -> choice-substmt"); }
-              ;
-
-choice_substmt : when_stmt           { clicon_debug(2,"choice-substmt -> when-stmt"); }  
-              | if_feature_stmt      { clicon_debug(2,"choice-substmt -> if-feature-stmt"); }
-              | default_stmt         { clicon_debug(2,"choice-substmt -> default-stmt"); }
-              | config_stmt          { clicon_debug(2,"choice-substmt -> config-stmt"); }
-              | mandatory_stmt       { clicon_debug(2,"choice-substmt -> mandatory-stmt"); }
-              | status_stmt          { clicon_debug(2,"choice-substmt -> status-stmt"); }
-              | description_stmt     { clicon_debug(2,"choice-substmt -> description-stmt"); }
-              | reference_stmt       { clicon_debug(2,"choice-substmt -> reference-stmt"); }
-              | short_case_stmt      { clicon_debug(2,"choice-substmt -> short-case-stmt");} 
-              | case_stmt            { clicon_debug(2,"choice-substmt -> case-stmt");} 
-              | unknown_stmt         { clicon_debug(2,"choice-substmt -> unknown-stmt");} 
-              |                      { clicon_debug(2,"choice-substmt -> "); }
-              ;
-
-/* short-case */
-short_case_stmt : container_stmt   { clicon_debug(2,"short-case-substmt -> container-stmt"); }
-              | leaf_stmt          { clicon_debug(2,"short-case-substmt -> leaf-stmt"); }
-              | leaf_list_stmt     { clicon_debug(2,"short-case-substmt -> leaf-list-stmt"); }
-              | list_stmt          { clicon_debug(2,"short-case-substmt -> list-stmt"); }
-              | anyxml_stmt        { clicon_debug(2,"short-case-substmt -> anyxml-stmt");}
-              ;
-
-/* case */
-case_stmt   : K_CASE id_arg_str ';' 
-	       { if (ysp_add(_yy, Y_CASE, $2, NULL) == NULL) _YYERROR("22"); 
-			   clicon_debug(2,"case-stmt -> CASE id-arg-str ;"); }
-              | K_CASE id_arg_str 
-                          { if (ysp_add_push(_yy, Y_CASE, $2) == NULL) _YYERROR("23"); }
-	       '{' case_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("24");
-			     clicon_debug(2,"case-stmt -> CASE id-arg-str { case-substmts }"); }
-              ;
-
-case_substmts : case_substmts case_substmt 
-                      { clicon_debug(2,"case-substmts -> case-substmts case-substmt"); }
-              | case_substmt 
-                      { clicon_debug(2,"case-substmts -> case-substmt"); }
-              ;
-
-case_substmt  : when_stmt            { clicon_debug(2,"case-substmt -> when-stmt"); }
-              | if_feature_stmt      { clicon_debug(2,"case-substmt -> if-feature-stmt"); }
-              | status_stmt          { clicon_debug(2,"case-substmt -> status-stmt"); }
-              | description_stmt     { clicon_debug(2,"case-substmt -> description-stmt"); }
-              | reference_stmt       { clicon_debug(2,"case-substmt -> reference-stmt"); }
-              | data_def_stmt        { clicon_debug(2,"case-substmt -> data-def-stmt");} 
-              | unknown_stmt         { clicon_debug(2,"case-substmt -> unknown-stmt");} 
-              |                      { clicon_debug(2,"case-substmt -> "); }
-              ;
-
-
-/* anyxml */
-anyxml_stmt   : K_ANYXML  id_arg_str ';' 
-	       { if (ysp_add(_yy, Y_ANYXML, $2, NULL) == NULL) _YYERROR("25"); 
-			   clicon_debug(2,"anyxml-stmt -> ANYXML id-arg-str ;"); }
-              | K_ANYXML id_arg_str
-                          { if (ysp_add_push(_yy, Y_ANYXML, $2) == NULL) _YYERROR("26"); }
-	       '{' anyxml_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("27");
-			     clicon_debug(2,"anyxml-stmt -> ANYXML id-arg-str { anyxml-substmts }"); }
-              ;
-
-anyxml_substmts : anyxml_substmts anyxml_substmt 
-                      { clicon_debug(2,"anyxml-substmts -> anyxml-substmts anyxml-substmt"); }
-              | anyxml_substmt 
-                      { clicon_debug(2,"anyxml-substmts -> anyxml-substmt"); }
-              ;
-
-anyxml_substmt  : when_stmt          { clicon_debug(2,"anyxml-substmt -> when-stmt"); }
-              | if_feature_stmt      { clicon_debug(2,"anyxml-substmt -> if-feature-stmt"); }
-              | must_stmt            { clicon_debug(2,"anyxml-substmt -> must-stmt"); }
-              | config_stmt          { clicon_debug(2,"anyxml-substmt -> config-stmt"); }
-              | mandatory_stmt       { clicon_debug(2,"anyxml-substmt -> mandatory-stmt"); }
-              | status_stmt          { clicon_debug(2,"anyxml-substmt -> status-stmt"); }
-              | description_stmt     { clicon_debug(2,"anyxml-substmt -> description-stmt"); }
-              | reference_stmt       { clicon_debug(2,"anyxml-substmt -> reference-stmt"); }
-              | ustring ':' ustring ';' { free($1); free($3); clicon_debug(2,"anyxml-substmt -> anyxml extension"); }
-              ;
-
-/* uses */
-uses_stmt     : K_USES identifier_ref_arg_str ';' 
-	       { if (ysp_add(_yy, Y_USES, $2, NULL) == NULL) _YYERROR("28"); 
-			   clicon_debug(2,"uses-stmt -> USES id-arg-str ;"); }
-              | K_USES identifier_ref_arg_str
-                          { if (ysp_add_push(_yy, Y_USES, $2) == NULL) _YYERROR("29"); }
-	       '{' uses_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("30");
-			     clicon_debug(2,"uses-stmt -> USES id-arg-str { uses-substmts }"); }
-              ;
-
-uses_substmts : uses_substmts uses_substmt 
-                      { clicon_debug(2,"uses-substmts -> uses-substmts uses-substmt"); }
-              | uses_substmt 
-                      { clicon_debug(2,"uses-substmts -> uses-substmt"); }
-              ;
-
-uses_substmt  : when_stmt            { clicon_debug(2,"uses-substmt -> when-stmt"); }
-              | if_feature_stmt      { clicon_debug(2,"uses-substmt -> if-feature-stmt"); }
-              | status_stmt          { clicon_debug(2,"uses-substmt -> status-stmt"); }
-              | description_stmt     { clicon_debug(2,"uses-substmt -> description-stmt"); }
-              | reference_stmt       { clicon_debug(2,"uses-substmt -> reference-stmt"); }
-              | refine_stmt          { clicon_debug(2,"uses-substmt -> refine-stmt"); }
-              | uses_augment_stmt    { clicon_debug(2,"uses-substmt -> uses-augment-stmt"); }
-              | unknown_stmt         { clicon_debug(2,"uses-substmt -> unknown-stmt");} 
-              |                      { clicon_debug(2,"uses-substmt -> "); }
-              ;
-
-/* refine XXX need further refining */
-refine_stmt   : K_REFINE id_arg_str ';' 
-	       { if (ysp_add(_yy, Y_REFINE, $2, NULL) == NULL) _YYERROR("31"); 
-			   clicon_debug(2,"refine-stmt -> REFINE id-arg-str ;"); }
-              | K_REFINE id_arg_str 
-                          { if (ysp_add_push(_yy, Y_REFINE, $2) == NULL) _YYERROR("32"); }
-	       '{' refine_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("33");
-			     clicon_debug(2,"refine-stmt -> REFINE id-arg-str { refine-substmts }"); }
-              ;
-
-refine_substmts : refine_substmts refine_substmt 
-                      { clicon_debug(2,"refine-substmts -> refine-substmts refine-substmt"); }
-              | refine_substmt 
-                      { clicon_debug(2,"refine-substmts -> refine-substmt"); }
-              ;
-
-refine_substmt  : must_stmt     { clicon_debug(2,"refine-substmt -> must-stmt"); }
-              | mandatory_stmt  { clicon_debug(2,"refine-substmt -> mandatory-stmt"); }
-              | default_stmt    { clicon_debug(2,"refine-substmt -> default-stmt"); }
-              | unknown_stmt    { clicon_debug(2,"refine-substmt -> unknown-stmt");} 
-              |                 { clicon_debug(2,"refine-substmt -> "); }
-              ;
-
-/* augment */
-uses_augment_stmt : augment_stmt;
-
-augment_stmt   : K_AUGMENT string
-                          { if (ysp_add_push(_yy, Y_AUGMENT, $2) == NULL) _YYERROR("34"); }
-	       '{' augment_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("35");
-			     clicon_debug(2,"augment-stmt -> AUGMENT string { augment-substmts }"); }
-              ;
-
-augment_substmts : augment_substmts augment_substmt 
-                      { clicon_debug(2,"augment-substmts -> augment-substmts augment-substmt"); }
-              | augment_substmt 
-                      { clicon_debug(2,"augment-substmts -> augment-substmt"); }
-              ;
-
-augment_substmt : when_stmt          { clicon_debug(2,"augment-substmt -> when-stmt"); }  
-              | if_feature_stmt      { clicon_debug(2,"augment-substmt -> if-feature-stmt"); }
-              | status_stmt          { clicon_debug(2,"augment-substmt -> status-stmt"); }
-              | description_stmt     { clicon_debug(2,"augment-substmt -> description-stmt"); }
-              | reference_stmt       { clicon_debug(2,"augment-substmt -> reference-stmt"); }
-              | data_def_stmt        { clicon_debug(2,"augment-substmt -> data-def-stmt"); }
-              | case_stmt            { clicon_debug(2,"augment-substmt -> case-stmt");}
-              | action_stmt          { clicon_debug(2,"augment-substmt -> action-stmt");} 
-              | notification_stmt    { clicon_debug(2,"augment-substmt -> notification-stmt");} 
-              |                      { clicon_debug(2,"augment-substmt -> "); }
-              ;
-
-/* when */
-when_stmt   : K_WHEN string ';' 
-	       { if (ysp_add(_yy, Y_WHEN, $2, NULL) == NULL) _YYERROR("36"); 
-			   clicon_debug(2,"when-stmt -> WHEN string ;"); }
-              | K_WHEN string
-                          { if (ysp_add_push(_yy, Y_WHEN, $2) == NULL) _YYERROR("37"); }
-	       '{' when_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("38");
-			     clicon_debug(2,"when-stmt -> WHEN string { when-substmts }"); }
-              ;
-
-when_substmts : when_substmts when_substmt 
-                      { clicon_debug(2,"when-substmts -> when-substmts when-substmt"); }
-              | when_substmt 
-                      { clicon_debug(2,"when-substmts -> when-substmt"); }
-              ;
-
-when_substmt  : description_stmt { clicon_debug(2,"when-substmt -> description-stmt"); }
-              | reference_stmt   { clicon_debug(2,"when-substmt -> reference-stmt"); }
-              |                  { clicon_debug(2,"when-substmt -> "); }
-              ;
-
-/* rpc */
-rpc_stmt   : K_RPC id_arg_str ';' 
-	       { if (ysp_add(_yy, Y_RPC, $2, NULL) == NULL) _YYERROR("39"); 
-			   clicon_debug(2,"rpc-stmt -> RPC id-arg-str ;"); }
-              | K_RPC id_arg_str
-                          { if (ysp_add_push(_yy, Y_RPC, $2) == NULL) _YYERROR("40"); }
-	       '{' rpc_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("41");
-			     clicon_debug(2,"rpc-stmt -> RPC id-arg-str { rpc-substmts }"); }
-              ;
-
-rpc_substmts : rpc_substmts rpc_substmt 
-                      { clicon_debug(2,"rpc-substmts -> rpc-substmts rpc-substmt"); }
-              | rpc_substmt 
-                      { clicon_debug(2,"rpc-substmts -> rpc-substmt"); }
-              ;
-
-rpc_substmt   : if_feature_stmt  { clicon_debug(2,"rpc-substmt -> if-feature-stmt"); }
-              | status_stmt      { clicon_debug(2,"rpc-substmt -> status-stmt"); }
-              | description_stmt { clicon_debug(2,"rpc-substmt -> description-stmt"); }
-              | reference_stmt   { clicon_debug(2,"rpc-substmt -> reference-stmt"); }
-              | typedef_stmt     { clicon_debug(2,"rpc-substmt -> typedef-stmt"); }
-              | grouping_stmt    { clicon_debug(2,"rpc-substmt -> grouping-stmt"); }
-              | input_stmt       { clicon_debug(2,"rpc-substmt -> input-stmt"); }
-              | output_stmt      { clicon_debug(2,"rpc-substmt -> output-stmt"); }
-              |                  { clicon_debug(2,"rpc-substmt -> "); }
-              ;
-
-/* action */
-action_stmt   : K_ACTION id_arg_str ';' 
-	       { if (ysp_add(_yy, Y_ACTION, $2, NULL) == NULL) _YYERROR("39"); 
-			   clicon_debug(2,"action-stmt -> ACTION id-arg-str ;"); }
-              | K_ACTION id_arg_str
-                          { if (ysp_add_push(_yy, Y_ACTION, $2) == NULL) _YYERROR("40"); }
-	       '{' rpc_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("41");
-			     clicon_debug(2,"action-stmt -> ACTION id-arg-str { rpc-substmts }"); }
-              ;
-
-/* input */
-input_stmt  : K_INPUT 
-                          { if (ysp_add_push(_yy, Y_INPUT, NULL) == NULL) _YYERROR("42"); }
-	       '{' input_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("43");
-			     clicon_debug(2,"input-stmt -> INPUT { input-substmts }"); }
-              ;
-
-input_substmts : input_substmts input_substmt 
-                      { clicon_debug(2,"input-substmts -> input-substmts input-substmt"); }
-              | input_substmt 
-                      { clicon_debug(2,"input-substmts -> input-substmt"); }
-              ;
-
-input_substmt : typedef_stmt         { clicon_debug(2,"input-substmt -> typedef-stmt"); }
-              | grouping_stmt        { clicon_debug(2,"input-substmt -> grouping-stmt"); }
-              | data_def_stmt        { clicon_debug(2,"input-substmt -> data-def-stmt"); }
-              |                      { clicon_debug(2,"input-substmt -> "); }
-              ;
-
-/* output */
-output_stmt  : K_OUTPUT  /* XXX reuse input-substatements since they are same */
-                          { if (ysp_add_push(_yy, Y_OUTPUT, NULL) == NULL) _YYERROR("44"); }
-	       '{' input_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("45");
-			     clicon_debug(2,"output-stmt -> OUTPUT { input-substmts }"); }
-              ;
-
-
-/* notification */
-notification_stmt : K_NOTIFICATION id_arg_str ';' 
-	                { if (ysp_add(_yy, Y_NOTIFICATION, $2, NULL) == NULL) _YYERROR("46"); 
-			   clicon_debug(2,"notification-stmt -> NOTIFICATION id-arg-str ;"); }
-                  | K_NOTIFICATION id_arg_str
-                        { if (ysp_add_push(_yy, Y_NOTIFICATION, $2) == NULL) _YYERROR("47"); }
-	            '{' notification_substmts '}' 
-                        { if (ystack_pop(_yy) < 0) _YYERROR("48");
-			     clicon_debug(2,"notification-stmt -> NOTIFICATION id-arg-str { notification-substmts }"); }
-                  ;
-
-notification_substmts : notification_substmts notification_substmt 
-                         { clicon_debug(2,"notification-substmts -> notification-substmts notification-substmt"); }
-                      | notification_substmt 
-                         { clicon_debug(2,"notification-substmts -> notification-substmt"); }
-                      ;
-
-notification_substmt : if_feature_stmt  { clicon_debug(2,"notification-substmt -> if-feature-stmt"); }
-                     | must_stmt        { clicon_debug(2,"notification-substmt -> must-stmt"); }
-                     | status_stmt      { clicon_debug(2,"notification-substmt -> status-stmt"); }
-                     | description_stmt { clicon_debug(2,"notification-substmt -> description-stmt"); }
-                     | reference_stmt   { clicon_debug(2,"notification-substmt -> reference-stmt"); }
-                     | typedef_stmt     { clicon_debug(2,"notification-substmt -> typedef-stmt"); }
-                     | grouping_stmt    { clicon_debug(2,"notification-substmt -> grouping-stmt"); }
-                     | data_def_stmt    { clicon_debug(2,"notification-substmt -> data-def-stmt"); }
-                     |                  { clicon_debug(2,"notification-substmt -> "); }
-                     ;
-
 /* Typedef */
-typedef_stmt  : K_TYPEDEF id_arg_str 
+typedef_stmt  : K_TYPEDEF identifier_str 
                           { if (ysp_add_push(_yy, Y_TYPEDEF, $2) == NULL) _YYERROR("46"); }
 	       '{' typedef_substmts '}' 
                            { if (ystack_pop(_yy) < 0) _YYERROR("47");
@@ -949,10 +698,10 @@ typedef_substmt : type_stmt          { clicon_debug(2,"typedef-substmt -> type-s
               ;
 
 /* Type */
-type_stmt     : K_TYPE identifier_ref_arg_str ';' 
+type_stmt     : K_TYPE identifier_ref_str ';' 
 	       { if (ysp_add(_yy, Y_TYPE, $2, NULL) == NULL) _YYERROR("48"); 
 			   clicon_debug(2,"type-stmt -> TYPE identifier-ref-arg-str ;");}
-              | K_TYPE identifier_ref_arg_str 
+              | K_TYPE identifier_ref_str
                          { if (ysp_add_push(_yy, Y_TYPE, $2) == NULL) _YYERROR("49"); 
 			 }
                 '{' type_body_stmts '}'
@@ -966,8 +715,8 @@ type_stmt     : K_TYPE identifier_ref_arg_str ';'
  */
 type_body_stmts : type_body_stmts type_body_stmt
                          { clicon_debug(2,"type-body-stmts -> type-body-stmts type-body-stmt"); }
-              | type_body_stmt
-                         { clicon_debug(2,"type-body-stmts -> type-body-stmt"); }
+              | 
+                         { clicon_debug(2,"type-body-stmts -> "); }
               ;
 
 type_body_stmt/* numerical-restrictions */ 
@@ -991,31 +740,40 @@ type_body_stmt/* numerical-restrictions */
               | type_stmt              { clicon_debug(2,"type-body-stmt -> type-stmt"); }
               ;
 
+/* range-stmt */
+range_stmt   : K_RANGE string ';' /* XXX range-arg-str */
+	       { if (ysp_add(_yy, Y_RANGE, $2, NULL) == NULL) _YYERROR("68"); 
+			   clicon_debug(2,"range-stmt -> RANGE string ;"); }
 
-
-/* Grouping */
-grouping_stmt  : K_GROUPING id_arg_str 
-                          { if (ysp_add_push(_yy, Y_GROUPING, $2) == NULL) _YYERROR("51"); }
-	       '{' grouping_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("52");
-			     clicon_debug(2,"grouping-stmt -> GROUPING id-arg-str { grouping-substmts }"); }
+              | K_RANGE string
+	                  { if (ysp_add_push(_yy, Y_RANGE, $2) == NULL) _YYERROR("69"); }
+	       '{' range_substmts '}' 
+                          { if (ystack_pop(_yy) < 0) _YYERROR("70");
+			     clicon_debug(2,"range-stmt -> RANGE string { range-substmts }"); }
               ;
 
-grouping_substmts : grouping_substmts grouping_substmt 
-                      { clicon_debug(2,"grouping-substmts -> grouping-substmts grouping-substmt"); }
-              | grouping_substmt 
-                      { clicon_debug(2,"grouping-substmts -> grouping-substmt"); }
+range_substmts : range_substmts range_substmt 
+                      { clicon_debug(2,"range-substmts -> range-substmts range-substmt"); }
+              | range_substmt 
+                      { clicon_debug(2,"range-substmts -> range-substmt"); }
               ;
 
-grouping_substmt : status_stmt          { clicon_debug(2,"grouping-substmt -> status-stmt"); }
-              | description_stmt     { clicon_debug(2,"grouping-substmt -> description-stmt"); }
-              | reference_stmt       { clicon_debug(2,"grouping-substmt -> reference-stmt"); }
-              | typedef_stmt         { clicon_debug(2,"grouping-substmt -> typedef-stmt"); }
-              | grouping_stmt        { clicon_debug(2,"grouping-substmt -> grouping-stmt"); }
-              | data_def_stmt        { clicon_debug(2,"grouping-substmt -> data-def-stmt"); }
-              | action_stmt          { clicon_debug(2,"grouping-substmt -> action-stmt"); }
-              | notification_stmt    { clicon_debug(2,"grouping-substmt -> notification-stmt"); }
-              |                      { clicon_debug(2,"grouping-substmt -> "); }
+range_substmt : error_message_stmt   { clicon_debug(2,"range-substmt -> error-message-stmt");} 
+              | description_stmt     { clicon_debug(2,"range-substmt -> description-stmt"); }
+              | reference_stmt       { clicon_debug(2,"range-substmt -> reference-stmt"); }
+              | unknown_stmt         { clicon_debug(2,"range-substmt -> unknown-stmt");} 
+              |                      { clicon_debug(2,"range-substmt -> "); }
+              ;
+
+/* fraction-digits-stmt = fraction-digits-keyword fraction-digits-arg-str */
+fraction_digits_stmt : K_FRACTION_DIGITS string stmtend 
+		{ if (ysp_add(_yy, Y_FRACTION_DIGITS, $2, NULL) == NULL) _YYERROR("84"); 
+                            clicon_debug(2,"fraction-digits-stmt -> FRACTION-DIGITS string"); }
+              ;
+
+/* meta */
+meta_stmts    : meta_stmts meta_stmt { clicon_debug(2,"meta-stmts -> meta-stmts meta-stmt"); }
+              | meta_stmt            { clicon_debug(2,"meta-stmts -> meta-stmt"); }
               ;
 
 /* length-stmt */
@@ -1067,113 +825,12 @@ pattern_substmt : reference_stmt     { clicon_debug(2,"pattern-substmt -> refere
               |                      { clicon_debug(2,"pattern-substmt -> "); }
               ;
 
-/* Extension */
-extension_stmt: K_EXTENSION id_arg_str ';' 
-	       { if (ysp_add(_yy, Y_EXTENSION, $2, NULL) == NULL) _YYERROR("59");
-                    clicon_debug(2,"extenstion-stmt -> EXTENSION id-arg-str ;"); }
-              | K_EXTENSION id_arg_str 
- 	          { if (ysp_add_push(_yy, Y_EXTENSION, $2) == NULL) _YYERROR("60"); }
-	       '{' extension_substmts '}' 
-	       { if (ystack_pop(_yy) < 0) _YYERROR("61");
-                    clicon_debug(2,"extension-stmt -> FEATURE id-arg-str { extension-substmts }"); }
-	      ;
-
-
-/* extension substmts */
-extension_substmts : extension_substmts extension_substmt 
-                  { clicon_debug(2,"extension-substmts -> extension-substmts extension-substmt"); }
-              | extension_substmt 
-                  { clicon_debug(2,"extension-substmts -> extension-substmt"); }
+default_stmt  : K_DEFAULT string ';'
+		{ if (ysp_add(_yy, Y_DEFAULT, $2, NULL)== NULL) _YYERROR("94"); 
+                            clicon_debug(2,"default-stmt -> DEFAULT string"); }
               ;
 
-extension_substmt : argument_stmt    { clicon_debug(2,"extension-substmt -> argument-stmt"); }
-              | status_stmt          { clicon_debug(2,"extension-substmt -> status-stmt"); }
-              | description_stmt     { clicon_debug(2,"extension-substmt -> description-stmt"); }
-              | reference_stmt       { clicon_debug(2,"extension-substmt -> reference-stmt"); }
-              | unknown_stmt         { clicon_debug(2,"extension-substmt -> unknown-stmt");} 
-              |                      { clicon_debug(2,"extension-substmt -> "); }
-              ;
 
-argument_stmt  : K_ARGUMENT id_arg_str ';'     { free($2); }
-               | K_ARGUMENT id_arg_str '{' '}' { free($2); }
-               ;
-
-/* Feature */
-feature_stmt  : K_FEATURE id_arg_str ';' 
-	       { if (ysp_add(_yy, Y_FEATURE, $2, NULL) == NULL) _YYERROR("62");
-		      clicon_debug(2,"feature-stmt -> FEATURE id-arg-str ;"); }
-              | K_FEATURE id_arg_str
-                  { if (ysp_add_push(_yy, Y_FEATURE, $2) == NULL) _YYERROR("63"); }
-              '{' feature_substmts '}' 
-                  { if (ystack_pop(_yy) < 0) _YYERROR("64");
-                    clicon_debug(2,"feature-stmt -> FEATURE id-arg-str { feature-substmts }"); }
-              ;
-
-/* feature substmts */
-feature_substmts : feature_substmts feature_substmt 
-                      { clicon_debug(2,"feature-substmts -> feature-substmts feature-substmt"); }
-              | feature_substmt 
-                      { clicon_debug(2,"feature-substmts -> feature-substmt"); }
-              ;
-
-feature_substmt : if_feature_stmt    { clicon_debug(2,"feature-substmt -> if-feature-stmt"); }
-              | status_stmt          { clicon_debug(2,"feature-substmt -> status-stmt"); }
-              | description_stmt     { clicon_debug(2,"feature-substmt -> description-stmt"); }
-              | reference_stmt       { clicon_debug(2,"feature-substmt -> reference-stmt"); }
-              | unknown_stmt         { clicon_debug(2,"feature-substmt -> unknown-stmt");} 
-              |                      { clicon_debug(2,"feature-substmt -> "); }
-              ;
-
-/* Identity */
-identity_stmt  : K_IDENTITY string ';' /* XXX identifier-arg-str */
-	      { if (ysp_add(_yy, Y_IDENTITY, $2, NULL) == NULL) _YYERROR("65"); 
-			   clicon_debug(2,"identity-stmt -> IDENTITY string ;"); }
-
-              | K_IDENTITY string
-                          { if (ysp_add_push(_yy, Y_IDENTITY, $2) == NULL) _YYERROR("66"); }
-	       '{' identity_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("67");
-			     clicon_debug(2,"identity-stmt -> IDENTITY string { identity-substmts }"); }
-              ;
-
-identity_substmts : identity_substmts identity_substmt 
-                      { clicon_debug(2,"identity-substmts -> identity-substmts identity-substmt"); }
-              | identity_substmt 
-                      { clicon_debug(2,"identity-substmts -> identity-substmt"); }
-              ;
-
-identity_substmt : base_stmt         { clicon_debug(2,"identity-substmt -> base-stmt"); }
-              | status_stmt          { clicon_debug(2,"identity-substmt -> status-stmt"); }
-              | description_stmt     { clicon_debug(2,"identity-substmt -> description-stmt"); }
-              | reference_stmt       { clicon_debug(2,"identity-substmt -> reference-stmt"); }
-              | unknown_stmt         { clicon_debug(2,"identity-substmt -> unknown-stmt");} 
-              |                      { clicon_debug(2,"identity-substmt -> "); }
-              ;
-
-/* range-stmt */
-range_stmt   : K_RANGE string ';' /* XXX range-arg-str */
-	       { if (ysp_add(_yy, Y_RANGE, $2, NULL) == NULL) _YYERROR("68"); 
-			   clicon_debug(2,"range-stmt -> RANGE string ;"); }
-
-              | K_RANGE string
-	                  { if (ysp_add_push(_yy, Y_RANGE, $2) == NULL) _YYERROR("69"); }
-	       '{' range_substmts '}' 
-                          { if (ystack_pop(_yy) < 0) _YYERROR("70");
-			     clicon_debug(2,"range-stmt -> RANGE string { range-substmts }"); }
-              ;
-
-range_substmts : range_substmts range_substmt 
-                      { clicon_debug(2,"range-substmts -> range-substmts range-substmt"); }
-              | range_substmt 
-                      { clicon_debug(2,"range-substmts -> range-substmt"); }
-              ;
-
-range_substmt : error_message_stmt   { clicon_debug(2,"range-substmt -> error-message-stmt");} 
-              | description_stmt     { clicon_debug(2,"range-substmt -> description-stmt"); }
-              | reference_stmt       { clicon_debug(2,"range-substmt -> reference-stmt"); }
-              | unknown_stmt         { clicon_debug(2,"range-substmt -> unknown-stmt");} 
-              |                      { clicon_debug(2,"range-substmt -> "); }
-              ;
 
 /* enum-stmt */
 enum_stmt     : K_ENUM string ';'
@@ -1200,11 +857,21 @@ enum_substmt  : value_stmt           { clicon_debug(2,"enum-substmt -> value-stm
               |                      { clicon_debug(2,"enum-substmt -> "); }
               ;
 
+path_stmt     : K_PATH string ';' /* XXX: path-arg-str */
+		{ if (ysp_add(_yy, Y_PATH, $2, NULL)== NULL) _YYERROR("91"); 
+                            clicon_debug(2,"path-stmt -> PATH string"); }
+              ;
+
+require_instance_stmt : K_REQUIRE_INSTANCE bool_str ';' 
+		{ if (ysp_add(_yy, Y_REQUIRE_INSTANCE, $2, NULL)== NULL) _YYERROR("92"); 
+                            clicon_debug(2,"require-instance-stmt -> REQUIRE-INSTANCE string"); }
+              ;
+
 /* bit-stmt */
-bit_stmt     : K_BIT string ';'
+bit_stmt     : K_BIT identifier_str ';'
 	       { if (ysp_add(_yy, Y_BIT, $2, NULL) == NULL) _YYERROR("74"); 
 			   clicon_debug(2,"bit-stmt -> BIT string ;"); }
-              | K_BIT string
+              | K_BIT identifier_str
                          { if (ysp_add_push(_yy, Y_BIT, $2) == NULL) _YYERROR("75"); }
 	       '{' bit_substmts '}' 
                          { if (ystack_pop(_yy) < 0) _YYERROR("76");
@@ -1224,7 +891,44 @@ bit_substmt   : position_stmt        { clicon_debug(2,"bit-substmt -> positition
               |                      { clicon_debug(2,"bit-substmt -> "); }
               ;
 
-/* mus-stmt */
+/* position-stmt = position-keyword position-value-arg-str */
+position_stmt : K_POSITION integer_value_str stmtend 
+		{ if (ysp_add(_yy, Y_POSITION, $2, NULL) == NULL) _YYERROR("87"); 
+                            clicon_debug(2,"position-stmt -> POSITION integer-value"); }
+              ;
+
+/* status-stmt = status-keyword sep status-arg-str XXX: current-keyword*/
+status_stmt   : K_STATUS string stmtend
+		{ if (ysp_add(_yy, Y_STATUS, $2, NULL) == NULL) _YYERROR("88"); 
+                            clicon_debug(2,"status-stmt -> STATUS string"); }
+              ;
+
+config_stmt   : K_CONFIG bool_str ';' 
+		{ if (ysp_add(_yy, Y_CONFIG, $2, NULL) == NULL) _YYERROR("89"); 
+                            clicon_debug(2,"config-stmt -> CONFIG config-arg-str"); }
+              ;
+
+/* mandatory-stmt = mandatory-keyword mandatory-arg-str */
+mandatory_stmt: K_MANDATORY bool_str ';' 
+                         { yang_stmt *ys;
+			     if ((ys = ysp_add(_yy, Y_MANDATORY, $2, NULL))== NULL) _YYERROR("106"); 
+			   clicon_debug(2,"mandatory-stmt -> MANDATORY mandatory-arg-str ;");}
+              ;
+
+presence_stmt: K_PRESENCE string ';' 
+                         { yang_stmt *ys;
+			     if ((ys = ysp_add(_yy, Y_PRESENCE, $2, NULL))== NULL) _YYERROR("107"); 
+			   clicon_debug(2,"presence-stmt -> PRESENCE string ;");}
+              ;
+
+/* ordered-by-stmt = ordered-by-keyword sep ordered-by-arg-str */
+ordered_by_stmt: K_ORDERED_BY string stmtend
+                         { yang_stmt *ys;
+			     if ((ys = ysp_add(_yy, Y_ORDERED_BY, $2, NULL))== NULL) _YYERROR("108"); 
+			   clicon_debug(2,"ordered-by-stmt -> ORDERED-BY ordered-by-arg ;");}
+              ;
+
+/* must-stmt */
 must_stmt     : K_MUST string ';'
 	       { if (ysp_add(_yy, Y_MUST, $2, NULL) == NULL) _YYERROR("77"); 
 			   clicon_debug(2,"must-stmt -> MUST string ;"); }
@@ -1251,194 +955,571 @@ must_substmt  : error_message_stmt   { clicon_debug(2,"must-substmt -> error-mes
 /* error-message-stmt */
 error_message_stmt   : K_ERROR_MESSAGE string ';'
 	       { if (ysp_add(_yy, Y_ERROR_MESSAGE, $2, NULL) == NULL) _YYERROR("80"); }
+               ;
 
-/* import */
-import_stmt   : K_IMPORT id_arg_str 
-                          { if (ysp_add_push(_yy, Y_IMPORT, $2) == NULL) _YYERROR("81"); }
-                '{' import_substmts '}' 
-                        { if (ystack_pop(_yy) < 0) _YYERROR("82");
-			  clicon_debug(2,"import-stmt -> IMPORT id-arg-str { import-substmts }");} 
-              ;
+/* XXX error-app-tag-stmt */
 
-import_substmts : import_substmts import_substmt 
-                      { clicon_debug(2,"import-substmts -> import-substmts import-substm");} 
-              | import_substmt 
-                      { clicon_debug(2,"import-substmts ->");} 
-              ;
-
-import_substmt : prefix_stmt {  clicon_debug(2,"import-stmt -> prefix-stmt"); }
-              |  revision_date_stmt {  clicon_debug(2,"import-stmt -> revision-date-stmt"); }
-              ;
-
-
-/* Simple statements */
-yang_version_stmt  : K_YANG_VERSION string ';' /* XXX yang-version-arg-str */
-		{ if (ysp_add(_yy, Y_YANG_VERSION, $2, NULL) == NULL) _YYERROR("83");
-                            clicon_debug(2,"yang-version-stmt -> YANG-VERSION string"); }
-              ;
-
-fraction_digits_stmt : K_FRACTION_DIGITS string ';' /* XXX: fraction-digits-arg-str */
-		{ if (ysp_add(_yy, Y_FRACTION_DIGITS, $2, NULL) == NULL) _YYERROR("84"); 
-                            clicon_debug(2,"fraction-digits-stmt -> FRACTION-DIGITS string"); }
-              ;
-
-if_feature_stmt : K_IF_FEATURE identifier_ref_arg_str ';' 
-		{ if (ysp_add(_yy, Y_IF_FEATURE, $2, NULL) == NULL) _YYERROR("85"); 
-                            clicon_debug(2,"if-feature-stmt -> IF-FEATURE identifier-ref-arg-str"); }
-              ;
-
-value_stmt   : K_VALUE integer_value ';' 
-		{ if (ysp_add(_yy, Y_VALUE, $2, NULL) == NULL) _YYERROR("86"); 
-                            clicon_debug(2,"value-stmt -> VALUE integer-value"); }
-              ;
-
-position_stmt : K_POSITION integer_value ';' 
-		{ if (ysp_add(_yy, Y_POSITION, $2, NULL) == NULL) _YYERROR("87"); 
-                            clicon_debug(2,"position-stmt -> POSITION integer-value"); }
-              ;
-
-status_stmt   : K_STATUS string ';' /* XXX: status-arg-str */
-		{ if (ysp_add(_yy, Y_STATUS, $2, NULL) == NULL) _YYERROR("88"); 
-                            clicon_debug(2,"status-stmt -> STATUS string"); }
-              ;
-
-config_stmt   : K_CONFIG config_arg_str ';' 
-		{ if (ysp_add(_yy, Y_CONFIG, $2, NULL) == NULL) _YYERROR("89"); 
-                            clicon_debug(2,"config-stmt -> CONFIG config-arg-str"); }
-              ;
-
-
-base_stmt     : K_BASE identifier_ref_arg_str ';' 
-		{ if (ysp_add(_yy, Y_BASE, $2, NULL)== NULL) _YYERROR("90"); 
-                            clicon_debug(2,"base-stmt -> BASE identifier-ref-arg-str"); }
-              ;
-
-path_stmt     : K_PATH string ';' /* XXX: path-arg-str */
-		{ if (ysp_add(_yy, Y_PATH, $2, NULL)== NULL) _YYERROR("91"); 
-                            clicon_debug(2,"path-stmt -> PATH string"); }
-              ;
-
-require_instance_stmt : K_REQUIRE_INSTANCE string ';' /* XXX: require-instance-arg-str */
-		{ if (ysp_add(_yy, Y_REQUIRE_INSTANCE, $2, NULL)== NULL) _YYERROR("92"); 
-                            clicon_debug(2,"require-instance-stmt -> REQUIRE-INSTANCE string"); }
-              ;
-
-units_stmt    : K_UNITS string ';'
-		{ if (ysp_add(_yy, Y_UNITS, $2, NULL)== NULL) _YYERROR("93"); 
-                            clicon_debug(2,"units-stmt -> UNITS string"); }
-              ;
-
-default_stmt  : K_DEFAULT string ';'
-		{ if (ysp_add(_yy, Y_DEFAULT, $2, NULL)== NULL) _YYERROR("94"); 
-                            clicon_debug(2,"default-stmt -> DEFAULT string"); }
-              ;
-
-contact_stmt  : K_CONTACT string ';'
-		{ if (ysp_add(_yy, Y_CONTACT, $2, NULL)== NULL) _YYERROR("95"); 
-                            clicon_debug(2,"contact-stmt -> CONTACT string"); }
-              ;
-
-revision_date_stmt : K_REVISION_DATE string ';'  /* XXX date-arg-str */
-		{ if (ysp_add(_yy, Y_REVISION_DATE, $2, NULL) == NULL) _YYERROR("96"); 
-			 clicon_debug(2,"revision-date-stmt -> date;"); }
-              ;
-
-include_stmt  : K_INCLUDE id_arg_str ';'
-		{ if (ysp_add(_yy, Y_INCLUDE, $2, NULL)== NULL) _YYERROR("97"); 
-                           clicon_debug(2,"include-stmt -> id-arg-str"); }
-              | K_INCLUDE id_arg_str '{' revision_date_stmt '}'
-		{ if (ysp_add(_yy, Y_INCLUDE, $2, NULL)== NULL) _YYERROR("98"); 
-                           clicon_debug(2,"include-stmt -> id-arg-str { revision-date-stmt }"); }
-              ;
-
-namespace_stmt : K_NAMESPACE string ';'  /* XXX uri-str */
-		{ if (ysp_add(_yy, Y_NAMESPACE, $2, NULL)== NULL) _YYERROR("99"); 
-                            clicon_debug(2,"namespace-stmt -> NAMESPACE string"); }
-              ;
-
-prefix_stmt   : K_PREFIX string ';' /* XXX prefix-arg-str */
-		{ if (ysp_add(_yy, Y_PREFIX, $2, NULL)== NULL) _YYERROR("100"); 
-			     clicon_debug(2,"prefix-stmt -> PREFIX string ;");}
-              ;
-
-belongs_to_stmt : K_BELONGS_TO  id_arg_str ';' 
-
-                 { if (ysp_add(_yy, Y_BELONGS_TO, $2, NULL)== NULL) _YYERROR("100"); 
-			     clicon_debug(2,"belongs-to-stmt -> BELONGS-TO id-arg-str ;");}
-                | K_BELONGS_TO  id_arg_str '{' prefix_stmt '}'
-				{ if (ysp_add(_yy, Y_BELONGS_TO, $2, NULL)== NULL) _YYERROR("98"); 
-			     clicon_debug(2,"belongs-to-stmt -> BELONGS-TO id-arg-str { prefix-stmt } ");}
-              ;
-
-description_stmt: K_DESCRIPTION string ';' 
-		{ if (ysp_add(_yy, Y_DESCRIPTION, $2, NULL)== NULL) _YYERROR("101"); 
-			   clicon_debug(2,"description-stmt -> DESCRIPTION string ;");}
-              ;
-
-organization_stmt: K_ORGANIZATION string ';'
-		{ if (ysp_add(_yy, Y_ORGANIZATION, $2, NULL)== NULL) _YYERROR("102"); 
-			   clicon_debug(2,"organization-stmt -> ORGANIZATION string ;");}
-              ;
-
-min_elements_stmt: K_MIN_ELEMENTS integer_value ';'
+/* min-elements-stmt = min-elements-keyword min-value-arg-str */
+min_elements_stmt: K_MIN_ELEMENTS integer_value_str stmtend
 		{ if (ysp_add(_yy, Y_MIN_ELEMENTS, $2, NULL)== NULL) _YYERROR("103"); 
 			   clicon_debug(2,"min-elements-stmt -> MIN-ELEMENTS integer ;");}
               ;
 
-max_elements_stmt: K_MAX_ELEMENTS integer_value ';'
+/* max-elements-stmt   = max-elements-keyword ("unbounded"|integer-value) 
+ * XXX cannot use integer-value
+ */
+max_elements_stmt: K_MAX_ELEMENTS string ';'
 		{ if (ysp_add(_yy, Y_MAX_ELEMENTS, $2, NULL)== NULL) _YYERROR("104"); 
 			   clicon_debug(2,"max-elements-stmt -> MIN-ELEMENTS integer ;");}
               ;
 
-reference_stmt: K_REFERENCE string ';'
-		{ if (ysp_add(_yy, Y_REFERENCE, $2, NULL)== NULL) _YYERROR("105"); 
-			   clicon_debug(2,"reference-stmt -> REFERENCE string ;");}
+value_stmt   : K_VALUE integer_value_str ';' 
+		{ if (ysp_add(_yy, Y_VALUE, $2, NULL) == NULL) _YYERROR("86"); 
+                            clicon_debug(2,"value-stmt -> VALUE integer-value"); }
               ;
 
-mandatory_stmt: K_MANDATORY string ';' 
-                         { yang_stmt *ys;
-			     if ((ys = ysp_add(_yy, Y_MANDATORY, $2, NULL))== NULL) _YYERROR("106"); 
-			   clicon_debug(2,"mandatory-stmt -> MANDATORY mandatory-arg-str ;");}
+/* Grouping */
+grouping_stmt  : K_GROUPING identifier_str 
+                          { if (ysp_add_push(_yy, Y_GROUPING, $2) == NULL) _YYERROR("51"); }
+	       '{' grouping_substmts '}' 
+                           { if (ystack_pop(_yy) < 0) _YYERROR("52");
+			     clicon_debug(2,"grouping-stmt -> GROUPING id-arg-str { grouping-substmts }"); }
               ;
 
-presence_stmt: K_PRESENCE string ';' 
-                         { yang_stmt *ys;
-			     if ((ys = ysp_add(_yy, Y_PRESENCE, $2, NULL))== NULL) _YYERROR("107"); 
-			   clicon_debug(2,"presence-stmt -> PRESENCE string ;");}
+grouping_substmts : grouping_substmts grouping_substmt 
+                      { clicon_debug(2,"grouping-substmts -> grouping-substmts grouping-substmt"); }
+              | grouping_substmt 
+                      { clicon_debug(2,"grouping-substmts -> grouping-substmt"); }
               ;
 
-ordered_by_stmt: K_ORDERED_BY string ';' 
-                         { yang_stmt *ys;
-			     if ((ys = ysp_add(_yy, Y_ORDERED_BY, $2, NULL))== NULL) _YYERROR("108"); 
-			   clicon_debug(2,"ordered-by-stmt -> ORDERED-BY ordered-by-arg ;");}
+grouping_substmt : status_stmt          { clicon_debug(2,"grouping-substmt -> status-stmt"); }
+              | description_stmt     { clicon_debug(2,"grouping-substmt -> description-stmt"); }
+              | reference_stmt       { clicon_debug(2,"grouping-substmt -> reference-stmt"); }
+              | typedef_stmt         { clicon_debug(2,"grouping-substmt -> typedef-stmt"); }
+              | grouping_stmt        { clicon_debug(2,"grouping-substmt -> grouping-stmt"); }
+              | data_def_stmt        { clicon_debug(2,"grouping-substmt -> data-def-stmt"); }
+              | action_stmt          { clicon_debug(2,"grouping-substmt -> action-stmt"); }
+              | notification_stmt    { clicon_debug(2,"grouping-substmt -> notification-stmt"); }
+              |                      { clicon_debug(2,"grouping-substmt -> "); }
               ;
 
-key_stmt      : K_KEY id_arg_str ';' /* XXX key_arg_str */
+
+/* container */
+container_stmt : K_CONTAINER identifier_str ';'
+		{ if (ysp_add(_yy, Y_CONTAINER, $2, NULL) == NULL) _YYERROR("7"); 
+                             clicon_debug(2,"container-stmt -> CONTAINER id-arg-str ;");}
+              | K_CONTAINER identifier_str 
+                          { if (ysp_add_push(_yy, Y_CONTAINER, $2) == NULL) _YYERROR("8"); }
+                '{' container_substmts '}'
+                           { if (ystack_pop(_yy) < 0) _YYERROR("9");
+                             clicon_debug(2,"container-stmt -> CONTAINER id-arg-str { container-substmts }");}
+              ;
+
+container_substmts : container_substmts container_substmt 
+              | container_substmt 
+              ;
+
+container_substmt : when_stmt       { clicon_debug(2,"container-substmt -> when-stmt"); }
+              | if_feature_stmt     { clicon_debug(2,"container-substmt -> if-feature-stmt"); }
+              | must_stmt           { clicon_debug(2,"container-substmt -> must-stmt"); }
+              | presence_stmt       { clicon_debug(2,"container-substmt -> presence-stmt"); }
+              | config_stmt         { clicon_debug(2,"container-substmt -> config-stmt"); }
+              | status_stmt         { clicon_debug(2,"container-substmt -> status-stmt"); }
+              | description_stmt    { clicon_debug(2,"container-substmt -> description-stmt");} 
+              | reference_stmt      { clicon_debug(2,"container-substmt -> reference-stmt"); }
+              | typedef_stmt        { clicon_debug(2,"container-substmt -> typedef-stmt"); }
+              | grouping_stmt       { clicon_debug(2,"container-substmt -> grouping-stmt"); }
+              | data_def_stmt       { clicon_debug(2,"container-substmt -> data-def-stmt");}
+              | action_stmt         { clicon_debug(2,"container-substmt -> action-stmt");} 
+              | notification_stmt   { clicon_debug(2,"container-substmt -> notification-stmt");} 
+              | unknown_stmt        { clicon_debug(2,"container-substmt -> unknown-stmt");} 
+              |                     { clicon_debug(2,"container-substmt ->");} 
+              ;
+
+/* leaf */
+leaf_stmt     : K_LEAF identifier_str ';'
+		{ if (ysp_add(_yy, Y_LEAF, $2, NULL) == NULL) _YYERROR("10"); 
+			   clicon_debug(2,"leaf-stmt -> LEAF id-arg-str ;");}
+              | K_LEAF identifier_str 
+                          { if (ysp_add_push(_yy, Y_LEAF, $2) == NULL) _YYERROR("11"); }
+                '{' leaf_substmts '}' 
+                           { if (ystack_pop(_yy) < 0) _YYERROR("12");
+                             clicon_debug(2,"leaf-stmt -> LEAF id-arg-str { lead-substmts }");}
+              ;
+
+leaf_substmts : leaf_substmts leaf_substmt
+              | leaf_substmt
+              ;
+
+leaf_substmt  : when_stmt            { clicon_debug(2,"leaf-substmt -> when-stmt"); }
+              | if_feature_stmt      { clicon_debug(2,"leaf-substmt -> if-feature-stmt"); }
+              | type_stmt            { clicon_debug(2,"leaf-substmt -> type-stmt"); }
+              | units_stmt           { clicon_debug(2,"leaf-substmt -> units-stmt"); }
+              | must_stmt            { clicon_debug(2,"leaf-substmt -> must-stmt"); }
+              | default_stmt         { clicon_debug(2,"leaf-substmt -> default-stmt"); }
+              | config_stmt          { clicon_debug(2,"leaf-substmt -> config-stmt"); }
+              | mandatory_stmt       { clicon_debug(2,"leaf-substmt -> mandatory-stmt"); }
+              | status_stmt          { clicon_debug(2,"leaf-substmt -> status-stmt"); }
+              | description_stmt     { clicon_debug(2,"leaf-substmt -> description-stmt"); }
+              | reference_stmt       { clicon_debug(2,"leaf-substmt -> reference-stmt"); }
+              | unknown_stmt         { clicon_debug(2,"leaf-substmt -> unknown-stmt");} 
+              |                      { clicon_debug(2,"leaf-substmt ->"); }
+              ;
+
+/* leaf-list */
+leaf_list_stmt : K_LEAF_LIST identifier_str ';'
+		{ if (ysp_add(_yy, Y_LEAF_LIST, $2, NULL) == NULL) _YYERROR("13"); 
+			   clicon_debug(2,"leaf-list-stmt -> LEAF id-arg-str ;");}
+              | K_LEAF_LIST identifier_str
+                          { if (ysp_add_push(_yy, Y_LEAF_LIST, $2) == NULL) _YYERROR("14"); }
+                '{' leaf_list_substmts '}'
+                           { if (ystack_pop(_yy) < 0) _YYERROR("15");
+                             clicon_debug(2,"leaf-list-stmt -> LEAF-LIST id-arg-str { lead-substmts }");}
+              ;
+
+leaf_list_substmts : leaf_list_substmts leaf_list_substmt
+              | leaf_list_substmt
+              ;
+
+leaf_list_substmt : when_stmt        { clicon_debug(2,"leaf-list-substmt -> when-stmt"); } 
+              | if_feature_stmt      { clicon_debug(2,"leaf-list-substmt -> if-feature-stmt"); }
+              | type_stmt            { clicon_debug(2,"leaf-list-substmt -> type-stmt"); }
+              | units_stmt           { clicon_debug(2,"leaf-list-substmt -> units-stmt"); }
+              | must_stmt            { clicon_debug(2,"leaf-list-substmt -> must-stmt"); }
+              | config_stmt          { clicon_debug(2,"leaf-list-substmt -> config-stmt"); }
+              | min_elements_stmt    { clicon_debug(2,"leaf-list-substmt -> min-elements-stmt"); }
+              | max_elements_stmt    { clicon_debug(2,"leaf-list-substmt -> max-elements-stmt"); }
+              | ordered_by_stmt      { clicon_debug(2,"leaf-list-substmt -> ordered-by-stmt"); }
+              | status_stmt          { clicon_debug(2,"leaf-list-substmt -> status-stmt"); }
+              | description_stmt     { clicon_debug(2,"leaf-list-substmt -> description-stmt"); }
+              | reference_stmt       { clicon_debug(2,"leaf-list-substmt -> reference-stmt"); }
+              | unknown_stmt         { clicon_debug(2,"leaf-list-substmt -> unknown-stmt");} 
+              |                      { clicon_debug(2,"leaf-list-stmt ->"); }
+              ;
+
+/* list */
+list_stmt     : K_LIST identifier_str ';' 
+		{ if (ysp_add(_yy, Y_LIST, $2, NULL) == NULL) _YYERROR("16"); 
+			   clicon_debug(2,"list-stmt -> LIST id-arg-str ;"); }
+              | K_LIST identifier_str 
+                          { if (ysp_add_push(_yy, Y_LIST, $2) == NULL) _YYERROR("17"); }
+	       '{' list_substmts '}' 
+                           { if (ystack_pop(_yy) < 0) _YYERROR("18");
+			     clicon_debug(2,"list-stmt -> LIST id-arg-str { list-substmts }"); }
+              ;
+
+list_substmts : list_substmts list_substmt 
+                      { clicon_debug(2,"list-substmts -> list-substmts list-substmt"); }
+              | list_substmt 
+                      { clicon_debug(2,"list-substmts -> list-substmt"); }
+              ;
+
+list_substmt  : when_stmt            { clicon_debug(2,"list-substmt -> when-stmt"); }
+              | if_feature_stmt      { clicon_debug(2,"list-substmt -> if-feature-stmt"); }
+              | must_stmt            { clicon_debug(2,"list-substmt -> must-stmt"); }
+              | key_stmt             { clicon_debug(2,"list-substmt -> key-stmt"); }
+              | unique_stmt          { clicon_debug(2,"list-substmt -> unique-stmt"); }
+              | config_stmt          { clicon_debug(2,"list-substmt -> config-stmt"); }
+              | min_elements_stmt    { clicon_debug(2,"list-substmt -> min-elements-stmt"); }
+              | max_elements_stmt    { clicon_debug(2,"list-substmt -> max-elements-stmt"); }
+              | ordered_by_stmt      { clicon_debug(2,"list-substmt -> ordered-by-stmt"); }
+              | status_stmt          { clicon_debug(2,"list-substmt -> status-stmt"); }
+              | description_stmt     { clicon_debug(2,"list-substmt -> description-stmt"); }
+              | reference_stmt       { clicon_debug(2,"list-substmt -> reference-stmt"); }
+              | typedef_stmt         { clicon_debug(2,"list-substmt -> typedef-stmt"); }
+              | grouping_stmt        { clicon_debug(2,"list-substmt -> grouping-stmt"); }
+              | data_def_stmt        { clicon_debug(2,"list-substmt -> data-def-stmt"); }
+              | action_stmt          { clicon_debug(2,"list-substmt -> action-stmt"); }
+              | notification_stmt    { clicon_debug(2,"list-substmt -> notification-stmt"); }
+              | unknown_stmt         { clicon_debug(2,"list-substmt -> unknown-stmt");} 
+              |                      { clicon_debug(2,"list-substmt -> "); }
+              ;
+
+/* key-stmt = key-keyword sep key-arg-str */
+key_stmt      : K_KEY string stmtend
 		{ if (ysp_add(_yy, Y_KEY, $2, NULL)== NULL) _YYERROR("109"); 
 			   clicon_debug(2,"key-stmt -> KEY id-arg-str ;");}
               ;
 
-unique_stmt   : K_UNIQUE id_arg_str ';' /* XXX key_arg_str */
+/* unique-stmt = unique-keyword unique-arg-str */
+unique_stmt   : K_UNIQUE string stmtend
 		{ if (ysp_add(_yy, Y_UNIQUE, $2, NULL)== NULL) _YYERROR("110"); 
 			   clicon_debug(2,"key-stmt -> KEY id-arg-str ;");}
               ;
 
-config_arg_str : string { $$=$1; } /* XXX BOOL */
-              ;	      
-
-integer_value : string { $$=$1; }
-              ;	      
-
-identifier_ref_arg_str : string 
-                    {   if (($$=prefix_id_join(NULL, $1)) == NULL) _YYERROR("111");
-			clicon_debug(2,"identifier-ref-arg-str -> string"); }
-              | string ':' string 
-                    {   if (($$=prefix_id_join($1, $3)) == NULL) _YYERROR("112");
-			clicon_debug(2,"identifier-ref-arg-str -> prefix : string"); }
+/* choice */
+choice_stmt   : K_CHOICE identifier_str ';' 
+	       { if (ysp_add(_yy, Y_CHOICE, $2, NULL) == NULL) _YYERROR("19"); 
+			   clicon_debug(2,"choice-stmt -> CHOICE id-arg-str ;"); }
+              | K_CHOICE identifier_str
+                          { if (ysp_add_push(_yy, Y_CHOICE, $2) == NULL) _YYERROR("20"); }
+	       '{' choice_substmts '}' 
+                           { if (ystack_pop(_yy) < 0) _YYERROR("21");
+			     clicon_debug(2,"choice-stmt -> CHOICE id-arg-str { choice-substmts }"); }
               ;
 
-id_arg_str    : string { $$=$1; clicon_debug(2,"id-arg-str -> string"); }
-              ;	      
+choice_substmts : choice_substmts choice_substmt 
+                      { clicon_debug(2,"choice-substmts -> choice-substmts choice-substmt"); }
+              | choice_substmt 
+                      { clicon_debug(2,"choice-substmts -> choice-substmt"); }
+              ;
+
+choice_substmt : when_stmt           { clicon_debug(2,"choice-substmt -> when-stmt"); }  
+              | if_feature_stmt      { clicon_debug(2,"choice-substmt -> if-feature-stmt"); }
+              | default_stmt         { clicon_debug(2,"choice-substmt -> default-stmt"); }
+              | config_stmt          { clicon_debug(2,"choice-substmt -> config-stmt"); }
+              | mandatory_stmt       { clicon_debug(2,"choice-substmt -> mandatory-stmt"); }
+              | status_stmt          { clicon_debug(2,"choice-substmt -> status-stmt"); }
+              | description_stmt     { clicon_debug(2,"choice-substmt -> description-stmt"); }
+              | reference_stmt       { clicon_debug(2,"choice-substmt -> reference-stmt"); }
+              | short_case_stmt      { clicon_debug(2,"choice-substmt -> short-case-stmt");} 
+              | case_stmt            { clicon_debug(2,"choice-substmt -> case-stmt");} 
+              | unknown_stmt         { clicon_debug(2,"choice-substmt -> unknown-stmt");} 
+              |                      { clicon_debug(2,"choice-substmt -> "); }
+              ;
+
+/* case */
+case_stmt   : K_CASE identifier_str ';' 
+	       { if (ysp_add(_yy, Y_CASE, $2, NULL) == NULL) _YYERROR("22"); 
+			   clicon_debug(2,"case-stmt -> CASE id-arg-str ;"); }
+              | K_CASE identifier_str 
+                          { if (ysp_add_push(_yy, Y_CASE, $2) == NULL) _YYERROR("23"); }
+	       '{' case_substmts '}' 
+                           { if (ystack_pop(_yy) < 0) _YYERROR("24");
+			     clicon_debug(2,"case-stmt -> CASE id-arg-str { case-substmts }"); }
+              ;
+
+case_substmts : case_substmts case_substmt 
+                      { clicon_debug(2,"case-substmts -> case-substmts case-substmt"); }
+              | case_substmt 
+                      { clicon_debug(2,"case-substmts -> case-substmt"); }
+              ;
+
+case_substmt  : when_stmt            { clicon_debug(2,"case-substmt -> when-stmt"); }
+              | if_feature_stmt      { clicon_debug(2,"case-substmt -> if-feature-stmt"); }
+              | status_stmt          { clicon_debug(2,"case-substmt -> status-stmt"); }
+              | description_stmt     { clicon_debug(2,"case-substmt -> description-stmt"); }
+              | reference_stmt       { clicon_debug(2,"case-substmt -> reference-stmt"); }
+              | data_def_stmt        { clicon_debug(2,"case-substmt -> data-def-stmt");} 
+              | unknown_stmt         { clicon_debug(2,"case-substmt -> unknown-stmt");} 
+              |                      { clicon_debug(2,"case-substmt -> "); }
+              ;
+
+anydata_stmt   : K_ANYDATA identifier_str ';' 
+	       { if (ysp_add(_yy, Y_ANYDATA, $2, NULL) == NULL) _YYERROR("25"); 
+			   clicon_debug(2,"anydata-stmt -> ANYDATA id-arg-str ;"); }
+              | K_ANYDATA identifier_str
+                          { if (ysp_add_push(_yy, Y_ANYDATA, $2) == NULL) _YYERROR("26"); }
+	       '{' anyxml_substmts '}' 
+                           { if (ystack_pop(_yy) < 0) _YYERROR("27");
+			     clicon_debug(2,"anydata-stmt -> ANYDATA id-arg-str { anyxml-substmts }"); }
+              ;
+
+/* anyxml */
+anyxml_stmt   : K_ANYXML identifier_str ';' 
+	       { if (ysp_add(_yy, Y_ANYXML, $2, NULL) == NULL) _YYERROR("25"); 
+			   clicon_debug(2,"anyxml-stmt -> ANYXML id-arg-str ;"); }
+              | K_ANYXML identifier_str
+                          { if (ysp_add_push(_yy, Y_ANYXML, $2) == NULL) _YYERROR("26"); }
+	       '{' anyxml_substmts '}' 
+                           { if (ystack_pop(_yy) < 0) _YYERROR("27");
+			     clicon_debug(2,"anyxml-stmt -> ANYXML id-arg-str { anyxml-substmts }"); }
+              ;
+
+anyxml_substmts : anyxml_substmts anyxml_substmt 
+                      { clicon_debug(2,"anyxml-substmts -> anyxml-substmts anyxml-substmt"); }
+              | anyxml_substmt 
+                      { clicon_debug(2,"anyxml-substmts -> anyxml-substmt"); }
+              ;
+
+anyxml_substmt  : when_stmt          { clicon_debug(2,"anyxml-substmt -> when-stmt"); }
+              | if_feature_stmt      { clicon_debug(2,"anyxml-substmt -> if-feature-stmt"); }
+              | must_stmt            { clicon_debug(2,"anyxml-substmt -> must-stmt"); }
+              | config_stmt          { clicon_debug(2,"anyxml-substmt -> config-stmt"); }
+              | mandatory_stmt       { clicon_debug(2,"anyxml-substmt -> mandatory-stmt"); }
+              | status_stmt          { clicon_debug(2,"anyxml-substmt -> status-stmt"); }
+              | description_stmt     { clicon_debug(2,"anyxml-substmt -> description-stmt"); }
+              | reference_stmt       { clicon_debug(2,"anyxml-substmt -> reference-stmt"); }
+              | ustring ':' ustring ';' { free($1); free($3); clicon_debug(2,"anyxml-substmt -> anyxml extension"); }
+              ;
+
+/* uses-stmt = uses-keyword identifier-ref-arg-str */
+uses_stmt     : K_USES identifier_ref_str ';' 
+	       { if (ysp_add(_yy, Y_USES, $2, NULL) == NULL) _YYERROR("28"); 
+			   clicon_debug(2,"uses-stmt -> USES id-arg-str ;"); }
+              | K_USES identifier_ref_str
+                          { if (ysp_add_push(_yy, Y_USES, $2) == NULL) _YYERROR("29"); }
+	       '{' uses_substmts '}' 
+                           { if (ystack_pop(_yy) < 0) _YYERROR("30");
+			     clicon_debug(2,"uses-stmt -> USES id-arg-str { uses-substmts }"); }
+              ;
+
+uses_substmts : uses_substmts uses_substmt 
+                      { clicon_debug(2,"uses-substmts -> uses-substmts uses-substmt"); }
+              | uses_substmt 
+                      { clicon_debug(2,"uses-substmts -> uses-substmt"); }
+              ;
+
+uses_substmt  : when_stmt            { clicon_debug(2,"uses-substmt -> when-stmt"); }
+              | if_feature_stmt      { clicon_debug(2,"uses-substmt -> if-feature-stmt"); }
+              | status_stmt          { clicon_debug(2,"uses-substmt -> status-stmt"); }
+              | description_stmt     { clicon_debug(2,"uses-substmt -> description-stmt"); }
+              | reference_stmt       { clicon_debug(2,"uses-substmt -> reference-stmt"); }
+              | refine_stmt          { clicon_debug(2,"uses-substmt -> refine-stmt"); }
+              | uses_augment_stmt    { clicon_debug(2,"uses-substmt -> uses-augment-stmt"); }
+              | unknown_stmt         { clicon_debug(2,"uses-substmt -> unknown-stmt");} 
+              |                      { clicon_debug(2,"uses-substmt -> "); }
+              ;
+
+/* refine-stmt = refine-keyword sep refine-arg-str */
+refine_stmt   : K_REFINE desc_schema_node_str ';' 
+	       { if (ysp_add(_yy, Y_REFINE, $2, NULL) == NULL) _YYERROR("31"); 
+			   clicon_debug(2,"refine-stmt -> REFINE id-arg-str ;"); }
+              | K_REFINE desc_schema_node_str
+                          { if (ysp_add_push(_yy, Y_REFINE, $2) == NULL) _YYERROR("32"); }
+	       '{' refine_substmts '}' 
+                           { if (ystack_pop(_yy) < 0) _YYERROR("33");
+			     clicon_debug(2,"refine-stmt -> REFINE id-arg-str { refine-substmts }"); }
+              ;
+
+refine_substmts : refine_substmts refine_substmt 
+                      { clicon_debug(2,"refine-substmts -> refine-substmts refine-substmt"); }
+              | refine_substmt 
+                      { clicon_debug(2,"refine-substmts -> refine-substmt"); }
+              ;
+
+refine_substmt  : must_stmt     { clicon_debug(2,"refine-substmt -> must-stmt"); }
+              | mandatory_stmt  { clicon_debug(2,"refine-substmt -> mandatory-stmt"); }
+              | default_stmt    { clicon_debug(2,"refine-substmt -> default-stmt"); }
+              | unknown_stmt    { clicon_debug(2,"refine-substmt -> unknown-stmt");} 
+              |                 { clicon_debug(2,"refine-substmt -> "); }
+              ;
+
+/* uses-augment-stmt = augment-keyword augment-arg-str */
+uses_augment_stmt : K_AUGMENT desc_schema_node_str
+                      { if (ysp_add_push(_yy, Y_AUGMENT, $2) == NULL) _YYERROR("34"); }
+                    '{' augment_substmts '}'
+                      { if (ystack_pop(_yy) < 0) _YYERROR("35");
+			     clicon_debug(2,"uses-augment-stmt -> AUGMENT desc-schema-node-str { augment-substmts }"); }
+
+		    
+/* augment-stmt = augment-keyword sep augment-arg-str 
+ * XXX abs-schema-nodeid-str is too difficult, it needs the + semantics
+ */
+augment_stmt   : K_AUGMENT string
+                    { if (ysp_add_push(_yy, Y_AUGMENT, $2) == NULL) _YYERROR("34"); }
+	       '{' augment_substmts '}' 
+                    { if (ystack_pop(_yy) < 0) _YYERROR("35");
+			     clicon_debug(2,"augment-stmt -> AUGMENT abs-schema-node-str { augment-substmts }"); }
+              ;
+
+augment_substmts : augment_substmts augment_substmt 
+                      { clicon_debug(2,"augment-substmts -> augment-substmts augment-substmt"); }
+              | augment_substmt 
+                      { clicon_debug(2,"augment-substmts -> augment-substmt"); }
+              ;
+
+augment_substmt : when_stmt          { clicon_debug(2,"augment-substmt -> when-stmt"); }  
+              | if_feature_stmt      { clicon_debug(2,"augment-substmt -> if-feature-stmt"); }
+              | status_stmt          { clicon_debug(2,"augment-substmt -> status-stmt"); }
+              | description_stmt     { clicon_debug(2,"augment-substmt -> description-stmt"); }
+              | reference_stmt       { clicon_debug(2,"augment-substmt -> reference-stmt"); }
+              | data_def_stmt        { clicon_debug(2,"augment-substmt -> data-def-stmt"); }
+              | case_stmt            { clicon_debug(2,"augment-substmt -> case-stmt");}
+              | action_stmt          { clicon_debug(2,"augment-substmt -> action-stmt");} 
+              | notification_stmt    { clicon_debug(2,"augment-substmt -> notification-stmt");} 
+              |                      { clicon_debug(2,"augment-substmt -> "); }
+              ;
+
+/* when */
+when_stmt   : K_WHEN string ';' 
+	       { if (ysp_add(_yy, Y_WHEN, $2, NULL) == NULL) _YYERROR("36"); 
+			   clicon_debug(2,"when-stmt -> WHEN string ;"); }
+            | K_WHEN string
+               { if (ysp_add_push(_yy, Y_WHEN, $2) == NULL) _YYERROR("37"); }
+	       '{' when_substmts '}' 
+                           { if (ystack_pop(_yy) < 0) _YYERROR("38");
+			     clicon_debug(2,"when-stmt -> WHEN string { when-substmts }"); }
+              ;
+
+when_substmts : when_substmts when_substmt 
+                      { clicon_debug(2,"when-substmts -> when-substmts when-substmt"); }
+              | when_substmt 
+                      { clicon_debug(2,"when-substmts -> when-substmt"); }
+              ;
+
+when_substmt  : description_stmt { clicon_debug(2,"when-substmt -> description-stmt"); }
+              | reference_stmt   { clicon_debug(2,"when-substmt -> reference-stmt"); }
+              |                  { clicon_debug(2,"when-substmt -> "); }
+              ;
+
+/* rpc */
+rpc_stmt   : K_RPC identifier_str ';' 
+	       { if (ysp_add(_yy, Y_RPC, $2, NULL) == NULL) _YYERROR("39"); 
+			   clicon_debug(2,"rpc-stmt -> RPC id-arg-str ;"); }
+           | K_RPC identifier_str
+               { if (ysp_add_push(_yy, Y_RPC, $2) == NULL) _YYERROR("40"); }
+	     '{' rpc_substmts '}' 
+                           { if (ystack_pop(_yy) < 0) _YYERROR("41");
+			     clicon_debug(2,"rpc-stmt -> RPC id-arg-str { rpc-substmts }"); }
+              ;
+
+rpc_substmts : rpc_substmts rpc_substmt 
+                      { clicon_debug(2,"rpc-substmts -> rpc-substmts rpc-substmt"); }
+              | rpc_substmt 
+                      { clicon_debug(2,"rpc-substmts -> rpc-substmt"); }
+              ;
+
+rpc_substmt   : if_feature_stmt  { clicon_debug(2,"rpc-substmt -> if-feature-stmt"); }
+              | status_stmt      { clicon_debug(2,"rpc-substmt -> status-stmt"); }
+              | description_stmt { clicon_debug(2,"rpc-substmt -> description-stmt"); }
+              | reference_stmt   { clicon_debug(2,"rpc-substmt -> reference-stmt"); }
+              | typedef_stmt     { clicon_debug(2,"rpc-substmt -> typedef-stmt"); }
+              | grouping_stmt    { clicon_debug(2,"rpc-substmt -> grouping-stmt"); }
+              | input_stmt       { clicon_debug(2,"rpc-substmt -> input-stmt"); }
+              | output_stmt      { clicon_debug(2,"rpc-substmt -> output-stmt"); }
+              |                  { clicon_debug(2,"rpc-substmt -> "); }
+              ;
+
+/* action */
+action_stmt   : K_ACTION identifier_str ';' 
+	       { if (ysp_add(_yy, Y_ACTION, $2, NULL) == NULL) _YYERROR("39"); 
+			   clicon_debug(2,"action-stmt -> ACTION id-arg-str ;"); }
+              | K_ACTION identifier_str
+                          { if (ysp_add_push(_yy, Y_ACTION, $2) == NULL) _YYERROR("40"); }
+	       '{' rpc_substmts '}' 
+                           { if (ystack_pop(_yy) < 0) _YYERROR("41");
+			     clicon_debug(2,"action-stmt -> ACTION id-arg-str { rpc-substmts }"); }
+              ;
+
+/* notification */
+notification_stmt : K_NOTIFICATION identifier_str ';' 
+	                { if (ysp_add(_yy, Y_NOTIFICATION, $2, NULL) == NULL) _YYERROR("46"); 
+			   clicon_debug(2,"notification-stmt -> NOTIFICATION id-arg-str ;"); }
+                  | K_NOTIFICATION identifier_str
+                        { if (ysp_add_push(_yy, Y_NOTIFICATION, $2) == NULL) _YYERROR("47"); }
+	            '{' notification_substmts '}' 
+                        { if (ystack_pop(_yy) < 0) _YYERROR("48");
+			     clicon_debug(2,"notification-stmt -> NOTIFICATION id-arg-str { notification-substmts }"); }
+                  ;
+
+notification_substmts : notification_substmts notification_substmt 
+                         { clicon_debug(2,"notification-substmts -> notification-substmts notification-substmt"); }
+                      | notification_substmt 
+                         { clicon_debug(2,"notification-substmts -> notification-substmt"); }
+                      ;
+
+notification_substmt : if_feature_stmt  { clicon_debug(2,"notification-substmt -> if-feature-stmt"); }
+                     | must_stmt        { clicon_debug(2,"notification-substmt -> must-stmt"); }
+                     | status_stmt      { clicon_debug(2,"notification-substmt -> status-stmt"); }
+                     | description_stmt { clicon_debug(2,"notification-substmt -> description-stmt"); }
+                     | reference_stmt   { clicon_debug(2,"notification-substmt -> reference-stmt"); }
+                     | typedef_stmt     { clicon_debug(2,"notification-substmt -> typedef-stmt"); }
+                     | grouping_stmt    { clicon_debug(2,"notification-substmt -> grouping-stmt"); }
+                     | data_def_stmt    { clicon_debug(2,"notification-substmt -> data-def-stmt"); }
+                     |                  { clicon_debug(2,"notification-substmt -> "); }
+                     ;
+
+/* deviation /oc-sys:system/oc-sys:config/oc-sys:hostname {
+	     deviate not-supported;
+      }
+ * XXX abs-schema-nodeid-str is too difficult, it needs the + semantics
+
+*/
+deviation_stmt : K_DEVIATION string
+                  { if (ysp_add_push(_yy, Y_DEVIATION, $2) == NULL) _YYERROR("47"); }
+	            '{' deviation_substmts '}' 
+                        { if (ystack_pop(_yy) < 0) _YYERROR("48");
+			     clicon_debug(2,"deviation-stmt -> DEVIATION id-arg-str { notification-substmts }"); }
+               ;
+
+deviation_substmts : deviation_substmts deviation_substmt 
+                         { clicon_debug(2,"deviation-substmts -> deviation-substmts deviation-substmt"); }
+                      | deviation_substmt 
+                         { clicon_debug(2,"deviation-substmts -> deviation-substmt"); }
+                      ;
+
+deviation_substmt : description_stmt  { clicon_debug(2,"deviation-substmt -> description-stmt"); }
+                  | reference_stmt  { clicon_debug(2,"deviation-substmt -> reference-stmt"); }
+                  | deviate_not_supported_stmt  { clicon_debug(2,"deviation-substmt -> deviate-not-supported-stmt"); }
+		  ;
+
+deviate_not_supported_stmt : K_DEVIATE string { clicon_debug(2,"deviate-not-supported-stmt -> DEVIATE string"); }
+                             ;
+
+meta_stmt     : organization_stmt    { clicon_debug(2,"meta-stmt -> organization-stmt"); }
+              | contact_stmt         { clicon_debug(2,"meta-stmt -> contact-stmt"); }
+              | description_stmt     { clicon_debug(2,"meta-stmt -> description-stmt"); }
+              | reference_stmt       { clicon_debug(2,"meta-stmt -> reference-stmt"); }
+              ;
+
+/* body */
+body_stmts    : body_stmts body_stmt { clicon_debug(2,"body-stmts -> body-stmts body-stmt"); } 
+              | body_stmt            { clicon_debug(2,"body-stmts -> body-stmt");}
+              ;
+
+body_stmt     : extension_stmt       { clicon_debug(2,"body-stmt -> extension-stmt");}
+              | feature_stmt         { clicon_debug(2,"body-stmt -> feature-stmt");}
+              | identity_stmt        { clicon_debug(2,"body-stmt -> identity-stmt");}
+              | typedef_stmt         { clicon_debug(2,"body-stmt -> typedef-stmt");}
+              | grouping_stmt        { clicon_debug(2,"body-stmt -> grouping-stmt");}
+              | data_def_stmt        { clicon_debug(2,"body-stmt -> data-def-stmt");}
+              | augment_stmt         { clicon_debug(2,"body-stmt -> augment-stmt");}
+              | rpc_stmt             { clicon_debug(2,"body-stmt -> rpc-stmt");}
+              | notification_stmt    { clicon_debug(2,"body-stmt -> notification-stmt");}
+              | deviation_stmt       { clicon_debug(2,"body-stmt -> deviation-stmt");}
+              ;
+
+data_def_stmt : container_stmt       { clicon_debug(2,"data-def-stmt -> container-stmt");}
+              | leaf_stmt            { clicon_debug(2,"data-def-stmt -> leaf-stmt");}
+              | leaf_list_stmt       { clicon_debug(2,"data-def-stmt -> leaf-list-stmt");}
+              | list_stmt            { clicon_debug(2,"data-def-stmt -> list-stmt");}
+              | choice_stmt          { clicon_debug(2,"data-def-stmt -> choice-stmt");}
+              | anydata_stmt         { clicon_debug(2,"data-def-stmt -> anydata-stmt");}
+              | anyxml_stmt          { clicon_debug(2,"data-def-stmt -> anyxml-stmt");}
+              | uses_stmt            { clicon_debug(2,"data-def-stmt -> uses-stmt");}
+              ;
+
+/* short-case */
+short_case_stmt : container_stmt   { clicon_debug(2,"short-case-substmt -> container-stmt"); }
+              | leaf_stmt          { clicon_debug(2,"short-case-substmt -> leaf-stmt"); }
+              | leaf_list_stmt     { clicon_debug(2,"short-case-substmt -> leaf-list-stmt"); }
+              | list_stmt          { clicon_debug(2,"short-case-substmt -> list-stmt"); }
+              | anydata_stmt       { clicon_debug(2,"short-case-substmt -> anydata-stmt");}
+              | anyxml_stmt        { clicon_debug(2,"short-case-substmt -> anyxml-stmt");}
+              ;
+
+
+/* input */
+input_stmt  : K_INPUT 
+                          { if (ysp_add_push(_yy, Y_INPUT, NULL) == NULL) _YYERROR("42"); }
+	       '{' input_substmts '}' 
+                           { if (ystack_pop(_yy) < 0) _YYERROR("43");
+			     clicon_debug(2,"input-stmt -> INPUT { input-substmts }"); }
+              ;
+
+input_substmts : input_substmts input_substmt 
+                      { clicon_debug(2,"input-substmts -> input-substmts input-substmt"); }
+              | input_substmt 
+                      { clicon_debug(2,"input-substmts -> input-substmt"); }
+              ;
+
+input_substmt : typedef_stmt         { clicon_debug(2,"input-substmt -> typedef-stmt"); }
+              | grouping_stmt        { clicon_debug(2,"input-substmt -> grouping-stmt"); }
+              | data_def_stmt        { clicon_debug(2,"input-substmt -> data-def-stmt"); }
+              |                      { clicon_debug(2,"input-substmt -> "); }
+              ;
+
+/* output */
+output_stmt  : K_OUTPUT  /* XXX reuse input-substatements since they are same */
+                          { if (ysp_add_push(_yy, Y_OUTPUT, NULL) == NULL) _YYERROR("44"); }
+	       '{' input_substmts '}' 
+                           { if (ystack_pop(_yy) < 0) _YYERROR("45");
+			     clicon_debug(2,"output-stmt -> OUTPUT { input-substmts }"); }
+              ;
+
+
+
 
 string        : qstrings { $$=$1; clicon_debug(2,"string -> qstrings (%s)", $1); }
               | ustring  { $$=$1; clicon_debug(2,"string -> ustring (%s)", $1); }
@@ -1457,7 +1538,8 @@ qstrings      : qstrings '+' qstring
                      { $$=$1; clicon_debug(2,"qstrings-> qstring"); } 
               ;
 
-qstring        : DQ ustring DQ  { $$=$2; clicon_debug(2,"string-> \" ustring \""); } 
+qstring        : DQ ustring DQ  { $$=$2; clicon_debug(2,"string-> \" ustring \"");} 
+               | SQ ustring SQ  { $$=$2; clicon_debug(2,"string-> ' ustring '"); }
   ;
 
 /* unquoted string */
@@ -1473,6 +1555,67 @@ ustring       : ustring CHAR
               ;
 
 
+abs_schema_nodeid : abs_schema_nodeid '/' node_identifier
+                 { if (($$=string_del_join($1, "/", $3)) == NULL) _YYERROR("0");
+		   clicon_debug(2,"absolute-schema-nodeid -> absolute-schema-nodeid / node-identifier"); }
+              | '/' node_identifier
+                 {  if (($$=string_del_join(NULL, "/", $2)) == NULL) _YYERROR("0");
+		     clicon_debug(2,"absolute-schema-nodeid -> / node-identifier"); }
+              ;
+
+desc_schema_node_str : desc_schema_nodeid
+                         { $$=$1; clicon_debug(2,"descendant-schema-node-str -> descendant-node"); }
+                     | '"' desc_schema_nodeid '"'
+                         { $$=$2; clicon_debug(2,"descendant-schema-node-str -> descendant-node"); }
+                     ;
+
+desc_schema_nodeid : node_identifier
+                     { $$= $1; clicon_debug(2,"descendant-schema-nodeid -> node_identifier"); }
+                   | node_identifier abs_schema_nodeid
+		   { if (($$=string_del_join($1, " ", $2)) == NULL) _YYERROR("0");clicon_debug(2,"descendant-schema-nodeid -> node_identifier abs_schema_nodeid"); }
+                   ;
+
+identifier_str : '"' IDENTIFIER '"' { $$ = $2;
+		         clicon_debug(2,"identifier_str -> \" IDENTIFIER \" ");}
+               | IDENTIFIER           { $$ = $1;
+		         clicon_debug(2,"identifier_str -> IDENTIFIER ");}
+               ;
+
+identifier_ref_str : '"' identifier_ref '"' { $$ = $2;
+		         clicon_debug(2,"identifier_ref_str -> \" identifier_ref \" ");}
+               | identifier_ref           { $$ = $1;
+		         clicon_debug(2,"identifier_ref_str -> identifier_ref ");}
+               ;
+
+integer_value_str : '"' INT '"' { $$=$2; }
+                  |     INT     { $$=$1; }
+                  ;
+
+bool_str       : '"' BOOL '"' { $$ = $2;
+		         clicon_debug(2,"bool_str -> \" BOOL \" ");}
+               |     BOOL     { $$ = $1;
+		         clicon_debug(2,"bool_str -> BOOL ");}
+               ;
+
+
+/*   node-identifier     = [prefix ":"] identifier */
+node_identifier : IDENTIFIER
+		   { $$=$1; clicon_debug(2,"identifier-ref-arg-str -> string"); }
+                | IDENTIFIER ':' IDENTIFIER
+		{ if (($$=string_del_join($1, ":", $3)) == NULL) _YYERROR("112");
+			clicon_debug(2,"identifier-ref-arg-str -> prefix : string"); }
+                ;
+
+/* ;;; Basic Rules */
+
+/* identifier-ref = [prefix ":"] identifier */
+identifier_ref : node_identifier { $$=$1;}
+               ;
+
+stmtend        : ';'
+               | '{' '}'
+               | '{' unknown_stmt '}'
+               ;
 
 %%
 
diff --git a/test/test_openconfig.sh b/test/test_openconfig.sh
new file mode 100755
index 00000000..6ed5423b
--- /dev/null
+++ b/test/test_openconfig.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+# Parse yang openconfig tests
+#PROG="valgrind --leak-check=full --show-leak-kinds=all ../util/clixon_util_yang"
+PROG=../util/clixon_util_yang
+OPENCONFIG=~/syssrc/openconfig
+
+# include err() and new() functions and creates $dir
+. ./lib.sh
+
+# Openconfig
+# Files not parseable:
+# - openconfig-access-points.yang
+# - openconfig-access-points.yang
+new "Openconfig"
+files=$(find $OPENCONFIG -name "*.yang")
+for f in $files; do
+    new "$f"
+    YANG=$(cat $f)
+ # NYI
+  expecteof "$PROG" 0 "$YANG" "module"
+done
+rm -rf $dir
+
+
diff --git a/test/test_yang_parse.sh b/test/test_yang_parse.sh
index c8024a3d..3790645f 100755
--- a/test/test_yang_parse.sh
+++ b/test/test_yang_parse.sh
@@ -1,27 +1,11 @@
 #!/bin/bash
 # Test: YANG parser tests
-# First an example yang, second all openconfig yangs
-# Problem with this is that util only parses single file. it should
-# call yang_parse().
 #PROG="valgrind --leak-check=full --show-leak-kinds=all ../util/clixon_util_yang"
 PROG=../util/clixon_util_yang
-OPENCONFIG=~/syssrc/openconfig
-exit 0 # nyi
+
 # include err() and new() functions and creates $dir
 . ./lib.sh
 
-# Openconfig
-# Files not parseable:
-# - openconfig-access-points.yang
-# - openconfig-access-points.yang
-new "Openconfig"
-files=$(find $OPENCONFIG -name "*.yang")
-for f in $files; do
-    new "$f"
-    YANG=$(cat $f)
- # NYI
-  expecteof "$PROG" 0 "$YANG" "module"
-done
 rm -rf $dir
 
 

From 39a5086218bc90780fb79666cf34e227becd4d97 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sat, 1 Dec 2018 18:17:42 +0100
Subject: [PATCH 06/72] * Yang Support of submodule, include and belongs-to. *
 Improved unknown handling * Configure option `CLICON_YANG_DIR` is changed
 from a single directory to a path of directories     * Note CLIXON_DATADIR
 (=/usr/local/share/clixon) need to be in the list

---
 CHANGELOG.md                       |   6 +
 README.md                          |  16 +-
 apps/backend/backend_main.c        |   9 +-
 apps/cli/cli_generate.c            |  36 ++-
 apps/cli/cli_main.c                |   3 +-
 apps/netconf/netconf_main.c        |   3 +-
 apps/netconf/netconf_rpc.c         |  10 +-
 apps/restconf/restconf_main.c      |  14 +-
 configure                          |  11 +-
 configure.ac                       |   7 +-
 datastore/datastore_client.c       |  19 +-
 datastore/text/clixon_xmldb_text.c |   6 +-
 doc/FAQ.md                         |  24 +-
 doc/Makefile.in                    |   2 +
 example/example.xml                |   1 +
 include/clixon_config.h.in         |   8 +-
 lib/clixon/clixon_options.h        |   3 -
 lib/clixon/clixon_yang.h           |  14 +-
 lib/src/clixon_netconf_lib.c       |   4 +-
 lib/src/clixon_options.c           |  29 +-
 lib/src/clixon_yang.c              | 424 +++++++++++++++++++----------
 lib/src/clixon_yang_cardinality.c  |  18 +-
 lib/src/clixon_yang_module.c       |  12 +-
 lib/src/clixon_yang_parse.y        | 394 ++++++++++++++-------------
 lib/src/clixon_yang_type.c         |  51 ++--
 test/lib.sh                        |  16 +-
 test/test_cli.sh                   |   1 +
 test/test_datastore.sh             |   4 +-
 test/test_feature.sh               |   1 +
 test/test_identity.sh              |   1 +
 test/test_leafref.sh               |   1 +
 test/test_list.sh                  |   1 +
 test/test_nacm.sh                  |   1 +
 test/test_nacm_ext.sh              |   1 +
 test/test_netconf.sh               |   2 +-
 test/test_openconfig.sh            | 102 ++++++-
 test/test_order.sh                 |   1 +
 test/test_perf.sh                  |   7 +-
 test/test_restconf.sh              |   1 +
 test/test_restconf2.sh             |   1 +
 test/test_startup.sh               |   1 +
 test/test_stream.sh                |   3 +-
 test/test_type.sh                  |  97 +++++++
 test/test_when_must.sh             |   1 +
 test/test_yang.sh                  |  68 ++++-
 util/clixon_util_yang.c            |   2 +
 yang/clixon-config@2018-10-21.yang |   9 +-
 47 files changed, 977 insertions(+), 469 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a80cdd9a..8ed77983 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,10 +9,16 @@
 * More complete Yang parser 
   * YANG parser cardinality checked (only modules level yet)
     * See https://github.com/clicon/clixon/issues/84
+  * Support of submodule, include and belongs-to.
   * Openconfig yang specs parsed: https://github.com/openconfig/public
+  * Improved unknown handling
+  * `CLICON_YANG_DIR` is changed from a single directory to a path of directories
+    * Note CLIXON_DATADIR (=/usr/local/share/clixon) need to be in the list
 
 ### API changes on existing features (you may need to change your code)
 * Yang parser is stricter (see above) which may break parsing of existing yang specs.
+* Yang parser functions have changed signatures. Please check the source if you call these functions.
+* Add `<CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>` to your configuration file, or corresponding CLICON_DATADIR directory for Clixon system yang files.
 
 ### Minor changes
 * XML parser conformance to W3 spec
diff --git a/README.md b/README.md
index 9cbb2e32..278374e5 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ support.
   * [Tests](test/)
   * [Docker](docker/)
   * [Roadmap](ROADMAP.md)
-  * [Reference manual](http://www.clicon.org/doxygen/index.html) (Note: the link may not be up-to-date. It is better to build your own: `cd doc; make doc`)
+  * [Reference manual](#reference) 
   
 Background
 ==========
@@ -124,6 +124,10 @@ However, the following YANG syntax modules are not implemented:
 - action
 - belongs-to
 
+Restrictions on Yang types are as follows:
+- The range statement does not support multiple values (RFC7895 sec 9.2.4)
+- Submodules cannot re-use a prefix in an import statement that is already used for another imported module in the module that the submodule belongs to.
+
 Netconf
 =======
 Clixon implements the following NETCONF proposals or standards:
@@ -217,7 +221,6 @@ The tests outlines an example of three groups (taken from the RFC): admin, limit
 * limited: Read access (get and get-config)
 * guest: No access
 
-
 Runtime
 =======
 
@@ -225,3 +228,12 @@ Runtime
 
 The figure shows the SDK runtime of Clixon.
 
+Reference
+=========
+A reference manual can be built using [Doxygen](http://www.doxygen.nl/index.html). You need to install doxygen and graphviz on your system.
+Build it in the doc directory and point the browser to `.../clixon/doc/html/index.html` as follows:
+```
+> cd doc
+> make doc
+> make graphs # detailed callgraphs
+```
\ No newline at end of file
diff --git a/apps/backend/backend_main.c b/apps/backend/backend_main.c
index 3856eb0e..76a5dca9 100644
--- a/apps/backend/backend_main.c
+++ b/apps/backend/backend_main.c
@@ -264,7 +264,7 @@ nacm_load_external(clicon_handle h)
     }
     if ((yspec = yspec_new()) == NULL)
 	goto done;
-    if (yang_parse(h, NULL, "ietf-netconf-acm", CLIXON_DATADIR, NULL, yspec, NULL) < 0)
+    if (yang_parse(h, NULL, "ietf-netconf-acm", NULL, yspec, NULL) < 0)
 	goto done;
     fd = fileno(f);
     /* Read configfile */
@@ -753,11 +753,10 @@ main(int    argc,
     /* Load main application yang specification either module or specific file
      * If -y <file> is given, it overrides main module */
     if (yang_filename){
-	if (yang_spec_parse_file(h, yang_filename, clicon_yang_dir(h), yspec, NULL) < 0)
+	if (yang_spec_parse_file(h, yang_filename, yspec, NULL) < 0)
 	    goto done;
     }
     else if (yang_spec_parse_module(h, clicon_yang_module_main(h),
-				    clicon_yang_dir(h),
 				    clicon_yang_module_revision(h),
 				    yspec, NULL) < 0)
 	goto done;
@@ -770,11 +769,11 @@ main(int    argc,
 	goto done;
     /* Load yang Restconf stream discovery */
      if (clicon_option_bool(h, "CLICON_STREAM_DISCOVERY_RFC8040") &&
-	 yang_spec_parse_module(h, "ietf-restconf-monitoring", CLIXON_DATADIR, NULL, yspec, NULL)< 0)
+	 yang_spec_parse_module(h, "ietf-restconf-monitoring", NULL, yspec, NULL)< 0)
 	 goto done;
      /* Load yang Netconf stream discovery */
      if (clicon_option_bool(h, "CLICON_STREAM_DISCOVERY_RFC5277") &&
-	 yang_spec_parse_module(h, "ietf-netconf-notification", CLIXON_DATADIR, NULL, yspec, NULL)< 0)
+	 yang_spec_parse_module(h, "ietf-netconf-notification", NULL, yspec, NULL)< 0)
 	 goto done;
     /* Set options: database dir and yangspec (could be hidden in connect?)*/
     if (xmldb_setopt(h, "dbdir", clicon_xmldb_dir(h)) < 0)
diff --git a/apps/cli/cli_generate.c b/apps/cli/cli_generate.c
index 22f76883..022e41b8 100644
--- a/apps/cli/cli_generate.c
+++ b/apps/cli/cli_generate.c
@@ -51,7 +51,7 @@
 #include <assert.h>
 #include <fcntl.h>
 #include <sys/param.h>
-
+#include <math.h> /* For pow() kludge in cvtype_max2str_dup2 */
 
 /* cligen */
 #include <cligen/cligen.h>
@@ -169,6 +169,28 @@ static int yang2cli_stmt(clicon_handle h, yang_stmt *ys, cbuf *cb,
 static int yang2cli_var_union(clicon_handle h, yang_stmt *ys, char *origtype,
 			      yang_stmt *ytype, cbuf *cb, char *helptext);
 
+/*! Patched maxstring to account for DEC64 types 
+ * @note kludge to fix overflow error -> Fix the original error in cvtype_max2str
+ * by adding a fraction_digits argument.
+ */
+static char *
+cvtype_max2str_dup2(enum cv_type type,
+		    int fraction_digits)
+{
+    int   len;
+    char *str;
+    
+    if (type!=CGV_DEC64 || fraction_digits==0)
+	return cvtype_max2str_dup(type);
+    if ((len = cvtype_max2str(type, NULL, 0)) < 0)
+	return NULL;
+    if ((str = (char *)malloc(len+1)) == NULL)
+	return NULL;
+    memset(str, '\0', len+1);
+    len = snprintf(str, len+1, "%" PRId64 ".0", (INT64_MAX/((int)pow(10,fraction_digits))));
+    return str;
+}
+    
 /*! Generate CLI code for Yang leaf statement to CLIgen variable of specific type
  * Check for completion (of already existent values), ranges (eg range[min:max]) and
  * patterns, (eg regexp:"[0.9]*").
@@ -282,10 +304,12 @@ yang2cli_var_sub(clicon_handle h,
 		}
 		snprintf(r, 512, "%d", MAXPATHLEN);
 	    }
-	    else if ((r = cvtype_max2str_dup(cvtype)) == NULL){
+	    else {
+		if ((r = cvtype_max2str_dup2(cvtype, fraction_digits)) == NULL){
 		    clicon_err(OE_UNIX, errno, "cvtype_max2str");
 		    goto done;
 		}
+	    }
 	}
 	cprintf(cb, "%s]", r); /* range */
 	free(r);
@@ -410,7 +434,7 @@ yang2cli_var(clicon_handle h,
 	     cbuf         *cb,    
 	     char         *helptext)
 {
-    int retval = -1;
+    int           retval = -1;
     char         *origtype;
     yang_stmt    *yrestype; /* resolved type */
     char         *restype; /* resolved type */
@@ -513,10 +537,12 @@ yang2cli_leaf(clicon_handle h,
 	if (helptext)
 	    cprintf(cbuf, "(\"%s\")", helptext);
 	cprintf(cbuf, " ");
-	yang2cli_var(h, ys, cbuf, helptext);
+	if (yang2cli_var(h, ys, cbuf, helptext) < 0)
+	    goto done;
     }
     else
-	yang2cli_var(h, ys, cbuf, helptext);
+	if (yang2cli_var(h, ys, cbuf, helptext) < 0)
+	    goto done;
     if (callback){
 	if (cli_callback_generate(h, ys, cbuf) < 0)
 	    goto done;
diff --git a/apps/cli/cli_main.c b/apps/cli/cli_main.c
index c651127e..5e887543 100644
--- a/apps/cli/cli_main.c
+++ b/apps/cli/cli_main.c
@@ -433,11 +433,10 @@ main(int argc, char **argv)
     /* Load main application yang specification either module or specific file
      * If -y <file> is given, it overrides main module */
     if (yang_filename){
-	if (yang_spec_parse_file(h, yang_filename, clicon_yang_dir(h), yspec, &ymod) < 0)
+	if (yang_spec_parse_file(h, yang_filename, yspec, &ymod) < 0)
 	    goto done;
     }
     else if (yang_spec_parse_module(h, clicon_yang_module_main(h),
-				    clicon_yang_dir(h),
 				    clicon_yang_module_revision(h),
 				    yspec, &ymod) < 0)
 	goto done;
diff --git a/apps/netconf/netconf_main.c b/apps/netconf/netconf_main.c
index 6f3f30bc..6326c283 100644
--- a/apps/netconf/netconf_main.c
+++ b/apps/netconf/netconf_main.c
@@ -447,11 +447,10 @@ main(int    argc,
     /* Load main application yang specification either module or specific file
      * If -y <file> is given, it overrides main module */
     if (yang_filename){
-	if (yang_spec_parse_file(h, yang_filename, clicon_yang_dir(h), yspec, NULL) < 0)
+	if (yang_spec_parse_file(h, yang_filename, yspec, NULL) < 0)
 	    goto done;
     }
     else if (yang_spec_parse_module(h, clicon_yang_module_main(h),
-				    clicon_yang_dir(h),
 				    clicon_yang_module_revision(h),
 				    yspec, NULL) < 0)
 	goto done;
diff --git a/apps/netconf/netconf_rpc.c b/apps/netconf/netconf_rpc.c
index 838f0c73..a8627b66 100644
--- a/apps/netconf/netconf_rpc.c
+++ b/apps/netconf/netconf_rpc.c
@@ -32,7 +32,13 @@
   ***** END LICENSE BLOCK *****
 
  *
- *  Code for handling netconf rpc messages according to RFC 4741 and RFC 5277
+ * Code for handling netconf rpc messages according to RFC 4741,5277,6241
+ *    All NETCONF protocol elements are defined in the following namespace:
+ *      urn:ietf:params:xml:ns:netconf:base:1.0
+ * YANG defines an XML namespace for NETCONF <edit-config> operations,
+ *     <error-info> content, and the <action> element.  The name of this
+ *      namespace is "urn:ietf:params:xml:ns:yang:1".
+ *
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
 #include "clixon_config.h" /* generated by config & autoconf */
@@ -894,7 +900,7 @@ netconf_application_rpc(clicon_handle h,
     }
     cprintf(cb, "/%s:%s", xml_namespace(xn), xml_name(xn));
     /* Find yang rpc statement, return yang rpc statement if found */
-    if (yang_abs_schema_nodeid(yspec, cbuf_get(cb), Y_RPC, &yrpc) < 0)
+    if (yang_abs_schema_nodeid(yspec, xml_spec(xn), cbuf_get(cb), Y_RPC, &yrpc) < 0)
 	goto done;
     /* Check if found */
     if (yrpc != NULL){
diff --git a/apps/restconf/restconf_main.c b/apps/restconf/restconf_main.c
index ed7fdc43..5909e8db 100644
--- a/apps/restconf/restconf_main.c
+++ b/apps/restconf/restconf_main.c
@@ -517,7 +517,6 @@ main(int    argc,
     char         *sockpath;
     char         *path;
     clicon_handle h;
-    char         *yangspec=NULL;
     char         *dir;
     char	 *tmp;
     int          logdst = CLICON_LOG_SYSLOG;
@@ -619,10 +618,6 @@ main(int    argc,
     argc -= optind;
     argv += optind;
 
-    /* Overwrite yang module with -y option */
-    if (yangspec)
-	clicon_option_str_set(h, "CLICON_YANG_MODULE_MAIN", yangspec);
-
     /* Initialize plugins group */
     if ((dir = clicon_restconf_dir(h)) != NULL)
 	if (clixon_plugins_load(h, CLIXON_PLUGIN_INIT, dir, NULL) < 0)
@@ -635,12 +630,11 @@ main(int    argc,
     /* Load main application yang specification either module or specific file
      * If -y <file> is given, it overrides main module */
     if (yang_filename){
-	if (yang_spec_parse_file(h, yang_filename, clicon_yang_dir(h), yspec, NULL) < 0)
+	if (yang_spec_parse_file(h, yang_filename, yspec, NULL) < 0)
 	    goto done;
     }
     else if (yang_spec_parse_module(h, clicon_yang_module_main(h),
-		       clicon_yang_dir(h),
-		       clicon_yang_module_revision(h),
+				    clicon_yang_module_revision(h),
 				    yspec, NULL) < 0)
 	goto done;
 
@@ -649,10 +643,10 @@ main(int    argc,
 	goto done;
     /* Add system modules */
      if (clicon_option_bool(h, "CLICON_STREAM_DISCOVERY_RFC8040") &&
-	 yang_spec_parse_module(h, "ietf-restconf-monitoring", CLIXON_DATADIR, NULL, yspec, NULL)< 0)
+	 yang_spec_parse_module(h, "ietf-restconf-monitoring", NULL, yspec, NULL)< 0)
 	 goto done;
      if (clicon_option_bool(h, "CLICON_STREAM_DISCOVERY_RFC5277") &&
-	 yang_spec_parse_module(h, "ietf-netconf-notification", CLIXON_DATADIR, NULL, yspec, NULL)< 0)
+	 yang_spec_parse_module(h, "ietf-netconf-notification", NULL, yspec, NULL)< 0)
 	 goto done;
     /* Call start function in all plugins before we go interactive 
        Pass all args after the standard options to plugin_start
diff --git a/configure b/configure
index 9428e91f..7eba05ec 100755
--- a/configure
+++ b/configure
@@ -4391,15 +4391,14 @@ fi
 done
 
 
-# This is to find clixon system files in the source code and Makefile
+# CLIXON_DATADIR is where clixon installs the "system" yang files in yang/Makfile
+# This directory should most probably be included in each application,
+# so each application designer may need to place CLIXON_DATADIR in their config
+# (last in yang dir list):
+# <CLIXON-YANG-DIR>$CLIXON_DATADIR</CLIXON-YANG_DIR>
 
 CLIXON_DATADIR="${prefix}/share/clixon"
 
-cat >>confdefs.h <<_ACEOF
-#define CLIXON_DATADIR "${CLIXON_DATADIR}"
-_ACEOF
-
-
 # Default location for config file
 
 cat >>confdefs.h <<_ACEOF
diff --git a/configure.ac b/configure.ac
index c46628fb..ebdccaf6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -199,10 +199,13 @@ AC_CHECK_LIB(dl, dlopen)
 
 AC_CHECK_FUNCS(inet_aton sigaction sigvec strlcpy strsep strndup alphasort versionsort strverscmp)
 
-# This is to find clixon system files in the source code and Makefile
+# CLIXON_DATADIR is where clixon installs the "system" yang files in yang/Makfile
+# This directory should most probably be included in each application,
+# so each application designer may need to place CLIXON_DATADIR in their config
+# (last in yang dir list):
+# <CLIXON-YANG-DIR>$CLIXON_DATADIR</CLIXON-YANG_DIR>
 AC_SUBST(CLIXON_DATADIR)
 CLIXON_DATADIR="${prefix}/share/clixon"
-AC_DEFINE_UNQUOTED(CLIXON_DATADIR, "${CLIXON_DATADIR}", [Clixon data dir for system yang files etc])
 
 # Default location for config file
 AC_DEFINE_UNQUOTED(CLIXON_DEFAULT_CONFIG,"${CLIXON_DEFAULT_CONFIG}",[Location for apps to find default config file])
diff --git a/datastore/datastore_client.c b/datastore/datastore_client.c
index 82c0263e..e5c5440c 100644
--- a/datastore/datastore_client.c
+++ b/datastore/datastore_client.c
@@ -71,7 +71,7 @@ sudo ./datastore_client -d candidate -b /usr/local/var/example -p /home/olof/src
 #include <clixon/clixon.h>
 
 /* Command line options to be passed to getopt(3) */
-#define DATASTORE_OPTS "hDd:p:b:y:m:"
+#define DATASTORE_OPTS "hDd:p:b:y:"
 
 /*! usage
  */
@@ -85,8 +85,7 @@ usage(char *argv0)
 		"\t-d <db>\t\tDatabase name. Default: running. Alt: candidate,startup\n"
 		"\t-b <dir>\tDatabase directory. Mandatory\n"
 		"\t-p <plugin>\tDatastore plugin. Mandatory\n"
-		"\t-y <dir>\tYang directory (where modules are stored). Mandatory\n"
-		"\t-m <module>\tYang module. Mandatory\n"
+		"\t-y <file>\tYang file. Mandatory\n"
 		"and command is either:\n"
 		"\tget [<xpath>]\n"
  	        "\tmget <nr> [<xpath>]\n"
@@ -115,7 +114,6 @@ main(int argc, char **argv)
     char               *plugin = NULL;
     char               *cmd = NULL;
     yang_spec          *yspec = NULL;
-    char               *yangdir = NULL;
     char               *yangmodule = NULL;
     char               *dbdir = NULL;
     int                 ret;
@@ -158,12 +156,7 @@ main(int argc, char **argv)
 	        usage(argv0);
 	    dbdir = optarg;
 	    break;
-	case 'y': /* Yang directory */
-	    if (!optarg)
-	        usage(argv0);
-	    yangdir = optarg;
-	    break;
-	case 'm': /* Yang module */
+	case 'y': /* Yang file */
 	    if (!optarg)
 	        usage(argv0);
 	    yangmodule = optarg;
@@ -188,10 +181,6 @@ main(int argc, char **argv)
 	clicon_err(OE_DB, 0, "Missing dbdir -b option");
 	goto done;
     }
-    if (yangdir == NULL){
-	clicon_err(OE_YANG, 0, "Missing yangdir -y option");
-	goto done;
-    }
     if (yangmodule == NULL){
 	clicon_err(OE_YANG, 0, "Missing yang module -m option");
 	goto done;
@@ -206,7 +195,7 @@ main(int argc, char **argv)
     if ((yspec = yspec_new()) == NULL)
 	goto done;
     /* Parse yang spec from given file */
-    if (yang_parse(h, NULL, yangmodule, yangdir, NULL, yspec, NULL) < 0)
+    if (yang_parse(h, yangmodule, NULL, NULL, yspec, NULL) < 0)
 	goto done;
     /* Set database directory option */
     if (xmldb_setopt(h, "dbdir", dbdir) < 0)
diff --git a/datastore/text/clixon_xmldb_text.c b/datastore/text/clixon_xmldb_text.c
index bee21bd0..5d1edaf2 100644
--- a/datastore/text/clixon_xmldb_text.c
+++ b/datastore/text/clixon_xmldb_text.c
@@ -1367,8 +1367,7 @@ main(int    argc,
     enum operation_type      op;
     char       *cmd;
     char       *db;
-    char       *yangdir;
-    char       *yangmod;
+    char       *yangmod; /* yang file */
     yang_spec  *yspec = NULL;
     clicon_handle h;
 
@@ -1381,12 +1380,11 @@ main(int    argc,
     }
     cmd = argv[1];
     db = argv[2];
-    yangdir = argv[3];
     yangmod = argv[4];
     db_init(db);
     if ((yspec = yspec_new()) == NULL)
 	goto done
-    if (yang_parse(h, NULL, yangmod, yangdir, NULL, yspec) < 0)
+    if (yang_parse(h, NULL, yangmod, NULL, yspec) < 0)
 	goto done;
     if (strcmp(cmd, "get")==0){
 	if (argc < 5)
diff --git a/doc/FAQ.md b/doc/FAQ.md
index 25727e98..a5539c5a 100644
--- a/doc/FAQ.md
+++ b/doc/FAQ.md
@@ -97,13 +97,31 @@ configuration file is /usr/local/etc/clixon.xml. The example
 configuration file is installed at /usr/local/etc/example.xml. The
 YANG specification for the configuration file is clixon-config.yang.
 
-You can change where Clixon looks for the configuration FILE as follows:
+## How are Clixon configuration files found?
+
+Clixon by default finds its configuration file at `/usr/local/etc/clixon.xml`. However, you can modify this location as follows:
   - Provide -f FILE option when starting a program (eg clixon_backend -f FILE)
   - Provide --with-configfile=FILE when configuring
-  - Provide --with-sysconfig=<dir> when configuring, then FILE is <dir>/clixon.xml
-  - Provide --sysconfig=<dir> when configuring then FILE is <dir>/etc/clixon.xml
+  - Provide --with-sysconfig=<dir> when configuring. Then FILE is <dir>/clixon.xml
+  - Provide --sysconfig=<dir> when configuring. Then FILE is <dir>/etc/clixon.xml
   - FILE is /usr/local/etc/clixon.xml
 
+## How are Yang files found?
+
+Yang files contain the configuration specification. A Clixon
+application loads yang files and clixon itself loads system yang
+files. When Yang files are loaded modules are imported and submodules
+are included.
+
+The following configuration file options control the loading of Yang files:
+- `CLICON_YANG_DIR` -  A list of directories (yang dir path) where Clixon searches for module and submodules.
+- `CLICON_YANG_MODULE_MAIN` - Specifies a single module to load. The module is searched for in the yang dir path.
+- `CLICON_YANG_MODULE_REVISION` : Specifies a revision to the main module. 
+
+Note that the special `CLIXON_DATADIR`, by default `/usr/local/share/clixon` should be included in the yang dir path for Clixon system files to be found.
+
+Application also has a command-line option `-y` to include a single Yang using absolute file path. This is mainly for debugging.
+
 ## How do I enable Yang features?
 
 Yang models have features, and parts of a specification can be
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 7b1ce519..ad0f4203 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -44,11 +44,13 @@ all:  $(SUBDIRS) doc
 	echo "Build doxygen doc: make doc"
 
 # Regular doxygen documentation
+# Need to install doxygen
 doc:	
 	doxygen Doxyfile # generates html dir
 	echo "Build doxygen graphs: make graphs"
 
 # doxygen documentation with callgraphs
+# Need to install graphviz
 graphs:
 	doxygen Doxyfile.graphs # generates html dir + call graphs (takes time)
 
diff --git a/example/example.xml b/example/example.xml
index c222f6ce..b6b42cdb 100644
--- a/example/example.xml
+++ b/example/example.xml
@@ -2,6 +2,7 @@
   <CLICON_CONFIGFILE>/usr/local/etc/example.xml</CLICON_CONFIGFILE>
   <CLICON_FEATURE>*:*</CLICON_FEATURE>
   <CLICON_YANG_DIR>/usr/local/share/example/yang</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
   <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
   <CLICON_CLI_MODE>example</CLICON_CLI_MODE>
   <CLICON_BACKEND_DIR>/usr/local/lib/example/backend</CLICON_BACKEND_DIR>
diff --git a/include/clixon_config.h.in b/include/clixon_config.h.in
index 1cc881df..f8678e33 100644
--- a/include/clixon_config.h.in
+++ b/include/clixon_config.h.in
@@ -1,8 +1,5 @@
 /* include/clixon_config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* Clixon data dir for system yang files etc */
-#undef CLIXON_DATADIR
-
 /* Location for apps to find default config file */
 #undef CLIXON_DEFAULT_CONFIG
 
@@ -42,6 +39,9 @@
 /* Define to 1 if you have the `crypt' library (-lcrypt). */
 #undef HAVE_LIBCRYPT
 
+/* Define to 1 if you have the `curl' library (-lcurl). */
+#undef HAVE_LIBCURL
+
 /* Define to 1 if you have the `dl' library (-ldl). */
 #undef HAVE_LIBDL
 
@@ -133,4 +133,4 @@
    `char[]'. */
 #undef YYTEXT_POINTER
 
-#include "clixon_custom.h"
+#include <clixon_custom.h>
diff --git a/lib/clixon/clixon_options.h b/lib/clixon/clixon_options.h
index f06660f0..d774fe29 100644
--- a/lib/clixon/clixon_options.h
+++ b/lib/clixon/clixon_options.h
@@ -105,9 +105,6 @@ int clicon_option_del(clicon_handle h, const char *name);
 static inline char *clicon_configfile(clicon_handle h){
     return clicon_option_str(h, "CLICON_CONFIGFILE");
 }
-static inline char *clicon_yang_dir(clicon_handle h){
-    return clicon_option_str(h, "CLICON_YANG_DIR");
-}
 static inline char *clicon_yang_module_main(clicon_handle h){
     return clicon_option_str(h, "CLICON_YANG_MODULE_MAIN");
 }
diff --git a/lib/clixon/clixon_yang.h b/lib/clixon/clixon_yang.h
index 5b3b01e2..222f3f91 100644
--- a/lib/clixon/clixon_yang.h
+++ b/lib/clixon/clixon_yang.h
@@ -95,6 +95,7 @@ enum rfc_6020{
     Y_MANDATORY,
     Y_MAX_ELEMENTS,
     Y_MIN_ELEMENTS,
+    Y_MODIFIER,
     Y_MODULE,
     Y_MUST,
     Y_NAMESPACE,
@@ -193,6 +194,8 @@ struct yang_stmt{
 
     char              *ys_argument;  /* String / argument depending on keyword */   
     int                ys_flags;     /* Flags according to YANG_FLAG_* above */
+    /*--------------here common for all -------*/
+    char              *ys_extra;     /* For unknown */
     cg_var            *ys_cv;        /* cligen variable. See ys_populate()
 					Following stmts have cv:s:
 				        leaf: for default value
@@ -200,7 +203,7 @@ struct yang_stmt{
 					config: boolean true or false
 					mandatory: boolean true or false
 					fraction-digits for fraction-digits
-					unkown-stmt (argument)
+					unknown-stmt (argument)
 				     */
     cvec              *ys_cvec;      /* List of stmt-specific variables 
 					Y_RANGE: range_min, range_max 
@@ -265,11 +268,12 @@ int        yang_print_cbuf(cbuf *cb, yang_node *yn, int marginal);
 int        ys_populate(yang_stmt *ys, void *arg);
 yang_stmt *yang_parse_file(int fd, const char *name, yang_spec *ysp);
 int        yang_parse(clicon_handle h, const char *filename,
-		      const char *module, const char *dir, 
+		      const char *module, 
 		      const char *revision, yang_spec *ysp, yang_stmt **ymodp);
 int        yang_apply(yang_node *yn, enum rfc_6020 key, yang_applyfn_t fn, 
 		      void *arg);
-int        yang_abs_schema_nodeid(yang_spec *yspec, char *schema_nodeid, 
+int        yang_abs_schema_nodeid(yang_spec *yspec, yang_stmt *ys,
+				  char *schema_nodeid, 
 				  enum rfc_6020 keyword, yang_stmt **yres);
 int        yang_desc_schema_nodeid(yang_node *yn, char *schema_nodeid, 
 				   enum rfc_6020 keyword, yang_stmt **yres);
@@ -277,8 +281,8 @@ cg_var    *ys_parse(yang_stmt *ys, enum cv_type cvtype);
 int        ys_parse_sub(yang_stmt *ys, char *extra);
 int        yang_mandatory(yang_stmt *ys);
 int        yang_config(yang_stmt *ys);
-int        yang_spec_parse_module(clicon_handle h, char *module, char *dir, char *revision, yang_spec *yspec, yang_stmt **ymodp);
-int        yang_spec_parse_file(clicon_handle h, char *filename, char *dir, yang_spec *yspec, yang_stmt **ymodp);
+int        yang_spec_parse_module(clicon_handle h, char *module, char *revision, yang_spec *yspec, yang_stmt **ymodp);
+int        yang_spec_parse_file(clicon_handle h, char *filename, yang_spec *yspec, yang_stmt **ymodp);
 cvec      *yang_arg2cvec(yang_stmt *ys, char *delimi);
 int        yang_key_match(yang_node *yn, char *name);
 
diff --git a/lib/src/clixon_netconf_lib.c b/lib/src/clixon_netconf_lib.c
index d832ffc9..c2a25f25 100644
--- a/lib/src/clixon_netconf_lib.c
+++ b/lib/src/clixon_netconf_lib.c
@@ -988,9 +988,9 @@ netconf_module_load(clicon_handle h)
 
     yspec = clicon_dbspec_yang(h);
     /* Load yang spec */
-    if (yang_spec_parse_module(h, "ietf-netconf", CLIXON_DATADIR, NULL, yspec, NULL)< 0)
+    if (yang_spec_parse_module(h, "ietf-netconf", NULL, yspec, NULL)< 0)
 	goto done;
-    if (yang_spec_parse_module(h, "ietf-netconf-notification", CLIXON_DATADIR, NULL, yspec, NULL)< 0)
+    if (yang_spec_parse_module(h, "ietf-netconf-notification", NULL, yspec, NULL)< 0)
 	goto done;
     if ((xc = clicon_conf_xml(h)) == NULL){
 	clicon_err(OE_CFG, ENOENT, "Clicon configuration not loaded");
diff --git a/lib/src/clixon_options.c b/lib/src/clixon_options.c
index 62202def..5804f182 100644
--- a/lib/src/clixon_options.c
+++ b/lib/src/clixon_options.c
@@ -178,8 +178,16 @@ parse_configfile(clicon_handle  h,
 		       __FUNCTION__, name, body);
 	    continue;
 	}
+	/* hard-coded exceptions for configure options that are leaf-lists (not leaf)
+	 * They must be accessed directly by looping over clicon_conf_xml(h)
+	 */
 	if (strcmp(name,"CLICON_FEATURE")==0)
 	    continue;
+	if (strcmp(name,"CLICON_YANG_DIR")==0)
+	    continue;
+	/* Used as an arg to this fn */
+	if (strcmp(name,"CLICON_CONFIGFILE")==0)
+	    continue;
 	if (hash_add(copt, 
 		     name,
 		     body,
@@ -236,14 +244,25 @@ clicon_options_main(clicon_handle h,
 	clicon_err(OE_CFG, 0, "%s: suffix %s not recognized (Run ./configure --with-config-compat?)", configfile, suffix);
 	goto done;
     }
-    /* Parse clixon yang spec */
-    if (yang_parse(h, NULL, "clixon-config", CLIXON_DATADIR, NULL, yspec, NULL) < 0)
-	goto done;    
-    /* Read configfile */
+    /* Read configfile first without yangspec, for bootstrapping */
     if (parse_configfile(h, configfile, yspec, &xconfig) < 0)
 	goto done;
     if (xml_rootchild(xconfig, 0, &xconfig) < 0)
 	goto done;
+    /* Set clixon_conf pointer to handle */
+    clicon_conf_xml_set(h, xconfig);
+    /* Parse clixon yang spec */
+    if (yang_parse(h, NULL, "clixon-config", NULL, yspec, NULL) < 0)
+	goto done;    
+    clicon_conf_xml_set(h, NULL);
+    if (xconfig)
+	xml_free(xconfig);
+    /* Read configfile second time now with check yang spec */
+    if (parse_configfile(h, configfile, yspec, &xconfig) < 0)
+	goto done;
+    if (xml_rootchild(xconfig, 0, &xconfig) < 0)
+	goto done;
+    /* Set clixon_conf pointer to handle */
     clicon_conf_xml_set(h, xconfig);
     /* Specific option handling */
     if (clicon_option_bool(h, "CLICON_XML_SORT") == 1)
@@ -638,7 +657,7 @@ clicon_conf_xml(clicon_handle h)
     return NULL;
 }
 
-/*! Set YANG specification for Clixon system options and features
+ /*! Set YANG specification for Clixon system options and features
  * ys must be a malloced pointer
  */
 int
diff --git a/lib/src/clixon_yang.c b/lib/src/clixon_yang.c
index 2afb0b6b..a7033ce2 100644
--- a/lib/src/clixon_yang.c
+++ b/lib/src/clixon_yang.c
@@ -122,6 +122,7 @@ static const map_str2int ykmap[] = {
     {"mandatory",        Y_MANDATORY}, 
     {"max-elements",     Y_MAX_ELEMENTS}, 
     {"min-elements",     Y_MIN_ELEMENTS}, 
+    {"modifier",         Y_MODIFIER}, 
     {"module",           Y_MODULE}, 
     {"must",             Y_MUST}, 
     {"namespace",        Y_NAMESPACE}, 
@@ -206,6 +207,8 @@ ys_free1(yang_stmt *ys)
 {
     if (ys->ys_argument)
 	free(ys->ys_argument);
+    if (ys->ys_extra)
+	free(ys->ys_extra);
     if (ys->ys_cv)
 	cv_free(ys->ys_cv);
     if (ys->ys_cvec)
@@ -233,7 +236,8 @@ ys_free(yang_stmt *ys)
     return 0;
 }
 
-/*! Free a yang specification recursively */
+/*! Free a yang specification recursively 
+ */
 int 
 yspec_free(yang_spec *yspec)
 {
@@ -294,6 +298,11 @@ ys_cp(yang_stmt *ynew,
 	    clicon_err(OE_YANG, errno, "strdup");
 	    goto done;
 	}
+    if (yold->ys_extra)
+	if ((ynew->ys_extra = strdup(yold->ys_extra)) == NULL){
+	    clicon_err(OE_YANG, errno, "strdup");
+	    goto done;
+	}
     if (yold->ys_cv)
 	if ((ynew->ys_cv = cv_dup(yold->ys_cv)) == NULL){
 	    clicon_err(OE_YANG, errno, "cv_dup");
@@ -672,7 +681,8 @@ yang_find_topnode(yang_spec *ysp,
     if (yang_nodeid_split(nodeid, &prefix, &id) < 0)
 	goto done;
     if (prefix){
-	if ((ymod = yang_find((yang_node*)ysp, Y_MODULE, prefix)) != NULL){
+	if ((ymod = yang_find((yang_node*)ysp, Y_MODULE, prefix)) != NULL ||
+	    (ymod = yang_find((yang_node*)ysp, Y_SUBMODULE, prefix)) != NULL){
 	    if ((yres = yang_find((yang_node*)ymod, 0, id)) != NULL)
 		goto ok;
 	    goto done;
@@ -771,7 +781,7 @@ yang_order(yang_stmt *y)
     int         j=0;
     
     yp = y->ys_parent;
-    if (yp->yn_keyword == Y_MODULE ||yp->yn_keyword == Y_SUBMODULE){
+    if (yp->yn_keyword == Y_MODULE || yp->yn_keyword == Y_SUBMODULE){
 	ypp = yp->yn_parent;
 	for (i=0; i<ypp->yn_len; i++){
 	    yn = (yang_node*)ypp->yn_stmt[i];
@@ -800,7 +810,8 @@ yang_key2str(int keyword)
     return (char*)clicon_int2str(ykmap, keyword);
 }
 
-/*! Find top module or sub-module given a statement. Ultimate top is yang spec 
+/*! Find top module or sub-module given a statement. 
+ * Ultimate top is yang spec, dont return that
  * The routine recursively finds ancestors.
  * @param[in] ys    Any yang statement in a yang tree
  * @retval    ymod  The top module or sub-module 
@@ -811,14 +822,13 @@ ys_module(yang_stmt *ys)
 {
     yang_node *yn;
 
-#if 1
     if (ys==NULL || ys->ys_keyword==Y_SPEC)
 	return NULL;
-#else
-    if (ys==NULL || ys->ys_keyword==Y_SPEC)
+    if (ys->ys_keyword == Y_MODULE || ys->ys_keyword == Y_SUBMODULE)
 	return ys;
-#endif
-    while (ys != NULL && ys->ys_keyword != Y_MODULE && ys->ys_keyword != Y_SUBMODULE){
+    while (ys != NULL &&
+	   ys->ys_keyword != Y_MODULE &&
+	   ys->ys_keyword != Y_SUBMODULE){
 	yn = ys->ys_parent;
 	/* Some extra stuff to ensure ys is a stmt */
 	if (yn && yn->yn_keyword == Y_SPEC)
@@ -973,7 +983,8 @@ yang_find_module_by_prefix(yang_stmt *ys,
     }
     yimport = NULL;
     while ((yimport = yn_each((yang_node*)my_ymod, yimport)) != NULL) {
-	if (yimport->ys_keyword != Y_IMPORT)
+	if (yimport->ys_keyword != Y_IMPORT &&
+	    yimport->ys_keyword != Y_INCLUDE)
 	    continue;
 	if ((yprefix = yang_find((yang_node*)yimport, Y_PREFIX, NULL)) != NULL &&
 	    strcmp(yprefix->ys_argument, prefix) == 0){
@@ -981,9 +992,10 @@ yang_find_module_by_prefix(yang_stmt *ys,
 	}
     }
     if (yimport){
-	if ((ymod = yang_find((yang_node*)yspec, Y_MODULE, yimport->ys_argument)) == NULL){
+	if ((ymod = yang_find((yang_node*)yspec, Y_MODULE, yimport->ys_argument)) == NULL &&
+	    (ymod = yang_find((yang_node*)yspec, Y_SUBMODULE, yimport->ys_argument)) == NULL){
 	    clicon_err(OE_YANG, 0, "No module or sub-module found with prefix %s", 
-		       yimport->ys_argument);	
+		       prefix);	
 	    yimport = NULL;
 	    goto done; /* unresolved */
 	}
@@ -1411,9 +1423,9 @@ ys_populate_feature(clicon_handle h,
     cg_var    *cv;
     char      *module;
     char      *feature;
-    cxobj     *x1;
+    cxobj     *xc;
 
-    /* Eg, when parsing the config xml itself */
+    /* get clicon config file in xml form */
     if ((x = clicon_conf_xml(h)) == NULL)
 	goto ok;
     if ((ymod = ys_module(ys)) == NULL){
@@ -1422,14 +1434,14 @@ ys_populate_feature(clicon_handle h,
     }
     module = ymod->ys_argument;
     feature = ys->ys_argument;
-    x1 = NULL;
-    while ((x1 = xml_child_each(x, x1, CX_ELMNT)) != NULL && found == 0) {
+    xc = NULL;
+    while ((xc = xml_child_each(x, xc, CX_ELMNT)) != NULL && found == 0) {
 	char *m = NULL;
 	char *f = NULL;
-	if (strcmp(xml_name(x1), "CLICON_FEATURE") != 0)
+	if (strcmp(xml_name(xc), "CLICON_FEATURE") != 0)
 	    continue;
 	/* get m and f from configuration feature rules */
-	if (yang_nodeid_split(xml_body(x1), &m, &f) < 0)
+	if (yang_nodeid_split(xml_body(xc), &m, &f) < 0)
 	    goto done;
 	if (m && f &&
 	    (strcmp(m,"*")==0 ||
@@ -1454,6 +1466,51 @@ ys_populate_feature(clicon_handle h,
     return retval;
 }
 
+/*! Populate unknown node with extension
+ */
+static int
+ys_populate_unknown(yang_stmt    *ys)
+{
+    int retval = -1;
+    int        cvret;
+    char      *reason = NULL;
+    yang_stmt *ymod;
+    char      *prefix = NULL;
+    char      *name;
+    char      *extra;
+
+    if ((extra = ys->ys_extra) == NULL)
+	goto ok;
+    /* Find extension, if found, store it as unknown, if not,
+       break for error */
+    prefix  = yarg_prefix(ys); /* And this its prefix */
+    name    = yarg_id(ys);     /* This is the type to resolve */
+    if ((ymod = yang_find_module_by_prefix(ys, prefix)) == NULL)
+	goto ok; /* shouldnt happen */
+    if (yang_find((yang_node*)ymod, Y_EXTENSION, name) == NULL){
+	clicon_err(OE_YANG, errno, "Extension %s:%s not found", prefix, name);
+	goto done;
+    }
+    if ((ys->ys_cv = cv_new(CGV_STRING)) == NULL){
+	clicon_err(OE_YANG, errno, "cv_new"); 
+	goto done;
+    }
+    if ((cvret = cv_parse1(extra, ys->ys_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);
+	goto done;
+    }
+ ok:
+    retval = 0;
+ done:
+    if (prefix)
+	free(prefix);
+    return retval;
+}
+
 /*! Populate with cligen-variables, default values, etc. Sanity checks on complete tree.
  *
  * We do this in 2nd pass after complete parsing to be sure to have a complete parse-tree
@@ -1495,6 +1552,10 @@ ys_populate(yang_stmt *ys,
 	if (ys_populate_identity(ys, NULL) < 0)
 	    goto done;
 	break;
+    case Y_UNKNOWN:
+	if (ys_populate_unknown(ys) < 0)
+	    goto done;
+	break;
     default:
 	break;
     }
@@ -1555,12 +1616,11 @@ yang_augment_node(yang_stmt *ys,
     yang_stmt *yss = NULL;
     yang_stmt *yc;
     int        i;
-
+    
     schema_nodeid = ys->ys_argument;
     clicon_debug(1, "%s %s", __FUNCTION__, schema_nodeid);
-
     /* Find the target */
-    if (yang_abs_schema_nodeid(ysp, schema_nodeid, -1, &yss) < 0)
+    if (yang_abs_schema_nodeid(ysp, ys, schema_nodeid, -1, &yss) < 0)
 	goto done;
     if (yss == NULL)
 	goto ok;
@@ -1646,14 +1706,15 @@ yang_expand(yang_node *yn)
 	    prefix  = yarg_prefix(ys); /* And this its prefix */
 	    if (ys_grouping_resolve(ys, prefix, name, &ygrouping) < 0)
 		goto done;
-	    if (prefix)
-		free(prefix); 
+
 	    if (ygrouping == NULL){
-		clicon_log(LOG_NOTICE, "%s: Yang error : grouping \"%s\" not found", 
-			   __FUNCTION__, ys->ys_argument);
+		clicon_log(LOG_NOTICE, "%s: Yang error : grouping \"%s\" not found in module \"%s\"", 
+			   __FUNCTION__, ys->ys_argument, ys_module(ys)->ys_argument);
 		goto done;
 		break;
 	    }
+	    if (prefix)
+		free(prefix); /* XXX move up */
 	    /* Check mark flag to see if this grouping (itself) has been expanded
 	       If not, this needs to be done before we can insert it into
 	       the 'uses' place */
@@ -1825,48 +1886,69 @@ yang_parse_file(int         fd,
     return ymod; /* top-level (sub)module */
 }
 
-/*! No specific revision give. Match a yang file given dir and module 
+/*! No specific revision give. Match a yang file given module 
  * @param[in]  h        CLICON handle
- * @param[in]  yang_dir Directory where all YANG module files reside
+ * @param[in]  dir      Directory, if NULL, look in YANG_DIR path
  * @param[in]  module   Name of main YANG module. 
+ * @param[in]  revision Revision or NULL
  * @param[out] fbuf     Buffer containing filename
- *
+ * @note for bootstrapping, dir may have to be set.
  * @retval 1            Match found, Most recent entry returned in fbuf
  * @retval 0            No matching entry found
  * @retval -1           Error 
 */
 static int
-yang_parse_find_match(const char   *yang_dir, 
-		      const char   *module, 
+yang_parse_find_match(clicon_handle h, 
+		      const char   *module,
+		      const char   *revision, 
 		      cbuf         *fbuf)    
 {
-    int retval = -1;
+    int            retval = -1;
     struct dirent *dp = NULL;
     int            ndp;
     cbuf          *regex = NULL;
+    cxobj         *x;
+    cxobj         *xc;
+    char          *dir;
 
+    /* get clicon config file in xml form */
+    if ((x = clicon_conf_xml(h)) == NULL)
+	goto ok;
     if ((regex = cbuf_new()) == NULL){
 	clicon_err(OE_YANG, errno, "cbuf_new");
 	goto done;
     }
     /* RFC 6020: The name of the file SHOULD be of the form:
-       module-or-submodule-name ['@' revision-date] ( '.yang' / '.yin' )
-       revision-date ::= 4DIGIT "-" 2DIGIT "-" 2DIGIT
-    */
-    cprintf(regex, "^%s(@[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9])?(.yang)$", 
-	    module);
-    if ((ndp = clicon_file_dirent(yang_dir, 
-				  &dp, 
-				  cbuf_get(regex),
-				  S_IFREG)) < 0)
-	goto done;
-    /* Entries are sorted, last entry should be most recent date */
-    if (ndp != 0){
-	cprintf(fbuf, "%s/%s", yang_dir, dp[ndp-1].d_name);
-	retval = 1;
-    }
+     * module-or-submodule-name ['@' revision-date] ( '.yang' / '.yin' )
+     * revision-date ::= 4DIGIT "-" 2DIGIT "-" 2DIGIT
+     */
+    if (revision)
+	cprintf(regex, "^%s@%s(.yang)$", module, revision);
     else
-	retval = 0;
+	cprintf(regex, "^%s(@[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9])?(.yang)$", 
+		module);
+    xc = NULL;
+    while ((xc = xml_child_each(x, xc, CX_ELMNT)) != NULL) {
+	if (strcmp(xml_name(xc), "CLICON_YANG_DIR") != 0)
+	    continue;
+	dir = xml_body(xc);
+	/* get all matching files in this directory */
+	if ((ndp = clicon_file_dirent(dir, 
+				      &dp, 
+				      cbuf_get(regex),
+				      S_IFREG)) < 0)
+	    goto done;
+	/* Entries are sorted, last entry should be most recent date 
+	 * Found
+	 */
+	if (ndp != 0){
+	    cprintf(fbuf, "%s/%s", dir, dp[ndp-1].d_name);
+	    retval = 1;
+	    goto done;
+	}
+    }
+ ok:
+    retval = 0;
  done:
     if (regex)
 	cbuf_free(regex);
@@ -1875,7 +1957,6 @@ yang_parse_find_match(const char   *yang_dir,
     return retval;
 }
 
-
 /*! Open a file, read into a string and invoke yang parsing
  *
  * Similar to clicon_yang_str(), just read a file first
@@ -1903,7 +1984,6 @@ yang_parse_filename(const char   *filename,
     int           fd = -1;
     struct stat   st;
 
-    clicon_log(LOG_DEBUG, "Parsing yang file: %s", filename);
     if (stat(filename, &st) < 0){
 	clicon_err(OE_YANG, errno, "%s not found", filename);
 	goto done;
@@ -1921,8 +2001,8 @@ yang_parse_filename(const char   *filename,
 }
 
 static yang_stmt *
-yang_parse_module(const char   *module, 
-		  const char   *dir, 
+yang_parse_module(clicon_handle h,
+		  const char   *module, 
 		  const char   *revision, 
 		  yang_spec    *ysp)
 {
@@ -1934,16 +2014,12 @@ yang_parse_module(const char   *module,
 	clicon_err(OE_YANG, errno, "cbuf_new");
 	goto done;
     }
-    if (revision)
-	cprintf(fbuf, "%s/%s@%s.yang", dir, module, revision);
-    else{
-	/* No specific revision, Match a yang file */
-	if ((nr = yang_parse_find_match(dir, module, fbuf)) < 0)
-	    goto done;
-	if (nr == 0){
-	    clicon_err(OE_YANG, errno, "No matching %s yang files found in %s (expected module name or absolute filename)", module, dir);
-	    goto done;
-	}
+    /* Match a yang file with or without revision in yang-dir list */
+    if ((nr = yang_parse_find_match(h, module, revision, fbuf)) < 0)
+	goto done;
+    if (nr == 0){
+	clicon_err(OE_YANG, errno, "No yang files found matching \"%s\" in the list of CLICON_YANG_DIRs", module);
+	goto done;
     }
     if ((ymod = yang_parse_filename(cbuf_get(fbuf), ysp)) == NULL)
 	goto done;
@@ -1953,10 +2029,9 @@ yang_parse_module(const char   *module,
     return ymod; /* top-level (sub)module */
 }
 
-/*! Parse one yang module then go through (sub)modules and parse them recursively
+/*! Given a (sub)module, parse all (sub)modules in turn recursively
  *
  * @param[in] h        CLICON handle
- * @param[in] yang_dir Directory where all YANG module files reside
  * @param[in] module   Name of main YANG module. Or absolute file name.
  * @param[in] revision Module revision date or NULL
  * @param[in] ysp      Yang specification. Should have been created by caller using yspec_new
@@ -1972,8 +2047,8 @@ yang_parse_module(const char   *module,
  *   clixon_yang_parseparse # Actual yang parsing using yacc
  */
 static int
-yang_parse_recurse(yang_stmt    *ymod,
-		   const char   *dir, 
+yang_parse_recurse(clicon_handle h,
+		   yang_stmt    *ymod,
 		   yang_spec    *ysp)
 {
     int         retval = -1;
@@ -1982,21 +2057,29 @@ yang_parse_recurse(yang_stmt    *ymod,
     char       *submodule;
     char       *subrevision;
     yang_stmt  *subymod;
+    enum rfc_6020 keyw;
 
-    /* go through all import statements of ysp (or its module) */
+    /* go through all import (modules) and include(submodules) of ysp */
     while ((yi = yn_each((yang_node*)ymod, yi)) != NULL){
-	if (yi->ys_keyword != Y_IMPORT)
+	keyw = yi->ys_keyword;
+	if (keyw != Y_IMPORT && keyw != Y_INCLUDE)
 	    continue;
+	/* common part */
 	submodule = yi->ys_argument;
+	/* Is there a specific revision (or just latest)? */
 	if ((yrev = yang_find((yang_node*)yi, Y_REVISION_DATE, NULL)) != NULL)
 	    subrevision = yrev->ys_argument;
 	else
 	    subrevision = NULL;
-	if (yang_find((yang_node*)ysp, Y_MODULE, submodule) == NULL){
+	/* if already loaded, ignore, else parse the file */
+	if (yang_find((yang_node*)ysp,
+		      keyw=Y_IMPORT?Y_MODULE:Y_SUBMODULE,
+		      submodule) == NULL){
 	    /* recursive call */
-	    if ((subymod = yang_parse_module(submodule, dir, subrevision, ysp)) == NULL)
+	    if ((subymod = yang_parse_module(h, submodule, subrevision, ysp)) == NULL)
 		goto done;
-	    if (yang_parse_recurse(subymod, dir, ysp) < 0){
+	    /* Go through its sub-modules recursively */
+	    if (yang_parse_recurse(h, subymod, ysp) < 0){
 		ymod = NULL;
 		goto done;
 	    }
@@ -2019,7 +2102,8 @@ ys_schemanode_check(yang_stmt *ys,
     yp = ys->ys_parent;
     switch (ys->ys_keyword){
     case Y_AUGMENT:
-	if (yp->yn_keyword == Y_MODULE) /* Not top-level */
+	if (yp->yn_keyword == Y_MODULE || /* Not top-level */
+	    yp->yn_keyword == Y_SUBMODULE) 
 	    break;
 	/* fallthru */
     case Y_REFINE:
@@ -2035,7 +2119,7 @@ ys_schemanode_check(yang_stmt *ys,
 	break;
     case Y_DEVIATION:
 	yspec = ys_spec(ys);
-	if (yang_abs_schema_nodeid(yspec, ys->ys_argument, -1, &yres) < 0)
+	if (yang_abs_schema_nodeid(yspec, ys, ys->ys_argument, -1, &yres) < 0)
 	    goto done;
 	if (yres == NULL){
 	    clicon_err(OE_YANG, 0, "schemanode sanity check of %s", ys->ys_argument);
@@ -2127,10 +2211,69 @@ yang_features(clicon_handle h,
     return retval;
 }
 
+/*! Merge yang submodule into the module it belongs to
+ * Skip submodule header fields
+ * @param[in] h      Clicon handle
+ * @param[in] yspec  Yang spec
+ * @param[in] ysubm  Yang submodule 
+ */
+static int
+yang_merge_submodules(clicon_handle h,
+		      yang_spec    *yspec,
+		      yang_stmt    *ysubm)
+{
+    int        retval = -1;
+    yang_stmt *yb;   /* belongs-to */
+    yang_stmt *ymod; /* parent yang module */
+    yang_stmt *yc;   /* yang child */
+    char      *modname;
+    int        i;
+    
+    assert(ysubm->ys_keyword == Y_SUBMODULE);
+    /* Get parent name (via belongs-to) and find parent module */
+    if ((yb = yang_find((yang_node*)ysubm, Y_BELONGS_TO, NULL)) == NULL){
+	clicon_err(OE_YANG, ENOENT, "submodule %s does not have a mandatory belongs-to statement", ysubm->ys_argument);
+	goto done;
+    }
+    modname = yb->ys_argument;
+    if ((ymod = yang_find((yang_node*)yspec, Y_MODULE, modname)) == NULL){
+	clicon_err(OE_YANG, ENOENT, "Module %s which submodule %s belongs to is not found", modname, ysubm->ys_argument);
+	goto done;
+    }
+    /* Move sub-module statements to modules 
+     * skip belongs-to, revision, organization, reference, yang-version) 
+     * since main module has its own and may only have one
+     * XXX: use queue,...
+     */
+    for (i=0; i<ysubm->ys_len; i++){
+	yc = ysubm->ys_stmt[i];
+	if (yc->ys_keyword == Y_BELONGS_TO ||
+	    yc->ys_keyword == Y_CONTACT ||
+	    yc->ys_keyword == Y_DESCRIPTION ||
+	    yc->ys_keyword == Y_ORGANIZATION ||
+	    yc->ys_keyword == Y_REVISION ||
+	    yc->ys_keyword == Y_REFERENCE ||
+	    yc->ys_keyword == Y_YANG_VERSION)
+	    ys_free(yc);
+	else{
+	    if (yn_insert((yang_node*)ymod, yc) < 0)
+		goto done;
+	}
+    }
+    if (ysubm->ys_stmt){
+	free(ysubm->ys_stmt);
+	ysubm->ys_stmt = NULL;
+    }
+    ysubm->ys_len = 0;
+    ys_free(ysubm);
+    retval = 0;
+ done:
+    return retval;
+}
+
 /*! Parse top yang module including all its sub-modules. Expand and populate yang tree
  *
  * @param[in] h        CLICON handle
- * @param[in] yang_dir Directory where all YANG module files reside (except mainfile)
  * @param[in] filename File name containing Yang specification. Overrides module
  * @param[in] module   Name of main YANG module. Or absolute file name.
  * @param[in] revision Main module revision date string or NULL
@@ -2154,7 +2297,6 @@ int
 yang_parse(clicon_handle h, 
 	   const char   *filename, 
 	   const char   *module, 
-	   const char   *dir, 
 	   const char   *revision, 
 	   yang_spec    *ysp,
     	   yang_stmt   **ymodp)
@@ -2164,63 +2306,89 @@ yang_parse(clicon_handle h,
     int         i;
     int         modnr;       /* Existing number of modules */
 
+    /* Apply steps 2.. on new modules, ie ones after modnr. */
     modnr = ysp->yp_len;
     if (filename){
 	if ((ymod = yang_parse_filename(filename, ysp)) == NULL)
 	    goto done;
     }
     else 
-	if ((ymod = yang_parse_module(module, dir, revision, ysp)) == NULL)
+	if ((ymod = yang_parse_module(h, module, revision, ysp)) == NULL)
 	    goto done;
 
-    /* From here on, apply actions on new modules, ie ones after modnr. */
-    /* Step 1: parse from text to yang parse-tree. */
+    /* 1: Parse from text to yang parse-tree. */
     /* Iterate through modules */
-    if (yang_parse_recurse(ymod, dir, ysp) < 0)
+    if (yang_parse_recurse(h, ymod, ysp) < 0)
 	goto done;
 
-    /* Check cardinality maybe this should be done after grouping/augment */
+    /* 2. Check cardinality maybe this should be done after grouping/augment */
     for (i=modnr; i<ysp->yp_len; i++) /* XXX */
 	if (yang_cardinality(h, ysp->yp_stmt[i], ysp->yp_stmt[i]->ys_argument) < 0)
 	    goto done;
 
-    /* Step 2: check features: check if enabled and remove disabled features */
+    /* 3: Merge sub-modules with modules - after this step, no submodules exist
+     * In the merge, remove submodule headers
+     */
+    for (i=modnr; i<ysp->yp_len; i++){
+	if (ysp->yp_stmt[i]->ys_keyword != Y_SUBMODULE)
+	    continue;
+    }
+    i = 0;
+    while (i<ysp->yp_len){
+	int j;
+	if (ysp->yp_stmt[i]->ys_keyword != Y_SUBMODULE){
+	    i++;
+	    continue;
+	}
+	if (yang_merge_submodules(h, ysp, ysp->yp_stmt[i]) < 0)
+	    goto done;
+	/* shift down one step */
+	for (j=i; j<ysp->yp_len-1; j++)
+	    ysp->yp_stmt[j] = ysp->yp_stmt[j+1];
+	ysp->yp_len--;
+    }
+
+    /* 4: Check features: check if enabled and remove disabled features */
     for (i=modnr; i<ysp->yp_len; i++) /* XXX */
 	if (yang_features(h, ysp->yp_stmt[i]) < 0)
 	    goto done;
     
-    /* Step 3: Go through parse tree and populate it with cv types */
+    /* 5: Go through parse tree and populate it with cv types */
     for (i=modnr; i<ysp->yp_len; i++)
 	if (yang_apply((yang_node*)ysp->yp_stmt[i], -1, ys_populate, (void*)h) < 0)
 	    goto done;
 
-
-    /* Step 4: Resolve all types: populate type caches. Requires eg length/range cvecs
-     * from ys_populate step
+    /* 6: Resolve all types: populate type caches. Requires eg length/range cvecs
+     * from ys_populate step.
+     * Must be done using static binding.
      */
     for (i=modnr; i<ysp->yp_len; i++)
-	yang_apply((yang_node*)ysp->yp_stmt[i], Y_TYPE, ys_resolve_type, NULL);
+	if (yang_apply((yang_node*)ysp->yp_stmt[i], Y_TYPE, ys_resolve_type, NULL) < 0)
+	    goto done;
 
-    /* Up to here resolving is made in the context they are defined, rather than the 
-       context they are used. Like static scoping. After this we expand all 
-       grouping/uses and unfold all macros into a single tree as they are used.
-    */
+    /* Up to here resolving is made in the context they are defined, rather 
+     * than the context they are used (except for submodules being merged w 
+     * modules). Like static scoping. 
+     * After this we expand all grouping/uses and unfold all macros into a
+     *single tree as they are used.
+     */
 
-    /* Step 5: Macro expansion of all grouping/uses pairs. Expansion needs marking */
+    /* 7: Macro expansion of all grouping/uses pairs. Expansion needs marking */
     for (i=modnr; i<ysp->yp_len; i++){
 	if (yang_expand((yang_node*)ysp->yp_stmt[i]) < 0)
 	    goto done;
 	yang_apply((yang_node*)ysp->yp_stmt[i], -1, ys_flag_reset, (void*)YANG_FLAG_MARK);
     }
 
-    /* Step 6: Top-level augmentation of all modules XXX: only new modules? */
+    /* 8: Top-level augmentation of all modules XXX: only new modules? */
     if (yang_augment_spec(ysp) < 0)
 	goto done;
 
-    /* Step 7: sanity check of schemanode references, need more here */
+    /* 9: sanity check of schemanode references, need more here */
     for (i=modnr; i<ysp->yp_len; i++)
 	if (yang_apply((yang_node*)ysp->yp_stmt[i], -1, ys_schemanode_check, NULL) < 0)
 	    goto done;
+    /* Return main module parsed in step 1 */
     if (ymodp)
 	*ymodp = ymod;
     retval = 0;
@@ -2367,6 +2535,7 @@ schema_nodeid_vec(yang_node  *yn,
 
 /*! Given an absolute schema-nodeid (eg /a/b/c) find matching yang spec  
  * @param[in]  yspec         Yang specification.
+ * @param[in]  yn            Original yang stmt (where call is made) if any
  * @param[in]  schema_nodeid Absolute schema-node-id, ie /a/b
  * @param[in]  keyword       A schemode of this type, or -1 if any
  * @param[out] yres          Result yang statement node, or NULL if not found
@@ -2382,6 +2551,7 @@ schema_nodeid_vec(yang_node  *yn,
  */
 int
 yang_abs_schema_nodeid(yang_spec    *yspec,
+		       yang_stmt    *yn,
 		       char         *schema_nodeid,
 		       enum rfc_6020 keyword,
 		       yang_stmt   **yres)
@@ -2389,7 +2559,7 @@ yang_abs_schema_nodeid(yang_spec    *yspec,
     int              retval = -1;
     char           **vec = NULL;
     int              nvec;
-    yang_stmt       *ymod;
+    yang_stmt       *ymod = NULL;
     char            *id;
     char            *prefix = NULL;
     yang_stmt       *yprefix;
@@ -2421,16 +2591,20 @@ yang_abs_schema_nodeid(yang_spec    *yspec,
     }
     prefix[id-vec[1]] = '\0';
     id++;
-    ymod = NULL;
-    while ((ymod = yn_each((yang_node*)yspec, ymod)) != NULL) {
-	if ((yprefix = yang_find((yang_node*)ymod, Y_PREFIX, NULL)) != NULL &&
-	    strcmp(yprefix->ys_argument, prefix) == 0){
-	    break;
+    if (yn) /* Find module using local prefix definition */
+	ymod = yang_find_module_by_prefix(yn, prefix);
+    if (ymod == NULL){ /* Try (global) prefix the module itself uses */
+	ymod = NULL;
+	while ((ymod = yn_each((yang_node*)yspec, ymod)) != NULL) {
+	    if ((yprefix = yang_find((yang_node*)ymod, Y_PREFIX, NULL)) != NULL &&
+		strcmp(yprefix->ys_argument, prefix) == 0){
+		break;
+	    }
 	}
     }
-    if (ymod == NULL){ /* Try with topnode */
+    if (ymod == NULL){ /* Try find id from topnode without prefix XXX remove?*/
 	if ((ys = yang_find_topnode(yspec, id, YC_SCHEMANODE)) == NULL){
-	    clicon_err(OE_YANG, 0, "Module with id:%s:%s not found", prefix,id);
+	    clicon_err(OE_YANG, 0, "Module with id:\"%s:%s\" not found", prefix,id);
 	    goto done;
 	}
 	if ((ymod = ys_module(ys)) == NULL){
@@ -2439,7 +2613,7 @@ yang_abs_schema_nodeid(yang_spec    *yspec,
 	}
 	if ((yprefix = yang_find((yang_node*)ymod, Y_PREFIX, NULL)) != NULL &&
 	    strcmp(yprefix->ys_argument, prefix) != 0){
-	    clicon_err(OE_YANG, 0, "Module with id:%s:%s not found", prefix,id);
+	    clicon_err(OE_YANG, 0, "Module with id:\"%s:%s\" not found", prefix,id);
 	    goto done;
 	}
     }
@@ -2546,12 +2720,7 @@ ys_parse_sub(yang_stmt *ys,
 	     char      *extra)
 {
     int        retval = -1;
-    int        cvret;
-    char      *reason = NULL;
-    yang_stmt *ymod;
     uint8_t    fd;
-    char      *prefix = NULL;
-    char      *name;
 
     switch (ys->ys_keyword){
     case Y_FRACTION_DIGITS:
@@ -2563,40 +2732,17 @@ ys_parse_sub(yang_stmt *ys,
 	    goto done;
 	}
 	break;
-    case Y_UNKNOWN:
+    case Y_UNKNOWN: /* XXX This code assumes ymod already loaded
+		       but it may not be */
 	if (extra == NULL)
 	    break;
-	/* Find extension, if found, store it as unknown, if not,
-	   break for error */
-	prefix  = yarg_prefix(ys); /* And this its prefix */
-	name    = yarg_id(ys);  /* This is the type to resolve */
-	if ((ymod = yang_find_module_by_prefix(ys, prefix)) == NULL)
-	    goto ok; /* shouldnt happen */
-	if (yang_find((yang_node*)ymod, Y_EXTENSION, name) == NULL){
-	    clicon_err(OE_YANG, errno, "Extension %s:%s not found", prefix, name);
-	    goto done;
-	}
-	if ((ys->ys_cv = cv_new(CGV_STRING)) == NULL){
-	    clicon_err(OE_YANG, errno, "cv_new"); 
-	    goto done;
-	}
-	if ((cvret = cv_parse1(extra, ys->ys_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);
-	    goto done;
-	}
+	ys->ys_extra = extra;
 	break;
     default:
 	break;
     }
- ok:
     retval = 0;
   done:
-    if (prefix)
-	free(prefix);
     return retval;
 }
 
@@ -2654,7 +2800,6 @@ yang_config(yang_stmt *ys)
 int
 yang_spec_parse_module(clicon_handle h,
 		       char         *module,
-		       char         *dir,
 		       char         *revision,
 		       yang_spec    *yspec,
 		       yang_stmt   **ymodp)
@@ -2674,11 +2819,7 @@ yang_spec_parse_module(clicon_handle h,
 	clicon_err(OE_YANG, EINVAL, "yang module illegal format");
 	goto done;
     }
-    if (dir == NULL){
-	clicon_err(OE_YANG, EINVAL, "yang dir not set");
-	goto done;
-    }
-    if (yang_parse(h, NULL, module, dir, revision, yspec, ymodp) < 0)
+    if (yang_parse(h, NULL, module, revision, yspec, ymodp) < 0)
 	goto done;
     retval = 0;
   done:
@@ -2698,7 +2839,6 @@ yang_spec_parse_module(clicon_handle h,
 int
 yang_spec_parse_file(clicon_handle h,
 		     char         *filename,
-		     char         *dir,
 		     yang_spec    *yspec,
 		     yang_stmt   **ymodp)
 {
@@ -2708,11 +2848,7 @@ yang_spec_parse_file(clicon_handle h,
 	clicon_err(OE_YANG, EINVAL, "yang spec is NULL");
 	goto done;
     }
-    if (dir == NULL){
-	clicon_err(OE_YANG, EINVAL, "yang dir not set");
-	goto done;
-    }
-    if (yang_parse(h, filename, NULL, dir, NULL, yspec, ymodp) < 0)
+    if (yang_parse(h, filename, NULL, NULL, yspec, ymodp) < 0)
 	goto done;
     retval = 0;
   done:
diff --git a/lib/src/clixon_yang_cardinality.c b/lib/src/clixon_yang_cardinality.c
index ab6a43d6..60964c86 100644
--- a/lib/src/clixon_yang_cardinality.c
+++ b/lib/src/clixon_yang_cardinality.c
@@ -193,7 +193,8 @@ yang_cardinality(clicon_handle h,
     
     pk = yt->ys_keyword;
     /* 0) Find parent sub-parts of cardinality vector */
-    ycplist = ycard_find(pk, 0, yclist, 0);
+    if ((ycplist = ycard_find(pk, 0, yclist, 0)) == NULL)
+	goto ok; /* skip */
     /* 1) For all children, if neither in 0..n, 0..1, 1 or 1..n   ->ERROR  */
     i = 0;
     while (i<yt->ys_len){
@@ -231,14 +232,15 @@ yang_cardinality(clicon_handle h,
     }
     
     if (0) { /* Notyet */
-    /* 4) Recurse */
-    i = 0;
-    while (i<yt->ys_len){ /* Note, children may be removed */
-	ys = yt->ys_stmt[i++];
-	if (yang_cardinality(h, ys, modname) < 0)
-	    goto done;
-    }
+	/* 4) Recurse */
+	i = 0;
+	while (i<yt->ys_len){ /* Note, children may be removed */
+	    ys = yt->ys_stmt[i++];
+	    if (yang_cardinality(h, ys, modname) < 0)
+		goto done;
+	}
     }
+ ok:
     retval = 0;
  done:
     return retval;
diff --git a/lib/src/clixon_yang_module.c b/lib/src/clixon_yang_module.c
index cf2f3208..539126df 100644
--- a/lib/src/clixon_yang_module.c
+++ b/lib/src/clixon_yang_module.c
@@ -77,7 +77,6 @@
  *
  * Load RFC7895 yang spec, module-set-id, etc.
  * @param[in]     h       Clicon handle
- * @note CLIXON_DATADIR is hardcoded
  */
 int
 yang_modules_init(clicon_handle h)
@@ -94,7 +93,7 @@ yang_modules_init(clicon_handle h)
 	goto done;
     }
     /* Ensure revision exists is set */
-    if (yang_spec_parse_module(h, "ietf-yang-library", CLIXON_DATADIR, NULL, yspec, NULL)< 0)
+    if (yang_spec_parse_module(h, "ietf-yang-library", NULL, yspec, NULL)< 0)
 	goto done;
     /* Find revision */
     if (yang_modules_revision(h) == NULL){
@@ -121,7 +120,8 @@ yang_modules_revision(clicon_handle h)
     char      *revision = NULL;
 
     yspec = clicon_dbspec_yang(h);
-    if ((ymod = yang_find((yang_node*)yspec, Y_MODULE, "ietf-yang-library")) != NULL){
+    if ((ymod = yang_find((yang_node*)yspec, Y_MODULE, "ietf-yang-library")) != NULL ||
+	(ymod = yang_find((yang_node*)yspec, Y_SUBMODULE, "ietf-yang-library")) != NULL){
 	if ((yrev = yang_find((yang_node*)ymod, Y_REVISION, NULL)) != NULL){
 	    revision = yrev->ys_argument;
 	}
@@ -172,7 +172,8 @@ yang_modules_state_get(clicon_handle    h,
     char       *module = "ietf-yang-library";
 
     module_set_id = clicon_option_str(h, "CLICON_MODULE_SET_ID");
-    if ((ylib = yang_find((yang_node*)yspec, Y_MODULE, module)) == NULL){
+    if ((ylib = yang_find((yang_node*)yspec, Y_MODULE, module)) == NULL &&
+	(ylib = yang_find((yang_node*)yspec, Y_SUBMODULE, module)) == NULL){
 	clicon_err(OE_YANG, 0, "%s not found", module);
 	goto done;
     }
@@ -189,7 +190,8 @@ yang_modules_state_get(clicon_handle    h,
     
     ymod = NULL;
     while ((ymod = yn_each((yang_node*)yspec, ymod)) != NULL) {
-	if (ymod->ys_keyword != Y_MODULE)
+	if (ymod->ys_keyword != Y_MODULE &&
+	    ymod->ys_keyword != Y_SUBMODULE)
 	    continue;
 	cprintf(cb,"<module>");
 	cprintf(cb,"<name>%s</name>", ymod->ys_argument);
diff --git a/lib/src/clixon_yang_parse.y b/lib/src/clixon_yang_parse.y
index f947c833..0af79687 100644
--- a/lib/src/clixon_yang_parse.y
+++ b/lib/src/clixon_yang_parse.y
@@ -42,9 +42,6 @@
  * identifier_ref = prefix : IDENTIFIER
  * node_identier  = prefix : IDENTIFIER
  *
- * Missing top-level statements (will break parser if in yang spec): 
- * - error-app-tag-stmt
- * - any-data-stmt
  * Missing args (just strings);
  * - length-arg-str
  * - path-arg-str
@@ -124,6 +121,7 @@
 %token K_MANDATORY
 %token K_MAX_ELEMENTS
 %token K_MIN_ELEMENTS
+%token K_MODIFIER
 %token K_MODULE
 %token K_MUST
 %token K_NAMESPACE
@@ -369,29 +367,28 @@ file          : module_stmt MY_EOF
 
   /* For extensions */
 unknown_stmt  : ustring  ':' ustring ';'
-                 { char *id; if ((id=string_del_join($1, ":", $3)) == NULL) _YYERROR("0");
-		   if (ysp_add(_yy, Y_UNKNOWN, id, NULL) == NULL) _YYERROR("0"); 
+                 { char *id; if ((id=string_del_join($1, ":", $3)) == NULL) _YYERROR("unknown_stmt");
+		   if (ysp_add(_yy, Y_UNKNOWN, id, NULL) == NULL) _YYERROR("unknown_stmt"); 
 		   clicon_debug(2,"unknown-stmt -> ustring : ustring");
 	       }
               | ustring  ':' ustring ' ' string ';'
-	        { char *id; if ((id=string_del_join($1, ":", $3)) == NULL) _YYERROR("0");
-		   if (ysp_add(_yy, Y_UNKNOWN, id, $5) == NULL){ _YYERROR("0"); }
+	        { char *id; if ((id=string_del_join($1, ":", $3)) == NULL) _YYERROR("unknwon_stmt");
+		   if (ysp_add(_yy, Y_UNKNOWN, id, $5) == NULL){ _YYERROR("unknwon_stmt"); }
 		   clicon_debug(2,"unknown-stmt -> ustring : ustring string");
-                   if ($5) free($5);
 	       }
 	      ;
 
 /* module identifier-arg-str */
 module_stmt   : K_MODULE identifier_str 
-                  { if ((_YY->yy_module = ysp_add_push(_yy, Y_MODULE, $2)) == NULL) _YYERROR("1");
+                  { if ((_YY->yy_module = ysp_add_push(_yy, Y_MODULE, $2)) == NULL) _YYERROR("module_stmt");
                         } 
                 '{' module_substmts '}' 
-                        { if (ystack_pop(_yy) < 0) _YYERROR("2");
-			  clicon_debug(2,"module_stmt -> id-arg-str { module-substmts }");} 
+                  { if (ystack_pop(_yy) < 0) _YYERROR("module_stmt");
+		    clicon_debug(2,"module_stmt -> id-arg-str { module-substmts }");} 
               ;
 
 module_substmts : module_substmts module_substmt 
-                      { clicon_debug(2,"module-substmts -> module-substmts module-substm");} 
+                      {clicon_debug(2,"module-substmts -> module-substmts module-substm");} 
               | module_substmt 
                       { clicon_debug(2,"module-substmts ->");} 
               ;
@@ -406,10 +403,11 @@ module_substmt : module_header_stmts { clicon_debug(2,"module-substmt -> module-
                ;
 
 /* submodule */
-submodule_stmt : K_SUBMODULE identifier_str '{' submodule_substmts '}' 
-		{ if ((_YY->yy_module = ysp_add_push(_yy, Y_SUBMODULE, $2)) == NULL) _YYERROR("3"); 
-                        clicon_debug(2,"submodule -> id-arg-str { submodule-stmts }"); 
-                      }
+submodule_stmt : K_SUBMODULE identifier_str 
+		{ if ((_YY->yy_module = ysp_add_push(_yy, Y_SUBMODULE, $2)) == NULL) _YYERROR("submodule_stmt"); }
+                '{' submodule_substmts '}'
+                    { if (ystack_pop(_yy) < 0) _YYERROR("submodule_stmt");
+			clicon_debug(2,"submodule_stmt -> id-arg-str { submodule-substmts }");} 
               ;
 
 submodule_substmts : submodule_substmts submodule_substmt 
@@ -464,16 +462,16 @@ submodule_header_stmt : yang_version_stmt
               ;
 
 /* yang-version-stmt = yang-version-keyword  yang-version-arg-str */
-yang_version_stmt : K_YANG_VERSION string ';' 
-		{ if (ysp_add(_yy, Y_YANG_VERSION, $2, NULL) == NULL) _YYERROR("83");
+yang_version_stmt : K_YANG_VERSION string stmtend
+		{ if (ysp_add(_yy, Y_YANG_VERSION, $2, NULL) == NULL) _YYERROR("yang_version_stmt");
                             clicon_debug(2,"yang-version-stmt -> YANG-VERSION string"); }
               ;
 
 /* import */
 import_stmt   : K_IMPORT identifier_str
-                          { if (ysp_add_push(_yy, Y_IMPORT, $2) == NULL) _YYERROR("81"); }
+                          { if (ysp_add_push(_yy, Y_IMPORT, $2) == NULL) _YYERROR("import_stmt"); }
                 '{' import_substmts '}' 
-                        { if (ystack_pop(_yy) < 0) _YYERROR("82");
+                        { if (ystack_pop(_yy) < 0) _YYERROR("import_stmt");
 			  clicon_debug(2,"import-stmt -> IMPORT id-arg-str { import-substmts }");} 
               ;
 
@@ -484,69 +482,79 @@ import_substmts : import_substmts import_substmt
               ;
 
 import_substmt : prefix_stmt {  clicon_debug(2,"import-stmt -> prefix-stmt"); }
-              |  revision_date_stmt {  clicon_debug(2,"import-stmt -> revision-date-stmt"); }
+               | revision_date_stmt {  clicon_debug(2,"import-stmt -> revision-date-stmt"); }
+               | description_stmt   { clicon_debug(2,"import-stmt -> description-stmt"); }
+               | reference_stmt {  clicon_debug(2,"import-stmt -> reference-stmt"); }
               ;
 
 include_stmt  : K_INCLUDE identifier_str ';'
-		{ if (ysp_add(_yy, Y_INCLUDE, $2, NULL)== NULL) _YYERROR("97"); 
-                           clicon_debug(2,"include-stmt -> id-arg-str"); }
-              | K_INCLUDE identifier_str '{' revision_date_stmt '}'
-		{ if (ysp_add(_yy, Y_INCLUDE, $2, NULL)== NULL) _YYERROR("98"); 
-                           clicon_debug(2,"include-stmt -> id-arg-str { revision-date-stmt }"); }
+		{ if (ysp_add(_yy, Y_INCLUDE, $2, NULL)== NULL) _YYERROR("include_stmt"); 
+                           clicon_debug(2,"include-stmt -> id-str"); }
+              | K_INCLUDE identifier_str '{' include_substmts '}'
+		{ if (ysp_add(_yy, Y_INCLUDE, $2, NULL)== NULL) _YYERROR("include_stmt"); 
+                           clicon_debug(2,"include-stmt -> id-str { include-substmts }"); }
               ;
 
+include_substmts : include_substmts include_substmt 
+                      { clicon_debug(2,"include-substmts -> include-substmts include-substm");} 
+              | include_substmt 
+                      { clicon_debug(2,"include-substmts ->");} 
+              ;
+
+include_substmt : revision_date_stmt {  clicon_debug(2,"include-stmt -> revision-date-stmt"); }
+                | description_stmt   { clicon_debug(2,"include-stmt -> description-stmt"); }
+                | reference_stmt {  clicon_debug(2,"include-stmt -> reference-stmt"); }
+               ;
+
+
 /* namespace-stmt = namespace-keyword sep uri-str */
 namespace_stmt : K_NAMESPACE string stmtend  
-		{ if (ysp_add(_yy, Y_NAMESPACE, $2, NULL)== NULL) _YYERROR("99"); 
+		{ if (ysp_add(_yy, Y_NAMESPACE, $2, NULL)== NULL) _YYERROR("namespace_stmt"); 
                             clicon_debug(2,"namespace-stmt -> NAMESPACE string"); }
               ;
 
-prefix_stmt   : K_PREFIX identifier_str ';' /* XXX prefix-arg-str */
-		{ if (ysp_add(_yy, Y_PREFIX, $2, NULL)== NULL) _YYERROR("100"); 
+prefix_stmt   : K_PREFIX identifier_str stmtend /* XXX prefix-arg-str */
+		{ if (ysp_add(_yy, Y_PREFIX, $2, NULL)== NULL) _YYERROR("prefix_stmt"); 
 			     clicon_debug(2,"prefix-stmt -> PREFIX string ;");}
               ;
 
-belongs_to_stmt : K_BELONGS_TO identifier_str ';' 
-
-                 { if (ysp_add(_yy, Y_BELONGS_TO, $2, NULL)== NULL) _YYERROR("100"); 
-			     clicon_debug(2,"belongs-to-stmt -> BELONGS-TO id-arg-str ;");}
-                | K_BELONGS_TO identifier_str '{' prefix_stmt '}'
-				{ if (ysp_add(_yy, Y_BELONGS_TO, $2, NULL)== NULL) _YYERROR("98"); 
+belongs_to_stmt : K_BELONGS_TO identifier_str '{' prefix_stmt '}'
+				{ if (ysp_add(_yy, Y_BELONGS_TO, $2, NULL)== NULL) _YYERROR("belongs_to_stmt"); 
 			     clicon_debug(2,"belongs-to-stmt -> BELONGS-TO id-arg-str { prefix-stmt } ");}
                  ;
 
-organization_stmt: K_ORGANIZATION string ';'
-		{ if (ysp_add(_yy, Y_ORGANIZATION, $2, NULL)== NULL) _YYERROR("102"); 
+organization_stmt: K_ORGANIZATION string stmtend
+		{ if (ysp_add(_yy, Y_ORGANIZATION, $2, NULL)== NULL) _YYERROR("belongs_to_stmt"); 
 			   clicon_debug(2,"organization-stmt -> ORGANIZATION string ;");}
               ;
 
-contact_stmt  : K_CONTACT string ';'
-		{ if (ysp_add(_yy, Y_CONTACT, $2, NULL)== NULL) _YYERROR("95"); 
+contact_stmt  : K_CONTACT string stmtend
+		{ if (ysp_add(_yy, Y_CONTACT, $2, NULL)== NULL) _YYERROR("contact_stmt"); 
                             clicon_debug(2,"contact-stmt -> CONTACT string"); }
               ;
 
-description_stmt: K_DESCRIPTION string ';' 
-		{ if (ysp_add(_yy, Y_DESCRIPTION, $2, NULL)== NULL) _YYERROR("101"); 
+description_stmt : K_DESCRIPTION string stmtend
+		{ if (ysp_add(_yy, Y_DESCRIPTION, $2, NULL)== NULL) _YYERROR("description_stmt"); 
 			   clicon_debug(2,"description-stmt -> DESCRIPTION string ;");}
               ;
 
-reference_stmt: K_REFERENCE string ';'
-		{ if (ysp_add(_yy, Y_REFERENCE, $2, NULL)== NULL) _YYERROR("105"); 
+reference_stmt : K_REFERENCE string stmtend
+		{ if (ysp_add(_yy, Y_REFERENCE, $2, NULL)== NULL) _YYERROR("reference_stmt"); 
 			   clicon_debug(2,"reference-stmt -> REFERENCE string ;");}
               ;
 
 units_stmt    : K_UNITS string ';'
-		{ if (ysp_add(_yy, Y_UNITS, $2, NULL)== NULL) _YYERROR("93"); 
+		{ if (ysp_add(_yy, Y_UNITS, $2, NULL)== NULL) _YYERROR("units_stmt"); 
                             clicon_debug(2,"units-stmt -> UNITS string"); }
               ;
 
 revision_stmt : K_REVISION string ';'  /* XXX date-arg-str */
-		{ if (ysp_add(_yy, Y_REVISION, $2, NULL) == NULL) _YYERROR("4"); 
+		{ if (ysp_add(_yy, Y_REVISION, $2, NULL) == NULL) _YYERROR("revision_stmt"); 
 			 clicon_debug(2,"revision-stmt -> date-arg-str ;"); }
               | K_REVISION string 
-                     { if (ysp_add_push(_yy, Y_REVISION, $2) == NULL) _YYERROR("5"); }
+                     { if (ysp_add_push(_yy, Y_REVISION, $2) == NULL) _YYERROR("revision_stmt"); }
                 '{' revision_substmts '}'  /* XXX date-arg-str */
-                     { if (ystack_pop(_yy) < 0) _YYERROR("6");
+                     { if (ystack_pop(_yy) < 0) _YYERROR("revision_stmt");
 		       clicon_debug(2,"revision-stmt -> date-arg-str { revision-substmts  }"); }
               ;
 
@@ -570,19 +578,18 @@ revision_stmts : revision_stmts revision_stmt
                        { clicon_debug(2,"revision-stmts -> "); }
               ;
 
-revision_date_stmt : K_REVISION_DATE string ';'  /* XXX date-arg-str */
-		{ if (ysp_add(_yy, Y_REVISION_DATE, $2, NULL) == NULL) _YYERROR("96"); 
+revision_date_stmt : K_REVISION_DATE string stmtend  /* XXX date-arg-str */
+		{ if (ysp_add(_yy, Y_REVISION_DATE, $2, NULL) == NULL) _YYERROR("revision_date_stmt"); 
 			 clicon_debug(2,"revision-date-stmt -> date;"); }
               ;
 
-/* Extension */
-extension_stmt: K_EXTENSION identifier_str ';' 
-	       { if (ysp_add(_yy, Y_EXTENSION, $2, NULL) == NULL) _YYERROR("59");
+extension_stmt : K_EXTENSION identifier_str ';' 
+	       { if (ysp_add(_yy, Y_EXTENSION, $2, NULL) == NULL) _YYERROR("extension_stmt");
                     clicon_debug(2,"extenstion-stmt -> EXTENSION id-arg-str ;"); }
               | K_EXTENSION identifier_str 
- 	          { if (ysp_add_push(_yy, Y_EXTENSION, $2) == NULL) _YYERROR("60"); }
+ 	          { if (ysp_add_push(_yy, Y_EXTENSION, $2) == NULL) _YYERROR("extension_stmt"); }
 	       '{' extension_substmts '}' 
-	       { if (ystack_pop(_yy) < 0) _YYERROR("61");
+	       { if (ystack_pop(_yy) < 0) _YYERROR("extension_stmt");
                     clicon_debug(2,"extension-stmt -> FEATURE id-arg-str { extension-substmts }"); }
 	      ;
 
@@ -612,13 +619,13 @@ yin_element_stmt1 : K_YIN_ELEMENT bool_str stmtend {free($2);}
 
 /* Identity */
 identity_stmt  : K_IDENTITY identifier_str ';' 
-	      { if (ysp_add(_yy, Y_IDENTITY, $2, NULL) == NULL) _YYERROR("65"); 
+	      { if (ysp_add(_yy, Y_IDENTITY, $2, NULL) == NULL) _YYERROR("identity_stmt"); 
 			   clicon_debug(2,"identity-stmt -> IDENTITY string ;"); }
 
               | K_IDENTITY identifier_str
-                          { if (ysp_add_push(_yy, Y_IDENTITY, $2) == NULL) _YYERROR("66"); }
+                          { if (ysp_add_push(_yy, Y_IDENTITY, $2) == NULL) _YYERROR("identity_stmt"); }
 	       '{' identity_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("67");
+                           { if (ystack_pop(_yy) < 0) _YYERROR("identity_stmt");
 			     clicon_debug(2,"identity-stmt -> IDENTITY string { identity-substmts }"); }
               ;
 
@@ -636,19 +643,19 @@ identity_substmt : base_stmt         { clicon_debug(2,"identity-substmt -> base-
               |                      { clicon_debug(2,"identity-substmt -> "); }
               ;
 
-base_stmt     : K_BASE identifier_ref_str ';' 
-		{ if (ysp_add(_yy, Y_BASE, $2, NULL)== NULL) _YYERROR("90"); 
+base_stmt     : K_BASE identifier_ref_str stmtend
+		{ if (ysp_add(_yy, Y_BASE, $2, NULL)== NULL) _YYERROR("base_stmt"); 
                             clicon_debug(2,"base-stmt -> BASE identifier-ref-arg-str"); }
               ;
 
 /* Feature */
 feature_stmt  : K_FEATURE identifier_str ';' 
-	       { if (ysp_add(_yy, Y_FEATURE, $2, NULL) == NULL) _YYERROR("62");
+	       { if (ysp_add(_yy, Y_FEATURE, $2, NULL) == NULL) _YYERROR("feature_stmt");
 		      clicon_debug(2,"feature-stmt -> FEATURE id-arg-str ;"); }
               | K_FEATURE identifier_str
-                  { if (ysp_add_push(_yy, Y_FEATURE, $2) == NULL) _YYERROR("63"); }
+                  { if (ysp_add_push(_yy, Y_FEATURE, $2) == NULL) _YYERROR("feature_stmt"); }
               '{' feature_substmts '}' 
-                  { if (ystack_pop(_yy) < 0) _YYERROR("64");
+                  { if (ystack_pop(_yy) < 0) _YYERROR("feature_stmt");
                     clicon_debug(2,"feature-stmt -> FEATURE id-arg-str { feature-substmts }"); }
               ;
 
@@ -669,15 +676,15 @@ feature_substmt : if_feature_stmt    { clicon_debug(2,"feature-substmt -> if-fea
 
 /* if-feature-stmt = if-feature-keyword sep if-feature-expr-str */
 if_feature_stmt : K_IF_FEATURE string stmtend 
-		{ if (ysp_add(_yy, Y_IF_FEATURE, $2, NULL) == NULL) _YYERROR("85"); 
+		{ if (ysp_add(_yy, Y_IF_FEATURE, $2, NULL) == NULL) _YYERROR("if_feature_stmt"); 
                             clicon_debug(2,"if-feature-stmt -> IF-FEATURE identifier-ref-arg-str"); }
               ;
 
 /* Typedef */
 typedef_stmt  : K_TYPEDEF identifier_str 
-                          { if (ysp_add_push(_yy, Y_TYPEDEF, $2) == NULL) _YYERROR("46"); }
+                          { if (ysp_add_push(_yy, Y_TYPEDEF, $2) == NULL) _YYERROR("typedef_stmt"); }
 	       '{' typedef_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("47");
+                           { if (ystack_pop(_yy) < 0) _YYERROR("typedef_stmt");
 			     clicon_debug(2,"typedef-stmt -> TYPEDEF id-arg-str { typedef-substmts }"); }
               ;
 
@@ -699,13 +706,13 @@ typedef_substmt : type_stmt          { clicon_debug(2,"typedef-substmt -> type-s
 
 /* Type */
 type_stmt     : K_TYPE identifier_ref_str ';' 
-	       { if (ysp_add(_yy, Y_TYPE, $2, NULL) == NULL) _YYERROR("48"); 
+	       { if (ysp_add(_yy, Y_TYPE, $2, NULL) == NULL) _YYERROR("type_stmt"); 
 			   clicon_debug(2,"type-stmt -> TYPE identifier-ref-arg-str ;");}
               | K_TYPE identifier_ref_str
-                         { if (ysp_add_push(_yy, Y_TYPE, $2) == NULL) _YYERROR("49"); 
+                         { if (ysp_add_push(_yy, Y_TYPE, $2) == NULL) _YYERROR("type_stmt"); 
 			 }
                 '{' type_body_stmts '}'
-                         { if (ystack_pop(_yy) < 0) _YYERROR("50");
+                         { if (ystack_pop(_yy) < 0) _YYERROR("type_stmt");
                            clicon_debug(2,"type-stmt -> TYPE identifier-ref-arg-str { type-body-stmts }");}
               ;
 
@@ -742,13 +749,13 @@ type_body_stmt/* numerical-restrictions */
 
 /* range-stmt */
 range_stmt   : K_RANGE string ';' /* XXX range-arg-str */
-	       { if (ysp_add(_yy, Y_RANGE, $2, NULL) == NULL) _YYERROR("68"); 
+	       { if (ysp_add(_yy, Y_RANGE, $2, NULL) == NULL) _YYERROR("range_stmt"); 
 			   clicon_debug(2,"range-stmt -> RANGE string ;"); }
 
               | K_RANGE string
-	                  { if (ysp_add_push(_yy, Y_RANGE, $2) == NULL) _YYERROR("69"); }
+	                  { if (ysp_add_push(_yy, Y_RANGE, $2) == NULL) _YYERROR("range_stmt"); }
 	       '{' range_substmts '}' 
-                          { if (ystack_pop(_yy) < 0) _YYERROR("70");
+                          { if (ystack_pop(_yy) < 0) _YYERROR("range_stmt");
 			     clicon_debug(2,"range-stmt -> RANGE string { range-substmts }"); }
               ;
 
@@ -767,7 +774,7 @@ range_substmt : error_message_stmt   { clicon_debug(2,"range-substmt -> error-me
 
 /* fraction-digits-stmt = fraction-digits-keyword fraction-digits-arg-str */
 fraction_digits_stmt : K_FRACTION_DIGITS string stmtend 
-		{ if (ysp_add(_yy, Y_FRACTION_DIGITS, $2, NULL) == NULL) _YYERROR("84"); 
+		{ if (ysp_add(_yy, Y_FRACTION_DIGITS, $2, NULL) == NULL) _YYERROR("fraction_digits_stmt"); 
                             clicon_debug(2,"fraction-digits-stmt -> FRACTION-DIGITS string"); }
               ;
 
@@ -776,15 +783,22 @@ meta_stmts    : meta_stmts meta_stmt { clicon_debug(2,"meta-stmts -> meta-stmts
               | meta_stmt            { clicon_debug(2,"meta-stmts -> meta-stmt"); }
               ;
 
+meta_stmt     : organization_stmt    { clicon_debug(2,"meta-stmt -> organization-stmt"); }
+              | contact_stmt         { clicon_debug(2,"meta-stmt -> contact-stmt"); }
+              | description_stmt     { clicon_debug(2,"meta-stmt -> description-stmt"); }
+              | reference_stmt       { clicon_debug(2,"meta-stmt -> reference-stmt"); }
+              ;
+
+
 /* length-stmt */
 length_stmt   : K_LENGTH string ';' /* XXX length-arg-str */
-	       { if (ysp_add(_yy, Y_LENGTH, $2, NULL) == NULL) _YYERROR("53"); 
+	       { if (ysp_add(_yy, Y_LENGTH, $2, NULL) == NULL) _YYERROR("length_stmt"); 
 			   clicon_debug(2,"length-stmt -> LENGTH string ;"); }
 
               | K_LENGTH string
-                          { if (ysp_add_push(_yy, Y_LENGTH, $2) == NULL) _YYERROR("54"); }
+                          { if (ysp_add_push(_yy, Y_LENGTH, $2) == NULL) _YYERROR("length_stmt"); }
 	       '{' length_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("55");
+                           { if (ystack_pop(_yy) < 0) _YYERROR("length_stmt");
 			     clicon_debug(2,"length-stmt -> LENGTH string { length-substmts }"); }
               ;
 
@@ -803,13 +817,13 @@ length_substmt : error_message_stmt  { clicon_debug(2,"length-substmt -> error-m
 
 /* Pattern */
 pattern_stmt  : K_PATTERN string ';' 
-	       { if (ysp_add(_yy, Y_PATTERN, $2, NULL) == NULL) _YYERROR("56"); 
+	       { if (ysp_add(_yy, Y_PATTERN, $2, NULL) == NULL) _YYERROR("pattern_stmt"); 
 			   clicon_debug(2,"pattern-stmt -> PATTERN string ;"); }
 
               | K_PATTERN string
-                          { if (ysp_add_push(_yy, Y_PATTERN, $2) == NULL) _YYERROR("57"); }
+                          { if (ysp_add_push(_yy, Y_PATTERN, $2) == NULL) _YYERROR("pattern_stmt"); }
 	       '{' pattern_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("58");
+                           { if (ystack_pop(_yy) < 0) _YYERROR("pattern_stmt");
 			     clicon_debug(2,"pattern-stmt -> PATTERN string { pattern-substmts }"); }
               ;
 
@@ -819,27 +833,34 @@ pattern_substmts : pattern_substmts pattern_substmt
                       { clicon_debug(2,"pattern-substmts -> pattern-substmt"); }
               ;
 
-pattern_substmt : reference_stmt     { clicon_debug(2,"pattern-substmt -> reference-stmt"); }
-              | error_message_stmt   { clicon_debug(2,"pattern-substmt -> error-message-stmt");} 
-              | unknown_stmt         { clicon_debug(2,"pattern-substmt -> unknown-stmt");} 
+pattern_substmt : modifier_stmt    { clicon_debug(2,"pattern-substmt -> modifier-stmt");}
+              | error_message_stmt { clicon_debug(2,"pattern-substmt -> error-message-stmt");}
+              | error_app_tag_stmt { clicon_debug(2,"pattern-substmt -> error-app-tag-stmt");} 
+              | description_stmt   { clicon_debug(2,"pattern-substmt -> description-stmt");}
+              | reference_stmt     { clicon_debug(2,"pattern-substmt -> reference-stmt"); }
+              | unknown_stmt       { clicon_debug(2,"pattern-substmt -> unknown-stmt");} 
+
               |                      { clicon_debug(2,"pattern-substmt -> "); }
               ;
 
-default_stmt  : K_DEFAULT string ';'
-		{ if (ysp_add(_yy, Y_DEFAULT, $2, NULL)== NULL) _YYERROR("94"); 
+modifier_stmt  : K_MODIFIER string stmtend
+		{ if (ysp_add(_yy, Y_DEFAULT, $2, NULL)== NULL) _YYERROR("modifier_stmt"); 
+                            clicon_debug(2,"modifier-stmt -> MODIFIER string"); }
+              ;
+
+default_stmt  : K_DEFAULT string stmtend
+		{ if (ysp_add(_yy, Y_DEFAULT, $2, NULL)== NULL) _YYERROR("default_stmt"); 
                             clicon_debug(2,"default-stmt -> DEFAULT string"); }
               ;
 
-
-
 /* enum-stmt */
 enum_stmt     : K_ENUM string ';'
-	       { if (ysp_add(_yy, Y_ENUM, $2, NULL) == NULL) _YYERROR("71"); 
+	       { if (ysp_add(_yy, Y_ENUM, $2, NULL) == NULL) _YYERROR("enum_stmt"); 
 			   clicon_debug(2,"enum-stmt -> ENUM string ;"); }
               | K_ENUM string
-                         { if (ysp_add_push(_yy, Y_ENUM, $2) == NULL) _YYERROR("72"); }
+                         { if (ysp_add_push(_yy, Y_ENUM, $2) == NULL) _YYERROR("enum_stmt"); }
 	       '{' enum_substmts '}' 
-                         { if (ystack_pop(_yy) < 0) _YYERROR("73");
+                         { if (ystack_pop(_yy) < 0) _YYERROR("enum_stmt");
 			   clicon_debug(2,"enum-stmt -> ENUM string { enum-substmts }"); }
               ;
 
@@ -857,24 +878,24 @@ enum_substmt  : value_stmt           { clicon_debug(2,"enum-substmt -> value-stm
               |                      { clicon_debug(2,"enum-substmt -> "); }
               ;
 
-path_stmt     : K_PATH string ';' /* XXX: path-arg-str */
-		{ if (ysp_add(_yy, Y_PATH, $2, NULL)== NULL) _YYERROR("91"); 
+path_stmt     : K_PATH string stmtend /* XXX: path-arg-str */
+		{ if (ysp_add(_yy, Y_PATH, $2, NULL)== NULL) _YYERROR("path_stmt"); 
                             clicon_debug(2,"path-stmt -> PATH string"); }
               ;
 
-require_instance_stmt : K_REQUIRE_INSTANCE bool_str ';' 
-		{ if (ysp_add(_yy, Y_REQUIRE_INSTANCE, $2, NULL)== NULL) _YYERROR("92"); 
+require_instance_stmt : K_REQUIRE_INSTANCE bool_str stmtend
+		{ if (ysp_add(_yy, Y_REQUIRE_INSTANCE, $2, NULL)== NULL) _YYERROR("require_instance_stmt"); 
                             clicon_debug(2,"require-instance-stmt -> REQUIRE-INSTANCE string"); }
               ;
 
 /* bit-stmt */
 bit_stmt     : K_BIT identifier_str ';'
-	       { if (ysp_add(_yy, Y_BIT, $2, NULL) == NULL) _YYERROR("74"); 
+	       { if (ysp_add(_yy, Y_BIT, $2, NULL) == NULL) _YYERROR("bit_stmt"); 
 			   clicon_debug(2,"bit-stmt -> BIT string ;"); }
               | K_BIT identifier_str
-                         { if (ysp_add_push(_yy, Y_BIT, $2) == NULL) _YYERROR("75"); }
+                         { if (ysp_add_push(_yy, Y_BIT, $2) == NULL) _YYERROR("bit_stmt"); }
 	       '{' bit_substmts '}' 
-                         { if (ystack_pop(_yy) < 0) _YYERROR("76");
+                         { if (ystack_pop(_yy) < 0) _YYERROR("bit_stmt");
 			   clicon_debug(2,"bit-stmt -> BIT string { bit-substmts }"); }
               ;
 
@@ -893,50 +914,50 @@ bit_substmt   : position_stmt        { clicon_debug(2,"bit-substmt -> positition
 
 /* position-stmt = position-keyword position-value-arg-str */
 position_stmt : K_POSITION integer_value_str stmtend 
-		{ if (ysp_add(_yy, Y_POSITION, $2, NULL) == NULL) _YYERROR("87"); 
+		{ if (ysp_add(_yy, Y_POSITION, $2, NULL) == NULL) _YYERROR("position_stmt"); 
                             clicon_debug(2,"position-stmt -> POSITION integer-value"); }
               ;
 
 /* status-stmt = status-keyword sep status-arg-str XXX: current-keyword*/
 status_stmt   : K_STATUS string stmtend
-		{ if (ysp_add(_yy, Y_STATUS, $2, NULL) == NULL) _YYERROR("88"); 
+		{ if (ysp_add(_yy, Y_STATUS, $2, NULL) == NULL) _YYERROR("status_stmt"); 
                             clicon_debug(2,"status-stmt -> STATUS string"); }
               ;
 
-config_stmt   : K_CONFIG bool_str ';' 
-		{ if (ysp_add(_yy, Y_CONFIG, $2, NULL) == NULL) _YYERROR("89"); 
+config_stmt   : K_CONFIG bool_str stmtend
+		{ if (ysp_add(_yy, Y_CONFIG, $2, NULL) == NULL) _YYERROR("config_stmt"); 
                             clicon_debug(2,"config-stmt -> CONFIG config-arg-str"); }
               ;
 
 /* mandatory-stmt = mandatory-keyword mandatory-arg-str */
-mandatory_stmt: K_MANDATORY bool_str ';' 
+mandatory_stmt : K_MANDATORY bool_str stmtend
                          { yang_stmt *ys;
-			     if ((ys = ysp_add(_yy, Y_MANDATORY, $2, NULL))== NULL) _YYERROR("106"); 
+			     if ((ys = ysp_add(_yy, Y_MANDATORY, $2, NULL))== NULL) _YYERROR("mandatory_stmt"); 
 			   clicon_debug(2,"mandatory-stmt -> MANDATORY mandatory-arg-str ;");}
               ;
 
-presence_stmt: K_PRESENCE string ';' 
+presence_stmt : K_PRESENCE string stmtend
                          { yang_stmt *ys;
-			     if ((ys = ysp_add(_yy, Y_PRESENCE, $2, NULL))== NULL) _YYERROR("107"); 
+			     if ((ys = ysp_add(_yy, Y_PRESENCE, $2, NULL))== NULL) _YYERROR("presence_stmt"); 
 			   clicon_debug(2,"presence-stmt -> PRESENCE string ;");}
               ;
 
 /* ordered-by-stmt = ordered-by-keyword sep ordered-by-arg-str */
-ordered_by_stmt: K_ORDERED_BY string stmtend
+ordered_by_stmt : K_ORDERED_BY string stmtend
                          { yang_stmt *ys;
-			     if ((ys = ysp_add(_yy, Y_ORDERED_BY, $2, NULL))== NULL) _YYERROR("108"); 
+			     if ((ys = ysp_add(_yy, Y_ORDERED_BY, $2, NULL))== NULL) _YYERROR("ordered_by_stmt"); 
 			   clicon_debug(2,"ordered-by-stmt -> ORDERED-BY ordered-by-arg ;");}
               ;
 
 /* must-stmt */
 must_stmt     : K_MUST string ';'
-	       { if (ysp_add(_yy, Y_MUST, $2, NULL) == NULL) _YYERROR("77"); 
+	       { if (ysp_add(_yy, Y_MUST, $2, NULL) == NULL) _YYERROR("must_stmt"); 
 			   clicon_debug(2,"must-stmt -> MUST string ;"); }
 
               | K_MUST string
-                         { if (ysp_add_push(_yy, Y_MUST, $2) == NULL) _YYERROR("78"); }
+                         { if (ysp_add_push(_yy, Y_MUST, $2) == NULL) _YYERROR("must_stmt"); }
 	       '{' must_substmts '}' 
-                         { if (ystack_pop(_yy) < 0) _YYERROR("79");
+                         { if (ystack_pop(_yy) < 0) _YYERROR("must_stmt");
 			   clicon_debug(2,"must-stmt -> MUST string { must-substmts }"); }
               ;
 
@@ -947,42 +968,47 @@ must_substmts : must_substmts must_substmt
               ;
 
 must_substmt  : error_message_stmt   { clicon_debug(2,"must-substmt -> error-message-stmt"); }
+              | error_app_tag_stmt   { clicon_debug(2,"must-substmt -> error-app-tag-stmt"); }
               | description_stmt     { clicon_debug(2,"must-substmt -> description-stmt"); }
               | reference_stmt       { clicon_debug(2,"must-substmt -> reference-stmt"); }
               |                      { clicon_debug(2,"must-substmt -> "); }
               ;
 
 /* error-message-stmt */
-error_message_stmt   : K_ERROR_MESSAGE string ';'
-	       { if (ysp_add(_yy, Y_ERROR_MESSAGE, $2, NULL) == NULL) _YYERROR("80"); }
+error_message_stmt   : K_ERROR_MESSAGE string stmtend
+	       { if (ysp_add(_yy, Y_ERROR_MESSAGE, $2, NULL) == NULL) _YYERROR("error_message_stmt");
+	          clicon_debug(2,"error-message-stmt -> ERROR-MESSAGE string"); }
                ;
 
-/* XXX error-app-tag-stmt */
+error_app_tag_stmt : K_ERROR_APP_TAG string stmtend
+	       { if (ysp_add(_yy, Y_ERROR_MESSAGE, $2, NULL) == NULL) _YYERROR("error_message_stmt");
+     	          clicon_debug(2,"error-app-tag-stmt -> ERROR-APP-TAG string"); }
+               ;
 
 /* min-elements-stmt = min-elements-keyword min-value-arg-str */
-min_elements_stmt: K_MIN_ELEMENTS integer_value_str stmtend
-		{ if (ysp_add(_yy, Y_MIN_ELEMENTS, $2, NULL)== NULL) _YYERROR("103"); 
+min_elements_stmt : K_MIN_ELEMENTS integer_value_str stmtend
+		{ if (ysp_add(_yy, Y_MIN_ELEMENTS, $2, NULL)== NULL) _YYERROR("min_elements_stmt"); 
 			   clicon_debug(2,"min-elements-stmt -> MIN-ELEMENTS integer ;");}
               ;
 
 /* max-elements-stmt   = max-elements-keyword ("unbounded"|integer-value) 
  * XXX cannot use integer-value
  */
-max_elements_stmt: K_MAX_ELEMENTS string ';'
-		{ if (ysp_add(_yy, Y_MAX_ELEMENTS, $2, NULL)== NULL) _YYERROR("104"); 
+max_elements_stmt : K_MAX_ELEMENTS string stmtend
+		{ if (ysp_add(_yy, Y_MAX_ELEMENTS, $2, NULL)== NULL) _YYERROR("max_elements_stmt"); 
 			   clicon_debug(2,"max-elements-stmt -> MIN-ELEMENTS integer ;");}
               ;
 
-value_stmt   : K_VALUE integer_value_str ';' 
-		{ if (ysp_add(_yy, Y_VALUE, $2, NULL) == NULL) _YYERROR("86"); 
+value_stmt   : K_VALUE integer_value_str stmtend
+		{ if (ysp_add(_yy, Y_VALUE, $2, NULL) == NULL) _YYERROR("value_stmt"); 
                             clicon_debug(2,"value-stmt -> VALUE integer-value"); }
               ;
 
 /* Grouping */
 grouping_stmt  : K_GROUPING identifier_str 
-                          { if (ysp_add_push(_yy, Y_GROUPING, $2) == NULL) _YYERROR("51"); }
+                          { if (ysp_add_push(_yy, Y_GROUPING, $2) == NULL) _YYERROR("grouping_stmt"); }
 	       '{' grouping_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("52");
+                           { if (ystack_pop(_yy) < 0) _YYERROR("grouping_stmt");
 			     clicon_debug(2,"grouping-stmt -> GROUPING id-arg-str { grouping-substmts }"); }
               ;
 
@@ -1006,12 +1032,12 @@ grouping_substmt : status_stmt          { clicon_debug(2,"grouping-substmt -> st
 
 /* container */
 container_stmt : K_CONTAINER identifier_str ';'
-		{ if (ysp_add(_yy, Y_CONTAINER, $2, NULL) == NULL) _YYERROR("7"); 
+		{ if (ysp_add(_yy, Y_CONTAINER, $2, NULL) == NULL) _YYERROR("container_stmt"); 
                              clicon_debug(2,"container-stmt -> CONTAINER id-arg-str ;");}
               | K_CONTAINER identifier_str 
-                          { if (ysp_add_push(_yy, Y_CONTAINER, $2) == NULL) _YYERROR("8"); }
+                          { if (ysp_add_push(_yy, Y_CONTAINER, $2) == NULL) _YYERROR("container_stmt"); }
                 '{' container_substmts '}'
-                           { if (ystack_pop(_yy) < 0) _YYERROR("9");
+                           { if (ystack_pop(_yy) < 0) _YYERROR("container_stmt");
                              clicon_debug(2,"container-stmt -> CONTAINER id-arg-str { container-substmts }");}
               ;
 
@@ -1036,14 +1062,13 @@ container_substmt : when_stmt       { clicon_debug(2,"container-substmt -> when-
               |                     { clicon_debug(2,"container-substmt ->");} 
               ;
 
-/* leaf */
 leaf_stmt     : K_LEAF identifier_str ';'
-		{ if (ysp_add(_yy, Y_LEAF, $2, NULL) == NULL) _YYERROR("10"); 
+		{ if (ysp_add(_yy, Y_LEAF, $2, NULL) == NULL) _YYERROR("leaf_stmt"); 
 			   clicon_debug(2,"leaf-stmt -> LEAF id-arg-str ;");}
               | K_LEAF identifier_str 
-                          { if (ysp_add_push(_yy, Y_LEAF, $2) == NULL) _YYERROR("11"); }
+                          { if (ysp_add_push(_yy, Y_LEAF, $2) == NULL) _YYERROR("leaf_stmt"); }
                 '{' leaf_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("12");
+                           { if (ystack_pop(_yy) < 0) _YYERROR("leaf_stmt");
                              clicon_debug(2,"leaf-stmt -> LEAF id-arg-str { lead-substmts }");}
               ;
 
@@ -1068,12 +1093,12 @@ leaf_substmt  : when_stmt            { clicon_debug(2,"leaf-substmt -> when-stmt
 
 /* leaf-list */
 leaf_list_stmt : K_LEAF_LIST identifier_str ';'
-		{ if (ysp_add(_yy, Y_LEAF_LIST, $2, NULL) == NULL) _YYERROR("13"); 
+		{ if (ysp_add(_yy, Y_LEAF_LIST, $2, NULL) == NULL) _YYERROR("leaf_list_stmt"); 
 			   clicon_debug(2,"leaf-list-stmt -> LEAF id-arg-str ;");}
               | K_LEAF_LIST identifier_str
-                          { if (ysp_add_push(_yy, Y_LEAF_LIST, $2) == NULL) _YYERROR("14"); }
+                          { if (ysp_add_push(_yy, Y_LEAF_LIST, $2) == NULL) _YYERROR("leaf_list_stmt"); }
                 '{' leaf_list_substmts '}'
-                           { if (ystack_pop(_yy) < 0) _YYERROR("15");
+                           { if (ystack_pop(_yy) < 0) _YYERROR("leaf_list_stmt");
                              clicon_debug(2,"leaf-list-stmt -> LEAF-LIST id-arg-str { lead-substmts }");}
               ;
 
@@ -1097,14 +1122,13 @@ leaf_list_substmt : when_stmt        { clicon_debug(2,"leaf-list-substmt -> when
               |                      { clicon_debug(2,"leaf-list-stmt ->"); }
               ;
 
-/* list */
 list_stmt     : K_LIST identifier_str ';' 
-		{ if (ysp_add(_yy, Y_LIST, $2, NULL) == NULL) _YYERROR("16"); 
+		{ if (ysp_add(_yy, Y_LIST, $2, NULL) == NULL) _YYERROR("list_stmt"); 
 			   clicon_debug(2,"list-stmt -> LIST id-arg-str ;"); }
               | K_LIST identifier_str 
-                          { if (ysp_add_push(_yy, Y_LIST, $2) == NULL) _YYERROR("17"); }
+                          { if (ysp_add_push(_yy, Y_LIST, $2) == NULL) _YYERROR("list_stmt"); }
 	       '{' list_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("18");
+                           { if (ystack_pop(_yy) < 0) _YYERROR("list_stmt");
 			     clicon_debug(2,"list-stmt -> LIST id-arg-str { list-substmts }"); }
               ;
 
@@ -1137,24 +1161,24 @@ list_substmt  : when_stmt            { clicon_debug(2,"list-substmt -> when-stmt
 
 /* key-stmt = key-keyword sep key-arg-str */
 key_stmt      : K_KEY string stmtend
-		{ if (ysp_add(_yy, Y_KEY, $2, NULL)== NULL) _YYERROR("109"); 
+		{ if (ysp_add(_yy, Y_KEY, $2, NULL)== NULL) _YYERROR("key_stmt"); 
 			   clicon_debug(2,"key-stmt -> KEY id-arg-str ;");}
               ;
 
 /* unique-stmt = unique-keyword unique-arg-str */
 unique_stmt   : K_UNIQUE string stmtend
-		{ if (ysp_add(_yy, Y_UNIQUE, $2, NULL)== NULL) _YYERROR("110"); 
+		{ if (ysp_add(_yy, Y_UNIQUE, $2, NULL)== NULL) _YYERROR("unique_stmt"); 
 			   clicon_debug(2,"key-stmt -> KEY id-arg-str ;");}
               ;
 
 /* choice */
 choice_stmt   : K_CHOICE identifier_str ';' 
-	       { if (ysp_add(_yy, Y_CHOICE, $2, NULL) == NULL) _YYERROR("19"); 
+	       { if (ysp_add(_yy, Y_CHOICE, $2, NULL) == NULL) _YYERROR("choice_stmt"); 
 			   clicon_debug(2,"choice-stmt -> CHOICE id-arg-str ;"); }
               | K_CHOICE identifier_str
-                          { if (ysp_add_push(_yy, Y_CHOICE, $2) == NULL) _YYERROR("20"); }
+                          { if (ysp_add_push(_yy, Y_CHOICE, $2) == NULL) _YYERROR("choice_stmt"); }
 	       '{' choice_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("21");
+                           { if (ystack_pop(_yy) < 0) _YYERROR("choice_stmt");
 			     clicon_debug(2,"choice-stmt -> CHOICE id-arg-str { choice-substmts }"); }
               ;
 
@@ -1180,12 +1204,12 @@ choice_substmt : when_stmt           { clicon_debug(2,"choice-substmt -> when-st
 
 /* case */
 case_stmt   : K_CASE identifier_str ';' 
-	       { if (ysp_add(_yy, Y_CASE, $2, NULL) == NULL) _YYERROR("22"); 
+	       { if (ysp_add(_yy, Y_CASE, $2, NULL) == NULL) _YYERROR("case_stmt"); 
 			   clicon_debug(2,"case-stmt -> CASE id-arg-str ;"); }
               | K_CASE identifier_str 
-                          { if (ysp_add_push(_yy, Y_CASE, $2) == NULL) _YYERROR("23"); }
+                          { if (ysp_add_push(_yy, Y_CASE, $2) == NULL) _YYERROR("case_stmt"); }
 	       '{' case_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("24");
+                           { if (ystack_pop(_yy) < 0) _YYERROR("case_stmt");
 			     clicon_debug(2,"case-stmt -> CASE id-arg-str { case-substmts }"); }
               ;
 
@@ -1206,23 +1230,23 @@ case_substmt  : when_stmt            { clicon_debug(2,"case-substmt -> when-stmt
               ;
 
 anydata_stmt   : K_ANYDATA identifier_str ';' 
-	       { if (ysp_add(_yy, Y_ANYDATA, $2, NULL) == NULL) _YYERROR("25"); 
+	       { if (ysp_add(_yy, Y_ANYDATA, $2, NULL) == NULL) _YYERROR("anydata_stmt"); 
 			   clicon_debug(2,"anydata-stmt -> ANYDATA id-arg-str ;"); }
               | K_ANYDATA identifier_str
-                          { if (ysp_add_push(_yy, Y_ANYDATA, $2) == NULL) _YYERROR("26"); }
+                          { if (ysp_add_push(_yy, Y_ANYDATA, $2) == NULL) _YYERROR("anydata_stmt"); }
 	       '{' anyxml_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("27");
+                           { if (ystack_pop(_yy) < 0) _YYERROR("anydata_stmt");
 			     clicon_debug(2,"anydata-stmt -> ANYDATA id-arg-str { anyxml-substmts }"); }
               ;
 
 /* anyxml */
 anyxml_stmt   : K_ANYXML identifier_str ';' 
-	       { if (ysp_add(_yy, Y_ANYXML, $2, NULL) == NULL) _YYERROR("25"); 
+	       { if (ysp_add(_yy, Y_ANYXML, $2, NULL) == NULL) _YYERROR("anyxml_stmt"); 
 			   clicon_debug(2,"anyxml-stmt -> ANYXML id-arg-str ;"); }
               | K_ANYXML identifier_str
-                          { if (ysp_add_push(_yy, Y_ANYXML, $2) == NULL) _YYERROR("26"); }
+                          { if (ysp_add_push(_yy, Y_ANYXML, $2) == NULL) _YYERROR("anyxml_stmt"); }
 	       '{' anyxml_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("27");
+                           { if (ystack_pop(_yy) < 0) _YYERROR("anyxml_stmt");
 			     clicon_debug(2,"anyxml-stmt -> ANYXML id-arg-str { anyxml-substmts }"); }
               ;
 
@@ -1245,12 +1269,12 @@ anyxml_substmt  : when_stmt          { clicon_debug(2,"anyxml-substmt -> when-st
 
 /* uses-stmt = uses-keyword identifier-ref-arg-str */
 uses_stmt     : K_USES identifier_ref_str ';' 
-	       { if (ysp_add(_yy, Y_USES, $2, NULL) == NULL) _YYERROR("28"); 
+	       { if (ysp_add(_yy, Y_USES, $2, NULL) == NULL) _YYERROR("uses_stmt"); 
 			   clicon_debug(2,"uses-stmt -> USES id-arg-str ;"); }
               | K_USES identifier_ref_str
-                          { if (ysp_add_push(_yy, Y_USES, $2) == NULL) _YYERROR("29"); }
+                          { if (ysp_add_push(_yy, Y_USES, $2) == NULL) _YYERROR("uses_stmt"); }
 	       '{' uses_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("30");
+                           { if (ystack_pop(_yy) < 0) _YYERROR("uses_stmt");
 			     clicon_debug(2,"uses-stmt -> USES id-arg-str { uses-substmts }"); }
               ;
 
@@ -1273,12 +1297,12 @@ uses_substmt  : when_stmt            { clicon_debug(2,"uses-substmt -> when-stmt
 
 /* refine-stmt = refine-keyword sep refine-arg-str */
 refine_stmt   : K_REFINE desc_schema_node_str ';' 
-	       { if (ysp_add(_yy, Y_REFINE, $2, NULL) == NULL) _YYERROR("31"); 
+	       { if (ysp_add(_yy, Y_REFINE, $2, NULL) == NULL) _YYERROR("refine_stmt"); 
 			   clicon_debug(2,"refine-stmt -> REFINE id-arg-str ;"); }
               | K_REFINE desc_schema_node_str
-                          { if (ysp_add_push(_yy, Y_REFINE, $2) == NULL) _YYERROR("32"); }
+                          { if (ysp_add_push(_yy, Y_REFINE, $2) == NULL) _YYERROR("refine_stmt"); }
 	       '{' refine_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("33");
+                           { if (ystack_pop(_yy) < 0) _YYERROR("refine_stmt");
 			     clicon_debug(2,"refine-stmt -> REFINE id-arg-str { refine-substmts }"); }
               ;
 
@@ -1297,9 +1321,9 @@ refine_substmt  : must_stmt     { clicon_debug(2,"refine-substmt -> must-stmt");
 
 /* uses-augment-stmt = augment-keyword augment-arg-str */
 uses_augment_stmt : K_AUGMENT desc_schema_node_str
-                      { if (ysp_add_push(_yy, Y_AUGMENT, $2) == NULL) _YYERROR("34"); }
+                      { if (ysp_add_push(_yy, Y_AUGMENT, $2) == NULL) _YYERROR("uses_augment_stmt"); }
                     '{' augment_substmts '}'
-                      { if (ystack_pop(_yy) < 0) _YYERROR("35");
+                      { if (ystack_pop(_yy) < 0) _YYERROR("uses_augment_stmt");
 			     clicon_debug(2,"uses-augment-stmt -> AUGMENT desc-schema-node-str { augment-substmts }"); }
 
 		    
@@ -1307,9 +1331,9 @@ uses_augment_stmt : K_AUGMENT desc_schema_node_str
  * XXX abs-schema-nodeid-str is too difficult, it needs the + semantics
  */
 augment_stmt   : K_AUGMENT string
-                    { if (ysp_add_push(_yy, Y_AUGMENT, $2) == NULL) _YYERROR("34"); }
+                    { if (ysp_add_push(_yy, Y_AUGMENT, $2) == NULL) _YYERROR("augment_stmt"); }
 	       '{' augment_substmts '}' 
-                    { if (ystack_pop(_yy) < 0) _YYERROR("35");
+                    { if (ystack_pop(_yy) < 0) _YYERROR("augment_stmt");
 			     clicon_debug(2,"augment-stmt -> AUGMENT abs-schema-node-str { augment-substmts }"); }
               ;
 
@@ -1333,12 +1357,12 @@ augment_substmt : when_stmt          { clicon_debug(2,"augment-substmt -> when-s
 
 /* when */
 when_stmt   : K_WHEN string ';' 
-	       { if (ysp_add(_yy, Y_WHEN, $2, NULL) == NULL) _YYERROR("36"); 
+	       { if (ysp_add(_yy, Y_WHEN, $2, NULL) == NULL) _YYERROR("when_stmt"); 
 			   clicon_debug(2,"when-stmt -> WHEN string ;"); }
             | K_WHEN string
-               { if (ysp_add_push(_yy, Y_WHEN, $2) == NULL) _YYERROR("37"); }
+               { if (ysp_add_push(_yy, Y_WHEN, $2) == NULL) _YYERROR("when_stmt"); }
 	       '{' when_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("38");
+                           { if (ystack_pop(_yy) < 0) _YYERROR("when_stmt");
 			     clicon_debug(2,"when-stmt -> WHEN string { when-substmts }"); }
               ;
 
@@ -1355,12 +1379,12 @@ when_substmt  : description_stmt { clicon_debug(2,"when-substmt -> description-s
 
 /* rpc */
 rpc_stmt   : K_RPC identifier_str ';' 
-	       { if (ysp_add(_yy, Y_RPC, $2, NULL) == NULL) _YYERROR("39"); 
+	       { if (ysp_add(_yy, Y_RPC, $2, NULL) == NULL) _YYERROR("rpc_stmt"); 
 			   clicon_debug(2,"rpc-stmt -> RPC id-arg-str ;"); }
            | K_RPC identifier_str
-               { if (ysp_add_push(_yy, Y_RPC, $2) == NULL) _YYERROR("40"); }
+               { if (ysp_add_push(_yy, Y_RPC, $2) == NULL) _YYERROR("rpc_stmt"); }
 	     '{' rpc_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("41");
+                           { if (ystack_pop(_yy) < 0) _YYERROR("rpc_stmt");
 			     clicon_debug(2,"rpc-stmt -> RPC id-arg-str { rpc-substmts }"); }
               ;
 
@@ -1383,23 +1407,23 @@ rpc_substmt   : if_feature_stmt  { clicon_debug(2,"rpc-substmt -> if-feature-stm
 
 /* action */
 action_stmt   : K_ACTION identifier_str ';' 
-	       { if (ysp_add(_yy, Y_ACTION, $2, NULL) == NULL) _YYERROR("39"); 
+	       { if (ysp_add(_yy, Y_ACTION, $2, NULL) == NULL) _YYERROR("action_stmt"); 
 			   clicon_debug(2,"action-stmt -> ACTION id-arg-str ;"); }
               | K_ACTION identifier_str
-                          { if (ysp_add_push(_yy, Y_ACTION, $2) == NULL) _YYERROR("40"); }
+                          { if (ysp_add_push(_yy, Y_ACTION, $2) == NULL) _YYERROR("action_stmt"); }
 	       '{' rpc_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("41");
+                           { if (ystack_pop(_yy) < 0) _YYERROR("action_stmt");
 			     clicon_debug(2,"action-stmt -> ACTION id-arg-str { rpc-substmts }"); }
               ;
 
 /* notification */
 notification_stmt : K_NOTIFICATION identifier_str ';' 
-	                { if (ysp_add(_yy, Y_NOTIFICATION, $2, NULL) == NULL) _YYERROR("46"); 
+	                { if (ysp_add(_yy, Y_NOTIFICATION, $2, NULL) == NULL) _YYERROR("notification_stmt"); 
 			   clicon_debug(2,"notification-stmt -> NOTIFICATION id-arg-str ;"); }
                   | K_NOTIFICATION identifier_str
-                        { if (ysp_add_push(_yy, Y_NOTIFICATION, $2) == NULL) _YYERROR("47"); }
+                        { if (ysp_add_push(_yy, Y_NOTIFICATION, $2) == NULL) _YYERROR("notification_stmt"); }
 	            '{' notification_substmts '}' 
-                        { if (ystack_pop(_yy) < 0) _YYERROR("48");
+                        { if (ystack_pop(_yy) < 0) _YYERROR("notification_stmt");
 			     clicon_debug(2,"notification-stmt -> NOTIFICATION id-arg-str { notification-substmts }"); }
                   ;
 
@@ -1427,9 +1451,9 @@ notification_substmt : if_feature_stmt  { clicon_debug(2,"notification-substmt -
 
 */
 deviation_stmt : K_DEVIATION string
-                  { if (ysp_add_push(_yy, Y_DEVIATION, $2) == NULL) _YYERROR("47"); }
+                  { if (ysp_add_push(_yy, Y_DEVIATION, $2) == NULL) _YYERROR("deviation_stmt"); }
 	            '{' deviation_substmts '}' 
-                        { if (ystack_pop(_yy) < 0) _YYERROR("48");
+                        { if (ystack_pop(_yy) < 0) _YYERROR("deviation_stmt");
 			     clicon_debug(2,"deviation-stmt -> DEVIATION id-arg-str { notification-substmts }"); }
                ;
 
@@ -1444,14 +1468,10 @@ deviation_substmt : description_stmt  { clicon_debug(2,"deviation-substmt -> des
                   | deviate_not_supported_stmt  { clicon_debug(2,"deviation-substmt -> deviate-not-supported-stmt"); }
 		  ;
 
-deviate_not_supported_stmt : K_DEVIATE string { clicon_debug(2,"deviate-not-supported-stmt -> DEVIATE string"); }
+deviate_not_supported_stmt : K_DEVIATE string stmtend
+                     { clicon_debug(2,"deviate-not-supported-stmt -> DEVIATE string"); }
                              ;
 
-meta_stmt     : organization_stmt    { clicon_debug(2,"meta-stmt -> organization-stmt"); }
-              | contact_stmt         { clicon_debug(2,"meta-stmt -> contact-stmt"); }
-              | description_stmt     { clicon_debug(2,"meta-stmt -> description-stmt"); }
-              | reference_stmt       { clicon_debug(2,"meta-stmt -> reference-stmt"); }
-              ;
 
 /* body */
 body_stmts    : body_stmts body_stmt { clicon_debug(2,"body-stmts -> body-stmts body-stmt"); } 
@@ -1492,9 +1512,9 @@ short_case_stmt : container_stmt   { clicon_debug(2,"short-case-substmt -> conta
 
 /* input */
 input_stmt  : K_INPUT 
-                          { if (ysp_add_push(_yy, Y_INPUT, NULL) == NULL) _YYERROR("42"); }
+                          { if (ysp_add_push(_yy, Y_INPUT, NULL) == NULL) _YYERROR("input_stmt"); }
 	       '{' input_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("43");
+                           { if (ystack_pop(_yy) < 0) _YYERROR("input_stmt");
 			     clicon_debug(2,"input-stmt -> INPUT { input-substmts }"); }
               ;
 
@@ -1512,15 +1532,12 @@ input_substmt : typedef_stmt         { clicon_debug(2,"input-substmt -> typedef-
 
 /* output */
 output_stmt  : K_OUTPUT  /* XXX reuse input-substatements since they are same */
-                          { if (ysp_add_push(_yy, Y_OUTPUT, NULL) == NULL) _YYERROR("44"); }
+                          { if (ysp_add_push(_yy, Y_OUTPUT, NULL) == NULL) _YYERROR("output_stmt"); }
 	       '{' input_substmts '}' 
-                           { if (ystack_pop(_yy) < 0) _YYERROR("45");
+                           { if (ystack_pop(_yy) < 0) _YYERROR("output_stmt");
 			     clicon_debug(2,"output-stmt -> OUTPUT { input-substmts }"); }
               ;
 
-
-
-
 string        : qstrings { $$=$1; clicon_debug(2,"string -> qstrings (%s)", $1); }
               | ustring  { $$=$1; clicon_debug(2,"string -> ustring (%s)", $1); }
               ;	      
@@ -1554,12 +1571,11 @@ ustring       : ustring CHAR
 	             {$$=$1; } 
               ;
 
-
 abs_schema_nodeid : abs_schema_nodeid '/' node_identifier
-                 { if (($$=string_del_join($1, "/", $3)) == NULL) _YYERROR("0");
+                 { if (($$=string_del_join($1, "/", $3)) == NULL) _YYERROR("abs_schema_nodeid");
 		   clicon_debug(2,"absolute-schema-nodeid -> absolute-schema-nodeid / node-identifier"); }
               | '/' node_identifier
-                 {  if (($$=string_del_join(NULL, "/", $2)) == NULL) _YYERROR("0");
+                 {  if (($$=string_del_join(NULL, "/", $2)) == NULL) _YYERROR("abs_schema_nodeid");
 		     clicon_debug(2,"absolute-schema-nodeid -> / node-identifier"); }
               ;
 
@@ -1572,7 +1588,7 @@ desc_schema_node_str : desc_schema_nodeid
 desc_schema_nodeid : node_identifier
                      { $$= $1; clicon_debug(2,"descendant-schema-nodeid -> node_identifier"); }
                    | node_identifier abs_schema_nodeid
-		   { if (($$=string_del_join($1, " ", $2)) == NULL) _YYERROR("0");clicon_debug(2,"descendant-schema-nodeid -> node_identifier abs_schema_nodeid"); }
+		   { if (($$=string_del_join($1, " ", $2)) == NULL) _YYERROR("desc_schema_nodeid");clicon_debug(2,"descendant-schema-nodeid -> node_identifier abs_schema_nodeid"); }
                    ;
 
 identifier_str : '"' IDENTIFIER '"' { $$ = $2;
@@ -1602,7 +1618,7 @@ bool_str       : '"' BOOL '"' { $$ = $2;
 node_identifier : IDENTIFIER
 		   { $$=$1; clicon_debug(2,"identifier-ref-arg-str -> string"); }
                 | IDENTIFIER ':' IDENTIFIER
-		{ if (($$=string_del_join($1, ":", $3)) == NULL) _YYERROR("112");
+		{ if (($$=string_del_join($1, ":", $3)) == NULL) _YYERROR("node_identifier");
 			clicon_debug(2,"identifier-ref-arg-str -> prefix : string"); }
                 ;
 
diff --git a/lib/src/clixon_yang_type.c b/lib/src/clixon_yang_type.c
index 68204c9b..788af4f7 100644
--- a/lib/src/clixon_yang_type.c
+++ b/lib/src/clixon_yang_type.c
@@ -150,7 +150,7 @@ yang_type_cache_set(yang_type_cache **ycache0,
     return retval;
 }
 
-/*! Get individual fields (direct/destrucively) from yang type cache. */
+/*! Get individual fields (direct/destructively) from yang type cache. */
 int
 yang_type_cache_get(yang_type_cache *ycache,
 		    yang_stmt      **resolved,
@@ -227,19 +227,17 @@ ys_resolve_type(yang_stmt *ys,
     yang_stmt        *resolved = NULL;
  
     assert(ys->ys_keyword == Y_TYPE);
+    /* Recursively resolve ys -> resolve with restrictions(options, etc) 
+     * Note that the resolved type could be ys itself.
+     */
     if (yang_type_resolve((yang_stmt*)ys->ys_parent, ys, &resolved,
 			  &options, &mincv, &maxcv, &pattern, &fraction) < 0)
 	goto done;
 
-    if (resolved && strcmp(resolved->ys_argument, "union")==0)
-	; 
-    /* skip unions since they may have different sets of options, mincv, etc 
-     * You would have to resolve all sub-types also recursively
-     */
-    else
-	if (yang_type_cache_set(&ys->ys_typecache, 
-				resolved, options, mincv, maxcv, pattern, fraction) < 0)
-	    goto done;
+    /* Cache the resolve locally */
+    if (yang_type_cache_set(&ys->ys_typecache, 
+			    resolved, options, mincv, maxcv, pattern, fraction) < 0)
+	goto done;
     retval = 0;
  done:
     return retval;
@@ -660,10 +658,12 @@ ys_cv_validate_union_one(yang_stmt *ys,
 	    clicon_err(OE_UNIX, errno, "cv_new");
 	    goto done;
 	}
-	if (cv_parse(val, cvt) <0){
+	if ((retval = cv_parse1(val, cvt, reason)) < 0){
 	    clicon_err(OE_UNIX, errno, "cv_parse");
 	    goto done;
 	}
+	if (retval == 0)
+	    goto done;
 	if ((retval = cv_validate1(cvt, cvtype, options, range_min, range_max, 
 				   pattern, yrt, restype, reason)) < 0)
 	    goto done;
@@ -688,16 +688,32 @@ ys_cv_validate_union(yang_stmt *ys,
 {
     int        retval = 1; /* valid */
     yang_stmt *yt = NULL;
+    char      *reason1 = NULL;  /* saved reason */
 
     while ((yt = yn_each((yang_node*)yrestype, yt)) != NULL){
 	if (yt->ys_keyword != Y_TYPE)
 	    continue;
 	if ((retval = ys_cv_validate_union_one(ys, reason, yt, type, val)) < 0)
 	    goto done;
+	/* If validation failed, save reason, reset error and continue,
+	 * save latest reason if noithing validates.
+	 */
+	if (retval == 0 && reason && *reason != NULL){
+	    if (reason1)
+		free(reason1);
+	    reason1 = *reason;
+	    *reason = NULL;
+	}
 	if (retval == 1) /* Enough that one type validates value */
 	    break;
     }
  done:
+    if (retval == 0 && reason1){
+	*reason = reason1;
+	reason1 = NULL;
+    }
+    if (reason1)
+	free(reason1);
     return retval;
 }
 
@@ -908,7 +924,7 @@ resolve_restrictions(yang_stmt   *yrange,
 }
 
 /*! Recursively resolve a yang type to built-in type with optional restrictions
- * @param[in]  ys       yang-stmt from where the current search is based
+ * @param[in]  ys       (original) type yang-stmt where the current search is based
  * @param[in]  ytype    yang-stmt object containing currently resolving type
  * @param[out] yrestype resolved type. return built-in type or NULL. mandatory
  * @param[out] options  pointer to flags field of optional values. optional
@@ -945,14 +961,14 @@ yang_type_resolve(yang_stmt   *ys,
     char        *prefix = NULL;
     int          retval = -1;
     yang_node   *yn;
-    yang_stmt   *ymod;
+    yang_stmt   *yrmod; /* module where resolved type is looked for */
 
     if (options)
 	*options = 0x0;
     *yrestype    = NULL; /* Initialization of resolved type that may not be necessary */
     type      = yarg_id(ytype);     /* This is the type to resolve */
     prefix    = yarg_prefix(ytype); /* And this its prefix */
-    /* Cache does not work for eg string length 32 */
+    /* Cache does not work for eg string length 32? */
     if (!yang_builtin(type) && ytype->ys_typecache != NULL){
 	if (yang_type_cache_get(ytype->ys_typecache, 
 				yrestype, options, mincv, maxcv, pattern, fraction) < 0)
@@ -974,11 +990,12 @@ yang_type_resolve(yang_stmt   *ys,
 
     /* Not basic type. Now check if prefix which means we look in other module */
     if (prefix){ /* Go to top and find import that matches */
-	if ((ymod = yang_find_module_by_prefix(ys, prefix)) == NULL){
-	    clicon_err(OE_DB, 0, "Type not resolved: %s:%s", prefix, type);
+	if ((yrmod = yang_find_module_by_prefix(ytype, prefix)) == NULL){
+	    clicon_err(OE_DB, 0, "Type not resolved: \"%s:%s\" in module %s",
+		       prefix, type, ys_module(ys)->ys_argument);
 	    goto done;
 	}
-	if ((rytypedef = yang_find((yang_node*)ymod, Y_TYPEDEF, type)) == NULL)
+	if ((rytypedef = yang_find((yang_node*)yrmod, Y_TYPEDEF, type)) == NULL)
 	    goto ok; /* unresolved */
     }
     else
diff --git a/test/lib.sh b/test/lib.sh
index ab0a5ed9..716b6c83 100755
--- a/test/lib.sh
+++ b/test/lib.sh
@@ -78,14 +78,24 @@ expectfn(){
       expect2=
   fi
   ret=$($cmd)
+  r=$? 
 #  echo "cmd:\"$cmd\""
 #  echo "retval:\"$retval\""
 #  echo "ret:\"$ret\""
-  if [ $? -ne $retval ]; then
-      echo -e "\e[31m\nError in Test$testnr [$testname]:"
+#  echo "r:\"$r\""
+    if [ $r != $retval ]; then
+      echo -e "\e[31m\nError ($r != $retval) in Test$testnr [$testname]:"
       echo -e "\e[0m:"
       exit -1
-  fi
+    fi
+    if [ $r != 0 ]; then
+       return
+    fi
+#  if [ $ret -ne $retval ]; then
+#      echo -e "\e[31m\nError in Test$testnr [$testname]:"
+#      echo -e "\e[0m:"
+#      exit -1
+#  fi
   # Match if both are empty string
   if [ -z "$ret" -a -z "$expect" ]; then
       return
diff --git a/test/test_cli.sh b/test/test_cli.sh
index 1304bf81..a93cf0fb 100755
--- a/test/test_cli.sh
+++ b/test/test_cli.sh
@@ -17,6 +17,7 @@ cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
   <CLICON_YANG_MODULE_MAIN>$APPNAME</CLICON_YANG_MODULE_MAIN>
   <CLICON_BACKEND_DIR>/usr/local/lib/$APPNAME/backend</CLICON_BACKEND_DIR>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
diff --git a/test/test_datastore.sh b/test/test_datastore.sh
index 27f3b4bf..122b3add 100755
--- a/test/test_datastore.sh
+++ b/test/test_datastore.sh
@@ -57,7 +57,7 @@ run(){
     fi
     rm -rf $mydir/*
 
-    conf="-d candidate -b $mydir -p ../datastore/$name/$name.so -y $dir -m ietf-ip"
+    conf="-d candidate -b $mydir -p ../datastore/$name/$name.so -y $dir/ietf-ip.yang"
   
     new "datastore $name init"
     expectfn "$datastore $conf init" 0 ""
@@ -144,7 +144,7 @@ run(){
     expectfn "$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 "$datastore -d kalle -b $mydir -p ../datastore/$name/$name.so -y $dir -m ietf-ip init" 0 ""
+    expectfn "$datastore -d kalle -b $mydir -p ../datastore/$name/$name.so -y $dir/ietf-ip.yang init" 0 ""
 
     new "datastore other db copy"
     expectfn "$datastore $conf copy kalle" 0 ""
diff --git a/test/test_feature.sh b/test/test_feature.sh
index e5279f6c..86f3ffd2 100755
--- a/test/test_feature.sh
+++ b/test/test_feature.sh
@@ -13,6 +13,7 @@ cat <<EOF > $cfg
   <CLICON_FEATURE>ietf-routing:router-id</CLICON_FEATURE>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
   <CLICON_YANG_MODULE_MAIN>$APPNAME</CLICON_YANG_MODULE_MAIN>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
diff --git a/test/test_identity.sh b/test/test_identity.sh
index e006ca34..f9498013 100755
--- a/test/test_identity.sh
+++ b/test/test_identity.sh
@@ -11,6 +11,7 @@ cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
   <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>
diff --git a/test/test_leafref.sh b/test/test_leafref.sh
index 6a146916..719a77e6 100755
--- a/test/test_leafref.sh
+++ b/test/test_leafref.sh
@@ -10,6 +10,7 @@ cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
   <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
diff --git a/test/test_list.sh b/test/test_list.sh
index 67c3f953..ff12015a 100755
--- a/test/test_list.sh
+++ b/test/test_list.sh
@@ -12,6 +12,7 @@ cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
   <CLICON_YANG_MODULE_MAIN>$APPNAME</CLICON_YANG_MODULE_MAIN>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
diff --git a/test/test_nacm.sh b/test/test_nacm.sh
index 586e5538..afac1df7 100755
--- a/test/test_nacm.sh
+++ b/test/test_nacm.sh
@@ -15,6 +15,7 @@ cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_RESTCONF_DIR>/usr/local/lib/$APPNAME/restconf</CLICON_RESTCONF_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
diff --git a/test/test_nacm_ext.sh b/test/test_nacm_ext.sh
index ee5ae60b..997965ff 100755
--- a/test/test_nacm_ext.sh
+++ b/test/test_nacm_ext.sh
@@ -18,6 +18,7 @@ cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>/usr/local/share/example/yang</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
   <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>
diff --git a/test/test_netconf.sh b/test/test_netconf.sh
index 2d3d2b0c..e66aae53 100755
--- a/test/test_netconf.sh
+++ b/test/test_netconf.sh
@@ -13,6 +13,7 @@ cat <<EOF > $cfg
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_MODULE_SET_ID>42</CLICON_MODULE_SET_ID>
   <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
   <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>
@@ -200,7 +201,6 @@ expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><can
 #new "netconf get CDATA"
 #expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source><filter type=\"xpath\" select=\"/interfaces/interface[name='eth/0/0']/description\" /></get-config></rpc>]]>]]>" "<rpc-reply><data><interfaces><interface><name>eth/0/0</name><description><![CDATA[myeth&]]></description><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>"
 
-
 new "netconf discard-changes"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
diff --git a/test/test_openconfig.sh b/test/test_openconfig.sh
index 6ed5423b..efb68c54 100755
--- a/test/test_openconfig.sh
+++ b/test/test_openconfig.sh
@@ -1,24 +1,104 @@
 #!/bin/bash
 # Parse yang openconfig tests
+# Note that the 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/60
+# - release/models/wifi/types/openconfig-wifi-types.yang
+#      issue: https://github.com/clicon/clixon/issues/59
+# 
 #PROG="valgrind --leak-check=full --show-leak-kinds=all ../util/clixon_util_yang"
 PROG=../util/clixon_util_yang
-OPENCONFIG=~/syssrc/openconfig
+OPENCONFIG=public
+OCDIR=$OPENCONFIG/release/models
+
+# Clone openconfig dir if not there
+if [ ! -d public ]; then 
+    git clone https://github.com/openconfig/public
+else
+    (cd public; git pull)
+fi
 
 # include err() and new() functions and creates $dir
 . ./lib.sh
 
-# Openconfig
-# Files not parseable:
-# - openconfig-access-points.yang
-# - openconfig-access-points.yang
-new "Openconfig"
+# Yang specifics: multi-keys and empty type
+APPNAME=example
+# include err() and new() functions and creates $dir
+. ./lib.sh
+
+cfg=$dir/conf_yang.xml
+fyang=$dir/test.yang
+
+cat <<EOF > $cfg
+<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/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/$APPNAME/yang</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_MODULE_MAIN>$APPNAME</CLICON_YANG_MODULE_MAIN>
+  <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_CLI_GENMODEL_COMPLETION>1</CLICON_CLI_GENMODEL_COMPLETION>
+  <CLICON_XMLDB_DIR>/usr/local/var/$APPNAME</CLICON_XMLDB_DIR>
+  <CLICON_XMLDB_PLUGIN>/usr/local/lib/xmldb/text.so</CLICON_XMLDB_PLUGIN>
+  <CLICON_MODULE_LIBRARY_RFC7895>true</CLICON_MODULE_LIBRARY_RFC7895>
+</config>
+EOF
+
 files=$(find $OPENCONFIG -name "*.yang")
+# Just cound nr of modules (exclude submodule)
+let m=0; # Nr of modules
 for f in $files; do
-    new "$f"
-    YANG=$(cat $f)
- # NYI
-  expecteof "$PROG" 0 "$YANG" "module"
+    if [ -n "$(head -1 $f|grep '^module')" ]; then
+	let m++;
+    fi
 done
+echo "Number of modules:$m"
+for f in $files; do
+    if [ -n "$(head -1 $f|grep '^module')" ]; then
+	new "cli $f"
+	expectfn "$clixon_cli -1f $cfg -y $f show version" 0 "3."
+    fi
+
+done
+
 rm -rf $dir
 
-
diff --git a/test/test_order.sh b/test/test_order.sh
index da1ecb87..a44586cd 100755
--- a/test/test_order.sh
+++ b/test/test_order.sh
@@ -26,6 +26,7 @@ cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>/tmp/conf_yang.xml</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
   <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
diff --git a/test/test_perf.sh b/test/test_perf.sh
index e6dde054..a2c36cf8 100755
--- a/test/test_perf.sh
+++ b/test/test_perf.sh
@@ -23,7 +23,7 @@ fyang=$dir/scaling.yang
 fconfig=$dir/config
 
 cat <<EOF > $fyang
-module ietf-ip{
+module scaling{
    yang-version 1.1;
    namespace "urn:example:clixon";
    prefix ip;
@@ -47,8 +47,9 @@ EOF
 cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
-  <CLICON_YANG_DIR>$fyang</CLICON_YANG_DIR>
-  <CLICON_YANG_MODULE_MAIN>ietf-ip</CLICON_YANG_MODULE_MAIN>
+  <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_MODULE_MAIN>scaling</CLICON_YANG_MODULE_MAIN>
   <CLICON_SOCK>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
   <CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
   <CLICON_RESTCONF_PRETTY>false</CLICON_RESTCONF_PRETTY>
diff --git a/test/test_restconf.sh b/test/test_restconf.sh
index 260d7eb9..f3b8fa72 100755
--- a/test/test_restconf.sh
+++ b/test/test_restconf.sh
@@ -11,6 +11,7 @@ cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
   <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_BACKEND_DIR>/usr/local/lib/$APPNAME/backend</CLICON_BACKEND_DIR>
diff --git a/test/test_restconf2.sh b/test/test_restconf2.sh
index 52364f2f..938aa232 100755
--- a/test/test_restconf2.sh
+++ b/test/test_restconf2.sh
@@ -12,6 +12,7 @@ cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>/usr/local/var</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
   <CLICON_RESTCONF_PRETTY>false</CLICON_RESTCONF_PRETTY>
   <CLICON_SOCK>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
   <CLICON_BACKEND_PIDFILE>$dir/restconf.pidfile</CLICON_BACKEND_PIDFILE>
diff --git a/test/test_startup.sh b/test/test_startup.sh
index ba4960f7..d9ec5b07 100755
--- a/test/test_startup.sh
+++ b/test/test_startup.sh
@@ -14,6 +14,7 @@ cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
   <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
   <CLICON_CLI_MODE>$APPNAME</CLICON_CLI_MODE>
   <CLICON_BACKEND_DIR>/usr/local/lib/$APPNAME/backend</CLICON_BACKEND_DIR>
diff --git a/test/test_stream.sh b/test/test_stream.sh
index 7e5d0e48..ce0aefc5 100755
--- a/test/test_stream.sh
+++ b/test/test_stream.sh
@@ -25,8 +25,7 @@ UTIL=../util/clixon_util_stream
 NCWAIT=5 # Wait (netconf valgrind may need more time)
 
 if [ ! -x $UTIL ]; then
-    echo "$UTIL not found. To build: (cd ../util; make clixon_util_stream)"
-    exit 1
+    (cd ../util; make clixon_util_stream)
 fi
 DATE=$(date +"%Y-%m-%d")
 # include err() and new() functions and creates $dir
diff --git a/test/test_type.sh b/test/test_type.sh
index a2126e1c..d23d13cb 100755
--- a/test/test_type.sh
+++ b/test/test_type.sh
@@ -7,11 +7,15 @@ APPNAME=example
 
 cfg=$dir/conf_yang.xml
 fyang=$dir/type.yang
+fyang2=$dir/example2.yang
+fyang3=$dir/example3.yang
 
 cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
+  <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
   <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
@@ -21,14 +25,59 @@ cat <<EOF > $cfg
   <CLICON_CLI_GENMODEL_COMPLETION>1</CLICON_CLI_GENMODEL_COMPLETION>
   <CLICON_XMLDB_DIR>/usr/local/var/$APPNAME</CLICON_XMLDB_DIR>
   <CLICON_XMLDB_PLUGIN>/usr/local/lib/xmldb/text.so</CLICON_XMLDB_PLUGIN>
+  <CLICON_XMLDB_CACHE>false</CLICON_XMLDB_CACHE>
 </config>
 EOF
 
+# transitive type, exists in fyang3, referenced from fyang2, but not declared in fyang
+cat <<EOF > $fyang3
+module example3{
+  prefix ex3;
+  namespace "urn:example:example3";
+  typedef w{
+    type union{
+       type int32{
+          range "4..44";
+       }
+    }
+  }
+  typedef u{
+     type union {
+       type w;
+       type enumeration {
+         enum "bounded";
+         enum "unbounded";
+       }
+     }
+  }
+  typedef t{
+    type string{
+      pattern '[a-z][0-9]*';
+    }
+  }
+}
+EOF
+cat <<EOF > $fyang2
+module example2{
+  import example3 { prefix ex3; }
+  namespace "urn:example:example2";
+  prefix ex2;
+  grouping gr2 {
+    leaf talle{
+      type ex3:t;
+    }
+    leaf ulle{
+      type ex3:u;
+    }
+  }
+}
+EOF
 cat <<EOF > $fyang
 module example{
   yang-version 1.1;
   namespace "urn:example:clixon";
   prefix ex;
+  import example2 { prefix ex2; }
   typedef ab {
        type string {
          pattern
@@ -136,6 +185,10 @@ module example{
    leaf mbits{
       type mybits;
    }
+  container c{
+    description "transitive type- exists in ex3";
+    uses ex2:gr2;
+  }
 }
 EOF
 
@@ -151,6 +204,50 @@ if [ $? -ne 0 ]; then
     err
 fi
 
+new "cli set transitive string"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set c talle x99" 0 "^$"
+
+new "cli set transitive string error"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set c talle 9xx" 255 "^$"
+
+new "netconf set transitive string error"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><c><talle>9xx</talle></c></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>"
+
+new "netconf validate should fail"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>application</error-type><error-severity>error</error-severity><error-message>validation of talle failed regexp match fail"
+
+new "netconf discard-changes"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "cli set transitive union int"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set c ulle 33" 0 "^$"
+
+new "cli validate"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang -l o validate" 0 "^$"
+
+new "cli set transitive union string"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set c ulle unbounded" 0 "^$"
+
+new "cli validate"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang -l o validate" 0 "^$"
+
+new "cli set transitive union error. should fail"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set c ulle kalle" 255 ""
+
+new "cli set transitive union error int"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set c ulle 55" 255 ""
+
+new "netconf set transitive union error int"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><c><ulle>55</ulle></c></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>"
+
+new "netconf validate should fail"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>application</error-type><error-severity>error</error-severity><error-message>validation of ulle failed"
+
+new "netconf discard-changes"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+#-----------
+
 new "cli set ab"
 expectfn "$clixon_cli -1f $cfg -l o -y $fyang set list a.b.a.b" 0 "^$"
 
diff --git a/test/test_when_must.sh b/test/test_when_must.sh
index da629784..f83edd78 100755
--- a/test/test_when_must.sh
+++ b/test/test_when_must.sh
@@ -13,6 +13,7 @@ cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
   <CLICON_YANG_MODULE_MAIN>$APPNAME</CLICON_YANG_MODULE_MAIN>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
diff --git a/test/test_yang.sh b/test/test_yang.sh
index a15bf6cb..d81277a4 100755
--- a/test/test_yang.sh
+++ b/test/test_yang.sh
@@ -6,12 +6,16 @@ APPNAME=example
 
 cfg=$dir/conf_yang.xml
 fyang=$dir/test.yang
+fsubmod=$dir/example-types.yang
 fyangerr=$dir/err.yang
 
+#  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
 cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
+
+  <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
   <CLICON_YANG_MODULE_MAIN>$APPNAME</CLICON_YANG_MODULE_MAIN>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
@@ -30,6 +34,7 @@ module $APPNAME{
    yang-version 1.1;
    prefix ex;
    namespace "urn:example:clixon";
+   include example-types;
    extension c-define {
       description "Example from RFC 6020";
       argument "name";
@@ -85,6 +90,41 @@ module $APPNAME{
       type string;
     }
   }
+  list mylist{ /* uses submodule */
+         key x;
+         leaf x{
+           type string;
+         }
+         uses ex:subm-group;
+  }
+}
+EOF
+
+# Submodule Example from rfc7950 sec 7.2.3
+cat <<EOF > $fsubmod
+submodule example-types {
+       yang-version 1.1;
+       belongs-to $APPNAME {
+         prefix "sys";
+       }
+       import ietf-yang-types {
+         prefix "yang";
+       }
+       organization "Example Inc.";
+       contact         "Joe L. User";
+       description
+         "This submodule defines common Example types.";
+       revision "2007-06-09" {
+         description "Initial revision.";
+       }
+      grouping subm-group {
+        description "Defined in submodule";
+        container subm-container{
+          leaf subm-leaf{
+            type string;
+          }
+        }
+      }
 }
 EOF
 
@@ -128,7 +168,8 @@ new "netconf get config"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data><x><f><e/><e>a</e></f></x></data></rpc-reply>]]>]]>$"
 
 new "netconf discard-changes"
-expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
 
 #new "cli not defined extension"
 #new "netconf not defined extension"
@@ -182,7 +223,7 @@ new "netconf get presence only"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get-config><source><candidate/></source><filter type="xpath" select="/x/nopresence"/></get-config></rpc>]]>]]>' "^<rpc-reply><data/></rpc-reply>]]>]]>$"
 
 new "netconf discard-changes"
-expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf anyxml"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><x><any><foo><bar a=\"nisse\"/></foo></any></x></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
@@ -191,7 +232,7 @@ new "netconf validate anyxml"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf delete candidate"
-expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><delete-config><target><candidate/></target></delete-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><delete-config><target><candidate/></target></delete-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 # Check 3-keys
 new "netconf add one 3-key entry"
@@ -218,6 +259,25 @@ expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><can
 new "netconf check delete"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '<rpc-reply><data><x><y><a>1</a><b>2</b><c>1</c><val>two</val></y></x></data></rpc-reply>]]>]]>'
 
+# clear db for next test
+new "netconf delete candidate"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><delete-config><target><candidate/></target></delete-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "netconf commit empty candidate"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "netconfig config submodule"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><mylist><x>a</x><subm-container><subm-leaf>foo</subm-leaf></subm-container></mylist></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "netconf submodule get config"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data><mylist><x>a</x><subm-container><subm-leaf>foo</subm-leaf></subm-container></mylist></data></rpc-reply>]]>]]>$"
+
+new "netconf submodule validate"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "netconf submodule discard-changes"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
 new "Kill backend"
 # Check if premature kill
 pid=`pgrep -u root -f clixon_backend`
diff --git a/util/clixon_util_yang.c b/util/clixon_util_yang.c
index 9232b535..13b78743 100644
--- a/util/clixon_util_yang.c
+++ b/util/clixon_util_yang.c
@@ -31,6 +31,8 @@
 
   ***** END LICENSE BLOCK *****
 
+  * Parse a SINGLE yang file - no dependencies - utility function only useful
+  * for basic syntactic checks.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/yang/clixon-config@2018-10-21.yang b/yang/clixon-config@2018-10-21.yang
index 839e16b0..a0376c21 100644
--- a/yang/clixon-config@2018-10-21.yang
+++ b/yang/clixon-config@2018-10-21.yang
@@ -133,11 +133,14 @@ module clixon-config {
 	    description
 		"Location of configuration-file for default values (this file)";
 	}
-	leaf CLICON_YANG_DIR {
+	leaf-list CLICON_YANG_DIR {
 	    type string;
-	    mandatory true;
 	    description
-		"Location of YANG module and submodule files.";
+		"Yang directory path for finding module and submodule files. 
+                 A list of these options should be in the configuration. 
+                 When loading a Yang module, Clixon searches this list in the order
+                 they appear. Ensure that CLIXON_DATADIR(default 
+                 /usr/local/share/clixon) is present in the path";
 	}
 	leaf CLICON_YANG_MODULE_MAIN {
 	    type string;

From d09a8c08aa6cd80c5418348b0ffc254ee569224e Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sat, 1 Dec 2018 18:34:52 +0100
Subject: [PATCH 07/72] getopt return value changed from char to int
 (https://github.com/clicon/clixon/issues/58)

---
 CHANGELOG.md                  | 5 ++++-
 apps/backend/backend_main.c   | 2 +-
 apps/cli/cli_main.c           | 2 +-
 apps/netconf/netconf_main.c   | 2 +-
 apps/restconf/restconf_main.c | 2 +-
 datastore/datastore_client.c  | 2 +-
 example/example_restconf.c    | 2 +-
 lib/src/json_xpath.c          | 4 ++--
 util/clixon_util_stream.c     | 2 +-
 util/clixon_util_xml.c        | 2 +-
 util/clixon_util_xpath.c      | 2 +-
 util/clixon_util_yang.c       | 4 ++--
 12 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ed77983..a70162a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@
   * Support of submodule, include and belongs-to.
   * Openconfig yang specs parsed: https://github.com/openconfig/public
   * Improved unknown handling
-  * `CLICON_YANG_DIR` is changed from a single directory to a path of directories
+  * Configure option `CLICON_YANG_DIR` is changed from a single directory to a path of directories
     * Note CLIXON_DATADIR (=/usr/local/share/clixon) need to be in the list
 
 ### API changes on existing features (you may need to change your code)
@@ -26,7 +26,10 @@
   * Syntactically Correct handling of '<?' (processing instructions) and '<?xml' (XML declaration)
   * XML prolog syntax for 'well-formed' XML
   * <!DOCTYPE (ie DTD) is not supported.
+
 ### Corrected Bugs
+* getopt return value changed from char to int (https://github.com/clicon/clixon/issues/58)
+
 ### Known issues
 
 ## 3.8.0 (6 Nov 2018)
diff --git a/apps/backend/backend_main.c b/apps/backend/backend_main.c
index 76a5dca9..db66647e 100644
--- a/apps/backend/backend_main.c
+++ b/apps/backend/backend_main.c
@@ -504,7 +504,7 @@ main(int    argc,
      char **argv)
 {
     int           retval = -1;
-    char          c;
+    int           c;
     int           zap;
     int           foreground;
     int           once;
diff --git a/apps/cli/cli_main.c b/apps/cli/cli_main.c
index 5e887543..feb5f158 100644
--- a/apps/cli/cli_main.c
+++ b/apps/cli/cli_main.c
@@ -240,7 +240,7 @@ int
 main(int argc, char **argv)
 {
     int          retval = -1;
-    char         c;    
+    int          c;    
     int          once;
     char	*tmp;
     char	*argv0 = argv[0];
diff --git a/apps/netconf/netconf_main.c b/apps/netconf/netconf_main.c
index 6326c283..aee1cf80 100644
--- a/apps/netconf/netconf_main.c
+++ b/apps/netconf/netconf_main.c
@@ -330,7 +330,7 @@ int
 main(int    argc,
      char **argv)
 {
-    char             c;
+    int              c;
     char            *tmp;
     char            *argv0 = argv[0];
     int              quiet = 0;
diff --git a/apps/restconf/restconf_main.c b/apps/restconf/restconf_main.c
index 5909e8db..76fe7aab 100644
--- a/apps/restconf/restconf_main.c
+++ b/apps/restconf/restconf_main.c
@@ -513,7 +513,7 @@ main(int    argc,
     char	 *argv0 = argv[0];
     FCGX_Request  request;
     FCGX_Request *r = &request;
-    char          c;
+    int           c;
     char         *sockpath;
     char         *path;
     clicon_handle h;
diff --git a/datastore/datastore_client.c b/datastore/datastore_client.c
index e5c5440c..165b4238 100644
--- a/datastore/datastore_client.c
+++ b/datastore/datastore_client.c
@@ -107,7 +107,7 @@ usage(char *argv0)
 int
 main(int argc, char **argv)
 {
-    char                c;
+    int                 c;
     clicon_handle       h;
     char               *argv0;
     char               *db = "running";
diff --git a/example/example_restconf.c b/example/example_restconf.c
index 6cc6323d..b7d55505 100644
--- a/example/example_restconf.c
+++ b/example/example_restconf.c
@@ -289,7 +289,7 @@ example_restconf_start(clicon_handle h,
 		       int           argc,
 		       char        **argv)
 {
-    char c;
+    int c;
 
     clicon_debug(1, "%s argc:%d", __FUNCTION__, argc);
     optind = 1;
diff --git a/lib/src/json_xpath.c b/lib/src/json_xpath.c
index 5ac6d152..9f7c5a54 100644
--- a/lib/src/json_xpath.c
+++ b/lib/src/json_xpath.c
@@ -28,7 +28,7 @@ usage(char *argv0)
 int
 main(int argc, char **argv)
 {
-    int i;
+    int         i;
     cxobj     **xv;
     cxobj      *x;
     cxobj      *xn;
@@ -42,7 +42,7 @@ main(int argc, char **argv)
     char       *buf;
     char       *p;
     int         retval;
-    char        c;
+    int         c;
 
     while ((c = getopt(argc, argv, "?hbj")) != -1)
       switch (c) {
diff --git a/util/clixon_util_stream.c b/util/clixon_util_stream.c
index 10275ecf..6f45de57 100644
--- a/util/clixon_util_stream.c
+++ b/util/clixon_util_stream.c
@@ -218,7 +218,7 @@ main(int argc, char **argv)
     int    timeout = 10;
     char   start[27] = {0,}; /* strlen = 0 */
     char   stop[27] = {0,};
-    char   c;
+    int    c;
     char  *argv0 = argv[0];
     struct timeval now;
 
diff --git a/util/clixon_util_xml.c b/util/clixon_util_xml.c
index 5938eacb..88d2ab53 100644
--- a/util/clixon_util_xml.c
+++ b/util/clixon_util_xml.c
@@ -85,7 +85,7 @@ main(int    argc,
     cxobj *xc;
     cbuf  *cb = cbuf_new();
     int   retval = -1;
-    char  c;
+    int   c;
     int   logdst = CLICON_LOG_STDERR;
 
     optind = 1;
diff --git a/util/clixon_util_xpath.c b/util/clixon_util_xpath.c
index dcbee236..81b33361 100644
--- a/util/clixon_util_xpath.c
+++ b/util/clixon_util_xpath.c
@@ -119,7 +119,7 @@ main(int argc, char **argv)
     cxobj     **xv = NULL;
     cxobj      *x0 = NULL;
     cxobj      *x;
-    char        c;
+    int         c;
     int         len;
     char       *buf = NULL;
     int         ret;
diff --git a/util/clixon_util_yang.c b/util/clixon_util_yang.c
index 13b78743..3615fd27 100644
--- a/util/clixon_util_yang.c
+++ b/util/clixon_util_yang.c
@@ -81,8 +81,8 @@ int
 main(int argc, char **argv)
 {
     yang_spec *yspec = NULL;
-    char      c;
-    int       logdst = CLICON_LOG_STDERR;
+    int        c;
+    int        logdst = CLICON_LOG_STDERR;
     
     optind = 1;
     opterr = 0;

From ac1aa44fc4b853d05662fc51b2a6e1a10714db52 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Mon, 3 Dec 2018 21:16:35 +0100
Subject: [PATCH 08/72] * Yang Configure options changed   * `CLICON_YANG_DIR`
 is changed from a single directory to a path of directories     * Note
 CLIXON_DATADIR (=/usr/local/share/clixon) need to be in the list   *
 CLICON_YANG_MAIN_FILE Provides a filename with a single module filename.   *
 CLICON_YANG_MAIN_DIR Provides a directory where all yang modules should be
 loaded. * Change all @datamodel:tree to @datamodel in all CLI specification
 files   * If you generate CLI code from the model (CLIXON_CLI_GENMODEL).   *
 For backward compatibility, define CLICON_CLI_MODEL_TREENAME_PATCH in
 clixon_custom.h * Removed return value ymodp from yang parse functions (eg
 yang_parse()). * New config option: CLICON_CLI_MODEL_TREENAME defining name
 of generated syntax tree if CLIXON_CLI_GENMODEL is set.

---
 CHANGELOG.md                       |  12 ++-
 README.md                          |   3 +-
 apps/backend/backend_main.c        |  35 ++++---
 apps/cli/cli_main.c                |  54 ++++++-----
 apps/cli/cli_plugin.c              |  29 +++++-
 apps/netconf/netconf_main.c        |  27 ++++--
 apps/restconf/restconf_main.c      |  32 +++---
 datastore/datastore_client.c       |   2 +-
 doc/FAQ.md                         |  15 ++-
 example/example_cli.cli            |  18 ++--
 include/clixon_custom.h            |  12 +++
 lib/clixon/clixon_options.h        |   9 ++
 lib/clixon/clixon_yang.h           |   9 +-
 lib/src/clixon_netconf_lib.c       |   4 +-
 lib/src/clixon_options.c           |   2 +-
 lib/src/clixon_plugin.c            |   3 +-
 lib/src/clixon_xml_parse.y         |   2 +-
 lib/src/clixon_yang.c              | 150 ++++++++++++++++++++---------
 lib/src/clixon_yang_module.c       |   2 +-
 test/test_yang.sh                  |   2 +-
 yang/clixon-config@2018-10-21.yang |  27 +++++-
 21 files changed, 309 insertions(+), 140 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a70162a9..d71d1ec7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,15 +12,23 @@
   * Support of submodule, include and belongs-to.
   * Openconfig yang specs parsed: https://github.com/openconfig/public
   * Improved unknown handling
-  * Configure option `CLICON_YANG_DIR` is changed from a single directory to a path of directories
-    * Note CLIXON_DATADIR (=/usr/local/share/clixon) need to be in the list
+  * Yang Configure options changed
+    * `CLICON_YANG_DIR` is changed from a single directory to a path of directories
+      * Note CLIXON_DATADIR (=/usr/local/share/clixon) need to be in the list
+    * CLICON_YANG_MAIN_FILE Provides a filename with a single module filename.
+    * CLICON_YANG_MAIN_DIR Provides a directory where all yang modules should be loaded.
 
 ### API changes on existing features (you may need to change your code)
 * Yang parser is stricter (see above) which may break parsing of existing yang specs.
 * Yang parser functions have changed signatures. Please check the source if you call these functions.
 * Add `<CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>` to your configuration file, or corresponding CLICON_DATADIR directory for Clixon system yang files.
+* Change all @datamodel:tree to @datamodel in all CLI specification files
+  * If you generate CLI code from the model (CLIXON_CLI_GENMODEL).
+  * For backward compatibility, define CLICON_CLI_MODEL_TREENAME_PATCH in clixon_custom.h
 
 ### Minor changes
+* Removed return value ymodp from yang parse functions (eg yang_parse()).
+* New config option: CLICON_CLI_MODEL_TREENAME defining name of generated syntax tree if CLIXON_CLI_GENMODEL is set.
 * XML parser conformance to W3 spec
   * Names lexically correct (NCName)
   * Syntactically Correct handling of '<?' (processing instructions) and '<?xml' (XML declaration)
diff --git a/README.md b/README.md
index 278374e5..0389fa17 100644
--- a/README.md
+++ b/README.md
@@ -230,7 +230,8 @@ The figure shows the SDK runtime of Clixon.
 
 Reference
 =========
-A reference manual can be built using [Doxygen](http://www.doxygen.nl/index.html). You need to install doxygen and graphviz on your system.
+Clixon uses [Doxygen](http://www.doxygen.nl/index.html) for reference documentation.
+You need to install doxygen and graphviz on your system.
 Build it in the doc directory and point the browser to `.../clixon/doc/html/index.html` as follows:
 ```
 > cd doc
diff --git a/apps/backend/backend_main.c b/apps/backend/backend_main.c
index db66647e..1359e984 100644
--- a/apps/backend/backend_main.c
+++ b/apps/backend/backend_main.c
@@ -264,7 +264,7 @@ nacm_load_external(clicon_handle h)
     }
     if ((yspec = yspec_new()) == NULL)
 	goto done;
-    if (yang_parse(h, NULL, "ietf-netconf-acm", NULL, yspec, NULL) < 0)
+    if (yang_parse(h, NULL, "ietf-netconf-acm", NULL, yspec) < 0)
 	goto done;
     fd = fileno(f);
     /* Read configfile */
@@ -527,7 +527,7 @@ main(int    argc,
     int           logdst = CLICON_LOG_SYSLOG|CLICON_LOG_STDERR;
     yang_spec    *yspec = NULL;
     yang_spec    *yspecfg = NULL; /* For config XXX clixon bug */
-    char         *yang_filename = NULL;
+    char         *str;
     
     /* In the startup, logs to stderr & syslog and debug flag set later */
     clicon_log_init(__PROGRAM__, LOG_INFO, logdst);
@@ -652,8 +652,8 @@ main(int    argc,
 	case 'g': /* config socket group */
 	    clicon_option_str_set(h, "CLICON_SOCK_GROUP", optarg);
 	    break;
-	case 'y' :{ /* Load yang spec file (override yang main module) */
-	    yang_filename = optarg;
+	case 'y' :{ /* Load yang absolute filename */
+	    clicon_option_str_set(h, "CLICON_YANG_MAIN_FILE", optarg);
 	    break;
 	}
 	case 'x' :{ /* xmldb plugin */
@@ -750,17 +750,20 @@ main(int    argc,
     if ((yspec = yspec_new()) == NULL)
 	goto done;
     clicon_dbspec_yang_set(h, yspec);	
-    /* Load main application yang specification either module or specific file
-     * If -y <file> is given, it overrides main module */
-    if (yang_filename){
-	if (yang_spec_parse_file(h, yang_filename, yspec, NULL) < 0)
+    /* Load Yang modules
+     * 1. Load a yang module as a specific absolute filename */
+    if ((str = clicon_yang_main_file(h)) != NULL)
+	if (yang_spec_parse_file(h, str, yspec) < 0)
+	    goto done;
+    /* 2. Load a (single) main module */
+    if ((str = clicon_yang_module_main(h)) != NULL)
+	if (yang_spec_parse_module(h, str, clicon_yang_module_revision(h),
+				   yspec) < 0)
+	    goto done;
+    /* 3. Load all modules in a directory */
+    if ((str = clicon_yang_main_dir(h)) != NULL)
+	if (yang_spec_load_dir(h, str, yspec) < 0)
 	    goto done;
-    }
-    else if (yang_spec_parse_module(h, clicon_yang_module_main(h),
-				    clicon_yang_module_revision(h),
-				    yspec, NULL) < 0)
-	goto done;
-    
      /* Load yang module library, RFC7895 */
     if (yang_modules_init(h) < 0)
 	goto done;
@@ -769,11 +772,11 @@ main(int    argc,
 	goto done;
     /* Load yang Restconf stream discovery */
      if (clicon_option_bool(h, "CLICON_STREAM_DISCOVERY_RFC8040") &&
-	 yang_spec_parse_module(h, "ietf-restconf-monitoring", NULL, yspec, NULL)< 0)
+	 yang_spec_parse_module(h, "ietf-restconf-monitoring", NULL, yspec)< 0)
 	 goto done;
      /* Load yang Netconf stream discovery */
      if (clicon_option_bool(h, "CLICON_STREAM_DISCOVERY_RFC5277") &&
-	 yang_spec_parse_module(h, "ietf-netconf-notification", NULL, yspec, NULL)< 0)
+	 yang_spec_parse_module(h, "ietf-netconf-notification", NULL, yspec)< 0)
 	 goto done;
     /* Set options: database dir and yangspec (could be hidden in connect?)*/
     if (xmldb_setopt(h, "dbdir", clicon_xmldb_dir(h)) < 0)
diff --git a/apps/cli/cli_main.c b/apps/cli/cli_main.c
index feb5f158..b22e1c9f 100644
--- a/apps/cli/cli_main.c
+++ b/apps/cli/cli_main.c
@@ -250,15 +250,14 @@ main(int argc, char **argv)
     int          logclisyntax  = 0;
     int          help = 0;
     char        *treename = NULL;
-    int          len;
+    //    int          len;
     int          logdst = CLICON_LOG_STDERR;
     char        *restarg = NULL; /* what remains after options */
     int          dump_configfile_xml = 0;
     yang_spec   *yspec;
     yang_spec   *yspecfg = NULL; /* For config XXX clixon bug */
     struct passwd *pw;
-    char        *yang_filename = NULL;
-    yang_stmt   *ymod = NULL; /* Main module */
+    char         *str;
     
     /* Defaults */
     once = 0;
@@ -390,8 +389,8 @@ main(int argc, char **argv)
 	case 'L' : /* Debug print dynamic CLI syntax */
 	    logclisyntax++;
 	    break;
-	case 'y' :{ /* Load yang spec file (override yang main module) */
-	    yang_filename = optarg;
+	case 'y' :{ /* Load yang absolute filename */
+	    clicon_option_str_set(h, "CLICON_YANG_MAIN_FILE", optarg);
 	    break;
 	}
 	case 'c' :{ /* Overwrite clispec with absolute filename */
@@ -430,16 +429,24 @@ main(int argc, char **argv)
 	goto done;
     clicon_dbspec_yang_set(h, yspec);	
 
-    /* Load main application yang specification either module or specific file
-     * If -y <file> is given, it overrides main module */
-    if (yang_filename){
-	if (yang_spec_parse_file(h, yang_filename, yspec, &ymod) < 0)
+    /* Load Yang modules
+     * 1. Load a yang module as a specific absolute filename */
+    if ((str = clicon_yang_main_file(h)) != NULL){
+	if (yang_spec_parse_file(h, str, yspec) < 0)
 	    goto done;
     }
-    else if (yang_spec_parse_module(h, clicon_yang_module_main(h),
-				    clicon_yang_module_revision(h),
-				    yspec, &ymod) < 0)
-	goto done;
+    /* 2. Load a (single) main module */
+    if ((str = clicon_yang_module_main(h)) != NULL){
+	if (yang_spec_parse_module(h, str, clicon_yang_module_revision(h),
+				   yspec) < 0)
+	    goto done;
+    }
+    /* 3. Load all modules in a directory */
+    if ((str = clicon_yang_main_dir(h)) != NULL){
+	if (yang_spec_load_dir(h, str, yspec) < 0)
+	    goto done;
+    }
+
      /* Load yang module library, RFC7895 */
     if (yang_modules_init(h) < 0)
 	goto done;
@@ -448,25 +455,22 @@ main(int argc, char **argv)
 
     /* Create tree generated from dataspec. If no other trees exists, this is
      * the only one.
+     * The following code creates the tree @datamodel
+     * This tree is referenced from the main CLI spec (CLICON_CLISPEC_DIR) 
+     * using the "tree reference"
+     * syntax, ie @datamodel
+     * But note that yang2cli generates syntax for ALL modules, not just for 
+     * <module>.
      */
     if (clicon_cli_genmodel(h)){
 	parse_tree    pt = {0,};  /* cli parse tree */
-	char         *name;       /* main module name */
+	char         *treeref; 
 
+	treeref = clicon_cli_model_treename(h);
 	/* Create cli command tree from dbspec */
 	if (yang2cli(h, yspec, &pt, clicon_cli_genmodel_type(h)) < 0)
 	    goto done;
-
-	/* name of main module */
-	name = ymod->ys_argument;
-
-	len = strlen("datamodel:") + strlen(name) + 1;
-	if ((treename = malloc(len)) == NULL){
-	    clicon_err(OE_UNIX, errno, "malloc");
-	    goto done;
-	}	
-	snprintf(treename, len, "datamodel:%s",  name);
-	cligen_tree_add(cli_cligen(h), treename, pt);
+	cligen_tree_add(cli_cligen(h), treeref, pt);
 
 	if (printgen)
 	    cligen_print(stdout, pt, 1);
diff --git a/apps/cli/cli_plugin.c b/apps/cli/cli_plugin.c
index 0fb58736..633c46ae 100644
--- a/apps/cli/cli_plugin.c
+++ b/apps/cli/cli_plugin.c
@@ -209,6 +209,30 @@ clixon_str2fn(char  *name,
    return NULL; 
 }
 
+#ifdef CLICON_CLI_MODEL_TREENAME_PATCH
+/*! Patch all CLI spec calls to @datamodel:tree to @datamodel.
+ * This is a backward compatible fix for 3.9 for CLIgen specification files
+ * using model generation (CLIXON_CLI_GENMODEL).
+ * All new references should use @datamodel (or CLICON_CLI_MODEL_TREENAME).
+ * whereas older code used @datamodel:tree.
+ */
+static int
+mask_datamodel_fn(cg_obj *co,
+		  void   *arg)
+{
+    char *str = "datamodel:";
+    int len = strlen(str);
+    if (co->co_type == CO_REFERENCE){
+
+	if (strlen(co->co_command) > len &&
+	    strncmp(co->co_command, "datamodel:", len)==0){
+	    co->co_command[len-1] = '\0';
+	}
+    }
+    return 0;
+}
+#endif /* CLICON_CLI_MODEL_TREENAME_PATCH */
+
 /*! Append to syntax mode from file
  * @param[in]  h         Clixon handle
  * @param[in]  filename	 Name of file where syntax is specified (in syntax-group dir)
@@ -253,7 +277,10 @@ cli_load_syntax(clicon_handle h,
 	goto done;
     }
     fclose(f);
-	
+#ifdef CLICON_CLI_MODEL_TREENAME_PATCH
+    if (pt_apply(pt, mask_datamodel_fn, h) < 0)
+	goto done;
+#endif
     /* Get CLICON specific global variables */
     prompt = cvec_find_str(cvv, "CLICON_PROMPT");
     plgnam = cvec_find_str(cvv, "CLICON_PLUGIN");
diff --git a/apps/netconf/netconf_main.c b/apps/netconf/netconf_main.c
index aee1cf80..cc51d966 100644
--- a/apps/netconf/netconf_main.c
+++ b/apps/netconf/netconf_main.c
@@ -341,7 +341,7 @@ main(int    argc,
     struct timeval   tv = {0,}; /* timeout */
     yang_spec       *yspec = NULL;
     yang_spec       *yspecfg = NULL; /* For config XXX clixon bug */
-    char            *yang_filename = NULL;
+    char            *str;
     
     /* Create handle */
     if ((h = clicon_handle_init()) == NULL)
@@ -420,7 +420,7 @@ main(int    argc,
 	    clicon_option_str_set(h, "CLICON_NETCONF_DIR", optarg);
 	    break;
 	case 'y' :{ /* Load yang spec file (override yang main module) */
-	    yang_filename = optarg;
+	    clicon_option_str_set(h, "CLICON_YANG_MAIN_FILE", optarg);
 	    break;
 	}
 	case 'U': /* Clixon 'pseudo' user */
@@ -444,16 +444,23 @@ main(int    argc,
     if ((yspec = yspec_new()) == NULL)
 	goto done;
     clicon_dbspec_yang_set(h, yspec);	
-    /* Load main application yang specification either module or specific file
-     * If -y <file> is given, it overrides main module */
-    if (yang_filename){
-	if (yang_spec_parse_file(h, yang_filename, yspec, NULL) < 0)
+    /* Load Yang modules
+     * 1. Load a yang module as a specific absolute filename */
+    if ((str = clicon_yang_main_file(h)) != NULL){
+	if (yang_spec_parse_file(h, str, yspec) < 0)
+	    goto done;
+    }
+    /* 2. Load a (single) main module */
+    if ((str = clicon_yang_module_main(h)) != NULL){
+	if (yang_spec_parse_module(h, str, clicon_yang_module_revision(h),
+				   yspec) < 0)
+	    goto done;
+    }
+    /* 3. Load all modules in a directory */
+    if ((str = clicon_yang_main_dir(h)) != NULL){
+	if (yang_spec_load_dir(h, str, yspec) < 0)
 	    goto done;
     }
-    else if (yang_spec_parse_module(h, clicon_yang_module_main(h),
-				    clicon_yang_module_revision(h),
-				    yspec, NULL) < 0)
-	goto done;
     
      /* Load yang module library, RFC7895 */
     if (yang_modules_init(h) < 0)
diff --git a/apps/restconf/restconf_main.c b/apps/restconf/restconf_main.c
index 76fe7aab..d5067c4f 100644
--- a/apps/restconf/restconf_main.c
+++ b/apps/restconf/restconf_main.c
@@ -522,9 +522,9 @@ main(int    argc,
     int          logdst = CLICON_LOG_SYSLOG;
     yang_spec   *yspec = NULL;
     yang_spec   *yspecfg = NULL; /* For config XXX clixon bug */
-    char        *yang_filename = NULL;
     char        *stream_path;
     int          finish;
+    char        *str;
     
     /* In the startup, logs to stderr & debug flag set later */
     clicon_log_init(__PROGRAM__, LOG_INFO, logdst); 
@@ -601,7 +601,7 @@ main(int    argc,
 	    clicon_option_str_set(h, "CLICON_RESTCONF_DIR", optarg);
 	    break;
 	case 'y' : /* Load yang spec file (override yang main module) */
-	    yang_filename = optarg;
+	    clicon_option_str_set(h, "CLICON_YANG_MAIN_FILE", optarg);
 	    break;
 	case 'a': /* internal backend socket address family */
 	    clicon_option_str_set(h, "CLICON_SOCK_FAMILY", optarg);
@@ -627,26 +627,34 @@ main(int    argc,
     if ((yspec = yspec_new()) == NULL)
 	goto done;
     clicon_dbspec_yang_set(h, yspec);	
-    /* Load main application yang specification either module or specific file
-     * If -y <file> is given, it overrides main module */
-    if (yang_filename){
-	if (yang_spec_parse_file(h, yang_filename, yspec, NULL) < 0)
+
+    /* Load Yang modules
+     * 1. Load a yang module as a specific absolute filename */
+    if ((str = clicon_yang_main_file(h)) != NULL){
+	if (yang_spec_parse_file(h, str, yspec) < 0)
+	    goto done;
+    }
+    /* 2. Load a (single) main module */
+    if ((str = clicon_yang_module_main(h)) != NULL){
+	if (yang_spec_parse_module(h, str, clicon_yang_module_revision(h),
+				   yspec) < 0)
+	    goto done;
+    }
+    /* 3. Load all modules in a directory */
+    if ((str = clicon_yang_main_dir(h)) != NULL){
+	if (yang_spec_load_dir(h, str, yspec) < 0)
 	    goto done;
     }
-    else if (yang_spec_parse_module(h, clicon_yang_module_main(h),
-				    clicon_yang_module_revision(h),
-				    yspec, NULL) < 0)
-	goto done;
 
      /* Load yang module library, RFC7895 */
     if (yang_modules_init(h) < 0)
 	goto done;
     /* Add system modules */
      if (clicon_option_bool(h, "CLICON_STREAM_DISCOVERY_RFC8040") &&
-	 yang_spec_parse_module(h, "ietf-restconf-monitoring", NULL, yspec, NULL)< 0)
+	 yang_spec_parse_module(h, "ietf-restconf-monitoring", NULL, yspec)< 0)
 	 goto done;
      if (clicon_option_bool(h, "CLICON_STREAM_DISCOVERY_RFC5277") &&
-	 yang_spec_parse_module(h, "ietf-netconf-notification", NULL, yspec, NULL)< 0)
+	 yang_spec_parse_module(h, "ietf-netconf-notification", NULL, yspec)< 0)
 	 goto done;
     /* Call start function in all plugins before we go interactive 
        Pass all args after the standard options to plugin_start
diff --git a/datastore/datastore_client.c b/datastore/datastore_client.c
index 165b4238..5722d497 100644
--- a/datastore/datastore_client.c
+++ b/datastore/datastore_client.c
@@ -195,7 +195,7 @@ main(int argc, char **argv)
     if ((yspec = yspec_new()) == NULL)
 	goto done;
     /* Parse yang spec from given file */
-    if (yang_parse(h, yangmodule, NULL, NULL, yspec, NULL) < 0)
+    if (yang_parse(h, yangmodule, NULL, NULL, yspec) < 0)
 	goto done;
     /* Set database directory option */
     if (xmldb_setopt(h, "dbdir", dbdir) < 0)
diff --git a/doc/FAQ.md b/doc/FAQ.md
index a5539c5a..9e54e304 100644
--- a/doc/FAQ.md
+++ b/doc/FAQ.md
@@ -73,8 +73,14 @@ clicon:x:1001:<user>,www-data
 ```
 
 ## What about reference documentation?
-Clixon uses Doxygen for reference documentation.
-Build using 'make doc' and aim your browser at doc/html/index.html.
+Clixon uses [Doxygen](http://www.doxygen.nl/index.html) for reference documentation.
+You need to install doxygen and graphviz on your system.
+Build it in the doc directory and point the browser to `.../clixon/doc/html/index.html` as follows:
+```
+> cd doc
+> make doc
+> make graphs # detailed callgraphs
+```
 
 ## How is configuration data stored?
 Configuration data is stored in an XML datastore. In the example the
@@ -115,12 +121,15 @@ are included.
 
 The following configuration file options control the loading of Yang files:
 - `CLICON_YANG_DIR` -  A list of directories (yang dir path) where Clixon searches for module and submodules.
+- `CLICON_YANG_MAIN_DIR` - Load all yang modules in this directory.
+- `CLICON_YANG_MAIN_FILE` - Load a specific Yang module fiven by a file.
 - `CLICON_YANG_MODULE_MAIN` - Specifies a single module to load. The module is searched for in the yang dir path.
 - `CLICON_YANG_MODULE_REVISION` : Specifies a revision to the main module. 
 
 Note that the special `CLIXON_DATADIR`, by default `/usr/local/share/clixon` should be included in the yang dir path for Clixon system files to be found.
 
-Application also has a command-line option `-y` to include a single Yang using absolute file path. This is mainly for debugging.
+You can combine the options, however, more specific options override
+less specific. For example, `CLICON_YANG_MAIN_FILE` overrides `CLICON_YANG_MODULE_MAIN`.
 
 ## How do I enable Yang features?
 
diff --git a/example/example_cli.cli b/example/example_cli.cli
index 1856c8c7..302a6cf3 100644
--- a/example/example_cli.cli
+++ b/example/example_cli.cli
@@ -7,10 +7,10 @@ CLICON_PLUGIN="example_cli";
 translate value (<value:string translate:incstr()>),cli_set("/translate/value");
 
 # Note, when switching to PT, change datamodel to only @datamodel
-set @datamodel:example, cli_set();
-merge @datamodel:example, cli_merge();
-create @datamodel:example, cli_create();
-delete("Delete a configuration item") @datamodel:example, cli_del();
+set @datamodel, cli_set();
+merge @datamodel, cli_merge();
+create @datamodel, cli_create();
+delete("Delete a configuration item") @datamodel, cli_del();
 
 validate("Validate changes"), cli_validate();
 commit("Commit the changes"), cli_commit();
@@ -40,19 +40,19 @@ show("Show a particular state of the system"){
     }
     configuration("Show configuration"), cli_show_config("candidate", "text", "/");{
 	    xml("Show configuration as XML"), cli_show_config("candidate", "xml", "/");{
-	        @datamodel:example, cli_show_auto("candidate", "text");		   
+	        @datamodel, cli_show_auto("candidate", "text");		   
 	    }
 	    cli("Show configuration as CLI commands"), cli_show_config("candidate", "cli", "/");{
-	        @datamodel:example, cli_show_auto("candidate", "cli");
+	        @datamodel, cli_show_auto("candidate", "cli");
 	    }
 	    netconf("Show configuration as netconf edit-config operation"), cli_show_config("candidate", "netconf", "/");{
-	        @datamodel:example, cli_show_auto("candidate", "netconf");
+	        @datamodel, cli_show_auto("candidate", "netconf");
 	    }
 	    text("Show configuration as text"), cli_show_config("candidate","text","/");{
-	        @datamodel:example, cli_show_auto("candidate", "text");
+	        @datamodel, cli_show_auto("candidate", "text");
 	    }
 	    json("Show configuration as JSON"), cli_show_config("candidate", "json", "/");{
-	    	@datamodel:example, cli_show_auto("candidate", "json");
+	    	@datamodel, cli_show_auto("candidate", "json");
 	    }
     }
 }
diff --git a/include/clixon_custom.h b/include/clixon_custom.h
index 8bad0f92..cbb3f1df 100644
--- a/include/clixon_custom.h
+++ b/include/clixon_custom.h
@@ -51,3 +51,15 @@ int strverscmp (__const char *__s1, __const char *__s2);
 */
 #define XMLNS_YANG_ONLY 1
 
+/* Set for full XML namespace code in XML, NETCONF and YANG
+ * Experimental
+ */
+#undef ENABLE_XMLNS
+
+/* If set, patch all CLI spec calls to @datamodel:tree to @datamodel.
+ * This is a backward compatible fix for 3.9 for CLIgen specification files
+ * using model generation (CLIXON_CLI_GENMODEL).
+ * All new references should use @datamodel (or CLICON_CLI_MODEL_TREENAME).
+ * whereas older code used @datamodel:tree.
+ */
+#define CLICON_CLI_MODEL_TREENAME_PATCH
diff --git a/lib/clixon/clixon_options.h b/lib/clixon/clixon_options.h
index d774fe29..1f4069fc 100644
--- a/lib/clixon/clixon_options.h
+++ b/lib/clixon/clixon_options.h
@@ -105,6 +105,12 @@ int clicon_option_del(clicon_handle h, const char *name);
 static inline char *clicon_configfile(clicon_handle h){
     return clicon_option_str(h, "CLICON_CONFIGFILE");
 }
+static inline char *clicon_yang_main_file(clicon_handle h){
+    return clicon_option_str(h, "CLICON_YANG_MAIN_FILE");
+}
+static inline char *clicon_yang_main_dir(clicon_handle h){
+    return clicon_option_str(h, "CLICON_YANG_MAIN_DIR");
+}
 static inline char *clicon_yang_module_main(clicon_handle h){
     return clicon_option_str(h, "CLICON_YANG_MODULE_MAIN");
 }
@@ -129,6 +135,9 @@ static inline char *clicon_clispec_dir(clicon_handle h){
 static inline char *clicon_cli_mode(clicon_handle h){
     return clicon_option_str(h, "CLICON_CLI_MODE");
 }
+static inline char *clicon_cli_model_treename(clicon_handle h){
+    return clicon_option_str(h, "CLICON_CLI_MODEL_TREENAME");
+}
 static inline char *clicon_sock(clicon_handle h){
     return clicon_option_str(h, "CLICON_SOCK");
 }
diff --git a/lib/clixon/clixon_yang.h b/lib/clixon/clixon_yang.h
index 222f3f91..a49d1e94 100644
--- a/lib/clixon/clixon_yang.h
+++ b/lib/clixon/clixon_yang.h
@@ -256,7 +256,7 @@ int        yang_nodeid_split(char *nodeid, char **prefix, char **id);
 yang_stmt *ys_module(yang_stmt *ys);
 yang_spec *ys_spec(yang_stmt *ys);
 yang_stmt *yang_find_module_by_prefix(yang_stmt *ys, char *prefix);
-yang_stmt *yang_find(yang_node *yn, int keyword, char *argument);
+yang_stmt *yang_find(yang_node *yn, int keyword, const char *argument);
 int        yang_match(yang_node *yn, int keyword, char *argument);
 yang_stmt *yang_find_datanode(yang_node *yn, char *argument);
 yang_stmt *yang_find_schemanode(yang_node *yn, char *argument);
@@ -269,7 +269,7 @@ int        ys_populate(yang_stmt *ys, void *arg);
 yang_stmt *yang_parse_file(int fd, const char *name, yang_spec *ysp);
 int        yang_parse(clicon_handle h, const char *filename,
 		      const char *module, 
-		      const char *revision, yang_spec *ysp, yang_stmt **ymodp);
+		      const char *revision, yang_spec *ysp);
 int        yang_apply(yang_node *yn, enum rfc_6020 key, yang_applyfn_t fn, 
 		      void *arg);
 int        yang_abs_schema_nodeid(yang_spec *yspec, yang_stmt *ys,
@@ -281,8 +281,9 @@ cg_var    *ys_parse(yang_stmt *ys, enum cv_type cvtype);
 int        ys_parse_sub(yang_stmt *ys, char *extra);
 int        yang_mandatory(yang_stmt *ys);
 int        yang_config(yang_stmt *ys);
-int        yang_spec_parse_module(clicon_handle h, char *module, char *revision, yang_spec *yspec, yang_stmt **ymodp);
-int        yang_spec_parse_file(clicon_handle h, char *filename, yang_spec *yspec, yang_stmt **ymodp);
+int        yang_spec_parse_module(clicon_handle h, char *module, char *revision, yang_spec *yspec);
+int        yang_spec_parse_file(clicon_handle h, char *filename, yang_spec *yspec);
+int        yang_spec_load_dir(clicon_handle h, char *dir, yang_spec *yspec);
 cvec      *yang_arg2cvec(yang_stmt *ys, char *delimi);
 int        yang_key_match(yang_node *yn, char *name);
 
diff --git a/lib/src/clixon_netconf_lib.c b/lib/src/clixon_netconf_lib.c
index c2a25f25..27c0acc0 100644
--- a/lib/src/clixon_netconf_lib.c
+++ b/lib/src/clixon_netconf_lib.c
@@ -988,9 +988,9 @@ netconf_module_load(clicon_handle h)
 
     yspec = clicon_dbspec_yang(h);
     /* Load yang spec */
-    if (yang_spec_parse_module(h, "ietf-netconf", NULL, yspec, NULL)< 0)
+    if (yang_spec_parse_module(h, "ietf-netconf", NULL, yspec)< 0)
 	goto done;
-    if (yang_spec_parse_module(h, "ietf-netconf-notification", NULL, yspec, NULL)< 0)
+    if (yang_spec_parse_module(h, "ietf-netconf-notification", NULL, yspec)< 0)
 	goto done;
     if ((xc = clicon_conf_xml(h)) == NULL){
 	clicon_err(OE_CFG, ENOENT, "Clicon configuration not loaded");
diff --git a/lib/src/clixon_options.c b/lib/src/clixon_options.c
index 5804f182..9c737b18 100644
--- a/lib/src/clixon_options.c
+++ b/lib/src/clixon_options.c
@@ -252,7 +252,7 @@ clicon_options_main(clicon_handle h,
     /* Set clixon_conf pointer to handle */
     clicon_conf_xml_set(h, xconfig);
     /* Parse clixon yang spec */
-    if (yang_parse(h, NULL, "clixon-config", NULL, yspec, NULL) < 0)
+    if (yang_parse(h, NULL, "clixon-config", NULL, yspec) < 0)
 	goto done;    
     clicon_conf_xml_set(h, NULL);
     if (xconfig)
diff --git a/lib/src/clixon_plugin.c b/lib/src/clixon_plugin.c
index 7710ae80..03ed2b29 100644
--- a/lib/src/clixon_plugin.c
+++ b/lib/src/clixon_plugin.c
@@ -269,8 +269,7 @@ clixon_plugins_load(clicon_handle h,
 
     clicon_debug(1, "%s", __FUNCTION__); 
     /* Get plugin objects names from plugin directory */
-    if((ndp = clicon_file_dirent(dir, &dp,
-				 regexp?regexp:"(.so)$", S_IFREG))<0)
+    if((ndp = clicon_file_dirent(dir, &dp, regexp?regexp:"(.so)$", S_IFREG)) < 0)
 	goto done;
     /* Load all plugins */
     for (i = 0; i < ndp; i++) {
diff --git a/lib/src/clixon_xml_parse.y b/lib/src/clixon_xml_parse.y
index a86c7276..7072ed01 100644
--- a/lib/src/clixon_xml_parse.y
+++ b/lib/src/clixon_xml_parse.y
@@ -315,7 +315,7 @@ xml_parse_attr(struct xml_parse_yacc_arg *ya,
     int    retval = -1;
     cxobj *xa; 
 
-#ifdef notyet
+#ifdef ENABLE_XMLNS
     if (prefix && strcmp(prefix,"xmlns")==0)
 	fprintf(stderr, "PrefixedAttName NCNAME:%s = %s\n", name, attval);
     if (prefix==NULL && strcmp(name,"xmlns")==0)
diff --git a/lib/src/clixon_yang.c b/lib/src/clixon_yang.c
index a7033ce2..2a6b1572 100644
--- a/lib/src/clixon_yang.c
+++ b/lib/src/clixon_yang.c
@@ -46,7 +46,7 @@
 #include <limits.h>
 #include <ctype.h>
 #include <unistd.h>
-#define __USE_GNU /* strverscmp */
+#define __USE_GNU    /* strverscmp */
 #include <string.h>
 #include <arpa/inet.h>
 #include <regex.h>
@@ -56,6 +56,7 @@
 #include <syslog.h>
 #include <assert.h>
 #include <sys/stat.h>
+#include <sys/param.h>
 #include <netinet/in.h>
 
 /* cligen */
@@ -416,7 +417,7 @@ yn_each(yang_node *yn,
 yang_stmt *
 yang_find(yang_node *yn, 
 	  int        keyword, 
-	  char      *argument)
+	  const char *argument)
 {
     yang_stmt *ys = NULL;
     int        i;
@@ -1939,7 +1940,6 @@ yang_parse_find_match(clicon_handle h,
 				      S_IFREG)) < 0)
 	    goto done;
 	/* Entries are sorted, last entry should be most recent date 
-	 * Found
 	 */
 	if (ndp != 0){
 	    cprintf(fbuf, "%s/%s", dir, dp[ndp-1].d_name);
@@ -2278,7 +2278,6 @@ yang_merge_submodules(clicon_handle h,
  * @param[in] module   Name of main YANG module. Or absolute file name.
  * @param[in] revision Main module revision date string or NULL
  * @param[in,out] ysp  Yang specification. Should have been created by caller using yspec_new
- * @param[out]   ymodp Yang module of first, topmost Yang module, if given.
  * @retval 0  Everything OK
  * @retval -1 Error encountered
  * The database symbols are inserted in alphabetical order.
@@ -2298,72 +2297,89 @@ yang_parse(clicon_handle h,
 	   const char   *filename, 
 	   const char   *module, 
 	   const char   *revision, 
-	   yang_spec    *ysp,
-    	   yang_stmt   **ymodp)
+	   yang_spec    *yspec)
 {
     int         retval = -1;
     yang_stmt  *ymod = NULL; /* Top-level yang (sub)module */
     int         i;
     int         modnr;       /* Existing number of modules */
+    char       *base = NULL;;
 
     /* Apply steps 2.. on new modules, ie ones after modnr. */
-    modnr = ysp->yp_len;
+    modnr = yspec->yp_len;
     if (filename){
-	if ((ymod = yang_parse_filename(filename, ysp)) == NULL)
+	/* Find module, and do not load file if module already exists */
+	if (basename(filename) == NULL){
+	    clicon_err(OE_YANG, errno, "No basename");
+	    goto done;
+	}
+	if ((base = strdup(basename(filename))) == NULL){
+	    clicon_err(OE_YANG, errno, "strdup");
+	    goto done;
+	}
+	if (index(base, '@') != NULL)
+	    *index(base, '@') = '\0';
+	if (yang_find((yang_node*)yspec, Y_MODULE, base) != NULL)
+	    goto ok;
+	if ((ymod = yang_parse_filename(filename, yspec)) == NULL)
 	    goto done;
     }
-    else 
-	if ((ymod = yang_parse_module(h, module, revision, ysp)) == NULL)
+    else {
+	/* Do not load module if it already exists */
+	if (yang_find((yang_node*)yspec, Y_MODULE, module) != NULL)
+	    goto ok;
+	if ((ymod = yang_parse_module(h, module, revision, yspec)) == NULL)
 	    goto done;
+    }
 
     /* 1: Parse from text to yang parse-tree. */
     /* Iterate through modules */
-    if (yang_parse_recurse(h, ymod, ysp) < 0)
+    if (yang_parse_recurse(h, ymod, yspec) < 0)
 	goto done;
 
     /* 2. Check cardinality maybe this should be done after grouping/augment */
-    for (i=modnr; i<ysp->yp_len; i++) /* XXX */
-	if (yang_cardinality(h, ysp->yp_stmt[i], ysp->yp_stmt[i]->ys_argument) < 0)
+    for (i=modnr; i<yspec->yp_len; i++) /* XXX */
+	if (yang_cardinality(h, yspec->yp_stmt[i], yspec->yp_stmt[i]->ys_argument) < 0)
 	    goto done;
 
     /* 3: Merge sub-modules with modules - after this step, no submodules exist
      * In the merge, remove submodule headers
      */
-    for (i=modnr; i<ysp->yp_len; i++){
-	if (ysp->yp_stmt[i]->ys_keyword != Y_SUBMODULE)
+    for (i=modnr; i<yspec->yp_len; i++){
+	if (yspec->yp_stmt[i]->ys_keyword != Y_SUBMODULE)
 	    continue;
     }
     i = 0;
-    while (i<ysp->yp_len){
+    while (i<yspec->yp_len){
 	int j;
-	if (ysp->yp_stmt[i]->ys_keyword != Y_SUBMODULE){
+	if (yspec->yp_stmt[i]->ys_keyword != Y_SUBMODULE){
 	    i++;
 	    continue;
 	}
-	if (yang_merge_submodules(h, ysp, ysp->yp_stmt[i]) < 0)
+	if (yang_merge_submodules(h, yspec, yspec->yp_stmt[i]) < 0)
 	    goto done;
 	/* shift down one step */
-	for (j=i; j<ysp->yp_len-1; j++)
-	    ysp->yp_stmt[j] = ysp->yp_stmt[j+1];
-	ysp->yp_len--;
+	for (j=i; j<yspec->yp_len-1; j++)
+	    yspec->yp_stmt[j] = yspec->yp_stmt[j+1];
+	yspec->yp_len--;
     }
 
     /* 4: Check features: check if enabled and remove disabled features */
-    for (i=modnr; i<ysp->yp_len; i++) /* XXX */
-	if (yang_features(h, ysp->yp_stmt[i]) < 0)
+    for (i=modnr; i<yspec->yp_len; i++) /* XXX */
+	if (yang_features(h, yspec->yp_stmt[i]) < 0)
 	    goto done;
     
     /* 5: Go through parse tree and populate it with cv types */
-    for (i=modnr; i<ysp->yp_len; i++)
-	if (yang_apply((yang_node*)ysp->yp_stmt[i], -1, ys_populate, (void*)h) < 0)
+    for (i=modnr; i<yspec->yp_len; i++)
+	if (yang_apply((yang_node*)yspec->yp_stmt[i], -1, ys_populate, (void*)h) < 0)
 	    goto done;
 
     /* 6: Resolve all types: populate type caches. Requires eg length/range cvecs
      * from ys_populate step.
      * Must be done using static binding.
      */
-    for (i=modnr; i<ysp->yp_len; i++)
-	if (yang_apply((yang_node*)ysp->yp_stmt[i], Y_TYPE, ys_resolve_type, NULL) < 0)
+    for (i=modnr; i<yspec->yp_len; i++)
+	if (yang_apply((yang_node*)yspec->yp_stmt[i], Y_TYPE, ys_resolve_type, NULL) < 0)
 	    goto done;
 
     /* Up to here resolving is made in the context they are defined, rather 
@@ -2374,25 +2390,26 @@ yang_parse(clicon_handle h,
      */
 
     /* 7: Macro expansion of all grouping/uses pairs. Expansion needs marking */
-    for (i=modnr; i<ysp->yp_len; i++){
-	if (yang_expand((yang_node*)ysp->yp_stmt[i]) < 0)
+    for (i=modnr; i<yspec->yp_len; i++){
+	if (yang_expand((yang_node*)yspec->yp_stmt[i]) < 0)
 	    goto done;
-	yang_apply((yang_node*)ysp->yp_stmt[i], -1, ys_flag_reset, (void*)YANG_FLAG_MARK);
+	yang_apply((yang_node*)yspec->yp_stmt[i], -1, ys_flag_reset, (void*)YANG_FLAG_MARK);
     }
 
     /* 8: Top-level augmentation of all modules XXX: only new modules? */
-    if (yang_augment_spec(ysp) < 0)
+    if (yang_augment_spec(yspec) < 0)
 	goto done;
 
     /* 9: sanity check of schemanode references, need more here */
-    for (i=modnr; i<ysp->yp_len; i++)
-	if (yang_apply((yang_node*)ysp->yp_stmt[i], -1, ys_schemanode_check, NULL) < 0)
+    for (i=modnr; i<yspec->yp_len; i++)
+	if (yang_apply((yang_node*)yspec->yp_stmt[i], -1, ys_schemanode_check, NULL) < 0)
 	    goto done;
     /* Return main module parsed in step 1 */
-    if (ymodp)
-	*ymodp = ymod;
+ ok:
     retval = 0;
-  done:
+ done:
+    if (base)
+	free(base);
     return retval;
 }
 
@@ -2792,7 +2809,6 @@ yang_config(yang_stmt *ys)
  * @param[in]     dir       Directory where to look for modules and sub-modules
  * @param[in]     revision  Revision, or NULL
  * @param[in,out] yspec     Modules parse are added to this yangspec
- * @param[out]    ymodp     Yang module of first, topmost Yang module, if given.
  * @retval        0         OK
  * @retval       -1         Error
  * @see yang_spec_parse_file
@@ -2801,8 +2817,7 @@ int
 yang_spec_parse_module(clicon_handle h,
 		       char         *module,
 		       char         *revision,
-		       yang_spec    *yspec,
-		       yang_stmt   **ymodp)
+		       yang_spec    *yspec)
 {
     int retval = -1;
     
@@ -2819,7 +2834,7 @@ yang_spec_parse_module(clicon_handle h,
 	clicon_err(OE_YANG, EINVAL, "yang module illegal format");
 	goto done;
     }
-    if (yang_parse(h, NULL, module, revision, yspec, ymodp) < 0)
+    if (yang_parse(h, NULL, module, revision, yspec) < 0)
 	goto done;
     retval = 0;
   done:
@@ -2831,7 +2846,6 @@ yang_spec_parse_module(clicon_handle h,
  * @param[in]     filename  Actual filename (including dir and revision)
  * @param[in]     dir       Directory for sub-modules
  * @param[in,out] yspec     Modules parse are added to this yangspec
- * @param[out]    ymodp     Yang module of first, topmost Yang module, if given.
  * @retval        0         OK
  * @retval       -1         Error
  * @see yang_spec_parse_module for yang dir,module,revision instead of actual filename
@@ -2839,8 +2853,7 @@ yang_spec_parse_module(clicon_handle h,
 int
 yang_spec_parse_file(clicon_handle h,
 		     char         *filename,
-		     yang_spec    *yspec,
-		     yang_stmt   **ymodp)
+		     yang_spec    *yspec)
 {
     int retval = -1;
     
@@ -2848,13 +2861,62 @@ yang_spec_parse_file(clicon_handle h,
 	clicon_err(OE_YANG, EINVAL, "yang spec is NULL");
 	goto done;
     }
-    if (yang_parse(h, filename, NULL, NULL, yspec, ymodp) < 0)
+    if (yang_parse(h, filename, NULL, NULL, yspec) < 0)
 	goto done;
     retval = 0;
   done:
     return retval;
 }
 
+/*! Load all yang modules in directory
+ * @param[in]  h   Clicon handle
+ * @param[in]  dir Load all yang modules in this directory
+ * @param[in,out] yspec     Modules parse are added to this yangspec
+ * @retval        0         OK
+ * @retval       -1         Error
+ */
+int
+yang_spec_load_dir(clicon_handle h,
+		   char         *dir,
+		   yang_spec    *yspec)
+{
+    int            retval = -1;
+    int            ndp;
+    struct dirent *dp = NULL;
+    int            i;
+    char           filename[MAXPATHLEN];
+    char          *base;
+    char          *b;
+    int            j;
+    int            len;
+    
+    /* Get plugin objects names from plugin directory */
+    if((ndp = clicon_file_dirent(dir, &dp, "(.yang)$", S_IFREG)) < 0)
+	goto done;
+    /* Load all yang files */
+    for (i = 0; i < ndp; i++) {
+	base = dp[i].d_name;
+	/* Entries are sorted, see if later entry exists (include @), if so skip 
+	 * this one and take last.
+	 */
+	if ((b = index(base, '@')) != NULL)
+	    len = b-base;
+	else
+	    len = strlen(base);
+	for (j = (i+1); j < ndp; j++)
+	    if (strncmp(base, dp[j].d_name, len) == 0)
+		break;
+	if (j<ndp) /* exists later entry */
+	    continue;
+	snprintf(filename, MAXPATHLEN-1, "%s/%s", dir, dp[i].d_name);
+	if (yang_parse(h, filename, NULL, NULL, yspec) < 0)
+	    goto done;
+    }
+    retval = 0;
+  done:
+    return retval;
+}
+
 /*! Given a yang node, translate the argument string to a cv vector
  *
  * @param[in]  ys         Yang statement 
diff --git a/lib/src/clixon_yang_module.c b/lib/src/clixon_yang_module.c
index 539126df..6e08c96e 100644
--- a/lib/src/clixon_yang_module.c
+++ b/lib/src/clixon_yang_module.c
@@ -93,7 +93,7 @@ yang_modules_init(clicon_handle h)
 	goto done;
     }
     /* Ensure revision exists is set */
-    if (yang_spec_parse_module(h, "ietf-yang-library", NULL, yspec, NULL)< 0)
+    if (yang_spec_parse_module(h, "ietf-yang-library", NULL, yspec)< 0)
 	goto done;
     /* Find revision */
     if (yang_modules_revision(h) == NULL){
diff --git a/test/test_yang.sh b/test/test_yang.sh
index d81277a4..82b5bba2 100755
--- a/test/test_yang.sh
+++ b/test/test_yang.sh
@@ -5,7 +5,7 @@ APPNAME=example
 . ./lib.sh
 
 cfg=$dir/conf_yang.xml
-fyang=$dir/test.yang
+fyang=$dir/$APPNAME.yang
 fsubmod=$dir/example-types.yang
 fyangerr=$dir/err.yang
 
diff --git a/yang/clixon-config@2018-10-21.yang b/yang/clixon-config@2018-10-21.yang
index a0376c21..1f78d691 100644
--- a/yang/clixon-config@2018-10-21.yang
+++ b/yang/clixon-config@2018-10-21.yang
@@ -142,9 +142,19 @@ module clixon-config {
                  they appear. Ensure that CLIXON_DATADIR(default 
                  /usr/local/share/clixon) is present in the path";
 	}
+	leaf CLICON_YANG_MAIN_FILE {
+	    type string;
+	    description
+		"If specified load a yang module in a specific absolute filename";
+	}
+	leaf CLICON_YANG_MAIN_DIR {
+	    type string;
+	    description
+		"If given, load all modules in this directory.
+                 See also CLICON_YANG_DIR which specifies a path of dirs";
+	}
 	leaf CLICON_YANG_MODULE_MAIN {
 	    type string;
-            default "clicon";
 	    description
 		"Option used to construct initial yang file: 
                  <module>[@<revision>]";
@@ -224,9 +234,18 @@ module clixon-config {
 	    type int32;
 	    default 1;
 	    description
-		"Generate code for CLI completion of existing db symbols. 
-      	         Example: Add name=\"myspec\" in datamodel spec and reference
-	         as @myspec";
+		"If set, generate CLI specification for CLI completion of
+                 loaded Yang modules. This CLI tree can be accessed in CLI
+                 spec files using the tree reference syntax (eg @datamodel).
+                 See also CLICON_CLI_MODEL_TREENAME.";
+	}
+	leaf CLICON_CLI_MODEL_TREENAME {
+	    type string;
+	    default "datamodel";
+	    description
+		"If CLICON_CLI_GENMODEL is set, CLI specs can reference the
+                 model syntax using this reference. 
+                 Example: set @datamodel, cli_set();";
 	}
 	leaf CLICON_CLI_GENMODEL_COMPLETION {
 	    type int32;

From 9377986c817a41557b323db68b7c7f1e1562d0b4 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Tue, 4 Dec 2018 20:04:16 +0100
Subject: [PATCH 09/72] testing of yang load ocnfig options

---
 CHANGELOG.md           |   2 +-
 doc/FAQ.md             |  12 +-
 test/test_yang_load.sh | 427 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 436 insertions(+), 5 deletions(-)
 create mode 100755 test/test_yang_load.sh

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d71d1ec7..3305eb87 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@
   * Support of submodule, include and belongs-to.
   * Openconfig yang specs parsed: https://github.com/openconfig/public
   * Improved unknown handling
-  * Yang Configure options changed
+  * Yang load file configure options changed
     * `CLICON_YANG_DIR` is changed from a single directory to a path of directories
       * Note CLIXON_DATADIR (=/usr/local/share/clixon) need to be in the list
     * CLICON_YANG_MAIN_FILE Provides a filename with a single module filename.
diff --git a/doc/FAQ.md b/doc/FAQ.md
index 9e54e304..9ecf46ff 100644
--- a/doc/FAQ.md
+++ b/doc/FAQ.md
@@ -121,15 +121,19 @@ are included.
 
 The following configuration file options control the loading of Yang files:
 - `CLICON_YANG_DIR` -  A list of directories (yang dir path) where Clixon searches for module and submodules.
-- `CLICON_YANG_MAIN_DIR` - Load all yang modules in this directory.
-- `CLICON_YANG_MAIN_FILE` - Load a specific Yang module fiven by a file.
+- `CLICON_YANG_MAIN_FILE` - Load a specific Yang module fiven by a file. 
 - `CLICON_YANG_MODULE_MAIN` - Specifies a single module to load. The module is searched for in the yang dir path.
 - `CLICON_YANG_MODULE_REVISION` : Specifies a revision to the main module. 
+- `CLICON_YANG_MAIN_DIR` - Load all yang modules in this directory.
 
 Note that the special `CLIXON_DATADIR`, by default `/usr/local/share/clixon` should be included in the yang dir path for Clixon system files to be found.
 
-You can combine the options, however, more specific options override
-less specific. For example, `CLICON_YANG_MAIN_FILE` overrides `CLICON_YANG_MODULE_MAIN`.
+You can combine the options, however, if there are different variants
+of the same module, more specific options override less
+specific. The precedence of the options are as follows:
+- `CLICON_YANG_MAIN_FILE`
+- `CLICON_YANG_MODULE_MAIN`
+- `CLICON_YANG_MAIN_DIR`
 
 ## How do I enable Yang features?
 
diff --git a/test/test_yang_load.sh b/test/test_yang_load.sh
new file mode 100755
index 00000000..ae4f56e3
--- /dev/null
+++ b/test/test_yang_load.sh
@@ -0,0 +1,427 @@
+#!/bin/bash
+# Load yang files. Test the different options 
+# CLICON_YANG_MODULE_DIR vs CLICON_YANG_MAIN_FILE vs CLICON_YANG_MAIN_DIR
+# as well as revisions
+# Test is made by having different config files and then try to set configure
+# options available in specific modules
+APPNAME=example
+# include err() and new() functions and creates $dir
+. ./lib.sh
+
+cfg=$dir/conf_yang.xml
+fyang1=$dir/$APPNAME@2018-12-02.yang
+fyang2=$dir/$APPNAME@2018-01-01.yang
+fyang3=$dir/other.yang
+
+#  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
+
+# 1st variant of the example module
+cat <<EOF > $fyang1
+module $APPNAME{
+  prefix ex;
+  revision 2018-12-02;
+  namespace "urn:example:example";
+  leaf newex{
+    type string;
+  }
+}
+EOF
+
+# 2nd variant of the same example module
+cat <<EOF > $fyang2
+module $APPNAME{
+  prefix ex;
+  revision 2018-01-01;
+  namespace "urn:example:example";
+  leaf oldex{
+    type string;
+  }
+}
+EOF
+
+# Other module
+cat <<EOF > $fyang3
+module other{
+  prefix oth;
+  revision 2018-01-01;
+  namespace "urn:example:example2";
+  leaf other{
+    type string;
+  }
+}
+EOF
+
+#---------------------------------
+new "1. Load module as file"
+cat <<EOF > $cfg
+<config>
+  <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
+  <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_MAIN_FILE>$fyang1</CLICON_YANG_MAIN_FILE>
+  <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_XMLDB_PLUGIN>/usr/local/lib/xmldb/text.so</CLICON_XMLDB_PLUGIN>
+  <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_CLI_GENMODEL_COMPLETION>1</CLICON_CLI_GENMODEL_COMPLETION>
+</config>
+EOF
+# kill old backend (if any)
+new "kill old backend"
+sudo clixon_backend -zf $cfg
+if [ $? -ne 0 ]; then
+    err
+fi
+
+new "start backend  -s init -f $cfg"
+# start new backend
+sudo $clixon_backend -s init -f $cfg
+if [ $? -ne 0 ]; then
+    err
+fi
+
+new "1. Set newex"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex>str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+
+new "Set oldex should fail"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex>str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>XML'
+
+new "Set other should fail"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other>str</other></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>XML'
+
+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
+sudo clixon_backend -z -f $cfg
+if [ $? -ne 0 ]; then
+    err "kill backend"
+fi
+sudo pkill -u root -f clixon_backend
+
+#--------------------------------------
+new "2. Load old module as file"
+cat <<EOF > $cfg
+<config>
+  <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
+  <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_MAIN_FILE>$fyang2</CLICON_YANG_MAIN_FILE>
+  <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_XMLDB_PLUGIN>/usr/local/lib/xmldb/text.so</CLICON_XMLDB_PLUGIN>
+  <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_CLI_GENMODEL_COMPLETION>1</CLICON_CLI_GENMODEL_COMPLETION>
+</config>
+EOF
+
+new "start backend  -s init -f $cfg"
+# start new backend
+sudo $clixon_backend -s init -f $cfg
+if [ $? -ne 0 ]; then
+    err
+fi
+
+new "Set oldex"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex>str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+
+new "Set newex should fail"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex>str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>XML'
+
+new "Set other should fail"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other>str</other></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>XML'
+
+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
+sudo clixon_backend -z -f $cfg
+if [ $? -ne 0 ]; then
+    err "kill backend"
+fi
+sudo pkill -u root -f clixon_backend
+
+#--------------------------------------
+new "3. Load module with no revision"
+cat <<EOF > $cfg
+<config>
+  <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
+  <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
+  <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_XMLDB_PLUGIN>/usr/local/lib/xmldb/text.so</CLICON_XMLDB_PLUGIN>
+</config>
+EOF
+
+new "start backend  -s init -f $cfg"
+# start new backend
+sudo $clixon_backend -s init -f $cfg
+if [ $? -ne 0 ]; then
+    err
+fi
+
+new "Set newex"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex>str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+
+new "Set oldex should fail"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex>str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>XML'
+
+new "Set other should fail"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other>str</other></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>XML'
+
+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
+sudo clixon_backend -z -f $cfg
+if [ $? -ne 0 ]; then
+    err "kill backend"
+fi
+sudo pkill -u root -f clixon_backend
+
+#--------------------------------------
+new "4. Load module with old revision"
+cat <<EOF > $cfg
+<config>
+  <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
+  <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
+  <CLICON_YANG_MODULE_REVISION>2018-01-01</CLICON_YANG_MODULE_REVISION>
+  <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_XMLDB_PLUGIN>/usr/local/lib/xmldb/text.so</CLICON_XMLDB_PLUGIN>
+</config>
+EOF
+
+new "start backend  -s init -f $cfg"
+# start new backend
+sudo $clixon_backend -s init -f $cfg
+if [ $? -ne 0 ]; then
+    err
+fi
+
+new "Set oldex"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex>str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+
+new "Set newex should fail"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex>str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>XML'
+
+new "Set other should fail"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other>str</other></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>XML'
+
+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
+sudo clixon_backend -z -f $cfg
+if [ $? -ne 0 ]; then
+    err "kill backend"
+fi
+sudo pkill -u root -f clixon_backend
+
+#--------------------------------------
+new "5. Load dir"
+cat <<EOF > $cfg
+<config>
+  <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
+  <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_MAIN_DIR>$dir</CLICON_YANG_MAIN_DIR>
+  <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_XMLDB_PLUGIN>/usr/local/lib/xmldb/text.so</CLICON_XMLDB_PLUGIN>
+</config>
+EOF
+
+new "start backend  -s init -f $cfg"
+# start new backend
+sudo $clixon_backend -s init -f $cfg
+if [ $? -ne 0 ]; then
+    err
+fi
+
+new "Set newex"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex>str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+
+new "Set oldex should fail"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex>str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>XML'
+
+new "Set other"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other>str</other></config></edit-config></rpc>]]>]]>'  '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+
+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
+sudo clixon_backend -z -f $cfg
+if [ $? -ne 0 ]; then
+    err "kill backend"
+fi
+sudo pkill -u root -f clixon_backend
+
+#--------------------------------------
+new "6. Load dir override with file"
+cat <<EOF > $cfg
+<config>
+  <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
+  <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_MAIN_DIR>$dir</CLICON_YANG_MAIN_DIR>
+  <CLICON_YANG_MAIN_FILE>$fyang2</CLICON_YANG_MAIN_FILE>
+  <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_XMLDB_PLUGIN>/usr/local/lib/xmldb/text.so</CLICON_XMLDB_PLUGIN>
+</config>
+EOF
+
+new "start backend  -s init -f $cfg"
+# start new backend
+sudo $clixon_backend -s init -f $cfg
+if [ $? -ne 0 ]; then
+    err
+fi
+
+new "Set oldex"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex>str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+
+new "Set newex should fail"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex>str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>XML'
+
+new "Set other"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other>str</other></config></edit-config></rpc>]]>]]>'  '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+
+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
+sudo clixon_backend -z -f $cfg
+if [ $? -ne 0 ]; then
+    err "kill backend"
+fi
+sudo pkill -u root -f clixon_backend
+
+
+#--------------------------------------
+new "7. Load dir override with module + revision"
+cat <<EOF > $cfg
+<config>
+  <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
+  <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_MAIN_DIR>$dir</CLICON_YANG_MAIN_DIR>
+  <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
+  <CLICON_YANG_MODULE_REVISION>2018-01-01</CLICON_YANG_MODULE_REVISION>
+  <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_XMLDB_PLUGIN>/usr/local/lib/xmldb/text.so</CLICON_XMLDB_PLUGIN>
+</config>
+EOF
+
+new "start backend  -s init -f $cfg"
+# start new backend
+sudo $clixon_backend -s init -f $cfg
+if [ $? -ne 0 ]; then
+    err
+fi
+
+new "Set oldex"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex>str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+
+new "Set newex should fail"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex>str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>XML'
+
+new "Set other"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other>str</other></config></edit-config></rpc>]]>]]>'  '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+
+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
+sudo clixon_backend -z -f $cfg
+if [ $? -ne 0 ]; then
+    err "kill backend"
+fi
+sudo pkill -u root -f clixon_backend
+
+#--------------------------------------
+new "8. Load module w new revision overrided by old file"
+cat <<EOF > $cfg
+<config>
+  <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
+  <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_MAIN_FILE>$fyang2</CLICON_YANG_MAIN_FILE>
+  <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
+  <CLICON_YANG_MODULE_REVISION>2018-12-02</CLICON_YANG_MODULE_REVISION>
+  <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_XMLDB_PLUGIN>/usr/local/lib/xmldb/text.so</CLICON_XMLDB_PLUGIN>
+</config>
+EOF
+
+new "start backend  -s init -f $cfg"
+# start new backend
+sudo $clixon_backend -s init -f $cfg
+if [ $? -ne 0 ]; then
+    err
+fi
+
+new "Set oldex"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex>str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+
+new "Set newex should fail"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex>str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>XML'
+
+new "Set other should fail"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other>str</other></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>XML'
+
+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
+sudo clixon_backend -z -f $cfg
+if [ $? -ne 0 ]; then
+    err "kill backend"
+fi
+sudo pkill -u root -f clixon_backend
+
+rm -rf $dir

From 7d5bfe5c81f78e52eb06caa267ab8160a5e872d1 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Wed, 5 Dec 2018 22:18:28 +0100
Subject: [PATCH 10/72] YANG parser cardinality checked
 (https://github.com/clicon/clixon/issues/48)

---
 CHANGELOG.md                      |   2 +-
 example/README.md                 |   3 +-
 lib/src/clixon_yang_cardinality.c | 316 +++++++++++++++++++++++++++++-
 lib/src/clixon_yang_parse.y       |  22 ++-
 test/test_openconfig.sh           |  10 +-
 5 files changed, 335 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3305eb87..e2ab6c86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@
 
 ### Major New features
 * More complete Yang parser 
-  * YANG parser cardinality checked (only modules level yet)
+  * YANG parser cardinality checked (https://github.com/clicon/clixon/issues/48)
     * See https://github.com/clicon/clixon/issues/84
   * Support of submodule, include and belongs-to.
   * Openconfig yang specs parsed: https://github.com/openconfig/public
diff --git a/example/README.md b/example/README.md
index 6fdc8641..48ed4595 100644
--- a/example/README.md
+++ b/example/README.md
@@ -1,7 +1,6 @@
 # Clixon example
 
-This directory contains a Clixon example which includes a simple
-routing example. It contains the following files:
+This directory contains a Clixon example which includes a simple example. It contains the following files:
 * example.xml       The configuration file. See yang/clixon-config@<date>.yang for all available fields.
 * example.yang      The yang spec of the example. It mainly includes ietf routing and IP modules.
 * example_cli.cli   CLIgen specification.
diff --git a/lib/src/clixon_yang_cardinality.c b/lib/src/clixon_yang_cardinality.c
index 60964c86..4a8b1ddf 100644
--- a/lib/src/clixon_yang_cardinality.c
+++ b/lib/src/clixon_yang_cardinality.c
@@ -108,6 +108,217 @@ struct ycard{
  */
 #define NMAX 1000000 /* Just a large number */
 static const struct ycard yclist[] = {
+    {Y_ACTION,  Y_DESCRIPTION, 0, 1},
+    {Y_ACTION,  Y_GROUPING, 0, NMAX},
+    {Y_ACTION,  Y_IF_FEATURE, 0, NMAX},
+    {Y_ACTION,  Y_INPUT, 0, 1},
+    {Y_ACTION,  Y_OUTPUT, 0, 1},
+    {Y_ACTION,  Y_REFERENCE, 0, 1},
+    {Y_ACTION,  Y_STATUS, 0, 1},
+    {Y_ACTION,  Y_TYPEDEF, 0, NMAX},
+    {Y_ANYDATA,  Y_CONFIG, 0, 1},
+    {Y_ANYDATA,  Y_DESCRIPTION, 0, 1},
+    {Y_ANYDATA,  Y_IF_FEATURE, 0, NMAX},
+    {Y_ANYDATA,  Y_MANDATORY, 0, 1},
+    {Y_ANYDATA,  Y_MUST, 0, NMAX},
+    {Y_ANYDATA,  Y_REFERENCE, 0, 1},
+    {Y_ANYDATA,  Y_STATUS, 0, 1},
+    {Y_ANYDATA,  Y_WHEN, 0, 1},
+    {Y_ANYXML,  Y_CONFIG, 0, 1},
+    {Y_ANYXML,  Y_DESCRIPTION, 0, 1},
+    {Y_ANYXML,  Y_IF_FEATURE, 0, NMAX},
+    {Y_ANYXML,  Y_MANDATORY, 0, 1},
+    {Y_ANYXML,  Y_MUST, 0, NMAX},
+    {Y_ANYXML,  Y_REFERENCE, 0, 1},
+    {Y_ANYXML,  Y_STATUS, 0, 1},
+    {Y_ANYXML,  Y_WHEN, 0, 1},
+    {Y_ARGUMENT,  Y_YIN_ELEMENT, 0, 1},
+    {Y_AUGMENT,  Y_ACTION, 0, NMAX},
+    {Y_AUGMENT,  Y_ANYDATA, 0, NMAX},
+    {Y_AUGMENT,  Y_ANYXML, 0, NMAX},
+    {Y_AUGMENT,  Y_CASE, 0, NMAX},
+    {Y_AUGMENT,  Y_CHOICE, 0, NMAX},
+    {Y_AUGMENT,  Y_CONTAINER, 0, NMAX},
+    {Y_AUGMENT,  Y_DESCRIPTION, 0, 1},
+    {Y_AUGMENT,  Y_IF_FEATURE, 0, NMAX},
+    {Y_AUGMENT,  Y_LEAF, 0, NMAX},
+    {Y_AUGMENT,  Y_LEAF_LIST, 0, NMAX},
+    {Y_AUGMENT,  Y_LIST, 0, NMAX},
+    {Y_AUGMENT,  Y_NOTIFICATION, 0, NMAX},
+    {Y_AUGMENT,  Y_REFERENCE, 0, 1},
+    {Y_AUGMENT,  Y_STATUS, 0, 1},
+    {Y_AUGMENT,  Y_USES, 0, NMAX},
+    {Y_AUGMENT,  Y_WHEN, 0, 1},
+    {Y_BELONGS_TO, Y_PREFIX,    1, 1},
+    {Y_BIT,  Y_DESCRIPTION, 0, 1},
+    {Y_BIT,  Y_IF_FEATURE, 0, NMAX},
+    {Y_BIT,  Y_POSITION, 0, 1},
+    {Y_BIT,  Y_REFERENCE, 0, 1},
+    {Y_BIT,  Y_STATUS, 0, 1},
+    {Y_CASE,  Y_ANYDATA, 0, NMAX},
+    {Y_CASE,  Y_ANYXML, 0, NMAX},
+    {Y_CASE,  Y_CHOICE, 0, NMAX},
+    {Y_CASE,  Y_CONTAINER, 0, NMAX},
+    {Y_CASE,  Y_DESCRIPTION, 0, 1},
+    {Y_CASE,  Y_IF_FEATURE, 0, NMAX},
+    {Y_CASE,  Y_LEAF, 0, NMAX},
+    {Y_CASE,  Y_LEAF_LIST, 0, NMAX},
+    {Y_CASE,  Y_LIST, 0, NMAX},
+    {Y_CASE,  Y_REFERENCE, 0, 1},
+    {Y_CASE,  Y_STATUS, 0, 1},
+    {Y_CASE,  Y_USES, 0, NMAX},
+    {Y_CASE,  Y_WHEN, 0, 1},
+    {Y_CHOICE,  Y_ANYXML, 0, NMAX},
+    {Y_CHOICE,  Y_CASE, 0, NMAX},
+    {Y_CHOICE,  Y_CHOICE, 0, NMAX},
+    {Y_CHOICE,  Y_CONFIG, 0, 1},
+    {Y_CHOICE,  Y_CONTAINER, 0, NMAX},
+    {Y_CHOICE,  Y_DEFAULT, 0, 1},
+    {Y_CHOICE,  Y_DESCRIPTION, 0, 1},
+    {Y_CHOICE,  Y_IF_FEATURE, 0, NMAX},
+    {Y_CHOICE,  Y_LEAF, 0, NMAX},
+    {Y_CHOICE,  Y_LEAF_LIST, 0, NMAX},
+    {Y_CHOICE,  Y_LIST, 0, NMAX},
+    {Y_CHOICE,  Y_MANDATORY, 0, 1},
+    {Y_CHOICE,  Y_REFERENCE, 0, 1},
+    {Y_CHOICE,  Y_STATUS, 0, 1},
+    {Y_CHOICE,  Y_WHEN, 0, 1},
+    {Y_CHOICE, Y_ANYDATA, 0, NMAX},
+    {Y_CONTAINER, Y_ACTION,   0, NMAX},
+    {Y_CONTAINER, Y_ANYDATA, 0, NMAX},
+    {Y_CONTAINER, Y_ANYXML, 0, NMAX},
+    {Y_CONTAINER, Y_CHOICE, 0, NMAX},
+    {Y_CONTAINER, Y_CONFIG, 0, 1},
+    {Y_CONTAINER, Y_CONTAINER, 0, NMAX},
+    {Y_CONTAINER, Y_DESCRIPTION, 0, 1},
+    {Y_CONTAINER, Y_GROUPING, 0, NMAX},
+    {Y_CONTAINER, Y_IF_FEATURE, 0, NMAX},
+    {Y_CONTAINER, Y_LEAF, 0, NMAX},
+    {Y_CONTAINER, Y_LEAF_LIST, 0, NMAX},
+    {Y_CONTAINER, Y_LIST, 0, NMAX},
+    {Y_CONTAINER, Y_MUST, 0, NMAX},
+    {Y_CONTAINER, Y_NOTIFICATION, 0, NMAX},
+    {Y_CONTAINER, Y_PRESENCE, 0, 1},
+    {Y_CONTAINER, Y_REFERENCE, 0, 1},
+    {Y_CONTAINER, Y_STATUS, 0, 1},
+    {Y_CONTAINER, Y_TYPEDEF, 0, NMAX},
+    {Y_CONTAINER, Y_USES, 0, NMAX},
+    {Y_CONTAINER, Y_WHEN, 0, 1},
+    {Y_DEVIATE,  Y_CONFIG, 0, 1},
+    {Y_DEVIATE,  Y_DEFAULT, 0, NMAX},
+    {Y_DEVIATE,  Y_MANDATORY, 0, 1},
+    {Y_DEVIATE,  Y_MAX_ELEMENTS, 0, 1},
+    {Y_DEVIATE,  Y_MIN_ELEMENTS, 0, 1},
+    {Y_DEVIATE,  Y_MUST, 0, NMAX},
+    {Y_DEVIATE,  Y_TYPE, 0, 1},
+    {Y_DEVIATE,  Y_UNIQUE, 0, NMAX},
+    {Y_DEVIATE,  Y_UNITS, 0, 1},
+    {Y_DEVIATION,  Y_DESCRIPTION, 0, 1},
+    {Y_DEVIATION,  Y_DEVIATE, 1, NMAX},
+    {Y_DEVIATION,  Y_REFERENCE, 0, 1},
+    {Y_ENUM,  Y_DESCRIPTION, 0, 1},
+    {Y_ENUM,  Y_IF_FEATURE, 0, NMAX},
+    {Y_ENUM,  Y_REFERENCE, 0, 1},
+    {Y_ENUM,  Y_STATUS, 0, 1},
+    {Y_ENUM,  Y_VALUE, 0, 1},
+    {Y_EXTENSION,  Y_ARGUMENT, 0, 1},
+    {Y_EXTENSION,  Y_DESCRIPTION, 0, 1},
+    {Y_EXTENSION,  Y_REFERENCE, 0, 1},
+    {Y_EXTENSION,  Y_STATUS, 0, 1},
+    {Y_FEATURE,  Y_DESCRIPTION, 0, 1},
+    {Y_FEATURE,  Y_IF_FEATURE, 0, NMAX},
+    {Y_FEATURE,  Y_REFERENCE, 0, 1},
+    {Y_FEATURE,  Y_STATUS, 0, 1},
+    {Y_GROUPING,  Y_ACTION, 0, NMAX},
+    {Y_GROUPING,  Y_ANYDATA, 0, NMAX},
+    {Y_GROUPING,  Y_ANYXML, 0, NMAX},
+    {Y_GROUPING,  Y_CHOICE, 0, NMAX},
+    {Y_GROUPING,  Y_CONTAINER, 0, NMAX},
+    {Y_GROUPING,  Y_DESCRIPTION, 0, 1},
+    {Y_GROUPING,  Y_GROUPING, 0, NMAX},
+    {Y_GROUPING,  Y_LEAF, 0, NMAX},
+    {Y_GROUPING,  Y_LEAF_LIST, 0, NMAX},
+    {Y_GROUPING,  Y_LIST, 0, NMAX},
+    {Y_GROUPING,  Y_NOTIFICATION, 0, NMAX},
+    {Y_GROUPING,  Y_REFERENCE, 0, 1},
+    {Y_GROUPING,  Y_STATUS, 0, 1},
+    {Y_GROUPING,  Y_TYPEDEF, 0, NMAX},
+    {Y_GROUPING,  Y_USES, 0, NMAX},
+    {Y_IDENTITY,  Y_BASE, 0, NMAX},
+    {Y_IDENTITY,  Y_DESCRIPTION, 0, 1},
+    {Y_IDENTITY,  Y_IF_FEATURE, 0, NMAX},
+    {Y_IDENTITY,  Y_REFERENCE, 0, 1},
+    {Y_IDENTITY,  Y_STATUS, 0, 1},
+    {Y_IMPORT, Y_DESCRIPTION,  0, 1},
+    {Y_IMPORT, Y_PREFIX,       1, 1},
+    {Y_IMPORT, Y_REFERENCE,    0, 1},
+    {Y_IMPORT, Y_REVISION_DATE,0, 1},
+    {Y_INCLUDE, Y_DESCRIPTION,  0, 1},
+    {Y_INCLUDE, Y_REFERENCE,    0, 1},
+    {Y_INCLUDE, Y_REVISION_DATE,0, 1},
+    {Y_INPUT,  Y_ANYDATA, 0, NMAX},
+    {Y_INPUT,  Y_ANYXML, 0, NMAX},
+    {Y_INPUT,  Y_CHOICE, 0, NMAX},
+    {Y_INPUT,  Y_CONTAINER, 0, NMAX},
+    {Y_INPUT,  Y_GROUPING, 0, NMAX},
+    {Y_INPUT,  Y_LEAF, 0, NMAX},
+    {Y_INPUT,  Y_LEAF_LIST, 0, NMAX},
+    {Y_INPUT,  Y_LIST, 0, NMAX},
+    {Y_INPUT,  Y_MUST, 0, NMAX},
+    {Y_INPUT,  Y_TYPEDEF, 0, NMAX},
+    {Y_INPUT,  Y_USES, 0, NMAX},
+    {Y_LEAF, Y_CONFIG, 0, 1},
+    {Y_LEAF, Y_DEFAULT, 0, 1},
+    {Y_LEAF, Y_DESCRIPTION, 0, 1},
+    {Y_LEAF, Y_IF_FEATURE, 0, NMAX},
+    {Y_LEAF, Y_MANDATORY, 0, 1},
+    {Y_LEAF, Y_MUST, 0, NMAX},
+    {Y_LEAF, Y_REFERENCE, 0, 1},
+    {Y_LEAF, Y_STATUS, 0, 1},
+    {Y_LEAF, Y_TYPE, 1, 1},
+    {Y_LEAF, Y_UNITS, 0, 1},
+    {Y_LEAF, Y_WHEN, 0, 1},
+    {Y_LEAF_LIST, Y_CONFIG, 0, 1},
+    {Y_LEAF_LIST, Y_DEFAULT, 0, NMAX},
+    {Y_LEAF_LIST, Y_DESCRIPTION, 0, 1},
+    {Y_LEAF_LIST, Y_IF_FEATURE, 0, NMAX},
+    {Y_LEAF_LIST, Y_MAX_ELEMENTS, 0, 1},
+    {Y_LEAF_LIST, Y_MIN_ELEMENTS, 0, 1},
+    {Y_LEAF_LIST, Y_MUST, 0, NMAX},
+    {Y_LEAF_LIST, Y_ORDERED_BY, 0, 1},
+    {Y_LEAF_LIST, Y_REFERENCE, 0, 1},
+    {Y_LEAF_LIST, Y_STATUS, 0, 1},
+    {Y_LEAF_LIST, Y_TYPE, 1, 1},
+    {Y_LEAF_LIST, Y_UNITS, 0, 1},
+    {Y_LEAF_LIST, Y_WHEN, 0, 1},
+    {Y_LENGTH,  Y_DESCRIPTION, 0, 1},
+    {Y_LENGTH,  Y_ERROR_APP_TAG, 0, 1},
+    {Y_LENGTH,  Y_ERROR_MESSAGE, 0, 1},
+    {Y_LENGTH,  Y_REFERENCE, 0, 1},
+    {Y_LIST, Y_ACTION, 0, NMAX},
+    {Y_LIST, Y_ANYDATA, 0, NMAX},
+    {Y_LIST, Y_ANYXML, 0, NMAX},
+    {Y_LIST, Y_CHOICE, 0, NMAX},
+    {Y_LIST, Y_CONFIG, 0, 1},
+    {Y_LIST, Y_CONTAINER, 0, NMAX},
+    {Y_LIST, Y_DESCRIPTION, 0, 1},
+    {Y_LIST, Y_GROUPING, 0, NMAX},
+    {Y_LIST, Y_IF_FEATURE, 0, NMAX},
+    {Y_LIST, Y_KEY, 0, 1},
+    {Y_LIST, Y_LEAF, 0, NMAX},
+    {Y_LIST, Y_LEAF_LIST, 0, NMAX},
+    {Y_LIST, Y_LIST, 0, NMAX},
+    {Y_LIST, Y_MAX_ELEMENTS, 0, 1},
+    {Y_LIST, Y_MIN_ELEMENTS, 0, 1},
+    {Y_LIST, Y_MUST, 0, NMAX},
+    {Y_LIST, Y_NOTIFICATION, 0, NMAX},
+    {Y_LIST, Y_ORDERED_BY, 0, 1},
+    {Y_LIST, Y_REFERENCE, 0, 1},
+    {Y_LIST, Y_STATUS, 0, 1},
+    {Y_LIST, Y_TYPEDEF, 0, NMAX},
+    {Y_LIST, Y_UNIQUE, 0, NMAX},
+    {Y_LIST, Y_USES, 0, NMAX},
+    {Y_LIST, Y_WHEN, 0,1},
     {Y_MODULE, Y_ANYDATA,      0, NMAX},
     {Y_MODULE, Y_ANYXML,       0, NMAX},
     {Y_MODULE, Y_AUGMENT,      0, NMAX},
@@ -134,17 +345,115 @@ static const struct ycard yclist[] = {
     {Y_MODULE, Y_RPC,          0, NMAX},
     {Y_MODULE, Y_TYPEDEF,      0, NMAX},
     {Y_MODULE, Y_USES,         0, NMAX},
-    {Y_MODULE, Y_YANG_VERSION, 0, 1}, 
+    {Y_MODULE, Y_YANG_VERSION, 0, 1},
+    {Y_MUST, Y_DESCRIPTION, 0, 1},
+    {Y_MUST, Y_ERROR_APP_TAG, 0, 1},
+    {Y_MUST, Y_ERROR_MESSAGE, 0, 1},
+    {Y_MUST, Y_REFERENCE, 0, 1},
+    {Y_NOTIFICATION,  Y_ANYDATA, 0, NMAX},
+    {Y_NOTIFICATION,  Y_ANYXML, 0, NMAX},
+    {Y_NOTIFICATION,  Y_CHOICE, 0, NMAX},
+    {Y_NOTIFICATION,  Y_CONTAINER, 0, NMAX},
+    {Y_NOTIFICATION,  Y_DESCRIPTION, 0, 1},
+    {Y_NOTIFICATION,  Y_GROUPING, 0, NMAX},
+    {Y_NOTIFICATION,  Y_IF_FEATURE, 0, NMAX},
+    {Y_NOTIFICATION,  Y_LEAF, 0, NMAX},
+    {Y_NOTIFICATION,  Y_LEAF_LIST, 0, NMAX},
+    {Y_NOTIFICATION,  Y_LIST, 0, NMAX},
+    {Y_NOTIFICATION,  Y_MUST, 0, NMAX},
+    {Y_NOTIFICATION,  Y_REFERENCE, 0, 1},
+    {Y_NOTIFICATION,  Y_STATUS, 0, 1},
+    {Y_NOTIFICATION,  Y_TYPEDEF, 0, NMAX},
+    {Y_NOTIFICATION,  Y_USES, 0, NMAX},
+    {Y_OUTPUT,  Y_ANYDATA, 0, NMAX},
+    {Y_OUTPUT,  Y_ANYXML, 0, NMAX},
+    {Y_OUTPUT,  Y_CHOICE, 0, NMAX},
+    {Y_OUTPUT,  Y_CONTAINER, 0, NMAX},
+    {Y_OUTPUT,  Y_GROUPING, 0, NMAX},
+    {Y_OUTPUT,  Y_LEAF, 0, NMAX},
+    {Y_OUTPUT,  Y_LEAF_LIST, 0, NMAX},
+    {Y_OUTPUT,  Y_LIST, 0, NMAX},
+    {Y_OUTPUT,  Y_MUST, 0, NMAX},
+    {Y_OUTPUT,  Y_TYPEDEF, 0, NMAX},
+    {Y_OUTPUT,  Y_USES, 0, NMAX},
+    {Y_PATTERN,  Y_DESCRIPTION, 0, 1},
+    {Y_PATTERN,  Y_ERROR_APP_TAG, 0, 1},
+    {Y_PATTERN,  Y_ERROR_MESSAGE, 0, 1},
+    {Y_PATTERN,  Y_MODIFIER, 0, 1},
+    {Y_PATTERN,  Y_REFERENCE, 0, 1},
+    {Y_RANGE,  Y_DESCRIPTION, 0, 1},
+    {Y_RANGE,  Y_ERROR_APP_TAG, 0, 1},
+    {Y_RANGE,  Y_ERROR_MESSAGE, 0, 1},
+    {Y_RANGE,  Y_REFERENCE, 0, 1},
+    {Y_REVISION, Y_DESCRIPTION, 0, 1},
+    {Y_REVISION, Y_REFERENCE,   0, 1},
+    {Y_RPC,  Y_DESCRIPTION, 0, 1},
+    {Y_RPC,  Y_GROUPING, 0, NMAX},
+    {Y_RPC,  Y_IF_FEATURE, 0, NMAX},
+    {Y_RPC,  Y_INPUT, 0, 1},
+    {Y_RPC,  Y_OUTPUT, 0, 1},
+    {Y_RPC,  Y_REFERENCE, 0, 1},
+    {Y_RPC,  Y_STATUS, 0, 1},
+    {Y_RPC,  Y_TYPEDEF, 0, NMAX},
+    {Y_SUBMODULE, Y_ANYDATA,    0, NMAX},
+    {Y_SUBMODULE, Y_AUGMENT,    0, NMAX},
+    {Y_SUBMODULE, Y_BELONGS_TO, 1, 1},
+    {Y_SUBMODULE, Y_CHOICE,     0, NMAX},
+    {Y_SUBMODULE, Y_CONTACT,    0, 1},
+    {Y_SUBMODULE, Y_CONTAINER,  0, NMAX},
+    {Y_SUBMODULE, Y_DESCRIPTION,0, 1},
+    {Y_SUBMODULE, Y_DEVIATION,  0, NMAX},
+    {Y_SUBMODULE, Y_EXTENSION,  0, NMAX},
+    {Y_SUBMODULE, Y_FEATURE,    0, NMAX},
+    {Y_SUBMODULE, Y_GROUPING,   0, NMAX},
+    {Y_SUBMODULE, Y_IDENTITY,   0, NMAX},
+    {Y_SUBMODULE, Y_IMPORT,     0, NMAX},
+    {Y_SUBMODULE, Y_INCLUDE,    0, NMAX},
+    {Y_SUBMODULE, Y_LEAF,       0, NMAX},
+    {Y_SUBMODULE, Y_LEAF_LIST,  0, NMAX},
+    {Y_SUBMODULE, Y_LIST,       0, NMAX},
+    {Y_SUBMODULE, Y_NOTIFICATION,0, NMAX},
+    {Y_SUBMODULE, Y_ORGANIZATION,0, 1},
+    {Y_SUBMODULE, Y_REFERENCE,  0, 1},
+    {Y_SUBMODULE, Y_REVISION,   0, NMAX},
+    {Y_SUBMODULE, Y_RPC,        0, NMAX},
+    {Y_SUBMODULE, Y_TYPEDEF,    0, NMAX},
+    {Y_SUBMODULE, Y_USES,       0, NMAX},
+    {Y_SUBMODULE, Y_YANG_VERSION,0, 1}, /* "yang-version" statement is mandatory in YANG version "1.1". */
+    {Y_TYPE, Y_BASE,          0, NMAX},
+    {Y_TYPE, Y_BIT,           0, NMAX},
+    {Y_TYPE, Y_ENUM,          0, NMAX},
+    {Y_TYPE, Y_FRACTION_DIGITS, 0, 1},
+    {Y_TYPE, Y_LENGTH,        0, 1},
+    {Y_TYPE, Y_PATH,          0, 1},
+    {Y_TYPE, Y_PATTERN,       0, NMAX},
+    {Y_TYPE, Y_RANGE,         0, 1},
+    {Y_TYPE, Y_REQUIRE_INSTANCE, 0, 1},
+    {Y_TYPE, Y_TYPE,          0, NMAX},
+    {Y_TYPEDEF, Y_DEFAULT,    0, 1},
+    {Y_TYPEDEF, Y_DESCRIPTION,0, 1},
+    {Y_TYPEDEF, Y_REFERENCE,  0, 1},
+    {Y_TYPEDEF, Y_STATUS,     0, 1},
+    {Y_TYPEDEF, Y_TYPE,       1, 1},
+    {Y_TYPEDEF, Y_UNITS,      0, 1},
+    {Y_USES,  Y_AUGMENT, 0, NMAX},
+    {Y_USES,  Y_DESCRIPTION, 0, 1},
+    {Y_USES,  Y_IF_FEATURE, 0, NMAX},
+    {Y_USES,  Y_REFERENCE, 0, 1},
+    {Y_USES,  Y_REFINE, 0, NMAX},
+    {Y_USES,  Y_STATUS, 0, 1},
+    {Y_USES,  Y_WHEN, 0, 1},
     {0,}
 };
 
 /*! Find yang parent and child combination in yang cardinality table
  * @param[in] parent Parent Yang spec
- * @param[in] child  Child yang spec if -1 first
+ * @param[in] child  Child yang spec if 0 first
  * @param[in] yc     Yang cardinality map
  * @param[in] p      If set, quit as soon as parents dont match
  * @retval    NULL   Not found
  * @retval    yp     Found
+ * @note if cardinal list above is sorted, this search could do binary
  */
 static const struct ycard *
 ycard_find(enum rfc_6020       parent,
@@ -202,6 +511,7 @@ yang_cardinality(clicon_handle h,
 	ck = ys->ys_keyword;
 	if (ck == Y_UNKNOWN) /* special case */
 	    continue;
+	/* Find entry in yang cardinality table from parent/child keyword pair */
 	if ((yc = ycard_find(pk, ck, ycplist, 1)) == NULL){
 	    clicon_err(OE_YANG, 0, "%s: \"%s\" is child of \"%s\", but should not be",
 		       modname, yang_key2str(ck), yang_key2str(pk));
@@ -231,7 +541,7 @@ yang_cardinality(clicon_handle h,
 	}
     }
     
-    if (0) { /* Notyet */
+    if (1) { /* Notyet */
 	/* 4) Recurse */
 	i = 0;
 	while (i<yt->ys_len){ /* Note, children may be removed */
diff --git a/lib/src/clixon_yang_parse.y b/lib/src/clixon_yang_parse.y
index 0af79687..7bd42cc1 100644
--- a/lib/src/clixon_yang_parse.y
+++ b/lib/src/clixon_yang_parse.y
@@ -490,9 +490,11 @@ import_substmt : prefix_stmt {  clicon_debug(2,"import-stmt -> prefix-stmt"); }
 include_stmt  : K_INCLUDE identifier_str ';'
 		{ if (ysp_add(_yy, Y_INCLUDE, $2, NULL)== NULL) _YYERROR("include_stmt"); 
                            clicon_debug(2,"include-stmt -> id-str"); }
-              | K_INCLUDE identifier_str '{' include_substmts '}'
-		{ if (ysp_add(_yy, Y_INCLUDE, $2, NULL)== NULL) _YYERROR("include_stmt"); 
-                           clicon_debug(2,"include-stmt -> id-str { include-substmts }"); }
+              | K_INCLUDE identifier_str
+                { if (ysp_add_push(_yy, Y_INCLUDE, $2) == NULL) _YYERROR("include_stmt"); }
+	      '{' include_substmts '}'
+                { if (ystack_pop(_yy) < 0) _YYERROR("include_stmt");
+                  clicon_debug(2,"include-stmt -> id-str { include-substmts }"); }
               ;
 
 include_substmts : include_substmts include_substmt 
@@ -518,9 +520,13 @@ prefix_stmt   : K_PREFIX identifier_str stmtend /* XXX prefix-arg-str */
 			     clicon_debug(2,"prefix-stmt -> PREFIX string ;");}
               ;
 
-belongs_to_stmt : K_BELONGS_TO identifier_str '{' prefix_stmt '}'
-				{ if (ysp_add(_yy, Y_BELONGS_TO, $2, NULL)== NULL) _YYERROR("belongs_to_stmt"); 
-			     clicon_debug(2,"belongs-to-stmt -> BELONGS-TO id-arg-str { prefix-stmt } ");}
+belongs_to_stmt : K_BELONGS_TO identifier_str 
+                        { if (ysp_add_push(_yy, Y_BELONGS_TO, $2) == NULL) _YYERROR("belongs_to_stmt"); }
+
+                  '{' prefix_stmt '}'
+                    { if (ystack_pop(_yy) < 0) _YYERROR("belongs_to_stmt");
+		      clicon_debug(2,"belongs-to-stmt -> BELONGS-TO id-arg-str { prefix-stmt } ");
+			}
                  ;
 
 organization_stmt: K_ORGANIZATION string stmtend
@@ -1469,10 +1475,10 @@ deviation_substmt : description_stmt  { clicon_debug(2,"deviation-substmt -> des
 		  ;
 
 deviate_not_supported_stmt : K_DEVIATE string stmtend
-                     { clicon_debug(2,"deviate-not-supported-stmt -> DEVIATE string"); }
+	                { if (ysp_add(_yy, Y_DEVIATE, $2, NULL) == NULL) _YYERROR("notification_stmt");
+    			   clicon_debug(2,"deviate-not-supported-stmt -> DEVIATE string ;"); }
                              ;
 
-
 /* body */
 body_stmts    : body_stmts body_stmt { clicon_debug(2,"body-stmts -> body-stmts body-stmt"); } 
               | body_stmt            { clicon_debug(2,"body-stmts -> body-stmt");}
diff --git a/test/test_openconfig.sh b/test/test_openconfig.sh
index efb68c54..26d81976 100755
--- a/test/test_openconfig.sh
+++ b/test/test_openconfig.sh
@@ -6,16 +6,18 @@
 # - release/models/wifi/types/openconfig-wifi-types.yang
 #      issue: https://github.com/clicon/clixon/issues/59
 # 
-#PROG="valgrind --leak-check=full --show-leak-kinds=all ../util/clixon_util_yang"
-PROG=../util/clixon_util_yang
 OPENCONFIG=public
 OCDIR=$OPENCONFIG/release/models
 
 # Clone openconfig dir if not there
+if false; then
 if [ ! -d public ]; then 
     git clone https://github.com/openconfig/public
 else
-    (cd public; git pull)
+    (cd public;
+     #git pull
+    )
+fi
 fi
 
 # include err() and new() functions and creates $dir
@@ -91,7 +93,7 @@ for f in $files; do
 	let m++;
     fi
 done
-echo "Number of modules:$m"
+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 "cli $f"

From 66ce941ac4d1bf2d3d28ac8aa2439a6e444b551a Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Thu, 6 Dec 2018 10:06:13 +0100
Subject: [PATCH 11/72] minor cardinality patch

---
 lib/src/clixon_yang_cardinality.c | 14 ++++++--------
 test/lib.sh                       |  1 +
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/src/clixon_yang_cardinality.c b/lib/src/clixon_yang_cardinality.c
index 4a8b1ddf..9c26fe92 100644
--- a/lib/src/clixon_yang_cardinality.c
+++ b/lib/src/clixon_yang_cardinality.c
@@ -541,14 +541,12 @@ yang_cardinality(clicon_handle h,
 	}
     }
     
-    if (1) { /* Notyet */
-	/* 4) Recurse */
-	i = 0;
-	while (i<yt->ys_len){ /* Note, children may be removed */
-	    ys = yt->ys_stmt[i++];
-	    if (yang_cardinality(h, ys, modname) < 0)
-		goto done;
-	}
+    /* 4) Recurse */
+    i = 0;
+    while (i<yt->ys_len){ /* Note, children may be removed */
+	ys = yt->ys_stmt[i++];
+	if (yang_cardinality(h, ys, modname) < 0)
+	    goto done;
     }
  ok:
     retval = 0;
diff --git a/test/lib.sh b/test/lib.sh
index 716b6c83..eb6bdbbd 100755
--- a/test/lib.sh
+++ b/test/lib.sh
@@ -13,6 +13,7 @@ clixon_cli=clixon_cli
 
 # For memcheck / performance
 #clixon_netconf="valgrind --tool=callgrind clixon_netconf"
+# use kcachegrind to view
 #clixon_netconf="valgrind --leak-check=full --show-leak-kinds=all clixon_netconf"
 clixon_netconf=clixon_netconf
 

From e5c0b06cf92729630960d10b2f78bb952f67ac5f Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sat, 8 Dec 2018 11:22:26 +0100
Subject: [PATCH 12/72] Move NACM files from backend to lib src dir

---
 CHANGELOG.md                         |   5 +-
 apps/backend/backend_client.c        | 266 ---------------------
 apps/backend/backend_handle.h        |   4 -
 apps/backend/backend_main.c          |   4 +-
 apps/backend/clixon_backend_handle.c |  23 --
 lib/clixon/clixon.h.in               |   1 +
 lib/clixon/clixon_nacm.h             |  44 ++++
 lib/clixon/clixon_options.h          |   3 +
 lib/src/Makefile.in                  |   2 +-
 lib/src/clixon_nacm.c                | 334 +++++++++++++++++++++++++++
 lib/src/clixon_options.c             |  44 +++-
 11 files changed, 432 insertions(+), 298 deletions(-)
 create mode 100644 lib/clixon/clixon_nacm.h
 create mode 100644 lib/src/clixon_nacm.c

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2ab6c86..7e3837ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,10 @@
 * [Roadmap](ROADMAP.md) (Uncommitted and unprioritized)
 
 ### Major New features
-* More complete Yang parser 
+	
+* NACM extension (RFC8341)
+  * Move NACM files from backend to lib src dir
+* Yang code upgrade (RFC7950)
   * YANG parser cardinality checked (https://github.com/clicon/clixon/issues/48)
     * See https://github.com/clicon/clixon/issues/84
   * Support of submodule, include and belongs-to.
diff --git a/apps/backend/backend_client.c b/apps/backend/backend_client.c
index fedad77a..7ff71e72 100644
--- a/apps/backend/backend_client.c
+++ b/apps/backend/backend_client.c
@@ -935,272 +935,6 @@ from_client_debug(clicon_handle      h,
     return retval;
 }
 
-/*! Match nacm access operations according to RFC8341 3.4.4.  
- * Incoming RPC Message Validation Step 7 (c)
- *  The rule's "access-operations" leaf has the "exec" bit set or
- *  has the special value "*".
- * @retval 0  No match
- * @retval 1  Match
- * XXX access_operations is bit-fields
- */
-static int
-nacm_match_access(char *access_operations,
-		  char *mode)
-{
-    if (access_operations==NULL)
-	return 0;
-    if (strcmp(access_operations,"*")==0)
-	return 1;
-    if (strstr(access_operations, mode)!=NULL)
-	return 1;
-    return 0;
-}
-
-/*! Match nacm single rule. Either match with access or deny. Or not match.
- * @param[in]  h      Clicon handle
- * @param[in]  name  rpc name
- * @param[in]  xrule  NACM rule XML tree
- * @param[out] cbret  Cligen buffer result. Set to an error msg if retval=0.
- * @retval -1  Error
- * @retval  0  Matching rule AND Not access and cbret set
- * @retval  1  Matchung rule AND Access
- * @retval  2  No matching rule Goto step 10
- * From RFC8341 3.4.4.  Incoming RPC Message Validation
-   +---------+-----------------+---------------------+-----------------+
-   | Method  | Resource class  | NETCONF operation   | Access          |
-   |         |                 |                     | operation       |
-   +---------+-----------------+---------------------+-----------------+
-   | OPTIONS | all             | none                | none            |
-   | HEAD    | all             | <get>, <get-config> | read            |
-   | GET     | all             | <get>, <get-config> | read            |
-   | POST    | datastore, data | <edit-config>       | create          |
-   | POST    | operation       | specified operation | execute         |
-   | PUT     | data            | <edit-config>       | create, update  |
-   | PUT     | datastore       | <copy-config>       | update          |
-   | PATCH   | data, datastore | <edit-config>       | update          |
-   | DELETE  | data            | <edit-config>       | delete          |
-
- 7.(cont) A rule matches if all of the following criteria are met: 
-        *  The rule's "module-name" leaf is "*" or equals the name of
-           the YANG module where the protocol operation is defined.
-
-        *  Either (1) the rule does not have a "rule-type" defined or
-           (2) the "rule-type" is "protocol-operation" and the
-           "rpc-name" is "*" or equals the name of the requested
-           protocol operation.
-
-        *  The rule's "access-operations" leaf has the "exec" bit set or
-           has the special value "*".
- */
-static int
-nacm_match_rule(clicon_handle h,
-		char         *name,
-		cxobj        *xrule,
-		cbuf         *cbret)
-{
-    int    retval = -1;
-    //    cxobj *x;
-    char  *module_name;
-    char  *rpc_name;
-    char  *access_operations;
-    char  *action;
-    
-    module_name = xml_find_body(xrule, "module-name");
-    rpc_name = xml_find_body(xrule, "rpc-name");
-    /* XXX access_operations can be a set of bits */
-    access_operations = xml_find_body(xrule, "access-operations");
-    action = xml_find_body(xrule, "action");
-    clicon_debug(1, "%s: %s %s %s %s", __FUNCTION__,
-	       module_name, rpc_name, access_operations, action);
-    if (module_name && strcmp(module_name,"*")==0){
-	if (nacm_match_access(access_operations, "exec")){
-	    if (rpc_name==NULL ||
-		strcmp(rpc_name, "*")==0 || strcmp(rpc_name, name)==0){
-		/* Here is a matching rule */
-		if (action && strcmp(action, "permit")==0){
-		    retval = 1;
-		    goto done;
-		}
-		else{
-		    if (netconf_access_denied(cbret, "protocol", "access denied") < 0)
-			goto done;
-		    retval = 0;
-		    goto done;
-		}
-	    }
-	}
-    }
-    retval = 2; /* no matching rule */
- done:
-    return retval;
-
-}
-
-/*! Make nacm access control 
- * @param[in]  h     Clicon handle
- * @param[in]  mode  NACMmode, internal or external
- * @param[in]  name  rpc name
- * @param[in]  username
- * @param[out] cbret Cligen buffer result. Set to an error msg if retval=0.
- * @retval -1  Error
- * @retval  0  Not access and cbret set
- * @retval  1  Access
- * From RFC8341 3.4.4.  Incoming RPC Message Validation
- */
-static int
-nacm_access(clicon_handle h,
-	    char         *mode,
-	    char         *name,
-	    char         *username,
-	    cbuf         *cbret)
-{
-    int     retval = -1;
-    cxobj  *xtop = NULL;
-    cxobj  *xacm;
-    cxobj  *x;
-    cxobj  *xrlist;
-    cxobj  *xrule;
-    char   *enabled = NULL;
-    cxobj **gvec = NULL; /* groups */
-    size_t  glen;
-    cxobj **rlistvec = NULL; /* rule-list */
-    size_t  rlistlen;
-    cxobj **rvec = NULL; /* rules */
-    size_t  rlen;
-    int     i, j;
-    char   *exec_default = NULL;
-    int     ret;
-
-    clicon_debug(1, "%s", __FUNCTION__);
-    /* 0. If nacm-mode is external, get NACM defintion from separet tree,
-       otherwise get it from internal configuration */
-    if (strcmp(mode, "external")==0){
-	if ((xtop = backend_nacm_list_get(h)) == NULL){
-	    clicon_err(OE_XML, 0, "No nacm external tree");
-	    goto done;
-	}
-    }
-    else if (strcmp(mode, "internal")==0){
-	if (xmldb_get(h, "running", "nacm", 0, &xtop) < 0)
-	    goto done;	
-    }
-    else{
-	clicon_err(OE_UNIX, 0, "Invalid NACM mode: %s", mode);
-	goto done;
-    }
-    
-    /* 1.   If the "enable-nacm" leaf is set to "false", then the protocol
-       operation is permitted. (or config does not exist) */
-
-    if ((xacm = xpath_first(xtop, "nacm")) == NULL)
-	goto permit;
-    exec_default = xml_find_body(xacm, "exec-default");
-    if ((x = xpath_first(xacm, "enable-nacm")) == NULL)
-	goto permit;
-    enabled = xml_body(x);
-    if (strcmp(enabled, "true") != 0)
-	goto permit;
-
-    /* 2.   If the requesting session is identified as a recovery session,
-       then the protocol operation is permitted. NYI */
-    
-    /* 3.   If the requested operation is the NETCONF <close-session>
-       protocol operation, then the protocol operation is permitted.
-    */
-    if (strcmp(name, "close-session") == 0)
-	goto permit;
-    /* 4.   Check all the "group" entries to see if any of them contain a
-       "user-name" entry that equals the username for the session
-       making the request.  (If the "enable-external-groups" leaf is
-       "true", add to these groups the set of groups provided by the
-       transport layer.)	       */
-    if (username == NULL)
-	goto step10;
-    /* User's group */
-    if (xpath_vec(xacm, "groups/group[user-name='%s']", &gvec, &glen, username) < 0)
-	goto done;
-    /* 5. If no groups are found, continue with step 10. */
-    if (glen == 0)
-	goto step10;
-    /* 6. Process all rule-list entries, in the order they appear in the
-        configuration.  If a rule-list's "group" leaf-list does not
-        match any of the user's groups, proceed to the next rule-list
-        entry. */
-    if (xpath_vec(xacm, "rule-list", &rlistvec, &rlistlen) < 0)
-	goto done;
-    for (i=0; i<rlistlen; i++){
-	xrlist = rlistvec[i];
-	/* Loop through user's group to find match in this rule-list */
-	for (j=0; j<glen; j++){
-	    char *gname;
-	    gname = xml_find_body(gvec[j], "name");
-	    if (xpath_first(xrlist, ".[group='%s']", gname)!=NULL)
-		break; /* found */
-	}
-	if (j==glen) /* not found */
-	    continue;
-	/* 7. For each rule-list entry found, process all rules, in order,
-	   until a rule that matches the requested access operation is
-	   found. 
-	*/
-	if (xpath_vec(xrlist, "rule", &rvec, &rlen) < 0)
-	    goto done;
-	for (j=0; j<rlen; j++){
-	    xrule = rvec[j];
-	    /* -1 error, 0 deny, 1 permit, 2 continue */
-	    if ((ret = nacm_match_rule(h, name, xrule, cbret)) < 0)
-		goto done;
-	    switch(ret){
-	    case 0: /* deny */
-		goto deny;
-		break;
-	    case 1: /* permit */
-		goto permit;
-		break;
-	    case 2: /* no match, continue */
-		break;
-	    }
-	}
-    }
- step10:
-    /*   10.  If the requested protocol operation is defined in a YANG module
-        advertised in the server capabilities and the "rpc" statement
-        contains a "nacm:default-deny-all" statement, then the protocol
-        operation is denied. */
-    /* 11.  If the requested protocol operation is the NETCONF
-        <kill-session> or <delete-config>, then the protocol operation
-        is denied. */
-    if (strcmp(name, "kill-session")==0 || strcmp(name, "delete-config")==0){
-	if (netconf_access_denied(cbret, "protocol", "default deny") < 0)
-	    goto done;
-	goto deny;
-    }
-    /*   12.  If the "exec-default" leaf is set to "permit", then permit the
-	 protocol operation; otherwise, deny the request. */
-    if (exec_default ==NULL || strcmp(exec_default, "permit")==0)
-	goto permit;
-    if (netconf_access_denied(cbret, "protocol", "default deny") < 0)
-	goto done;
-    goto deny;
- permit:
-    retval = 1;
- done:
-    clicon_debug(1, "%s retval:%d (0:deny 1:permit)", __FUNCTION__, retval);
-    if (strcmp(mode, "internal")==0 && xtop)
-	xml_free(xtop);
-    if (gvec)
-	free(gvec);
-    if (rlistvec)
-	free(rlistvec);
-    if (rvec)
-	free(rvec);
-    return retval;
- deny: /* Here, cbret must contain a netconf error msg */
-    assert(cbuf_len(cbret));
-    retval = 0;
-    goto done;
-}
-
 /*! An internal clicon message has arrived from a client. Receive and dispatch.
  * @param[in]   h    Clicon handle
  * @param[in]   s    Socket where message arrived. read from this.
diff --git a/apps/backend/backend_handle.h b/apps/backend/backend_handle.h
index 676cc50c..8eb3e073 100644
--- a/apps/backend/backend_handle.h
+++ b/apps/backend/backend_handle.h
@@ -52,8 +52,4 @@ struct client_entry *backend_client_list(clicon_handle h);
 
 int backend_client_delete(clicon_handle h, struct client_entry *ce);
 
-int backend_nacm_list_set(clicon_handle h, cxobj *xnacm);
-
-cxobj * backend_nacm_list_get(clicon_handle h);
-
 #endif  /* _BACKEND_HANDLE_H_ */
diff --git a/apps/backend/backend_main.c b/apps/backend/backend_main.c
index 1359e984..ec4a99d7 100644
--- a/apps/backend/backend_main.c
+++ b/apps/backend/backend_main.c
@@ -91,6 +91,8 @@ backend_terminate(clicon_handle h)
 	yspec_free(yspec);
     if ((yspec = clicon_config_yang(h)) != NULL)
 	yspec_free(yspec);
+    if ((x = clicon_nacm_ext(h)) != NULL)
+	xml_free(x);
     if ((x = clicon_conf_xml(h)) != NULL)
 	xml_free(x);
     stream_publish_exit();
@@ -274,7 +276,7 @@ nacm_load_external(clicon_handle h)
 	clicon_err(OE_XML, 0, "No xml tree in %s", filename);
 	goto done;
     }
-    if (backend_nacm_list_set(h, xt) < 0)
+    if (clicon_nacm_ext_set(h, xt) < 0)
 	goto done;
     retval = 0;
  done:
diff --git a/apps/backend/clixon_backend_handle.c b/apps/backend/clixon_backend_handle.c
index 8ed13d97..f4707de4 100644
--- a/apps/backend/clixon_backend_handle.c
+++ b/apps/backend/clixon_backend_handle.c
@@ -91,7 +91,6 @@ struct backend_handle {
     /* ------ end of common handle ------ */
     struct client_entry     *bh_ce_list;   /* The client list */
     int                      bh_ce_nr;     /* Number of clients, just increment */
-    cxobj                   *bh_nacm;      /* NACM external struct */
 };
 
 /*! Creates and returns a clicon config handle for other CLICON API calls
@@ -109,7 +108,6 @@ backend_handle_init(void)
 int
 backend_handle_exit(clicon_handle h)
 {
-    struct backend_handle *bh = handle(h);
     struct client_entry   *ce;
 
     /* only delete client structs, not close sockets, etc, see backend_client_rm WHY NOT? */
@@ -120,8 +118,6 @@ backend_handle_exit(clicon_handle h)
 	}
 	backend_client_delete(h, ce);
     }
-    if (bh->bh_nacm)
-	xml_free(bh->bh_nacm);
     clicon_handle_exit(h); /* frees h and options (and streams) */
     return 0;
 }
@@ -188,22 +184,3 @@ backend_client_delete(clicon_handle        h,
     return 0;
 }
 
-int
-backend_nacm_list_set(clicon_handle h,
-		      cxobj        *xnacm)
-{
-    struct backend_handle *bh = handle(h);
-
-    if (bh->bh_nacm)
-	xml_free(bh->bh_nacm);
-    bh->bh_nacm = xnacm;
-    return 0;
-}
-
-cxobj *
-backend_nacm_list_get(clicon_handle h)
-{
-    struct backend_handle *bh = handle(h);
-    
-    return bh->bh_nacm;
-}
diff --git a/lib/clixon/clixon.h.in b/lib/clixon/clixon.h.in
index c454835f..2fc6c50d 100644
--- a/lib/clixon/clixon.h.in
+++ b/lib/clixon/clixon.h.in
@@ -87,6 +87,7 @@
 #include <clixon/clixon_xpath.h>
 #include <clixon/clixon_json.h>
 #include <clixon/clixon_netconf_lib.h>
+#include <clixon/clixon_nacm.h>
 
 /*
  * Global variables generated by Makefile
diff --git a/lib/clixon/clixon_nacm.h b/lib/clixon/clixon_nacm.h
new file mode 100644
index 00000000..34e9a939
--- /dev/null
+++ b/lib/clixon/clixon_nacm.h
@@ -0,0 +1,44 @@
+/*
+ *
+  ***** BEGIN LICENSE BLOCK *****
+ 
+  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+
+  This file is part of CLIXON.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  Alternatively, the contents of this file may be used under the terms of
+  the GNU General Public License Version 3 or later (the "GPL"),
+  in which case the provisions of the GPL are applicable instead
+  of those above. If you wish to allow use of your version of this file only
+  under the terms of the GPL, and not to allow others to
+  use your version of this file under the terms of Apache License version 2, 
+  indicate your decision by deleting the provisions above and replace them with
+  the  notice and other provisions required by the GPL. If you do not delete
+  the provisions above, a recipient may use your version of this file under
+  the terms of any one of the Apache License version 2 or the GPL.
+
+  ***** END LICENSE BLOCK *****
+
+ * XML sort and earch functions when used with YANG
+ */
+#ifndef _CLIXON_NACM_H
+#define _CLIXON_NACM_H
+
+/*
+ * Prototypes
+ */
+int nacm_access(clicon_handle h, char *mode, char *name, char *username, cbuf *cbret);
+
+#endif /* _CLIXON_NACM_H */
diff --git a/lib/clixon/clixon_options.h b/lib/clixon/clixon_options.h
index 1f4069fc..b5cb55c3 100644
--- a/lib/clixon/clixon_options.h
+++ b/lib/clixon/clixon_options.h
@@ -171,6 +171,9 @@ int clicon_quiet_mode_set(clicon_handle h, int val);
 yang_spec * clicon_dbspec_yang(clicon_handle h);
 int clicon_dbspec_yang_set(clicon_handle h, struct yang_spec *ys);
 
+cxobj * clicon_nacm_ext(clicon_handle h);
+int clicon_nacm_ext_set(clicon_handle h, cxobj *xn);
+
 #if 1 /* Temporary function until "Top-level Yang symbol cannot be called "config"" is fixed */
 yang_spec * clicon_config_yang(clicon_handle h);
 int clicon_config_yang_set(clicon_handle h, struct yang_spec *ys);
diff --git a/lib/src/Makefile.in b/lib/src/Makefile.in
index eefa969f..ce0c0587 100644
--- a/lib/src/Makefile.in
+++ b/lib/src/Makefile.in
@@ -74,7 +74,7 @@ SRC     = clixon_sig.c clixon_log.c clixon_err.c clixon_event.c \
 	  clixon_hash.c clixon_options.c clixon_plugin.c \
 	  clixon_proto.c clixon_proto_client.c \
 	  clixon_xpath.c clixon_xpath_ctx.c clixon_sha1.c \
-	  clixon_xml_db.c clixon_netconf_lib.c clixon_stream.c
+	  clixon_xml_db.c clixon_netconf_lib.c clixon_stream.c clixon_nacm.c
 
 YACCOBJS := lex.clixon_xml_parse.o clixon_xml_parse.tab.o \
 	    lex.clixon_yang_parse.o  clixon_yang_parse.tab.o \
diff --git a/lib/src/clixon_nacm.c b/lib/src/clixon_nacm.c
new file mode 100644
index 00000000..1ab18411
--- /dev/null
+++ b/lib/src/clixon_nacm.c
@@ -0,0 +1,334 @@
+/*
+ *
+  ***** BEGIN LICENSE BLOCK *****
+ 
+  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+
+  This file is part of CLIXON.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  Alternatively, the contents of this file may be used under the terms of
+  the GNU General Public License Version 3 or later (the "GPL"),
+  in which case the provisions of the GPL are applicable instead
+  of those above. If you wish to allow use of your version of this file only
+  under the terms of the GPL, and not to allow others to
+  use your version of this file under the terms of Apache License version 2, 
+  indicate your decision by deleting the provisions above and replace them with
+  the  notice and other provisions required by the GPL. If you do not delete
+  the provisions above, a recipient may use your version of this file under
+  the terms of any one of the Apache License version 2 or the GPL.
+
+  ***** END LICENSE BLOCK *****
+
+ * NACM code according to RFC8341 Network Configuration Access Control Model
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "clixon_config.h" /* generated by config & autoconf */
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#include <limits.h>
+#include <fnmatch.h>
+#include <stdint.h>
+#include <assert.h>
+#include <syslog.h>
+
+/* cligen */
+#include <cligen/cligen.h>
+
+/* clixon */
+#include "clixon_queue.h"
+#include "clixon_hash.h"
+#include "clixon_err.h"
+#include "clixon_log.h"
+#include "clixon_string.h"
+#include "clixon_handle.h"
+#include "clixon_yang.h"
+#include "clixon_xml.h"
+#include "clixon_options.h"
+#include "clixon_netconf_lib.h"
+#include "clixon_xpath_ctx.h"
+#include "clixon_xpath.h"
+#include "clixon_xml_db.h"
+#include "clixon_nacm.h"
+
+/*! Match nacm access operations according to RFC8341 3.4.4.  
+ * Incoming RPC Message Validation Step 7 (c)
+ *  The rule's "access-operations" leaf has the "exec" bit set or
+ *  has the special value "*".
+ * @retval 0  No match
+ * @retval 1  Match
+ * @note access_operations is bit-fields
+ */
+static int
+nacm_match_access(char *access_operations,
+		  char *mode)
+{
+    if (access_operations==NULL)
+	return 0;
+    if (strcmp(access_operations,"*")==0)
+	return 1;
+    if (strstr(access_operations, mode)!=NULL)
+	return 1;
+    return 0;
+}
+
+/*! Match nacm single rule. Either match with access or deny. Or not match.
+ * @param[in]  h      Clicon handle
+ * @param[in]  name  rpc name
+ * @param[in]  xrule  NACM rule XML tree
+ * @param[out] cbret  Cligen buffer result. Set to an error msg if retval=0.
+ * @retval -1  Error
+ * @retval  0  Matching rule AND Not access and cbret set
+ * @retval  1  Matchung rule AND Access
+ * @retval  2  No matching rule Goto step 10
+ * From RFC8341 3.4.4.  Incoming RPC Message Validation
+   +---------+-----------------+---------------------+-----------------+
+   | Method  | Resource class  | NETCONF operation   | Access          |
+   |         |                 |                     | operation       |
+   +---------+-----------------+---------------------+-----------------+
+   | OPTIONS | all             | none                | none            |
+   | HEAD    | all             | <get>, <get-config> | read            |
+   | GET     | all             | <get>, <get-config> | read            |
+   | POST    | datastore, data | <edit-config>       | create          |
+   | POST    | operation       | specified operation | execute         |
+   | PUT     | data            | <edit-config>       | create, update  |
+   | PUT     | datastore       | <copy-config>       | update          |
+   | PATCH   | data, datastore | <edit-config>       | update          |
+   | DELETE  | data            | <edit-config>       | delete          |
+
+ 7.(cont) A rule matches if all of the following criteria are met: 
+        *  The rule's "module-name" leaf is "*" or equals the name of
+           the YANG module where the protocol operation is defined.
+
+        *  Either (1) the rule does not have a "rule-type" defined or
+           (2) the "rule-type" is "protocol-operation" and the
+           "rpc-name" is "*" or equals the name of the requested
+           protocol operation.
+
+        *  The rule's "access-operations" leaf has the "exec" bit set or
+           has the special value "*".
+ */
+static int
+nacm_match_rule(clicon_handle h,
+		char         *name,
+		cxobj        *xrule,
+		cbuf         *cbret)
+{
+    int    retval = -1;
+    //    cxobj *x;
+    char  *module_name;
+    char  *rpc_name;
+    char  *access_operations;
+    char  *action;
+    
+    module_name = xml_find_body(xrule, "module-name");
+    rpc_name = xml_find_body(xrule, "rpc-name");
+    /* XXX access_operations can be a set of bits */
+    access_operations = xml_find_body(xrule, "access-operations");
+    action = xml_find_body(xrule, "action");
+    clicon_debug(1, "%s: %s %s %s %s", __FUNCTION__,
+	       module_name, rpc_name, access_operations, action);
+    if (module_name && strcmp(module_name,"*")==0){
+	if (nacm_match_access(access_operations, "exec")){
+	    if (rpc_name==NULL ||
+		strcmp(rpc_name, "*")==0 || strcmp(rpc_name, name)==0){
+		/* Here is a matching rule */
+		if (action && strcmp(action, "permit")==0){
+		    retval = 1;
+		    goto done;
+		}
+		else{
+		    if (netconf_access_denied(cbret, "protocol", "access denied") < 0)
+			goto done;
+		    retval = 0;
+		    goto done;
+		}
+	    }
+	}
+    }
+    retval = 2; /* no matching rule */
+ done:
+    return retval;
+
+}
+
+/*! Make nacm access control 
+ * @param[in]  h     Clicon handle
+ * @param[in]  mode  NACMmode, internal or external
+ * @param[in]  name  rpc name
+ * @param[in]  username
+ * @param[out] cbret Cligen buffer result. Set to an error msg if retval=0.
+ * @retval -1  Error
+ * @retval  0  Not access and cbret set
+ * @retval  1  Access
+ * @see RFC8341 3.4.4.  Incoming RPC Message Validation
+ */
+int
+nacm_access(clicon_handle h,
+	    char         *mode,
+	    char         *name,
+	    char         *username,
+	    cbuf         *cbret)
+{
+    int     retval = -1;
+    cxobj  *xtop = NULL;
+    cxobj  *xacm;
+    cxobj  *x;
+    cxobj  *xrlist;
+    cxobj  *xrule;
+    char   *enabled = NULL;
+    cxobj **gvec = NULL; /* groups */
+    size_t  glen;
+    cxobj **rlistvec = NULL; /* rule-list */
+    size_t  rlistlen;
+    cxobj **rvec = NULL; /* rules */
+    size_t  rlen;
+    int     i, j;
+    char   *exec_default = NULL;
+    int     ret;
+
+    clicon_debug(1, "%s", __FUNCTION__);
+    /* 0. If nacm-mode is external, get NACM defintion from separet tree,
+       otherwise get it from internal configuration */
+    if (strcmp(mode, "external")==0){
+	if ((xtop = clicon_nacm_ext(h)) == NULL){
+	    clicon_err(OE_XML, 0, "No nacm external tree");
+	    goto done;
+	}
+    }
+    else if (strcmp(mode, "internal")==0){
+	if (xmldb_get(h, "running", "nacm", 0, &xtop) < 0)
+	    goto done;	
+    }
+    else{
+	clicon_err(OE_UNIX, 0, "Invalid NACM mode: %s", mode);
+	goto done;
+    }
+    
+    /* 1.   If the "enable-nacm" leaf is set to "false", then the protocol
+       operation is permitted. (or config does not exist) */
+    if ((xacm = xpath_first(xtop, "nacm")) == NULL)
+	goto permit;
+    exec_default = xml_find_body(xacm, "exec-default");
+    if ((x = xpath_first(xacm, "enable-nacm")) == NULL)
+	goto permit;
+    enabled = xml_body(x);
+    if (strcmp(enabled, "true") != 0)
+	goto permit;
+
+    /* 2.   If the requesting session is identified as a recovery session,
+       then the protocol operation is permitted. NYI */
+    
+    /* 3.   If the requested operation is the NETCONF <close-session>
+       protocol operation, then the protocol operation is permitted.
+    */
+    if (strcmp(name, "close-session") == 0)
+	goto permit;
+    /* 4.   Check all the "group" entries to see if any of them contain a
+       "user-name" entry that equals the username for the session
+       making the request.  (If the "enable-external-groups" leaf is
+       "true", add to these groups the set of groups provided by the
+       transport layer.)	       */
+    if (username == NULL)
+	goto step10;
+    /* User's group */
+    if (xpath_vec(xacm, "groups/group[user-name='%s']", &gvec, &glen, username) < 0)
+	goto done;
+    /* 5. If no groups are found, continue with step 10. */
+    if (glen == 0)
+	goto step10;
+    /* 6. Process all rule-list entries, in the order they appear in the
+        configuration.  If a rule-list's "group" leaf-list does not
+        match any of the user's groups, proceed to the next rule-list
+        entry. */
+    if (xpath_vec(xacm, "rule-list", &rlistvec, &rlistlen) < 0)
+	goto done;
+    for (i=0; i<rlistlen; i++){
+	xrlist = rlistvec[i];
+	/* Loop through user's group to find match in this rule-list */
+	for (j=0; j<glen; j++){
+	    char *gname;
+	    gname = xml_find_body(gvec[j], "name");
+	    if (xpath_first(xrlist, ".[group='%s']", gname)!=NULL)
+		break; /* found */
+	}
+	if (j==glen) /* not found */
+	    continue;
+	/* 7. For each rule-list entry found, process all rules, in order,
+	   until a rule that matches the requested access operation is
+	   found. 
+	*/
+	if (xpath_vec(xrlist, "rule", &rvec, &rlen) < 0)
+	    goto done;
+	for (j=0; j<rlen; j++){
+	    xrule = rvec[j];
+	    /* -1 error, 0 deny, 1 permit, 2 continue */
+	    if ((ret = nacm_match_rule(h, name, xrule, cbret)) < 0)
+		goto done;
+	    switch(ret){
+	    case 0: /* deny */
+		goto deny;
+		break;
+	    case 1: /* permit */
+		goto permit;
+		break;
+	    case 2: /* no match, continue */
+		break;
+	    }
+	}
+    }
+ step10:
+    /*   10.  If the requested protocol operation is defined in a YANG module
+        advertised in the server capabilities and the "rpc" statement
+        contains a "nacm:default-deny-all" statement, then the protocol
+        operation is denied. */
+    /* 11.  If the requested protocol operation is the NETCONF
+        <kill-session> or <delete-config>, then the protocol operation
+        is denied. */
+    if (strcmp(name, "kill-session")==0 || strcmp(name, "delete-config")==0){
+	if (netconf_access_denied(cbret, "protocol", "default deny") < 0)
+	    goto done;
+	goto deny;
+    }
+    /*   12.  If the "exec-default" leaf is set to "permit", then permit the
+	 protocol operation; otherwise, deny the request. */
+    if (exec_default ==NULL || strcmp(exec_default, "permit")==0)
+	goto permit;
+    if (netconf_access_denied(cbret, "protocol", "default deny") < 0)
+	goto done;
+    goto deny;
+ permit:
+    retval = 1;
+ done:
+    clicon_debug(1, "%s retval:%d (0:deny 1:permit)", __FUNCTION__, retval);
+    if (strcmp(mode, "internal")==0 && xtop)
+	xml_free(xtop);
+    if (gvec)
+	free(gvec);
+    if (rlistvec)
+	free(rlistvec);
+    if (rvec)
+	free(rvec);
+    return retval;
+ deny: /* Here, cbret must contain a netconf error msg */
+    assert(cbuf_len(cbret));
+    retval = 0;
+    goto done;
+}
diff --git a/lib/src/clixon_options.c b/lib/src/clixon_options.c
index 9c737b18..74e5a645 100644
--- a/lib/src/clixon_options.c
+++ b/lib/src/clixon_options.c
@@ -33,8 +33,6 @@
 
  *
  * CLICON options
- * See clicon_tutorial appendix and clicon.conf.cpp.cpp on documentation of
- * options
  */
 #ifdef HAVE_CONFIG_H
 #include "clixon_config.h" /* generated by config & autoconf */
@@ -607,6 +605,48 @@ clicon_dbspec_yang_set(clicon_handle     h,
     return 0;
 }
 
+/*! Get NACM (rfc 8341) XML parse tree if external not in std xml config
+ * @param[in]  h    Clicon handle
+ * @retval     xn   XML NACM tree, or NULL
+ * @note only used if config option CLICON_NACM_MODE is external
+ * @see clicon_nacm_ext_set
+ */
+cxobj *
+clicon_nacm_ext(clicon_handle h)
+{
+    clicon_hash_t *cdat = clicon_data(h);
+    size_t         len;
+    void          *p;
+
+    if ((p = hash_value(cdat, "nacm_xml", &len)) != NULL)
+	return *(cxobj **)p;
+    return NULL;
+}
+
+/*! Set NACM (rfc 8341) external XML parse tree, free old if any
+ * @param[in]  h   Clicon handle
+ * @param[in]  xn  XML Nacm tree
+ * @note only used if config option CLICON_NACM_MODE is external
+ * @see clicon_nacm_ext
+ */
+int
+clicon_nacm_ext_set(clicon_handle h,
+		     cxobj        *xn)
+{
+    clicon_hash_t *cdat = clicon_data(h);
+    cxobj         *xo;
+
+    if ((xo = clicon_nacm_ext(h)) != NULL)
+	xml_free(xo);
+    /* It is the pointer to xn that should be copied by hash,
+       so we send a ptr to the ptr to indicate what to copy.
+     */
+    if (hash_add(cdat, "nacm_xml", &xn, sizeof(xn)) == NULL)
+	return -1;
+    return 0;
+}
+
+
 #if 1 /* Temporary function until "Top-level Yang symbol cannot be called "config"" is fixed */
 /*! Get YANG specification for clixon config
  * Must use hash functions directly since they are not strings.

From f071e0b332b67c956b1276071502604668bcc305 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sat, 8 Dec 2018 18:13:27 +0100
Subject: [PATCH 13/72] prioritized roadmap

---
 ROADMAP.md | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index e0dd98f3..12ae406f 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -1,26 +1,43 @@
 # Clixon roadmap
 
-Not in prio order (yet)
+In prio order
 
-- XML
-  - [Namespace handling](https://github.com/clicon/clixon/issues/49)
+High prio
+- NACM (RFC 8341) 
+  - Module rules
+  - Data node rules (read/create/delete/update/execute)
+- Special handling of the initial startup transaction to avoid exit at startup
+  - Possibly - draft-wu-netconf-restconf-factory-restore-03
+- Handle revisions to data model.
+  - Possibly draft-wang-netmod-module-revision-management-01
+
+Medium prio:
+- Input validation on custom RPCs/ 
+  - [Sanity checks](https://github.com/clicon/clixon/issues/47)
+- Support for XML regex's.
+  - Currently Posix extended regular expressions
+- Support a plugin callback that is invoked when copy-config is called.
+- Preserve CLI command history across sessions. The up/down arrows
+
+Low prio:
+- Provide a client library to access netconf APIs provided by system services.
+- Support for restconf call-home (RFC 8071)
+- Support for restconf PATCH method
+
+Not prioritized:
+- XML [Namespace handling](https://github.com/clicon/clixon/issues/49)
 - NETCONF
   - Support for additional Netconf [edit-config modes](https://github.com/clicon/clixon/issues/53)
   - Netconf [framing](https://github.com/clicon/clixon/issues/50)
-  - [Sanity checks](https://github.com/clicon/clixon/issues/47)
   - [Child ordering](https://github.com/clicon/clixon/issues/22)
 - Netconf backend (Clixon acts as netconf controller)
 - Restconf
   - Query parameters
-- NACM (RFC 8341) is somewhat limited
-  - Extend with data node access (read/create/delete/update/execute)
 - Streams (netconf and restconf)
   - Extend native stream mode with external persistent timeseries database, eg influxdb.
 - Jenkins CI/CD and webhooks
 - YANG
-  - [Cardinality](https://github.com/clicon/clixon/issues/48)
   - RFC 6022 [NETCONF monitoring](https://github.com/clicon/clixon/issues/39)
-  - Factory default Setting - draft-wu-netconf-restconf-factory-restore-03
   - Deviation, belongs-to, min/max-elements, action, unique
 - Containers
   - [Docker improvements](https://github.com/clicon/clixon/issues/44)

From ae1af8da9ef6bc948aea4c7fb313d70365c785c6 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sun, 16 Dec 2018 19:46:26 +0100
Subject: [PATCH 14/72]  * NACM extension (RFC8341)    * NACM module support
 (RFC8341 A1+A2)    * Recovery user "_nacm_recovery" added.      * Example use
 is restconf PUT when NACM edit-config is permitted, then automatic commit and
 discard are permitted using recovery user.    * Example user changed adm1 to
 andy to comply with RFC8341 example

 * Yang code upgrade (RFC7950)
   * RPC method input parameters validated
     * see https://github.com/clicon/clixon/issues/4
* Correct XML namespace handling
   * XML multiple modules was based on "loose" semantics so that yang modules were found by iterating thorugh namespaces until a match was made. This did not adhere to proper [XML namespace handling](https://www.w3.org/TR/2009/REC-xml-names-20091208), and causes problems with overlapping names and false positives. Below see XML accepted (but wrong), and correct namespace declaration:
```
      <rpc><my-own-method></rpc> # Wrong but accepted
      <rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"> # Correct
        <my-own-method xmlns="http://example.net/me/my-own/1.0">
      </rpc>
```
   * To keep old loose semantics set config option CLICON_XML_NS_ITERATE (true by default)
   * XML to JSON translator support for mapping xmlns attribute to module name prefix.
   * Default namespace is still "urn:ietf:params:xml:ns:netconf:base:1.0"
   * See https://github.com/clicon/clixon/issues/49
* Changed all make tags --> make TAGS
* Keyvalue datastore removed (it has been disabled since 3.3.3)
* debug rpc added in example application (should be in clixon-config).
---
 .gitignore                           |    3 +
 CHANGELOG.md                         |   26 +-
 README.md                            |   31 +-
 apps/Makefile.in                     |    2 +-
 apps/backend/backend_client.c        |   80 +-
 apps/netconf/netconf_main.c          |   69 +-
 apps/netconf/netconf_rpc.c           |   26 +-
 apps/restconf/restconf_methods.c     |  101 ++-
 datastore/Makefile.in                |    3 +-
 datastore/README.md                  |    5 +-
 datastore/datastore_client.c         |    9 +-
 datastore/keyvalue/Makefile.in       |   98 ---
 datastore/keyvalue/clixon_chunk.c    |  794 ------------------
 datastore/keyvalue/clixon_chunk.h    |  177 ----
 datastore/keyvalue/clixon_keyvalue.c | 1130 --------------------------
 datastore/keyvalue/clixon_keyvalue.h |   54 --
 datastore/keyvalue/clixon_qdb.c      |  588 --------------
 datastore/keyvalue/clixon_qdb.h      |   73 --
 datastore/text/clixon_xmldb_text.c   |   32 +-
 example/README.md                    |    3 +-
 example/example.yang                 |   10 +
 example/example_cli.c                |    2 +-
 example/example_restconf.c           |   10 +-
 extras/rpm/clixon.spec               |    2 +-
 lib/Makefile.in                      |    2 +-
 lib/clixon/clixon_nacm.h             |   12 +-
 lib/clixon/clixon_xml.h              |   16 +-
 lib/clixon/clixon_xml_map.h          |    2 +
 lib/clixon/clixon_yang.h             |    5 +-
 lib/src/clixon_json.c                |   77 +-
 lib/src/clixon_nacm.c                |  119 ++-
 lib/src/clixon_netconf_lib.c         |   13 +-
 lib/src/clixon_options.c             |    7 +
 lib/src/clixon_proto_client.c        |    3 +-
 lib/src/clixon_xml.c                 |  149 +++-
 lib/src/clixon_xml_db.c              |    2 +-
 lib/src/clixon_xml_map.c             |  198 ++++-
 lib/src/clixon_xml_sort.c            |   41 +-
 lib/src/clixon_yang.c                |  114 ++-
 test/lib.sh                          |   35 +-
 test/nacm.sh                         |   47 ++
 test/test_cli.sh                     |   29 +-
 test/test_datastore.sh               |   26 +-
 test/test_feature.sh                 |   35 +-
 test/test_identity.sh                |   30 +-
 test/test_leafref.sh                 |   27 +-
 test/test_list.sh                    |   28 +-
 test/test_nacm.sh                    |   88 +-
 test/test_nacm_ext.sh                |   95 +--
 test/test_nacm_protocol.sh           |  231 ++++++
 test/test_netconf.sh                 |   37 +-
 test/test_order.sh                   |   27 +-
 test/test_perf.sh                    |   38 +-
 test/test_restconf.sh                |   32 +-
 test/test_restconf2.sh               |   27 +-
 test/test_stream.sh                  |   27 +-
 test/test_type.sh                    |   27 +-
 test/test_union.sh                   |  119 +++
 test/test_when_must.sh               |   27 +-
 test/test_yang.sh                    |   29 +-
 test/test_yang_load.sh               |   33 +-
 test/test_yang_namespace.sh          |  141 ++++
 yang/clixon-config@2018-10-21.yang   |   21 +-
 63 files changed, 1852 insertions(+), 3492 deletions(-)
 delete mode 100644 datastore/keyvalue/Makefile.in
 delete mode 100644 datastore/keyvalue/clixon_chunk.c
 delete mode 100644 datastore/keyvalue/clixon_chunk.h
 delete mode 100644 datastore/keyvalue/clixon_keyvalue.c
 delete mode 100644 datastore/keyvalue/clixon_keyvalue.h
 delete mode 100644 datastore/keyvalue/clixon_qdb.c
 delete mode 100644 datastore/keyvalue/clixon_qdb.h
 create mode 100755 test/nacm.sh
 create mode 100755 test/test_nacm_protocol.sh
 create mode 100755 test/test_union.sh
 create mode 100755 test/test_yang_namespace.sh

diff --git a/.gitignore b/.gitignore
index e9ed0e3e..cd4446bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,6 @@ lib/clixon/clixon.h
 build-root/*.tar.xz
 build-root/*.rpm
 build-root/rpmbuild
+
+test/public
+doc/html
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e3837ec..160f6254 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,21 +8,40 @@
 ### Major New features
 	
 * NACM extension (RFC8341)
-  * Move NACM files from backend to lib src dir
+  * NACM module support (RFC8341 A1+A2)
+  * Recovery user "_nacm_recovery" added.
+    * Example use is restconf PUT when NACM edit-config is permitted, then automatic commit and discard are permitted using recovery user.
+  * Example user changed adm1 to andy to comply with RFC8341 example
 * Yang code upgrade (RFC7950)
   * YANG parser cardinality checked (https://github.com/clicon/clixon/issues/48)
     * See https://github.com/clicon/clixon/issues/84
+  * RPC method input parameters validated
+    * see https://github.com/clicon/clixon/issues/47
   * Support of submodule, include and belongs-to.
   * Openconfig yang specs parsed: https://github.com/openconfig/public
-  * Improved unknown handling
+  * Improved "unknown" handling
   * Yang load file configure options changed
     * `CLICON_YANG_DIR` is changed from a single directory to a path of directories
       * Note CLIXON_DATADIR (=/usr/local/share/clixon) need to be in the list
     * CLICON_YANG_MAIN_FILE Provides a filename with a single module filename.
     * CLICON_YANG_MAIN_DIR Provides a directory where all yang modules should be loaded.
+* Correct XML namespace handling
+  * XML multiple modules was based on "loose" semantics so that yang modules were found by iterating thorugh namespaces until a match was made. This did not adhere to proper [XML namespace handling](https://www.w3.org/TR/2009/REC-xml-names-20091208), and causes problems with overlapping names and false positives. Below see XML accepted (but wrong), and correct namespace declaration:
+```
+     <rpc><my-own-method></rpc> # Wrong but accepted
+     <rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"> # Correct
+       <my-own-method xmlns="http://example.net/me/my-own/1.0">
+     </rpc>
+```
+  * To keep old loose semantics set config option CLICON_XML_NS_ITERATE (true by default)
+  * XML to JSON translator support for mapping xmlns attribute to module name prefix.
+  * Default namespace is still "urn:ietf:params:xml:ns:netconf:base:1.0"
+  * See https://github.com/clicon/clixon/issues/49
 
 ### API changes on existing features (you may need to change your code)
 * Yang parser is stricter (see above) which may break parsing of existing yang specs.
+* XML namespace handling is corrected (see above)
+  * For backward compatibility set config option  CLICON_XML_NS_ITERATE
 * Yang parser functions have changed signatures. Please check the source if you call these functions.
 * Add `<CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>` to your configuration file, or corresponding CLICON_DATADIR directory for Clixon system yang files.
 * Change all @datamodel:tree to @datamodel in all CLI specification files
@@ -30,6 +49,8 @@
   * For backward compatibility, define CLICON_CLI_MODEL_TREENAME_PATCH in clixon_custom.h
 
 ### Minor changes
+* Changed all make tags --> make TAGS
+* Keyvalue datastore removed (it has been disabled since 3.3.3)
 * Removed return value ymodp from yang parse functions (eg yang_parse()).
 * New config option: CLICON_CLI_MODEL_TREENAME defining name of generated syntax tree if CLIXON_CLI_GENMODEL is set.
 * XML parser conformance to W3 spec
@@ -42,6 +63,7 @@
 * getopt return value changed from char to int (https://github.com/clicon/clixon/issues/58)
 
 ### Known issues
+* debug rpc added in example application (should be in clixon-config).
 
 ## 3.8.0 (6 Nov 2018)
 
diff --git a/README.md b/README.md
index 0389fa17..bc0e7f50 100644
--- a/README.md
+++ b/README.md
@@ -31,9 +31,9 @@ Background
 ==========
 
 Clixon was implemented to provide an open-source generic configuration
-tool. The existing [CLIgen](http://www.cligen.se) tool was for command-lines only, while clixon is a system with configuration database, xml and rest interfaces. Most of the projects using clixon are for embedded network and measuring devices. But Clixon is more generic than that.
+tool. The existing [CLIgen](http://www.cligen.se) tool was for command-lines only, while Clixon is a system with configuration database, xml and rest interfaces all defined by Yang. Most of the projects using Clixon are for embedded network and measuring devices. But Clixon can be used for other systems as well due to its modular and pluggable architecture.
 
-Users of clixon currently include:
+Users of Clixon currently include:
   * [Netgate](https://www.netgate.com)
   * [CloudMon360](http://cloudmon360.com)
   * [Grideye](http://hagsand.se/grideye)	
@@ -98,16 +98,16 @@ XML
 Clixon has its own implementation of XML and XPATH implementation.
 
 The standards covered include:
-- [XML](https://www.w3.org/TR/2008/REC-xml-20081126)
-- [Namespaces](https://www.w3.org/TR/2009/REC-xml-names-20091208)
-- [XPATH](https://www.w3.org/TR/xpath-10)
+- [XML 1.0](https://www.w3.org/TR/2008/REC-xml-20081126)
+- [Namespaces in XML 1.0](https://www.w3.org/TR/2009/REC-xml-names-20091208)
+- [XPATH 1.0](https://www.w3.org/TR/xpath-10)
 
 Not supported:
-- <!DOCTYPE
+- !DOCTYPE (ie DTD)
 
 Yang
 ====
-YANG and XML is at the heart of Clixon.  Yang modules are used as a
+YANG and XML is the heart of Clixon.  Yang modules are used as a
 specification for handling XML configuration data. The YANG spec is
 used to generate an interactive CLI, netconf and restconf clients. It
 also manages an XML datastore.
@@ -126,7 +126,7 @@ However, the following YANG syntax modules are not implemented:
 
 Restrictions on Yang types are as follows:
 - The range statement does not support multiple values (RFC7895 sec 9.2.4)
-- Submodules cannot re-use a prefix in an import statement that is already used for another imported module in the module that the submodule belongs to.
+- Submodules cannot re-use a prefix in an import statement that is already used for another imported module in the module that the submodule belongs to. (see https://github.com/clicon/clixon/issues/60)
 
 Netconf
 =======
@@ -136,7 +136,14 @@ Clixon implements the following NETCONF proposals or standards:
 - [RFC 5277: NETCONF Event Notifications](http://www.rfc-base.org/txt/rfc-5277.txt)
 - [RFC 8341: Network Configuration Access Control Model](http://www.rfc-base.org/txt/rfc-8341.txt)
 
-Clixon does not yet support the following netconf features:
+The following RFC6241 capabilities/features are hardcoded in Clixon:
+- :candidate (RFC6241 8.3)
+- :validate (RFC6241 8.6)
+- :startup (RFC6241 8.7)
+- :xpath (RFC6241 8.9)
+- :notification: (RFC5277)
+
+Clixon does not support the following netconf features:
 
 - :url capability
 - copy-config source config
@@ -166,7 +173,7 @@ Datastore
 =========
 The Clixon datastore is a stand-alone XML based datastore. The idea is
 to be able to use different datastores backends with the same
-API.
+API. Currently only an XML plain text datastore is supported.
 
 The datastore is primarily designed to be used by Clixon but can be used
 separately.
@@ -183,7 +190,7 @@ subsystem can be used.
 Restconf however needs credentials.  This is done by writing a credentials callback in a restconf plugin. See:
   * [FAQ](doc/FAQ.md#how-do-i-write-an-authentication-callback).
   * [Example](example/README.md) has an example how to do this with HTTP basic auth.
-  * I have done this for another project using Oauth2 or (https://github.com/CESNET/Netopeer2/tree/master/server/configuration)
+  * It has been done for other projects using Oauth2 or (https://github.com/CESNET/Netopeer2/tree/master/server/configuration)
 
 The clients send the ID of the user using a "username" attribute with
 the RPC calls to the backend. Note that the backend trusts the clients
@@ -211,7 +218,7 @@ The functionality is as follows:
 * Groups are supported
 * Rule-lists are supported
 * Rules are supported as follows
-  * module-name: Only '*' supported
+  * module-name: fully supported
   * access-operations: only '*' and 'exec' supported
   * rpc-name: fully supported (eg edit-config/get-config, etc)
   * action: fully supported (permit/deny)
diff --git a/apps/Makefile.in b/apps/Makefile.in
index 2f096de0..bfcc31cf 100644
--- a/apps/Makefile.in
+++ b/apps/Makefile.in
@@ -80,5 +80,5 @@ distclean: clean
 	for i in $(SUBDIRS); \
 	do (cd $$i; $(MAKE) $(MFLAGS) $@); done
 
-tags:
+TAGS:
 	find $(srcdir) -name '*.[chyl]' -print | etags -
diff --git a/apps/backend/backend_client.c b/apps/backend/backend_client.c
index 7ff71e72..3b79eab2 100644
--- a/apps/backend/backend_client.c
+++ b/apps/backend/backend_client.c
@@ -467,12 +467,18 @@ from_client_edit_config(clicon_handle h,
 	    goto ok;
 	}
     }
-    if ((xc  = xpath_first(xn, "config")) == NULL){
+    if ((xc = xpath_first(xn, "config")) == NULL){
 	if (netconf_missing_element(cbret, "protocol", "<bad-element>config</bad-element>", NULL) < 0)
 	    goto done;
 	goto ok;
     }
     else{
+	/* <config> yang spec may be set to anyxml by ingress yang check,...*/
+	if (xml_spec(xc) != NULL)
+	    xml_spec_set(xc, NULL);
+	/* Populate XML with Yang spec (why not do this in parser?) 
+	 * Maybe validate xml here as in text_modify_top?
+	 */
 	if (xml_apply(xc, CX_ELMNT, xml_spec_populate, yspec) < 0)
 	    goto done;
 	if (xml_apply(xc, CX_ELMNT, xml_non_config_data, &non_config) < 0)
@@ -952,13 +958,16 @@ from_client_msg(clicon_handle        h,
     cxobj               *xt = NULL;
     cxobj               *x;
     cxobj               *xe;
-    char                *name = NULL;
+    char                *rpc = NULL;
+    char                *module = NULL;
     char                *db;
     cbuf                *cbret = NULL; /* return message */
     int                  pid;
     int                  ret;
     char                *username;
-    char                *nacm_mode;
+    yang_spec           *yspec;
+    yang_stmt           *ye;
+    yang_stmt           *ymod;
 
     clicon_debug(1, "%s", __FUNCTION__);
     pid = ce->ce_pid;
@@ -974,62 +983,81 @@ from_client_msg(clicon_handle        h,
 	    goto done;
 	goto reply;
     }
+    /* Get yang spec */ 
+    yspec = clicon_dbspec_yang(h); /* XXX maybe move to clicon_msg_decode? */
     if ((x = xpath_first(xt, "/rpc")) == NULL){
 	if (netconf_malformed_message(cbret, "rpc keyword expected")< 0)
 	    goto done;
 	goto reply;
     }
+    /* Populate incoming XML tree with yang */
+    if (xml_spec_populate_rpc(h, x, yspec) < 0)
+	goto done;
+    if ((ret = xml_yang_validate_rpc(x)) < 0)
+	goto done;
+    if (ret == 0){
+	if (netconf_operation_failed(cbret, "application", "Validation failed")< 0)
+	    goto done;
+	goto reply;
+    }
     xe = NULL;
     username = xml_find_value(x, "username");
     while ((xe = xml_child_each(x, xe, CX_ELMNT)) != NULL) {
-	name = xml_name(xe);
-	clicon_debug(1, "%s name:%s", __FUNCTION__, name);
-	/* Make NACM access control if enabled as "internal"*/
-	nacm_mode = clicon_option_str(h, "CLICON_NACM_MODE");
-	if (nacm_mode && strcmp(nacm_mode, "disabled") != 0){
-	    if ((ret = nacm_access(h, nacm_mode, name, username, cbret)) < 0)
+	rpc = xml_name(xe);
+	if ((ye = xml_spec(xe)) == NULL){
+	    if (netconf_operation_not_supported(cbret, "protocol", rpc) < 0)
 		goto done;
-	    if (!ret)
-		goto reply;
+	    goto reply;
 	}
-	if (strcmp(name, "get-config") == 0){
+	if ((ymod = ys_module(ye)) == NULL){
+	    clicon_err(OE_XML, ENOENT, "rpc yang does not have module");
+	    goto done;
+	}
+	module = ymod->ys_argument;
+	clicon_debug(1, "%s module:%s rpc:%s", __FUNCTION__, module, rpc);
+	/* Make NACM access control if enabled as "internal"*/
+	if ((ret = nacm_access(h, rpc, module, username, cbret)) < 0)
+	    goto done;
+	if (ret == 0)
+	    goto reply;
+	if (strcmp(rpc, "get-config") == 0){
 	    if (from_client_get_config(h, xe, cbret) <0)
 		goto done;
 	}
-	else if (strcmp(name, "edit-config") == 0){
+	else if (strcmp(rpc, "edit-config") == 0){
 	    if (from_client_edit_config(h, xe, pid, cbret) <0)
 		goto done;
 	}
-	else if (strcmp(name, "copy-config") == 0){
+	else if (strcmp(rpc, "copy-config") == 0){
 	    if (from_client_copy_config(h, xe, pid, cbret) <0)
 		goto done;
 	}
-	else if (strcmp(name, "delete-config") == 0){
+	else if (strcmp(rpc, "delete-config") == 0){
 	    if (from_client_delete_config(h, xe, pid, cbret) <0)
 		goto done;
 	}
-	else if (strcmp(name, "lock") == 0){
+	else if (strcmp(rpc, "lock") == 0){
 	    if (from_client_lock(h, xe, pid, cbret) < 0)
 		goto done;
 	}
-	else if (strcmp(name, "unlock") == 0){
+	else if (strcmp(rpc, "unlock") == 0){
 	    if (from_client_unlock(h, xe, pid, cbret) < 0)
 		goto done;
 	}
-	else if (strcmp(name, "get") == 0){
+	else if (strcmp(rpc, "get") == 0){
 	    if (from_client_get(h, xe, cbret) < 0)
 		goto done;
 	}
-	else if (strcmp(name, "close-session") == 0){
+	else if (strcmp(rpc, "close-session") == 0){
 	    xmldb_unlock_all(h, pid);
 	    stream_ss_delete_all(h, ce_event_cb, (void*)ce);
 	    cprintf(cbret, "<rpc-reply><ok/></rpc-reply>");
 	}
-	else if (strcmp(name, "kill-session") == 0){
+	else if (strcmp(rpc, "kill-session") == 0){
 	    if (from_client_kill_session(h, xe, cbret) < 0)
 		goto done;
 	}
-	else if (strcmp(name, "validate") == 0){
+	else if (strcmp(rpc, "validate") == 0){
 	    if ((db = netconf_db_find(xe, "source")) == NULL){
 		if (netconf_missing_element(cbret, "protocol", "<bad-element>source</bad-element>", NULL) < 0)
 		    goto done;
@@ -1038,19 +1066,19 @@ from_client_msg(clicon_handle        h,
 	    if (from_client_validate(h, db, cbret) < 0)
 		goto done;
 	}
-	else if (strcmp(name, "commit") == 0){
+	else if (strcmp(rpc, "commit") == 0){
 	    if (from_client_commit(h, pid, cbret) < 0)
 		goto done;
 	}
-	else if (strcmp(name, "discard-changes") == 0){
+	else if (strcmp(rpc, "discard-changes") == 0){
 	    if (from_client_discard_changes(h, pid, cbret) < 0)
 		goto done;
 	}
-	else if (strcmp(name, "create-subscription") == 0){
+	else if (strcmp(rpc, "create-subscription") == 0){
 	    if (from_client_create_subscription(h, xe, ce, cbret) < 0)
 		goto done;
 	}
-	else if (strcmp(name, "debug") == 0){
+	else if (strcmp(rpc, "debug") == 0){
 	    if (from_client_debug(h, xe, cbret) < 0)
 		goto done;
 	}
@@ -1104,7 +1132,7 @@ from_client_msg(clicon_handle        h,
     /* Sanity: log if clicon_err() is not called ! */
     if (retval < 0 && clicon_errno < 0) 
 	clicon_log(LOG_NOTICE, "%s: Internal error: No clicon_err call on error (message: %s)",
-		   __FUNCTION__, name?name:"");
+		   __FUNCTION__, rpc?rpc:"");
     //    clicon_debug(1, "%s retval:%d", __FUNCTION__, retval);
     return retval;// -1 here terminates backend
 }
diff --git a/apps/netconf/netconf_main.c b/apps/netconf/netconf_main.c
index cc51d966..55ee628b 100644
--- a/apps/netconf/netconf_main.c
+++ b/apps/netconf/netconf_main.c
@@ -95,6 +95,10 @@ process_incoming_packet(clicon_handle h,
 
     clicon_debug(1, "RECV");
     clicon_debug(2, "%s: RCV: \"%s\"", __FUNCTION__, cbuf_get(cb));
+    if ((cbret = cbuf_new()) == NULL){
+	clicon_err(LOG_ERR, errno, "cbuf_new");
+	goto done;
+    }
     yspec = clicon_dbspec_yang(h);
     if ((str0 = strdup(cbuf_get(cb))) == NULL){
 	clicon_log(LOG_ERR, "%s: strdup: %s", __FUNCTION__, strerror(errno));
@@ -103,19 +107,25 @@ process_incoming_packet(clicon_handle h,
     str = str0;
     /* Parse incoming XML message */
     if (xml_parse_string(str, yspec, &xreq) < 0){ 
-	if ((cbret = cbuf_new()) == NULL){
-	    if (netconf_operation_failed(cbret, "rpc", "internal error")< 0)
-		goto done;
-	    netconf_output(1, cbret, "rpc-error");
-	}
-	else
-	    clicon_log(LOG_ERR, "%s: cbuf_new", __FUNCTION__);
 	free(str0);
+	if (netconf_operation_failed(cbret, "rpc", "internal error")< 0)
+	    goto done;
+	netconf_output(1, cbret, "rpc-error");
 	goto done;
     }
     free(str0);
-    if ((xrpc=xpath_first(xreq, "//rpc")) != NULL)
+    if ((xrpc=xpath_first(xreq, "//rpc")) != NULL){
+	int ret;
         isrpc++;
+	if ((ret = xml_yang_validate_rpc(xrpc)) < 0) 
+	    goto done;
+	if (ret == 0){
+	    if (netconf_operation_failed(cbret, "application", "Validation failed")< 0)
+		goto done;
+	    netconf_output(1, cbret, "rpc-error");
+	    goto done;
+	}
+    }
     else
         if (xpath_first(xreq, "//hello") != NULL)
 	    ;
@@ -134,30 +144,27 @@ process_incoming_packet(clicon_handle h,
 	else{ /* there is a return message in xret */
 	    cxobj *xa, *xa2;
 	    assert(xret);
-
-	    if ((cbret = cbuf_new()) != NULL){
-		if ((xc = xml_child_i(xret,0))!=NULL){
-		    xa=NULL;
-		    /* Copy message-id attribute from incoming to reply. 
-		     * RFC 6241:
-		     * If additional attributes are present in an <rpc> element, a NETCONF
-		     * peer MUST return them unmodified in the <rpc-reply> element.  This
-		     * includes any "xmlns" attributes.
-		     */
-		    while ((xa = xml_child_each(xrpc, xa, CX_ATTR)) != NULL){
-			if ((xa2 = xml_dup(xa)) ==NULL)
-			    goto done;
-			if (xml_addsub(xc, xa2) < 0)
-			    goto done;
-		    }
-		    add_preamble(cbret);
-
-		    clicon_xml2cbuf(cbret, xml_child_i(xret,0), 0, 0);
-		    add_postamble(cbret);
-		    if (netconf_output(1, cbret, "rpc-reply") < 0){
-			cbuf_free(cbret);
+	    if ((xc = xml_child_i(xret,0))!=NULL){
+		xa=NULL;
+		/* Copy message-id attribute from incoming to reply. 
+		 * RFC 6241:
+		 * If additional attributes are present in an <rpc> element, a NETCONF
+		 * peer MUST return them unmodified in the <rpc-reply> element.  This
+		 * includes any "xmlns" attributes.
+		 */
+		while ((xa = xml_child_each(xrpc, xa, CX_ATTR)) != NULL){
+		    if ((xa2 = xml_dup(xa)) ==NULL)
 			goto done;
-		    }
+		    if (xml_addsub(xc, xa2) < 0)
+			goto done;
+		}
+		add_preamble(cbret);
+		
+		clicon_xml2cbuf(cbret, xml_child_i(xret,0), 0, 0);
+		add_postamble(cbret);
+		if (netconf_output(1, cbret, "rpc-reply") < 0){
+		    cbuf_free(cbret);
+		    goto done;
 		}
 	    }
 	}
diff --git a/apps/netconf/netconf_rpc.c b/apps/netconf/netconf_rpc.c
index a8627b66..f53b8675 100644
--- a/apps/netconf/netconf_rpc.c
+++ b/apps/netconf/netconf_rpc.c
@@ -869,6 +869,7 @@ netconf_application_rpc(clicon_handle h,
     int            retval = -1;
     yang_spec     *yspec = NULL; /* application yspec */
     yang_stmt     *yrpc = NULL;
+    yang_stmt     *ymod = NULL;
     yang_stmt     *yinput;
     yang_stmt     *youtput;
     cxobj         *xoutput;
@@ -888,26 +889,33 @@ netconf_application_rpc(clicon_handle h,
 	goto done;
     }
     cbuf_reset(cb);
-    if (xml_namespace(xn) == NULL){
+    if (ys_module_by_xml(yspec, xn, &ymod) < 0)
+	goto done;
+    if (ymod == NULL){
 	xml_parse_va(xret, NULL, "<rpc-reply><rpc-error>"
 		     "<error-tag>operation-failed</error-tag>"
 		     "<error-type>rpc</error-type>"
 		     "<error-severity>error</error-severity>"
 		     "<error-message>%s</error-message>"
-		     "<error-info>Not recognized</error-info>"
+		     "<error-info>Not recognized module</error-info>"
 		     "</rpc-error></rpc-reply>", xml_name(xn));
 	goto ok;
     }
-    cprintf(cb, "/%s:%s", xml_namespace(xn), xml_name(xn));
-    /* Find yang rpc statement, return yang rpc statement if found */
-    if (yang_abs_schema_nodeid(yspec, xml_spec(xn), cbuf_get(cb), Y_RPC, &yrpc) < 0)
-	goto done;
+    yrpc = yang_find((yang_node*)ymod, Y_RPC, xml_name(xn));
+    if ((yrpc==NULL) && _CLICON_XML_NS_ITERATE){
+	int i;
+	for (i=0; i<yspec->yp_len; i++){
+	    ymod = yspec->yp_stmt[i];
+	    if ((yrpc = yang_find((yang_node*)ymod, Y_RPC, xml_name(xn))) != NULL)
+		break;
+	}
+    }
     /* Check if found */
     if (yrpc != NULL){
 	/* 1. Check xn arguments with input statement. */
 	if ((yinput = yang_find((yang_node*)yrpc, Y_INPUT, NULL)) != NULL){
 	    xml_spec_set(xn, yinput); /* needed for xml_spec_populate */
-	    if (xml_apply(xn, CX_ELMNT, xml_spec_populate, yinput) < 0)
+	    if (xml_apply(xn, CX_ELMNT, xml_spec_populate, yspec) < 0)
 		goto done;
 	    if (xml_apply(xn, CX_ELMNT, 
 			  (xml_applyfn_t*)xml_yang_validate_all, NULL) < 0)
@@ -933,7 +941,7 @@ netconf_application_rpc(clicon_handle h,
 	if ((youtput = yang_find((yang_node*)yrpc, Y_OUTPUT, NULL)) != NULL){
 	    xoutput=xpath_first(*xret, "/");
 	    xml_spec_set(xoutput, youtput); /* needed for xml_spec_populate */
-	    if (xml_apply(xoutput, CX_ELMNT, xml_spec_populate, youtput) < 0)
+	    if (xml_apply(xoutput, CX_ELMNT, xml_spec_populate, yspec) < 0)
 		goto done;
 	    if (xml_apply(xoutput, CX_ELMNT, 
 			  (xml_applyfn_t*)xml_yang_validate_all, NULL) < 0)
@@ -954,7 +962,6 @@ netconf_application_rpc(clicon_handle h,
     return retval;
 }
 
-
 /*! The central netconf rpc dispatcher. Look at first tag and dispach to sub-functions.
  * Call plugin handler if tag not found. If not handled by any handler, return
  * error.
@@ -985,7 +992,6 @@ netconf_rpc_dispatch(clicon_handle h,
 	if (xml_value_set(xa, username) < 0)
 	    goto done;
     }
-
     xe = NULL;
     while ((xe = xml_child_each(xn, xe, CX_ELMNT)) != NULL) {
 	if (strcmp(xml_name(xe), "get-config") == 0){
diff --git a/apps/restconf/restconf_methods.c b/apps/restconf/restconf_methods.c
index 133f0ed9..42d4d331 100644
--- a/apps/restconf/restconf_methods.c
+++ b/apps/restconf/restconf_methods.c
@@ -257,7 +257,6 @@ api_data_get2(clicon_handle h,
     else{
 	if (xpath_vec(xret, "%s", &xvec, &xlen, path) < 0)
 	    goto done;
-	clicon_debug(1, "%s: xpath:%s xlen:%d", __FUNCTION__, path, (int)xlen);
 	if (use_xml){
 	    for (i=0; i<xlen; i++){
 		x = xvec[i];
@@ -269,7 +268,7 @@ api_data_get2(clicon_handle h,
 	    if (xml2json_cbuf_vec(cbx, xvec, xlen, pretty) < 0)
 		goto done;
     }
-    clicon_debug(1, "%s cbuf:%s", __FUNCTION__, cbuf_get(cbx));
+    //    clicon_debug(1, "%s cbuf:%s", __FUNCTION__, cbuf_get(cbx));
     FCGX_FPrintF(r->out, "%s", cbx?cbuf_get(cbx):"");
     FCGX_FPrintF(r->out, "\r\n\r\n");
  ok:
@@ -408,9 +407,10 @@ api_data_post(clicon_handle h,
     yang_spec *yspec;
     cxobj     *xa;
     cxobj     *xret = NULL;
-    cxobj     *xretcom = NULL;
+    cxobj     *xretcom = NULL; /* return from commit */
+    cxobj     *xretdis = NULL; /* return from discard-changes */
     cxobj     *xerr = NULL; /* malloced must be freed */
-    cxobj     *xe;
+    cxobj     *xe;            /* dont free */
     char      *username;
 	
     clicon_debug(1, "%s api_path:\"%s\" json:\"%s\"",
@@ -488,13 +488,22 @@ api_data_post(clicon_handle h,
     }
     /* Assume this is validation failed since commit includes validate */
     cbuf_reset(cbx);
-    cprintf(cbx, "<rpc username=\"%s\">", username?username:"");
+    /* commit/discard should be done automaticaly by the system, therefore
+     * recovery user is used here (edit-config but not commit may be permitted
+     by NACM */
+    cprintf(cbx, "<rpc username=\"%s\">", NACM_RECOVERY_USER);
     cprintf(cbx, "<commit/></rpc>");
     if (clicon_rpc_netconf(h, cbuf_get(cbx), &xretcom, NULL) < 0)
 	goto done;
     if ((xe = xpath_first(xretcom, "//rpc-error")) != NULL){
-	if (clicon_rpc_discard_changes(h) < 0)
+	cbuf_reset(cbx);
+	cprintf(cbx, "<rpc username=\"%s\">", username?username:"");
+	cprintf(cbx, "<discard-changes/></rpc>");
+	if (clicon_rpc_netconf(h, cbuf_get(cbx), &xretdis, NULL) < 0)
 	    goto done;
+	/* log errors from discard, but ignore */
+	if ((xpath_first(xretdis, "//rpc-error")) != NULL)
+	    clicon_log(LOG_WARNING, "%s: discard-changes failed which may lead candidate in an inconsistent state", __FUNCTION__);
 	if (api_return_err(h, r, xe, pretty, use_xml) < 0)
 	    goto done;
 	goto ok;
@@ -512,6 +521,8 @@ api_data_post(clicon_handle h,
 	xml_free(xerr);
     if (xretcom)
 	xml_free(xretcom);
+    if (xretdis)
+	xml_free(xretdis);
     if (xtop)
 	xml_free(xtop);
     if (xdata)
@@ -623,7 +634,8 @@ api_data_put(clicon_handle h,
     cxobj     *xa;
     char      *api_path;
     cxobj     *xret = NULL;
-    cxobj     *xretcom = NULL;
+    cxobj     *xretcom = NULL; /* return from commit */
+    cxobj     *xretdis = NULL; /* return from discard-changes */
     cxobj     *xerr = NULL; /* malloced must be freed */
     cxobj     *xe;
     char      *username;
@@ -734,13 +746,23 @@ api_data_put(clicon_handle h,
 	goto ok;
     }
     cbuf_reset(cbx);
-    cprintf(cbx, "<rpc username=\"%s\">", username?username:"");
+    /* commit/discard should be done automaticaly by the system, therefore
+     * recovery user is used here (edit-config but not commit may be permitted
+     by NACM */
+    cprintf(cbx, "<rpc username=\"%s\">", NACM_RECOVERY_USER);
     cprintf(cbx, "<commit/></rpc>");
+    
     if (clicon_rpc_netconf(h, cbuf_get(cbx), &xretcom, NULL) < 0)
 	goto done;
     if ((xe = xpath_first(xretcom, "//rpc-error")) != NULL){
-	if (clicon_rpc_discard_changes(h) < 0)
+	cbuf_reset(cbx);
+	cprintf(cbx, "<rpc username=\"%s\">", username?username:"");
+	cprintf(cbx, "<discard-changes/></rpc>");
+	if (clicon_rpc_netconf(h, cbuf_get(cbx), &xretdis, NULL) < 0)
 	    goto done;
+	/* log errors from discard, but ignore */
+	if ((xpath_first(xretdis, "//rpc-error")) != NULL)
+	    clicon_log(LOG_WARNING, "%s: discard-changes failed which may lead candidate in an inconsistent state", __FUNCTION__);
 	if (api_return_err(h, r, xe, pretty, use_xml) < 0)
 	    goto done;
 	goto ok;
@@ -758,6 +780,8 @@ api_data_put(clicon_handle h,
 	xml_free(xerr);
     if (xretcom)
 	xml_free(xretcom);
+    if (xretdis)
+	xml_free(xretdis);
     if (xtop)
 	xml_free(xtop);
     if (xdata)
@@ -791,7 +815,7 @@ api_data_patch(clicon_handle h,
     return 0;
 }
 
-/*! Generic REST DELETE method 
+/*! Generic REST DELETE method translated to edit-config
  * @param[in]  h      CLIXON handle
  * @param[in]  r      Fastcgi request handle
  * @param[in]  api_path According to restconf (Sec 3.5.3.1 in rfc8040)
@@ -821,7 +845,8 @@ api_data_delete(clicon_handle h,
     yang_spec *yspec;
     enum operation_type op = OP_DELETE;
     cxobj     *xret = NULL;
-    cxobj     *xretcom = NULL;
+    cxobj     *xretcom = NULL; /* return from commmit */
+    cxobj     *xretdis = NULL; /* return from discard */
     cxobj     *xerr = NULL;
     char      *username;
 
@@ -836,7 +861,6 @@ api_data_delete(clicon_handle h,
     if ((xtop = xml_new("config", NULL, NULL)) == NULL)
 	goto done;
     xbot = xtop;
-
     if (api_path && api_path2xml(api_path, yspec, xtop, YC_DATANODE, &xbot, &y) < 0)
 	goto done;
     if ((xa = xml_new("operation", xbot, NULL)) == NULL)
@@ -864,13 +888,22 @@ api_data_delete(clicon_handle h,
     }
     /* Assume this is validation failed since commit includes validate */
     cbuf_reset(cbx);
-    cprintf(cbx, "<rpc username=\"%s\">", username?username:"");
+    /* commit/discard should be done automaticaly by the system, therefore
+     * recovery user is used here (edit-config but not commit may be permitted
+     by NACM */
+    cprintf(cbx, "<rpc username=\"%s\">", NACM_RECOVERY_USER);
     cprintf(cbx, "<commit/></rpc>");
     if (clicon_rpc_netconf(h, cbuf_get(cbx), &xretcom, NULL) < 0)
 	goto done;
     if ((xerr = xpath_first(xretcom, "//rpc-error")) != NULL){
-	if (clicon_rpc_discard_changes(h) < 0)
+	cbuf_reset(cbx);
+	cprintf(cbx, "<rpc username=\"%s\">", NACM_RECOVERY_USER);
+	cprintf(cbx, "<discard-changes/></rpc>");
+	if (clicon_rpc_netconf(h, cbuf_get(cbx), &xretdis, NULL) < 0)
 	    goto done;
+	/* log errors from discard, but ignore */
+	if ((xpath_first(xretdis, "//rpc-error")) != NULL)
+	    clicon_log(LOG_WARNING, "%s: discard-changes failed which may lead candidate in an inconsistent state", __FUNCTION__);
 	if (api_return_err(h, r, xerr, pretty, use_xml) < 0)
 	    goto done;
 	goto ok;
@@ -887,6 +920,8 @@ api_data_delete(clicon_handle h,
 	xml_free(xret);
     if (xretcom)
 	xml_free(xretcom);
+    if (xretdis)
+	xml_free(xretdis);
     if (xtop)
 	xml_free(xtop);
     clicon_debug(1, "%s retval:%d", __FUNCTION__, retval);
@@ -912,6 +947,11 @@ api_data_delete(clicon_handle h,
  * data-model-specific RPC operations supported by the server.  The
  * server MAY omit this resource if no data-model-specific RPC
  * operations are advertised.
+ * From ietf-restconf.yang:
+ * In XML, the YANG module namespace identifies the module:
+ *      <system-restart xmlns='urn:ietf:params:xml:ns:yang:ietf-system'/>
+ * In JSON, the YANG module name identifies the module:
+ *       { 'ietf-system:system-restart' : [null] }
  */
 int
 api_operations_get(clicon_handle h,
@@ -926,9 +966,9 @@ api_operations_get(clicon_handle h,
 {
     int        retval = -1;
     yang_spec *yspec;
-    yang_stmt *ym;
+    yang_stmt *ymod; /* yang module */
     yang_stmt *yc;
-    char      *modname;
+    char      *namespace;
     cbuf      *cbx = NULL;
     cxobj     *xt = NULL;
     
@@ -937,18 +977,17 @@ api_operations_get(clicon_handle h,
     if ((cbx = cbuf_new()) == NULL)
 	goto done;
     cprintf(cbx, "<operations>");
-    ym = NULL;
-    while ((ym = yn_each((yang_node*)yspec, ym)) != NULL) {
-	modname = ym->ys_argument;
+    ymod = NULL;
+    while ((ymod = yn_each((yang_node*)yspec, ymod)) != NULL) {
+	namespace = yang_find_mynamespace(ymod);
 	yc = NULL;
-	while ((yc = yn_each((yang_node*)ym, yc)) != NULL) {
+	while ((yc = yn_each((yang_node*)ymod, yc)) != NULL) {
 	    if (yc->ys_keyword != Y_RPC)
 		continue;
-	    cprintf(cbx, "<%s:%s />", modname, yc->ys_argument);
+	    cprintf(cbx, "<%s xmlns=\"%s\"/>", yc->ys_argument, namespace);
 	}
     }
     cprintf(cbx, "</operations>");
-    clicon_debug(1, "%s xml:%s", __FUNCTION__, cbuf_get(cbx));
     if (xml_parse_string(cbuf_get(cbx), yspec, &xt) < 0)
 	goto done;
     if (xml_rootchild(xt, 0, &xt) < 0)
@@ -962,7 +1001,6 @@ api_operations_get(clicon_handle h,
 	if (xml2json_cbuf(cbx, xt, pretty) < 0)
 	    goto done;
     }
-    clicon_debug(1, "%s ret:%s", __FUNCTION__, cbuf_get(cbx));
     FCGX_SetExitStatus(200, r->out); /* OK */
     FCGX_FPrintF(r->out, "Content-Type: application/yang-data+%s\r\n", use_xml?"xml":"json");
     FCGX_FPrintF(r->out, "\r\n");
@@ -1095,18 +1133,9 @@ api_operations_post(clicon_handle h,
 	if (xml_value_set(xa, username) < 0)
 	    goto done;
     }
-
     /* XXX: something strange for rpc user */
     if (api_path2xml(oppath, yspec, xtop, YC_SCHEMANODE, &xbot, &y) < 0)
 	goto done;
-#if 0
-    {
-	cbuf *c = cbuf_new();
-	clicon_xml2cbuf(c, xtop, 0, 0);
-	clicon_debug(1, "%s xtop:%s", __FUNCTION__, cbuf_get(c));
-	cbuf_free(c);
-    }
-#endif
     if (data && strlen(data)){
 	/* Parse input data as json or xml into xml */
 	if (parse_xml){
@@ -1150,7 +1179,8 @@ api_operations_post(clicon_handle h,
 	    }
 	    if (yinput){
 		xml_spec_set(xbot, yinput); /* needed for xml_spec_populate */
-		if (xml_apply(xbot, CX_ELMNT, xml_spec_populate, yinput) < 0)
+		/* XXX yinput <-> h ?*/
+		if (xml_apply(xbot, CX_ELMNT, xml_spec_populate, yspec) < 0)
 		    goto done;
 		if (xml_apply(xbot, CX_ELMNT, 
 			      (xml_applyfn_t*)xml_yang_validate_all, NULL) < 0)
@@ -1215,7 +1245,7 @@ api_operations_post(clicon_handle h,
 #endif
 	cbuf_reset(cbx);
 	xml_spec_set(xoutput, youtput); /* needed for xml_spec_populate */
-	if (xml_apply(xoutput, CX_ELMNT, xml_spec_populate, youtput) < 0)
+	if (xml_apply(xoutput, CX_ELMNT, xml_spec_populate, yspec) < 0)
 	    goto done;
 	if (xml_apply(xoutput, CX_ELMNT, 
 		      (xml_applyfn_t*)xml_yang_validate_all, NULL) < 0)
@@ -1235,9 +1265,6 @@ api_operations_post(clicon_handle h,
 	else
 	    if (xml2json_cbuf(cbx, xoutput, pretty) < 0)
 		goto done;
-#if 1
-	clicon_debug(1, "%s cbx:%s", __FUNCTION__, cbuf_get(cbx));
-#endif
 	FCGX_FPrintF(r->out, "%s", cbx?cbuf_get(cbx):"");
 	FCGX_FPrintF(r->out, "\r\n\r\n");
     }
diff --git a/datastore/Makefile.in b/datastore/Makefile.in
index 98bc8a0e..6943dec5 100644
--- a/datastore/Makefile.in
+++ b/datastore/Makefile.in
@@ -49,7 +49,6 @@ INSTALLFLAGS  	= @INSTALLFLAGS@
 LDFLAGS 	= @LDFLAGS@
 LIBS    	= @LIBS@
 with_restconf	= @with_restconf@
-with_keyvalue	= @with_keyvalue@
 
 SH_SUFFIX	= @SH_SUFFIX@
 CLIXON_MAJOR    = @CLIXON_VERSION_MAJOR@
@@ -117,5 +116,5 @@ distclean: clean
 	for i in $(SUBDIRS); \
 	do (cd $$i; $(MAKE) $(MFLAGS) $@); done
 
-tags:
+TAGS:
 	find $(srcdir) -name '*.[chyl]' -print | etags -
diff --git a/datastore/README.md b/datastore/README.md
index a3283c6e..8f000d88 100644
--- a/datastore/README.md
+++ b/datastore/README.md
@@ -2,8 +2,7 @@
 
 The Clixon datastore is a stand-alone XML based datastore. The idea is
 to be able to use different datastores backends with the same
-API. There is currently a key-value plugin based on qdbm and a plain
-text-file datastore.
+API. There is currently only a plain text-file datastore.
 
 The datastore is primarily designed to be used by Clixon but can be used
 separately.  
@@ -38,7 +37,7 @@ int xmldb_create(clicon_handle h, char *db);
 
 To use the API, a client needs the following:
 - A clicon handle. 
-- A datastore plugin, such as a text.so or keyvalue.so. These are normally built and installed at Clixon make.
+- A datastore plugin, such as a text.so. These are normally built and installed at Clixon make.
 - A directory where to store databases
 - A yang specification. This needs to be parsed using the Clixon yang_parse() method.
 
diff --git a/datastore/datastore_client.c b/datastore/datastore_client.c
index 5722d497..63f1e7a0 100644
--- a/datastore/datastore_client.c
+++ b/datastore/datastore_client.c
@@ -31,14 +31,6 @@
 
   ***** END LICENSE BLOCK *****
 
-  * Examples: 
-
-./datastore_client -d candidate -b /usr/local/var/example -p /home/olof/src/clixon/datastore/keyvalue/keyvalue.so -y /usr/local/share/example/yang -m ietf-ip get /
-
-sudo ./datastore_client -d candidate -b /usr/local/var/example -p /home/olof/src/clixon/datastore/keyvalue/keyvalue.so -y /usr/local/share/example/yang -m ietf-ip put merge /interfaces/interface=eth66 '<config>eth66</config>'
-
-sudo ./datastore_client -d candidate -b /usr/local/var/example -p /home/olof/src/clixon/datastore/keyvalue/keyvalue.so -y /usr/local/share/example/yang -m ietf-ip put merge / '<config><interfaces><interface><name>eth0</name><enabled>true</enabled></interface></interfaces></config>'
-
  */
 
 #ifdef HAVE_CONFIG_H
@@ -247,6 +239,7 @@ main(int argc, char **argv)
 	    clicon_err(OE_DB, 0, "Unrecognized operation: %s", argv[1]);
 	    usage(argv0);
 	}
+	_CLICON_XML_NS_ITERATE = 1;
 	if (xml_parse_string(argv[2], NULL, &xt) < 0)
 	    goto done;
 	if (xml_rootchild(xt, 0, &xt) < 0)
diff --git a/datastore/keyvalue/Makefile.in b/datastore/keyvalue/Makefile.in
deleted file mode 100644
index 08fc997f..00000000
--- a/datastore/keyvalue/Makefile.in
+++ /dev/null
@@ -1,98 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# 
-# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
-#
-# This file is part of CLIXON
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# the GNU General Public License Version 3 or later (the "GPL"),
-# in which case the provisions of the GPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of the GPL, and not to allow others to
-# use your version of this file under the terms of Apache License version 2, 
-# indicate your decision by deleting the provisions above and replace them with
-# the notice and other provisions required by the GPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the Apache License version 2 or the GPL.
-#
-# ***** END LICENSE BLOCK *****
-#
-VPATH       	= @srcdir@
-prefix 		= @prefix@
-datarootdir	= @datarootdir@
-srcdir  	= @srcdir@
-top_srcdir  	= @top_srcdir@
-exec_prefix 	= @exec_prefix@
-bindir 		= @bindir@
-libdir		= @libdir@
-dbdir		= @prefix@/db
-mandir		= @mandir@
-libexecdir	= @libexecdir@
-localstatedir	= @localstatedir@
-sysconfdir	= @sysconfdir@
-
-VPATH       	= @srcdir@
-CC		= @CC@
-CFLAGS  	= @CFLAGS@ -rdynamic -fPIC 
-INSTALLFLAGS  	= @INSTALLFLAGS@ 
-LDFLAGS 	= @LDFLAGS@
-LIBS    	= @LIBS@ 
-DATASTORE       = keyvalue
-CPPFLAGS  	= @CPPFLAGS@
-
-INCLUDES = -I. -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir) @INCLUDES@
-
-PLUGIN       = $(DATASTORE).so
-
-SRC     = clixon_keyvalue.c clixon_qdb.c clixon_chunk.c 
-
-OBJS    = $(SRC:.c=.o) 
-
-all:	 $(PLUGIN)
-
-
-$(PLUGIN): $(SRC)
-	$(CC) $(CPPFLAGS) $(INCLUDES) $(CFLAGS) $(LDFLAGS) -shared -o $@ -lc $^ $(LIBS)
-
-clean:
-	rm -f $(PLUGIN) $(OBJS) *.core
-
-distclean: clean
-	rm -f Makefile *~ .depend
-
-.SUFFIXES:
-.SUFFIXES: .c .o
-
-.c.o: $(SRC)
-	$(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -c $<
-
-install: $(PLUGIN)
-	install -d -m 0755 $(DESTDIR)$(libdir)/xmldb
-	install -m 0644 $(INSTALLFLAGS) $(PLUGIN) $(DESTDIR)$(libdir)/xmldb
-
-install-include:
-
-uninstall: 
-	rm -rf $(DESTDIR)$(libdir)/xmldb/$(PLUGIN)
-
-TAGS:
-	find . -name '*.[chyl]' -print | etags -
-
-depend:
-	$(CC) $(DEPENDFLAGS) @DEFS@ $(INCLUDES) $(CFLAGS) -MM $(SRC) > .depend
-
-#include .depend
-
diff --git a/datastore/keyvalue/clixon_chunk.c b/datastore/keyvalue/clixon_chunk.c
deleted file mode 100644
index 80db76da..00000000
--- a/datastore/keyvalue/clixon_chunk.c
+++ /dev/null
@@ -1,794 +0,0 @@
-/*
- *
-  ***** BEGIN LICENSE BLOCK *****
- 
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
-
-  This file is part of CLIXON.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of
-  the GNU General Public License Version 3 or later (the "GPL"),
-  in which case the provisions of the GPL are applicable instead
-  of those above. If you wish to allow use of your version of this file only
-  under the terms of the GPL, and not to allow others to
-  use your version of this file under the terms of Apache License version 2, indicate
-  your decision by deleting the provisions above and replace them with the 
-  notice and other provisions required by the GPL. If you do not delete
-  the provisions above, a recipient may use your version of this file under
-  the terms of any one of the Apache License version 2 or the GPL.
-
-  ***** END LICENSE BLOCK *****
-
- */
-/* Error handling: dont use clicon_err, treat as unix system calls. That is,
-   ensure errno is set and return -1/NULL */
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <sys/mman.h>
-#include <sys/param.h>
-#include <sys/types.h>
-
-/* clicon */
-#include <cligen/cligen.h>
-
-/* clicon */
-#include <clixon/clixon.h>
-
-#include "clixon_chunk.h"
-
-/*
- * The chunk  head array for the predefined chunk sizes.
- */
-static chunk_head_t	chunk_heads[CHUNK_HEADS];
-
-/* 
- * Did we initialize the chunk heads yet?
- */
-static int 		chunk_initialized = 0;
-
-
-/*
- * The pagesize of this system
- */
-static int		chunk_pagesz;
-
-
-/*
- * List of chunk groups
- */
-static chunk_group_t	*chunk_grp;
-
-/*
- * Hack to tell unchunk() not to remove chunk_group if empty
- */
-static int		dont_unchunk_group;
-
-
-/*
- * Initialize chunk library
- */
-static void
-chunk_initialize ()
-{
-	int pgs;
-	register int idx;
-
-	chunk_pagesz = getpagesize();
-
-	bzero (&chunk_heads, sizeof(chunk_heads));
-
-	for (idx = 0; idx < CHUNK_HEADS; idx++) {
-		chunk_head_t *chead = &chunk_heads[idx];
-
-
-		/*
-		 * Calculate the size of a block
-		 */
-		pgs = (0x01lu << (CHUNK_BASE + idx)) / chunk_pagesz;
-		if (pgs == 0)
-			pgs = 1;
-		chead->ch_blksz = pgs * chunk_pagesz;
-
-
-		/*
-		 * Chunks per block is 1 for all size above a page. For sizes
-		 * (including the chunk header) less than a page it's as many
-		 * as fits		 
-		 */
-		chead->ch_nchkperblk = chead->ch_blksz / (0x01lu << (CHUNK_BASE + idx));
-
-
-		/*
-		 * Size of each chunk is:
-		 *	(size + chnkhdr) * ncnkperblk = blksiz - blkhdr
-		 */
-		chead->ch_size =
-			(chead->ch_blksz / chead->ch_nchkperblk)
-			- sizeof(chunk_t);
-
-	}
-
-	/* Zero misc variables */
-	chunk_grp = NULL;
-	dont_unchunk_group = 0;
-  
-	chunk_initialized = 1;
-}
-
-
-/*
- * chunk_new_block()	- Allocate new block, initialize it and it's chunks.
- */
-static int
-chunk_new_block (chunk_head_t *chead)
-{
-	register int	idx;
-	register char  *c;
-	chunk_block_t  *blk;
-	chunk_t	       *cnk;
-
-	/* Map block header mem */
-	blk = (chunk_block_t *)
-		mmap(NULL, sizeof(chunk_block_t),
-		     PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
-	if (blk == MAP_FAILED)
-		return -1;
-	memset((void *)blk, 0, sizeof(*blk));
-
-	/* Allocate chunk block */
-	blk->cb_blk = (void *)
-		mmap(NULL, chead->ch_blksz, 
-		     PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
-	if (blk->cb_blk == MAP_FAILED) {
-	    munmap(blk, chead->ch_blksz);
-	    return -1;
-	}
-	memset(blk->cb_blk, 0, chead->ch_blksz);
-
-	
-	/* Initialize chunk header */
-	blk->cb_head = chead;
-	INSQ(blk, chead->ch_blks);
-	chead->ch_nblks++;
-
-	/* Initialize chunks */
-	c = ((char *)blk->cb_blk);
-	for (idx = 0; idx < chead->ch_nchkperblk; idx++) {
-	       
-		cnk = (chunk_t *)c;
-		cnk->c_blk = blk;
-		INSQ(cnk, chead->ch_free);
-		chead->ch_nfree++;
-
-		c += (chead->ch_size + sizeof(chunk_t));
-	}
-
-
-	return 0;
-}
-
-/*
- * chunk_release_block()	- Unqueue a block, it's chunks and free mem
- */
-static void
-chunk_release_block(chunk_block_t *cblk)
-{
-	int		idx;
-	char		*c;
-	chunk_t		*cnk;
-	chunk_head_t	*chead;
-
-
-	chead = cblk->cb_head;
-	
-	/*
-	 * Dequeue block 
-	 */
-	DELQ(cblk, chead->ch_blks, chunk_block_t *);
-	chead->ch_nblks--;
-		
-	/* 
-	 * Dequeue all chunks in the block 
-	 */
-	c = (char *)cblk->cb_blk;
-	for (idx = 0; idx < chead->ch_nchkperblk; idx++) {
-		
-		cnk = (chunk_t *)c;
-		DELQ(cnk, chead->ch_free, chunk_t *);
-		chead->ch_nfree--;
-		
-		c += (chead->ch_size + sizeof(chunk_t));
-	}
-	
-	/*
-	 * Free block 
-	 */
-	munmap((void *)cblk->cb_blk, chead->ch_blksz);
-	munmap((void *)cblk, sizeof(*cblk));
-}
-
-
-
-/*
- * chunk_alloc()	- Map new chunk of memory
- */
-static void *
-chunk_alloc(size_t len)
-{
-	register int	idx;
-	chunk_head_t   *chead;
-	chunk_t	       *cnk;
-
-
-	if (!len)
-		return (void *)NULL;
-
-
-
-	/* Find sufficient sized block head */
-	for (idx = 0; idx < CHUNK_HEADS; idx++)
-		if (chunk_heads[idx].ch_size >= len)
-			break;
-
-	/* Too large chunk? */
-	if (idx >= CHUNK_HEADS) {
-		errno = ENOMEM;
-		return (void *)NULL;
-	}
-
-	chead = &chunk_heads[idx];
-
-	
-	/* Get new block if necessary */
-	if (!chead->ch_nfree)
-		if (chunk_new_block(chead))
- 			return (void *)NULL;
-		
-
-	/* Move a free chunk to the in-use list */
-	cnk = chead->ch_free;
-	DELQ(cnk, chead->ch_free, chunk_t *);
-	chead->ch_nfree--;
-	INSQ(cnk, chead->ch_cnks);
-	/* Add reference to the corresponding block */
-	cnk->c_blk->cb_ref++;
-	
-#ifdef CHUNK_DIAG
-	/* Clear diag info */
-	bzero((void *)&cnk->c_diag, sizeof(cnk->c_diag));
-#endif /* CHUNK_DIAG */
-	
-	/* Return pointer to first byte after the chunk header */
-	return (void *) (cnk + 1);
-}
-
-
-/*
- * chunk()	- Map new chunk of memory in group
- */
-void *
-#ifdef CHUNK_DIAG
-_chunk(size_t len, const char *name, const char *file, int line)
-#else
-chunk(size_t len, const char *name)
-#endif
-{
-	int		 newgrp = 0;
-	void		*ptr = NULL;
-	chunk_t		*cnk;
-	chunk_group_t	*tmp;
-	chunk_group_t	*grp = NULL;
-	chunk_grpent_t	*ent = NULL;
-	
-	/* Make sure chunk_heads are initialized */
-	if (!chunk_initialized)
-		chunk_initialize();
-
-	if (!len)
-		return (void *)NULL;
-
-	/* Get actual chunk 
-	 */
-	ptr = chunk_alloc(len);
-	if (!ptr)
-		goto error;
-	cnk = (chunk_t *) (((char *)ptr) - sizeof(chunk_t));
-
-#ifdef CHUNK_DIAG
-	/* Store who reuested us
-	 */
-	cnk->c_diag.cd_file = file;
-	cnk->c_diag.cd_line = line;
-#endif /* CHUNK_DIAG */
-
-	/* No name given. Get an ungrouped chunk
-	 */
-	if (!name)
-		return ptr;
-
-
-	/* Try to find already existing entry 
-	 */
-	if (chunk_grp) {
-		tmp = chunk_grp;
-		do {
-			if (!strcmp(tmp->cg_name, name)) {
-				grp = tmp;
-				break;
-			}
-			
-			tmp = NEXTQ(chunk_group_t *, tmp);
-			
-		} while (tmp != chunk_grp);
-	}
-
-	/* New group.
-	 */
-	if ( !grp ) {
-		
-		grp = (chunk_group_t *) chunk_alloc(sizeof(chunk_group_t));
-		if (!grp)
-			goto error;
-
-		bzero(grp, sizeof(chunk_group_t));
-
-		grp->cg_name = (char *) chunk_alloc(strlen(name) + 1);
-		if (!grp->cg_name)
-		  goto error;
-		bcopy(name, grp->cg_name, strlen(name)+1);
-		newgrp = 1;
-	}
-		
-	
-	/* Get new entry.
-	 */
-	ent = (chunk_grpent_t *) chunk_alloc(sizeof(chunk_grpent_t));
-	if (!ent)
-		goto error;
-	bzero(ent, sizeof(chunk_grpent_t));
-
-	/* Now put everything together
-	 */
-	cnk->c_grpent = ent;
-	
-	ent->ce_cnk = cnk;
-	ent->ce_grp = grp;
-
-	INSQ(ent, grp->cg_ent);
-	if (newgrp)
-		INSQ(grp, chunk_grp);
-	
-	return (ptr);
-
- error:
-	if (grp && newgrp) {
-	  	if (grp->cg_name)
-		 	unchunk(grp->cg_name);
-		unchunk(grp);
-	}
-	if (ent)
-		unchunk(ent);
-	if (ptr)
-		unchunk(ptr);
-	
-	return (void *)	NULL;
-}
-
-
-/*
- * rechunk()	- Resize previously allocated chunk.
- */
-void *
-#ifdef CHUNK_DIAG
-_rechunk(void *ptr, size_t len, const char *name, const char *file, int line)
-#else
-rechunk(void *ptr, size_t len, const char *name)
-#endif
-{
-	int		idx;
-	void		*new;
-	chunk_t		*cnk;
-	chunk_t		*newcnk;
-	chunk_head_t	*chead;
-	chunk_head_t	*newchead;
-
-
-	/* No previoud chunk, get new
-	 */
-	if (!ptr) {
-#ifdef CHUNK_DIAG
-	  return _chunk(len, name, file, line);
-#else
-	  return chunk(len, name);
-#endif
-	}
-
-	/* Zero length, free chunk 
-	 */
-	if (len == 0) {
-		unchunk(ptr);
-		return (void *) NULL;
-	}
-
-	/* Rewind pointer to beginning of chunk header 
-	 */
-	cnk = (chunk_t *) (((char *)ptr) - sizeof(chunk_t));
-	chead = cnk->c_blk->cb_head;
-
-	/* Find sufficient sized block head 
-	 */
-	for (idx = 0; idx < CHUNK_HEADS; idx++)
-		if (chunk_heads[idx].ch_size >= len)
-			break;
-	/* Too large chunk? */
-	if (idx >= CHUNK_HEADS) {
-		errno = ENOMEM;
-		return (void *)NULL;
-	}
-
-	/* Check if chunk size remains unchanged
-	 */
-	if (chunk_heads[idx].ch_size == chead->ch_size)
-		return (ptr);
-
-	/* Get new chunk 
-	 */
-#ifdef CHUNK_DIAG
-	new = _chunk(len, name, file, line);
-#else
-	new = chunk(len, name);
-#endif
-	if (!new)
-		return (void *) NULL;
-	newcnk = (chunk_t *) (((char *)new) - sizeof(chunk_t));
-	newchead =  newcnk->c_blk->cb_head;
-
-	/* Copy contents to new chunk 
-	 */
-	bcopy(ptr, new, MIN(newchead->ch_size, chead->ch_size));
-	
-	/* Free old chunk
-	 */
-	unchunk(ptr);
-
-
-	return (new);
-}
-	  
-/*
- * unchunk()	- Release chunk
- */
-void
-unchunk(void *ptr)
-{
-	chunk_t		*cnk;
-	chunk_head_t	*chead;
-	chunk_block_t	*cblk;
-	chunk_grpent_t	*ent;
-	chunk_group_t	*grp;
-
-	if (!chunk_initialized)
-		return;
-
-	/* Rewind pointer to beginning of chunk header 
-	 */
-	cnk = (chunk_t *) (((char *)ptr) - sizeof(chunk_t));
-	cblk = cnk->c_blk;
-	chead = cblk->cb_head;
-
-	/* Move chunk back to free list
-	 */
-	DELQ(cnk, chead->ch_cnks, chunk_t *);
-	INSQ(cnk, chead->ch_free);
-	chead->ch_nfree++;
-
-	/* If chunk is grouped, remove from group.
-	 */
-	ent = cnk->c_grpent;
-	if (ent) {
-		grp = ent->ce_grp;
-		DELQ(ent, grp->cg_ent, chunk_grpent_t *);
-		unchunk(ent);
-		cnk->c_grpent = NULL;
-
-		/* Group empty? */
-		if (!dont_unchunk_group && !grp->cg_ent) {
-			DELQ(grp, chunk_grp, chunk_group_t *);
-			unchunk(grp->cg_name);
-			unchunk(grp);
-		}
-	}
-
-	/* Check block refs is nil, if so free it
-	 */
-	cblk->cb_ref--;
-	if (cblk->cb_ref == 0)
-		chunk_release_block (cblk);
-}
-
-
-/*
- * unchunk_group()	- Release all group chunks.
- */
-void
-unchunk_group(const char *name)
-{
-	chunk_group_t	*tmp;
-	chunk_group_t	*grp = NULL;
-	chunk_t		*cnk;
-
-	if (!chunk_initialized)
-		return;
-
-	/* Try to find already existing entry 
-	 */
-	if (chunk_grp) {
-		tmp = chunk_grp;
-		do {
-			if (!strcmp(tmp->cg_name, name)) {
-				grp = tmp;
-				break;
-			}
-			
-			tmp = NEXTQ(chunk_group_t *, tmp);
-			
-		} while (tmp != chunk_grp);
-	}
-	if (!grp)
-		return;
-
-
-	/* Walk through all chunks in group an free them
-	 */
-	dont_unchunk_group = 1;
-	while (grp->cg_ent) {
-		cnk = grp->cg_ent->ce_cnk;
-		unchunk((chunk_t *)(((char *)cnk) + sizeof(chunk_t)));
-	}
-	dont_unchunk_group = 0;
-		
-
-	/* Remove group from list and free it 
-	 */
-	DELQ(grp, chunk_grp, chunk_group_t *);
-	unchunk(grp->cg_name);
-	unchunk(grp);
-}
-
-/*
- * chunkdup()	- Copy block of data to a new chunk of memory in group 
- */
-void *
-#ifdef CHUNK_DIAG
-_chunkdup(const void *ptr, size_t len, const char *name, const char *file, int line)
-#else
-chunkdup(const void *ptr, size_t len, const char *name)
-#endif
-{
-	void		*new;
-
-	/* No input data or no length
-	 */
-	if (!ptr || len <= 0)
-		return (void *)NULL;
-
-	/* Get new chunk 
-	 */
-#ifdef CHUNK_DIAG
-	new = _chunk(len, name, file, line);
-#else
-	new = chunk(len, name);
-#endif
-	if (!new)
-		return (void *)NULL;
-
-	/* Copy data to new chunk 
-	 */
-	memcpy(new, ptr, len);
-
-	return (new);
-}
-
-/*
- * chunksize()	- Return size of memory chunk.
- */
-size_t
-chunksize(void *ptr)
-{
-	chunk_t		*cnk;
-	chunk_head_t	*chead;
-	chunk_block_t	*cblk;
-
-	if (!chunk_initialized)
-		return -1;
-
-	/* Rewind pointer to beginning of chunk header 
-	 */
-	cnk = (chunk_t *) (((char *)ptr) - sizeof(chunk_t));
-	cblk = cnk->c_blk;
-	chead = cblk->cb_head;
-
-	return chead->ch_size;
-}
-
-/*
- * chunk_strncat() - Concatenate 'n' characters to a chunk allocated string. If
- *		     'n' is zero, do the whole src string.
- *
- */
-char *
-#ifdef CHUNK_DIAG
-_chunk_strncat(const char *dst, const char *src, size_t n, const char *name,
-		const char *file, int line)
-#else
-chunk_strncat(const char *dst, const char *src, size_t n, const char *name)
-#endif
-{
-	size_t len;
-	char *new;
-	void *ptr = (void *)dst;
-
-	if (n == 0)  /* zero length means cat whole string */
-		n = strlen(src);
-	len = (dst ? strlen(dst) : 0) + n + 1;
-#ifdef CHUNK_DIAG
-	ptr = _rechunk(ptr, len, name, file, line);
-#else
-	ptr = rechunk(ptr, len, name);
-#endif
-	if (ptr == NULL) 
-		return NULL;
-  
-	new = (char *)ptr;
-	new += strlen(new);
-	while (n-- > 0 && *src)
-	  *new++ = *src++;
-	*new = '\0';
-
-	return (char *)ptr;
-}
-
-/*
- * chunk_sprintf() - Format string into new chunk.
- */
-char *
-#ifdef CHUNK_DIAG
-_chunk_sprintf(const char *name, const char *file, 
-		int line, const char *fmt, ...)
-#else
-chunk_sprintf(const char *name, char *fmt, ...)
-#endif
-{
-	size_t len;
-	char *str;
-	va_list args;
-
-	/* Calculate formatted string length */
-	va_start(args, fmt);
-	len = vsnprintf(NULL, 0, fmt, args) + 1;
-	va_end(args);
-
-	/* get chunk */
-#ifdef CHUNK_DIAG
- 	str = _chunk(len, name, file, line);
-#else
- 	str = chunk(len, name);
-#endif
-	if (str == NULL) 
-		return NULL;
-
-	/* Format string */
-	va_start(args, fmt);
-	len = vsnprintf(str, len, fmt, args);
-	va_end(args);
-	
-	return str;
-}
-
-#ifdef CHUNK_DIAG
-/*
- * chunk_check()	- Report all non-freed chunk for given group (if any)
- */
-void
-chunk_check(FILE *fout, const char *name)
-{
-	int		idx;
-	chunk_t	       *cnk;
-	chunk_group_t  *tmp;
-	chunk_group_t  *grp = NULL;
-	chunk_grpent_t *ent;
-
-	if (!chunk_initialized)
-		return;
-	/* No name given, walk through everything
-	 */
-	if (name == (const char *)NULL) {
-		for (idx = 0; idx < CHUNK_HEADS; idx++) {
-			chunk_head_t *chead = &chunk_heads[idx];
-			cnk = chead->ch_cnks;
-			if (cnk == (chunk_t *)NULL)
-			    continue;
-
-			do {
-			    
-				/* If no file name it's an internal chunk */
-				if (cnk->c_diag.cd_file) 
-				    clicon_debug(0,
-						"%s:%d,\t%zu bytes (%p), group \"%s\"\n", 
-						cnk->c_diag.cd_file,
-						cnk->c_diag.cd_line,
-						cnk->c_blk->cb_head->ch_size,
-						(cnk +1),
-						cnk->c_grpent ? 
-						    cnk->c_grpent->ce_grp->cg_name :
-						    "NULL");
-
-				cnk = NEXTQ(chunk_t *, cnk);
-				
-			} while (cnk != chead->ch_cnks);
-		}
-	}
-
-	/* Walk through group
-	 */
-	else {
-	    
-
-		/* Try to find already existing entry 
-		 */
-		if (chunk_grp) {
-			tmp = chunk_grp;
-			do {
-				if (!strcmp(tmp->cg_name, name)) {
-					grp = tmp;
-					break;
-				}
-			
-				tmp = NEXTQ(chunk_group_t *, tmp);
-			
-			} while (tmp != chunk_grp);
-		}
-		if (!grp)
-			return;
-
-		ent = grp->cg_ent;
-		do {
-			cnk = ent->ce_cnk;	    
-
-			fprintf(fout ? fout : stdout,
-				"%s:%d,\t%zu bytes (%p), group \"%s\"\n", 
-				cnk->c_diag.cd_file,
-				cnk->c_diag.cd_line,
-				cnk->c_blk->cb_head->ch_size,
-				(cnk +1),
-				cnk->c_grpent ?
-			            cnk->c_grpent->ce_grp->cg_name :
-			            "NULL");
-
-			ent = NEXTQ(chunk_grpent_t *, ent);
-		} while (ent != grp->cg_ent);	    
-	}
-}
-#else /* CHUNK_DIAG */
-void
-chunk_check(FILE *fout, const char *name)
-{
-}
-#endif /* CHUNK_DIAG */
diff --git a/datastore/keyvalue/clixon_chunk.h b/datastore/keyvalue/clixon_chunk.h
deleted file mode 100644
index 81a8f18b..00000000
--- a/datastore/keyvalue/clixon_chunk.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- *
-  ***** BEGIN LICENSE BLOCK *****
- 
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
-
-  This file is part of CLIXON.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of
-  the GNU General Public License Version 3 or later (the "GPL"),
-  in which case the provisions of the GPL are applicable instead
-  of those above. If you wish to allow use of your version of this file only
-  under the terms of the GPL, and not to allow others to
-  use your version of this file under the terms of Apache License version 2, 
-  indicate your decision by deleting the provisions above and replace them with
-  the  notice and other provisions required by the GPL. If you do not delete
-  the provisions above, a recipient may use your version of this file under
-  the terms of any one of the Apache License version 2 or the GPL.
-
-  ***** END LICENSE BLOCK *****
-
- *
- */
-
-#ifndef _CLIXON_CHUNK_H_
-#define _CLIXON_CHUNK_H_
-
-
-/*
- * Compile with chunk diagnostics. XXX Should be in Makefile.in ??
- */
-#undef CHUNK_DIAG
-
-/*
- * Base number of bits to shift getting the size of a chunk_head.
- */
-#define CHUNK_BASE	6
-
-/*
- * Number of predefined chunk sizes. I.e. the number of chunk heads in the
- * chunk_heads vector. 
- */
-#define CHUNK_HEADS	(32 - CHUNK_BASE)
-
-
-#ifdef CHUNK_DIAG
-/*
- * Chunk diagnostics
- */
-typedef struct _chunk_diag_t {
-	const char     *cd_file;	/* File which requested chunk */
-
-	int		cd_line;	/* Line in requesting file */
-
-} chunk_diag_t;
-#endif /* CHUNK_DIAG */
-
-/*
- * The block header.
- */
-struct _chunk_head_t;
-typedef struct _chunk_head_t chunk_head_t;
-
-typedef struct _chunk_block_t {
-	qelem_t		cb_qelem;	/* Circular queue of blocks */
-
-	chunk_head_t   *cb_head;	/* The chunk head I belong to */
-
-	void	       *cb_blk;		/* Allocated memory block */
-
-	uint16_t	cb_ref;		/* Number of used chunks of block */
-	
-} chunk_block_t;
-
-
-/*
- * The chunk header.
- */
-struct _chunk_grpent_t;
-typedef struct _chunk_grpent_t chunk_grpent_t;
-typedef struct _chunk_t {
-	qelem_t		c_qelem;	/* Circular queue of chunks */
-
-	chunk_block_t  *c_blk;		/* The block I belong to */
-
-#ifdef CHUNK_DIAG
-    	chunk_diag_t	c_diag;		/* The diagnostics structure */
-#endif /* CHUNK_DIAG */
-
-	chunk_grpent_t *c_grpent;
-} chunk_t;
-
-/*
- * The head of a chunk size. Each predefined size has it's own head keeping
- * track of all blocks and chunks for the size.
- */
-struct _chunk_head_t {
-	size_t		ch_size;	/* Chunk size */
-	int		ch_nchkperblk;	/* Number pf chunks per block */
-
-	size_t		ch_blksz;	/* Size of a block */
-	int		ch_nblks;	/* Number of allocated blocks */
-
-	chunk_block_t  *ch_blks;	/* Circular list of blocks */
-
-	chunk_t	       *ch_cnks;	/* Circular list of chunks in use */
-
-	size_t		ch_nfree;	/* Number of free chunks */
-	chunk_t	       *ch_free;	/* Circular list of free chunks */
-
-};
-
-
-/*
- * The chunk group structure.
- */
-typedef struct _chunk_group_t {
-	qelem_t		cg_qelem;	/* List of chunk groups */
-	
-	char           *cg_name;	/* Name of group */
-	
-	chunk_grpent_t *cg_ent;		/* List of chunks in the group */
-
-} chunk_group_t;
-
-
-/*
- * The chunk group entry structure.
- */
-struct _chunk_grpent_t {
-	qelem_t		ce_qelem;	/* Circular list of entries */
-	
-	chunk_group_t  *ce_grp;		/* The group I belong to */
-
-	chunk_t	       *ce_cnk;		/* Pointer to the chunk */
-}; 
-
-/*
- * Public function declarations
- */
-#ifdef CHUNK_DIAG
-void   *_chunk (size_t, const char *, const char *, int);
-#define chunk(siz,label)	_chunk((siz),(label),__FILE__,__LINE__)
-void   *_rechunk (void *, size_t, const char *, const char *, int);
-#define rechunk(ptr,siz,label)	_rechunk((ptr),(siz),(label),__FILE__,__LINE__)
-void   *_chunkdup (const void *, size_t, const char *, const char *, int);
-#define chunkdup(ptr,siz,label)	_chunkdup((ptr),(siz),(label),__FILE__,__LINE__)
-char   *_chunk_strncat (const char *, const char *, size_t, const char *, const char *, int);
-#define chunk_strncat(str,new,n,label) _chunk_strncat((str),(new),(n),(label),__FILE__,__LINE__)
-char   *_chunk_sprintf (const char *, const char *, int, const char *, ...);
-#define chunk_sprintf(label,fmt,...) _chunk_sprintf((label),__FILE__,__LINE__,(fmt),__VA_ARGS__)
-#else /* CHUNK_DIAG */
-void   *chunk (size_t, const char *);
-void   *rechunk (void *, size_t, const char *);
-void   *chunkdup (const void *, size_t, const char *);
-char   *chunk_strncat (const char *, const char *, size_t, const char *);
-char   *chunk_sprintf (const char *, char *, ...);
-#endif /* CHUNK_DIAG */
-void	unchunk (void *);
-void	unchunk_group (const char *);
-void	chunk_check (FILE *, const char *);
-size_t	chunksize (void *);
-
-
-#endif	/* _CLIXON_CHUNK_H_ */
diff --git a/datastore/keyvalue/clixon_keyvalue.c b/datastore/keyvalue/clixon_keyvalue.c
deleted file mode 100644
index 39a11134..00000000
--- a/datastore/keyvalue/clixon_keyvalue.c
+++ /dev/null
@@ -1,1130 +0,0 @@
-/*
- *
-  ***** BEGIN LICENSE BLOCK *****
- 
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
-
-  This file is part of CLIXON.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of
-  the GNU General Public License Version 3 or later (the "GPL"),
-  in which case the provisions of the GPL are applicable instead
-  of those above. If you wish to allow use of your version of this file only
-  under the terms of the GPL, and not to allow others to
-  use your version of this file under the terms of Apache License version 2, 
-  indicate your decision by deleting the provisions above and replace them with
-  the  notice and other provisions required by the GPL. If you do not delete
-  the provisions above, a recipient may use your version of this file under
-  the terms of any one of the Apache License version 2 or the GPL.
-
-  ***** END LICENSE BLOCK *****
- */
-/*
- * An xml database consists of key-value pairs for xml-trees.
- * Each node in an xml-tree has a key and an optional value.
- * The key (xmlkey) is constructed from the xml node name concatenated
- * with its ancestors and any eventual list keys.
- * A xmlkeyfmt is a help-structure used when accessing the XML database.
- * It consists of an xmlkey but with the key fields replaced with wild-chars(%s)
- * Example: /aaa/bbb/%s/%s/ccc
- * Such an xmlkeyfmt can be obtained from a yang-statement by following
- * its ancestors to the root module. If one of the ancestors is a list, 
- * a wildchar (%s) is inserted for each key.
- * These xmlkeyfmt keys are saved and used in cli callbacks such as when
- * modifying syntax (eg cli_merge/cli_delete) or when completing for sub-symbols
- * In this case, the variables are set and the wildcards can be instantiated.
- * An xml tree can then be formed that can be used to the xmldb_get() or 
- * xmldb_put() functions.
- * The relations between the functions and formats are as follows:
- *
- * +-----------------+                   +-----------------+
- * | yang-stmt       | yang2api_path_fmt |   api_path_fmt  | api_path_fmt2xpath
- * | list aa,leaf k  | ----------------->|     /aa=%s      |---------------->
- * +-----------------+                   +-----------------+
- *                                               |
- *                                               | api_path_fmt2api_path
- *                                               | k=17
- *                                               v
- * +-------------------+                +-----------------+
- * | xml-tree/cxobj    |   xmlkey2xml   |api_path  RFC3986|
- * | <aa><k>17</k></aa>| <------------- |   /aa=17        |
- * +-------------------+                +-----------------+
- *
- * Alternative for xmlkeyfmt would be eg:
- * RESTCONF:     /interfaces/interface=%s/ipv4/address/ip=%s (used)
- * XPATH:        /interfaces/interface[name='%s']/ipv4/address/[ip'=%s']
- *
- * Paths through the code (for coverage)
- *   cli_callback_generate       +----------------+
- *   cli_expand_var_generate     | yang2api_path_fmt |
- *  yang  ------------->         |                |
- *                               +----------------+
- * dependency on clixon handle:
- * clixon_xmldb_dir()
- * clicon_dbspec_yang(h)
- */
-
-#ifdef HAVE_CONFIG_H
-#include "clixon_config.h" /* generated by config & autoconf */
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <limits.h>
-#include <fnmatch.h>
-#include <stdint.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <assert.h>
-#include <syslog.h>
-
-/* cligen */
-#include <cligen/cligen.h>
-
-/* clicon */
-#include <clixon/clixon.h>
-
-#include "clixon_chunk.h"
-#include "clixon_qdb.h"
-#include "clixon_keyvalue.h"
-
-#define handle(xh) (assert(kv_handle_check(xh)==0),(struct kv_handle *)(xh))
-
-/* Magic to ensure plugin sanity. */
-#define KV_HANDLE_MAGIC 0xfa61a402
-
-/*! Internal structure of keyvalue datastore handle. 
- */
-struct kv_handle {
-    int        kh_magic;    /* magic */
-    char      *kh_dbdir;    /* Directory of database files */
-    yang_spec *kh_yangspec;    /* Yang spec if this datastore */
-};
-
-/*! Check struct magic number for sanity checks
- * return 0 if OK, -1 if fail.
- */
-static int
-kv_handle_check(xmldb_handle xh)
-{
-    /* Dont use handle macro to avoid recursion */
-    struct kv_handle *kh = (struct kv_handle *)(xh);
-
-    return kh->kh_magic == KV_HANDLE_MAGIC ? 0 : -1;
-}
-
-/*! Database locking for candidate and running non-persistent
- * Store an integer for running and candidate containing
- * the session-id of the client holding the lock.
- */
-static int _running_locked = 0;
-static int _candidate_locked = 0;
-static int _startup_locked = 0;
-
-/*! Translate from symbolic database name to actual filename in file-system
- * @param[in]   xh       XMLDB handle
- * @param[in]   db       Symbolic database name, eg "candidate", "running"
- * @param[out]  filename Filename. Unallocate after use with free()
- * @retval      0        OK
- * @retval     -1        Error
- * @note Could need a way to extend which databases exists, eg to register new.
- * The currently allowed databases are: 
- *   candidate, tmp, running, result
- * The filename reside in CLICON_XMLDB_DIR option
- */
-static int
-kv_db2file(struct kv_handle *kh, 
-	   const char       *db,
-	   char            **filename)
-{
-    int   retval = -1;
-    cbuf *cb;
-    char *dir;
-
-    if ((cb = cbuf_new()) == NULL){
-	clicon_err(OE_XML, errno, "cbuf_new");
-	goto done;
-    }
-    if ((dir = kh->kh_dbdir) == NULL){
-	clicon_err(OE_XML, errno, "dbdir not set");
-	goto done;
-    }
-    if (strcmp(db, "running") != 0 && 
-	strcmp(db, "candidate") != 0 && 
-	strcmp(db, "startup") != 0 && 
-	strcmp(db, "tmp") != 0){
-	clicon_err(OE_XML, 0, "No such database: %s", db);
-	goto done;
-    }
-    cprintf(cb, "%s/%s_db", dir, db);
-    if ((*filename = strdup4(cbuf_get(cb))) == NULL){
-	clicon_err(OE_UNIX, errno, "strdup");
-	goto done;
-    }
-    retval = 0;
- done:
-    if (cb)
-	cbuf_free(cb);
-    return retval;
-}
-
-/*! Help function to append key values from an xml list to a cbuf 
- * Example, a yang node x with keys a and b results in "x/a/b"
- */
-static int
-append_listkeys(cbuf      *ckey, 
-		cxobj     *xt, 
-		yang_stmt *ys)
-{
-    int        retval = -1;
-    yang_stmt *ykey;
-    cxobj     *xkey;
-    cg_var    *cvi;
-    cvec      *cvk = NULL; /* vector of index keys */
-    char      *keyname;
-    char      *bodyenc;
-    int        i=0;
-
-    cvk = ys->ys_cvec; /* Use Y_LIST cache, see ys_populate_list() */
-    cvi = NULL;
-    /* Iterate over individual keys  */
-    while ((cvi = cvec_each(cvk, cvi)) != NULL) {
-	keyname = cv_string_get(cvi);
-	if ((xkey = xml_find(xt, keyname)) == NULL){
-	    clicon_err(OE_XML, errno, "XML list node \"%s\" does not have key \"%s\" child",
-		       xml_name(xt), keyname);
-	    goto done;
-	}
-	if (uri_percent_encode(&bodyenc, "%s", xml_body(xkey)) < 0)
-	    goto done;
-	if (i++)
-	    cprintf(ckey, ",");
-	else
-	    cprintf(ckey, "=");
-	cprintf(ckey, "%s", bodyenc);
-	free(bodyenc); 
-	bodyenc = NULL;
-    }
-    retval = 0;
- done:
-    return retval;
-}
-
-/*! Help function to create xml key values 
- * @param[in,out] x   Parent
- * @param[in]     ykey
- * @param[in]     arg
- * @param[in]     keyname  yang key name
- */
-static int
-create_keyvalues(cxobj     *x, 
-		 yang_stmt *ykey, 
-		 char      *arg, 
-		 char      *keyname)
-{
-    int        retval = -1;
-    cxobj     *xn;
-    cxobj     *xb;
-
-    /* Check if key node exists */
-    if ((xn = xml_new_spec(keyname, x, ykey)) == NULL)
-	goto done;
-    if ((xb = xml_new("body", xn)) == NULL)
-	goto done;
-    xml_type_set(xb, CX_BODY);
-    xml_value_set(xb, arg);
-    retval = 0;
- done:
-    return retval;
-}
-
-
-/*!
- * @param[in]   xk     xmlkey
- * @param[out]  xt     XML tree as result
- * XXX cannot handle top-level list
- */
-static int
-get(char      *dbname,
-    yang_spec *ys,
-    char      *xk,
-    char      *val,
-    cxobj     *xt)
-{
-    int         retval = -1;
-    char      **vec = NULL;
-    int         nvec;
-    char      **valvec = NULL;
-    int         nvalvec;
-    int         i;
-    int         j;
-    char       *name;
-    char       *restval;
-    yang_stmt  *y;
-    cxobj      *x;
-    cxobj      *xc;
-    cxobj      *xb;
-    yang_stmt *ykey;
-    cg_var    *cvi;
-    cvec      *cvk = NULL; /* vector of index keys */
-    char      *keyname;
-    char      *arg;
-    char      *argdec;
-    cbuf      *cb;
-    
-    //    clicon_debug(1, "%s xkey:%s val:%s", __FUNCTION__, xk, val);
-    x = xt;
-    if (xk == NULL || *xk!='/'){ 
-	clicon_err(OE_DB, 0, "Invalid key: %s", xk);
-	goto done;
-    }
-    if ((vec = clicon_strsep(xk, "/", &nvec)) == NULL)
-	goto done;
-    /* Element 0 is NULL '/', 
-       Element 1 is top symbol and needs to find subs in all modules:
-       spec->module->syntaxnode
-    */
-    if (nvec < 2){
-	clicon_err(OE_XML, 0, "Malformed key: %s", xk);
-	goto done;
-    }
-    i = 1;
-    while (i<nvec){
-	name = vec[i]; /* E.g "x=1,2" -> name:x restval=1,2 */
-	if ((restval = index(name, '=')) != NULL){
-	    *restval = '\0';
-	    restval++;
-	}
-	if (i == 1){ /* spec->module->node */
-	    if ((y = yang_find_topnode(ys, name, YC_DATANODE)) == NULL){
-		clicon_err(OE_UNIX, errno, "No yang node found: %s", name);
-		goto done;
-	    }
-	}
-	else
-	    if ((y = yang_find_datanode((yang_node*)y, name)) == NULL){
-		clicon_err(OE_UNIX, errno, "No yang node found: %s", name);
-		goto done;
-	    }
-	switch (y->ys_keyword){
-	case Y_LEAF_LIST:
-	    /* 
-	     * If xml element is a leaf-list, then the next element is expected to
-	     * be a value
-	     */
-	    if (uri_percent_decode(&argdec, restval) < 0)
-		goto done;
-	    if ((xc = xml_find(x, name))==NULL ||
-		(xb = xml_find(xc, argdec))==NULL){
-		if ((xc = xml_new_spec(name, x, y)) == NULL)
-		    goto done;
-		/* Assume body is created at end of function */
-	    }
-	    free(argdec);
-	    argdec = NULL;
-	    break;
-	case Y_LIST:
-	    /* 
-	     * If xml element is a list, then the next element(s) is expected to be
-	     * a key value. Check if this key value is already in the xml tree,
-	     * otherwise create it.
-	     */
-	    if ((ykey = yang_find((yang_node*)y, Y_KEY, NULL)) == NULL){
-		clicon_err(OE_XML, errno, "%s: List statement \"%s\" has no key", 
-			   __FUNCTION__, y->ys_argument);
-		goto done;
-	    }
-	    /* The value is a list of keys: <key>[ <key>]*  */
-	    if ((cvk = yang_arg2cvec(ykey, " ")) == NULL)
-		goto done;
-	    if ((cb = cbuf_new()) == NULL){
-		clicon_err(OE_XML, errno, "cbuf_new");
-		goto done;
-	    }
-	    cvi = NULL;
-	    /* Iterate over individual yang keys  */
-	    cprintf(cb, "%s", name);
-	    if (valvec)
-		free(valvec);
-	    if ((valvec = clicon_strsep(restval, ",", &nvalvec)) == NULL)
-		goto done;
-	    if (cvec_len(cvk)!=nvalvec){
-		retval = 0;
-		goto done;
-	    }
-	    j = 0;
-	    while ((cvi = cvec_each(cvk, cvi)) != NULL){
-		if (j>=nvalvec)
-		    break;
-		arg = valvec[j++];
-		if (uri_percent_decode(arg, &argdec) < 0)
-		    goto done;
-		cprintf(cb, "[%s='%s']", cv_string_get(cvi), argdec);
-		free(argdec);
-		argdec=NULL;
-	    }
-	    if ((xc = xpath_first(x, cbuf_get(cb))) == NULL){
-		if ((xc = xml_new_spec(name, x, y)) == NULL)
-		    goto done;
-		cvi = NULL;
-		//		i -= cvec_len(cvk);
-		/* Iterate over individual yang keys  */
-		j=0;
-		while ((cvi = cvec_each(cvk, cvi)) != NULL) {
-		    if (j>=nvalvec)
-			break;
-		    arg = valvec[j++];
-		    keyname = cv_string_get(cvi);
-		    if (uri_percent_decode(arg, &argdec) < 0)
-			goto done;
-		    if (create_keyvalues(xc,
-					 ykey,
-					 argdec, 
-					 keyname) < 0)
-			goto done;
-		    free(argdec); 
-		    argdec = NULL;
-		} /* while */
-	    }
-	    if (cb){
-		cbuf_free(cb);
-		cb = NULL;
-	    }
-	    if (cvk){
-		cvec_free(cvk);
-		cvk = NULL;
-	    }
-	    break;
-	case Y_LEAF:
-	case Y_CONTAINER:
-	default: 
-	    if ((xc = xml_find(x, name))==NULL)
-		if ((xc = xml_new_spec(name, x, y)) == NULL)
-		    goto done;
-	    break;
-	} /* switch */
-	x = xc;
-	i++;
-    }
-    if (val && xml_body(x)==NULL){
-	if ((x = xml_new("body", x)) == NULL)
-	    goto done;
-	xml_type_set(x, CX_BODY);
-	xml_value_set(x, val);
-    }
-    if(debug>1){
-	fprintf(stderr, "%s %s\n", __FUNCTION__, xk);
-	clicon_xml2file(stderr, xt, 0, 1);
-    }
-    retval = 0;
- done:
-    if (vec)
-	free(vec);
-    if (valvec)
-	free(valvec);
-    if (cvk)
-	cvec_free(cvk);
-    return retval;
-}
-
-/*! Connect to a datastore plugin
- * @retval  handle  Use this handle for other API calls
- * @retval  NULL    Error
- * @note You can do several connects, and have multiple connections to the same
- *       datastore
- */
-xmldb_handle
-kv_connect(void)
-{
-    struct kv_handle *kh;
-    xmldb_handle      xh = NULL;
-    int               size;
-
-    size = sizeof(struct kv_handle);
-    if ((kh = malloc(size)) == NULL){
-	clicon_err(OE_UNIX, errno, "malloc");
-	goto done;
-    }
-    memset(kh, 0, size);
-    kh->kh_magic = KV_HANDLE_MAGIC;
-    xh = (xmldb_handle)kh;
-  done:
-    return xh;
-}
-
-/*! Disconnect from a datastore plugin and deallocate handle
- * @param[in]  handle  Disconect and deallocate from this handle
- * @retval     0       OK
-  */
-int
-kv_disconnect(xmldb_handle xh)
-{
-    int               retval = -1;
-    struct kv_handle *kh = handle(xh);
-
-    if (kh){
-	if (kh->kh_dbdir)
-	    free(kh->kh_dbdir);
-	free(kh);
-    }
-    retval = 0;
-    // done:
-    return retval;
-}
-
-/*! Get value of generic plugin option. Type of value is givenby context
- * @param[in]  xh      XMLDB handle
- * @param[in]  optname Option name
- * @param[out] value   Pointer to Value of option
- * @retval     0       OK
- * @retval    -1       Error
- */
-int
-kv_getopt(xmldb_handle xh, 
-	  char        *optname,
-	  void       **value)
-{
-    int               retval = -1;
-    struct kv_handle *kh = handle(xh);
-
-    if (strcmp(optname, "yangspec") == 0)
-	*value = kh->kh_yangspec;
-    else if (strcmp(optname, "dbdir") == 0)
-	*value = kh->kh_dbdir;
-    else{
-	clicon_err(OE_PLUGIN, 0, "Option %s not implemented by plugin", optname);
-	goto done;
-    }
-    retval = 0;
- done:
-    return retval;
-}
-
-/*! Set value of generic plugin option. Type of value is givenby context
- * @param[in]  xh      XMLDB handle
- * @param[in]  optname Option name
- * @param[in]  value   Value of option
- * @retval     0       OK
- * @retval    -1       Error
- */
-int
-kv_setopt(xmldb_handle xh, 
-	  char        *optname,
-	  void        *value)
-{
-    int               retval = -1;
-    struct kv_handle *kh = handle(xh);
-
-    if (strcmp(optname, "yangspec") == 0)
-	kh->kh_yangspec = (yang_spec*)value;
-    else if (strcmp(optname, "dbdir") == 0){
-	if (value && (kh->kh_dbdir = strdup((char*)value)) == NULL){
-	    clicon_err(OE_UNIX, 0, "strdup");
-	    goto done;
-	}
-    }
-    else{
-	clicon_err(OE_PLUGIN, 0, "Option %s not implemented by plugin", optname);
-	goto done;
-    }
-    retval = 0;
- done:
-    return retval;
-}
-
-/*! Get content of database using xpath. return a set of matching sub-trees
- * The function returns a minimal tree that includes all sub-trees that match
- * xpath.
- * This is a clixon datastore plugin of the the xmldb api
- * @see xmldb_get
- */
-int
-kv_get(xmldb_handle  xh,
-       const char   *db, 
-       char         *xpath,
-       int           config,
-       cxobj       **xtop)
-{
-    int             retval = -1;
-    struct kv_handle *kh = handle(xh);
-    yang_spec      *yspec;
-    char           *dbfile = NULL;
-    cxobj         **xvec = NULL;
-    size_t          xlen;
-    int             i;
-    int             npairs;
-    struct db_pair *pairs;
-    cxobj          *xt = NULL;
-
-    clicon_debug(2, "%s", __FUNCTION__);
-    if (kv_db2file(kh, db, &dbfile) < 0)
-	goto done;
-    if (dbfile==NULL){
-	clicon_err(OE_XML, 0, "dbfile NULL");
-	goto done;
-    }
-    if ((yspec =  kh->kh_yangspec) == NULL){
-	clicon_err(OE_YANG, ENOENT, "No yang spec");
-	goto done;
-    }
-    /* Read in complete database (this can be optimized) */
-    if ((npairs = db_regexp(dbfile, "", __FUNCTION__, &pairs, 0)) < 0)
-	goto done;
-    if ((xt = xml_new_spec("config", NULL, yspec)) == NULL)
-	goto done;
-    /* Translate to complete xml tree */
-    for (i = 0; i < npairs; i++) {
-	if (get(dbfile, 
-		yspec, 
-		pairs[i].dp_key, /* xml key */
-		pairs[i].dp_val, /* may be NULL */
-		xt) < 0)
-	    goto done;
-    }
-    if (xpath_vec(xt, xpath?xpath:"/", &xvec, &xlen) < 0)
-	goto done;
-    /* If vectors are specified then filter out everything else,
-     * otherwise return complete tree.
-     */
-    if (xvec != NULL){
-	for (i=0; i<xlen; i++)
-	    xml_flag_set(xvec[i], XML_FLAG_MARK);
-    }
-    /* Top is special case */
-    if (!xml_flag(xt, XML_FLAG_MARK))
-	if (xml_tree_prune_flagged_sub(xt, XML_FLAG_MARK, 1, NULL) < 0)
-	    goto done;
-    if (xml_apply(xt, CX_ELMNT, (xml_applyfn_t*)xml_flag_reset, (void*)XML_FLAG_MARK) < 0)
-	goto done;
-    /* Add default values (if not set) */
-    if (xml_apply(xt, CX_ELMNT, xml_default, NULL) < 0)
-	goto done;
-    /* Order XML children according to YANG */
-    if (xml_apply(xt, CX_ELMNT, xml_order, NULL) < 0)
-	goto done;
-    if (xml_apply(xt, CX_ELMNT, xml_sanity, NULL) < 0)
-	goto done;
-    if (debug>1)
-    	clicon_xml2file(stderr, xt, 0, 1);
-    *xtop = xt;
-    retval = 0;
- done:
-    if (dbfile)
-	free(dbfile);
-    if (xvec)
-	free(xvec);
-    unchunk_group(__FUNCTION__);  
-    return retval;
-
-}
-
-/*! Add data to database internal recursive function
- * @param[in]  dbfile Name of database to search in (filename incl dir path)
- * @param[in]  xt     xml-node.
- * @param[in]  ys     Yang statement corresponding to xml-node
- * @param[in]  op     OP_MERGE, OP_REPLACE, OP_REMOVE, etc 
- * @param[in]  xkey0  aggregated xmlkey
- * @retval     0      OK
- * @retval     -1     Error
- * @note XXX op only supports merge
- */
-static int
-put(char               *dbfile, 
-    cxobj              *xt,
-    yang_stmt          *ys, 
-    enum operation_type op, 
-    const char         *xk0)
-{
-    int        retval = -1;
-    cxobj     *x = NULL;
-    char      *xk;
-    cbuf      *cbxk = NULL;
-    char      *body;
-    yang_stmt *y;
-    int        exists;
-    char      *bodyenc=NULL;
-    char      *opstr;
-
-    clicon_debug(1, "%s xk0:%s ys:%s", __FUNCTION__, xk0, ys->ys_argument);
-    if (debug){
-	xml_print(stderr, xt);
-	//	yang_print(stderr, (yang_node*)ys);
-    }
-    if ((opstr = xml_find_value(xt, "operation")) != NULL)
-	if (xml_operation(opstr, &op) < 0)
-	    goto done;
-    body = xml_body(xt);
-    if ((cbxk = cbuf_new()) == NULL){
-	clicon_err(OE_UNIX, errno, "cbuf_new");
-	goto done;
-    }
-    cprintf(cbxk, "%s/%s", xk0, xml_name(xt));
-    switch (ys->ys_keyword){
-    case Y_LIST: /* Note: can have many keys */
-	if (append_listkeys(cbxk, xt, ys) < 0)
-	    goto done;
-	break;
-    case Y_LEAF_LIST:
-	if (uri_percent_encode(&bodyenc, "%s", body) < 0)
-	    goto done;
-	cprintf(cbxk, "=%s", bodyenc);
-	break;
-    default:
-	break;
-    }
-    xk = cbuf_get(cbxk);
-    //    fprintf(stderr, "%s %s\n", key, body?body:"");
-    /* Write to database, key and a vector of variables */
-    switch (op){
-    case OP_CREATE:
-	if ((exists = db_exists(dbfile, xk)) < 0)
-	    goto done;
-	if (exists == 1){
-	    clicon_err(OE_DB, 0, "OP_CREATE: %s already exists in database", xk);
-	    goto done;
-	}
-    case OP_MERGE:
-    case OP_REPLACE:
-	if (db_set(dbfile, xk, body?body:NULL, body?strlen(body)+1:0) < 0)
-	    goto done;
-	break;
-    case OP_DELETE:
-	if ((exists = db_exists(dbfile, xk)) < 0)
-	    goto done;
-	if (exists == 0){
-	    clicon_err(OE_DB, 0, "OP_DELETE: %s does not exists in database", xk);
-	    goto done;
-	}
-    case OP_REMOVE:
-	switch (ys->ys_keyword){
-	case Y_LIST:
-	case Y_CONTAINER:{
-	    struct db_pair *pairs;
-	    int             npairs;
-	    cbuf           *cbrx;
-	    int             i;
-
-	    if ((cbrx = cbuf_new()) == NULL){
-		clicon_err(OE_UNIX, errno, "cbuf_new");
-		goto done;
-	    }
-	    cprintf(cbrx, "^%s.*$", xk);
-	    if ((npairs = db_regexp(dbfile, cbuf_get(cbrx), __FUNCTION__, 
-				    &pairs, 0)) < 0)
-		goto done;
-	    /* Translate to complete xml tree */
-	    for (i = 0; i < npairs; i++) 
-		if (db_del(dbfile, pairs[i].dp_key) < 0)
-		    goto done;
-	    if (cbrx)
-		cbuf_free(cbrx);
-	    /* Skip recursion, we have deleted whole subtree */
-	    retval = 0;
-	    goto done;
-	    break;
-	}
-	default:
-	    if (db_del(dbfile, xk) < 0)
-		goto done;
-	    break;
-	}
-
-	break;
-    case OP_NONE:
-	break;
-    }
-    /* For every node, create a key with values */
-    while ((x = xml_child_each(xt, x, CX_ELMNT)) != NULL){
-	if ((y = yang_find_datanode((yang_node*)ys, xml_name(x))) == NULL){
-	    clicon_err(OE_UNIX, 0, "No yang node found: %s", xml_name(x));
-	    goto done;
-	}
-	if (put(dbfile, x, y, op, xk) < 0)
-	    goto done;
-    }
-    retval = 0;
- done:
-    if (cbxk)
-	cbuf_free(cbxk);
-    if (bodyenc)
-	free(bodyenc);
-    unchunk_group(__FUNCTION__);
-    return retval;
-}
-
-/*! Modify database provided an xml tree and an operation
- * This is a clixon datastore plugin of the the xmldb api
- * @see xmldb_put
- */
-int
-kv_put(xmldb_handle        xh,
-       const char         *db, 
-       enum operation_type op,
-       cxobj              *xt)
-{
-    int        retval = -1;
-    struct kv_handle *kh = handle(xh);
-    cxobj     *x = NULL;
-    yang_stmt *ys;
-    yang_spec *yspec;
-    char      *dbfilename = NULL;
-
-    if ((yspec =  kh->kh_yangspec) == NULL){
-	clicon_err(OE_YANG, ENOENT, "No yang spec");
-	goto done;
-    }
-    if (kv_db2file(kh, db, &dbfilename) < 0)
-	goto done;
-    if (op == OP_REPLACE){
-	if (db_delete(dbfilename) < 0) 
-	    goto done;
-	if (db_init(dbfilename) < 0) 
-	    goto done;
-    }
-    //	clicon_log(LOG_WARNING, "%s", __FUNCTION__);
-    while ((x = xml_child_each(xt, x, CX_ELMNT)) != NULL){
-	if ((ys = yang_find_topnode(yspec, xml_name(x), YC_DATANODE)) == NULL){
-	    clicon_err(OE_UNIX, errno, "No yang node found: %s", xml_name(x));
-	    goto done;
-	}
-	if (put(dbfilename, /* database name */
-		x,          /* xml root node */
-		ys,         /* yang statement of xml node */
-		op,         /* operation, eg merge/delete */
-		""          /* aggregate xml key */
-		) < 0)
-	    goto done;
-    }
-    retval = 0;
- done:
-    if (dbfilename)
-	free(dbfilename);
-    return retval;
-}
-
-/*! Copy database from db1 to db2
- * @param[in]  xh    XMLDB handle
- * @param[in]  from  Source database copy
- * @param[in]  to    Destination database
- * @retval -1  Error
- * @retval  0  OK
-  */
-int 
-kv_copy(xmldb_handle xh, 
-	const char  *from,
-	const char  *to)
-{
-    int           retval = -1;
-    struct kv_handle *kh = handle(xh);
-    char         *fromfile = NULL;
-    char         *tofile = NULL;
-
-    /* XXX lock */
-    if (kv_db2file(kh, from, &fromfile) < 0)
-	goto done;
-    if (kv_db2file(kh, to, &tofile) < 0)
-	goto done;
-    if (clicon_file_copy(fromfile, tofile) < 0)
-	goto done;
-    retval = 0;
- done:
-    if (fromfile)
-	free(fromfile);
-    if (tofile)
-	free(tofile);
-    return retval;
-}
-
-/*! Lock database
- * @param[in]  xh      XMLDB handle
- * @param[in]  db   Database
- * @param[in]  pid  Process id
- * @retval -1  Error
- * @retval  0  OK
-  */
-int 
-kv_lock(xmldb_handle xh, 
-	const char  *db,
-	int          pid)
-{
-    int retval = -1;
-    //    struct kv_handle *kh = handle(xh);
-    if (strcmp("running", db) == 0)
-	_running_locked = pid;
-    else if (strcmp("candidate", db) == 0)
-	_candidate_locked = pid;
-    else if (strcmp("startup", db) == 0)
-	_startup_locked = pid;
-    else{
-	clicon_err(OE_DB, 0, "No such database: %s", db);
-	goto done;
-    }
-    clicon_debug(1, "%s: locked by %u",  db, pid);
-    retval = 0;
- done:
-    return retval;
-}
-
-/*! Unlock database
- * @param[in]  xh      XMLDB handle
- * @param[in]  db  Database
- * @param[in]  pid  Process id
- * @retval -1  Error
- * @retval  0  OK
- * Assume all sanity checks have been made
- */
-int 
-kv_unlock(xmldb_handle xh, 
-	  const char  *db)
-{
-    int retval = -1;
-    //    struct kv_handle *kh = handle(xh);
-    if (strcmp("running", db) == 0)
-	_running_locked = 0;
-    else if (strcmp("candidate", db) == 0)
-	_candidate_locked = 0;
-    else if (strcmp("startup", db) == 0)
-	_startup_locked = 0;
-    else{
-	clicon_err(OE_DB, 0, "No such database: %s", db);
-	goto done;
-    }
-    retval = 0;
- done:
-    return retval;
-}
-
-/*! Unlock all databases locked by pid (eg process dies) 
- * @param[in]  xh    XMLDB handle
- * @param[in]  pid   Process / Session id
- * @retval    -1     Error
- * @retval     0     Ok
- */
-int 
-kv_unlock_all(xmldb_handle xh, 
-	      int           pid)
-{
-    //    struct kv_handle *kh = handle(xh);
-
-    if (_running_locked == pid)
-	_running_locked = 0;
-    if (_candidate_locked == pid)
-	_candidate_locked = 0;
-    if (_startup_locked == pid)
-	_startup_locked = 0;
-    return 0;
-}
-
-/*! Check if database is locked
- * @param[in]  xh  XMLDB handle
- * @param[in]  db  Database
- * @retval    -1   Error
- * @retval     0   Not locked
- * @retval    >0   Id of locker
-  */
-int 
-kv_islocked(xmldb_handle xh, 
-	    const char  *db)
-{
-    int retval = -1;
-    //    struct kv_handle *kh = handle(xh);
-
-    if (strcmp("running", db) == 0)
-	retval = _running_locked;
-    else if (strcmp("candidate", db) == 0)
-	retval = _candidate_locked;
-    else if (strcmp("startup", db) == 0)
-	retval = _startup_locked;
-    else
-	clicon_err(OE_DB, 0, "No such database: %s", db);
-    return retval;
-}
-
-/*! Check if db exists 
- * @param[in]  xh      XMLDB handle
- * @param[in]  db  Database
- * @retval -1  Error
- * @retval  0  No it does not exist
- * @retval  1  Yes it exists
- */
-int 
-kv_exists(xmldb_handle xh, 
-	  const char  *db)
-{
-    int           retval = -1;
-    struct kv_handle *kh = handle(xh);
-    char         *filename = NULL;
-    struct stat  sb;
-
-    if (kv_db2file(kh, db, &filename) < 0)
-	goto done;
-    if (lstat(filename, &sb) < 0)
-	retval = 0;
-    else
-	retval = 1;
- done:
-    if (filename)
-	free(filename);
-    return retval;
-}
-
-/*! Delete database. Remove file 
- * @param[in]  xh      XMLDB handle
- * @param[in]  db  Database
- * @retval -1  Error
- * @retval  0  OK
- */
-int 
-kv_delete(xmldb_handle xh, 
-	  const char  *db)
-{
-    int           retval = -1;
-    struct kv_handle *kh = handle(xh);
-    char         *filename = NULL;
-
-    if (kv_db2file(kh, db, &filename) < 0)
-	goto done;
-    if (db_delete(filename) < 0)
-	goto done;
-    retval = 0;
- done:
-    if (filename)
-	free(filename);
-    return retval;
-}
-
-/*! Create / Initialize database 
- * @param[in]  xh      XMLDB handle
- * @param[in]  db  Database
- * @retval  0  OK
- * @retval -1  Error
- */
-int 
-kv_create(xmldb_handle xh, 
-	  const char  *db)
-{
-    int           retval = -1;
-    struct kv_handle *kh = handle(xh);
-    char         *filename = NULL;
-
-    if (kv_db2file(kh, db, &filename) < 0)
-	goto done;
-    if (db_init(filename) < 0)
-	goto done;
-    retval = 0;
- done:
-    if (filename)
-	free(filename);
-    return retval;
-}
-
-/*! plugin init function */
-int
-kv_plugin_exit(void)
-{
-    return 0;
-}
-
-static const struct xmldb_api api;
-
-/*! plugin init function */
-void *
-clixon_xmldb_plugin_init(int version)
-{
-    if (version != XMLDB_API_VERSION){
-	clicon_err(OE_DB, 0, "Invalid version %d expected %d", 
-		   version, XMLDB_API_VERSION);
-	goto done;
-    }
-    return (void*)&api;
- done:
-    return NULL;
-}
-
-static const struct xmldb_api api = {
-    1,
-    XMLDB_API_MAGIC,
-    clixon_xmldb_plugin_init,
-    kv_plugin_exit,
-    kv_connect,
-    kv_disconnect,
-    kv_getopt,
-    kv_setopt,
-    kv_get,
-    kv_put,
-    kv_copy,
-    kv_lock,
-    kv_unlock,
-    kv_unlock_all,
-    kv_islocked,
-    kv_exists,
-    kv_delete,
-    kv_create,
-};
-
-
-#if 0 /* Test program */
-/*
- * Turn this on to get an xpath test program 
- * Usage: clicon_xpath [<xpath>] 
- * read xml from input
- * Example compile:
- gcc -g -o keyvalue -I. -I../../lib ./clixon_keyvalue.c clixon_chunk.c clixon_qdb.c -lclixon -lcligen -lqdbm
-*/
-
-/*! Raw dump of database, just keys and values, no xml interpretation 
- * @param[in]  f       File
- * @param[in]  dbfile  File-name of database. This is a local file
- * @param[in]  rxkey   Key regexp, eg "^.*$"
- * @note This function can only be called locally.
- */
-int
-main(int    argc, 
-     char **argv)
-{
-    int             retval = -1;
-    int             npairs;
-    struct db_pair *pairs;
-    char           *rxkey = NULL;
-    char           *dbfilename;
-
-    if (argc != 2 && argc != 3){
-	fprintf(stderr, "usage: %s <dbfile> [rxkey]\n", argv[0]);
-	goto done;
-    }
-    dbfilename = argv[1];
-    if (argc == 3)
-	rxkey = argv[2];
-    else
-	rxkey = "^.*$";     /* Default is match all */
-
-    /* Get all keys/values for vector */
-    if ((npairs = db_regexp(dbfilename, rxkey, __FUNCTION__, &pairs, 0)) < 0)
-	goto done;
-    
-    for (npairs--; npairs >= 0; npairs--) 
-	fprintf(stdout, "%s %s\n", pairs[npairs].dp_key,
-		pairs[npairs].dp_val?pairs[npairs].dp_val:"");
-    retval = 0;
- done:
-    unchunk_group(__FUNCTION__);
-    return retval;
-}
-
-#endif /* Test program */
diff --git a/datastore/keyvalue/clixon_keyvalue.h b/datastore/keyvalue/clixon_keyvalue.h
deleted file mode 100644
index b11e15d5..00000000
--- a/datastore/keyvalue/clixon_keyvalue.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *
-  ***** BEGIN LICENSE BLOCK *****
- 
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
-
-  This file is part of CLIXON.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of
-  the GNU General Public License Version 3 or later (the "GPL"),
-  in which case the provisions of the GPL are applicable instead
-  of those above. If you wish to allow use of your version of this file only
-  under the terms of the GPL, and not to allow others to
-  use your version of this file under the terms of Apache License version 2, 
-  indicate your decision by deleting the provisions above and replace them with
-  the  notice and other provisions required by the GPL. If you do not delete
-  the provisions above, a recipient may use your version of this file under
-  the terms of any one of the Apache License version 2 or the GPL.
-
-  ***** END LICENSE BLOCK *****
-
-  Key-value store
- */
-#ifndef _CLIXON_KEYVALUE_H
-#define _CLIXON_KEYVALUE_H
-
-/*
- * Prototypes
- */
-int kv_get(xmldb_handle h, const char *db, char *xpath, int config, cxobj **xtop);
-int kv_put(xmldb_handle h, const char *db, enum operation_type op, cxobj *xt);
-int kv_dump(FILE *f, char *dbfilename, char *rxkey);
-int kv_copy(xmldb_handle h, const char *from, const char *to);
-int kv_lock(xmldb_handle h, const char *db, int pid);
-int kv_unlock(xmldb_handle h, const char *db);
-int kv_unlock_all(xmldb_handle h, int pid);
-int kv_islocked(xmldb_handle h, const char *db);
-int kv_exists(xmldb_handle h, const char *db);
-int kv_delete(xmldb_handle h, const char *db);
-int kv_init(xmldb_handle h, const char *db);
-
-#endif /* _CLIXON_KEYVALUE_H */
diff --git a/datastore/keyvalue/clixon_qdb.c b/datastore/keyvalue/clixon_qdb.c
deleted file mode 100644
index b80daf71..00000000
--- a/datastore/keyvalue/clixon_qdb.c
+++ /dev/null
@@ -1,588 +0,0 @@
-/*
- *
-  ***** BEGIN LICENSE BLOCK *****
- 
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
-
-  This file is part of CLIXON.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of
-  the GNU General Public License Version 3 or later (the "GPL"),
-  in which case the provisions of the GPL are applicable instead
-  of those above. If you wish to allow use of your version of this file only
-  under the terms of the GPL, and not to allow others to
-  use your version of this file under the terms of Apache License version 2, 
-  indicate your decision by deleting the provisions above and replace them with
-  the  notice and other provisions required by the GPL. If you do not delete
-  the provisions above, a recipient may use your version of this file under
-  the terms of any one of the Apache License version 2 or the GPL.
-
-  ***** END LICENSE BLOCK *****
-
- * @note Some unclarities with locking. man dpopen defines the following flags
- *       with dpopen:
- *       `DP_ONOLCK', which means it opens a database file without 
- *                    file locking,  
- *       `DP_OLCKNB', which means locking is performed without blocking.
- *
- *        While connecting as  a  writer, an  exclusive  lock is invoked to 
- *        the database file.  While connecting as a reader, a shared lock is
- *        invoked to the database file. The thread blocks until the lock is 
- *        achieved.  If `DP_ONOLCK' is used, the application is responsible  
- *        for  exclusion control.
- *        The code below uses for 
- *          write, delete:  DP_OLCKNB
- *          read:           DP_OLCKNB
- *        This means that a write fails if one or many reads are occurring, and
- *        a read or write fails if a write is occurring, and
- *        QDBM allows a single write _or_ multiple readers, but
- *	  not both. This is obviously extremely limiting.
- *        NOTE, the locking in netconf and xmldb is a write lock.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "clixon_config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include <errno.h>
-#include <syslog.h>
-#include <sys/types.h>
-#include <limits.h>
-#include <regex.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/param.h>
-
-#ifdef HAVE_DEPOT_H
-#include <depot.h> /* qdb api */
-#else /* HAVE_QDBM_DEPOT_H */
-#include <qdbm/depot.h> /* qdb api */
-#endif 
-
-#include <cligen/cligen.h>
-
-/* clicon */
-#include <clixon/clixon.h>
-
-#include "clixon_chunk.h"
-#include "clixon_qdb.h" 
-
-/*! Initialize database
- * @param[in]  file    database file
- * @param[in]  omode   see man dpopen
- */
-static int 
-db_init_mode(char *file, 
-	     int   omode)
-{
-    DEPOT *dp;
-
-    /* Open database for writing */
-    if ((dp = dpopen(file, omode | DP_OLCKNB, 0)) == NULL){
-	clicon_err(OE_DB, errno, "dpopen(%s): %s", 
-		   file, 
-		   dperrmsg(dpecode));
-	return -1;
-    }
-    clicon_debug(1, "db_init(%s)", file);
-    if (dpclose(dp) == 0){
-	clicon_err(OE_DB, errno, "db_set: dpclose: %s", 
-		   dperrmsg(dpecode));
-	return -1;
-    }
-    return 0;
-}
-
-/*! Open database for reading and writing
- * @param[in]  file    database file
- */
-int 
-db_init(char *file)
-{
-    return db_init_mode(file, DP_OWRITER | DP_OCREAT ); /* DP_OTRUNC? */
-}
-
-/*! Remove database by removing file, if it exists *
- * @param[in]  file    database file
- */
-int 
-db_delete(char *file)
-{
-    struct stat  sb;
-
-    if (stat(file, &sb) < 0){
-	return 0;
-    }
-    if (unlink(file) < 0){
-	clicon_err(OE_DB, errno, "unlink %s", file);
-	return -1;
-    }
-    return 0;
-}
-
-/*! Write data to database 
- * @param[in]  file    database file
- * @param[in]  key     database key
- * @param[out] data    Buffer containing content
- * @param[out] datalen Length of buffer
- * @retval  0 if OK: value returned. If not found, zero string returned
- * @retval -1 on error   
- */
-int 
-db_set(char  *file, 
-       char  *key, 
-       void  *data, 
-       size_t datalen)
-{
-    DEPOT *dp;
-
-    /* Open database for writing */
-    if ((dp = dpopen(file, DP_OWRITER|DP_OLCKNB , 0)) == NULL){
-	clicon_err(OE_DB, errno, "db_set: dpopen(%s): %s", 
-		file,
-		dperrmsg(dpecode));
-	return -1;
-    }
-    clicon_debug(2, "%s: db_put(%s, len:%d)", 
-		file, key, (int)datalen);
-    if (dpput(dp, key, -1, data, datalen, DP_DOVER) == 0){
-	clicon_err(OE_DB, errno, "%s: db_set: dpput(%s, %d): %s", 
-		file,
-		key,
-		datalen,
-		dperrmsg(dpecode));
-	dpclose(dp);
-	return -1;
-    }
-    if (dpclose(dp) == 0){
-	clicon_err(OE_DB, 0, "db_set: dpclose: %s", dperrmsg(dpecode));
-	return -1;
-    }
-    return 0;
-}
-
-/*! Get data from database 
- * @param[in]  file    database file
- * @param[in]  key     database key
- * @param[out] data    Pre-allocated buffer where data corresponding key is placed
- * @param[out] datalen Length of pre-allocated buffer
- * @retval  0 if OK: value returned. If not found, zero string returned
- * @retval -1 on error   
- * @see db_get_alloc  Allocates memory
- */
-int 
-db_get(char   *file, 
-       char   *key, 
-       void   *data, 
-       size_t *datalen)
-{
-    DEPOT *dp;
-    int len;
-
-    /* Open database for readinf */
-    if ((dp = dpopen(file, DP_OREADER | DP_OLCKNB, 0)) == NULL){
-	clicon_err(OE_DB, errno, "%s: db_get(%s, %d): dpopen: %s", 
-		file,
-		key,
-		datalen,
-		dperrmsg(dpecode));
-	return -1;
-    }
-    len = dpgetwb(dp, key, -1, 0, *datalen, data);
-    if (len < 0){
-	if (dpecode == DP_ENOITEM){
-	    data = NULL;
-	    *datalen = 0;
-	}
-	else{
-	    clicon_err(OE_DB, errno, "db_get: dpgetwb: %s (%d)", 
-		    dperrmsg(dpecode), dpecode);
-	    dpclose(dp);
-	    return -1;
-	}
-    }
-    else
-	*datalen = len;	
-    clicon_debug(2, "db_get(%s, %s)=%s", file, key, (char*)data);
-    if (dpclose(dp) == 0){
-	clicon_err(OE_DB, errno, "db_get: dpclose: %s", dperrmsg(dpecode));
-	return -1;
-    }
-    return 0;
-}
-
-/*! Get data from database and allocates memory
- * Similar to db_get but returns a malloced pointer to the data instead 
- * of copying data to pre-allocated buffer. This is necessary if the 
- * length of the data is not known when calling the function.
- * @param[in]  file    database file
- * @param[in]  key     database key
- * @param[out] data    Allocated buffer where data corresponding key is placed
- * @param[out] datalen Length of pre-allocated buffer
- * @retval  0 if OK: value returned. If not found, zero string returned
- * @retval -1 on error   
- * @note: *data needs to be freed after use.
- * @code
- *  char             *lvec = NULL;
- *  size_t            len = 0;
- *  if (db_get-alloc(dbname, "a.0", &val, &vlen) == NULL)
- *     return -1;
- *  ..do stuff..
- *  if (val) free(val);
- * @endcode
- * @see db_get Pre-allocates memory
- */
-int 
-db_get_alloc(char   *file, 
-	     char   *key, 
-	     void  **data, 
-	     size_t *datalen)
-{
-    DEPOT *dp;
-    int len;
-
-    /* Open database for writing */
-    if ((dp = dpopen(file, DP_OREADER | DP_OLCKNB, 0)) == NULL){
-	clicon_err(OE_DB, errno, "%s: dpopen(%s): %s", 
-		   __FUNCTION__,
-		   file,
-		   dperrmsg(dpecode));
-	return -1;
-    }
-    if ((*data = dpget(dp, key, -1, 0, -1, &len)) == NULL){
-	if (dpecode == DP_ENOITEM){
-	    *datalen = 0;
-	    *data = NULL;
-	    len = 0;
-	}
-	else{
-	    /* No entry vs error? */
-	    clicon_err(OE_DB, errno, "db_get_alloc: dpgetwb: %s (%d)", 
-		    dperrmsg(dpecode), dpecode);
-	    dpclose(dp);
-	    return -1;
-	}
-    }
-    *datalen = len;
-    if (dpclose(dp) == 0){
-	clicon_err(OE_DB, errno, "db_get_alloc: dpclose: %s", dperrmsg(dpecode));
-	return -1;
-    }
-    return 0;
-}
-
-/*! Delete database entry
- * @param[in]  file    database file
- * @param[in]  key     database key
- * @retval  -1  on failure, 
- * @retval   0  if key did not exist 
- * @retval   1  if successful.
- */
-int 
-db_del(char *file, char *key)
-{
-    int retval = 0;
-    DEPOT *dp;
-
-    /* Open database for writing */
-    if ((dp = dpopen(file, DP_OWRITER | DP_OLCKNB, 0)) == NULL){
-	clicon_err(OE_DB, errno, "db_del: dpopen(%s): %s", 
-		file,
-		dperrmsg(dpecode));
-	return -1;
-    }
-    if (dpout(dp, key, -1)) {
-        retval = 1;
-    }
-    if (dpclose(dp) == 0){
-	clicon_err(OE_DB, errno, "db_del: dpclose: %s", dperrmsg(dpecode));
-	return -1;
-    }
-    return retval;
-}
-
-/*! Check if entry in database exists
- * @param[in]  file    database file
- * @param[in]  key     database key
- * @retval  1  if key exists in database
- * @retval  0  key does not exist in database
- * @retval -1  error
- */
-int 
-db_exists(char *file, 
-	  char *key)
-{
-    DEPOT *dp;
-    int len;
-
-    /* Open database for reading */
-    if ((dp = dpopen(file, DP_OREADER | DP_OLCKNB, 0)) == NULL){
-	clicon_err(OE_DB, errno, "%s: dpopen: %s", 
-		   __FUNCTION__, dperrmsg(dpecode));
-	return -1;
-    }
-
-    len = dpvsiz(dp, key, -1);
-    if (len < 0 && dpecode != DP_ENOITEM)
-	clicon_err(OE_DB, errno, "^s: dpvsiz: %s (%d)", 
-		   __FUNCTION__, dperrmsg(dpecode), dpecode);
-
-    if (dpclose(dp) == 0) {
-	clicon_err(OE_DB, errno, "%s: dpclose: %s", dperrmsg(dpecode),__FUNCTION__);
-	return -1;
-    }
-
-    return (len < 0) ? 0 : 1;
-}
-
-/*! Return all entries in database that match a regular expression.
- * @param[in]  file    database file
- * @param[in]  regexp  regular expression for database keys
- * @param[in]  label   for memory/chunk allocation
- * @param[out] pairs   Vector of database keys and values
- * @param[in]  noval   If set don't retreive values, just keys
- * @retval -1  on error   
- * @retval  n  Number of pairs
- * @code
- * struct db_pair *pairs;
- * int             npairs;
- * if ((npairs = db_regexp(dbname, "^/test/kalle$", __FUNCTION__, 
- *                         &pairs, 0)) < 0)
- *    err;
- * 
- * @endcode
- */
-int
-db_regexp(char            *file,
-	  char            *regexp, 
-	  const char      *label, 
-	  struct db_pair **pairs,
-	  int              noval)
-{
-    int npairs;
-    int status;
-    int retval = -1;
-    int vlen = 0;
-    char *key = NULL;
-    void *val = NULL;
-    char errbuf[512];
-    struct db_pair *pair;
-    struct db_pair *newpairs;
-    regex_t iterre;
-    DEPOT *iterdp = NULL;
-    regmatch_t pmatch[1];
-    size_t nmatch = 1;
-    
-    npairs = 0;
-    *pairs = NULL;
-    
-    if (regexp) {
-	if ((status = regcomp(&iterre, regexp, REG_EXTENDED)) != 0) {
-	    regerror(status, &iterre, errbuf, sizeof(errbuf));
-	    clicon_err(OE_DB, errno, "%s: regcomp: %s", __FUNCTION__, errbuf);
-	    return -1;
-	}
-    }
-    
-    /* Open database for reading */
-    if ((iterdp = dpopen(file, DP_OREADER | DP_OLCKNB, 0)) == NULL){
-	clicon_err(OE_DB, 0, "%s: dpopen(%s): %s", 
-		   __FUNCTION__, file, dperrmsg(dpecode));
-	goto quit;
-    }
-    
-    /* Initiate iterator */
-    if(dpiterinit(iterdp) == 0) {
-	clicon_err(OE_DB, errno, "%s: dpiterinit: %s", __FUNCTION__, dperrmsg(dpecode));
-	goto quit;
-    }
-    
-    /* Iterate through DB */
-    while((key = dpiternext(iterdp, NULL)) != NULL) {
-	
-	if (regexp && regexec(&iterre, key, nmatch, pmatch, 0) != 0) {
-	    free(key);
-	    continue;
-	}
-	
-	/* Retrieve value if required */
-	if ( ! noval) {
-	    if((val = dpget(iterdp, key, -1, 0, -1, &vlen)) == NULL) {
-		clicon_log(LOG_WARNING, "%s: dpget: %s", __FUNCTION__, dperrmsg(dpecode));
-		goto quit;
-	    }
-	}
-
-	/* Resize and populate resulting array */
-	newpairs = rechunk(*pairs, (npairs+1) * sizeof(struct db_pair), label);
-	if (newpairs == NULL) {
-	    clicon_err(OE_DB, errno, "%s: rechunk", __FUNCTION__);
-	    goto quit;
-	}
-	pair = &newpairs[npairs];
-	memset(pair, 0, sizeof(*pair));
-	
-	pair->dp_key = chunk_sprintf(label, "%s", key);
-	if (regexp)
-	    pair->dp_matched = chunk_sprintf(label, "%.*s",
-					     pmatch[0].rm_eo - pmatch[0].rm_so,
-					     key + pmatch[0].rm_so);
-	else
-	    pair->dp_matched = chunk_sprintf(label, "%s", key);
-	if (pair->dp_key == NULL || pair->dp_matched == NULL) {
-	    clicon_err(OE_DB, errno, "%s: chunk_sprintf");
-	    goto quit;
-	}
-	if ( ! noval) {
-	    if (vlen){
-		pair->dp_val = chunkdup(val, vlen, label);
-		if (pair->dp_val == NULL) {
-		    clicon_err(OE_DB, errno, "%s: chunkdup", __FUNCTION__);
-		    goto quit;
-		}
-	    }
-	    pair->dp_vlen = vlen;
-	    free(val);
-	    val = NULL;
-	}
-
-	(*pairs) = newpairs;
-	npairs++;
-	free(key);
-    }
-	
-    retval = npairs;
-    
-quit:
-    if (key)
-	free(key);
-    if (val)
-	free(val);
-    if (regexp)
-	regfree(&iterre);
-    if (iterdp)
-	dpclose(iterdp);
-    if (retval < 0)
-	unchunk_group(label);
-
-    return retval;
-}
-
-/*! Sanitize regexp string. Escape '\' etc.
- */
-char *
-db_sanitize(char *rx, const char *label)
-{
-  char *new;
-  char *k, *p, *s;
-
-  k = chunk_sprintf(__FUNCTION__, "%s", "");
-  p = rx;
-  while((s = strstr(p, "\\"))) {
-    if ((k = chunk_sprintf(__FUNCTION__, "%s%.*s\\\\", k, s-p, p)) == NULL)
-      goto quit;
-    p = s+1;
-  }
-  if ((k = chunk_strncat(k, p, strlen(p), __FUNCTION__)) == NULL)
-    goto quit;
-
-  new = (char *)chunkdup(k, strlen(k)+1, label);
-  unchunk_group(__FUNCTION__);
-  return new;
-
- quit:
-  unchunk_group(__FUNCTION__);
-  return NULL;
-}
-
-#if 0 /* Test program */
-/*
- * Turn this on to get an xpath test program 
- * Usage: clicon_xpath [<xpath>] 
- * read xml from input
- * Example compile:
- gcc -g -o qdb -I. -I../clixon ./clixon_qdb.c -lclixon -lcligen -lqdbm
-*/
-
-static int
-usage(char *argv0)
-{
-    fprintf(stderr, "usage:\n");
-    fprintf(stderr, "\t%s init <filename>\n", argv0);
-    fprintf(stderr, "\t%s read <filename> <key>\n", argv0);
-    fprintf(stderr, "\t%s write <filename> <key> <val>\n", argv0);
-    fprintf(stderr, "\t%s openread <filename>\n", argv0);
-    fprintf(stderr, "\t%s openwrite <filename>\n", argv0);
-    exit(0);
-}
-
-int
-main(int argc, char **argv)
-{
-    char  *verb;
-    char  *filename;
-    char  *key;
-    char  *val;
-    size_t len;
-    DEPOT *dp;
-
-    if (argc < 3)
-	usage(argv[0]);
-    clicon_log_init(__FILE__, LOG_INFO, CLICON_LOG_STDERR);
-    verb = argv[1];
-    filename = argv[2];
-    if (strcmp(verb, "init")==0){
-	db_init(filename);
-    }
-    else if (strcmp(verb, "read")==0){
-	if (argc < 4)
-	    usage(argv[0]);
-	key = argv[3];
-	db_get_alloc(filename, key, (void**)&val, &len);
-	fprintf(stdout, "%s\n", val);
-    }
-    else if (strcmp(verb, "write")==0){
-	if (argc < 5)
-	    usage(argv[0]);
-	key = argv[3];
-	val = argv[4];
-	db_set(filename, key, val, strlen(val)+1);
-    }
-    else if (strcmp(verb, "openread")==0){
-	if ((dp = dpopen(filename, DP_OREADER | DP_OLCKNB, 0)) == NULL){
-	    clicon_err(OE_DB, errno, "dbopen: %s", 
-		       dperrmsg(dpecode));
-	    return -1;
-	}
-	sleep(1000000);
-    }
-    else if (strcmp(verb, "openwrite")==0){
-	if ((dp = dpopen(filename, DP_OWRITER | DP_OLCKNB, 0)) == NULL){
-	    clicon_err(OE_DB, errno, "dbopen: %s", 
-		       dperrmsg(dpecode));
-	    return -1;
-	}
-	sleep(1000000);
-    }
-    return 0;
-}
-
-#endif /* Test program */
-
-
diff --git a/datastore/keyvalue/clixon_qdb.h b/datastore/keyvalue/clixon_qdb.h
deleted file mode 100644
index d2d38785..00000000
--- a/datastore/keyvalue/clixon_qdb.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *
-  ***** BEGIN LICENSE BLOCK *****
- 
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
-
-  This file is part of CLIXON.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of
-  the GNU General Public License Version 3 or later (the "GPL"),
-  in which case the provisions of the GPL are applicable instead
-  of those above. If you wish to allow use of your version of this file only
-  under the terms of the GPL, and not to allow others to
-  use your version of this file under the terms of Apache License version 2, 
-  indicate your decision by deleting the provisions above and replace them with
-  the  notice and other provisions required by the GPL. If you do not delete
-  the provisions above, a recipient may use your version of this file under
-  the terms of any one of the Apache License version 2 or the GPL.
-
-  ***** END LICENSE BLOCK *****
-
- */
-
-#ifndef _CLIXON_QDB_H_
-#define _CLIXON_QDB_H_
-
-
-/*
- * Low level API
- */
-
-struct db_pair {    
-    char *dp_key;  /* database key */
-    char *dp_matched; /* Matched component of key */
-    char *dp_val;  /* pointer to vector of lvalues */
-    int   dp_vlen; /* length of vector of lvalues */
-};
-
-/*
- * Prototypes
- */ 
-int db_init(char *file);
-
-int db_delete(char *file);
-
-int db_set(char *file, char *key, void *data, size_t datalen);
-
-int db_get(char *file, char *key, void *data, size_t *datalen);
-
-int db_get_alloc(char *file, char *key, void **data, size_t *datalen);
-
-int db_del(char *file, char *key);
-
-int db_exists(char *file, char *key);
-
-int db_regexp(char *file, char *regexp, const char *label, 
-	      struct db_pair **pairs, int noval);
-
-char *db_sanitize(char *rx, const char *label);
-
-#endif  /* _CLIXON_QDB_H_ */
diff --git a/datastore/text/clixon_xmldb_text.c b/datastore/text/clixon_xmldb_text.c
index 5d1edaf2..8727daa0 100644
--- a/datastore/text/clixon_xmldb_text.c
+++ b/datastore/text/clixon_xmldb_text.c
@@ -748,7 +748,8 @@ text_modify(cxobj              *x0,
  * @see text_modify
  */
 static int
-text_modify_top(cxobj              *x0,
+text_modify_top(struct text_handle *th,
+		cxobj              *x0,
 		cxobj              *x1,
 		yang_spec          *yspec,
 		enum operation_type op,
@@ -759,6 +760,7 @@ text_modify_top(cxobj              *x0,
     cxobj     *x0c; /* base child */
     cxobj     *x1c; /* mod child */
     yang_stmt *yc;  /* yang child */
+    yang_stmt *ymod;/* yang module */
     char      *opstr;
 
     /* Assure top-levels are 'config' */
@@ -805,10 +807,23 @@ text_modify_top(cxobj              *x0,
     while ((x1c = xml_child_each(x1, x1c, CX_ELMNT)) != NULL) {
 	x1cname = xml_name(x1c);
 	/* Get yang spec of the child */
-	if ((yc = yang_find_topnode(yspec, x1cname, YC_DATANODE)) == NULL){
-	    clicon_err(OE_YANG, ENOENT, "XML node %s/%s has no corresponding yang specification (Invalid XML or wrong Yang spec?",
-		       xml_name(x1), x1cname);
+	yc = NULL;
+	if (ys_module_by_xml(yspec, x1c, &ymod) <0)
 	    goto done;
+	if (ymod != NULL)
+	    yc = yang_find_datanode((yang_node*)ymod, x1cname);
+	if (yc == NULL && _CLICON_XML_NS_ITERATE){
+	    int i;
+	    for (i=0; i<yspec->yp_len; i++){
+		ymod = yspec->yp_stmt[i];
+		if ((yc = yang_find_datanode((yang_node*)ymod, x1cname)) != NULL)
+		    break;
+	    }
+	}
+	if (yc == NULL){
+	    if (netconf_operation_failed(cbret, "application", "Validation failed")< 0)
+		goto done;
+	    goto ok;
 	}
 	/* See if there is a corresponding node in the base tree */
 	if (match_base_child(x0, x1c, &x0c, yc) < 0)
@@ -942,11 +957,12 @@ text_put(xmldb_handle        xh,
 		   xml_name(x0));
 	goto done;
     }
-
-    /* Add yang specification backpointer to all XML nodes */
-    /* XXX: where is this created? Add yspec */
+#if 0
+    /* Add yang specification backpointer to all XML nodes 
+     * This  is already done in from_client_edit_config() */
     if (xml_apply(x1, CX_ELMNT, xml_spec_populate, yspec) < 0)
        goto done;
+#endif
 #if 0 /* debug */
     if (xml_child_sort && xml_apply0(x1, -1, xml_sort_verify, NULL) < 0)
 	clicon_log(LOG_NOTICE, "%s: verify failed #1", __FUNCTION__);
@@ -955,7 +971,7 @@ text_put(xmldb_handle        xh,
      * Modify base tree x with modification x1. This is where the
      * new tree is made.
      */
-    if (text_modify_top(x0, x1, yspec, op, cbret) < 0)
+    if (text_modify_top(th, x0, x1, yspec, op, cbret) < 0)
 	goto done;
     /* If xml return - ie netconf error xml tree, then stop and return OK */
     if (cbuf_len(cbret))
diff --git a/example/README.md b/example/README.md
index 48ed4595..7621d9b5 100644
--- a/example/README.md
+++ b/example/README.md
@@ -191,10 +191,9 @@ state data.
 
 ## Authentication and NACM
 The example contains some stubs for authorization according to [RFC8341(NACM)](https://tools.ietf.org/html/rfc8341):
-* A basic auth HTTP callback, see: example_restconf_credentials() containing three example users: adm1, wilma, and guest, according to the examples in Appendix A in the RFC.
+* A basic auth HTTP callback, see: example_restconf_credentials() containing three example users: andy, wilma, and guest, according to the examples in Appendix A in [RFC8341](https://tools.ietf.org/html/rfc8341).
 * A NACM backend plugin reporting the mandatory NACM state variables.
 
-
 ## Systemd files
 
 Example systemd files for backend and restconf daemons are found under the systemd directory. Install them under /etc/systemd/system for example.
diff --git a/example/example.yang b/example/example.yang
index 0ee76e30..57f58fcb 100644
--- a/example/example.yang
+++ b/example/example.yang
@@ -9,6 +9,7 @@ module example {
 	prefix ip;
     }
     import ietf-routing {
+        description "defines fib-route";
 	prefix rt;
     }
     import iana-if-type {
@@ -72,4 +73,13 @@ module example {
 	    }
 	}
     }
+    rpc debug {
+	description "Set debug level of backend. XXX should be in clixon-config";
+	input {
+	    leaf level {
+		type uint32;
+	    }
+	}
+    }
+
 }
diff --git a/example/example_cli.c b/example/example_cli.c
index 99c38368..987aae30 100644
--- a/example/example_cli.c
+++ b/example/example_cli.c
@@ -96,7 +96,7 @@ fib_route_rpc(clicon_handle h,
     /* User supplied variable in CLI command */
     instance = cvec_find(cvv, "instance"); /* get a cligen variable from vector */
     /* Create XML for fib-route netconf RPC */
-    if (xml_parse_va(&xtop, NULL, "<rpc username=\"%s\"><fib-route><routing-instance-name>%s</routing-instance-name></fib-route></rpc>",
+    if (xml_parse_va(&xtop, NULL, "<rpc xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\" username=\"%s\"><fib-route xmlns=\"urn:ietf:params:xml:ns:yang:ietf-routing\"><routing-instance-name>%s</routing-instance-name></fib-route></rpc>",
 		     clicon_username_get(h),
 		     cv_string_get(instance)) < 0)
 	goto done;
diff --git a/example/example_restconf.c b/example/example_restconf.c
index b7d55505..43771662 100644
--- a/example/example_restconf.c
+++ b/example/example_restconf.c
@@ -191,7 +191,7 @@ b64_decode(const char *src,
  * @retval -1  Fatal error
  * @retval  0  Unauth
  * @retval  1  Auth
- * @note: Three hardwired users: adm1, wilma, guest w password "bar".
+ * @note: Three hardwired users: andy, wilma, guest w password "bar".
  * Enabled by passing -- -a to the main function
  */
 int
@@ -237,9 +237,9 @@ example_restconf_credentials(clicon_handle h,
     /* Here get auth sub-tree whjere all the users are */
     if ((cb = cbuf_new()) == NULL)
 	goto done;
-    /* Hardcoded user/passwd */
-    if (strcmp(user, "wilma")==0 || strcmp(user, "adm1")==0 ||
-	strcmp(user, "quest")==0){
+    /* XXX Three hardcoded user/passwd (from RFC8341 A.1)*/
+    if (strcmp(user, "wilma")==0 || strcmp(user, "andy")==0 ||
+	strcmp(user, "guest")==0){
 	passwd2 = "bar";
     }
     if (strcmp(passwd, passwd2))
@@ -282,7 +282,7 @@ restconf_client_rpc(clicon_handle h,
 /*! Start example restonf plugin. Set authentication method
  * Arguments are argc/argv after --
  * Currently defined: -a  enable http basic authentication
- * Note hardwired users adm1, wilma and guest
+ * @note There are three hardwired users andy, wilma and guest from RFC8341 A.1
  */
 int
 example_restconf_start(clicon_handle h,
diff --git a/extras/rpm/clixon.spec b/extras/rpm/clixon.spec
index c6ee5f70..20e77c04 100644
--- a/extras/rpm/clixon.spec
+++ b/extras/rpm/clixon.spec
@@ -36,7 +36,7 @@ This package contains header files for CLIXON.
 %setup
 
 %build
-%configure --with-cligen=%{cligen_prefix} --without-keyvalue
+%configure --with-cligen=%{cligen_prefix}
 make
 
 %install
diff --git a/lib/Makefile.in b/lib/Makefile.in
index eba8991d..d34e81ac 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -80,5 +80,5 @@ distclean:	clean
 	do (cd $$i; $(MAKE) $(MFLAGS) distclean); done; \
 	(cd clixon; $(MAKE) $(MFLAGS) $@)
 
-tags:
+TAGS:
 	find $(srcdir) -name '*.[chyl]' -print | etags -
diff --git a/lib/clixon/clixon_nacm.h b/lib/clixon/clixon_nacm.h
index 34e9a939..978b5486 100644
--- a/lib/clixon/clixon_nacm.h
+++ b/lib/clixon/clixon_nacm.h
@@ -36,9 +36,19 @@
 #ifndef _CLIXON_NACM_H
 #define _CLIXON_NACM_H
 
+/*
+ * Constants
+ */
+/* RFC8341 defines a "recovery session" as outside the scope.
+ * Clixon defines this user as having special admin rights to expemt from
+ * all access control enforcements
+ */
+#define NACM_RECOVERY_USER "_nacm_recovery"
+
 /*
  * Prototypes
  */
-int nacm_access(clicon_handle h, char *mode, char *name, char *username, cbuf *cbret);
+int nacm_access(clicon_handle h, char *rpc, char *module,
+		char *username, cbuf *cbret);
 
 #endif /* _CLIXON_NACM_H */
diff --git a/lib/clixon/clixon_xml.h b/lib/clixon/clixon_xml.h
index 59e25913..803e5948 100644
--- a/lib/clixon/clixon_xml.h
+++ b/lib/clixon/clixon_xml.h
@@ -41,6 +41,10 @@
 /*
  * Constants
  */
+/* If rpc call does not have a namespace (eg w xmlns) then use the default NETCONF
+ * namespace (rfc6241 3.1)
+ */
+#define DEFAULT_XML_RPC_NAMESPACE "urn:ietf:params:xml:ns:netconf:base:1.0"
 
 /*
  * Types
@@ -81,10 +85,13 @@ typedef int (xml_applyfn_t)(cxobj *x, void *arg);
 #define XML_FLAG_NONE   0x10  /* Node is added as NONE */
 
 
-/* Sort and binary search of XML children
- * Experimental
+/* Iterate through modules to find the matching datanode
+ * or rpc if no xmlns attribute specifies namespace.
+ * This is loose semantics of finding namespaces.
+ * And it is wrong, but is the way Clixon originally was written."
+ * @see CLICON_XML_NS_ITERATE clixon configure option 
  */
-extern int xml_child_sort;
+extern int _CLICON_XML_NS_ITERATE;
 
 /*
  * Prototypes
@@ -94,6 +101,7 @@ char     *xml_name(cxobj *xn);
 int       xml_name_set(cxobj *xn, char *name);
 char     *xml_namespace(cxobj *xn);
 int       xml_namespace_set(cxobj *xn, char *name);
+int       xml2ns(cxobj *x, char *localname, char **namespace);
 cxobj    *xml_parent(cxobj *xn);
 int       xml_parent_set(cxobj *xn, cxobj *parent);
 
@@ -129,6 +137,8 @@ int       xml_rootchild(cxobj  *xp, int i, cxobj **xcp);
 
 char     *xml_body(cxobj *xn);
 cxobj    *xml_body_get(cxobj *xn);
+char     *xml_find_type_value(cxobj *xn_parent, char *prefix,
+			      char *name, enum cxobj_type type);
 char     *xml_find_value(cxobj *xn_parent, char *name);
 char     *xml_find_body(cxobj *xn, char *name);
 cxobj    *xml_find_body_obj(cxobj *xt, char *name, char *val);
diff --git a/lib/clixon/clixon_xml_map.h b/lib/clixon/clixon_xml_map.h
index 6a5a32fe..abd1fe50 100644
--- a/lib/clixon/clixon_xml_map.h
+++ b/lib/clixon/clixon_xml_map.h
@@ -43,6 +43,7 @@
  */
 int xml2txt(FILE *f, cxobj *x, int level);
 int xml2cli(FILE *f, cxobj *x, char *prepend, enum genmodel_type gt);
+int xml_yang_validate_rpc(cxobj *xrpc);
 int xml_yang_validate_add(cxobj *xt, void *arg);
 int xml_yang_validate_all(cxobj *xt, void *arg);
 int xml2cvec(cxobj *xt, yang_stmt *ys, cvec **cvv0);
@@ -60,6 +61,7 @@ int xml_default(cxobj *x, void  *arg);
 int xml_order(cxobj *x, void  *arg);
 int xml_sanity(cxobj *x, void  *arg);
 int xml_non_config_data(cxobj *xt, void *arg);
+int xml_spec_populate_rpc(clicon_handle h, cxobj *x, yang_spec *yspec);
 int xml_spec_populate(cxobj *x, void *arg);
 int api_path2xpath_cvv(yang_spec *yspec, cvec *cvv, int offset, cbuf *xpath);
 int api_path2xpath(yang_spec *yspec, char *api_path, cbuf *xpath);
diff --git a/lib/clixon/clixon_yang.h b/lib/clixon/clixon_yang.h
index a49d1e94..e9aee2e6 100644
--- a/lib/clixon/clixon_yang.h
+++ b/lib/clixon/clixon_yang.h
@@ -49,6 +49,7 @@
 /*
  * Types
  */
+struct xml;
 /*! YANG keywords from RFC6020.
  * See also keywords generated by yacc/bison in clicon_yang_parse.tab.h, but they start with K_
  * instead of Y_
@@ -159,7 +160,6 @@ typedef enum yang_class yang_class;
  */
 #define yang_datadefinition(y) (yang_datanode(y) || (y)->ys_keyword == Y_CHOICE || (y)->ys_keyword == Y_CASE || (y)->ys_keyword == Y_AUGMENT || (y)->ys_keyword == Y_USES)
 
-
 /* Yang schema node .
  * See RFC 7950 Sec 3:
  *    o  schema node: A node in the schema tree.  One of action, container,
@@ -253,15 +253,18 @@ char      *yang_key2str(int keyword);
 char      *yarg_prefix(yang_stmt *ys);
 char      *yarg_id(yang_stmt *ys);
 int        yang_nodeid_split(char *nodeid, char **prefix, char **id);
+int        ys_module_by_xml(yang_spec *ysp, struct xml *xt, yang_stmt **ymodp);
 yang_stmt *ys_module(yang_stmt *ys);
 yang_spec *ys_spec(yang_stmt *ys);
 yang_stmt *yang_find_module_by_prefix(yang_stmt *ys, char *prefix);
+yang_stmt *yang_find_module_by_namespace(yang_spec *yspec, char *namespace);
 yang_stmt *yang_find(yang_node *yn, int keyword, const char *argument);
 int        yang_match(yang_node *yn, int keyword, char *argument);
 yang_stmt *yang_find_datanode(yang_node *yn, char *argument);
 yang_stmt *yang_find_schemanode(yang_node *yn, char *argument);
 yang_stmt *yang_find_topnode(yang_spec *ysp, char *name, yang_class class);
 char      *yang_find_myprefix(yang_stmt *ys);
+char      *yang_find_mynamespace(yang_stmt *ys);
 int        yang_order(yang_stmt *y);
 int        yang_print(FILE *f, yang_node *yn);
 int        yang_print_cbuf(cbuf *cb, yang_node *yn, int marginal);
diff --git a/lib/src/clixon_json.c b/lib/src/clixon_json.c
index 794b35f2..00778c30 100644
--- a/lib/src/clixon_json.c
+++ b/lib/src/clixon_json.c
@@ -90,22 +90,43 @@ enum childtype{
     ANY_CHILD,    /* eg <a><b/></a> or <a><b/><c/></a> */
 };
 
+/*! Number of children EXCEPT attributes
+ * @param[in]  xn    xml node
+ * @retval     number of children in XML tree (except children of type CX_ATTR)
+ * @see xml_child_nr
+ */
+static int   
+xml_child_nr_noattr(cxobj *xn)
+{
+    cxobj *x = NULL;
+    int    nr = 0;
+
+    while ((x = xml_child_each(xn, x, -1)) != NULL) {
+	if (xml_type(x) != CX_ATTR)
+	    nr++;
+    }
+    return nr;
+}
+
 /*! x is element and has exactly one child which in turn has none 
+ * remove attributes from x
  * Clone from clixon_xml_map.c
  */
 static enum childtype
 childtype(cxobj *x)
 {
     cxobj *xc1; /* the only child of x */
+    int    clen; /* nr of children */
 
+    clen = xml_child_nr_noattr(x);
     if (xml_type(x) != CX_ELMNT)
 	return -1; /* n/a */
-    if (xml_child_nr(x) == 0)
+    if (clen == 0)
     	return NULL_CHILD;
-    if (xml_child_nr(x) > 1)
+    if (clen > 1)
 	return ANY_CHILD;
     xc1 = xml_child_i(x, 0); /* From here exactly one child */
-    if (xml_child_nr(xc1) == 0 && xml_type(xc1)==CX_BODY)
+    if (xml_child_nr_noattr(xc1) == 0 && xml_type(xc1)==CX_BODY)
 	return BODY_CHILD;
     else
 	return ANY_CHILD;
@@ -267,13 +288,13 @@ json_str_escape(char *str)
   +----------+--------------+--------------+--------------+
  */
 static int 
-xml2json1_cbuf(cbuf                  *cb,
-	       cxobj                 *x,
+xml2json1_cbuf(cbuf                   *cb,
+	       cxobj                  *x,
 	       enum array_element_type arraytype,
-	       int                    level,
-	       int                    pretty,
-	       int                    flat,
-	       int                    bodystr)
+	       int                     level,
+	       int                     pretty,
+	       int                     flat,
+	       int                     bodystr)
 {
     int              retval = -1;
     int              i;
@@ -281,10 +302,30 @@ xml2json1_cbuf(cbuf                  *cb,
     enum childtype   childt;
     enum array_element_type xc_arraytype;
     yang_stmt       *ys;
+    yang_stmt       *ymod; /* yang module */
+    yang_spec       *yspec = NULL; /* yang spec */
     int              bodystr0=1;
+    char            *str;
+    char            *prefix=NULL;    /* prefix / local namespace name */
+    char            *namespace=NULL; /* namespace uri */
+    char            *modname=NULL;   /* Module name */
 
+    /* If x is labelled with a default namespace, it should be translated
+     * to a module name. 
+     * Harder if x has a prefix, then that should also be translated to associated
+     * module name
+     */
+    prefix = xml_namespace(x);
+    if (xml2ns(x, prefix, &namespace) < 0)
+	goto done;
+    if ((ys = xml_spec(x)) != NULL) /* yang spec associated with x */
+	yspec = ys_spec(ys);
+    /* Find module name associated with namspace URI */
+    if (namespace && yspec &&
+	(ymod = yang_find_module_by_namespace(yspec, namespace)) != NULL){
+	modname = ymod->ys_argument;
+    }
     childt = childtype(x);
-    ys = xml_spec(x);
     if (pretty==2)
 	cprintf(cb, "#%s_array, %s_child ", 
 		arraytype2str(arraytype),
@@ -292,7 +333,6 @@ xml2json1_cbuf(cbuf                  *cb,
     switch(arraytype){
     case BODY_ARRAY:{
 	if (bodystr){
-	    char      *str;
 	    if ((str = json_str_escape(xml_value(x))) == NULL)
 		goto done;
 	    cprintf(cb, "\"%s\"", str);
@@ -300,14 +340,13 @@ xml2json1_cbuf(cbuf                  *cb,
 	}
 	else
 	    cprintf(cb, "%s", xml_value(x));
-
 	break;
     }
     case NO_ARRAY:
 	if (!flat){
 	    cprintf(cb, "%*s\"", pretty?(level*JSON_INDENT):0, "");
-	    if (xml_namespace(x))
-		cprintf(cb, "%s:", xml_namespace(x));
+	    if (modname) /* XXX should remove this? */
+		cprintf(cb, "%s:", modname);
 	    cprintf(cb, "%s\": ", xml_name(x));
 	}
 	switch (childt){
@@ -326,8 +365,8 @@ xml2json1_cbuf(cbuf                  *cb,
     case FIRST_ARRAY:
     case SINGLE_ARRAY:
 	cprintf(cb, "%*s\"", pretty?(level*JSON_INDENT):0, "");
-	if (xml_namespace(x))
-	    cprintf(cb, "%s:", xml_namespace(x));
+	if (modname)
+	    cprintf(cb, "%s:", modname);
 	cprintf(cb, "%s\": ", xml_name(x));
 	level++;
 	cprintf(cb, "[%s%*s", 
@@ -368,7 +407,7 @@ xml2json1_cbuf(cbuf                  *cb,
 	break;
     }
     /* Check for typed sub-body if:
-     * arracytype=* but chilt-type is BODY_CHILD 
+     * arraytype=* but child-type is BODY_CHILD 
      * This is code for writing <a>42</a> as "a":42 and not "a":"42"
      */
     if (childt == BODY_CHILD && ys!=NULL &&
@@ -393,6 +432,8 @@ xml2json1_cbuf(cbuf                  *cb,
 
     for (i=0; i<xml_child_nr(x); i++){
 	xc = xml_child_i(x, i);
+	if (xml_type(xc) == CX_ATTR)
+	    continue; /* XXX Only xmlns attributes mapped */
 	xc_arraytype = array_eval(i?xml_child_i(x,i-1):NULL, 
 				xc, 
 				xml_child_i(x, i+1));
@@ -401,7 +442,7 @@ xml2json1_cbuf(cbuf                  *cb,
 			   xc_arraytype,
 			   level+1, pretty, 0, bodystr0) < 0)
 	    goto done;
-	if (i<xml_child_nr(x)-1)
+	if (i<xml_child_nr_noattr(x)-1)
 	    cprintf(cb, ",%s", pretty?"\n":"");
     }
     switch (arraytype){
diff --git a/lib/src/clixon_nacm.c b/lib/src/clixon_nacm.c
index 1ab18411..bf60b865 100644
--- a/lib/src/clixon_nacm.c
+++ b/lib/src/clixon_nacm.c
@@ -128,27 +128,28 @@ nacm_match_access(char *access_operations,
 static int
 nacm_match_rule(clicon_handle h,
 		char         *name,
+		char         *module,
 		cxobj        *xrule,
 		cbuf         *cbret)
 {
     int    retval = -1;
-    //    cxobj *x;
-    char  *module_name;
-    char  *rpc_name;
+    char  *module_rule; /* rule module name */
+    char  *rpc_rule;
     char  *access_operations;
     char  *action;
     
-    module_name = xml_find_body(xrule, "module-name");
-    rpc_name = xml_find_body(xrule, "rpc-name");
+    module_rule = xml_find_body(xrule, "module-name");
+    rpc_rule = xml_find_body(xrule, "rpc-name");
     /* XXX access_operations can be a set of bits */
     access_operations = xml_find_body(xrule, "access-operations");
     action = xml_find_body(xrule, "action");
     clicon_debug(1, "%s: %s %s %s %s", __FUNCTION__,
-	       module_name, rpc_name, access_operations, action);
-    if (module_name && strcmp(module_name,"*")==0){
+	       module_rule, rpc_rule, access_operations, action);
+    if (module_rule &&
+	(strcmp(module_rule,"*")==0 || strcmp(module_rule,module)==0)){
 	if (nacm_match_access(access_operations, "exec")){
-	    if (rpc_name==NULL ||
-		strcmp(rpc_name, "*")==0 || strcmp(rpc_name, name)==0){
+	    if (rpc_rule==NULL ||
+		strcmp(rpc_rule, "*")==0 || strcmp(rpc_rule, name)==0){
 		/* Here is a matching rule */
 		if (action && strcmp(action, "permit")==0){
 		    retval = 1;
@@ -166,61 +167,43 @@ nacm_match_rule(clicon_handle h,
     retval = 2; /* no matching rule */
  done:
     return retval;
-
 }
 
-/*! Make nacm access control 
+/*! Process a nacm message control
  * @param[in]  h     Clicon handle
  * @param[in]  mode  NACMmode, internal or external
  * @param[in]  name  rpc name
  * @param[in]  username
+ * @param[in]  xtop
  * @param[out] cbret Cligen buffer result. Set to an error msg if retval=0.
  * @retval -1  Error
  * @retval  0  Not access and cbret set
  * @retval  1  Access
  * @see RFC8341 3.4.4.  Incoming RPC Message Validation
  */
-int
-nacm_access(clicon_handle h,
-	    char         *mode,
-	    char         *name,
-	    char         *username,
-	    cbuf         *cbret)
+static int
+nacm_rpc_validation(clicon_handle h,
+		    char         *name,
+		    char         *module,
+		    char         *username,
+		    cxobj        *xtop,
+		    cbuf         *cbret)
 {
     int     retval = -1;
-    cxobj  *xtop = NULL;
     cxobj  *xacm;
     cxobj  *x;
-    cxobj  *xrlist;
     cxobj  *xrule;
     char   *enabled = NULL;
     cxobj **gvec = NULL; /* groups */
     size_t  glen;
+    cxobj  *xrlist;
     cxobj **rlistvec = NULL; /* rule-list */
     size_t  rlistlen;
     cxobj **rvec = NULL; /* rules */
     size_t  rlen;
+    int     ret;
     int     i, j;
     char   *exec_default = NULL;
-    int     ret;
-
-    clicon_debug(1, "%s", __FUNCTION__);
-    /* 0. If nacm-mode is external, get NACM defintion from separet tree,
-       otherwise get it from internal configuration */
-    if (strcmp(mode, "external")==0){
-	if ((xtop = clicon_nacm_ext(h)) == NULL){
-	    clicon_err(OE_XML, 0, "No nacm external tree");
-	    goto done;
-	}
-    }
-    else if (strcmp(mode, "internal")==0){
-	if (xmldb_get(h, "running", "nacm", 0, &xtop) < 0)
-	    goto done;	
-    }
-    else{
-	clicon_err(OE_UNIX, 0, "Invalid NACM mode: %s", mode);
-	goto done;
-    }
     
     /* 1.   If the "enable-nacm" leaf is set to "false", then the protocol
        operation is permitted. (or config does not exist) */
@@ -235,6 +218,8 @@ nacm_access(clicon_handle h,
 
     /* 2.   If the requesting session is identified as a recovery session,
        then the protocol operation is permitted. NYI */
+    if (strcmp(username, NACM_RECOVERY_USER) == 0)
+	goto permit;
     
     /* 3.   If the requested operation is the NETCONF <close-session>
        protocol operation, then the protocol operation is permitted.
@@ -280,7 +265,7 @@ nacm_access(clicon_handle h,
 	for (j=0; j<rlen; j++){
 	    xrule = rvec[j];
 	    /* -1 error, 0 deny, 1 permit, 2 continue */
-	    if ((ret = nacm_match_rule(h, name, xrule, cbret)) < 0)
+	    if ((ret = nacm_match_rule(h, name, module, xrule, cbret)) < 0)
 		goto done;
 	    switch(ret){
 	    case 0: /* deny */
@@ -318,8 +303,6 @@ nacm_access(clicon_handle h,
     retval = 1;
  done:
     clicon_debug(1, "%s retval:%d (0:deny 1:permit)", __FUNCTION__, retval);
-    if (strcmp(mode, "internal")==0 && xtop)
-	xml_free(xtop);
     if (gvec)
 	free(gvec);
     if (rlistvec)
@@ -332,3 +315,57 @@ nacm_access(clicon_handle h,
     retval = 0;
     goto done;
 }
+
+/*! Make nacm access control 
+ * @param[in]  h     Clicon handle
+ * @param[in]  name  rpc name
+ * @param[in]  username
+ * @param[out] cbret Cligen buffer result. Set to an error msg if retval=0.
+ * @retval -1  Error
+ * @retval  0  Not access and cbret set
+ * @retval  1  Access
+ * @see RFC8341 3.4.4.  Incoming RPC Message Validation
+ */
+int
+nacm_access(clicon_handle h,
+	    char         *rpc,
+	    char         *module,
+	    char         *username,
+	    cbuf         *cbret)
+{
+    int     retval = -1;
+    cxobj  *xtop = NULL;
+    char   *mode;
+
+    clicon_debug(1, "%s", __FUNCTION__);
+    mode = clicon_option_str(h, "CLICON_NACM_MODE");
+    if (mode == NULL || strcmp(mode, "disabled") == 0){
+	retval = 1;
+	goto done;
+    }
+
+    /* 0. If nacm-mode is external, get NACM defintion from separet tree,
+       otherwise get it from internal configuration */
+    if (strcmp(mode, "external")==0){
+	if ((xtop = clicon_nacm_ext(h)) == NULL){
+	    clicon_err(OE_XML, 0, "No nacm external tree");
+	    goto done;
+	}
+    }
+    else if (strcmp(mode, "internal")==0){
+	if (xmldb_get(h, "running", "nacm", 0, &xtop) < 0)
+	    goto done;	
+    }
+    else{
+	clicon_err(OE_UNIX, 0, "Invalid NACM mode: %s", mode);
+	goto done;
+    }
+    /* Do the real nacm processing */
+    if ((retval = nacm_rpc_validation(h, rpc, module, username, xtop, cbret)) < 0)
+	goto done;
+ done:
+    clicon_debug(1, "%s retval:%d (0:deny 1:permit)", __FUNCTION__, retval);
+    if (strcmp(mode, "internal")==0 && xtop)
+	xml_free(xtop);
+    return retval;
+}
diff --git a/lib/src/clixon_netconf_lib.c b/lib/src/clixon_netconf_lib.c
index 27c0acc0..ccb88275 100644
--- a/lib/src/clixon_netconf_lib.c
+++ b/lib/src/clixon_netconf_lib.c
@@ -983,19 +983,14 @@ netconf_module_load(clicon_handle h)
 {
     int        retval = -1;
     cxobj     *xc;
-    //    cxobj     *x;
     yang_spec *yspec;
 
     yspec = clicon_dbspec_yang(h);
-    /* Load yang spec */
-    if (yang_spec_parse_module(h, "ietf-netconf", NULL, yspec)< 0)
-	goto done;
-    if (yang_spec_parse_module(h, "ietf-netconf-notification", NULL, yspec)< 0)
-	goto done;
     if ((xc = clicon_conf_xml(h)) == NULL){
 	clicon_err(OE_CFG, ENOENT, "Clicon configuration not loaded");
 	goto done; 
     }
+    
     /* Enable features (hardcoded here) */
     if (xml_parse_string("<CLICON_FEATURE>ietf-netconf:candidate</CLICON_FEATURE>", yspec, &xc) < 0)
 	goto done;
@@ -1005,6 +1000,12 @@ netconf_module_load(clicon_handle h)
 	goto done;
     if (xml_parse_string("<CLICON_FEATURE>ietf-netconf:xpath</CLICON_FEATURE>", yspec, &xc) < 0)
 	goto done;
+    
+    /* Load yang spec */
+    if (yang_spec_parse_module(h, "ietf-netconf", NULL, yspec)< 0)
+	goto done;
+    if (yang_spec_parse_module(h, "ietf-netconf-notification", NULL, yspec)< 0)
+	goto done;
     retval = 0;
  done:
     return retval;
diff --git a/lib/src/clixon_options.c b/lib/src/clixon_options.c
index 74e5a645..873d3aaf 100644
--- a/lib/src/clixon_options.c
+++ b/lib/src/clixon_options.c
@@ -63,6 +63,7 @@
 #include "clixon_log.h"
 #include "clixon_yang.h"
 #include "clixon_xml.h"
+#include "clixon_xml_sort.h"
 #include "clixon_options.h"
 #include "clixon_plugin.h"
 #include "clixon_xpath_ctx.h"
@@ -242,6 +243,9 @@ clicon_options_main(clicon_handle h,
 	clicon_err(OE_CFG, 0, "%s: suffix %s not recognized (Run ./configure --with-config-compat?)", configfile, suffix);
 	goto done;
     }
+#if 1 /* XXX Kludge to low-level functions to iterate over namspaces or not */
+    _CLICON_XML_NS_ITERATE = 1;
+#endif
     /* Read configfile first without yangspec, for bootstrapping */
     if (parse_configfile(h, configfile, yspec, &xconfig) < 0)
 	goto done;
@@ -267,6 +271,9 @@ clicon_options_main(clicon_handle h,
 	xml_child_sort = 1;
     else
 	xml_child_sort = 0;
+#if 1 /* XXX Kludge to low-level functions to iterate over namspaces or not */
+    _CLICON_XML_NS_ITERATE = clicon_option_bool(h, "CLICON_XML_NS_ITERATE");
+#endif
     retval = 0;
  done:
     return retval;
diff --git a/lib/src/clixon_proto_client.c b/lib/src/clixon_proto_client.c
index 9de878c0..0cf421d2 100644
--- a/lib/src/clixon_proto_client.c
+++ b/lib/src/clixon_proto_client.c
@@ -826,7 +826,8 @@ clicon_rpc_debug(clicon_handle h,
     char              *username;
 
     username = clicon_username_get(h);
-    if ((msg = clicon_msg_encode("<rpc username=\"%s\"><debug><level>%d</level></debug></rpc>", username?username:"", level)) == NULL)
+    /* XXX: hardcoded example yang, should be clixon-config!!! */
+    if ((msg = clicon_msg_encode("<rpc username=\"%s\"><debug xmlns=\"urn:example:clixon\"><level>%d</level></debug></rpc>", username?username:"", level)) == NULL)
 	goto done;
     if (clicon_rpc_msg(h, msg, &xret, NULL) < 0)
 	goto done;
diff --git a/lib/src/clixon_xml.c b/lib/src/clixon_xml.c
index 16183ef2..24bab41b 100644
--- a/lib/src/clixon_xml.c
+++ b/lib/src/clixon_xml.c
@@ -108,17 +108,13 @@
  * - Namespace name: For a name N in a namespace identified by a URI I, the 
  *   "namespace name" is I.
  *   For a name N that is not in a namespace, the "namespace name" has no value.
- * - Local name: In either case the "local name" is N.
+ * - Local name: In either case the "local name" is N (also "prefix")
  * It is this combination of the universally managed URI namespace with the 
  * vocabulary's local names that is effective in avoiding name clashes.
  */
 struct xml{
     char             *x_name;       /* name of node */
-    char             *x_namespace;  /* namespace, if any */
-#ifdef notyet
-    char             *x_namespacename;  /* namespace name (or NULL) */
-    char             *x_localname;  /* Local name N as defined above */
-#endif
+    char             *x_prefix;     /* namespace localname N, called prefix */
     struct xml       *x_up;         /* parent node in hierarchy if any */
     struct xml      **x_childvec;   /* vector of children nodes */
     int               x_childvec_len;/* length of vector */
@@ -130,6 +126,17 @@ struct xml{
 				       reference, dont free */
 };
 
+/*
+ * Variables
+ */
+/* Iterate through modules to find the matching datanode
+ * or rpc if no xmlns attribute specifies namespace.
+ * This is loose semantics of finding namespaces.
+ * And it is wrong, but is the way Clixon originally was written."
+ * @see CLICON_XML_NS_ITERATE clixon configure option 
+ */
+int _CLICON_XML_NS_ITERATE = 0;
+
 /* Mapping between xml type <--> string */
 static const map_str2int xsmap[] = {
     {"error",         CX_ERROR}, 
@@ -189,29 +196,31 @@ xml_name_set(cxobj *xn,
 /*! Get namespace of xnode
  * @param[in]  xn    xml node
  * @retval     namespace of xml node
+ * XXX change to xml_localname
  */
 char*
 xml_namespace(cxobj *xn)
 {
-    return xn->x_namespace;
+    return xn->x_prefix;
 }
 
 /*! Set name space of xnode, namespace is copied
  * @param[in]  xn         xml node
- * @param[in]  namespace  new namespace, null-terminated string, copied by function
+ * @param[in]  localname  new namespace, null-terminated string, copied by function
  * @retval     -1         on error with clicon-err set
  * @retval     0          OK
+ * XXX change to xml_localname_set
  */
 int
 xml_namespace_set(cxobj *xn, 
-		  char  *namespace)
+		  char  *localname)
 {
-    if (xn->x_namespace){
-	free(xn->x_namespace);
-	xn->x_namespace = NULL;
+    if (xn->x_prefix){
+	free(xn->x_prefix);
+	xn->x_prefix = NULL;
     }
-    if (namespace){
-	if ((xn->x_namespace = strdup(namespace)) == NULL){
+    if (localname){
+	if ((xn->x_prefix = strdup(localname)) == NULL){
 	    clicon_err(OE_XML, errno, "strdup");
 	    return -1;
 	}
@@ -219,12 +228,57 @@ xml_namespace_set(cxobj *xn,
     return 0;
 }
 
-/*! See if xmlns:<namespace>=<uri> exists, if so return <uri>
+
+/*! Given an xml tree return URI namespace: default or localname given
+ *
+ * Given an XML tree and a prefix (or NULL) return URI namespace.
+ * @param[in]  x          XML tree
+ * @param[in]  prefix     prefix/ns localname. If NULL then return default.
+ * @param[out] namespace  URI namespace (or NULL). Note pointer into xml tree
+ * @retval     0          OK
+ * @retval    -1          Error
+ * @see xmlns_check XXX coordinate
+ */
+int
+xml2ns(cxobj *x,
+       char  *prefix,
+       char **namespace)
+{
+    int    retval = -1;
+    char  *ns;
+    cxobj *xp;
+    
+    if (prefix != NULL) /* xmlns:<prefix> */
+	ns = xml_find_type_value(x, "xmlns", prefix, CX_ATTR);
+    else /* default ns */
+    	ns = xml_find_type_value(x, NULL, "xmlns", CX_ATTR);
+
+    /* namespace not found, try parent */
+    if (ns == NULL){
+	if ((xp = xml_parent(x)) != NULL){
+	    if (xml2ns(xp, prefix, &ns) < 0)
+		goto done;
+	}
+	/* If no parent, return default namespace if defined */
+#if defined(DEFAULT_XML_RPC_NAMESPACE)
+	else
+	    ns = DEFAULT_XML_RPC_NAMESPACE;
+#endif
+    }
+    if (namespace)
+	*namespace = ns;
+    retval = 0;
+ done:
+    return retval;
+}
+
+/*! See if xmlns:[<localname>=]<uri> exists, if so return <uri>
  *
  * @param[in]  xn   XML node
  * @param[in]  nsn  Namespace name
  * @retval     URI  return associated URI if found
  * @retval     NULL No namespace name binding found for nsn
+ * @see xml2ns XXX coordinate
  */
 static char *
 xmlns_check(cxobj *xn,
@@ -233,7 +287,7 @@ xmlns_check(cxobj *xn,
     cxobj *x = NULL;
     char  *xns;
     
-    while ((x = xml_child_each(xn, x, -1)) != NULL) 
+    while ((x = xml_child_each(xn, x, CX_ATTR)) != NULL) 
 	if ((xns = xml_namespace(x)) && strcmp(xns, "xmlns")==0 &&
 	    strcmp(xml_name(x), nsn) == 0)
 	    return xml_value(x);
@@ -248,7 +302,7 @@ xmlns_check(cxobj *xn,
  * @note This function is grossly inefficient
  */
 static int
-xml_namespace_check(cxobj *xn, 
+xml_localname_check(cxobj *xn, 
 		    void  *arg)
 {
     cxobj     *xp = NULL;
@@ -886,6 +940,42 @@ xml_body_get(cxobj *xt)
     return NULL;
 }
 
+/*! Find and return the value of an xml child of specific type
+ *
+ * The value can be of an attribute only
+ * @param[in]   xt          xml tree node
+ * @param[in]   prefix      Prefix (namespace local name) or NULL
+ * @param[in]   name        name of xml tree node (eg attr name or "body")
+ * @retval      val         Pointer to the name string
+ * @retval      NULL        No such node or no value in node
+ * @code
+ * char *str = xml_find_type_value(x, "prefix", "name", CX_ATTR);
+ * @endcode
+ * @note, make a copy of the return value to use it properly
+ * @see xml_find_value where a body can be found as well
+ */
+char *
+xml_find_type_value(cxobj           *xt, 
+		    char            *prefix,
+		    char            *name,
+		    enum cxobj_type  type)
+{
+    cxobj *x = NULL;
+    int    pmatch; /* prefix match */
+    char  *xprefix;     /* xprefix */
+    
+    while ((x = xml_child_each(xt, x, type)) != NULL) {
+	xprefix = xml_namespace(x);
+	if (prefix)
+	    pmatch = xprefix?strcmp(prefix,xprefix)==0:0;
+	else
+	    pmatch = 1;
+	if (pmatch && strcmp(name, xml_name(x)) == 0)
+	    return xml_value(x);
+    }
+    return NULL;
+}
+
 /*! Find and return the value of a sub xml node
  *
  * The value can be of an attribute or body.
@@ -895,7 +985,7 @@ xml_body_get(cxobj *xt)
  * @retval      NULL        No such node or no value in node
  *
  * Note, make a copy of the return value to use it properly
- * See also xml_find_body
+ * @see xml_find_body
  * Explaining picture:
  *       xt  --> x         
  *               x_name=name
@@ -983,8 +1073,8 @@ xml_free(cxobj *x)
 	free(x->x_name);
     if (x->x_value)
 	free(x->x_value);
-    if (x->x_namespace)
-	free(x->x_namespace);
+    if (x->x_prefix)
+	free(x->x_prefix);
     for (i=0; i<x->x_childvec_len; i++){
 	if ((xc = x->x_childvec[i]) != NULL){
 	    xml_free(xc);
@@ -1028,6 +1118,8 @@ clicon_xml2file(FILE  *f,
     char  *val;
     char  *encstr = NULL; /* xml encoded string */
     
+    if (x == NULL)
+	goto ok;
     name = xml_name(x);
     namespace = xml_namespace(x);
     switch(xml_type(x)){
@@ -1097,6 +1189,7 @@ clicon_xml2file(FILE  *f,
     default:
 	break;
     }/* switch */
+ ok:
     retval = 0;
  done:
     if (encstr)
@@ -1302,7 +1395,7 @@ _xml_parse(const char  *str,
     if (clixon_xml_parseparse(&ya) != 0)  /* yacc returns 1 on error */
 	goto done;
     /* Verify namespaces after parsing */
-    if (xml_apply0(xt, CX_ELMNT, xml_namespace_check, NULL) < 0)
+    if (xml_apply0(xt, CX_ELMNT, xml_localname_check, NULL) < 0)
     	goto done;
     /* Sort the complete tree after parsing */
     if (yspec){
@@ -1507,15 +1600,20 @@ int
 xml_copy_one(cxobj *x0, 
 	     cxobj *x1)
 {
+    char *s;
+    
     xml_type_set(x1, xml_type(x0));
-    if (xml_value(x0)){ /* malloced string */
-	if ((x1->x_value = strdup(x0->x_value)) == NULL){
+    if ((s = xml_value(x0))){ /* malloced string */
+	if ((x1->x_value = strdup(s)) == NULL){
 	    clicon_err(OE_XML, errno, "strdup");
 	    return -1;
 	}
     }
-    if (xml_name(x0)) /* malloced string */
-	if ((xml_name_set(x1, xml_name(x0))) < 0)
+    if ((s = xml_name(x0))) /* malloced string */
+	if ((xml_name_set(x1, s)) < 0)
+	    return -1;
+    if ((s = xml_namespace(x0))) /* malloced string */
+	if ((xml_namespace_set(x1, s)) < 0)
 	    return -1;
     return 0;
 }
@@ -1794,7 +1892,6 @@ xml_body_parse(cxobj       *xb,
     if (retval < 0 && cv != NULL)
 	cv_free(cv);
     return retval;
-
 }
 
 /*! Parse an xml body as int32
diff --git a/lib/src/clixon_xml_db.c b/lib/src/clixon_xml_db.c
index 4dfe4f96..c3a4126a 100644
--- a/lib/src/clixon_xml_db.c
+++ b/lib/src/clixon_xml_db.c
@@ -70,7 +70,7 @@
 /*! Load an xmldb storage plugin according to filename
  * If init function fails (not found, wrong version, etc) print a log and dont
  * add it.
- * @param[in]  h         CLicon handle
+ * @param[in]  h         Clicon handle
  * @param[in]  filename  Actual filename including path
  */
 int 
diff --git a/lib/src/clixon_xml_map.c b/lib/src/clixon_xml_map.c
index d9c394cf..6794b503 100644
--- a/lib/src/clixon_xml_map.c
+++ b/lib/src/clixon_xml_map.c
@@ -245,7 +245,7 @@ validate_leafref(cxobj     *xt,
     char        *leafbody;
 
     if ((leafrefbody = xml_body(xt)) == NULL)
-	return 0;
+	goto ok;
     if ((ypath = yang_find((yang_node*)ytype, Y_PATH, NULL)) == NULL){
 	clicon_err(OE_DB, 0, "Leafref %s requires path statement", ytype->ys_argument);
 	goto done;
@@ -264,6 +264,7 @@ validate_leafref(cxobj     *xt,
 		   leafrefbody);
 	goto done;
     }
+ ok:
     retval = 0;
  done:
     if (xvec)
@@ -337,6 +338,73 @@ validate_identityref(cxobj     *xt,
     return retval;
 }
 
+/*! Validate an RPC node
+ * @param[in]  xt  XML node to be validated
+ * @retval     1   Validation OK
+ * @retval     0   Validation failed
+ * @retval    -1   Error
+ * rfc7950
+ * 7.14.2
+ * If a leaf in the input tree has a "mandatory" statement with the
+ * value "true", the leaf MUST be present in an RPC invocation.
+ *
+ * If a leaf in the input tree has a default value, the server MUST use
+ * this value in the same cases as those described in Section 7.6.1.  In
+ * these cases, the server MUST operationally behave as if the leaf was
+ * present in the RPC invocation with the default value as its value.
+ *
+ * If a leaf-list in the input tree has one or more default values, the
+ * server MUST use these values in the same cases as those described in
+ * Section 7.7.2.  In these cases, the server MUST operationally behave
+ * as if the leaf-list was present in the RPC invocation with the
+ * default values as its values.
+ *
+ * Since the input tree is not part of any datastore, all "config"
+ * statements for nodes in the input tree are ignored.
+ *
+ * If any node has a "when" statement that would evaluate to "false",
+ * then this node MUST NOT be present in the input tree.
+ *
+ * 7.14.4
+ * Input parameters are encoded as child XML elements to the rpc node's
+ * XML element, in the same order as they are defined within the "input"
+ * statement.
+ *
+ * If the RPC operation invocation succeeded and no output parameters
+ * are returned, the <rpc-reply> contains a single <ok/> element defined
+ * in [RFC6241].  If output parameters are returned, they are encoded as
+ * child elements to the <rpc-reply> element defined in [RFC6241], in
+ * the same order as they are defined within the "output" statement.
+ */
+int
+xml_yang_validate_rpc(cxobj *xrpc)
+{
+    int        retval = -1;
+    yang_stmt *yn=NULL;  /* rpc name */
+    cxobj     *xn;       /* rpc name */
+    yang_stmt *yi=NULL;  /* input name */
+    cxobj     *xi;       /* input name */
+    
+    assert(strcmp(xml_name(xrpc), "rpc")==0);
+    xn = NULL;
+    while ((xn = xml_child_each(xrpc, xn, CX_ELMNT)) != NULL) {
+	if ((yn = xml_spec(xn)) == NULL)
+	    goto fail;
+	xi = NULL;
+	while ((xi = xml_child_each(xn, xi, CX_ELMNT)) != NULL) {
+	    if ((yi = xml_spec(xi)) == NULL)
+		goto fail;
+	}
+    }
+    // ok: /* pass validation */
+    retval = 1;
+ done:
+    return retval;
+ fail:
+    retval = 0;
+    goto done;
+}
+
 /*! Validate a single XML node with yang specification for added entry
  * 1. Check if mandatory leafs present as subs.
  * 2. Check leaf values, eg int ranges and string regexps.
@@ -418,9 +486,14 @@ xml_yang_validate_add(cxobj   *xt,
 /*! Validate a single XML node with yang specification for all (not only added) entries
  * 1. Check leafrefs. Eg you delete a leaf and a leafref references it.
  * @param[in]  xt  XML node to be validated
- * @retval     0   Valid OK
+ * @param[in]  arg Not used
  * @retval    -1   Validation failed
+ * @retval     0   Validation OK
  * @see xml_yang_validate_add
+ * @code
+ *   if (xml_apply(x, CX_ELMNT, (xml_applyfn_t*)xml_yang_validate_all, 0) < 0)
+ *      err;
+ * @endcode
  */
 int
 xml_yang_validate_all(cxobj   *xt, 
@@ -1397,41 +1470,133 @@ xml_non_config_data(cxobj *xt,
     return retval;
 }
 
-
-/*! Add yang specification backpoint to XML node
+/*! Add yang specification backpointer to rpc
+ * 
  * @param[in]   xt      XML tree node
  * @param[in]   arg     Yang spec
- * @note This may be unnecessary if yspec us set on creation
+ * @retval      0       OK
+ * @retval     -1       Error
+ * @note This may be unnecessary if yspec is set on creation
  * @note For subs to anyxml nodes will not have spec set
  * @note No validation is done,... XXX
  * @code
  * xml_apply(xc, CX_ELMNT, xml_spec_populate, yspec)
  * @endcode
+ * @see xml_spec_populate
+ */
+int
+xml_spec_populate_rpc(clicon_handle h,
+		      cxobj        *xrpc,
+		      yang_spec    *yspec)
+{
+    int        retval = -1;
+    yang_stmt *y=NULL;    /* yang node */
+    yang_stmt *ymod=NULL; /* yang module */
+    yang_stmt *yi = NULL; /* input */
+    yang_stmt *ya = NULL; /* arg */
+    cxobj     *x;
+    cxobj     *xi;
+    int        i;
+    
+    if ((strcmp(xml_name(xrpc), "rpc"))!=0){
+	clicon_err(OE_UNIX, EINVAL, "RPC expected");
+	goto done;
+    }
+    x = NULL;
+    while ((x = xml_child_each(xrpc, x, CX_ELMNT)) != NULL) {
+	if (ys_module_by_xml(yspec, x, &ymod) < 0)
+	    goto done;
+	if (ymod != NULL)
+	    y = yang_find((yang_node*)ymod, Y_RPC, xml_name(x));
+	/* Loose semantics: loop through all modules to find the node 
+	 */
+	if (y == NULL &&
+	    clicon_option_bool(h, "CLICON_XML_NS_ITERATE")){
+	    for (i=0; i<yspec->yp_len; i++){
+		ymod = yspec->yp_stmt[i];
+		if ((y = yang_find((yang_node*)ymod, Y_RPC, xml_name(x))) != NULL)
+		    break;
+	    }
+	}
+	if (y){
+	    xml_spec_set(x, y);
+	    if ((yi = yang_find((yang_node*)y, Y_INPUT, NULL)) != NULL){
+		xi = NULL;
+		while ((xi = xml_child_each(x, xi, CX_ELMNT)) != NULL) {
+		    if ((ya = yang_find_datanode((yang_node*)yi, xml_name(xi))) != NULL)
+			xml_spec_set(xi, ya);
+		}		
+	    }
+	}
+    }
+    retval = 0;
+ done:
+    return retval;
+}
+
+/*! Add yang specification backpointer to XML node
+ * @param[in]   xt      XML tree node
+ * @param[in]   arg     Yang spec
+ * @note This may be unnecessary if yspec is set on creation
+ * @note For subs to anyxml nodes will not have spec set
+ * @note No validation is done,... XXX
+ * @note relies on kludge _CLICON_XML_NS_ITERATE
+ * @code
+ * xml_apply(xc, CX_ELMNT, xml_spec_populate, yspec)
+ * @endcode
  */
 int
 xml_spec_populate(cxobj  *x, 
 		  void   *arg)
 {
     int        retval = -1;
-    yang_spec *yspec = (yang_spec*)arg;
+    //    clicon_handle h = (clicon_handle)arg;
+    yang_spec *yspec=NULL; /* yang spec */
     yang_stmt *y=NULL;  /* yang node */
+    yang_stmt *yparent; /* yang parent */
+    yang_stmt *ymod;    /* yang module */
+    cxobj     *xp;      /* xml parent */
+    char      *name;
+    int        i;
 
-    if (xml_child_spec(xml_name(x), xml_parent(x), yspec, &y) < 0)
-	goto done;
-#if 0
-    if ((xp = xml_parent(x)) != NULL &&
-	(yp = xml_spec(xp)) != NULL)
-	y = yang_find_datanode((yang_node*)yp, xml_name(x));
-    else
-	y = yang_find_topnode(yspec, name, YC_DATANODE); /* still NULL for config */
-#endif
-    if (y)
+    yspec = (yang_spec*)arg;
+    if (xml_spec(x))
+	goto ok;
+    xp = xml_parent(x);
+    name = xml_name(x);
+    if (xp && (yparent = xml_spec(xp)) != NULL)
+	y = yang_find_datanode((yang_node*)yparent, name);
+    else if (yspec){
+	if (ys_module_by_xml(yspec, x, &ymod) < 0)
+	    goto done;
+	if (ymod != NULL)
+	    y = yang_find_datanode((yang_node*)ymod, name);
+	/* Loose semantics: loop through all modules to find the node 
+	 * XXX clicon_option_bool(h, "CLICON_XML_NS_ITERATE")
+	 */
+	if (y == NULL && _CLICON_XML_NS_ITERATE){
+	    for (i=0; i<yspec->yp_len; i++){
+		ymod = yspec->yp_stmt[i];
+		if ((y = yang_find_datanode((yang_node*)ymod, name)) != NULL)
+		    break;
+	    }
+	}
+    }
+    if (y) 
 	xml_spec_set(x, y);
+#if 0 /* Add if you want validation error */
+    else {
+	clicon_err(OE_YANG, ENOENT, "No yang top found?");
+	goto done;
+    }
+#endif
+    ok:
     retval = 0;
  done:
     return retval;
 }
 
+
 /*! Translate from restconf api-path in cvv form to xml xpath
  * eg a/b=c -> a/[b=c] 
  * @param[in]  yspec Yang spec
@@ -1757,7 +1922,6 @@ api_path2xml(char       *api_path,
  * @retval     0     OK. If reason is set, Yang error
  * @retval    -1     Error
  * Assume x0 and x1 are same on entry and that y is the spec
- * @see put in clixon_keyvalue.c
  */
 static int
 xml_merge1(cxobj              *x0,
diff --git a/lib/src/clixon_xml_sort.c b/lib/src/clixon_xml_sort.c
index 27842b6a..7e68d2b8 100644
--- a/lib/src/clixon_xml_sort.c
+++ b/lib/src/clixon_xml_sort.c
@@ -56,7 +56,6 @@
 #include "clixon_err.h"
 #include "clixon_log.h"
 #include "clixon_string.h"
-
 #include "clixon_queue.h"
 #include "clixon_hash.h"
 #include "clixon_handle.h"
@@ -73,7 +72,6 @@
  */
 int xml_child_sort = 1;
 
-
 /*! Given a child name and an XML object, return yang stmt of child
  * If no xml parent, find root yang stmt matching name
  * @param[in]  x        Child
@@ -81,6 +79,8 @@ int xml_child_sort = 1;
  * @param[in]  yspec    Yang specification (top level)
  * @param[out] yresult  Pointer to yang stmt of result, or NULL, if not found
  * @note special rule for rpc, ie <rpc><foo>,look for top "foo" node.
+ * @note works for import prefix, but not work for generic XML parsing where
+ *       xmlns and xmlns:ns are used.
  */
 int
 xml_child_spec(char       *name,
@@ -88,17 +88,40 @@ xml_child_spec(char       *name,
 	       yang_spec  *yspec,
 	       yang_stmt **yresult)
 {
-    yang_stmt *y;  /* result yang node */   
+    int        retval = -1;
+    yang_stmt *y = NULL;  /* result yang node */   
     yang_stmt *yparent; /* parent yang */
-    
-    if (xp && (yparent = xml_spec(xp)) != NULL)
-	y = yang_find_datanode((yang_node*)yparent, name);
-    else if (yspec)
-	y = yang_find_topnode(yspec, name, YC_DATANODE); /* still NULL for config */
+    yang_stmt *ymod = NULL;
+    yang_stmt *yi;
+    int        i;
+	    
+    if (xp && (yparent = xml_spec(xp)) != NULL){
+	if (yparent->ys_keyword == Y_RPC){
+	    if ((yi = yang_find((yang_node*)yparent, Y_INPUT, NULL)) != NULL)
+		y = yang_find_datanode((yang_node*)yi, name);
+	}
+	else
+	    y = yang_find_datanode((yang_node*)yparent, name);
+    }
+    else if (yspec){
+	if (ys_module_by_xml(yspec, xp, &ymod) < 0)
+	    goto done;
+	if (ymod != NULL)
+	    y = yang_find_schemanode((yang_node*)ymod, name);
+	if (y == NULL && _CLICON_XML_NS_ITERATE){
+	    for (i=0; i<yspec->yp_len; i++){
+		ymod = yspec->yp_stmt[i];
+		if ((y = yang_find_schemanode((yang_node*)ymod, name)) != NULL)
+		    break;
+	    }
+	}
+    }
     else
 	y = NULL;
     *yresult = y;
-    return 0;
+    retval = 0;
+ done:
+    return retval;
 }
 
 /*! Help function to qsort for sorting entries in xml child vector
diff --git a/lib/src/clixon_yang.c b/lib/src/clixon_yang.c
index 2a6b1572..8b9af6d0 100644
--- a/lib/src/clixon_yang.c
+++ b/lib/src/clixon_yang.c
@@ -658,15 +658,18 @@ yang_find_schemanode(yang_node *yn,
     return ysmatch;
 }
 
-/*! Find first matching data node in all (sub)modules in a yang spec
+/*! Find first matching data node in all modules in a yang spec (prefixes)
  *
  * @param[in]  ysp        Yang specification
- * @param[in]  argument   Name of node. If NULL match first
+ * @param[in]  nodeid     Name of node. If NULL match first
  * @param[in]  class      See yang_class for class of yang nodes
  * A yang specification has modules as children which in turn can have 
  * syntax-nodes as children. This function goes through all the modules to
  * look for nodes. Note that if a child to a module is a choice, 
  * the search is made recursively made to the choice's children.
+ * @note works for import prefix, but not work for generic XML parsing where
+ *       xmlns and xmlns:ns are used.
+ * @see yang_find_top_ns
  */
 yang_stmt *
 yang_find_topnode(yang_spec *ysp, 
@@ -677,7 +680,7 @@ yang_find_topnode(yang_spec *ysp,
     yang_stmt *yres = NULL; /* result */
     char      *prefix = NULL;
     char      *id = NULL;
-    int i;
+    int        i;
 
     if (yang_nodeid_split(nodeid, &prefix, &id) < 0)
 	goto done;
@@ -719,7 +722,7 @@ yang_find_topnode(yang_spec *ysp,
 }
 
 /*! Given a yang statement, find the prefix associated to this module
- * @param[in]  ys        Yang statement
+ * @param[in]  ys        Yang statement in module tree (or module itself)
  * @retval     NULL      Not found
  * @retval     prefix    Prefix as char* pointer into yang tree
  * @code
@@ -745,6 +748,34 @@ yang_find_myprefix(yang_stmt *ys)
     return prefix;
 }
 
+/*! Given a yang statement, find the namespace URI associated to this module
+ * @param[in]  ys        Yang statement in module tree (or module itself)
+ * @retval     NULL      Not found
+ * @retval     namespace Namspace URI as char* pointer into yang tree
+ * @code
+ * char *myns = yang_find_mynamespace(ys);
+ * @endcode
+ * @see yang_find_module_by_namespace
+ */
+char *
+yang_find_mynamespace(yang_stmt *ys)
+{
+    yang_stmt *ymod; /* My module */
+    yang_stmt *ynamespace;
+    char      *namespace = NULL;
+
+    if ((ymod = ys_module(ys)) == NULL){
+	clicon_err(OE_YANG, 0, "My yang module not found");
+	goto done;
+    }
+    if ((ynamespace = yang_find((yang_node*)ymod, Y_NAMESPACE, NULL)) == NULL)
+	goto done;
+    namespace = ynamespace->ys_argument;
+ done:
+    return namespace;
+}
+
+
 /*! Find matching y in yp:s children, return 0 and index or -1 if not found.
  * @retval 0 not found
  * @retval 1 found
@@ -811,7 +842,52 @@ yang_key2str(int keyword)
     return (char*)clicon_int2str(ykmap, keyword);
 }
 
-/*! Find top module or sub-module given a statement. 
+/*! Find top data node among all modules by namespace in xml tree
+ * @param[in]  ysp      Yang specification
+ * @param[in]  xt       XML node
+ * @param[out] ymod     Yang module (NULL if not found)
+ * @retval     0        OK
+ * @retval    -1        Error
+ * @note works for xml namespaces (xmlns / xmlns:ns)
+ */
+int
+ys_module_by_xml(yang_spec  *ysp,
+		 cxobj      *xt,
+		 yang_stmt **ymodp)
+{
+    int        retval = -1;
+    yang_stmt *ym = NULL; /* module */
+    char      *prefix = NULL;
+    char      *namespace = NULL; /* namespace URI */
+
+    if (ymodp)
+	*ymodp = NULL;
+    prefix = xml_namespace(xt);
+    if (prefix){
+	/* Get namespace for prefix */
+	if (xml2ns(xt, prefix, &namespace) < 0)
+	    goto done;
+    }
+    else{
+	/* Get default namespace */
+	if (xml2ns(xt, NULL, &namespace) < 0)
+	    goto done;
+    }
+    /* No namespace found, give up */
+    if (namespace == NULL)
+	goto ok;
+    /* We got the namespace, now get the module */
+    ym = yang_find_module_by_namespace(ysp, namespace);
+    /* Set result param */
+    if (ymodp && ym)
+	*ymodp = ym;
+ ok:
+    retval = 0;
+ done:
+    return retval;
+}
+
+/*! Find the top module or sub-module given a statement from within a yang tree
  * Ultimate top is yang spec, dont return that
  * The routine recursively finds ancestors.
  * @param[in] ys    Any yang statement in a yang tree
@@ -840,7 +916,7 @@ ys_module(yang_stmt *ys)
     return ys;
 }
 
-/*! Find top of tree, the yang specification 
+/*! Find top of tree, the yang specification from within the tree
  * @param[in] ys    Any yang statement in a yang tree
  * @retval    yspec The top yang specification
  * @see  ys_module
@@ -1005,6 +1081,29 @@ yang_find_module_by_prefix(yang_stmt *ys,
     return ymod;
 }
 
+/*! Given a yang statement and a namespace, return yang module
+ *
+ * @param[in]  yspec      A yang specification
+ * @param[in]  namespace  namespace
+ * @retval     ymod       Yang module statement if found
+ * @retval     NULL       not found
+ */
+yang_stmt *
+yang_find_module_by_namespace(yang_spec *yspec, 
+			      char      *namespace)
+{
+    yang_stmt *ymod = NULL;
+
+    if (namespace == NULL)
+	goto done;
+    while ((ymod = yn_each((yang_node*)yspec, ymod)) != NULL) {
+	if (yang_find((yang_node*)ymod, Y_NAMESPACE, namespace) != NULL)
+	    break;
+    }
+ done:
+    return ymod;
+}
+
 /*! string is quoted if it contains space or tab, needs double '' */
 static int inline
 quotedstring(char *s)
@@ -1984,6 +2083,7 @@ yang_parse_filename(const char   *filename,
     int           fd = -1;
     struct stat   st;
 
+    //    clicon_debug(1, "%s %s", __FUNCTION__, filename);
     if (stat(filename, &st) < 0){
 	clicon_err(OE_YANG, errno, "%s not found", filename);
 	goto done;
@@ -2903,6 +3003,8 @@ yang_spec_load_dir(clicon_handle h,
 	    len = b-base;
 	else
 	    len = strlen(base);
+	/* remove duplicates: there may be cornercases that dont work, eg
+	 * mix of revisions and not? */
 	for (j = (i+1); j < ndp; j++)
 	    if (strncmp(base, dp[j].d_name, len) == 0)
 		break;
diff --git a/test/lib.sh b/test/lib.sh
index eb6bdbbd..2a66d2d5 100755
--- a/test/lib.sh
+++ b/test/lib.sh
@@ -7,6 +7,12 @@
 testnr=0
 testname=
 
+# If set to 0, override starting of clixon_backend in test (you bring your own)
+: ${BE:=1}
+
+# If set, enable debugging (of backend)
+: ${DBG:=0}
+
 # For memcheck
 #clixon_cli="valgrind --leak-check=full --show-leak-kinds=all clixon_cli"
 clixon_cli=clixon_cli
@@ -56,6 +62,7 @@ new(){
     testname=$1
     >&2 echo "Test$testnr [$1]"
 }
+# No CR
 new2(){
     testnr=`expr $testnr + 1`
     testname=$1
@@ -84,7 +91,7 @@ expectfn(){
 #  echo "retval:\"$retval\""
 #  echo "ret:\"$ret\""
 #  echo "r:\"$r\""
-    if [ $r != $retval ]; then
+   if [ $r != $retval ]; then
       echo -e "\e[31m\nError ($r != $retval) in Test$testnr [$testname]:"
       echo -e "\e[0m:"
       exit -1
@@ -219,3 +226,29 @@ expectwait(){
   fi
 }
 
+expectmatch(){
+    ret=$1
+    r=$2
+    expret=$3
+    expect=$4
+    if [ $r != $expret ]; then
+	echo -e "\e[31m\nError ($r != $retval) in Test$testnr [$testname]:"
+	echo -e "\e[0m:"
+	exit -1
+    fi
+    if [ -z "$ret" -a -z "$expect" ]; then
+	echo > /dev/null
+    else
+	match=$(echo "$ret" | grep -Eo "$expect")
+	if [ -z "$match" ]; then
+	    err "$expect" "$ret"
+	fi
+	if [ -n "$expect2" ]; then
+	    match=`echo "$ret" | grep -EZo "$expect2"`
+	    if [ -z "$match" ]; then
+		err $expect "$ret"
+	    fi
+	fi
+    fi
+
+}
diff --git a/test/nacm.sh b/test/nacm.sh
new file mode 100755
index 00000000..01e7ad05
--- /dev/null
+++ b/test/nacm.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+# Authentication and authorization and IETF NACM
+# Library variable and functions
+
+USER=$(whoami)
+
+# Three groups from RFC8341 A.1 (admin extended with $USER)
+NGROUPS=$(cat <<EOF
+     <groups>
+       <group>
+         <name>admin</name>
+         <user-name>admin</user-name>
+         <user-name>andy</user-name>
+         <user-name>$USER</user-name>
+       </group>
+       <group>
+         <name>limited</name>
+         <user-name>wilma</user-name>
+         <user-name>bam-bam</user-name>
+       </group>
+       <group>
+         <name>guest</name>
+         <user-name>guest</user-name>
+         <user-name>guest@example.com</user-name>
+       </group>
+     </groups>
+EOF
+)
+
+# Permit all rule for admin group from RFC8341 A.2
+NADMIN=$(cat <<EOF
+     <rule-list>
+       <name>admin-acl</name>
+       <group>admin</group>
+       <rule>
+         <name>permit-all</name>
+         <module-name>*</module-name>
+         <access-operations>*</access-operations>
+         <action>permit</action>
+         <comment>
+             Allow the 'admin' group complete access to all operations and data.
+         </comment>
+       </rule>
+     </rule-list>
+EOF
+)
+
diff --git a/test/test_cli.sh b/test/test_cli.sh
index a93cf0fb..3bf4af77 100755
--- a/test/test_cli.sh
+++ b/test/test_cli.sh
@@ -14,7 +14,7 @@ APPNAME=example
 cfg=$dir/conf_yang.xml
 
 cat <<EOF > $cfg
-<config>
+<config xmlns="http://clicon.org">
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
@@ -31,17 +31,18 @@ cat <<EOF > $cfg
 </config>
 EOF
 
-# kill old backend (if any)
-new "kill old backend"
-sudo clixon_backend -z -f $cfg
-if [ $? -ne 0 ]; then
-    err
-fi
-new "start backend -s init -f $cfg"
-sudo $clixon_backend -s init -f $cfg
-
-if [ $? -ne 0 ]; then
-    err
+new "test params: -f $cfg"
+if [ $BE -ne 0 ]; then
+    new "kill old backend"
+    sudo clixon_backend -z -f $cfg
+    if [ $? -ne 0 ]; then
+	err
+    fi
+    new "start backend -s init -f $cfg"
+    sudo $clixon_backend -s init -f $cfg -D $DBG
+    if [ $? -ne 0 ]; then
+	err
+    fi
 fi
 
 new "cli configure top"
@@ -114,6 +115,10 @@ expectfn "$clixon_cli -1 -f $cfg -l o debug level 0" 0 "^$"
 new "cli rpc"
 expectfn "$clixon_cli -1 -f $cfg -l o rpc ipv4" 0 "<address-family>ipv4</address-family>" "<next-hop-list>2.3.4.5</next-hop-list>"
 
+if [ $BE -ne 0 ]; then
+    exit # BE
+fi
+
 new "Kill backend"
 # Check if premature kill
 pid=`pgrep -u root -f clixon_backend`
diff --git a/test/test_datastore.sh b/test/test_datastore.sh
index 122b3add..bcc7b27b 100755
--- a/test/test_datastore.sh
+++ b/test/test_datastore.sh
@@ -46,7 +46,12 @@ module ietf-ip{
 }
 EOF
 
-db='<config><x><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>'
+
+
+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>'
+
+# Without xmlns
+xmlxxx='<config><x><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>'
 
 run(){
     name=$1
@@ -62,12 +67,12 @@ run(){
     new "datastore $name init"
     expectfn "$datastore $conf init" 0 ""
 
-    # Whole tree operations
     new "datastore $name put all replace"
-    expectfn "$datastore $conf put replace $db" 0 ""
+    ret=$($datastore $conf put replace "$xml")
+    expectmatch "$ret" $? "0" ""
 
     new "datastore $name get"
-    expectfn "$datastore $conf get /" 0 "^$db$"
+    expectfn "$datastore $conf get /" 0 "^$xmlxxx$"
 
     new "datastore $name put all remove"
     expectfn "$datastore $conf put remove <config/>" 0 ""
@@ -76,10 +81,13 @@ run(){
     expectfn "$datastore $conf get /" 0 "^<config/>$" 
 
     new "datastore $name put all merge"
-    expectfn "$datastore $conf put merge $db" 0 ""
+    ret=$($datastore $conf put merge "$xml")
+    expectmatch "$ret" $? "0" ""
+    
+#    expectfn "$datastore $conf put merge $xml" 0 ""
 
     new "datastore $name get"
-    expectfn "$datastore $conf get /" 0 "^$db$"
+    expectfn "$datastore $conf get /" 0 "^$xmlxxx$"
 
     new "datastore $name put all delete"
     expectfn "$datastore $conf put remove <config/>" 0 ""
@@ -88,10 +96,11 @@ run(){
     expectfn "$datastore $conf get /" 0 "^<config/>$"
 
     new "datastore $name put all create"
-    expectfn "$datastore $conf put create $db" 0 ""
+    ret=$($datastore $conf put create "$xml")
+    expectmatch "$ret" $? "0" ""
 
     new "datastore $name get"
-    expectfn "$datastore $conf get /" 0 "^$db$"
+    expectfn "$datastore $conf get /" 0 "^$xmlxxx$"
 
     new "datastore $name put top create"
     expectfn "$datastore $conf put create <config><x/></config>" 0 "" # error
@@ -159,7 +168,6 @@ run(){
     rm -rf $mydir
 }
 
-#run keyvalue # cant get the put to work
 run text
 
 rm -rf $dir
diff --git a/test/test_feature.sh b/test/test_feature.sh
index 86f3ffd2..4bbb334c 100755
--- a/test/test_feature.sh
+++ b/test/test_feature.sh
@@ -57,19 +57,21 @@ module $APPNAME{
    }
 }
 EOF
-new "start backend -s init -f $cfg -y $fyang"
-# kill old backend (if any)
-new "kill old backend"
-sudo clixon_backend -zf $cfg -y $fyang
-if [ $? -ne 0 ]; then
-    err
-fi
 
-new "start backend -s init -f $cfg -y $fyang"
-# start new backend
-sudo $clixon_backend -s init -f $cfg -y $fyang
-if [ $? -ne 0 ]; then
-    err
+new "test params: -f $cfg -y $fyang"
+if [ $BE -ne 0 ]; then
+    new "kill old backend"
+    sudo clixon_backend -zf $cfg -y $fyang
+    if [ $? -ne 0 ]; then
+	err
+    fi
+
+    new "start backend -s init -f $cfg -y $fyang"
+    # start new backend
+    sudo $clixon_backend -s init -f $cfg -y $fyang -D $DBG
+    if [ $? -ne 0 ]; then
+	err
+    fi
 fi
 
 new "cli enabled feature"
@@ -94,7 +96,8 @@ new "netconf validate enabled feature"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf disabled feature"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><A>foo</A></config></edit-config></rpc>]]>]]>" '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>XML node config/A has no corresponding yang specification (Invalid XML or wrong Yang spec?'
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><A>foo</A></config></edit-config></rpc>]]>]]>" '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>application</error-type><error-severity>error</error-severity><error-message>Validation failed</error-message></rpc-error></rpc-reply>]]>]]>$'
+#expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><A>foo</A></config></edit-config></rpc>]]>]]>" '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>XML node config/A has no corresponding yang specification (Invalid XML or wrong Yang spec?'
 
 # This test has been broken up into all different modules instead of one large
 # reply since the modules change so often
@@ -134,7 +137,7 @@ if [ -z "$match" ]; then
 fi
 
 new "netconf module ietf-netconf"
-expect="module><name>ietf-netconf</name><revision>2011-06-01</revision><namespace>urn:ietf:params:xml:ns:netconf:base:1.0</namespace><conformance-type>implement</conformance-type></module>"
+expect="module><name>ietf-netconf</name><revision>2011-06-01</revision><namespace>urn:ietf:params:xml:ns:netconf:base:1.0</namespace><feature>candidate</feature><feature>startup</feature><feature>validate</feature><feature>xpath</feature><conformance-type>implement</conformance-type></module>"
 match=`echo "$ret" | grep -GZo "$expect"`
 if [ -z "$match" ]; then
       err "$expect" "$ret"
@@ -159,6 +162,10 @@ if [ -z "$match" ]; then
       err "$expect" "$ret"
 fi
 
+if [ $BE -ne 0 ]; then
+    exit # BE
+fi
+
 new "Kill backend"
 # Check if premature kill
 pid=`pgrep -u root -f clixon_backend`
diff --git a/test/test_identity.sh b/test/test_identity.sh
index f9498013..1acbc764 100755
--- a/test/test_identity.sh
+++ b/test/test_identity.sh
@@ -106,21 +106,23 @@ cat <<EOF > $fyang
      }
 EOF
 
-# kill old backend (if any)
-new "kill old backend"
-sudo clixon_backend -zf $cfg
-if [ $? -ne 0 ]; then
-    err
-fi
-new "start backend  -s init -f $cfg -y $fyang"
-# start new backend
-sudo $clixon_backend -s init -f $cfg -y $fyang # -D 1
-if [ $? -ne 0 ]; then
-    err
+new "test params: -f $cfg -y $fyang"
+if [ $BE -ne 0 ]; then
+    new "kill old backend"
+    sudo clixon_backend -zf $cfg
+    if [ $? -ne 0 ]; then
+	err
+    fi
+    new "start backend -s init -f $cfg -y $fyang"
+    # start new backend
+    sudo $clixon_backend -s init -f $cfg -y $fyang -D $DBG
+    if [ $? -ne 0 ]; then
+	err
+    fi
 fi
 
 new "Set crypto to aes"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><crypto>aes</crypto></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><edit-config><target><candidate/></target><config><crypto>aes</crypto></config></edit-config></rpc>]]>]]>' '^<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><ok/></rpc-reply>]]>]]>$'
 
 new "netconf validate "
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
@@ -180,6 +182,10 @@ expectfn "$clixon_cli -1 -f $cfg -y $fyang -l o set crypto des:des3" 0 "^$"
 new "cli validate"
 expectfn "$clixon_cli -1 -f $cfg -y $fyang -l o validate" 0 "^$"
 
+if [ $BE -ne 0 ]; then
+    exit # BE
+fi
+
 new "Kill backend"
 # Check if premature kill
 pid=`pgrep -u root -f clixon_backend`
diff --git a/test/test_leafref.sh b/test/test_leafref.sh
index 719a77e6..72faaa4e 100755
--- a/test/test_leafref.sh
+++ b/test/test_leafref.sh
@@ -72,18 +72,19 @@ module example{
 }
 EOF
 
-# kill old backend (if any)
-new "kill old backend"
-sudo clixon_backend -zf $cfg -y $fyang
-if [ $? -ne 0 ]; then
-    err
-fi
+new "test params: -f $cfg -y $fyang"
 
-# start new backend
-new "start backend  -s init -f $cfg -y $fyang"
-sudo $clixon_backend -s init -f $cfg -y $fyang 
-if [ $? -ne 0 ]; then
-    err
+if [ $BE -ne 0 ]; then
+    new "kill old backend"
+    sudo clixon_backend -zf $cfg -y $fyang
+    if [ $? -ne 0 ]; then
+	err
+    fi
+    new "start backend  -s init -f $cfg -y $fyang"
+    sudo $clixon_backend -s init -f $cfg -y $fyang -D $DBG
+    if [ $? -ne 0 ]; then
+	err
+    fi
 fi
 
 new "leafref base config"
@@ -142,6 +143,10 @@ expectfn "$clixon_cli -1f $cfg -y $fyang -l o set sender a" 0 "^$"
 new "cli sender template"
 expectfn "$clixon_cli -1f $cfg -y $fyang -l o set sender b template a" 0 "^$"
 
+if [ $BE -ne 0 ]; then
+    exit # BE
+fi
+
 new "Kill backend"
 # Check if premature kill
 pid=`pgrep -u root -f clixon_backend`
diff --git a/test/test_list.sh b/test/test_list.sh
index ff12015a..7e42a23b 100755
--- a/test/test_list.sh
+++ b/test/test_list.sh
@@ -64,18 +64,20 @@ module $APPNAME{
 }
 EOF
 
-# kill old backend (if any)
-new "kill old backend"
-sudo clixon_backend -zf $cfg -y $fyang
-if [ $? -ne 0 ]; then
-    err
-fi
+new "test params: -f $cfg -y $fyang"
 
-new "start backend -s init -f $cfg -y $fyang"
-# start new backend
-sudo $clixon_backend -s init -f $cfg -y $fyang 
-if [ $? -ne 0 ]; then
-    err
+if [ $BE -ne 0 ]; then
+    new "kill old backend"
+    sudo clixon_backend -zf $cfg -y $fyang
+    if [ $? -ne 0 ]; then
+	err
+    fi
+    new "start backend -s init -f $cfg -y $fyang"
+    # start new backend
+    sudo $clixon_backend -s init -f $cfg -y $fyang -D $DBG
+    if [ $? -ne 0 ]; then
+	err
+    fi
 fi
 
 new "minmax: minimal"
@@ -123,6 +125,10 @@ new "minmax: validate should fail"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error/></rpc-reply>]]>]]>$"
 fi # NYI
 
+if [ $BE -ne 0 ]; then
+    exit # BE
+fi
+
 new "Kill backend"
 # Check if premature kill
 pid=`pgrep -u root -f clixon_backend`
diff --git a/test/test_nacm.sh b/test/test_nacm.sh
index afac1df7..c22159c2 100755
--- a/test/test_nacm.sh
+++ b/test/test_nacm.sh
@@ -6,6 +6,7 @@
 APPNAME=example
 # include err() and new() functions and creates $dir
 . ./lib.sh
+. ./nacm.sh
 
 cfg=$dir/conf_yang.xml
 fyang=$dir/test.yang
@@ -45,30 +46,17 @@ module $APPNAME{
 }
 EOF
 
+# The groups are slightly modified from RFC8341 A.1
+# The rule-list is from A.2
 RULES=$(cat <<EOF
    <nacm>
      <enable-nacm>false</enable-nacm>
      <read-default>deny</read-default>
      <write-default>deny</write-default>
      <exec-default>deny</exec-default>
-     <groups>
-       <group>
-         <name>admin</name>
-         <user-name>admin</user-name>
-         <user-name>adm1</user-name>
-         <user-name>olof</user-name>
-       </group>
-       <group>
-         <name>limited</name>
-         <user-name>wilma</user-name>
-         <user-name>bam-bam</user-name>
-       </group>
-       <group>
-         <name>guest</name>
-         <user-name>guest</user-name>
-         <user-name>guest@example.com</user-name>
-       </group>
-     </groups>
+
+     $NGROUPS
+
      <rule-list>
        <name>guest-acl</name>
        <group>guest</group>
@@ -78,7 +66,8 @@ RULES=$(cat <<EOF
          <access-operations>*</access-operations>
          <action>deny</action>
          <comment>
-             Do not allow guests any access to any information.
+             Do not allow guests any access to the NETCONF
+             monitoring information.
          </comment>
        </rule>
      </rule-list>
@@ -106,36 +95,27 @@ RULES=$(cat <<EOF
          </comment>
        </rule>
      </rule-list>
-     <rule-list>
-       <name>admin-acl</name>
-       <group>admin</group>
-       <rule>
-         <name>permit-all</name>
-         <module-name>*</module-name>
-         <access-operations>*</access-operations>
-         <action>permit</action>
-         <comment>
-             Allow the 'admin' group complete access to all operations and data.
-         </comment>
-       </rule>
-     </rule-list>
+
+     $NADMIN
+
    </nacm>
    <x>0</x>
 EOF
 )
 
-# kill old backend (if any)
-new "kill old backend"
-sudo clixon_backend -zf $cfg -y $fyang
-if [ $? -ne 0 ]; then
-    err
-fi
+new "test params: -f $cfg -y $fyang"
 
-new "start backend -s init -f $cfg -y $fyang"
-# start new backend
-sudo $clixon_backend -s init -f $cfg -y $fyang
-if [ $? -ne 0 ]; then
-    err
+if [ $BE -ne 0 ]; then
+    new "kill old backend"
+    sudo clixon_backend -zf $cfg -y $fyang
+    if [ $? -ne 0 ]; then
+	err
+    fi
+    new "start backend -s init -f $cfg -y $fyang"
+    sudo $clixon_backend -s init -f $cfg -y $fyang -D $DBG
+    if [ $? -ne 0 ]; then
+	err
+    fi
 fi
 
 new "kill old restconf daemon"
@@ -148,10 +128,10 @@ sudo su -c "$clixon_restconf -f $cfg -y $fyang -- -a" -s /bin/sh www-data &
 sleep $RCWAIT
 
 new "restconf DELETE whole datastore"
-expecteq "$(curl -u adm1:bar -sS -X DELETE http://localhost/restconf/data)" ""
+expecteq "$(curl -u andy:bar -sS -X DELETE http://localhost/restconf/data)" ""
 
 new2 "auth get"
-expecteq "$(curl -u adm1:bar -sS -X GET http://localhost/restconf/data/x)" 'null
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/x)" 'null
 
'
 
 new "auth set authentication config"
@@ -164,19 +144,19 @@ new2 "auth get (no user: access denied)"
 expecteq "$(curl -sS -X GET -H \"Accept:\ application/yang-data+json\" http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-tag": "access-denied","error-type": "protocol","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
 
 new2 "auth get (wrong passwd: access denied)"
-expecteq "$(curl -u adm1:foo -sS -X GET http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-tag": "access-denied","error-type": "protocol","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
+expecteq "$(curl -u andy:foo -sS -X GET http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-tag": "access-denied","error-type": "protocol","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
 
 new2 "auth get (access)"
-expecteq "$(curl -u adm1:bar -sS -X GET http://localhost/restconf/data/x)" '{"x": 0}
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/x)" '{"x": 0}
 
'
 
 #----------------Enable NACM
 
 new "enable nacm"
-expecteq "$(curl -u adm1:bar -sS -X PUT -d '{"enable-nacm": true}' http://localhost/restconf/data/nacm/enable-nacm)" ""
+expecteq "$(curl -u andy:bar -sS -X PUT -d '{"enable-nacm": true}' http://localhost/restconf/data/nacm/enable-nacm)" ""
 
 new2 "admin get nacm"
-expecteq "$(curl -u adm1:bar -sS -X GET http://localhost/restconf/data/x)" '{"x": 0}
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/x)" '{"x": 0}
 
'
 
 new2 "limited get nacm"
@@ -184,20 +164,24 @@ expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/x)" '{"x
 
'
 
 new2 "guest get nacm"
-expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-tag": "access-denied","error-type": "protocol","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
+expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-tag": "access-denied","error-type": "protocol","error-severity": "error","error-message": "access denied"}}}
'
 
 new "admin edit nacm"
-expecteq "$(curl -u adm1:bar -sS -X PUT -d '{"x": 1}' http://localhost/restconf/data/x)" ""
+expecteq "$(curl -u andy:bar -sS -X PUT -d '{"x": 1}' http://localhost/restconf/data/x)" ""
 
 new2 "limited edit nacm"
 expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"x": 2}' http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-tag": "access-denied","error-type": "protocol","error-severity": "error","error-message": "default deny"}}}
'
 
 new2 "guest edit nacm"
-expecteq "$(curl -u guest:bar -sS -X PUT -d '{"x": 3}' http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-tag": "access-denied","error-type": "protocol","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
+expecteq "$(curl -u guest:bar -sS -X PUT -d '{"x": 3}' http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-tag": "access-denied","error-type": "protocol","error-severity": "error","error-message": "access denied"}}}
'
 
 new "Kill restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"
 
+if [ $BE -ne 0 ]; then
+    exit # BE
+fi
+
 new "Kill backend"
 # Check if premature kill
 pid=`pgrep -u root -f clixon_backend`
diff --git a/test/test_nacm_ext.sh b/test/test_nacm_ext.sh
index 997965ff..1db3949f 100755
--- a/test/test_nacm_ext.sh
+++ b/test/test_nacm_ext.sh
@@ -7,6 +7,7 @@
 APPNAME=example
 # include err() and new() functions and creates $dir
 . ./lib.sh
+. ./nacm.sh
 
 cfg=$dir/conf_yang.xml
 fyang=$dir/test.yang
@@ -40,7 +41,12 @@ cat <<EOF > $fyang
 module $APPNAME{
   yang-version 1.1;
   namespace "urn:example:clixon";
+
   prefix ex;
+  import ietf-routing {
+        description "For fib-route";
+	prefix rt;
+  }
   container authentication {
 	description "Example code for enabling www basic auth and some example 
                      users";
@@ -82,23 +88,9 @@ cat <<EOF > $nacmfile
      <read-default>deny</read-default>
      <write-default>deny</write-default>
      <exec-default>deny</exec-default>
-     <groups>
-       <group>
-         <name>admin</name>
-         <user-name>admin</user-name>
-         <user-name>adm1</user-name>
-       </group>
-       <group>
-         <name>limited</name>
-         <user-name>wilma</user-name>
-         <user-name>bam-bam</user-name>
-       </group>
-       <group>
-         <name>guest</name>
-         <user-name>guest</user-name>
-         <user-name>guest@example.com</user-name>
-       </group>
-     </groups>
+
+     $NGROUPS
+
      <rule-list>
        <name>guest-acl</name>
        <group>guest</group>
@@ -136,34 +128,27 @@ cat <<EOF > $nacmfile
          </comment>
        </rule>
      </rule-list>
-     <rule-list>
-       <name>admin-acl</name>
-       <group>admin</group>
-       <rule>
-         <name>permit-all</name>
-         <module-name>*</module-name>
-         <access-operations>*</access-operations>
-         <action>permit</action>
-         <comment>
-             Allow the 'admin' group complete access to all operations and data.
-         </comment>
-       </rule>
-     </rule-list>
+
+     $NADMIN
+
    </nacm>
 EOF
 
-# kill old backend (if any)
-new "kill old backend -zf $cfg -y $fyang"
-sudo clixon_backend -zf $cfg -y $fyang
-if [ $? -ne 0 ]; then
-    err
-fi
-sleep 1
-new "start backend -s init -f $cfg -y $fyang"
-# start new backend
-sudo $clixon_backend -s init -f $cfg -y $fyang 
-if [ $? -ne 0 ]; then
-    err
+new "test params: -f $cfg -y $fyang"
+
+if [ $BE -ne 0 ]; then
+    new "kill old backend -zf $cfg -y $fyang"
+    sudo clixon_backend -zf $cfg -y $fyang
+    if [ $? -ne 0 ]; then
+	err
+    fi
+    sleep 1
+    new "start backend -s init -f $cfg -y $fyang"
+    # start new backend
+    sudo $clixon_backend -s init -f $cfg -y $fyang -D $DBG
+    if [ $? -ne 0 ]; then
+	err
+    fi
 fi
 
 new "kill old restconf daemon"
@@ -175,27 +160,27 @@ sudo su -c "$clixon_restconf -f $cfg -y $fyang -- -a" -s /bin/sh www-data &
 sleep $RCWAIT
 
 new "restconf DELETE whole datastore"
-expecteq "$(curl -u adm1:bar -sS -X DELETE http://localhost/restconf/data)" ""
+expecteq "$(curl -u andy:bar -sS -X DELETE http://localhost/restconf/data)" ""
 
 new2 "auth get"
-expecteq "$(curl -u adm1:bar -sS -X GET http://localhost/restconf/data/state)" '{"state": {"op": "42"}}
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/state)" '{"state": {"op": "42"}}
 
'
 
 new "Set x to 0"
-expecteq "$(curl -u adm1:bar -sS -X PUT -d '{"x": 0}' http://localhost/restconf/data/x)" ""
+expecteq "$(curl -u andy:bar -sS -X PUT -d '{"x": 0}' http://localhost/restconf/data/x)" ""
 
 new2 "auth get (no user: access denied)"
 expecteq "$(curl -sS -X GET -H \"Accept:\ application/yang-data+json\" http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-tag": "access-denied","error-type": "protocol","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
 
 new2 "auth get (wrong passwd: access denied)"
-expecteq "$(curl -u adm1:foo -sS -X GET http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-tag": "access-denied","error-type": "protocol","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
+expecteq "$(curl -u andy:foo -sS -X GET http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-tag": "access-denied","error-type": "protocol","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
 
 new2 "auth get (access)"
-expecteq "$(curl -u adm1:bar -sS -X GET http://localhost/restconf/data/x)" '{"x": 0}
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/x)" '{"x": 0}
 
'
 
 new2 "admin get nacm"
-expecteq "$(curl -u adm1:bar -sS -X GET http://localhost/restconf/data/x)" '{"x": 0}
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/x)" '{"x": 0}
 
'
 
 new2 "limited get nacm"
@@ -203,19 +188,19 @@ expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/x)" '{"x
 
'
 
 new2 "guest get nacm"
-expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-tag": "access-denied","error-type": "protocol","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
+expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-tag": "access-denied","error-type": "protocol","error-severity": "error","error-message": "access denied"}}}
'
 
 new "admin edit nacm"
-expecteq "$(curl -u adm1:bar -sS -X PUT -d '{"x": 1}' http://localhost/restconf/data/x)" ""
+expecteq "$(curl -u andy:bar -sS -X PUT -d '{"x": 1}' http://localhost/restconf/data/x)" ""
 
 new2 "limited edit nacm"
 expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"x": 2}' http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-tag": "access-denied","error-type": "protocol","error-severity": "error","error-message": "default deny"}}}
'
 
 new2 "guest edit nacm"
-expecteq "$(curl -u guest:bar -sS -X PUT -d '{"x": 3}' http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-tag": "access-denied","error-type": "protocol","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
+expecteq "$(curl -u guest:bar -sS -X PUT -d '{"x": 3}' http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-tag": "access-denied","error-type": "protocol","error-severity": "error","error-message": "access denied"}}}
'
 
 new "cli show conf as admin"
-expectfn "$clixon_cli -1 -U adm1 -l o -f $cfg -y $fyang show conf" 0 "^x 1;$"
+expectfn "$clixon_cli -1 -U andy -l o -f $cfg -y $fyang show conf" 0 "^x 1;$"
 
 new "cli show conf as limited"
 expectfn "$clixon_cli -1 -U wilma -l o -f $cfg -y $fyang show conf" 0 "^x 1;$"
@@ -224,7 +209,7 @@ new "cli show conf as guest"
 expectfn "$clixon_cli -1 -U guest -l o -f $cfg -y $fyang show conf" 255 "protocol access-denied"
 
 new "cli rpc as admin"
-expectfn "$clixon_cli -1 -U adm1 -l o -f $cfg -y $fyang rpc ipv4" 0 "<next-hop-list>2.3.4.5</next-hop-list>"
+expectfn "$clixon_cli -1 -U andy -l o -f $cfg -y $fyang rpc ipv4" 0 "<next-hop-list>2.3.4.5</next-hop-list>"
 
 new "cli rpc as limited"
 expectfn "$clixon_cli -1 -U wilma -l o -f $cfg -y $fyang rpc ipv4" 255 "protocol access-denied default deny"
@@ -235,6 +220,10 @@ expectfn "$clixon_cli -1 -U guest -l o -f $cfg -y $fyang rpc ipv4" 255 "protocol
 new "Kill restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"
 
+if [ $BE -ne 0 ]; then
+    exit # BE
+fi
+
 new "Kill backend"
 # Check if premature kill
 pid=`pgrep -u root -f clixon_backend`
diff --git a/test/test_nacm_protocol.sh b/test/test_nacm_protocol.sh
new file mode 100755
index 00000000..2ab70b4b
--- /dev/null
+++ b/test/test_nacm_protocol.sh
@@ -0,0 +1,231 @@
+#!/bin/bash
+# Authentication and authorization and IETF NACM
+# NACM protocol operation rules
+# @see RFC 8341 A.1 and A.3 (and permit-all from A.2)
+# Tests for three protocol operation rules (all apply to module ietf-netconf)
+# deny-kill-session:  This rule prevents the "limited" group or the
+#     "guest" group from invoking the NETCONF <kill-session> protocol
+#     operation.
+# deny-delete-config:  This rule prevents the "limited" group or the
+#     "guest" group from invoking the NETCONF <delete-config> protocol
+#     operation.
+# permit-edit-config:  This rule allows the "limited" group to invoke
+#     the NETCONF <edit-config> protocol operation.  This rule will have
+#     no real effect unless the "exec-default" leaf is set to "deny".
+#
+#  From RFC8040, I conclude that commit/discard should be done automatically
+#  BY THE SYSTEM
+#  Otherwise, if the device supports :candidate, all edits to
+#  configuration nodes in {+restconf}/data are performed in the
+#  candidate configuration datastore.  The candidate MUST be
+#  automatically committed to running immediately after each successful
+#  edit.
+# Which means that restconf -X DELETE /data translates to edit-config + commit
+# WHICH IS allowed.
+
+APPNAME=example
+# include err() and new() functions and creates $dir
+. ./lib.sh
+. ./nacm.sh
+
+cfg=$dir/conf_yang.xml
+fyang=$dir/test.yang
+fyangerr=$dir/err.yang
+
+cat <<EOF > $cfg
+<config>
+  <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_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>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
+  <CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
+  <CLICON_CLI_GENMODEL_COMPLETION>1</CLICON_CLI_GENMODEL_COMPLETION>
+  <CLICON_XMLDB_DIR>/usr/local/var/$APPNAME</CLICON_XMLDB_DIR>
+  <CLICON_XMLDB_PLUGIN>/usr/local/lib/xmldb/text.so</CLICON_XMLDB_PLUGIN>
+  <CLICON_RESTCONF_PRETTY>false</CLICON_RESTCONF_PRETTY>
+  <CLICON_NACM_MODE>internal</CLICON_NACM_MODE>
+</config>
+EOF
+
+cat <<EOF > $fyang
+module $APPNAME{
+  yang-version 1.1;
+  namespace "urn:example:clixon";
+  prefix ex;
+  import ietf-netconf-acm {
+	prefix nacm;
+  }
+  leaf x{
+    type int32;
+    description "something to edit";
+  }
+}
+EOF
+
+# The groups are slightly modified from RFC8341 A.1
+# The rule-list is from A.2
+RULES=$(cat <<EOF
+   <nacm xmlns="urn:ietf:params:xml:ns:yang:ietf-netconf-acm">
+     <enable-nacm>false</enable-nacm>
+     <read-default>deny</read-default>
+     <write-default>deny</write-default>
+     <exec-default>deny</exec-default>
+
+     $NGROUPS
+
+     <rule-list>
+       <name>guest-limited-acl</name>
+       <group>limited</group>
+       <group>guest</group>
+       <rule>
+         <name>deny-kill-session</name>
+         <module-name>ietf-netconf</module-name>
+         <rpc-name>kill-session</rpc-name>
+         <access-operations>exec</access-operations>
+         <action>deny</action>
+         <comment>
+           Do not allow the 'limited' group or the 'guest' group
+           to kill another session.
+         </comment>
+       </rule>
+       <rule>
+         <name>deny-delete-config</name>
+         <module-name>ietf-netconf</module-name>
+         <rpc-name>delete-config</rpc-name>
+         <access-operations>exec</access-operations>
+         <action>deny</action>
+         <comment>
+           Do not allow the 'limited' group or the 'guest' group
+           to delete any configurations.
+         </comment>
+       </rule>
+     </rule-list>
+     <rule-list>
+       <name>limited-acl</name>
+       <group>limited</group>
+       <rule>
+         <name>permit-edit-config</name>
+         <module-name>ietf-netconf</module-name>
+         <rpc-name>edit-config</rpc-name>
+         <access-operations>exec</access-operations>
+         <action>permit</action>
+         <comment>
+           Allow the 'limited' group to edit the configuration.
+         </comment>
+       </rule>
+     </rule-list>
+
+     $NADMIN
+
+   </nacm>
+   <x>0</x>
+EOF
+)
+
+new "test params: -f $cfg -y $fyang"
+
+if [ $BE -ne 0 ]; then
+    new "kill old backend"
+    sudo clixon_backend -zf $cfg -y $fyang
+    if [ $? -ne 0 ]; then
+	err
+    fi
+
+    new "start backend -s init -f $cfg -y $fyang"
+    sudo $clixon_backend -s init -f $cfg -y $fyang -D $DBG
+    if [ $? -ne 0 ]; then
+	err
+    fi
+fi
+
+new "kill old restconf daemon"
+sudo pkill -u www-data -f "/www-data/clixon_restconf"
+
+sleep 1
+new "start restconf daemon (-a is enable basic authentication)"
+sudo su -c "$clixon_restconf -f $cfg -y $fyang -D 1 -- -a" -s /bin/sh www-data &
+
+sleep $RCWAIT
+
+new "auth set authentication config"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config>$RULES</config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "commit it"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "enable nacm"
+expecteq "$(curl -u andy:bar -sS -X PUT -d '{"enable-nacm": true}' http://localhost/restconf/data/nacm/enable-nacm)" ""
+
+new2 "admin get nacm"
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/x)" '{"x": 0}
+
'
+
+# Rule 1: deny-kill-session
+new "deny-kill-session: limited fail (netconf)"
+expecteof "$clixon_netconf -qf $cfg -y $fyang -U wilma" 0 "<rpc><kill-session><session-id>44</session-id></kill-session></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-tag>access-denied</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>access denied</error-message></rpc-error></rpc-reply>]]>]]>$"
+
+new "deny-kill-session: guest fail (netconf)"
+expecteof "$clixon_netconf -qf $cfg -y $fyang -U guest" 0 "<rpc><kill-session><session-id>44</session-id></kill-session></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-tag>access-denied</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>access denied</error-message></rpc-error></rpc-reply>]]>]]>$"
+
+new "deny-kill-session: admin ok (netconf)"
+expecteof "$clixon_netconf -qf $cfg -y $fyang -U andy" 0 "<rpc><kill-session><session-id>44</session-id></kill-session></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+# Rule 2: deny-delete-config
+new "deny-delete-config: limited fail (netconf)"
+expecteof "$clixon_netconf -qf $cfg -y $fyang -U wilma" 0 "<rpc><delete-config><target><startup/></target></delete-config></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-tag>access-denied</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>access denied</error-message></rpc-error></rpc-reply>]]>]]>$"
+
+new2 "deny-delete-config: guest fail (restconf)"
+expecteq "$(curl -u guest:bar -sS -X DELETE http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-tag": "access-denied","error-type": "protocol","error-severity": "error","error-message": "default deny"}}}
'
+
+# In restconf delete-config is translated to edit-config which is permitted
+new "deny-delete-config: limited fail (restconf) ok"
+expecteq "$(curl -u wilma:bar -sS -X DELETE http://localhost/restconf/data)" ''
+
+new2 "admin get nacm (should be null)"
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/x)" 'null
+
'
+
+new "deny-delete-config: admin ok (restconf)"
+expecteq "$(curl -u andy:bar -sS -X DELETE http://localhost/restconf/data)" ''
+
+# Here the whole config is gone so we need to start again
+new "auth set authentication config (restart)"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config>$RULES</config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "commit it"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "enable nacm"
+expecteq "$(curl -u andy:bar -sS -X PUT -d '{"enable-nacm": true}' http://localhost/restconf/data/nacm/enable-nacm)" ""
+
+# Rule 3: permit-edit-config
+new "permit-edit-config: limited ok restconf"
+expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"x": 2}' http://localhost/restconf/data/x)" ''
+
+new2 "permit-edit-config: guest fail restconf"
+expecteq "$(curl -u guest:bar -sS -X PUT -d '{"x": 2}' http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-tag": "access-denied","error-type": "protocol","error-severity": "error","error-message": "default deny"}}}
'
+
+new "Kill restconf daemon"
+sudo pkill -u www-data -f "/www-data/clixon_restconf"
+
+if [ $BE -ne 0 ]; then
+    exit # BE
+fi
+
+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
+sudo clixon_backend -z -f $cfg
+if [ $? -ne 0 ]; then
+    err "kill backend"
+fi
+
+#rm -rf $dir # XXX
diff --git a/test/test_netconf.sh b/test/test_netconf.sh
index e66aae53..a0eae7d8 100755
--- a/test/test_netconf.sh
+++ b/test/test_netconf.sh
@@ -87,17 +87,21 @@ module example{
 }
 EOF
 
-# kill old backend (if any)
-new "kill old backend"
-sudo clixon_backend -zf $cfg
-if [ $? -ne 0 ]; then
-    err
-fi
-new "start backend  -s init -f $cfg -y $fyang"
-# start new backend
-sudo $clixon_backend -s init -f $cfg -y $fyang # -D 1
-if [ $? -ne 0 ]; then
-    err
+new "test params: -f $cfg -y $fyang"
+# Bring your own backend
+if [ $BE -ne 0 ]; then
+    # kill old backend (if any)
+    new "kill old backend"
+    sudo clixon_backend -zf $cfg
+    if [ $? -ne 0 ]; then
+	err
+    fi
+    new "start backend  -s init -f $cfg -y $fyang"
+    # start new backend
+    sudo $clixon_backend -s init -f $cfg -y $fyang -D $DBG
+    if [ $? -ne 0 ]; then
+	err
+    fi
 fi
 
 new "netconf hello"
@@ -222,6 +226,7 @@ expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><lock><target><candidate/
 new "close-session"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><close-session/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
+# XXX NOTE that this does not actually kill a running session - and may even kill some random process,...
 new "kill-session"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><kill-session><session-id>44</session-id></kill-session></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
@@ -238,10 +243,10 @@ new "netconf check empty startup"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><startup/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data/></rpc-reply>]]>]]>$"
 
 new "netconf rpc"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><rt:fib-route><routing-instance-name>ipv4</routing-instance-name><destination-address><address-family>ipv4</address-family></destination-address></rt:fib-route></rpc>]]>]]>" "^<rpc-reply><route><address-family>ipv4</address-family><next-hop><next-hop-list>"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><fib-route xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"><routing-instance-name>ipv4</routing-instance-name><destination-address><address-family>ipv4</address-family></destination-address></fib-route></rpc>]]>]]>' "^<rpc-reply><route><address-family>ipv4</address-family><next-hop><next-hop-list>"
 
-new "netconf rpc without namespace"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><rt:fib-route><routing-instance-name>ipv4</routing-instance-name><destination-address><address-family>ipv4</address-family></destination-address></rt:fib-route></rpc>]]>]]>" "^<rpc-reply><route><address-family>ipv4</address-family><next-hop><next-hop-list>"
+new "netconf rpc without namespace (iterate kludge should work)"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><fib-route><routing-instance-name>ipv4</routing-instance-name><destination-address><address-family>ipv4</address-family></destination-address></fib-route></rpc>]]>]]>" "^<rpc-reply><route><address-family>ipv4</address-family><next-hop><next-hop-list>"
 
 new "netconf empty rpc"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><ex:empty/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
@@ -249,6 +254,10 @@ expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><ex:empty/></rpc>]]>]]>"
 new "netconf client-side rpc"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><ex:client-rpc><request>example</request></ex:client-rpc></rpc>]]>]]>" "^<rpc-reply><result>ok</result></rpc-reply>]]>]]>$"
 
+if [ $BE -ne 0 ]; then
+    exit # BE
+fi
+
 new "Kill backend"
 # Check if premature kill
 pid=`pgrep -u root -f clixon_backend`
diff --git a/test/test_order.sh b/test/test_order.sh
index a44586cd..a06a036b 100755
--- a/test/test_order.sh
+++ b/test/test_order.sh
@@ -107,18 +107,19 @@ cat <<EOF > $dbdir/running_db
 </config>
 EOF
 
-# kill old backend (if any)
-new "kill old backend"
-sudo clixon_backend -zf $cfg -y $fyang
-if [ $? -ne 0 ]; then
-    err
-fi
+new "test params: -f $cfg -y $fyang"
 
-new "start backend"
-# start new backend
-sudo $clixon_backend -s running -f $cfg -y $fyang
-if [ $? -ne 0 ]; then
-    err
+if [ $BE -ne 0 ]; then
+    new "kill old backend"
+    sudo clixon_backend -zf $cfg -y $fyang
+    if [ $? -ne 0 ]; then
+	err
+    fi
+    new "start backend"
+    sudo $clixon_backend -s running -f $cfg -y $fyang -D $DBG
+    if [ $? -ne 0 ]; then
+	err
+    fi
 fi
 
 # Check as file
@@ -171,6 +172,10 @@ expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><can
 new "verify list user order (as entered)"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source><filter type=\"xpath\" select=\"/y2\"/></get-config></rpc>]]>]]>" "^<rpc-reply><data><y2><k>c</k><a>bar</a></y2><y2><k>b</k><a>foo</a></y2><y2><k>a</k><a>fie</a></y2></data></rpc-reply>]]>]]>$"
 
+if [ $BE -ne 0 ]; then
+    exit # BE
+fi
+
 new "Kill backend"
 # Check if premature kill
 pid=`pgrep -u root -f clixon_backend`
diff --git a/test/test_perf.sh b/test/test_perf.sh
index a2c36cf8..d03fcbde 100755
--- a/test/test_perf.sh
+++ b/test/test_perf.sh
@@ -12,7 +12,7 @@ elif [ $# = 2 ]; then
     req=$2
 else
     echo "Usage: $0 [<number> [<requests>]]"
-    exit 1
+    exit 1 # Scaling
 fi
 APPNAME=example
 # include err() and new() functions and creates $dir
@@ -58,18 +58,20 @@ cat <<EOF > $cfg
 </config>
 EOF
 
-# kill old backend (if any)
-new "kill old backend"
-sudo clixon_backend -zf $cfg -y $fyang
-if [ $? -ne 0 ]; then
-    err
-fi
+new "test params: -f $cfg" -y $fyang
+if [ $BE -ne 0 ]; then
+    new "kill old backend"
+    sudo clixon_backend -zf $cfg -y $fyang
+    if [ $? -ne 0 ]; then
+	err
+    fi
 
-new "start backend  -s init -f $cfg -y $fyang"
-# start new backend
-sudo $clixon_backend -s init -f $cfg -y $fyang
-if [ $? -ne 0 ]; then
-    err
+    new "start backend  -s init -f $cfg -y $fyang"
+    # start new backend
+    sudo $clixon_backend -s init -f $cfg -y $fyang -D $DBG
+    if [ $? -ne 0 ]; then
+	err
+    fi
 fi
 
 new "kill old restconf daemon"
@@ -103,10 +105,10 @@ expecteof_file "time -f %e $clixon_netconf -qf $cfg -y $fyang" "$fconfig" "^<rpc
 rm $fconfig
 
 new "netconf commit large config"
-expecteof "time -f %e $clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit><source><candidate/></source></commit></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$" 
+expecteof "time -f %e $clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$" 
 
 new "netconf commit large config again"
-expecteof "time -f %e $clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit><source><candidate/></source></commit></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$" 
+expecteof "time -f %e $clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$" 
 
 new "netconf add small (1 entry) config"
 expecteof "time -f %e $clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><x><y><a>x</a><b>y</b></y></x></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$" 
@@ -151,7 +153,7 @@ expecteof_file "time -f %e $clixon_netconf -qf $cfg -y $fyang" "$fconfig" "^<rpc
 rm $fconfig
 
 new "netconf commit large leaf-list config"
-expecteof "time -f %e $clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit><source><candidate/></source></commit></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$" 
+expecteof "time -f %e $clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$" 
 
 new "netconf add $req small leaf-list config"
 time -p for (( i=0; i<$req; i++ )); do
@@ -163,7 +165,7 @@ new "netconf add small leaf-list config"
 expecteof "time -f %e $clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><x><c>x</c></x></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$" 
 
 new "netconf commit small leaf-list config"
-expecteof "time -f %e $clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit><source><candidate/></source></commit></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$" 
+expecteof "time -f %e $clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$" 
 
 new "netconf get large leaf-list config"
 expecteof "time -f %e $clixon_netconf -qf $cfg  -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data><x><c>0</c><c>1</c>"
@@ -171,6 +173,10 @@ expecteof "time -f %e $clixon_netconf -qf $cfg  -y $fyang" 0 "<rpc><get-config><
 new "Kill restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"
 
+if [ $BE -ne 0 ]; then
+    exit # BE
+fi
+
 new "Kill backend"
 # Check if premature kill
 pid=`pgrep -u root -f clixon_backend`
diff --git a/test/test_restconf.sh b/test/test_restconf.sh
index f3b8fa72..f98b87e4 100755
--- a/test/test_restconf.sh
+++ b/test/test_restconf.sh
@@ -86,23 +86,25 @@ EOF
 # This is a fixed 'state' implemented in routing_backend. It is assumed to be always there
 state='{"state": {"op": "42"}}'
 
-# kill old backend (if any)
-new "kill old backend"
-sudo clixon_backend -zf $cfg
-if [ $? -ne 0 ]; then
-    err
-fi
-new "start backend -s init -f $cfg -y $fyang"
-sudo $clixon_backend -s init -f $cfg -y $fyang  # -D 1
-if [ $? -ne 0 ]; then
-    err
+new "test params: -f $cfg -y $fyang"
+if [ $BE -ne 0 ]; then
+    new "kill old backend"
+    sudo clixon_backend -zf $cfg
+    if [ $? -ne 0 ]; then
+	err
+    fi
+    new "start backend -s init -f $cfg -y $fyang"
+    sudo $clixon_backend -s init -f $cfg -y $fyang -D $DBG
+    if [ $? -ne 0 ]; then
+	err
+    fi
 fi
 
 new "kill old restconf daemon"
 sudo pkill -u www-data clixon_restconf
 
 new "start restconf daemon"
-sudo su -c "$clixon_restconf -f $cfg -y $fyang" -s /bin/sh www-data &
+sudo su -c "$clixon_restconf -f $cfg -y $fyang -D 1" -s /bin/sh www-data &
 
 sleep $RCWAIT
 
@@ -128,7 +130,7 @@ expecteq "$(curl -sG http://localhost/restconf/operations)" '{"operations": {"ex
 
 new "restconf get restconf/operations. RFC8040 3.3.2 (xml)"
 ret=$(curl -s -H "Accept: application/yang-data+xml" -G http://localhost/restconf/operations)
-expect="<operations><example:empty/><example:input/><example:output/><example:client-rpc/><ietf-routing:fib-route/><ietf-routing:route-count/></operations>"
+expect='<operations><empty xmlns="urn:example:clixon"/><input xmlns="urn:example:clixon"/><output xmlns="urn:example:clixon"/><client-rpc xmlns="urn:example:clixon"/><fib-route xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"/><route-count xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"/></operations>'
 match=`echo $ret | grep -EZo "$expect"`
 if [ -z "$match" ]; then
     err "$expect" "$ret"
@@ -157,7 +159,7 @@ expectfn "curl -s -I http://localhost/restconf/data" 0 "HTTP/1.1 200 OK"
 #Content-Type: application/yang-data+json"
 
 new "restconf empty rpc"
-expecteq "$(curl -s -X POST -d {\"input\":{\"name\":\"\"}} http://localhost/restconf/operations/example:empty)" ""
+expecteq "$(curl -s -X POST -d {\"input\":null} http://localhost/restconf/operations/example:empty)" ""
 
 new2 "restconf get empty config + state json"
 expecteq "$(curl -sSG http://localhost/restconf/data/state)" '{"state": {"op": "42"}}
@@ -319,6 +321,10 @@ fi
 new "Kill restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"
 
+if [ $BE -ne 0 ]; then
+    exit # BE
+fi
+
 new "Kill backend"
 # Check if premature kill
 pid=`pgrep -u root -f clixon_backend`
diff --git a/test/test_restconf2.sh b/test/test_restconf2.sh
index 938aa232..dbddee09 100755
--- a/test/test_restconf2.sh
+++ b/test/test_restconf2.sh
@@ -46,16 +46,19 @@ module example{
 }
 EOF
 
-# kill old backend (if any)
-new "kill old backend"
-sudo clixon_backend -zf $cfg
-if [ $? -ne 0 ]; then
-    err
-fi
-new "start backend -s init -f $cfg -y $fyang"
-sudo $clixon_backend -s init -f $cfg -y $fyang
-if [ $? -ne 0 ]; then
-    err
+new "test params: -f $cfg -y $fyang"
+
+if [ $BE -ne 0 ]; then
+    new "kill old backend"
+    sudo clixon_backend -zf $cfg
+    if [ $? -ne 0 ]; then
+	err
+    fi
+    new "start backend -s init -f $cfg -y $fyang"
+    sudo $clixon_backend -s init -f $cfg -y $fyang -D $DBG
+    if [ $? -ne 0 ]; then
+	err
+    fi
 fi
 
 new "kill old restconf daemon"
@@ -140,6 +143,10 @@ expectfn 'curl -is -X PUT -d {"interface":{"name":"ALPHA","type":"eth0"}} http:/
 new "Kill restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"
 
+if [ $BE -ne 0 ]; then
+    exit # BE
+fi
+
 new "Kill backend"
 # Check if premature kill
 pid=`pgrep -u root -f clixon_backend`
diff --git a/test/test_stream.sh b/test/test_stream.sh
index ce0aefc5..910a29c8 100755
--- a/test/test_stream.sh
+++ b/test/test_stream.sh
@@ -102,16 +102,19 @@ cat <<EOF > $fyang
    }
 EOF
 
-# kill old backend (if any)
-new "kill old backend"
-sudo clixon_backend -zf $cfg
-if [ $? -ne 0 ]; then
-    err
-fi
-new "start backend -s init -f $cfg -y $fyang"
-sudo $clixon_backend -s init -f $cfg -y $fyang # -D 1
-if [ $? -ne 0 ]; then
-    err
+new "test params: -f $cfg -y $fyang"
+
+if [ $BE -ne 0 ]; then
+    new "kill old backend"
+    sudo clixon_backend -zf $cfg
+    if [ $? -ne 0 ]; then
+	err
+    fi
+    new "start backend -s init -f $cfg -y $fyang"
+    sudo $clixon_backend -s init -f $cfg -y $fyang -D $DBG
+    if [ $? -ne 0 ]; then
+	err
+    fi
 fi
 
 new "kill old restconf daemon"
@@ -275,6 +278,10 @@ sleep 5
 new "Kill restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"
 
+if [ $BE -ne 0 ]; then
+    exit # BE
+fi
+
 new "Kill backend"
 # Check if premature kill
 pid=`pgrep -u root -f clixon_backend`
diff --git a/test/test_type.sh b/test/test_type.sh
index d23d13cb..4ff09bbc 100755
--- a/test/test_type.sh
+++ b/test/test_type.sh
@@ -192,16 +192,19 @@ module example{
 }
 EOF
 
-# kill old backend (if any)
-new "kill old backend"
-sudo clixon_backend -zf $cfg
-if [ $? -ne 0 ]; then
-    err
-fi
-new "start backend -s init -f $cfg -y $fyang"
-sudo $clixon_backend -s init -f $cfg -y $fyang
-if [ $? -ne 0 ]; then
-    err
+new "test params: -f $cfg -y $fyang"
+
+if [ $BE -ne 0 ]; then
+    new "kill old backend"
+    sudo clixon_backend -zf $cfg
+    if [ $? -ne 0 ]; then
+	err
+    fi
+    new "start backend -s init -f $cfg -y $fyang"
+    sudo $clixon_backend -s init -f $cfg -y $fyang
+    if [ $? -ne 0 ]; then
+	err
+    fi
 fi
 
 new "cli set transitive string"
@@ -300,6 +303,10 @@ expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><can
 new "cli bits validate"
 expectfn "$clixon_cli -1f $cfg -l o -y $fyang validate" 0 "^$"
 
+if [ $BE -ne 0 ]; then
+    exit # BE
+fi
+
 new "Kill backend"
 # Check if premature kill
 pid=`pgrep -u root -f clixon_backend`
diff --git a/test/test_union.sh b/test/test_union.sh
new file mode 100755
index 00000000..d0f7af99
--- /dev/null
+++ b/test/test_union.sh
@@ -0,0 +1,119 @@
+#!/bin/bash
+# Advanced union types and generated code
+# and enum w values
+APPNAME=example
+# include err() and new() functions and creates $dir
+. ./lib.sh
+
+cfg=$dir/conf_yang.xml
+fyang=$dir/type.yang
+fyang2=$dir/example2.yang
+fyang3=$dir/example3.yang
+
+cat <<EOF > $cfg
+<config>
+  <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
+  <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
+  <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_CLI_GENMODEL_COMPLETION>1</CLICON_CLI_GENMODEL_COMPLETION>
+  <CLICON_XMLDB_DIR>/usr/local/var/$APPNAME</CLICON_XMLDB_DIR>
+  <CLICON_XMLDB_PLUGIN>/usr/local/lib/xmldb/text.so</CLICON_XMLDB_PLUGIN>
+</config>
+EOF
+
+# transitive type, exists in fyang3, referenced from fyang2, but not declared in fyang
+cat <<EOF > $fyang3
+module example3{
+  prefix ex3;
+  namespace "urn:example:example3";
+  typedef u{
+     type union {
+       type int32{
+          range "4..44";
+       }
+       type enumeration {
+         enum "unbounded";
+       }
+     }
+  }
+  typedef t{
+    type string;
+  }
+}
+EOF
+cat <<EOF > $fyang2
+module example2{
+  import example3 { prefix ex3; }
+  namespace "urn:example:example2";
+  prefix ex2;
+  grouping gr2 {
+    leaf talle{
+      type ex3:t;
+    }
+    leaf ulle{
+      type ex3:u;
+    }
+  }
+}
+EOF
+cat <<EOF > $fyang
+module example{
+  yang-version 1.1;
+  namespace "urn:example:clixon";
+  prefix ex;
+  import example2 { prefix ex2; }
+  container c{
+    description "transitive type- exists in ex3";
+    uses ex2:gr2;
+  }
+}
+EOF
+
+new "test params: -f $cfg -y $fyang"
+
+if [ $BE -ne 0 ]; then
+    new "kill old backend"
+    sudo clixon_backend -zf $cfg
+    if [ $? -ne 0 ]; then
+	err
+    fi
+    new "start backend -s init -f $cfg -y $fyang"
+    sudo $clixon_backend -s init -f $cfg -y $fyang
+    if [ $? -ne 0 ]; then
+	err
+    fi
+fi
+
+new "cli set transitive string"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set c talle x" 0 "^$"
+
+new "cli set transitive union"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set c ulle 33" 0 "^$"
+
+new "cli set transitive union error"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set c ulle kalle" 255 ""
+
+if [ $BE -ne 0 ]; then
+    exit # BE
+fi
+
+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
+sudo clixon_backend -z -f $cfg
+if [ $? -ne 0 ]; then
+    err "kill backend"
+fi
+
+rm -rf $dir
diff --git a/test/test_when_must.sh b/test/test_when_must.sh
index f83edd78..6e3b971f 100755
--- a/test/test_when_must.sh
+++ b/test/test_when_must.sh
@@ -90,18 +90,19 @@ module $APPNAME{
 }
 EOF
 
-# kill old backend (if any)
-new "kill old backend"
-sudo clixon_backend -zf $cfg -y $fyang
-if [ $? -ne 0 ]; then
-    err
-fi
+new "test params: -f $cfg -y $fyang"
 
-new "start backend -s init -f $cfg -y $fyang"
-# start new backend
-sudo $clixon_backend -s init -f $cfg -y $fyang
-if [ $? -ne 0 ]; then
-    err
+if [ $BE -ne 0 ]; then
+    new "kill old backend"
+    sudo clixon_backend -zf $cfg -y $fyang
+    if [ $? -ne 0 ]; then
+	err
+    fi
+    new "start backend -s init -f $cfg -y $fyang"
+    sudo $clixon_backend -s init -f $cfg -y $fyang -D $DBG
+    if [ $? -ne 0 ]; then
+	err
+    fi
 fi
 
 new "when: add static route"
@@ -140,6 +141,10 @@ expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><can
 new "must: eth validate fail"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>application</error-type><error-severity>error</error-severity><error-message>An Ethernet MTU must be 1500</error-message></rpc-error></rpc-reply>]]>]]>"
 
+if [ $BE -ne 0 ]; then
+    exit # BE
+fi
+
 new "Kill backend"
 # Check if premature kill
 pid=`pgrep -u root -f clixon_backend`
diff --git a/test/test_yang.sh b/test/test_yang.sh
index 82b5bba2..9a3f7cfe 100755
--- a/test/test_yang.sh
+++ b/test/test_yang.sh
@@ -13,7 +13,6 @@ fyangerr=$dir/err.yang
 cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
-
   <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
   <CLICON_YANG_MODULE_MAIN>$APPNAME</CLICON_YANG_MODULE_MAIN>
@@ -141,18 +140,20 @@ module $APPNAME{
    ex:not-defined ARGUMENT;
 }
 EOF
-# kill old backend (if any)
-new "kill old backend"
-sudo clixon_backend -zf $cfg -y $fyang
-if [ $? -ne 0 ]; then
-    err
-fi
 
-new "start backend -s init -f $cfg -y $fyang"
-# start new backend
-sudo $clixon_backend -s init -f $cfg -y $fyang
-if [ $? -ne 0 ]; then
-    err
+new "test params: -f $cfg -y $fyang"
+
+if [ $BE -ne 0 ]; then
+    new "kill old backend"
+    sudo clixon_backend -zf $cfg -y $fyang
+    if [ $? -ne 0 ]; then
+	err
+    fi
+    new "start backend -s init -f $cfg -y $fyang"
+    sudo $clixon_backend -s init -f $cfg -y $fyang -D $DBG
+    if [ $? -ne 0 ]; then
+	err
+    fi
 fi
 
 new "cli defined extension"
@@ -278,6 +279,10 @@ expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candid
 new "netconf submodule discard-changes"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
+if [ $BE -ne 0 ]; then
+    exit # BE
+fi
+
 new "Kill backend"
 # Check if premature kill
 pid=`pgrep -u root -f clixon_backend`
diff --git a/test/test_yang_load.sh b/test/test_yang_load.sh
index ae4f56e3..9bcae5fa 100755
--- a/test/test_yang_load.sh
+++ b/test/test_yang_load.sh
@@ -69,28 +69,33 @@ cat <<EOF > $cfg
   <CLICON_CLI_GENMODEL_COMPLETION>1</CLICON_CLI_GENMODEL_COMPLETION>
 </config>
 EOF
-# kill old backend (if any)
-new "kill old backend"
-sudo clixon_backend -zf $cfg
-if [ $? -ne 0 ]; then
-    err
-fi
 
-new "start backend  -s init -f $cfg"
-# start new backend
-sudo $clixon_backend -s init -f $cfg
-if [ $? -ne 0 ]; then
-    err
+new "test params: -f $cfg"
+if [ $BE -ne 0 ]; then
+    new "kill old backend"
+    sudo clixon_backend -zf $cfg
+    if [ $? -ne 0 ]; then
+	err
+    fi
+    new "start backend  -s init -f $cfg"
+    sudo $clixon_backend -s init -f $cfg -D $DBG
+    if [ $? -ne 0 ]; then
+	err
+    fi
 fi
 
 new "1. Set newex"
 expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex>str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
-new "Set oldex should fail"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex>str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>XML'
+new "Set oldex should fail (since oldex is in old revision and only the new is loaded)"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex>str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>application</error-type><error-severity>error</error-severity><error-message>Validation failed</error-message></rpc-error></rpc-reply>]]>]]>$'
 
 new "Set other should fail"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other>str</other></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>XML'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other>str</other></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>application</error-type><error-severity>error</error-severity><error-message>Validation failed</error-message></rpc-error></rpc-reply>]]>]]>$'
+
+if [ $BE -ne 0 ]; then
+    exit # BE
+fi
 
 new "Kill backend"
 # Check if premature kill
diff --git a/test/test_yang_namespace.sh b/test/test_yang_namespace.sh
new file mode 100755
index 00000000..215e91f3
--- /dev/null
+++ b/test/test_yang_namespace.sh
@@ -0,0 +1,141 @@
+#!/bin/bash
+# Yang specifics: multi-keys and empty type
+APPNAME=example
+# include err() and new() functions and creates $dir
+. ./lib.sh
+
+cfg=$dir/conf_yang.xml
+fyang=$dir/example.yang
+fyang2=$dir/example2.yang
+
+#  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
+cat <<EOF > $cfg
+<config>
+  <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
+  <CLICON_YANG_MAIN_DIR>$dir</CLICON_YANG_MAIN_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</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_CLI_GENMODEL_COMPLETION>1</CLICON_CLI_GENMODEL_COMPLETION>
+  <CLICON_XMLDB_DIR>/usr/local/var/$APPNAME</CLICON_XMLDB_DIR>
+  <CLICON_XMLDB_PLUGIN>/usr/local/lib/xmldb/text.so</CLICON_XMLDB_PLUGIN>
+  <CLICON_MODULE_LIBRARY_RFC7895>true</CLICON_MODULE_LIBRARY_RFC7895>
+</config>
+EOF
+
+# For testing namespaces -
+# x.y is different type. Here it is string whereas in fyang it is list.
+#
+cat <<EOF > $fyang2
+module example2{
+   yang-version 1.1;
+   prefix ex2;
+   namespace "urn:example:clixon2";
+   container x {
+     leaf y {
+        type uint32;
+     }
+   }
+}
+EOF
+
+cat <<EOF > $fyang
+module example{
+   yang-version 1.1;
+   prefix ex;
+   namespace "urn:example:clixon";
+   import ietf-routing {
+        description "defines fib-route";
+	prefix rt;
+   }
+   leaf x{
+     type int32;
+   }
+   rpc client-rpc {
+	description "Example local client-side RPC that is processed by the
+                     the netconf/restconf and not sent to the backend.
+                     This is a clixon implementation detail: some rpc:s
+                     are better processed by the client for API or perf reasons";
+	input {
+	    leaf request {
+		type string;
+	    }
+	}
+	output {
+	    leaf result{
+		type string;
+	    }
+	}
+    }
+}
+EOF
+
+new "test params: -f $cfg"
+
+if [ $BE -ne 0 ]; then
+    new "kill old backend"
+    sudo clixon_backend -zf $cfg
+    if [ $? -ne 0 ]; then
+	err
+    fi
+
+    new "start backend -s init -f $cfg"
+    # start new backend
+    sudo $clixon_backend -s init -f $cfg -D $DBG
+    if [ $? -ne 0 ]; then
+	err
+    fi
+fi
+
+
+
+new "netconf xmlns module ex"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><edit-config><target><candidate/></target><config><x xmlns="urn:example:clixon">42</x></config></edit-config></rpc>]]>]]>' '^<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><ok/></rpc-reply>]]>]]>$'
+
+new "netconf get config XXX xmlfn in return"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data><x>42</x></data></rpc-reply>]]>]]>$"
+
+new "netconf xmlns module ex2"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><edit-config><target><candidate/></target><config><x xmlns="urn:example:clixon2"><y>99</y></x></config></edit-config></rpc>]]>]]>' '^<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><ok/></rpc-reply>]]>]]>$'
+
+new "netconf get config XXX xmlns"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data><x>42</x><x><y>99</y></x></data></rpc-reply>]]>]]>$"
+
+new "netconf discard-changes"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "netconf xmlns:ex"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:ex="urn:example:clixon"><edit-config><target><candidate/></target><config><ex:x>4422</ex:x></config></edit-config></rpc>]]>]]>' '^<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:ex="urn:example:clixon"><ok/></rpc-reply>]]>]]>$'
+
+new "netconf get config XXX xmlns:ex"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data><x>4422</x></data></rpc-reply>]]>]]>$"
+
+new "netconf xmlns:ex2"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:ex2="urn:example:clixon2"><edit-config><target><candidate/></target><config><ex2:x><ex2:y>9999</ex2:y></ex2:x></config></edit-config></rpc>]]>]]>' '^<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:ex2="urn:example:clixon2"><ok/></rpc-reply>]]>]]>$'
+
+new "netconf get config XXX xmlns:ex2"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data><x>4422</x><x><y>9999</y></x></data></rpc-reply>]]>]]>$"
+
+# rpc
+
+if [ $BE -ne 0 ]; then
+    exit # BE
+fi
+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
+sudo clixon_backend -z -f $cfg
+if [ $? -ne 0 ]; then
+    err "kill backend"
+fi
+sudo pkill -u root -f clixon_backend
+
+rm -rf $dir
diff --git a/yang/clixon-config@2018-10-21.yang b/yang/clixon-config@2018-10-21.yang
index 1f78d691..162c3c0b 100644
--- a/yang/clixon-config@2018-10-21.yang
+++ b/yang/clixon-config@2018-10-21.yang
@@ -123,7 +123,7 @@ module clixon-config {
                "Supported features as used by YANG feature/if-feature
 	        value is: <module>:<feature>, where <module> and <feature>
                 are either names, or the special character '*'.
-                *:an* means enable all features
+                *:* means enable all features
                 <module>:* means enable all features in the specified module
                 *:<feature> means enable the specific feature in all modules";
 	   type string;
@@ -150,7 +150,7 @@ module clixon-config {
 	leaf CLICON_YANG_MAIN_DIR {
 	    type string;
 	    description
-		"If given, load all modules in this directory.
+		"If given, load all modules in this directory (all .yang files)
                  See also CLICON_YANG_DIR which specifies a path of dirs";
 	}
 	leaf CLICON_YANG_MODULE_MAIN {
@@ -353,6 +353,15 @@ module clixon-config {
                  Only works for Yang specified XML.
                  If not set, all lists accessed via linear search.";
 	}
+	leaf CLICON_XML_NS_ITERATE {
+	    type boolean;
+	    default true;
+	    description
+		"If set, iterate through modules to find the matching datanode
+                 or rpc if no xmlns attribute specifies namespace.
+                 This is loose semantics of finding namespaces.
+                 And it is wrong, but is the way Clixon originally was written.";
+	}
 	leaf CLICON_USE_STARTUP_CONFIG {
 	    type int32;
 	    default 0;
@@ -450,4 +459,12 @@ module clixon-config {
 
 	}
     }
+    rpc debug {
+	description "Set debug level of backend.";
+	input {
+	    leaf level {
+		type uint32;
+	    }
+	}
+    }
 }

From f872c7e295422881168465e3e6c062314a27dff0 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Fri, 21 Dec 2018 01:33:41 +0100
Subject: [PATCH 15/72] * More precise Yang validation and better error
 messages    * For Example, adding bad-, missing-, or unknown-element error
 messages, etc instead of operation-failed * Removed delete-config support for
 candidate db since it is not supported in RFC6241. * Switched the order of
 `error-type` and `error-tag` in all netconf and restconf error messages to
 comply to RFC order. * Added example_rpc RPC to example backend * Renamed
 xml_namespace[_set]() to xml_prefix[_set]() * Some restconf error messages
 contained "rpc-reply" or "rpc-error" which have now been removed. *
 Netconf/Restconf RPC extra input arguments are ignored
 (https://github.com/clicon/clixon/issues/47)

---
 CHANGELOG.md                     |  15 +-
 README.md                        |   3 +-
 ROADMAP.md                       |  20 ++-
 apps/backend/backend_client.c    |  31 ++--
 apps/backend/backend_commit.c    | 106 +++++++++-----
 apps/backend/backend_commit.h    |   2 +-
 apps/backend/backend_main.c      |  25 +++-
 apps/netconf/netconf_main.c      |  31 ++--
 apps/netconf/netconf_rpc.c       |  37 +++--
 apps/restconf/restconf_lib.c     |   9 +-
 apps/restconf/restconf_methods.c | 161 +++++++++++++--------
 example/example_backend.c        |  49 ++++++-
 lib/clixon/clixon_netconf_lib.h  |   6 +-
 lib/clixon/clixon_xml.h          |   4 +-
 lib/clixon/clixon_xml_map.h      |   7 +-
 lib/src/clixon_json.c            |   2 +-
 lib/src/clixon_netconf_lib.c     |  81 +++++------
 lib/src/clixon_options.c         |  12 +-
 lib/src/clixon_proto_client.c    |   2 +-
 lib/src/clixon_xml.c             |  26 ++--
 lib/src/clixon_xml_map.c         | 235 +++++++++++++++++++++++--------
 lib/src/clixon_xml_parse.y       |  16 +--
 lib/src/clixon_xml_sort.c        |   3 +
 lib/src/clixon_yang.c            |   2 +-
 test/test_cli.sh                 |   6 +-
 test/test_feature.sh             |   5 +-
 test/test_identity.sh            |   4 +-
 test/test_leafref.sh             |   8 +-
 test/test_list.sh                |   2 +-
 test/test_nacm.sh                |  12 +-
 test/test_nacm_ext.sh            |  12 +-
 test/test_nacm_protocol.sh       |  14 +-
 test/test_netconf.sh             |   4 +-
 test/test_order.sh               |   4 +-
 test/test_perf.sh                |   2 +-
 test/test_restconf.sh            |  57 ++++----
 test/test_restconf2.sh           |  10 +-
 test/test_rpc.sh                 | 125 ++++++++++++++++
 test/test_stream.sh              |   8 +-
 test/test_type.sh                |   6 +-
 test/test_union.sh               |   2 +-
 test/test_when_must.sh           |   8 +-
 test/test_yang.sh                |   8 +-
 test/test_yang_load.sh           |  28 ++--
 test/test_yang_namespace.sh      |   2 +-
 45 files changed, 807 insertions(+), 405 deletions(-)
 create mode 100755 test/test_rpc.sh

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 160f6254..0035a93d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,6 @@
 * [Roadmap](ROADMAP.md) (Uncommitted and unprioritized)
 
 ### Major New features
-	
 * NACM extension (RFC8341)
   * NACM module support (RFC8341 A1+A2)
   * Recovery user "_nacm_recovery" added.
@@ -20,6 +19,8 @@
   * Support of submodule, include and belongs-to.
   * Openconfig yang specs parsed: https://github.com/openconfig/public
   * Improved "unknown" handling
+  * More precise Yang validation and better error messages
+    * For Example, adding bad-, missing-, or unknown-element error messages, etc instead of operation-failed
   * Yang load file configure options changed
     * `CLICON_YANG_DIR` is changed from a single directory to a path of directories
       * Note CLIXON_DATADIR (=/usr/local/share/clixon) need to be in the list
@@ -27,18 +28,20 @@
     * CLICON_YANG_MAIN_DIR Provides a directory where all yang modules should be loaded.
 * Correct XML namespace handling
   * XML multiple modules was based on "loose" semantics so that yang modules were found by iterating thorugh namespaces until a match was made. This did not adhere to proper [XML namespace handling](https://www.w3.org/TR/2009/REC-xml-names-20091208), and causes problems with overlapping names and false positives. Below see XML accepted (but wrong), and correct namespace declaration:
-```
+  ```
      <rpc><my-own-method></rpc> # Wrong but accepted
      <rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"> # Correct
        <my-own-method xmlns="http://example.net/me/my-own/1.0">
      </rpc>
-```
+  ```
   * To keep old loose semantics set config option CLICON_XML_NS_ITERATE (true by default)
   * XML to JSON translator support for mapping xmlns attribute to module name prefix.
   * Default namespace is still "urn:ietf:params:xml:ns:netconf:base:1.0"
   * See https://github.com/clicon/clixon/issues/49
 
 ### API changes on existing features (you may need to change your code)
+* Removed delete-config support for candidate db since it is not supported in RFC6241.
+* Switched the order of `error-type` and `error-tag` in all netconf and restconf error messages to comply to RFC order.
 * Yang parser is stricter (see above) which may break parsing of existing yang specs.
 * XML namespace handling is corrected (see above)
   * For backward compatibility set config option  CLICON_XML_NS_ITERATE
@@ -49,6 +52,8 @@
   * For backward compatibility, define CLICON_CLI_MODEL_TREENAME_PATCH in clixon_custom.h
 
 ### Minor changes
+* Added example_rpc RPC to example backend
+* Renamed xml_namespace[_set]() to xml_prefix[_set]()
 * Changed all make tags --> make TAGS
 * Keyvalue datastore removed (it has been disabled since 3.3.3)
 * Removed return value ymodp from yang parse functions (eg yang_parse()).
@@ -60,8 +65,10 @@
   * <!DOCTYPE (ie DTD) is not supported.
 
 ### Corrected Bugs
+* Some restconf error messages contained "rpc-reply" or "rpc-error" which have now been removed.
 * getopt return value changed from char to int (https://github.com/clicon/clixon/issues/58)
-
+* Netconf/Restconf RPC extra input arguments are ignored (https://github.com/clicon/clixon/issues/47)
+	
 ### Known issues
 * debug rpc added in example application (should be in clixon-config).
 
diff --git a/README.md b/README.md
index bc0e7f50..865cac8a 100644
--- a/README.md
+++ b/README.md
@@ -125,8 +125,9 @@ However, the following YANG syntax modules are not implemented:
 - belongs-to
 
 Restrictions on Yang types are as follows:
-- The range statement does not support multiple values (RFC7895 sec 9.2.4)
+- The range statement does not support multiple values (RFC7950 9.2.4)
 - Submodules cannot re-use a prefix in an import statement that is already used for another imported module in the module that the submodule belongs to. (see https://github.com/clicon/clixon/issues/60)
+- default values on leaf-lists (RFC7950 7.7.2)
 
 Netconf
 =======
diff --git a/ROADMAP.md b/ROADMAP.md
index 12ae406f..3e91e1a3 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -1,36 +1,34 @@
 # Clixon roadmap
 
-In prio order
-
-High prio
+## High prio
 - NACM (RFC 8341) 
-  - Module rules
+  - Module rules (done)
   - Data node rules (read/create/delete/update/execute)
 - Special handling of the initial startup transaction to avoid exit at startup
   - Possibly - draft-wu-netconf-restconf-factory-restore-03
 - Handle revisions to data model.
   - Possibly draft-wang-netmod-module-revision-management-01
+- XML [Namespace handling](https://github.com/clicon/clixon/issues/49)
 
-Medium prio:
-- Input validation on custom RPCs/ 
+## Medium prio:
+- Input validation on custom RPCs/ (done)
   - [Sanity checks](https://github.com/clicon/clixon/issues/47)
 - Support for XML regex's.
   - Currently Posix extended regular expressions
 - Support a plugin callback that is invoked when copy-config is called.
 - Preserve CLI command history across sessions. The up/down arrows
 
-Low prio:
+## Low prio:
 - Provide a client library to access netconf APIs provided by system services.
+  - Netconf backend (Clixon acts as netconf controller)
 - Support for restconf call-home (RFC 8071)
-- Support for restconf PATCH method
 
 Not prioritized:
-- XML [Namespace handling](https://github.com/clicon/clixon/issues/49)
+- Support for restconf PATCH method
 - NETCONF
   - Support for additional Netconf [edit-config modes](https://github.com/clicon/clixon/issues/53)
   - Netconf [framing](https://github.com/clicon/clixon/issues/50)
   - [Child ordering](https://github.com/clicon/clixon/issues/22)
-- Netconf backend (Clixon acts as netconf controller)
 - Restconf
   - Query parameters
 - Streams (netconf and restconf)
@@ -38,7 +36,7 @@ Not prioritized:
 - Jenkins CI/CD and webhooks
 - YANG
   - RFC 6022 [NETCONF monitoring](https://github.com/clicon/clixon/issues/39)
-  - Deviation, belongs-to, min/max-elements, action, unique
+  - Deviation, min/max-elements, action, unique
 - Containers
   - [Docker improvements](https://github.com/clicon/clixon/issues/44)
   - Kubernetes Helm chart definition
diff --git a/apps/backend/backend_client.c b/apps/backend/backend_client.c
index 3b79eab2..baf40269 100644
--- a/apps/backend/backend_client.c
+++ b/apps/backend/backend_client.c
@@ -468,12 +468,12 @@ from_client_edit_config(clicon_handle h,
 	}
     }
     if ((xc = xpath_first(xn, "config")) == NULL){
-	if (netconf_missing_element(cbret, "protocol", "<bad-element>config</bad-element>", NULL) < 0)
+	if (netconf_missing_element(cbret, "protocol", "config", NULL) < 0)
 	    goto done;
 	goto ok;
     }
     else{
-	/* <config> yang spec may be set to anyxml by ingress yang check,...*/
+	/* <config> yang spec may be set to anyxmly by ingress yang check,...*/
 	if (xml_spec(xc) != NULL)
 	    xml_spec_set(xc, NULL);
 	/* Populate XML with Yang spec (why not do this in parser?) 
@@ -530,7 +530,7 @@ from_client_lock(clicon_handle h,
     cbuf  *cbx = NULL; /* Assist cbuf */
     
     if ((db = netconf_db_find(xe, "target")) == NULL){
-	if (netconf_missing_element(cbret, "protocol", "<bad-element>target</bad-element>", NULL) < 0)
+	if (netconf_missing_element(cbret, "protocol", "target", NULL) < 0)
 	    goto done;
 	goto ok;
     }
@@ -589,7 +589,7 @@ from_client_unlock(clicon_handle h,
     cbuf  *cbx = NULL; /* Assist cbuf */
 
     if ((db = netconf_db_find(xe, "target")) == NULL){
-	if (netconf_missing_element(cbret, "protocol", "<bad-element>target</bad-element>", NULL) < 0)
+	if (netconf_missing_element(cbret, "protocol", "target", NULL) < 0)
 	    goto done;
 	goto ok;
     }
@@ -651,7 +651,7 @@ from_client_kill_session(clicon_handle h,
     
     if ((x = xml_find(xe, "session-id")) == NULL ||
 	(str = xml_find_value(x, "body")) == NULL){
-	if (netconf_missing_element(cbret, "protocol", "<bad-element>session-id</bad-element>", NULL) < 0)
+	if (netconf_missing_element(cbret, "protocol", "session-id", NULL) < 0)
 	    goto done;
 	goto ok;
     }
@@ -709,7 +709,7 @@ from_client_copy_config(clicon_handle h,
     cbuf  *cbx = NULL; /* Assist cbuf */
     
     if ((source = netconf_db_find(xe, "source")) == NULL){
-	if (netconf_missing_element(cbret, "protocol", "<bad-element>source</bad-element>", NULL) < 0)
+	if (netconf_missing_element(cbret, "protocol", "source", NULL) < 0)
 	    goto done;
 	goto ok;
     }
@@ -724,7 +724,7 @@ from_client_copy_config(clicon_handle h,
 	goto ok;
     }
     if ((target = netconf_db_find(xe, "target")) == NULL){
-	if (netconf_missing_element(cbret, "protocol", "<bad-element>target</bad-element>", NULL) < 0)
+	if (netconf_missing_element(cbret, "protocol", "target", NULL) < 0)
 	    goto done;
 	goto ok;
     }
@@ -777,7 +777,7 @@ from_client_delete_config(clicon_handle h,
 
     if ((target = netconf_db_find(xe, "target")) == NULL||
 	strcmp(target, "running")==0){
-	if (netconf_missing_element(cbret, "protocol", "<bad-element>target</bad-element>", NULL) < 0)
+	if (netconf_missing_element(cbret, "protocol", "target", NULL) < 0)
 	    goto done;
 	goto ok;
     }
@@ -856,7 +856,7 @@ from_client_create_subscription(clicon_handle        h,
     if ((x = xpath_first(xe, "//stopTime")) != NULL){
 	if ((stoptime = xml_find_value(x, "body")) != NULL &&
 	    str2time(stoptime, &stop) < 0){
-	    if (netconf_bad_element(cbret, "application", "<bad-element>stopTime</bad-element>", "Expected timestamp") < 0)
+	    if (netconf_bad_element(cbret, "application", "stopTime", "Expected timestamp") < 0)
 		goto done;
 	    goto ok;	
 	}
@@ -864,7 +864,7 @@ from_client_create_subscription(clicon_handle        h,
     if ((x = xpath_first(xe, "//startTime")) != NULL){
 	if ((starttime = xml_find_value(x, "body")) != NULL &&
 	    str2time(starttime, &start) < 0){
-	    if (netconf_bad_element(cbret, "application", "<bad-element>startTime</bad-element>", "Expected timestamp") < 0)
+	    if (netconf_bad_element(cbret, "application", "startTime", "Expected timestamp") < 0)
 		goto done;
 	    goto ok;	
 	}	
@@ -925,7 +925,7 @@ from_client_debug(clicon_handle      h,
     char    *valstr;
     
     if ((valstr = xml_find_body(xe, "level")) == NULL){
-	if (netconf_missing_element(cbret, "application", "<bad-element>level</bad-element>", NULL) < 0)
+	if (netconf_missing_element(cbret, "application", "level", NULL) < 0)
 	    goto done;
 	goto ok;
     }
@@ -993,13 +993,10 @@ from_client_msg(clicon_handle        h,
     /* Populate incoming XML tree with yang */
     if (xml_spec_populate_rpc(h, x, yspec) < 0)
 	goto done;
-    if ((ret = xml_yang_validate_rpc(x)) < 0)
+    if ((ret = xml_yang_validate_rpc(x, cbret)) < 0)
 	goto done;
-    if (ret == 0){
-	if (netconf_operation_failed(cbret, "application", "Validation failed")< 0)
-	    goto done;
+    if (ret == 0)
 	goto reply;
-    }
     xe = NULL;
     username = xml_find_value(x, "username");
     while ((xe = xml_child_each(x, xe, CX_ELMNT)) != NULL) {
@@ -1059,7 +1056,7 @@ from_client_msg(clicon_handle        h,
 	}
 	else if (strcmp(rpc, "validate") == 0){
 	    if ((db = netconf_db_find(xe, "source")) == NULL){
-		if (netconf_missing_element(cbret, "protocol", "<bad-element>source</bad-element>", NULL) < 0)
+		if (netconf_missing_element(cbret, "protocol", "source", NULL) < 0)
 		    goto done;
 		goto reply;
 	    }
diff --git a/apps/backend/backend_commit.c b/apps/backend/backend_commit.c
index 3aa2f82d..88ea9e99 100644
--- a/apps/backend/backend_commit.c
+++ b/apps/backend/backend_commit.c
@@ -81,68 +81,86 @@
  * are if code comes via XML/NETCONF.
  * @param[in]   yspec   Yang spec
  * @param[in]   td      Transaction data
+ * @param[out]  cbret   Cligen buffer containing netconf error (if retval == 0)
+ * @retval     -1       Error
+ * @retval      0       Validation failed (with cbret set)
+ * @retval      1       Validation OK       
  */
 static int
 generic_validate(yang_spec          *yspec,
-		 transaction_data_t *td)
+		 transaction_data_t *td,
+		 cbuf               *cbret)
 {
     int             retval = -1;
     cxobj          *x1;
     cxobj          *x2;
     yang_stmt      *ys;
     int             i;
+    int             ret;
 
     /* All entries */
-    if (xml_apply(td->td_target, CX_ELMNT, 
-		  (xml_applyfn_t*)xml_yang_validate_all, NULL) < 0)
+    if ((ret = xml_yang_validate_all_top(td->td_target, cbret)) < 0) 
 	goto done;
-
+    if (ret == 0)
+	goto fail;
     /* changed entries */
     for (i=0; i<td->td_clen; i++){
 	x1 = td->td_scvec[i]; /* source changed */
 	x2 = td->td_tcvec[i]; /* target changed */
-	if (xml_yang_validate_add(x2, NULL) < 0)
+	/* Should this be recursive? */
+	if ((ret = xml_yang_validate_add(x2, cbret)) < 0)
 	    goto done;
+	if (ret == 0)
+	    goto fail;
     }
     /* deleted entries */
     for (i=0; i<td->td_dlen; i++){
 	x1 = td->td_dvec[i];
 	ys = xml_spec(x1);
 	if (ys && yang_mandatory(ys)){
-	    clicon_err(OE_CFG, 0,"Removed mandatory variable: %s", 
-		       xml_name(x1));
-	    goto done;
+	    if (netconf_missing_element(cbret, "protocol", xml_name(x1), "Removed mandatory variable") < 0)
+		goto done;
+	    goto fail;
 	}
     }
     /* added entries */
     for (i=0; i<td->td_alen; i++){
 	x2 = td->td_avec[i];
-	if (xml_apply0(x2, CX_ELMNT, 
-		      (xml_applyfn_t*)xml_yang_validate_add, NULL) < 0)
+	if ((ret = xml_yang_validate_add(x2, cbret)) < 0)
 	    goto done;
+	if (ret == 0)
+	    goto fail;
     }
-    retval = 0;
+    // ok:
+    retval = 1;
  done:
     return retval;
+ fail:
+    retval = 0;
+    goto done;
 }
 
 /*! Common code of candidate_validate and candidate_commit 
  * @param[in] h         Clicon handle
  * @param[in] candidate The candidate database. The wanted backend state
- * @retval    0         OK  
- * @retval   -1         Fatal error or validation fail
- * @note Need to differentiate between error and validation fail
+ * @retval   -1       Error - or validation failed (but cbret not set)
+ * @retval    0       Validation failed (with cbret set)
+ * @retval    1       Validation OK       
+ * @note Need to differentiate between error and validation fail 
+ *       (only done for generic_validate)
  */
 static int
 validate_common(clicon_handle       h, 
 		char               *candidate,
-	        transaction_data_t *td)
+	        transaction_data_t *td,
+		cbuf               *cbret)
 {
     int         retval = -1;
     yang_spec  *yspec;
     int         i;
     cxobj      *xn;
-
+    int         ret;
+    
     if ((yspec = clicon_dbspec_yang(h)) == NULL){
 	clicon_err(OE_FATAL, 0, "No DB_SPEC");
 	goto done;
@@ -193,9 +211,12 @@ validate_common(clicon_handle       h,
     if (plugin_transaction_begin(h, td) < 0)
 	goto done;
 
-    /* 5. Make generic validation on all new or changed data. */
-    if (generic_validate(yspec, td) < 0)
+    /* 5. Make generic validation on all new or changed data.
+       Note this is only call that uses 3-values */
+    if ((ret = generic_validate(yspec, td, cbret)) < 0)
 	goto done;
+    if (ret == 0)
+	goto fail;
 
     /* 6. Call plugin transaction validate callbacks */
     if (plugin_transaction_validate(h, td) < 0)
@@ -204,9 +225,12 @@ validate_common(clicon_handle       h,
     /* 7. Call plugin transaction complete callbacks */
     if (plugin_transaction_complete(h, td) < 0)
 	goto done;
-    retval = 0;
+    retval = 1;
  done:
     return retval;
+ fail:
+    retval = 0;
+    goto done;
 }
 
 /*! Do a diff between candidate and running, then start a commit transaction
@@ -216,24 +240,30 @@ validate_common(clicon_handle       h,
  * do something more drastic?
  * @param[in]  h         Clicon handle
  * @param[in]  candidate A candidate database, not necessarily "candidate"
- * @retval    0         OK  
- * @retval   -1         Fatal error or validation fail
+ * @retval   -1       Error - or validation failed (but cbret not set)
+ * @retval    0       Validation failed (with cbret set)
+ * @retval    1       Validation OK       
  * @note Need to differentiate between error and validation fail
+ *       (only done for validate_common)
  */
 int
 candidate_commit(clicon_handle h, 
-		 char         *candidate)
+		 char         *candidate,
+		 cbuf         *cbret)
 {
-    int                retval = -1;
+    int                 retval = -1;
     transaction_data_t *td = NULL;
+    int                 ret;
 
      /* 1. Start transaction */
     if ((td = transaction_new()) == NULL)
 	goto done;
 
-    /* Common steps (with validate) */
-    if (validate_common(h, candidate, td) < 0)
+    /* Common steps (with validate). Note this is only call that uses 3-values */
+    if ((ret = validate_common(h, candidate, td, cbret)) < 0)
 	goto done;
+    if (ret == 0)
+	goto fail;
 
      /* 7. Call plugin transaction commit callbacks */
      if (plugin_transaction_commit(h, td) < 0)
@@ -252,21 +282,23 @@ candidate_commit(clicon_handle h,
     /* 9. Call plugin transaction end callbacks */
     plugin_transaction_end(h, td);
 
-
     /* 8. Copy running back to candidate in case end functions updated running */
     if (xmldb_copy(h, "running", candidate) < 0){
 	/* ignore errors or signal major setback ? */
 	clicon_log(LOG_NOTICE, "Error in rollback, trying to continue");
 	goto done;
     } 
-    retval = 0;
+    retval = 1;
  done:
-     /* In case of failure, call plugin transaction termination callbacks */
-     if (retval < 0 && td)
+     /* In case of failure (or error), call plugin transaction termination callbacks */
+     if (retval < 1 && td)
 	 plugin_transaction_abort(h, td);
      if (td)
 	 transaction_free(td);
     return retval;
+ fail:
+    retval = 0;
+    goto done;
 }
 
 /*! Commit changes from candidate to running
@@ -283,6 +315,7 @@ from_client_commit(clicon_handle h,
     int        retval = -1;
     int        piddb;
     cbuf      *cbx = NULL; /* Assist cbuf */
+    int        ret;
 
     /* Check if target locked by other client */
     piddb = xmldb_islocked(h, "running");
@@ -296,9 +329,10 @@ from_client_commit(clicon_handle h,
 	    goto done;
 	goto ok;
     }
-    if (candidate_commit(h, "candidate") < 0){ /* Assume validation fail, nofatal */
+    if ((ret = candidate_commit(h, "candidate", cbret)) < 0){ /* Assume validation fail, nofatal */
 	clicon_debug(1, "Commit candidate failed");
-	    if (netconf_invalid_value(cbret, "protocol", clicon_err_reason)< 0)
+	if (ret < 0)
+	    if (netconf_operation_failed(cbret, "application", clicon_err_reason)< 0)
 		goto done;
         goto ok;
     }
@@ -367,6 +401,7 @@ from_client_validate(clicon_handle h,
 {
     int                 retval = -1;
     transaction_data_t *td = NULL;
+    int                 ret;
 
     if (strcmp(db, "candidate") != 0 && strcmp(db, "tmp") != 0){
 	if (netconf_invalid_value(cbret, "protocol", "No such database")< 0)
@@ -379,11 +414,12 @@ from_client_validate(clicon_handle h,
     if ((td = transaction_new()) == NULL)
 	goto done;
     /* Common steps (with commit) */
-    if (validate_common(h, db, td) < 0){
+    if ((ret = validate_common(h, db, td, cbret)) < 1){
 	clicon_debug(1, "Validate %s failed",  db);
-	/* XXX: candidate_validate should have proper error handling */
-	if (netconf_operation_failed(cbret, "application", clicon_err_reason)< 0)
-	    goto done;
+	if (ret < 0){
+	    if (netconf_operation_failed(cbret, "application", clicon_err_reason)< 0)
+		goto done;
+	}
 	goto ok;
     }
     /* Optionally write (potentially modified) tree back to candidate */
diff --git a/apps/backend/backend_commit.h b/apps/backend/backend_commit.h
index 6be05858..45b0f922 100644
--- a/apps/backend/backend_commit.h
+++ b/apps/backend/backend_commit.h
@@ -43,6 +43,6 @@
 int from_client_validate(clicon_handle h, char *db, cbuf *cbret);
 int from_client_commit(clicon_handle h, int pid, cbuf *cbret);
 int from_client_discard_changes(clicon_handle h, int pid, cbuf *cbret);
-int candidate_commit(clicon_handle h, char *db);
+int candidate_commit(clicon_handle h, char *db, cbuf *cbret);
 
 #endif  /* _BACKEND_COMMIT_H_ */
diff --git a/apps/backend/backend_main.c b/apps/backend/backend_main.c
index ec4a99d7..8e433d85 100644
--- a/apps/backend/backend_main.c
+++ b/apps/backend/backend_main.c
@@ -386,6 +386,7 @@ startup_mode_running(clicon_handle h,
     		     char         *extraxml_file)
 {
     int     retval = -1;
+    cbuf   *cbret = NULL;
 
     /* Stash original running to candidate for later commit */
     if (xmldb_copy(h, "running", "candidate") < 0)
@@ -405,15 +406,20 @@ startup_mode_running(clicon_handle h,
     /* Clear running db */
     if (db_reset(h, "running") < 0)
 	goto done;
+    if ((cbret = cbuf_new()) == NULL){
+	clicon_err(OE_XML, errno, "cbuf_new");
+	goto done;
+    }
     /* Commit original running. Assume -1 is validate fail */
-    if (candidate_commit(h, "candidate") < 0){
+    if (candidate_commit(h, "candidate", cbret) < 1){
 	/*  (1) We cannot differentiate between fatal errors and validation
 	 *      failures
 	 *  (2) If fatal error, we should exit
 	 *  (3) If validation fails we cannot continue. How could we?
 	 *  (4) Need to restore the running db since we destroyed it above
 	 */
-	clicon_log(LOG_NOTICE, "%s: Commit of saved running failed, exiting.", __FUNCTION__);
+	clicon_log(LOG_NOTICE, "%s: Commit of saved running failed, exiting: %s.",
+		   __FUNCTION__, cbuf_get(cbret));
 	/* Reinstate original */
 	if (xmldb_copy(h, "candidate", "running") < 0)
 	    goto done;
@@ -424,6 +430,8 @@ startup_mode_running(clicon_handle h,
 	goto done;
     retval = 0;
  done:
+    if (cbret)
+	cbuf_free(cbret);
     if (xmldb_delete(h, "tmp") < 0)
 	goto done;
     return retval;
@@ -455,6 +463,7 @@ startup_mode_startup(clicon_handle h,
 		     char *extraxml_file)
 {
     int     retval = -1;
+    cbuf   *cbret = NULL;
 
     /* Stash original running to backup */
     if (xmldb_copy(h, "running", "backup") < 0)
@@ -478,13 +487,19 @@ startup_mode_startup(clicon_handle h,
     /* Clear running db */
     if (db_reset(h, "running") < 0)
 	goto done;
+    /* Create return buffer (not used) */
+    if ((cbret = cbuf_new()) == NULL){
+	clicon_err(OE_XML, errno, "cbuf_new");
+	goto done;
+    }
     /* Commit startup */
-    if (candidate_commit(h, "startup") < 0){ /* diff */
+    if (candidate_commit(h, "startup", cbret) < 1){ /* diff */
 	/*  We cannot differentiate between fatal errors and validation
 	 *  failures
 	 *  In both cases we copy back the original running and quit
 	 */
-	clicon_log(LOG_NOTICE, "%s: Commit of startup failed, exiting.", __FUNCTION__);
+	clicon_log(LOG_NOTICE, "%s: Commit of startup failed, exiting: %s.",
+		   __FUNCTION__, cbuf_get(cbret));
 	if (xmldb_copy(h, "backup", "running") < 0)
 	    goto done;
 	goto done;
@@ -494,6 +509,8 @@ startup_mode_startup(clicon_handle h,
 	goto done;
     retval = 0;
  done:
+    if (cbret)
+	cbuf_free(cbret);
     if (xmldb_delete(h, "backup") < 0)
 	goto done;
     if (xmldb_delete(h, "tmp") < 0)
diff --git a/apps/netconf/netconf_main.c b/apps/netconf/netconf_main.c
index 55ee628b..cc4c9710 100644
--- a/apps/netconf/netconf_main.c
+++ b/apps/netconf/netconf_main.c
@@ -83,15 +83,17 @@ static int
 process_incoming_packet(clicon_handle h, 
 			cbuf         *cb)
 {
-    char  *str;
-    char  *str0;
-    cxobj *xreq = NULL; /* Request (in) */
-    int    isrpc = 0;   /* either hello or rpc */
-    cbuf  *cbret = NULL;
-    cxobj *xret = NULL; /* Return (out) */
-    cxobj *xrpc;
-    cxobj *xc;
+    int        retval = -1;
+    char      *str;
+    char      *str0;
+    cxobj     *xreq = NULL; /* Request (in) */
+    int        isrpc = 0;   /* either hello or rpc */
+    cbuf      *cbret = NULL;
+    cxobj     *xret = NULL; /* Return (out) */
+    cxobj     *xrpc;
+    cxobj     *xc;
     yang_spec *yspec;
+    int        ret;
 
     clicon_debug(1, "RECV");
     clicon_debug(2, "%s: RCV: \"%s\"", __FUNCTION__, cbuf_get(cb));
@@ -115,15 +117,12 @@ process_incoming_packet(clicon_handle h,
     }
     free(str0);
     if ((xrpc=xpath_first(xreq, "//rpc")) != NULL){
-	int ret;
         isrpc++;
-	if ((ret = xml_yang_validate_rpc(xrpc)) < 0) 
+	if ((ret = xml_yang_validate_rpc(xrpc, cbret)) < 0) 
 	    goto done;
 	if (ret == 0){
-	    if (netconf_operation_failed(cbret, "application", "Validation failed")< 0)
-		goto done;
 	    netconf_output(1, cbret, "rpc-error");
-	    goto done;
+	    goto ok;
 	}
     }
     else
@@ -168,6 +167,8 @@ process_incoming_packet(clicon_handle h,
 		}
 	    }
 	}
+ ok:
+    retval = 0;
   done:
     if (xreq)
 	xml_free(xreq);
@@ -175,7 +176,7 @@ process_incoming_packet(clicon_handle h,
 	xml_free(xret);
     if (cbret)
 	cbuf_free(cbret);
-    return 0;
+    return retval;
 }
 
 /*! Get netconf message: detect end-of-msg 
@@ -229,7 +230,7 @@ netconf_input_cb(int   s,
 		/* Remove trailer */
 		*(((char*)cbuf_get(cb)) + cbuf_len(cb) - strlen("]]>]]>")) = '\0';
 		if (process_incoming_packet(h, cb) < 0)
-		    goto done;
+		    ; //goto done; // ignore errors
 		if (cc_closed)
 		    break;
 		cbuf_reset(cb);
diff --git a/apps/netconf/netconf_rpc.c b/apps/netconf/netconf_rpc.c
index f53b8675..64001137 100644
--- a/apps/netconf/netconf_rpc.c
+++ b/apps/netconf/netconf_rpc.c
@@ -56,6 +56,7 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <syslog.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/param.h>
@@ -876,12 +877,16 @@ netconf_application_rpc(clicon_handle h,
     cbuf          *cb = NULL;
     cbuf          *cbret = NULL;
     int            ret;
-
+    
     /* First check system / netconf RPC:s */
     if ((cb = cbuf_new()) == NULL){
 	clicon_err(OE_UNIX, 0, "cbuf_new");
 	goto done;
     }
+    if ((cbret = cbuf_new()) == NULL){
+	clicon_err(OE_UNIX, 0, "cbuf_new");
+	goto done;
+    }
     /* Find yang rpc statement, return yang rpc statement if found 
        Check application RPC */
     if ((yspec =  clicon_dbspec_yang(h)) == NULL){
@@ -917,15 +922,18 @@ netconf_application_rpc(clicon_handle h,
 	    xml_spec_set(xn, yinput); /* needed for xml_spec_populate */
 	    if (xml_apply(xn, CX_ELMNT, xml_spec_populate, yspec) < 0)
 		goto done;
-	    if (xml_apply(xn, CX_ELMNT, 
-			  (xml_applyfn_t*)xml_yang_validate_all, NULL) < 0)
+	    if ((ret = xml_yang_validate_all_top(xn, cbret)) < 0)
 		goto done;
-	    if (xml_yang_validate_add(xn, NULL) < 0)
+	    if (ret == 0){
+		netconf_output(1, cbret, "rpc-error");
+		goto ok;
+	    }
+	    if ((ret = xml_yang_validate_add(xn, cbret)) < 0)
 		goto done;
-	}
-	if ((cbret = cbuf_new()) == NULL){
-	    clicon_err(OE_UNIX, 0, "cbuf_new");
-	    goto done;
+	    if (ret == 0){
+		netconf_output(1, cbret, "rpc-error");
+		goto ok;
+	    }
 	}
 	/* Look for local (client-side) netconf plugins. */
 	if ((ret = rpc_callback_call(h, xn, cbret, NULL)) < 0)
@@ -943,11 +951,18 @@ netconf_application_rpc(clicon_handle h,
 	    xml_spec_set(xoutput, youtput); /* needed for xml_spec_populate */
 	    if (xml_apply(xoutput, CX_ELMNT, xml_spec_populate, yspec) < 0)
 		goto done;
-	    if (xml_apply(xoutput, CX_ELMNT, 
-			  (xml_applyfn_t*)xml_yang_validate_all, NULL) < 0)
+	    if ((ret = xml_yang_validate_all_top(xoutput, cbret)) < 0)
 		goto done;
-	    if (xml_yang_validate_add(xoutput, NULL) < 0)
+	    if (ret == 0){
+		clicon_log(LOG_WARNING, "Errors in output netconf %s", cbuf_get(cbret));
+		goto ok;
+	    }
+	    if ((ret = xml_yang_validate_add(xoutput, cbret)) < 0)
 		goto done;
+	    if (ret == 0){
+		clicon_log(LOG_WARNING, "Errors in output netconf %s", cbuf_get(cbret));
+		goto ok;
+	    }
 	}
 	retval = 1; /* handled by callback */
 	goto done;
diff --git a/apps/restconf/restconf_lib.c b/apps/restconf/restconf_lib.c
index 75c06699..be214fbb 100644
--- a/apps/restconf/restconf_lib.c
+++ b/apps/restconf/restconf_lib.c
@@ -71,11 +71,12 @@ static const map_str2int netconf_restconf_map[] = {
     {"missing-attribute",      400},
     {"bad-attribute",          400},
     {"unknown-attribute",      400},
+    {"missing-element",        400},
     {"bad-element",            400},
     {"unknown-element",        400},
     {"unknown-namespace",      400},
-    {"access-denied",          401},
-    {"access-denied",          403},
+    {"access-denied",          401}, /* or 403 */
+    {"access-denied",          403}, 
     {"lock-denied",            409},
     {"resource-denied",        409},
     {"rollback-failed",        500},
@@ -436,7 +437,8 @@ api_return_err(clicon_handle h,
 	goto ok;
     }
     tagstr = xml_body(xtag);
-    code = restconf_err2code(tagstr);
+    if ((code = restconf_err2code(tagstr)) < 0)
+	code = 500; /* internal server error */
     if ((reason_phrase = restconf_code2reason(code)) == NULL)
 	reason_phrase="";
     if (xml_name_set(xerr, "error") < 0)
@@ -448,6 +450,7 @@ api_return_err(clicon_handle h,
     else
 	if (xml2json_cbuf(cb, xerr, pretty) < 0)
 	    goto done;
+    FCGX_SetExitStatus(code, r->out); /* Created */
     FCGX_FPrintF(r->out, "Status: %d %s\r\n", code, reason_phrase);
     FCGX_FPrintF(r->out, "Content-Type: application/yang-data+%s\r\n\r\n",
 		 use_xml?"xml":"json");
diff --git a/apps/restconf/restconf_methods.c b/apps/restconf/restconf_methods.c
index 42d4d331..b8beb068 100644
--- a/apps/restconf/restconf_methods.c
+++ b/apps/restconf/restconf_methods.c
@@ -190,7 +190,7 @@ api_data_get2(clicon_handle h,
     yang_spec *yspec;
     cxobj     *xret = NULL;
     cxobj     *xerr = NULL; /* malloced */
-    cxobj     *xe;
+    cxobj     *xe = NULL;
     cxobj    **xvec = NULL;
     size_t     xlen;
     int        i;
@@ -206,8 +206,9 @@ api_data_get2(clicon_handle h,
     if (api_path2xpath_cvv(yspec, pcvec, pi, cbpath) < 0){
 	if (netconf_operation_failed_xml(&xerr, "protocol", clicon_err_reason) < 0)
 	    goto done;
-	if (api_return_err(h, r, xerr, pretty, use_xml) < 0)
-	    goto done;
+	if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
+	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		goto done;
 	goto ok;
     }
     path = cbuf_get(cbpath);
@@ -215,8 +216,9 @@ api_data_get2(clicon_handle h,
     if (clicon_rpc_get(h, path, &xret) < 0){
 	if (netconf_operation_failed_xml(&xerr, "protocol", clicon_err_reason) < 0)
 	    goto done;
-	if (api_return_err(h, r, xerr, pretty, use_xml) < 0)
-	    goto done;
+	if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
+	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		goto done;
 	goto ok;
     }
     /* We get return via netconf which is complete tree from root 
@@ -434,16 +436,18 @@ api_data_post(clicon_handle h,
 	if (xml_parse_string(data, NULL, &xdata) < 0){
 	    if (netconf_malformed_message_xml(&xerr, clicon_err_reason) < 0)
 		goto done;
-	    if (api_return_err(h, r, xerr, pretty, use_xml) < 0)
-		goto done;
+	    if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
+		if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		    goto done;
 	    goto ok;
 	}
     }
     else if (json_parse_str(data, &xdata) < 0){
 	if (netconf_malformed_message_xml(&xerr, clicon_err_reason) < 0)
 	    goto done;
-	if (api_return_err(h, r, xerr, pretty, use_xml) < 0)
-	    goto done;
+	if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
+	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		goto done;
 	goto ok;
     }
     /* 4.4.1: The message-body MUST contain exactly one instance of the
@@ -452,8 +456,9 @@ api_data_post(clicon_handle h,
     if (xml_child_nr(xdata) != 1){
 	if (netconf_malformed_message_xml(&xerr, clicon_err_reason) < 0)
 	    goto done;
-	if (api_return_err(h, r, xerr, pretty, use_xml) < 0)
-	    goto done;
+	if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
+	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		goto done;
 	goto ok;
     }
     x = xml_child_i(xdata,0);
@@ -662,16 +667,18 @@ api_data_put(clicon_handle h,
 	if (xml_parse_string(data, NULL, &xdata) < 0){
 	    if (netconf_malformed_message_xml(&xerr, clicon_err_reason) < 0)
 		goto done;
-	    if (api_return_err(h, r, xerr, pretty, use_xml) < 0)
-		goto done;
+	    if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
+		if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		    goto done;
 	    goto ok;
 	}
     }
     else if (json_parse_str(data, &xdata) < 0){
 	if (netconf_malformed_message_xml(&xerr, clicon_err_reason) < 0)
 	    goto done;
-	if (api_return_err(h, r, xerr, pretty, use_xml) < 0)
-	    goto done;
+	if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
+	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		goto done;
 	goto ok;
     }
     /* The message-body MUST contain exactly one instance of the
@@ -680,8 +687,9 @@ api_data_put(clicon_handle h,
     if (xml_child_nr(xdata) != 1){
 	if (netconf_malformed_message_xml(&xerr, clicon_err_reason) < 0)
 	    goto done;
-	if (api_return_err(h, r, xerr, pretty, use_xml) < 0)
-	    goto done;
+	if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
+	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		goto done;
 	goto ok;
     }
     x = xml_child_i(xdata,0);
@@ -705,8 +713,9 @@ api_data_put(clicon_handle h,
 	if (strcmp(xml_name(x), xml_name(xbot))){
 	    if (netconf_operation_failed_xml(&xerr, "protocol", "Not same symbol in api-path as data") < 0)
 		goto done;
-	    if (api_return_err(h, r, xerr, pretty, use_xml) < 0)
-		goto done;
+	    if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
+		if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		    goto done;
 	    goto ok;
 	}
 	/* If list or leaf-list, api-path keys must match data keys */	    
@@ -714,8 +723,9 @@ api_data_put(clicon_handle h,
 	    if (match_list_keys((yang_stmt*)y, x, xbot) < 0){
 		if (netconf_operation_failed_xml(&xerr, "protocol", "api-path keys do not match data keys") < 0)
 		    goto done;
-		if (api_return_err(h, r, xerr, pretty, use_xml) < 0)
-		    goto done;
+		if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
+		    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+			goto done;
 		goto ok;
 	    }
 	}
@@ -866,7 +876,7 @@ api_data_delete(clicon_handle h,
     if ((xa = xml_new("operation", xbot, NULL)) == NULL)
 	goto done;
     xml_type_set(xa, CX_ATTR);
-    if (xml_value_set(xa,  xml_operation2str(op)) < 0)
+    if (xml_value_set(xa, xml_operation2str(op)) < 0)
 	goto done;
     if ((cbx = cbuf_new()) == NULL)
 	goto done;
@@ -1054,7 +1064,6 @@ api_operations_post(clicon_handle h,
     cxobj     *xdata = NULL;
     cxobj     *xret = NULL;
     cxobj     *xerr = NULL; /* malloced must be freed */
-    cxobj     *xer; /* non-malloced error */
     cbuf      *cbx = NULL;
     cxobj     *xtop = NULL; /* xpath root */
     cxobj     *xbot = NULL;
@@ -1076,13 +1085,18 @@ api_operations_post(clicon_handle h,
 	clicon_err(OE_FATAL, 0, "No DB_SPEC");
 	goto done;
     }
+    if ((cbret = cbuf_new()) == NULL){
+	clicon_err(OE_UNIX, 0, "cbuf_new");
+	goto done;
+    }
     for (i=0; i<pi; i++)
 	oppath = index(oppath+1, '/');
     if (oppath == NULL || strcmp(oppath,"/")==0){
 	if (netconf_operation_failed_xml(&xerr, "protocol", "Operation name expected") < 0)
 	    goto done;
-	if (api_return_err(h, r, xerr, pretty, use_xml) < 0)
-	    goto done;
+	if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
+	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		goto done;
 	goto ok;
     }
     clicon_debug(1, "%s oppath: %s", __FUNCTION__, oppath);
@@ -1098,22 +1112,25 @@ api_operations_post(clicon_handle h,
     if ((ys = yang_find((yang_node*)yspec, Y_MODULE, prefix)) == NULL){
 	if (netconf_operation_failed_xml(&xerr, "protocol", "yang module not found") < 0)
 	    goto done;
-	if (api_return_err(h, r, xerr, pretty, use_xml) < 0)
-	    goto done;
+	if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
+	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		goto done;
 	goto ok;
     }
     if ((yrpc = yang_find((yang_node*)ys, Y_RPC, id)) == NULL){
 	if (netconf_operation_failed_xml(&xerr, "protocol", "yang node not found") < 0)
 	    goto done;
-	if (api_return_err(h, r, xerr, pretty, use_xml) < 0)
-	    goto done;
+	if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
+	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		goto done;
 	goto ok;
     }
     if (yrpc == NULL){
 	if (netconf_operation_failed_xml(&xerr, "protocol", "yang node not found") < 0)
 	    goto done;
-	if (api_return_err(h, r, xerr, pretty, use_xml) < 0)
-	    goto done;
+	if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
+	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		goto done;
 	goto ok;
     }
     /* Create an xml message: 
@@ -1142,16 +1159,18 @@ api_operations_post(clicon_handle h,
 	    if (xml_parse_string(data, NULL, &xdata) < 0){
 		if (netconf_malformed_message_xml(&xerr, clicon_err_reason) < 0)
 		    goto done;
-		if (api_return_err(h, r, xerr, pretty, use_xml) < 0)
-		    goto done;
+		if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
+		    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+			goto done;
 		goto ok;
 	    }
 	}
 	else if (json_parse_str(data, &xdata) < 0){
 	    if (netconf_malformed_message_xml(&xerr, clicon_err_reason) < 0)
 		goto done;
-	    if (api_return_err(h, r, xerr, pretty, use_xml) < 0)
-		goto done;
+	    if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
+		if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		    goto done;
 	    goto ok;
 	}
 	yinput = yang_find((yang_node*)yrpc, Y_INPUT, NULL);
@@ -1160,11 +1179,14 @@ api_operations_post(clicon_handle h,
 	    xml_name_set(xdata, "input");
 	    xml_spec_set(xdata, yinput); /* needed for xml_spec_populate */
 	    if (yinput){
-		if (xml_yang_validate_add(xdata, NULL) < 0){
-		    if (netconf_operation_failed_xml(&xerr, "protocol", clicon_err_reason) < 0)
-			goto done;
-		    if (api_return_err(h, r, xerr, pretty, use_xml) < 0)
+		if ((ret = xml_yang_validate_add(xdata, cbret)) < 0)
+		    goto done;
+		if (ret == 0){ /* validation failed */
+		    if (xml_parse_string(cbuf_get(cbret), yspec, &xerr) < 0)
 			goto done;
+		    if ((xe=xpath_first(xerr, "rpc-reply/rpc-error")) != NULL)
+			if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+			    goto done;
 		    goto ok;
 		}
 	    }
@@ -1182,23 +1204,31 @@ api_operations_post(clicon_handle h,
 		/* XXX yinput <-> h ?*/
 		if (xml_apply(xbot, CX_ELMNT, xml_spec_populate, yspec) < 0)
 		    goto done;
-		if (xml_apply(xbot, CX_ELMNT, 
-			      (xml_applyfn_t*)xml_yang_validate_all, NULL) < 0)
+		if ((ret = xml_yang_validate_all(xbot, cbret)) < 0)
 		    goto done;
-		if (xml_yang_validate_add(xbot, NULL) < 0){
-		    if (netconf_operation_failed_xml(&xerr, "protocol", clicon_err_reason) < 0)
-			goto done;
-		    if (api_return_err(h, r, xerr, pretty, use_xml) < 0)
+		if (ret == 0){ /* validation failed */
+		    clicon_debug(1, "%s err: %s", __FUNCTION__, cbuf_get(cbret));
+		    if (xml_parse_string(cbuf_get(cbret), yspec, &xerr) < 0)
 			goto done;
+		    if ((xe=xpath_first(xerr, "rpc-reply/rpc-error")) != NULL)
+			if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+			    goto done;
 		    goto ok;
 		}
+		if ((ret = xml_yang_validate_add(xbot, cbret)) < 0){
+		    if (xml_parse_string(cbuf_get(cbret), yspec, &xerr) < 0)
+			goto done;
+		    if ((xe=xpath_first(xerr, "rpc-reply/rpc-error")) != NULL)
+			if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+			    goto done;
+		    goto ok;
+		}
+		if (xml_apply0(xbot, CX_ELMNT, xml_default, NULL) < 0)
+		    goto done;
 	    }
 	}
     }
-    if ((cbret = cbuf_new()) == NULL){
-	clicon_err(OE_UNIX, 0, "cbuf_new");
-	goto done;
-    }
+    ret = 0;
     xe = NULL;
     while ((xe = xml_child_each(xtop, xe, CX_ELMNT)) != NULL) {
 	/* Look for local (client-side) restconf plugins. */
@@ -1208,8 +1238,8 @@ api_operations_post(clicon_handle h,
 	    if (xml_parse_string(cbuf_get(cbret), NULL, &xret) < 0)
 		goto done;
 	    /* Local error: return it and quit */
-	    if ((xer = xpath_first(xret, "//rpc-error")) != NULL){
-		if (api_return_err(h, r, xer, pretty, use_xml) < 0)
+	    if ((xe = xpath_first(xret, "rpc-reply/rpc-error")) != NULL){
+		if (api_return_err(h, r, xe, pretty, use_xml) < 0)
 		    goto done;
 		goto ok;
 	    }
@@ -1219,8 +1249,8 @@ api_operations_post(clicon_handle h,
     if (ret == 0){ /* Send to backend */
 	if (clicon_rpc_netconf_xml(h, xtop, &xret, NULL) < 0)
 	    goto done;
-	if ((xer = xpath_first(xret, "//rpc-error")) != NULL){
-	    if (api_return_err(h, r, xer, pretty, use_xml) < 0)
+	if ((xe = xpath_first(xret, "rpc-reply/rpc-error")) != NULL){
+	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
 		goto done;
 	    goto ok;
 	}
@@ -1240,18 +1270,31 @@ api_operations_post(clicon_handle h,
 	goto done;
     if ((xoutput=xpath_first(xret, "/")) != NULL){
 	xml_name_set(xoutput, "output");
-#if 0
-	clicon_debug(1, "%s xoutput:%s", __FUNCTION__, cbuf_get(cbx));
-#endif
 	cbuf_reset(cbx);
 	xml_spec_set(xoutput, youtput); /* needed for xml_spec_populate */
 	if (xml_apply(xoutput, CX_ELMNT, xml_spec_populate, yspec) < 0)
 	    goto done;
-	if (xml_apply(xoutput, CX_ELMNT, 
-		      (xml_applyfn_t*)xml_yang_validate_all, NULL) < 0)
+	if ((ret = xml_yang_validate_all(xoutput, cbret)) < 0)
 	    goto done;
-	if (xml_yang_validate_add(xoutput, NULL) < 0)
+	if (ret == 0){ /* validation failed */
+	    clicon_debug(1, "%s output validation failed", __FUNCTION__);
+	    if (xml_parse_string(cbuf_get(cbret), yspec, &xerr) < 0)
+		goto done;
+	    if ((xe = xpath_first(xret, "rpc-reply/rpc-error")) != NULL)
+		if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		goto done;
+	    goto ok;
+	}
+	if ((ret = xml_yang_validate_add(xoutput, cbret)) < 0)
 	    goto done;
+	if (ret == 0){ /* validation failed */
+	    if (xml_parse_string(cbuf_get(cbret), yspec, &xerr) < 0)
+		goto done;
+	    if ((xe = xpath_first(xret, "rpc-reply/rpc-error")) != NULL)
+		if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		    goto done;
+	    goto ok;
+	}
     }
     /* Sanity check of outgoing XML */
     FCGX_SetExitStatus(200, r->out); /* OK */
diff --git a/example/example_backend.c b/example/example_backend.c
index 3a420a0e..35fe20d4 100644
--- a/example/example_backend.c
+++ b/example/example_backend.c
@@ -132,6 +132,7 @@ fib_route(clicon_handle h,            /* Clicon handle */
     cprintf(cbret, "<rpc-reply><route>"
 	    "<address-family>ipv4</address-family>"
 	    "<next-hop><next-hop-list>2.3.4.5</next-hop-list></next-hop>"
+	    "<source-protocol>static</source-protocol>"
 	    "</route></rpc-reply>");    
     return 0;
 }
@@ -157,16 +158,41 @@ route_count(clicon_handle h,
  * in [RFC6241].
  */
 static int 
-empty(clicon_handle h,            /* Clicon handle */
-      cxobj        *xe,           /* Request: <rpc><xn></rpc> */
-      cbuf         *cbret,        /* Reply eg <rpc-reply>... */
-      void         *arg,          /* client_entry */
-      void         *regarg)       /* Argument given at register */
+empty_rpc(clicon_handle h,            /* Clicon handle */
+	  cxobj        *xe,           /* Request: <rpc><xn></rpc> */
+	  cbuf         *cbret,        /* Reply eg <rpc-reply>... */
+	  void         *arg,          /* client_entry */
+	  void         *regarg)       /* Argument given at register */
 {
     cprintf(cbret, "<rpc-reply><ok/></rpc-reply>");
     return 0;
 }
 
+/*! More elaborate example RPC for testing
+ * The RPC returns the incoming parameters
+ */
+static int 
+example_rpc(clicon_handle h,            /* Clicon handle */
+	    cxobj        *xe,           /* Request: <rpc><xn></rpc> */
+	    cbuf         *cbret,        /* Reply eg <rpc-reply>... */
+	    void         *arg,          /* client_entry */
+	    void         *regarg)       /* Argument given at register */
+{
+    int    retval = -1;
+    cxobj *x = NULL;
+
+    cprintf(cbret, "<rpc-reply>");
+    while ((x = xml_child_each(xe, x, CX_ELMNT)) != NULL) {
+	if (clicon_xml2cbuf(cbret, x, 0, 0) < 0)
+	    goto done;
+    }
+    cprintf(cbret, "</rpc-reply>");
+    retval = 0;
+ done:
+    return retval;
+}
+
+
 /*! Called to get state data from plugin
  * @param[in]    h      Clicon handle
  * @param[in]    xpath  String with XPATH syntax. or NULL for all
@@ -315,22 +341,31 @@ clixon_plugin_init(clicon_handle h)
     if (example_stream_timer_setup(h) < 0)
 	goto done;
 
-    /* Register callback for routing rpc calls */
+    /* Register callback for routing rpc calls 
+     */
+
     if (rpc_callback_register(h, fib_route, 
 			      NULL, 
 			      "fib-route"/* Xml tag when callback is made */
 			      ) < 0)
 	goto done;
+    /* From ietf-routing.yang */
     if (rpc_callback_register(h, route_count, 
 			      NULL, 
 			      "route-count"/* Xml tag when callback is made */
 			      ) < 0)
 	goto done;
-    if (rpc_callback_register(h, empty, 
+    /* From example.yang (clicon) */
+    if (rpc_callback_register(h, empty_rpc, 
 			      NULL, 
 			      "empty"/* Xml tag when callback is made */
 			      ) < 0)
 	goto done;
+    if (rpc_callback_register(h, example_rpc, 
+			      NULL, 
+			      "example"/* Xml tag when callback is made */
+			      ) < 0)
+	goto done;
 
     /* Return plugin API */
     return &api;
diff --git a/lib/clixon/clixon_netconf_lib.h b/lib/clixon/clixon_netconf_lib.h
index cdf570e9..b22e697b 100644
--- a/lib/clixon/clixon_netconf_lib.h
+++ b/lib/clixon/clixon_netconf_lib.h
@@ -46,9 +46,9 @@ int netconf_too_big(cbuf *cb, char *type, char *message);
 int netconf_missing_attribute(cbuf *cb,	char *type, char *info, char *message);
 int netconf_bad_attribute(cbuf *cb, char *type, char *info, char *message);
 int netconf_unknown_attribute(cbuf *cb,	char *type, char *info, char *message);
-int netconf_missing_element(cbuf *cb, char *type, char *info, char *message);
-int netconf_bad_element(cbuf *cb, char *type, char *info, char *message);
-int netconf_unknown_element(cbuf *cb, char *type, char *info, char *message);
+int netconf_missing_element(cbuf *cb, char *type, char *element, char *message);
+int netconf_bad_element(cbuf *cb, char *type, char *info, char *element);
+int netconf_unknown_element(cbuf *cb, char *type, char *element, char *message);
 int netconf_unknown_namespace(cbuf *cb, char *type, char *info, char *message);
 int netconf_access_denied(cbuf *cb, char *type, char *message);
 int netconf_access_denied_xml(cxobj **xret, char *type, char *message);
diff --git a/lib/clixon/clixon_xml.h b/lib/clixon/clixon_xml.h
index 803e5948..68f332ab 100644
--- a/lib/clixon/clixon_xml.h
+++ b/lib/clixon/clixon_xml.h
@@ -99,8 +99,8 @@ extern int _CLICON_XML_NS_ITERATE;
 char     *xml_type2str(enum cxobj_type type);
 char     *xml_name(cxobj *xn);
 int       xml_name_set(cxobj *xn, char *name);
-char     *xml_namespace(cxobj *xn);
-int       xml_namespace_set(cxobj *xn, char *name);
+char     *xml_prefix(cxobj *xn);
+int       xml_prefix_set(cxobj *xn, char *name);
 int       xml2ns(cxobj *x, char *localname, char **namespace);
 cxobj    *xml_parent(cxobj *xn);
 int       xml_parent_set(cxobj *xn, cxobj *parent);
diff --git a/lib/clixon/clixon_xml_map.h b/lib/clixon/clixon_xml_map.h
index abd1fe50..dba82884 100644
--- a/lib/clixon/clixon_xml_map.h
+++ b/lib/clixon/clixon_xml_map.h
@@ -43,9 +43,10 @@
  */
 int xml2txt(FILE *f, cxobj *x, int level);
 int xml2cli(FILE *f, cxobj *x, char *prepend, enum genmodel_type gt);
-int xml_yang_validate_rpc(cxobj *xrpc);
-int xml_yang_validate_add(cxobj *xt, void *arg);
-int xml_yang_validate_all(cxobj *xt, void *arg);
+int xml_yang_validate_rpc(cxobj *xrpc, cbuf *cbret);
+int xml_yang_validate_add(cxobj *xt, cbuf *cbret);
+int xml_yang_validate_all(cxobj *xt, cbuf *cbret);
+int xml_yang_validate_all_top(cxobj *xt, cbuf *cbret);
 int xml2cvec(cxobj *xt, yang_stmt *ys, cvec **cvv0);
 int cvec2xml_1(cvec *cvv, char *toptag, cxobj *xp, cxobj **xt0);
 int xml_diff(yang_spec *yspec, cxobj *xt1, cxobj *xt2, 	 
diff --git a/lib/src/clixon_json.c b/lib/src/clixon_json.c
index 00778c30..06aa71c9 100644
--- a/lib/src/clixon_json.c
+++ b/lib/src/clixon_json.c
@@ -315,7 +315,7 @@ xml2json1_cbuf(cbuf                   *cb,
      * Harder if x has a prefix, then that should also be translated to associated
      * module name
      */
-    prefix = xml_namespace(x);
+    prefix = xml_prefix(x);
     if (xml2ns(x, prefix, &namespace) < 0)
 	goto done;
     if ((ys = xml_spec(x)) != NULL) /* yang spec associated with x */
diff --git a/lib/src/clixon_netconf_lib.c b/lib/src/clixon_netconf_lib.c
index ccb88275..6c284fc6 100644
--- a/lib/src/clixon_netconf_lib.c
+++ b/lib/src/clixon_netconf_lib.c
@@ -80,8 +80,8 @@ netconf_in_use(cbuf *cb,
     char *encstr = NULL;
     
     if (cprintf(cb, "<rpc-reply><rpc-error>"
-		"<error-tag>in-use</error-tag>"
 		"<error-type>%s</error-type>"
+		"<error-tag>in-use</error-tag>"
 		"<error-severity>error</error-severity>",
 		type) <0)
 	goto err;
@@ -119,8 +119,8 @@ netconf_invalid_value(cbuf *cb,
     char *encstr = NULL;
 
     if (cprintf(cb, "<rpc-reply><rpc-error>"
-		"<error-tag>invalid-value</error-tag>"
 		"<error-type>%s</error-type>"
+		"<error-tag>invalid-value</error-tag>"
 		"<error-severity>error</error-severity>",
 		type) <0)
 	goto err;
@@ -159,8 +159,8 @@ netconf_too_big(cbuf *cb,
     char *encstr = NULL;
 
     if (cprintf(cb, "<rpc-reply><rpc-error>"
-		"<error-tag>too-big</error-tag>"
 		"<error-type>%s</error-type>"
+		"<error-tag>too-big</error-tag>"
 		"<error-severity>error</error-severity>",
 		type) <0)
 	goto err;
@@ -200,8 +200,8 @@ netconf_missing_attribute(cbuf *cb,
     char *encstr = NULL;
 
     if (cprintf(cb, "<rpc-reply><rpc-error>"
-		"<error-tag>missing-attribute</error-tag>"
 		"<error-type>%s</error-type>"
+		"<error-tag>missing-attribute</error-tag>"
 		"<error-info>%s</error-info>"
 		"<error-severity>error</error-severity>",
 		type, info) <0)
@@ -241,8 +241,8 @@ netconf_bad_attribute(cbuf *cb,
     char *encstr = NULL;
 
     if (cprintf(cb, "<rpc-reply><rpc-error>"
-		"<error-tag>bad-attribute</error-tag>"
 		"<error-type>%s</error-type>"
+		"<error-tag>bad-attribute</error-tag>"
 		"<error-info>%s</error-info>"
 		"<error-severity>error</error-severity>",
 		type, info) <0)
@@ -283,8 +283,8 @@ netconf_unknown_attribute(cbuf *cb,
     char *encstr = NULL;
 
     if (cprintf(cb, "<rpc-reply><rpc-error>"
-		"<error-tag>unknown-attribute</error-tag>"
 		"<error-type>%s</error-type>"
+		"<error-tag>unknown-attribute</error-tag>"
 		"<error-info>%s</error-info>"
 		"<error-severity>error</error-severity>",
 		type, info) <0)
@@ -318,18 +318,18 @@ netconf_unknown_attribute(cbuf *cb,
 int
 netconf_missing_element(cbuf      *cb, 
 			char      *type,
-			char      *info,
+			char      *element,
 			char      *message)
 {
     int   retval = -1;
     char *encstr = NULL;
 
     if (cprintf(cb, "<rpc-reply><rpc-error>"
-		"<error-tag>missing-element</error-tag>"
 		"<error-type>%s</error-type>"
-		"<error-info>%s</error-info>"
+		"<error-tag>missing-element</error-tag>"
+		"<error-info><bad-element>%s</bad-element></error-info>"
 		"<error-severity>error</error-severity>",
-		type, info) <0)
+		type, element) <0)
 	goto err;
     if (message){
 	if (xml_chardata_encode(&encstr, "%s", message) < 0)
@@ -355,24 +355,24 @@ netconf_missing_element(cbuf      *cb,
  * pattern mismatch.
  * @param[out] cb      CLIgen buf. Error XML is written in this buffer
  * @param[in]  type    Error type: "application" or "protocol"
- * @param[in]  info    bad-element xml
+ * @param[in]  elemnt  Bad element name
  * @param[in]  message Error message
  */
 int
 netconf_bad_element(cbuf *cb,
 		    char *type,
-		    char *info,
+		    char *element,
 		    char *message)
 {
     int   retval = -1;
     char *encstr = NULL;
 
     if (cprintf(cb, "<rpc-reply><rpc-error>"
-		"<error-tag>bad-element</error-tag>"
 		"<error-type>%s</error-type>"
-		"<error-info>%s</error-info>"
+		"<error-tag>bad-element</error-tag>"
+		"<error-info><bad-element>%s</bad-element></error-info>"
 		"<error-severity>error</error-severity>",
-		type, info) <0)
+		type, element) <0)
 	goto err;
     if (message){
 	if (xml_chardata_encode(&encstr, "%s", message) < 0)
@@ -397,24 +397,24 @@ netconf_bad_element(cbuf *cb,
  * An unexpected element is present.
  * @param[out] cb      CLIgen buf. Error XML is written in this buffer
  * @param[in]  type    Error type: "application" or "protocol"
- * @param[in]  info    bad-element xml
+ * @param[in]  element Bad element name
  * @param[in]  message Error message
  */
 int
 netconf_unknown_element(cbuf *cb,
 			char *type,
-			char *info,
+			char *element,
 			char *message)
 {
     int   retval = -1;
     char *encstr = NULL;
 
     if (cprintf(cb, "<rpc-reply><rpc-error>"
-		"<error-tag>unknown-element</error-tag>"
 		"<error-type>%s</error-type>"
-		"<error-info>%s</error-info>"
+		"<error-tag>unknown-element</error-tag>"
+		"<error-info><bad-element>%s</bad-element></error-info>"
 		"<error-severity>error</error-severity>",
-		type, info) <0)
+		type, element) <0)
 	goto err;
     if (message){
 	if (xml_chardata_encode(&encstr, "%s", message) < 0)
@@ -452,8 +452,8 @@ netconf_unknown_namespace(cbuf *cb,
     char *encstr = NULL;
 
     if (cprintf(cb, "<rpc-reply><rpc-error>"
-		"<error-tag>unknown-namespace</error-tag>"
 		"<error-type>%s</error-type>"
+		"<error-tag>unknown-namespace</error-tag>"
 		"<error-info>%s</error-info>"
 		"<error-severity>error</error-severity>",
 		type, info) <0)
@@ -478,7 +478,8 @@ netconf_unknown_namespace(cbuf *cb,
 
 /*! Create Netconf access-denied error XML tree according to RFC 6241 App A
  *
- * An expected element is missing.
+ * Access to the requested protocol operation or data model is denied because 
+ * authorization failed.
  * @param[out] cb      CLIgen buf. Error XML is written in this buffer
  * @param[in]  type    Error type: "application" or "protocol"
  * @param[in]  message Error message
@@ -492,8 +493,8 @@ netconf_access_denied(cbuf *cb,
     char *encstr = NULL;
     
     if (cprintf(cb, "<rpc-reply><rpc-error>"
-		"<error-tag>access-denied</error-tag>"
 		"<error-type>%s</error-type>"
+		"<error-tag>access-denied</error-tag>"
 		"<error-severity>error</error-severity>",
 		type) <0)
 	goto err;
@@ -517,7 +518,8 @@ netconf_access_denied(cbuf *cb,
 
 /*! Create Netconf access-denied error XML tree according to RFC 6241 App A
  *
- * An expected element is missing.
+ * Access to the requested protocol operation or data model is denied because
+ * authorization failed.
  * @param[out] xret    Error XML tree 
  * @param[in]  type    Error type: "application" or "protocol"
  * @param[in]  message Error message
@@ -538,8 +540,8 @@ netconf_access_denied_xml(cxobj **xret,
 	goto done;
     if ((xerr = xml_new("rpc-error", *xret, NULL)) == NULL)
 	goto done;
-    if (xml_parse_va(&xerr, NULL, "<error-tag>access-denied</error-tag>"
-		     "<error-type>%s</error-type>"
+    if (xml_parse_va(&xerr, NULL, "<error-type>%s</error-type>"
+		     "<error-tag>access-denied</error-tag>"
 		     "<error-severity>error</error-severity>", type) < 0)
 	goto done;
     if (message && xml_parse_va(&xerr, NULL, "<error-message>%s</error-message>",
@@ -567,8 +569,8 @@ netconf_lock_denied(cbuf *cb,
     char *encstr = NULL;
 
     if (cprintf(cb, "<rpc-reply><rpc-error>"
-		"<error-tag>lock-denied</error-tag>"
 		"<error-type>protocol</error-type>"
+		"<error-tag>lock-denied</error-tag>"
 		"<error-info>%s</error-info>"
 		"<error-severity>error</error-severity>",
 		info) <0)
@@ -593,7 +595,7 @@ netconf_lock_denied(cbuf *cb,
 
 /*! Create Netconf resource-denied error XML tree according to RFC 6241 App A
  *
- * An expected element is missing.
+ * Request could not be completed because of insufficient resources.
  * @param[out] cb      CLIgen buf. Error XML is written in this buffer
  * @param[in]  type    Error type: "transport, "rpc", "application", "protocol"
  * @param[in]  message Error message
@@ -607,8 +609,8 @@ netconf_resource_denied(cbuf *cb,
     char *encstr = NULL;
     
     if (cprintf(cb, "<rpc-reply><rpc-error>"
-		"<error-tag>resource-denied</error-tag>"
 		"<error-type>%s</error-type>"
+		"<error-tag>resource-denied</error-tag>"
 		"<error-severity>error</error-severity>",
 		type) <0)
 	goto err;
@@ -647,8 +649,8 @@ netconf_rollback_failed(cbuf *cb,
     char *encstr = NULL;
 
     if (cprintf(cb, "<rpc-reply><rpc-error>"
-		"<error-tag>rollback-failed</error-tag>"
 		"<error-type>%s</error-type>"
+		"<error-tag>rollback-failed</error-tag>"
 		"<error-severity>error</error-severity>",
 		type) <0)
 	goto err;
@@ -686,8 +688,8 @@ netconf_data_exists(cbuf      *cb,
     char *encstr = NULL;
 
     if (cprintf(cb, "<rpc-reply><rpc-error>"
-		"<error-tag>data-exists</error-tag>"
 		"<error-type>application</error-type>"
+		"<error-tag>data-exists</error-tag>"
 		"<error-severity>error</error-severity>") <0)
 	goto err;
     if (message){
@@ -724,8 +726,8 @@ netconf_data_missing(cbuf *cb,
     char *encstr = NULL;
 
     if (cprintf(cb, "<rpc-reply><rpc-error>"
-		"<error-tag>data-missing</error-tag>"
 		"<error-type>application</error-type>"
+		"<error-tag>data-missing</error-tag>"
 		"<error-severity>error</error-severity>") <0)
 	goto err;
     if (message){
@@ -763,8 +765,8 @@ netconf_operation_not_supported(cbuf *cb,
     char *encstr = NULL;
 
     if (cprintf(cb, "<rpc-reply><rpc-error>"
-		"<error-tag>operation-not-supported</error-tag>"
 		"<error-type>%s</error-type>"
+		"<error-tag>operation-not-supported</error-tag>"
 		"<error-severity>error</error-severity>",
 		type) <0)
 	goto err;
@@ -803,8 +805,8 @@ netconf_operation_failed(cbuf  *cb,
     char *encstr = NULL;
 
     if (cprintf(cb, "<rpc-reply><rpc-error>"
-		"<error-tag>operation-failed</error-tag>"
 		"<error-type>%s</error-type>"
+		"<error-tag>operation-failed</error-tag>"
 		"<error-severity>error</error-severity>",
 		type) <0)
 	goto err;
@@ -850,8 +852,8 @@ netconf_operation_failed_xml(cxobj **xret,
 	goto done;
     if ((xerr = xml_new("rpc-error", *xret, NULL)) == NULL)
 	goto done;
-    if (xml_parse_va(&xerr, NULL, "<error-tag>operation-failed</error-tag>"
-		     "<error-type>%s</error-type>"
+    if (xml_parse_va(&xerr, NULL, "<error-type>%s</error-type>"
+		     "<error-tag>operation-failed</error-tag>"
 		     "<error-severity>error</error-severity>", type) < 0)
 	goto done;
     if (message && xml_parse_va(&xerr, NULL, "<error-message>%s</error-message>",
@@ -879,8 +881,8 @@ netconf_malformed_message(cbuf  *cb,
     char *encstr = NULL;
 
     if (cprintf(cb, "<rpc-reply><rpc-error>"
-		"<error-tag>malformed-message</error-tag>"
 		"<error-type>rpc</error-type>"
+		"<error-tag>malformed-message</error-tag>"
 		"<error-severity>error</error-severity>") <0)
 	goto err;
     if (message){
@@ -925,8 +927,8 @@ netconf_malformed_message_xml(cxobj **xret,
 	goto done;
     if ((xerr = xml_new("rpc-error", *xret, NULL)) == NULL)
 	goto done;
-    if (xml_parse_va(&xerr, NULL, "<error-tag>malformed-message</error-tag>"
-		     "<error-type>rpc</error-type>"
+    if (xml_parse_va(&xerr, NULL, "<error-type>rpc</error-type>"
+		     "<error-tag>malformed-message</error-tag>"
 		     "<error-severity>error</error-severity>") < 0)
 	goto done;
     if (message && xml_parse_va(&xerr, NULL, "<error-message>%s</error-message>",
@@ -990,7 +992,6 @@ netconf_module_load(clicon_handle h)
 	clicon_err(OE_CFG, ENOENT, "Clicon configuration not loaded");
 	goto done; 
     }
-    
     /* Enable features (hardcoded here) */
     if (xml_parse_string("<CLICON_FEATURE>ietf-netconf:candidate</CLICON_FEATURE>", yspec, &xc) < 0)
 	goto done;
diff --git a/lib/src/clixon_options.c b/lib/src/clixon_options.c
index 873d3aaf..45c3948b 100644
--- a/lib/src/clixon_options.c
+++ b/lib/src/clixon_options.c
@@ -136,6 +136,8 @@ parse_configfile(clicon_handle  h,
     char       *name;
     char       *body;
     clicon_hash_t *copt = clicon_options(h);
+    cbuf       *cbret = NULL;
+    int         ret;
 
     if (filename == NULL || !strlen(filename)){
 	clicon_err(OE_UNIX, 0, "Not specified");
@@ -167,8 +169,16 @@ parse_configfile(clicon_handle  h,
     }
     if (xml_apply0(xc, CX_ELMNT, xml_default, yspec) < 0)
 	goto done;	
-    if (xml_apply0(xc, CX_ELMNT, xml_yang_validate_add, NULL) < 0)
+    if ((cbret = cbuf_new()) == NULL){
+	clicon_err(OE_XML, errno, "cbuf_new");
 	goto done;	
+    }
+    if ((ret = xml_yang_validate_add(xc, cbret)) < 0)
+	goto done;
+    if (ret == 0){
+	clicon_err(OE_CFG, 0, "Config file validation: %s", cbuf_get(cbret));
+	goto done;
+    }
     while ((x = xml_child_each(xc, x, CX_ELMNT)) != NULL) {
 	name = xml_name(x);
 	body = xml_body(x);
diff --git a/lib/src/clixon_proto_client.c b/lib/src/clixon_proto_client.c
index 0cf421d2..aa3ac4ac 100644
--- a/lib/src/clixon_proto_client.c
+++ b/lib/src/clixon_proto_client.c
@@ -444,7 +444,7 @@ clicon_rpc_delete_config(clicon_handle h,
     char              *username;
 
     username = clicon_username_get(h);
-    if ((msg = clicon_msg_encode("<rpc username=\"%s\"><delete-config><target><%s/></target></delete-config></rpc>",
+    if ((msg = clicon_msg_encode("<rpc username=\"%s\"><edit-config><target><%s/></target><default-operation>none</default-operation><config operation=\"delete\"/></edit-config></rpc>",
 				 username?username:"", db)) == NULL)
 	goto done;
     if (clicon_rpc_msg(h, msg, &xret, NULL) < 0)
diff --git a/lib/src/clixon_xml.c b/lib/src/clixon_xml.c
index 24bab41b..59292ba9 100644
--- a/lib/src/clixon_xml.c
+++ b/lib/src/clixon_xml.c
@@ -196,10 +196,9 @@ xml_name_set(cxobj *xn,
 /*! Get namespace of xnode
  * @param[in]  xn    xml node
  * @retval     namespace of xml node
- * XXX change to xml_localname
  */
 char*
-xml_namespace(cxobj *xn)
+xml_prefix(cxobj *xn)
 {
     return xn->x_prefix;
 }
@@ -209,11 +208,10 @@ xml_namespace(cxobj *xn)
  * @param[in]  localname  new namespace, null-terminated string, copied by function
  * @retval     -1         on error with clicon-err set
  * @retval     0          OK
- * XXX change to xml_localname_set
  */
 int
-xml_namespace_set(cxobj *xn, 
-		  char  *localname)
+xml_prefix_set(cxobj *xn, 
+	       char  *localname)
 {
     if (xn->x_prefix){
 	free(xn->x_prefix);
@@ -288,7 +286,7 @@ xmlns_check(cxobj *xn,
     char  *xns;
     
     while ((x = xml_child_each(xn, x, CX_ATTR)) != NULL) 
-	if ((xns = xml_namespace(x)) && strcmp(xns, "xmlns")==0 &&
+	if ((xns = xml_prefix(x)) && strcmp(xns, "xmlns")==0 &&
 	    strcmp(xml_name(x), nsn) == 0)
 	    return xml_value(x);
     return NULL;
@@ -311,7 +309,7 @@ xml_localname_check(cxobj *xn,
     yang_stmt *ys = xml_spec(xn);
     
     /* No namespace name - comply */
-    if ((nsn = xml_namespace(xn)) == NULL)
+    if ((nsn = xml_prefix(xn)) == NULL)
 	return 0;
     /* Check if NSN defined in same node */
     if (xmlns_check(xn, nsn) != NULL)
@@ -965,7 +963,7 @@ xml_find_type_value(cxobj           *xt,
     char  *xprefix;     /* xprefix */
     
     while ((x = xml_child_each(xt, x, type)) != NULL) {
-	xprefix = xml_namespace(x);
+	xprefix = xml_prefix(x);
 	if (prefix)
 	    pmatch = xprefix?strcmp(prefix,xprefix)==0:0;
 	else
@@ -1121,7 +1119,7 @@ clicon_xml2file(FILE  *f,
     if (x == NULL)
 	goto ok;
     name = xml_name(x);
-    namespace = xml_namespace(x);
+    namespace = xml_prefix(x);
     switch(xml_type(x)){
     case CX_BODY:
 	if ((val = xml_value(x)) == NULL) /* incomplete tree */
@@ -1246,7 +1244,7 @@ clicon_xml2cbuf(cbuf  *cb,
     char  *val;
     
     name = xml_name(x);
-    namespace = xml_namespace(x);
+    namespace = xml_prefix(x);
     switch(xml_type(x)){
     case CX_BODY:
 	if ((val = xml_value(x)) == NULL) /* incomplete tree */
@@ -1333,10 +1331,10 @@ xmltree2cbuf(cbuf  *cb,
 	cprintf(cb, " ");
     if (xml_type(x) != CX_BODY)
 	cprintf(cb, "%s", xml_type2str(xml_type(x)));
-    if (xml_namespace(x)==NULL)
+    if (xml_prefix(x)==NULL)
 	cprintf(cb, " %s", xml_name(x));
     else
-	cprintf(cb, " %s:%s", xml_namespace(x), xml_name(x));
+	cprintf(cb, " %s:%s", xml_prefix(x), xml_name(x));
     if (xml_value(x))
 	cprintf(cb, " value:\"%s\"", xml_value(x));
     if (x->x_flags)
@@ -1612,8 +1610,8 @@ xml_copy_one(cxobj *x0,
     if ((s = xml_name(x0))) /* malloced string */
 	if ((xml_name_set(x1, s)) < 0)
 	    return -1;
-    if ((s = xml_namespace(x0))) /* malloced string */
-	if ((xml_namespace_set(x1, s)) < 0)
+    if ((s = xml_prefix(x0))) /* malloced string */
+	if ((xml_prefix_set(x1, s)) < 0)
 	    return -1;
     return 0;
 }
diff --git a/lib/src/clixon_xml_map.c b/lib/src/clixon_xml_map.c
index 6794b503..2263bde2 100644
--- a/lib/src/clixon_xml_map.c
+++ b/lib/src/clixon_xml_map.c
@@ -87,6 +87,7 @@
 #include "clixon_xpath.h"
 #include "clixon_log.h"
 #include "clixon_err.h"
+#include "clixon_netconf_lib.h"
 #include "clixon_xml_sort.h"
 #include "clixon_xml_map.h"
 
@@ -230,10 +231,15 @@ xml2cli(FILE              *f,
 /*! Validate xml node of type leafref, ensure the value is one of that path's reference
  * @param[in]  xt    XML leaf node of type leafref
  * @param[in]  ytype Yang type statement belonging to the XML node
+ * @param[out] cbret Error buffer
+ * @retval     1     Validation OK
+ * @retval     0     Validation failed
+ * @retval    -1     Error
  */
 static int
 validate_leafref(cxobj     *xt,
-		 yang_stmt *ytype)
+		 yang_stmt *ytype,
+		 cbuf      *cbret)
 {
     int          retval = -1;
     yang_stmt   *ypath;
@@ -247,8 +253,9 @@ validate_leafref(cxobj     *xt,
     if ((leafrefbody = xml_body(xt)) == NULL)
 	goto ok;
     if ((ypath = yang_find((yang_node*)ytype, Y_PATH, NULL)) == NULL){
-	clicon_err(OE_DB, 0, "Leafref %s requires path statement", ytype->ys_argument);
-	goto done;
+	if (netconf_missing_element(cbret, "application", ytype->ys_argument, "Leafref requires path statement") < 0)
+	    goto done;
+	goto fail;
     }
     if (xpath_vec(xt, "%s", &xvec, &xlen, ypath->ys_argument) < 0) 
 	goto done;
@@ -260,9 +267,9 @@ validate_leafref(cxobj     *xt,
 	    break;
     }
     if (i==xlen){
-	clicon_err(OE_DB, 0, "Leafref validation failed, no such leaf: %s",
-		   leafrefbody);
-	goto done;
+	if (netconf_bad_element(cbret, "application", leafrefbody, "Leafref validation failed: No such leaf") < 0)
+	    goto done;
+	goto fail;
     }
  ok:
     retval = 0;
@@ -270,6 +277,9 @@ validate_leafref(cxobj     *xt,
     if (xvec)
 	free(xvec);
     return retval;
+ fail:
+    retval = 0;
+    goto done;
 }
 
 /*! Validate xml node of type identityref, ensure value is a defined identity
@@ -285,14 +295,18 @@ validate_leafref(cxobj     *xt,
  * @param[in]  xt    XML leaf node of type identityref
  * @param[in]  ys    Yang spec of leaf
  * @param[in]  ytype Yang type field of type identityref
+ * @param[out] cbret Error buffer
+ * @retval     1     Validation OK
+ * @retval     0     Validation failed
+ * @retval    -1     Error
  * @see ys_populate_identity where the derived types are set
  * @see RFC7950 Sec 9.10.2:
-
  */
 static int
 validate_identityref(cxobj     *xt,
 		     yang_stmt *ys,
-		     yang_stmt *ytype)
+		     yang_stmt *ytype,
+		     cbuf      *cbret)
 {
     int         retval = -1;
     char       *node;
@@ -305,37 +319,46 @@ validate_identityref(cxobj     *xt,
      * Always add default prefix because derived identifiers are stored with
      * prefixes in the base identifiers derived-list.
      */
+    if ((cb = cbuf_new()) == NULL){
+	clicon_err(OE_UNIX, errno, "cbuf_new"); 
+	goto done;
+    }
     if ((node = xml_body(xt)) == NULL)
 	return 0;
     if (strchr(node, ':') == NULL){
 	prefix = yang_find_myprefix(ys);
-	if ((cb = cbuf_new()) == NULL){
-	    clicon_err(OE_UNIX, errno, "cbuf_new"); 
-	    goto done;
-	}
 	cprintf(cb, "%s:%s", prefix, node);
 	node = cbuf_get(cb);
     }
     /* This is the type's base reference */
     if ((ybaseref = yang_find((yang_node*)ytype, Y_BASE, NULL)) == NULL){
-	clicon_err(OE_DB, 0, "Identityref validation failed, no base");
-	goto done;
+	if (netconf_missing_element(cbret, "application", ytype->ys_argument, "Identityref validation failed, no base") < 0)
+	    goto done;
+	goto fail;
     }
     /* This is the actual base identity */
     if ((ybaseid = yang_find_identity(ybaseref, ybaseref->ys_argument)) == NULL){
-	clicon_err(OE_DB, 0, "Identityref validation failed, no base identity");
-	goto done;
+	if (netconf_missing_element(cbret, "application", ybaseref->ys_argument, "Identityref validation failed, no base identity") < 0)
+	    goto done;
+	goto fail;
     }
     /* Here check if node is in the derived node list of the base identity */
     if (cvec_find(ybaseid->ys_cvec, node) == NULL){
-	clicon_err(OE_DB, 0, "Identityref validation failed, %s not derived from %s", node, ybaseid->ys_argument);
-	goto done;
+	cbuf_reset(cb);
+	cprintf(cb, "Identityref validation failed, %s not derived from %s", 
+		node, ybaseid->ys_argument);
+	if (netconf_operation_failed(cbret, "application", cbuf_get(cb)) < 0)
+	    goto done;
+	goto fail;
     }
-    retval = 0;
+    retval = 1;
  done:
     if (cb)
 	cbuf_free(cb);
     return retval;
+ fail:
+    retval = 0;
+    goto done;
 }
 
 /*! Validate an RPC node
@@ -377,24 +400,33 @@ validate_identityref(cxobj     *xt,
  * the same order as they are defined within the "output" statement.
  */
 int
-xml_yang_validate_rpc(cxobj *xrpc)
+xml_yang_validate_rpc(cxobj *xrpc,
+		      cbuf  *cbret)
 {
     int        retval = -1;
     yang_stmt *yn=NULL;  /* rpc name */
     cxobj     *xn;       /* rpc name */
-    yang_stmt *yi=NULL;  /* input name */
-    cxobj     *xi;       /* input name */
+    int        ret;
     
-    assert(strcmp(xml_name(xrpc), "rpc")==0);
+    if (strcmp(xml_name(xrpc), "rpc")){
+	clicon_err(OE_XML, EINVAL, "Expected RPC");
+	goto done;
+    }
     xn = NULL;
+    /* xn is name of rpc, ie <rcp><xn/></rpc> */
     while ((xn = xml_child_each(xrpc, xn, CX_ELMNT)) != NULL) {
 	if ((yn = xml_spec(xn)) == NULL)
 	    goto fail;
-	xi = NULL;
-	while ((xi = xml_child_each(xn, xi, CX_ELMNT)) != NULL) {
-	    if ((yi = xml_spec(xi)) == NULL)
-		goto fail;
-	}
+	if ((ret = xml_yang_validate_all(xn, cbret)) < 0)
+	    goto fail;
+	if (ret == 0)
+	    goto fail;
+	if ((ret = xml_yang_validate_add(xn, cbret)) < 0)
+	    goto fail;
+	if (ret == 0)
+	    goto fail;
+	if (xml_apply0(xn, CX_ELMNT, xml_default, NULL) < 0)
+	    goto done;
     }
     // ok: /* pass validation */
     retval = 1;
@@ -408,14 +440,24 @@ xml_yang_validate_rpc(cxobj *xrpc)
 /*! Validate a single XML node with yang specification for added entry
  * 1. Check if mandatory leafs present as subs.
  * 2. Check leaf values, eg int ranges and string regexps.
- * @param[in]  xt  XML node to be validated
- * @retval     0   Valid OK
- * @retval    -1   Validation failed
+ * @param[in]  xt    XML node to be validated
+ * @param[out] cbret Error buffer
+ * @retval     1     Validation OK
+ * @retval     0     Validation failed
+ * @retval    -1     Error
+ * @code
+ *   cxobj *x;
+ *   cbuf *cbret = cbuf_new();
+ *   if ((ret = xml_yang_validate_add(x, cbret)) < 0)
+ *      err;
+ *   if (ret == 0)
+ *      fail;
+ * @endcode
  * @see xml_yang_validate_all
  */
 int
 xml_yang_validate_add(cxobj   *xt, 
-		      void    *arg)
+		      cbuf    *cbret)
 {
     int        retval = -1;
     cg_var    *cv = NULL;
@@ -424,11 +466,14 @@ xml_yang_validate_add(cxobj   *xt,
     int        i;
     yang_stmt *ys;
     char      *body;
+    int        ret;
+    cxobj     *x;
     
     /* if not given by argument (overide) use default link 
        and !Node has a config sub-statement and it is false */
     if ((ys = xml_spec(xt)) != NULL && yang_config(ys) != 0){
 	switch (ys->ys_keyword){
+	case Y_RPC:
 	case Y_INPUT:
 	case Y_LIST:
 	    /* fall thru */
@@ -440,9 +485,9 @@ xml_yang_validate_add(cxobj   *xt,
 		if (yang_config(yc)==0)
 		    continue;
 		if (yang_mandatory(yc) && xml_find(xt, yc->ys_argument)==NULL){
-		    clicon_err(OE_CFG, 0,"Missing mandatory variable: %s",
-			       yc->ys_argument);
-		    goto done;
+		    if (netconf_missing_element(cbret, "application", yc->ys_argument, "Mandatory variable") < 0)
+			goto done;
+		    goto fail;
 		}
 	    }
 	    break;
@@ -463,12 +508,11 @@ xml_yang_validate_add(cxobj   *xt,
 		    goto done;
 		}
 		if ((ys_cv_validate(cv, ys, &reason)) != 1){
-		    clicon_err(OE_DB, 0,
-			       "validation of %s failed %s",
-			       ys->ys_argument, reason?reason:"");
+		    if (netconf_bad_element(cbret, "application",  ys->ys_argument, reason) < 0)
+			goto done;
 		    if (reason)
 			free(reason);
-		    goto done;
+		    goto fail;
 		}
 	    }
 	    break;
@@ -476,28 +520,43 @@ xml_yang_validate_add(cxobj   *xt,
 	    break;
 	}
     }
-    retval = 0;
+    x = NULL;
+    while ((x = xml_child_each(xt, x, CX_ELMNT)) != NULL) {
+	if ((ret = xml_yang_validate_add(x, cbret)) < 0)
+	    goto done;
+	if (ret == 0)
+	    goto fail;
+    }
+    retval = 1;
  done:
     if (cv)
 	cv_free(cv);
     return retval;
+ fail:
+    retval = 0;
+    goto done;
 }
 
 /*! Validate a single XML node with yang specification for all (not only added) entries
  * 1. Check leafrefs. Eg you delete a leaf and a leafref references it.
  * @param[in]  xt  XML node to be validated
- * @param[in]  arg Not used
- * @retval    -1   Validation failed
- * @retval     0   Validation OK
+ * @param[out] cbret Error buffer
+ * @retval     1     Validation OK
+ * @retval     0     Validation failed
+ * @retval    -1     Error
  * @see xml_yang_validate_add
  * @code
- *   if (xml_apply(x, CX_ELMNT, (xml_applyfn_t*)xml_yang_validate_all, 0) < 0)
+ *   cxobj *x;
+ *   cbuf *cbret = cbuf_new();
+ *   if ((ret = xml_yang_validate_all(x, cbret)) < 0)
  *      err;
+ *   if (ret == 0)
+ *      fail;
  * @endcode
  */
 int
 xml_yang_validate_all(cxobj   *xt, 
-		      void    *arg)
+		      cbuf    *cbret)
 {
     int        retval = -1;
     yang_stmt *ys;  /* yang node */
@@ -505,13 +564,24 @@ xml_yang_validate_all(cxobj   *xt,
     yang_stmt *ye;  /* yang must error-message */
     char      *xpath;
     int        nr;
-    
+    int        ret;
+    cxobj     *x;
+
     /* if not given by argument (overide) use default link 
        and !Node has a config sub-statement and it is false */
-    if ((ys = xml_spec(xt)) != NULL &&
-	yang_config(ys) != 0){
+    ys=xml_spec(xt);
+    if (ys==NULL){
+	if (netconf_unknown_element(cbret, "application", xml_name(xt), NULL) < 0)
+	    goto done;
+	goto fail;
+    }
+    if (ys != NULL && yang_config(ys) != 0){
 	/* Node-specific validation */
 	switch (ys->ys_keyword){
+	case Y_ANYXML:
+	case Y_ANYDATA:
+	    goto ok;
+	    break;
 	case Y_LEAF:
 	    /* fall thru */
 	case Y_LEAF_LIST:
@@ -520,11 +590,11 @@ xml_yang_validate_all(cxobj   *xt,
  	    */
 	    if ((yc = yang_find((yang_node*)ys, Y_TYPE, NULL)) != NULL){
 		if (strcmp(yc->ys_argument, "leafref") == 0){
-		    if (validate_leafref(xt, yc) < 0)
+		    if (validate_leafref(xt, yc, cbret) < 0)
 			goto done;
 		}
 		else if (strcmp(yc->ys_argument, "identityref") == 0){
-		    if (validate_identityref(xt, ys, yc) < 0)
+		    if (validate_identityref(xt, ys, yc, cbret) < 0)
 			goto done;
 		}
 	    }
@@ -568,11 +638,11 @@ xml_yang_validate_all(cxobj   *xt,
 	    if ((nr = xpath_vec_bool(xt, "%s", xpath)) < 0)
 		goto done;
 	    if (!nr){
-		if ((ye = yang_find((yang_node*)yc, Y_ERROR_MESSAGE, NULL)) != NULL)
-		    clicon_err(OE_DB, 0, "%s", ye->ys_argument);
-		else
-		    clicon_err(OE_DB, 0, "xpath %s validation failed", xml_name(xt));
-		goto done;
+		ye = yang_find((yang_node*)yc, Y_ERROR_MESSAGE, NULL);
+		if (netconf_operation_failed(cbret, "application",
+					     ye?ye->ys_argument:"must xpath validation failed") < 0)
+		    goto done;
+		goto fail;
 	    }
 	}
 	/* "when" sub-node RFC 7950 Sec 7.21.5. Can only be one. */
@@ -581,14 +651,42 @@ xml_yang_validate_all(cxobj   *xt,
 	    if ((nr = xpath_vec_bool(xt, "%s", xpath)) < 0)
 		goto done;
 	    if (!nr){
-		clicon_err(OE_DB, 0, "xpath %s validation failed", xml_name(xt));
-		goto done;
+		if (netconf_operation_failed(cbret, "application",
+					     "when xpath validation failed") < 0)
+		    goto done;
+		goto fail;
 	    }
 	}
     }
-    retval = 0;
+    x = NULL;
+    while ((x = xml_child_each(xt, x, CX_ELMNT)) != NULL) {
+	if ((ret = xml_yang_validate_all(x, cbret)) < 0)
+	    goto done;
+	if (ret == 0)
+	    goto fail;
+    }
+ ok:
+    retval = 1;
  done:
     return retval;
+ fail:
+    retval = 0;
+    goto done;
+}
+
+int
+xml_yang_validate_all_top(cxobj   *xt, 
+			  cbuf    *cbret)
+{
+    int    ret;
+    cxobj *x;
+    
+    x = NULL;
+    while ((x = xml_child_each(xt, x, CX_ELMNT)) != NULL) {
+	if ((ret = xml_yang_validate_all(x, cbret)) < 1)
+	    return ret;
+    }
+    return 1;
 }
 
 /*! Translate a single xml node to a cligen variable vector. Note not recursive 
@@ -1310,6 +1408,11 @@ xml_tree_prune_flagged(cxobj *xt,
 
 /*! Add default values (if not set)
  * @param[in]   xt      XML tree with some node marked
+ * @param[in]   arg     Ignored
+ * Typically called in a recursive apply function:
+ * @code
+ *   xml_apply(xt, CX_ELMNT, xml_default, NULL);
+ * @endcode
  */
 int
 xml_default(cxobj *xt, 
@@ -1328,7 +1431,8 @@ xml_default(cxobj *xt,
 	goto done;
     }
     /* Check leaf defaults */
-    if (ys->ys_keyword == Y_CONTAINER || ys->ys_keyword == Y_LIST){
+    if (ys->ys_keyword == Y_CONTAINER || ys->ys_keyword == Y_LIST ||
+	ys->ys_keyword == Y_INPUT){
 	for (i=0; i<ys->ys_len; i++){
 	    y = ys->ys_stmt[i];
 	    if (y->ys_keyword != Y_LEAF)
@@ -1493,9 +1597,9 @@ xml_spec_populate_rpc(clicon_handle h,
     yang_stmt *y=NULL;    /* yang node */
     yang_stmt *ymod=NULL; /* yang module */
     yang_stmt *yi = NULL; /* input */
-    yang_stmt *ya = NULL; /* arg */
+    //    yang_stmt *ya = NULL; /* arg */
     cxobj     *x;
-    cxobj     *xi;
+    //    cxobj     *xi;
     int        i;
     
     if ((strcmp(xml_name(xrpc), "rpc"))!=0){
@@ -1521,11 +1625,18 @@ xml_spec_populate_rpc(clicon_handle h,
 	if (y){
 	    xml_spec_set(x, y);
 	    if ((yi = yang_find((yang_node*)y, Y_INPUT, NULL)) != NULL){
+		/* kludge rpc -> input */
+		xml_spec_set(x, yi); 
+#if 1
+		if (xml_apply(x, CX_ELMNT, xml_spec_populate, yspec) < 0)
+		    goto done;
+#else
 		xi = NULL;
 		while ((xi = xml_child_each(x, xi, CX_ELMNT)) != NULL) {
 		    if ((ya = yang_find_datanode((yang_node*)yi, xml_name(xi))) != NULL)
 			xml_spec_set(xi, ya);
-		}		
+		}
+#endif		
 	    }
 	}
     }
diff --git a/lib/src/clixon_xml_parse.y b/lib/src/clixon_xml_parse.y
index 7072ed01..7600d249 100644
--- a/lib/src/clixon_xml_parse.y
+++ b/lib/src/clixon_xml_parse.y
@@ -172,7 +172,7 @@ xml_parse_prefixed_name(struct xml_parse_yacc_arg *ya,
 	goto done;
     if ((x = xml_new(name, xp, y)) == NULL) 
 	goto done;
-    if (xml_namespace_set(x, prefix) < 0)
+    if (xml_prefix_set(x, prefix) < 0)
 	goto done;
     ya->ya_xelement = x;
     retval = 0;
@@ -223,9 +223,9 @@ xml_parse_bslash1(struct xml_parse_yacc_arg *ya,
 		xml_name(x), name);
 	goto done;
     }
-    if (xml_namespace(x)!=NULL){
+    if (xml_prefix(x)!=NULL){
 	clicon_err(OE_XML, 0, "XML parse sanity check failed: %s:%s vs %s", 
-		xml_namespace(x), xml_name(x), name);
+		xml_prefix(x), xml_name(x), name);
 	goto done;
     }
     /* Strip pretty-print. Ad-hoc algorithm
@@ -263,16 +263,16 @@ xml_parse_bslash2(struct xml_parse_yacc_arg *ya,
 
     if (strcmp(xml_name(x), name)){
 	clicon_err(OE_XML, 0, "Sanity check failed: %s:%s vs %s:%s", 
-		xml_namespace(x), 
+		xml_prefix(x), 
 		xml_name(x), 
 		namespace, 
 		name);
 	goto done;
     }
-    if (xml_namespace(x)==NULL ||
-	strcmp(xml_namespace(x), namespace)){
+    if (xml_prefix(x)==NULL ||
+	strcmp(xml_prefix(x), namespace)){
 	clicon_err(OE_XML, 0, "Sanity check failed: %s:%s vs %s:%s", 
-		xml_namespace(x), 
+		xml_prefix(x), 
 		xml_name(x), 
 		namespace, 
 		name);
@@ -324,7 +324,7 @@ xml_parse_attr(struct xml_parse_yacc_arg *ya,
     if ((xa = xml_new(name, ya->ya_xelement, NULL)) == NULL)
 	goto done;
     xml_type_set(xa, CX_ATTR);
-    if (prefix && xml_namespace_set(xa, prefix) < 0)
+    if (prefix && xml_prefix_set(xa, prefix) < 0)
 	goto done;
     if (xml_value_set(xa, attval) < 0)
 	goto done;
diff --git a/lib/src/clixon_xml_sort.c b/lib/src/clixon_xml_sort.c
index 7e68d2b8..befb5bcb 100644
--- a/lib/src/clixon_xml_sort.c
+++ b/lib/src/clixon_xml_sort.c
@@ -118,6 +118,9 @@ xml_child_spec(char       *name,
     }
     else
 	y = NULL;
+    /* kludge rpc -> input */
+    if (y && y->ys_keyword == Y_RPC && yang_find((yang_node*)y, Y_INPUT, NULL))
+	y = yang_find((yang_node*)y, Y_INPUT, NULL);
     *yresult = y;
     retval = 0;
  done:
diff --git a/lib/src/clixon_yang.c b/lib/src/clixon_yang.c
index 8b9af6d0..68c9ce9f 100644
--- a/lib/src/clixon_yang.c
+++ b/lib/src/clixon_yang.c
@@ -862,7 +862,7 @@ ys_module_by_xml(yang_spec  *ysp,
 
     if (ymodp)
 	*ymodp = NULL;
-    prefix = xml_namespace(xt);
+    prefix = xml_prefix(xt);
     if (prefix){
 	/* Get namespace for prefix */
 	if (xml2ns(xt, prefix, &namespace) < 0)
diff --git a/test/test_cli.sh b/test/test_cli.sh
index 3bf4af77..aa1379d9 100755
--- a/test/test_cli.sh
+++ b/test/test_cli.sh
@@ -13,8 +13,10 @@ APPNAME=example
 . ./lib.sh
 cfg=$dir/conf_yang.xml
 
+# Use yang in example
+
 cat <<EOF > $cfg
-<config xmlns="http://clicon.org">
+<config xmlns="urn:example:clixon">
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
@@ -115,7 +117,7 @@ expectfn "$clixon_cli -1 -f $cfg -l o debug level 0" 0 "^$"
 new "cli rpc"
 expectfn "$clixon_cli -1 -f $cfg -l o rpc ipv4" 0 "<address-family>ipv4</address-family>" "<next-hop-list>2.3.4.5</next-hop-list>"
 
-if [ $BE -ne 0 ]; then
+if [ $BE -eq 0 ]; then
     exit # BE
 fi
 
diff --git a/test/test_feature.sh b/test/test_feature.sh
index 4bbb334c..dfb99172 100755
--- a/test/test_feature.sh
+++ b/test/test_feature.sh
@@ -96,8 +96,7 @@ new "netconf validate enabled feature"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf disabled feature"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><A>foo</A></config></edit-config></rpc>]]>]]>" '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>application</error-type><error-severity>error</error-severity><error-message>Validation failed</error-message></rpc-error></rpc-reply>]]>]]>$'
-#expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><A>foo</A></config></edit-config></rpc>]]>]]>" '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>XML node config/A has no corresponding yang specification (Invalid XML or wrong Yang spec?'
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><A>foo</A></config></edit-config></rpc>]]>]]>" '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>Validation failed</error-message></rpc-error></rpc-reply>]]>]]>$'
 
 # This test has been broken up into all different modules instead of one large
 # reply since the modules change so often
@@ -162,7 +161,7 @@ if [ -z "$match" ]; then
       err "$expect" "$ret"
 fi
 
-if [ $BE -ne 0 ]; then
+if [ $BE -eq 0 ]; then
     exit # BE
 fi
 
diff --git a/test/test_identity.sh b/test/test_identity.sh
index 1acbc764..14d6b996 100755
--- a/test/test_identity.sh
+++ b/test/test_identity.sh
@@ -162,7 +162,7 @@ new "Set crypto to foo:bar"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><crypto>foo:bar</crypto></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf validate"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>application</error-type><error-severity>error</error-severity><error-message>Identityref validation failed, foo:bar not derived from crypto-alg</error-message></rpc-error></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>Identityref validation failed, foo:bar not derived from crypto-alg</error-message></rpc-error></rpc-reply>]]>]]>$"
 
 new "cli set crypto to mc:aes"
 expectfn "$clixon_cli -1 -f $cfg -y $fyang -l o set crypto mc:aes" 0 "^$"
@@ -182,7 +182,7 @@ expectfn "$clixon_cli -1 -f $cfg -y $fyang -l o set crypto des:des3" 0 "^$"
 new "cli validate"
 expectfn "$clixon_cli -1 -f $cfg -y $fyang -l o validate" 0 "^$"
 
-if [ $BE -ne 0 ]; then
+if [ $BE -eq 0 ]; then
     exit # BE
 fi
 
diff --git a/test/test_leafref.sh b/test/test_leafref.sh
index 72faaa4e..6e66c7f3 100755
--- a/test/test_leafref.sh
+++ b/test/test_leafref.sh
@@ -105,8 +105,8 @@ expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><get-config><source><candidate/></s
 new "leafref add wrong ref"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><default-address><absname>eth3</absname><address>10.0.4.6</address></default-address></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
-new "leafref validate XXX shouldnt really be operation-failed, more work in validate code"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag>"
+new "leafref validate"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>eth3</bad-element></error-info><error-severity>error</error-severity><error-message>Leafref validation failed: No such leaf</error-message></rpc-error></rpc-reply>]]>]]>$'
 
 new "leafref discard-changes"
 expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
@@ -126,7 +126,7 @@ new "leafref delete leaf"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><interfaces><interface operation=\"delete\"><name>eth0</name></interface></interfaces></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>"
 
 new "leafref validate (should fail)"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>"  "^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag>"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>"  '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>eth0</bad-element></error-info><error-severity>error</error-severity><error-message>Leafref validation failed: No such leaf</error-message></rpc-error></rpc-reply>]]>]]>$'
 
 new "leafref discard-changes"
 expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
@@ -143,7 +143,7 @@ expectfn "$clixon_cli -1f $cfg -y $fyang -l o set sender a" 0 "^$"
 new "cli sender template"
 expectfn "$clixon_cli -1f $cfg -y $fyang -l o set sender b template a" 0 "^$"
 
-if [ $BE -ne 0 ]; then
+if [ $BE -eq 0 ]; then
     exit # BE
 fi
 
diff --git a/test/test_list.sh b/test/test_list.sh
index 7e42a23b..37fb8c6c 100755
--- a/test/test_list.sh
+++ b/test/test_list.sh
@@ -125,7 +125,7 @@ new "minmax: validate should fail"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error/></rpc-reply>]]>]]>$"
 fi # NYI
 
-if [ $BE -ne 0 ]; then
+if [ $BE -eq 0 ]; then
     exit # BE
 fi
 
diff --git a/test/test_nacm.sh b/test/test_nacm.sh
index c22159c2..afd1c29d 100755
--- a/test/test_nacm.sh
+++ b/test/test_nacm.sh
@@ -141,10 +141,10 @@ new "commit it"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new2 "auth get (no user: access denied)"
-expecteq "$(curl -sS -X GET -H \"Accept:\ application/yang-data+json\" http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-tag": "access-denied","error-type": "protocol","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
+expecteq "$(curl -sS -X GET -H \"Accept:\ application/yang-data+json\" http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
 
 new2 "auth get (wrong passwd: access denied)"
-expecteq "$(curl -u andy:foo -sS -X GET http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-tag": "access-denied","error-type": "protocol","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
+expecteq "$(curl -u andy:foo -sS -X GET http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
 
 new2 "auth get (access)"
 expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/x)" '{"x": 0}
@@ -164,21 +164,21 @@ expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/x)" '{"x
 
'
 
 new2 "guest get nacm"
-expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-tag": "access-denied","error-type": "protocol","error-severity": "error","error-message": "access denied"}}}
'
+expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
 
 new "admin edit nacm"
 expecteq "$(curl -u andy:bar -sS -X PUT -d '{"x": 1}' http://localhost/restconf/data/x)" ""
 
 new2 "limited edit nacm"
-expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"x": 2}' http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-tag": "access-denied","error-type": "protocol","error-severity": "error","error-message": "default deny"}}}
'
+expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"x": 2}' http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
 new2 "guest edit nacm"
-expecteq "$(curl -u guest:bar -sS -X PUT -d '{"x": 3}' http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-tag": "access-denied","error-type": "protocol","error-severity": "error","error-message": "access denied"}}}
'
+expecteq "$(curl -u guest:bar -sS -X PUT -d '{"x": 3}' http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
 
 new "Kill restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"
 
-if [ $BE -ne 0 ]; then
+if [ $BE -eq 0 ]; then
     exit # BE
 fi
 
diff --git a/test/test_nacm_ext.sh b/test/test_nacm_ext.sh
index 1db3949f..2701b2da 100755
--- a/test/test_nacm_ext.sh
+++ b/test/test_nacm_ext.sh
@@ -170,10 +170,10 @@ new "Set x to 0"
 expecteq "$(curl -u andy:bar -sS -X PUT -d '{"x": 0}' http://localhost/restconf/data/x)" ""
 
 new2 "auth get (no user: access denied)"
-expecteq "$(curl -sS -X GET -H \"Accept:\ application/yang-data+json\" http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-tag": "access-denied","error-type": "protocol","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
+expecteq "$(curl -sS -X GET -H \"Accept:\ application/yang-data+json\" http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
 
 new2 "auth get (wrong passwd: access denied)"
-expecteq "$(curl -u andy:foo -sS -X GET http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-tag": "access-denied","error-type": "protocol","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
+expecteq "$(curl -u andy:foo -sS -X GET http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
 
 new2 "auth get (access)"
 expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/x)" '{"x": 0}
@@ -188,16 +188,16 @@ expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/x)" '{"x
 
'
 
 new2 "guest get nacm"
-expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-tag": "access-denied","error-type": "protocol","error-severity": "error","error-message": "access denied"}}}
'
+expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
 
 new "admin edit nacm"
 expecteq "$(curl -u andy:bar -sS -X PUT -d '{"x": 1}' http://localhost/restconf/data/x)" ""
 
 new2 "limited edit nacm"
-expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"x": 2}' http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-tag": "access-denied","error-type": "protocol","error-severity": "error","error-message": "default deny"}}}
'
+expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"x": 2}' http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
 new2 "guest edit nacm"
-expecteq "$(curl -u guest:bar -sS -X PUT -d '{"x": 3}' http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-tag": "access-denied","error-type": "protocol","error-severity": "error","error-message": "access denied"}}}
'
+expecteq "$(curl -u guest:bar -sS -X PUT -d '{"x": 3}' http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
 
 new "cli show conf as admin"
 expectfn "$clixon_cli -1 -U andy -l o -f $cfg -y $fyang show conf" 0 "^x 1;$"
@@ -220,7 +220,7 @@ expectfn "$clixon_cli -1 -U guest -l o -f $cfg -y $fyang rpc ipv4" 255 "protocol
 new "Kill restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"
 
-if [ $BE -ne 0 ]; then
+if [ $BE -eq 0 ]; then
     exit # BE
 fi
 
diff --git a/test/test_nacm_protocol.sh b/test/test_nacm_protocol.sh
index 2ab70b4b..aebaa843 100755
--- a/test/test_nacm_protocol.sh
+++ b/test/test_nacm_protocol.sh
@@ -147,7 +147,7 @@ sudo pkill -u www-data -f "/www-data/clixon_restconf"
 
 sleep 1
 new "start restconf daemon (-a is enable basic authentication)"
-sudo su -c "$clixon_restconf -f $cfg -y $fyang -D 1 -- -a" -s /bin/sh www-data &
+sudo su -c "$clixon_restconf -f $cfg -y $fyang -- -a" -s /bin/sh www-data &
 
 sleep $RCWAIT
 
@@ -166,20 +166,20 @@ expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/x)" '{"x"
 
 # Rule 1: deny-kill-session
 new "deny-kill-session: limited fail (netconf)"
-expecteof "$clixon_netconf -qf $cfg -y $fyang -U wilma" 0 "<rpc><kill-session><session-id>44</session-id></kill-session></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-tag>access-denied</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>access denied</error-message></rpc-error></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang -U wilma" 0 "<rpc><kill-session><session-id>44</session-id></kill-session></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-type>protocol</error-type><error-tag>access-denied</error-tag><error-severity>error</error-severity><error-message>access denied</error-message></rpc-error></rpc-reply>]]>]]>$"
 
 new "deny-kill-session: guest fail (netconf)"
-expecteof "$clixon_netconf -qf $cfg -y $fyang -U guest" 0 "<rpc><kill-session><session-id>44</session-id></kill-session></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-tag>access-denied</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>access denied</error-message></rpc-error></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang -U guest" 0 "<rpc><kill-session><session-id>44</session-id></kill-session></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-type>protocol</error-type><error-tag>access-denied</error-tag><error-severity>error</error-severity><error-message>access denied</error-message></rpc-error></rpc-reply>]]>]]>$"
 
 new "deny-kill-session: admin ok (netconf)"
 expecteof "$clixon_netconf -qf $cfg -y $fyang -U andy" 0 "<rpc><kill-session><session-id>44</session-id></kill-session></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 # Rule 2: deny-delete-config
 new "deny-delete-config: limited fail (netconf)"
-expecteof "$clixon_netconf -qf $cfg -y $fyang -U wilma" 0 "<rpc><delete-config><target><startup/></target></delete-config></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-tag>access-denied</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>access denied</error-message></rpc-error></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang -U wilma" 0 "<rpc><delete-config><target><startup/></target></delete-config></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-type>protocol</error-type><error-tag>access-denied</error-tag><error-severity>error</error-severity><error-message>access denied</error-message></rpc-error></rpc-reply>]]>]]>$"
 
 new2 "deny-delete-config: guest fail (restconf)"
-expecteq "$(curl -u guest:bar -sS -X DELETE http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-tag": "access-denied","error-type": "protocol","error-severity": "error","error-message": "default deny"}}}
'
+expecteq "$(curl -u guest:bar -sS -X DELETE http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
 # In restconf delete-config is translated to edit-config which is permitted
 new "deny-delete-config: limited fail (restconf) ok"
@@ -207,12 +207,12 @@ new "permit-edit-config: limited ok restconf"
 expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"x": 2}' http://localhost/restconf/data/x)" ''
 
 new2 "permit-edit-config: guest fail restconf"
-expecteq "$(curl -u guest:bar -sS -X PUT -d '{"x": 2}' http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-tag": "access-denied","error-type": "protocol","error-severity": "error","error-message": "default deny"}}}
'
+expecteq "$(curl -u guest:bar -sS -X PUT -d '{"x": 2}' http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
 new "Kill restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"
 
-if [ $BE -ne 0 ]; then
+if [ $BE -eq 0 ]; then
     exit # BE
 fi
 
diff --git a/test/test_netconf.sh b/test/test_netconf.sh
index a0eae7d8..7b060875 100755
--- a/test/test_netconf.sh
+++ b/test/test_netconf.sh
@@ -209,7 +209,7 @@ new "netconf discard-changes"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf edit state operation should fail"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><state><op>42</op></state></config></edit-config></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-tag>invalid-value</error-tag>"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><state><op>42</op></state></config></edit-config></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-type>protocol</error-type><error-tag>invalid-value</error-tag>"
 
 new "netconf get state operation"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get><filter type=\"xpath\" select=\"/state\"/></get></rpc>]]>]]>" "^<rpc-reply><data><state><op>42</op></state></data></rpc-reply>]]>]]>$"
@@ -254,7 +254,7 @@ expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><ex:empty/></rpc>]]>]]>"
 new "netconf client-side rpc"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><ex:client-rpc><request>example</request></ex:client-rpc></rpc>]]>]]>" "^<rpc-reply><result>ok</result></rpc-reply>]]>]]>$"
 
-if [ $BE -ne 0 ]; then
+if [ $BE -eq 0 ]; then
     exit # BE
 fi
 
diff --git a/test/test_order.sh b/test/test_order.sh
index a06a036b..cb9eb780 100755
--- a/test/test_order.sh
+++ b/test/test_order.sh
@@ -139,7 +139,7 @@ new "get each ordered-by user leaf-list"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><running/></source><filter type=\"xpath\" select=\"/y3[k='b']\"/></get-config></rpc>]]>]]>" "^<rpc-reply><data><y3><k>b</k><a>bar</a></y3></data></rpc-reply>]]>]]>$"
 
 new "delete candidate"
-expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><delete-config><target><candidate/></target></delete-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><default-operation>none</default-operation><config operation="delete"/></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 # LEAF_LISTS
 
@@ -172,7 +172,7 @@ expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><can
 new "verify list user order (as entered)"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source><filter type=\"xpath\" select=\"/y2\"/></get-config></rpc>]]>]]>" "^<rpc-reply><data><y2><k>c</k><a>bar</a></y2><y2><k>b</k><a>foo</a></y2><y2><k>a</k><a>fie</a></y2></data></rpc-reply>]]>]]>$"
 
-if [ $BE -ne 0 ]; then
+if [ $BE -eq 0 ]; then
     exit # BE
 fi
 
diff --git a/test/test_perf.sh b/test/test_perf.sh
index d03fcbde..66c7a5b1 100755
--- a/test/test_perf.sh
+++ b/test/test_perf.sh
@@ -173,7 +173,7 @@ expecteof "time -f %e $clixon_netconf -qf $cfg  -y $fyang" 0 "<rpc><get-config><
 new "Kill restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"
 
-if [ $BE -ne 0 ]; then
+if [ $BE -eq 0 ]; then
     exit # BE
 fi
 
diff --git a/test/test_restconf.sh b/test/test_restconf.sh
index f98b87e4..03d20bd9 100755
--- a/test/test_restconf.sh
+++ b/test/test_restconf.sh
@@ -52,14 +52,6 @@ module example{
     }
     rpc empty {
     }
-    rpc input {
-       input {
-       }
-    }
-    rpc output {
-       output {
-       }
-    }
     rpc client-rpc {
        	description "Example local client-side rpc";
 	input {
@@ -104,12 +96,15 @@ new "kill old restconf daemon"
 sudo pkill -u www-data clixon_restconf
 
 new "start restconf daemon"
-sudo su -c "$clixon_restconf -f $cfg -y $fyang -D 1" -s /bin/sh www-data &
+sudo su -c "$clixon_restconf -f $cfg -y $fyang -D $DBG" -s /bin/sh www-data &
 
 sleep $RCWAIT
 
 new "restconf tests"
 
+new2 "restconf rpc using POST json without mandatory element"
+expecteq "$(curl -s -X POST -d '{"input":{"wrongelement":"ipv4"}}' http://localhost/restconf/operations/ietf-routing:fib-route)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "wrongelement"},"error-severity": "error"}}}
'
+
 new2 "restconf root discovery. RFC 8040 3.1 (xml+xrd)"
 expecteq "$(curl  -s -X GET http://localhost/.well-known/host-meta)" "<XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'>
    <Link rel='restconf' href='/restconf'/>
@@ -125,12 +120,12 @@ expecteq "$(curl -s -H 'Accept: application/yang-data+xml' -G http://localhost/r
 
'
 
 new2 "restconf get restconf/operations. RFC8040 3.3.2 (json)"
-expecteq "$(curl -sG http://localhost/restconf/operations)" '{"operations": {"example:empty": null,"example:input": null,"example:output": null,"example:client-rpc": null,"ietf-routing:fib-route": null,"ietf-routing:route-count": null}}
+expecteq "$(curl -sG http://localhost/restconf/operations)" '{"operations": {"example:client-rpc": null,"ietf-routing:fib-route": null,"ietf-routing:route-count": null,"example:empty": null}}
 
'
 
 new "restconf get restconf/operations. RFC8040 3.3.2 (xml)"
 ret=$(curl -s -H "Accept: application/yang-data+xml" -G http://localhost/restconf/operations)
-expect='<operations><empty xmlns="urn:example:clixon"/><input xmlns="urn:example:clixon"/><output xmlns="urn:example:clixon"/><client-rpc xmlns="urn:example:clixon"/><fib-route xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"/><route-count xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"/></operations>'
+expect='<operations><client-rpc xmlns="urn:example:clixon"/><fib-route xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"/><route-count xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"/><empty xmlns="urn:example:clixon"/></operations>'
 match=`echo $ret | grep -EZo "$expect"`
 if [ -z "$match" ]; then
     err "$expect" "$ret"
@@ -161,6 +156,9 @@ expectfn "curl -s -I http://localhost/restconf/data" 0 "HTTP/1.1 200 OK"
 new "restconf empty rpc"
 expecteq "$(curl -s -X POST -d {\"input\":null} http://localhost/restconf/operations/example:empty)" ""
 
+new2 "restconf empty rpc with extra args (should fail)"
+expecteq "$(curl -s -X POST -d {\"input\":{\"extra\":null}} http://localhost/restconf/operations/example:empty)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "extra"},"error-severity": "error"}}}
'
+
 new2 "restconf get empty config + state json"
 expecteq "$(curl -sSG http://localhost/restconf/data/state)" '{"state": {"op": "42"}}
 
'
@@ -170,7 +168,7 @@ expecteq "$(curl -sSG http://localhost/restconf/data/example:state)" '{"state":
 
'
 
 new2 "restconf get empty config + state json with wrong module name"
-expecteq "$(curl -sSG http://localhost/restconf/data/badmodule:state)" '{"ietf-restconf:errors" : {"error": {"rpc-error": {"error-tag": "operation-failed","error-type": "protocol","error-severity": "error","error-message": "No yang node found: badmodule:state"}}}}
'
+expecteq "$(curl -sSG http://localhost/restconf/data/badmodule:state)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "No yang node found: badmodule:state"}}}
'
 
 new "restconf get empty config + state xml"
 ret=$(curl -s -H "Accept: application/yang-data+xml" -G http://localhost/restconf/data/state)
@@ -215,10 +213,10 @@ new "restconf Add subtree to datastore using POST"
 expectfn 'curl -s -i -X POST -H "Accept: application/yang-data+json" -d {"interfaces":{"interface":{"name":"eth/0/0","type":"ex:eth","enabled":true}}} http://localhost/restconf/data' 0 'HTTP/1.1 200 OK'
 
 new "restconf Re-add subtree which should give error"
-expectfn 'curl -s -X POST -d {"interfaces":{"interface":{"name":"eth/0/0","type":"ex:eth","enabled":true}}} http://localhost/restconf/data' 0 '{"ietf-restconf:errors" : {"error": {"error-tag": "data-exists","error-type": "application","error-severity": "error","error-message": "Data already exists; cannot create new resource"}}}'
+expectfn 'curl -s -X POST -d {"interfaces":{"interface":{"name":"eth/0/0","type":"ex:eth","enabled":true}}} http://localhost/restconf/data' 0 '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "data-exists","error-severity": "error","error-message": "Data already exists; cannot create new resource"}}}'
 
 # XXX Cant get this to work
-#expecteq "$(curl -s -X POST -d {\"interfaces\":{\"interface\":{\"name\":\"eth/0/0\",\"type\":\"ex:eth\",\"enabled\":true}}} http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-tag": "data-exists","error-type": "application","error-severity": "error","error-message": "Data already exists; cannot create new resource"}}}'
+#expecteq "$(curl -s -X POST -d {\"interfaces\":{\"interface\":{\"name\":\"eth/0/0\",\"type\":\"ex:eth\",\"enabled\":true}}} http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "data-exists","error-severity": "error","error-message": "Data already exists; cannot create new resource"}}}'
 
 new "restconf Check interfaces eth/0/0 added"
 expectfn "curl -s -G http://localhost/restconf/data" 0 '{"interfaces": {"interface": \[{"name": "eth/0/0","type": "ex:eth","enabled": true}\]},"state": {"op": "42"}}
@@ -244,13 +242,13 @@ expecteq "$(curl -s -G http://localhost/restconf/data/state)" '{"state": {"op":
 
'
 
 new2 "restconf Re-post eth/0/0 which should generate error"
-expecteq "$(curl -s -X POST -d '{"interface":{"name":"eth/0/0","type":"ex:eth","enabled":true}}' http://localhost/restconf/data/interfaces)" '{"ietf-restconf:errors" : {"error": {"error-tag": "data-exists","error-type": "application","error-severity": "error","error-message": "Data already exists; cannot create new resource"}}}
'
+expecteq "$(curl -s -X POST -d '{"interface":{"name":"eth/0/0","type":"ex:eth","enabled":true}}' http://localhost/restconf/data/interfaces)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "data-exists","error-severity": "error","error-message": "Data already exists; cannot create new resource"}}}
'
 
 new "Add leaf description using POST"
 expecteq "$(curl -s -X POST -d '{"description":"The-first-interface"}' http://localhost/restconf/data/interfaces/interface=eth%2f0%2f0)" ""
 
 new "Add nothing using POST"
-expectfn 'curl -s -X POST http://localhost/restconf/data/interfaces/interface=eth%2f0%2f0' 0 '"ietf-restconf:errors" : {"error": {"rpc-error": {"error-tag": "malformed-message","error-type": "rpc","error-severity": "error","error-message": " on line 1: syntax error at or before:'
+expectfn 'curl -s -X POST http://localhost/restconf/data/interfaces/interface=eth%2f0%2f0' 0 '"ietf-restconf:errors" : {"error": {"error-type": "rpc","error-tag": "malformed-message","error-severity": "error","error-message": " on line 1: syntax error at or before:'
 
 new2 "restconf Check description added"
 expecteq "$(curl -s -G http://localhost/restconf/data/interfaces)" '{"interfaces": {"interface": [{"name": "eth/0/0","description": "The-first-interface","type": "ex:eth","enabled": true}]}}
@@ -263,7 +261,7 @@ new "Check deleted eth/0/0"
 expectfn 'curl -s -G http://localhost/restconf/data' 0 $state
 
 new2 "restconf Re-Delete eth/0/0 using none should generate error"
-expecteq "$(curl -s -X DELETE  http://localhost/restconf/data/interfaces/interface=eth%2f0%2f0)" '{"ietf-restconf:errors" : {"error": {"error-tag": "data-missing","error-type": "application","error-severity": "error","error-message": "Data does not exist; cannot delete resource"}}}
'
+expecteq "$(curl -s -X DELETE  http://localhost/restconf/data/interfaces/interface=eth%2f0%2f0)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "data-missing","error-severity": "error","error-message": "Data does not exist; cannot delete resource"}}}
'
 
 new "restconf Add subtree eth/0/0 using PUT"
 expecteq "$(curl -s -X PUT -d '{"interface":{"name":"eth/0/0","type":"ex:eth","enabled":true}}' http://localhost/restconf/data/interfaces/interface=eth%2f0%2f0)" ""
@@ -273,37 +271,38 @@ expecteq "$(curl -s -G http://localhost/restconf/data/interfaces)" '{"interfaces
 
'
 
 new2 "restconf rpc using POST json"
-expecteq "$(curl -s -X POST -d '{"input":{"routing-instance-name":"ipv4"}}' http://localhost/restconf/operations/ietf-routing:fib-route)" '{"output": {"route": {"address-family": "ipv4","next-hop": {"next-hop-list": "2.3.4.5"}}}}
+expecteq "$(curl -s -X POST -d '{"input":{"routing-instance-name":"ipv4","destination-address":{"address-family":"ipv6"}}}' http://localhost/restconf/operations/ietf-routing:fib-route)" '{"output": {"route": {"address-family": "ipv4","next-hop": {"next-hop-list": "2.3.4.5"},"source-protocol": "static"}}}
 
'
 
 # Cant get this to work due to quoting
 #new2 "restconf rpc using POST wrong JSON"
-#expecteq "$(curl -s -X POST -d '{"input":{"routing-instance-name":ipv4}}' http://localhost/restconf/operations/ietf-routing:fib-route)" '{"ietf-restconf:errors" : {"error": {"rpc-error": {"error-tag": "operation-failed","error-type": "protocol","error-severity": "error","error-message": " on line 1: syntax error at or before: i"}}}}
'
+#expecteq "$(curl -s -X POST -d '{"input":{"routing-instance-name":ipv4}}' http://localhost/restconf/operations/ietf-routing:fib-route)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": " on line 1: syntax error at or before: i"}}}
'
 
-new2 "restconf rpc using POST json w/o mandatory element"
-expecteq "$(curl -s -X POST -d '{"input":{"wrongelement":"ipv4"}}' http://localhost/restconf/operations/ietf-routing:fib-route)" '{"ietf-restconf:errors" : {"error": {"rpc-error": {"error-tag": "operation-failed","error-type": "protocol","error-severity": "error","error-message": "Missing mandatory variable: routing-instance-name"}}}}
'
-new2 "restconf rpc non-existing rpc w/o namespace"
-expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations/kalle)" '{"ietf-restconf:errors" : {"error": {"rpc-error": {"error-tag": "operation-failed","error-type": "protocol","error-severity": "error","error-message": "yang node not found"}}}}
'
+new2 "restconf rpc using POST json without mandatory element"
+expecteq "$(curl -s -X POST -d '{"input":{"wrongelement":"ipv4"}}' http://localhost/restconf/operations/ietf-routing:fib-route)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "wrongelement"},"error-severity": "error"}}}
'
+
+new2 "restconf rpc non-existing rpc without namespace"
+expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations/kalle)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "yang node not found"}}}
'
 
 new2 "restconf rpc non-existing rpc"
-expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations/example:kalle)" '{"ietf-restconf:errors" : {"error": {"rpc-error": {"error-tag": "operation-failed","error-type": "protocol","error-severity": "error","error-message": "yang node not found"}}}}
'
+expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations/example:kalle)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "yang node not found"}}}
'
 
 new2 "restconf rpc missing name"
-expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations)" '{"ietf-restconf:errors" : {"error": {"rpc-error": {"error-tag": "operation-failed","error-type": "protocol","error-severity": "error","error-message": "Operation name expected"}}}}
'
+expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "Operation name expected"}}}
'
 
 new2 "restconf rpc missing input"
-expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations/ietf-routing:fib-route)" '{"ietf-restconf:errors" : {"error": {"rpc-error": {"error-tag": "operation-failed","error-type": "protocol","error-severity": "error","error-message": "Missing mandatory variable: routing-instance-name"}}}}
'
+expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations/ietf-routing:fib-route)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "routing-instance-name"},"error-severity": "error","error-message": "Mandatory variable"}}}
'
 
 new "restconf rpc using POST xml"
 ret=$(curl -s -X POST -H "Accept: application/yang-data+xml" -d '{"input":{"routing-instance-name":"ipv4"}}' http://localhost/restconf/operations/ietf-routing:fib-route)
-expect="<output><route><address-family>ipv4</address-family><next-hop><next-hop-list>2.3.4.5</next-hop-list></next-hop></route></output>"
+expect="<output><route><address-family>ipv4</address-family><next-hop><next-hop-list>2.3.4.5</next-hop-list></next-hop><source-protocol>static</source-protocol></route></output>"
 match=`echo $ret | grep -EZo "$expect"`
 if [ -z "$match" ]; then
     err "$expect" "$ret"
 fi
 
 new2 "restconf rpc using wrong prefix"
-expecteq "$(curl -s -X POST -d '{"input":{"routing-instance-name":"ipv4"}}' http://localhost/restconf/operations/wrong:fib-route)" '{"ietf-restconf:errors" : {"error": {"rpc-error": {"error-tag": "operation-failed","error-type": "protocol","error-severity": "error","error-message": "yang module not found"}}}}
'
+expecteq "$(curl -s -X POST -d '{"input":{"routing-instance-name":"ipv4"}}' http://localhost/restconf/operations/wrong:fib-route)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "yang module not found"}}}
'
 
 new "restconf local client rpc using POST xml"
 ret=$(curl -s -X POST -H "Accept: application/yang-data+xml" -d '{"input":{"request":"example"}}' http://localhost/restconf/operations/example:client-rpc)
@@ -321,7 +320,7 @@ fi
 new "Kill restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"
 
-if [ $BE -ne 0 ]; then
+if [ $BE -eq 0 ]; then
     exit # BE
 fi
 
diff --git a/test/test_restconf2.sh b/test/test_restconf2.sh
index dbddee09..ee820082 100755
--- a/test/test_restconf2.sh
+++ b/test/test_restconf2.sh
@@ -84,16 +84,16 @@ new "restconf GET if-type"
 expectfn "curl -s -X GET http://localhost/restconf/data/cont1/interface=local0/type" 0 '{"type": "regular"}'
 
 new "restconf POST interface without mandatory type"
-expectfn 'curl -s -X POST -d {"interface":{"name":"TEST"}} http://localhost/restconf/data/cont1' 0 '"error-message": "Missing mandatory variable: type"'
+expectfn 'curl -s -X POST -d {"interface":{"name":"TEST"}} http://localhost/restconf/data/cont1' 0 '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "type"},"error-severity": "error","error-message": "Mandatory variable"}}}
'
 
 new "restconf POST interface"
 expectfn 'curl -s -X POST -d {"interface":{"name":"TEST","type":"eth0"}} http://localhost/restconf/data/cont1' 0 ""
 
 new2 "restconf POST again"
-expecteq "$(curl -s -X POST -d '{"interface":{"name":"TEST","type":"eth0"}}' http://localhost/restconf/data/cont1)" '{"ietf-restconf:errors" : {"error": {"error-tag": "data-exists","error-type": "application","error-severity": "error","error-message": "Data already exists; cannot create new resource"}}}
'
+expecteq "$(curl -s -X POST -d '{"interface":{"name":"TEST","type":"eth0"}}' http://localhost/restconf/data/cont1)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "data-exists","error-severity": "error","error-message": "Data already exists; cannot create new resource"}}}
'
 
 new2 "restconf POST from top"
-expecteq "$(curl -s -X POST -d '{"cont1":{"interface":{"name":"TEST","type":"eth0"}}}' http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-tag": "data-exists","error-type": "application","error-severity": "error","error-message": "Data already exists; cannot create new resource"}}}
'
+expecteq "$(curl -s -X POST -d '{"cont1":{"interface":{"name":"TEST","type":"eth0"}}}' http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "data-exists","error-severity": "error","error-message": "Data already exists; cannot create new resource"}}}
'
 
 new "restconf DELETE"
 expectfn 'curl -s -X DELETE http://localhost/restconf/data/cont1' 0 ""
@@ -138,12 +138,12 @@ new "restconf PUT add interface"
 expectfn 'curl -s -X PUT -d {"interface":{"name":"TEST","type":"eth0"}} http://localhost/restconf/data/cont1/interface=TEST' 0 ""
 
 new "restconf PUT change key error"
-expectfn 'curl -is -X PUT -d {"interface":{"name":"ALPHA","type":"eth0"}} http://localhost/restconf/data/cont1/interface=TEST' 0 '{"ietf-restconf:errors" : {"error": {"rpc-error": {"error-tag": "operation-failed","error-type": "protocol","error-severity": "error","error-message": "api-path keys do not match data keys"}}}}'
+expectfn 'curl -is -X PUT -d {"interface":{"name":"ALPHA","type":"eth0"}} http://localhost/restconf/data/cont1/interface=TEST' 0 '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "api-path keys do not match data keys"}}}'
 
 new "Kill restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"
 
-if [ $BE -ne 0 ]; then
+if [ $BE -eq 0 ]; then
     exit # BE
 fi
 
diff --git a/test/test_rpc.sh b/test/test_rpc.sh
new file mode 100755
index 00000000..b1b04251
--- /dev/null
+++ b/test/test_rpc.sh
@@ -0,0 +1,125 @@
+#!/bin/bash
+# RPC tests
+# Validate parameters in restconf and netconf, check namespaces, etc
+# See rfc8040 3.6
+APPNAME=example
+
+# include err() and new() functions and creates $dir
+. ./lib.sh
+cfg=$dir/conf.xml
+
+# Use yang in example
+cat <<EOF > $cfg
+<config xmlns="urn:example:clixon">
+  <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
+  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_MODULE_MAIN>$APPNAME</CLICON_YANG_MODULE_MAIN>
+  <CLICON_BACKEND_DIR>/usr/local/lib/$APPNAME/backend</CLICON_BACKEND_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_RESTCONF_PRETTY>false</CLICON_RESTCONF_PRETTY>
+  <CLICON_SOCK>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
+  <CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
+  <CLICON_CLI_GENMODEL_COMPLETION>1</CLICON_CLI_GENMODEL_COMPLETION>
+  <CLICON_XMLDB_DIR>/usr/local/var/$APPNAME</CLICON_XMLDB_DIR>
+  <CLICON_XMLDB_PLUGIN>/usr/local/lib/xmldb/text.so</CLICON_XMLDB_PLUGIN>
+</config>
+EOF
+
+new "test params: -f $cfg"
+if [ $BE -ne 0 ]; then
+    new "kill old backend"
+    sudo clixon_backend -zf $cfg
+    if [ $? -ne 0 ]; then
+	err
+    fi
+    new "start backend -s init -f $cfg"
+    sudo $clixon_backend -s init -f $cfg -D $DBG
+    if [ $? -ne 0 ]; then
+	err
+    fi
+fi
+
+new "kill old restconf daemon"
+sudo pkill -u www-data clixon_restconf
+
+new "start restconf daemon"
+sudo su -c "$clixon_restconf -f $cfg" -s /bin/sh www-data &
+
+sleep $RCWAIT
+
+new "rpc tests"
+
+# 1.First some positive tests vary media types
+#
+new2 "restconf example rpc json/json default - no headers"
+expecteq "$(curl -s -X POST -d '{"input":{"x":"0"}}' http://localhost/restconf/operations/example:example)" '{"output": {"x": "0","y": "42"}}
+
'
+
+new2 "restconf example rpc json/json change y default"
+expecteq "$(curl -s -X POST -d '{"input":{"x":"0","y":"99"}}' http://localhost/restconf/operations/example:example)" '{"output": {"x": "0","y": "99"}}
+
'
+
+new2 "restconf example rpc json/json"
+# XXX example:input example:output
+expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+json' -H 'Content-Type: application/yang-data+json' -d '{"input":{"x":"0"}}' http://localhost/restconf/operations/example:example)" '{"output": {"x": "0","y": "42"}}
+
'
+
+new2 "restconf example rpc xml/json"
+expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+xml' -H 'Content-Type: application/yang-data+json' -d '<input xmlns="urn:example:clixon"><x>0</x></input>' http://localhost/restconf/operations/example:example)"  '{"output": {"x": "0","y": "42"}}
+
'
+
+new2 "restconf example rpc json/xml"
+# <output xmlns="rn:example:clixon"
+expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+json' -H 'Accept: application/yang-data+xml' -d '{"input":{"x":"0"}}' http://localhost/restconf/operations/example:example)" '<output><x>0</x><y>42</y></output>
+
'
+
+new2 "restconf example rpc xml/xml"
+# <output xmlns="rn:example:clixon"
+expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+xml' -H 'Accept: application/yang-data+xml'  -d '<input xmlns="urn:example:clixon"><x>0</x></input>' http://localhost/restconf/operations/example:example)" '<output><x>0</x><y>42</y></output>
+
'
+
+new "netconf example rpc"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><example><x>0</x></example></rpc>]]>]]>' '^<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><x>0</x><y>42</y></rpc-reply>]]>]]>$'
+
+# 2. Then error cases
+#
+new2 "restconf omit mandatory"
+expecteq "$(curl -s -X POST -d '{"input":null}' http://localhost/restconf/operations/example:example)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "x"},"error-severity": "error","error-message": "Mandatory variable"}}}
'
+
+new2 "restconf add extra"
+expecteq "$(curl -s -X POST -d '{"input":{"x":"0","extra":"0"}}' http://localhost/restconf/operations/example:example)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "extra"},"error-severity": "error"}}}
'
+
+new2 "restconf wrong method"
+expecteq "$(curl -s -X POST -d '{"input":{"x":"0"}}' http://localhost/restconf/operations/example:wrong)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "yang node not found"}}}
'
+
+new2 "restconf edit-config missing mandatory"
+expecteq "$(curl -s -X POST -d '{"input":null}' http://localhost/restconf/operations/ietf-netconf:edit-config)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "yang module not found"}}}
'
+
+new "netconf kill-session missing session-id mandatory"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><kill-session/></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>missing-element</error-tag><error-info><bad-element>session-id</bad-element></error-info><error-severity>error</error-severity><error-message>Mandatory variable</error-message></rpc-error></rpc-reply>$'
+
+# edit-config?
+
+new "Kill restconf daemon"
+sudo pkill -u www-data -f "/www-data/clixon_restconf"
+
+if [ $BE -eq 0 ]; then
+    exit # BE
+fi
+
+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
+sudo clixon_backend -z -f $cfg
+if [ $? -ne 0 ]; then
+    err "kill backend"
+fi
+
+rm -rf $dir
diff --git a/test/test_stream.sh b/test/test_stream.sh
index 910a29c8..19ad9802 100755
--- a/test/test_stream.sh
+++ b/test/test_stream.sh
@@ -150,10 +150,10 @@ new "netconf EXAMPLE subscription with filter classifier"
 expectwait "$clixon_netconf -qf $cfg -y $fyang" "<rpc><create-subscription><stream>EXAMPLE</stream><filter type=\"xpath\" select=\"event[event-class='fault']\"/></create-subscription></rpc>]]>]]>" '^<rpc-reply><ok/></rpc-reply>]]>]]><notification xmlns="urn:ietf:params:xml:ns:netconf:notification:1.0"><eventTime>20' $NCWAIT
 
 new "netconf NONEXIST subscription"
-expectwait "$clixon_netconf -qf $cfg -y $fyang" '<rpc><create-subscription><stream>NONEXIST</stream></create-subscription></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>invalid-value</error-tag><error-type>application</error-type><error-severity>error</error-severity><error-message>No such stream</error-message></rpc-error></rpc-reply>]]>]]>$' $NCWAIT
+expectwait "$clixon_netconf -qf $cfg -y $fyang" '<rpc><create-subscription><stream>NONEXIST</stream></create-subscription></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>invalid-value</error-tag><error-severity>error</error-severity><error-message>No such stream</error-message></rpc-error></rpc-reply>]]>]]>$' $NCWAIT
 
 new "netconf EXAMPLE subscription with wrong date"
-expectwait "$clixon_netconf -qf $cfg -y $fyang" '<rpc><create-subscription><stream>EXAMPLE</stream><startTime>kallekaka</startTime></create-subscription></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>bad-element</error-tag><error-type>application</error-type><error-info><bad-element>startTime</bad-element></error-info><error-severity>error</error-severity><error-message>Expected timestamp</error-message></rpc-error></rpc-reply>]]>]]>$' 0
+expectwait "$clixon_netconf -qf $cfg -y $fyang" '<rpc><create-subscription><stream>EXAMPLE</stream><startTime>kallekaka</startTime></create-subscription></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>startTime</bad-element></error-info><error-severity>error</error-severity><error-message>Expected timestamp</error-message></rpc-error></rpc-reply>]]>]]>$' 0
 
 #new "netconf EXAMPLE subscription with replay"
 #NOW=$(date +"%Y-%m-%dT%H:%M:%S")
@@ -176,7 +176,7 @@ sleep 2
 # Restconf stream subscription RFC8040 Sec 6.3
 # Start Subscription w error
 new "restconf monitor event nonexist stream"
-expectwait 'curl -s -X GET -H "Accept: text/event-stream" -H "Cache-Control: no-cache" -H "Connection: keep-alive" http://localhost/streams/NOTEXIST' 0 '<errors xmlns="urn:ietf:params:xml:ns:yang:ietf-restconf"><error><error-tag>invalid-value</error-tag><error-type>application</error-type><error-severity>error</error-severity><error-message>No such stream</error-message></error></errors>' 2
+expectwait 'curl -s -X GET -H "Accept: text/event-stream" -H "Cache-Control: no-cache" -H "Connection: keep-alive" http://localhost/streams/NOTEXIST' 0 '<errors xmlns="urn:ietf:params:xml:ns:yang:ietf-restconf"><error><error-type>application</error-type><error-tag>invalid-value</error-tag><error-severity>error</error-severity><error-message>No such stream</error-message></error></errors>' 2
 
 # 2a) start subscription 8s - expect 1-2 notifications
 new "2a) start subscriptions 8s - expect 1-2 notifications"
@@ -278,7 +278,7 @@ sleep 5
 new "Kill restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"
 
-if [ $BE -ne 0 ]; then
+if [ $BE -eq 0 ]; then
     exit # BE
 fi
 
diff --git a/test/test_type.sh b/test/test_type.sh
index 4ff09bbc..1261d2ba 100755
--- a/test/test_type.sh
+++ b/test/test_type.sh
@@ -217,7 +217,7 @@ new "netconf set transitive string error"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><c><talle>9xx</talle></c></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>"
 
 new "netconf validate should fail"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>application</error-type><error-severity>error</error-severity><error-message>validation of talle failed regexp match fail"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" '<rpc-reply><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>talle</bad-element></error-info><error-severity>error</error-severity><error-message>regexp match fail: "9xx" does not match \[a-z\]\[0-9\]\*</error-message></rpc-error></rpc-reply>]]>]]>$'
 
 new "netconf discard-changes"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
@@ -244,7 +244,7 @@ new "netconf set transitive union error int"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><c><ulle>55</ulle></c></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>"
 
 new "netconf validate should fail"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>application</error-type><error-severity>error</error-severity><error-message>validation of ulle failed"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>ulle</bad-element></error-info><error-severity>error</error-severity><error-message>'55' does not match enumeration</error-message></rpc-error></rpc-reply>]]>]]>$"
 
 new "netconf discard-changes"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
@@ -303,7 +303,7 @@ expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><can
 new "cli bits validate"
 expectfn "$clixon_cli -1f $cfg -l o -y $fyang validate" 0 "^$"
 
-if [ $BE -ne 0 ]; then
+if [ $BE -eq 0 ]; then
     exit # BE
 fi
 
diff --git a/test/test_union.sh b/test/test_union.sh
index d0f7af99..c583593a 100755
--- a/test/test_union.sh
+++ b/test/test_union.sh
@@ -100,7 +100,7 @@ expectfn "$clixon_cli -1f $cfg -l o -y $fyang set c ulle 33" 0 "^$"
 new "cli set transitive union error"
 expectfn "$clixon_cli -1f $cfg -l o -y $fyang set c ulle kalle" 255 ""
 
-if [ $BE -ne 0 ]; then
+if [ $BE -eq 0 ]; then
     exit # BE
 fi
 
diff --git a/test/test_when_must.sh b/test/test_when_must.sh
index 6e3b971f..9f4c8d4b 100755
--- a/test/test_when_must.sh
+++ b/test/test_when_must.sh
@@ -118,7 +118,7 @@ new "when get config"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data><whenex><type>direct</type><name>r2</name><static-routes/></whenex><whenex><type>static</type><name>r1</name><static-routes/></whenex></data></rpc-reply>]]>]]>$"
 
 new "when: validate fail"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>application</error-type><error-severity>error</error-severity><error-message>xpath static-routes validation failed</error-message></rpc-error></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>when xpath validation failed</error-message></rpc-error></rpc-reply>]]>]]>$"
 
 new "when: discard-changes"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
@@ -133,15 +133,15 @@ new "must: add atm interface"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><interface><ifType>atm</ifType><ifMTU>32</ifMTU></interface></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "must: atm validate fail"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>application</error-type><error-severity>error</error-severity><error-message>An ATM MTU must be 64 .. 17966</error-message></rpc-error></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>An ATM MTU must be 64 .. 17966</error-message></rpc-error></rpc-reply>]]>]]>$"
 
 new "must: add eth interface"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><interface><ifType>ethernet</ifType><ifMTU>989</ifMTU></interface></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "must: eth validate fail"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>application</error-type><error-severity>error</error-severity><error-message>An Ethernet MTU must be 1500</error-message></rpc-error></rpc-reply>]]>]]>"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>An Ethernet MTU must be 1500</error-message></rpc-error></rpc-reply>]]>]]>"
 
-if [ $BE -ne 0 ]; then
+if [ $BE -eq 0 ]; then
     exit # BE
 fi
 
diff --git a/test/test_yang.sh b/test/test_yang.sh
index 9a3f7cfe..1d953dc5 100755
--- a/test/test_yang.sh
+++ b/test/test_yang.sh
@@ -212,7 +212,7 @@ expectfn "$clixon_cli -1f $cfg -y $fyang set x f e foo" 0 ""
 new "cli show leaf-list"
 expectfn "$clixon_cli -1f $cfg -y $fyang show xpath /x/f/e" 0 "<e>foo</e>"
 new "netconf set state data (not allowed)"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><state><op>42</op></state></config></edit-config></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-tag>invalid-value"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><state><op>42</op></state></config></edit-config></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-type>protocol</error-type><error-tag>invalid-value"
 
 new "netconf set presence and not present"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><x><nopresence/><presence/></x></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
@@ -233,7 +233,7 @@ new "netconf validate anyxml"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf delete candidate"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><delete-config><target><candidate/></target></delete-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><default-operation>none</default-operation><config operation="delete"/></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 # Check 3-keys
 new "netconf add one 3-key entry"
@@ -262,7 +262,7 @@ expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get-config><source><cand
 
 # clear db for next test
 new "netconf delete candidate"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><delete-config><target><candidate/></target></delete-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><default-operation>none</default-operation><config operation="delete"/></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf commit empty candidate"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
@@ -279,7 +279,7 @@ expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candid
 new "netconf submodule discard-changes"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
-if [ $BE -ne 0 ]; then
+if [ $BE -eq 0 ]; then
     exit # BE
 fi
 
diff --git a/test/test_yang_load.sh b/test/test_yang_load.sh
index 9bcae5fa..90fc10e4 100755
--- a/test/test_yang_load.sh
+++ b/test/test_yang_load.sh
@@ -88,12 +88,12 @@ new "1. Set newex"
 expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex>str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "Set oldex should fail (since oldex is in old revision and only the new is loaded)"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex>str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>application</error-type><error-severity>error</error-severity><error-message>Validation failed</error-message></rpc-error></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex>str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>Validation failed</error-message></rpc-error></rpc-reply>]]>]]>$'
 
 new "Set other should fail"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other>str</other></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>application</error-type><error-severity>error</error-severity><error-message>Validation failed</error-message></rpc-error></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other>str</other></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>Validation failed</error-message></rpc-error></rpc-reply>]]>]]>$'
 
-if [ $BE -ne 0 ]; then
+if [ $BE -eq 0 ]; then
     exit # BE
 fi
 
@@ -140,10 +140,10 @@ new "Set oldex"
 expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex>str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "Set newex should fail"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex>str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>XML'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex>str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>Validation failed</error-message></rpc-error></rpc-reply>]]>]]>$'
 
 new "Set other should fail"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other>str</other></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>XML'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other>str</other></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>Validation failed</error-message></rpc-error></rpc-reply>]]>]]>$'
 
 new "Kill backend"
 # Check if premature kill
@@ -184,10 +184,10 @@ new "Set newex"
 expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex>str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "Set oldex should fail"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex>str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>XML'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex>str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>'
 
 new "Set other should fail"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other>str</other></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>XML'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other>str</other></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>'
 
 new "Kill backend"
 # Check if premature kill
@@ -229,10 +229,10 @@ new "Set oldex"
 expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex>str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "Set newex should fail"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex>str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>XML'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex>str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>'
 
 new "Set other should fail"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other>str</other></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>XML'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other>str</other></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>'
 
 new "Kill backend"
 # Check if premature kill
@@ -273,7 +273,7 @@ new "Set newex"
 expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex>str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "Set oldex should fail"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex>str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>XML'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex>str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>'
 
 new "Set other"
 expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other>str</other></config></edit-config></rpc>]]>]]>'  '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
@@ -318,7 +318,7 @@ new "Set oldex"
 expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex>str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "Set newex should fail"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex>str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>XML'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex>str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>'
 
 new "Set other"
 expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other>str</other></config></edit-config></rpc>]]>]]>'  '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
@@ -365,7 +365,7 @@ new "Set oldex"
 expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex>str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "Set newex should fail"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex>str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>XML'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex>str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>'
 
 new "Set other"
 expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other>str</other></config></edit-config></rpc>]]>]]>'  '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
@@ -411,10 +411,10 @@ new "Set oldex"
 expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex>str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "Set newex should fail"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex>str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>XML'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex>str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>'
 
 new "Set other should fail"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other>str</other></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-tag>operation-failed</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-message>XML'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other>str</other></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>'
 
 new "Kill backend"
 # Check if premature kill
diff --git a/test/test_yang_namespace.sh b/test/test_yang_namespace.sh
index 215e91f3..19447f80 100755
--- a/test/test_yang_namespace.sh
+++ b/test/test_yang_namespace.sh
@@ -122,7 +122,7 @@ expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><cand
 
 # rpc
 
-if [ $BE -ne 0 ]; then
+if [ $BE -eq 0 ]; then
     exit # BE
 fi
 new "Kill backend"

From 861300d6c07ba9749657832485d4f7f74e6da197 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Fri, 21 Dec 2018 14:44:59 +0100
Subject: [PATCH 16/72] netconf error handling and test summary script

---
 CHANGELOG.md                     |   3 +-
 apps/netconf/clixon_netconf.h    |   1 +
 apps/netconf/netconf_lib.c       |  37 ++++-
 apps/netconf/netconf_lib.h       |   1 +
 apps/netconf/netconf_main.c      |   9 +-
 apps/netconf/netconf_rpc.c       |   8 +-
 apps/restconf/restconf_lib.c     |   2 +
 apps/restconf/restconf_methods.c |  11 +-
 example/example.yang             |  55 ++++++
 lib/clixon/clixon_netconf_lib.h  |   3 +
 lib/src/clixon_netconf_lib.c     | 277 ++++++++++++++++---------------
 lib/src/clixon_xml_map.c         |  18 +-
 test/README.md                   |  17 +-
 test/all.sh                      |  40 ++++-
 test/lib.sh                      |  12 +-
 test/test_nacm.sh                |   2 +-
 test/test_nacm_ext.sh            |   2 +-
 test/test_nacm_protocol.sh       |   2 +-
 test/test_perf.sh                |   2 +-
 test/test_restconf.sh            |   4 +-
 test/test_restconf2.sh           |   2 +-
 test/test_rpc.sh                 |   8 +-
 test/test_stream.sh              |   4 +-
 23 files changed, 331 insertions(+), 189 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0035a93d..ce4188a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,7 +20,8 @@
   * Openconfig yang specs parsed: https://github.com/openconfig/public
   * Improved "unknown" handling
   * More precise Yang validation and better error messages
-    * For Example, adding bad-, missing-, or unknown-element error messages, etc instead of operation-failed
+    * Example: adding bad-, missing-, or unknown-element error messages, etc instead of operation-failed, bad-element instead of "yang node not found", etc.
+    * 
   * Yang load file configure options changed
     * `CLICON_YANG_DIR` is changed from a single directory to a path of directories
       * Note CLIXON_DATADIR (=/usr/local/share/clixon) need to be in the list
diff --git a/apps/netconf/clixon_netconf.h b/apps/netconf/clixon_netconf.h
index e2fbb5bb..9fed0a1a 100644
--- a/apps/netconf/clixon_netconf.h
+++ b/apps/netconf/clixon_netconf.h
@@ -44,6 +44,7 @@
  * (Duplicated. Also in netconf_*.h)
  */
 int netconf_output(int s, cbuf *xf, char *msg);
+int netconf_output_encap(int s, cbuf *xf, char *msg);
 
 int netconf_xpath(cxobj *xsearch,
 		  cxobj *xfilter, 
diff --git a/apps/netconf/netconf_lib.c b/apps/netconf/netconf_lib.c
index fc24810b..50723de4 100644
--- a/apps/netconf/netconf_lib.c
+++ b/apps/netconf/netconf_lib.c
@@ -182,9 +182,9 @@ netconf_get_target(cxobj        *xn,
  * @param[in]   s    
  * @param[in]   cb   Cligen buffer that contains the XML message
  * @param[in]   msg  Only for debug
- * @note Assumes "cb" contains valid XML, ie encoding is correct. This is done
- *       if it is output by a xml render routine (xml_print et al), but NOT
- *       otherwise.
+ * @retval      0    OK
+ * @retval     -1    Error
+ * @see netconf_output_encap  for function with encapsulation
  */
 int 
 netconf_output(int   s, 
@@ -216,3 +216,34 @@ netconf_output(int   s,
     return retval;
 }
 
+	    
+/*! Encapsulate and send outgoing netconf packet as cbuf on socket
+ * @param[in]   s    
+ * @param[in]   cb   Cligen buffer that contains the XML message
+ * @param[in]   msg  Only for debug
+ * @retval      0    OK
+ * @retval     -1    Error
+ * @note Assumes "cb" contains valid XML
+ * @see netconf_output  without encapsulation
+ */
+int 
+netconf_output_encap(int   s, 
+		     cbuf *cb, 
+		     char *msg)
+{
+    int  retval = -1;
+    cbuf *cb1 = NULL;
+    
+    if ((cb1 = cbuf_new()) == NULL){
+	clicon_err(OE_XML, errno, "cbuf_new");
+	goto done;
+    }
+    add_preamble(cb1);
+    cprintf(cb1, "%s", cbuf_get(cb));
+    add_postamble(cb1);
+    retval = netconf_output(s, cb1, msg);
+ done:
+    if (cb1)
+	cbuf_free(cb1);
+    return retval;
+}
diff --git a/apps/netconf/netconf_lib.h b/apps/netconf/netconf_lib.h
index f2dc73e1..6d2de111 100644
--- a/apps/netconf/netconf_lib.h
+++ b/apps/netconf/netconf_lib.h
@@ -75,5 +75,6 @@ int add_error_preamble(cbuf *xf, char *reason);
 char *netconf_get_target(cxobj *xn, char *path);
 int add_error_postamble(cbuf *xf);
 int netconf_output(int s, cbuf *xf, char *msg);
+int netconf_output_encap(int s, cbuf *cb, char *msg);
 
 #endif  /* _NETCONF_LIB_H_ */
diff --git a/apps/netconf/netconf_main.c b/apps/netconf/netconf_main.c
index cc4c9710..dc57126e 100644
--- a/apps/netconf/netconf_main.c
+++ b/apps/netconf/netconf_main.c
@@ -112,7 +112,7 @@ process_incoming_packet(clicon_handle h,
 	free(str0);
 	if (netconf_operation_failed(cbret, "rpc", "internal error")< 0)
 	    goto done;
-	netconf_output(1, cbret, "rpc-error");
+	netconf_output_encap(1, cbret, "rpc-error");
 	goto done;
     }
     free(str0);
@@ -121,7 +121,7 @@ process_incoming_packet(clicon_handle h,
 	if ((ret = xml_yang_validate_rpc(xrpc, cbret)) < 0) 
 	    goto done;
 	if (ret == 0){
-	    netconf_output(1, cbret, "rpc-error");
+	    netconf_output_encap(1, cbret, "rpc-error");
 	    goto ok;
 	}
     }
@@ -157,11 +157,8 @@ process_incoming_packet(clicon_handle h,
 		    if (xml_addsub(xc, xa2) < 0)
 			goto done;
 		}
-		add_preamble(cbret);
-		
 		clicon_xml2cbuf(cbret, xml_child_i(xret,0), 0, 0);
-		add_postamble(cbret);
-		if (netconf_output(1, cbret, "rpc-reply") < 0){
+		if (netconf_output_encap(1, cbret, "rpc-reply") < 0){
 		    cbuf_free(cbret);
 		    goto done;
 		}
diff --git a/apps/netconf/netconf_rpc.c b/apps/netconf/netconf_rpc.c
index 64001137..4d9b354a 100644
--- a/apps/netconf/netconf_rpc.c
+++ b/apps/netconf/netconf_rpc.c
@@ -776,12 +776,10 @@ netconf_notification_cb(int   s,
 	clicon_err(OE_PLUGIN, errno, "cbuf_new");
 	goto done;
     }
-    add_preamble(cb); /* Make it well-formed netconf xml */
     if (clicon_xml2cbuf(cb, xn, 0, 0) < 0)
 	goto done;
-    add_postamble(cb);
     /* Send it to listening client on stdout */
-    if (netconf_output(1, cb, "notification") < 0){
+    if (netconf_output_encap(1, cb, "notification") < 0){
 	cbuf_free(cb);
 	goto done;
     }
@@ -925,13 +923,13 @@ netconf_application_rpc(clicon_handle h,
 	    if ((ret = xml_yang_validate_all_top(xn, cbret)) < 0)
 		goto done;
 	    if (ret == 0){
-		netconf_output(1, cbret, "rpc-error");
+		netconf_output_encap(1, cbret, "rpc-error");
 		goto ok;
 	    }
 	    if ((ret = xml_yang_validate_add(xn, cbret)) < 0)
 		goto done;
 	    if (ret == 0){
-		netconf_output(1, cbret, "rpc-error");
+		netconf_output_encap(1, cbret, "rpc-error");
 		goto ok;
 	    }
 	}
diff --git a/apps/restconf/restconf_lib.c b/apps/restconf/restconf_lib.c
index be214fbb..062dff65 100644
--- a/apps/restconf/restconf_lib.c
+++ b/apps/restconf/restconf_lib.c
@@ -450,10 +450,12 @@ api_return_err(clicon_handle h,
     else
 	if (xml2json_cbuf(cb, xerr, pretty) < 0)
 	    goto done;
+    clicon_debug(1, "%s code:%d err:%s", __FUNCTION__, code, cbuf_get(cb));
     FCGX_SetExitStatus(code, r->out); /* Created */
     FCGX_FPrintF(r->out, "Status: %d %s\r\n", code, reason_phrase);
     FCGX_FPrintF(r->out, "Content-Type: application/yang-data+%s\r\n\r\n",
 		 use_xml?"xml":"json");
+
     if (use_xml){
 	if (pretty){
 	    FCGX_FPrintF(r->out, "    <errors xmlns=\"urn:ietf:params:xml:ns:yang:ietf-restconf\">\n", cbuf_get(cb));
diff --git a/apps/restconf/restconf_methods.c b/apps/restconf/restconf_methods.c
index b8beb068..a11d55c1 100644
--- a/apps/restconf/restconf_methods.c
+++ b/apps/restconf/restconf_methods.c
@@ -1118,15 +1118,8 @@ api_operations_post(clicon_handle h,
 	goto ok;
     }
     if ((yrpc = yang_find((yang_node*)ys, Y_RPC, id)) == NULL){
-	if (netconf_operation_failed_xml(&xerr, "protocol", "yang node not found") < 0)
-	    goto done;
-	if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
-	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
-		goto done;
-	goto ok;
-    }
-    if (yrpc == NULL){
-	if (netconf_operation_failed_xml(&xerr, "protocol", "yang node not found") < 0)
+	clicon_debug(1, "%s rpc %s not found", __FUNCTION__, id);
+	if (netconf_missing_element_xml(&xerr, "application", id, "RPC not defined") < 0)
 	    goto done;
 	if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
 	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
diff --git a/example/example.yang b/example/example.yang
index 57f58fcb..749b10ff 100644
--- a/example/example.yang
+++ b/example/example.yang
@@ -26,6 +26,10 @@ module example {
     }
     /* Translation function example - See also example_cli */
     list translate{
+	key k;
+	leaf k{
+	    type string;
+	}
 	leaf value{
 	    type string;
 	}
@@ -73,6 +77,57 @@ module example {
 	    }
 	}
     }
+    rpc empty {
+	description "Smallest possible RPC with no input or output";
+    }
+    rpc example {
+	description "Some example input/output for testing RFC7950 7.14.
+                     RPC simply echoes the input for debugging.";
+	input {
+	    leaf x {
+		description
+         	    "If a leaf in the input tree has a 'mandatory' statement with
+                   the value 'true', the leaf MUST be present in an RPC invocation.";
+		type string;
+		mandatory true;
+	    }
+	    leaf y {
+		description
+                 "If a leaf in the input tree has a 'mandatory' statement with the
+                  value 'true', the leaf MUST be present in an RPC invocation.";
+		type string;
+		default "42";
+	    }
+	    leaf-list z {
+		description
+		    "If a leaf-list in the input tree has one or more default 
+                     values, the server MUST use these values (XXX not supported)";
+		type string;
+	    }
+	    leaf w {
+		description
+		    "If any node has a 'when' statement that would evaluate to 
+                    'false',then this node MUST NOT be present in the input tree.
+                     (XXX not supported)";
+		type string;
+		when "/translate/k=5/value='w'";
+	    }
+	}
+	output {
+	    leaf x {
+		type string;
+	    }
+	    leaf y {
+		type string;
+	    }
+	    leaf z {
+		type string;
+	    }
+	    leaf w {
+		type string;
+	    }
+	}
+    }
     rpc debug {
 	description "Set debug level of backend. XXX should be in clixon-config";
 	input {
diff --git a/lib/clixon/clixon_netconf_lib.h b/lib/clixon/clixon_netconf_lib.h
index b22e697b..8f1b9da0 100644
--- a/lib/clixon/clixon_netconf_lib.h
+++ b/lib/clixon/clixon_netconf_lib.h
@@ -47,8 +47,11 @@ int netconf_missing_attribute(cbuf *cb,	char *type, char *info, char *message);
 int netconf_bad_attribute(cbuf *cb, char *type, char *info, char *message);
 int netconf_unknown_attribute(cbuf *cb,	char *type, char *info, char *message);
 int netconf_missing_element(cbuf *cb, char *type, char *element, char *message);
+int netconf_missing_element_xml(cxobj **xret, char *type, char *element, char *message);
 int netconf_bad_element(cbuf *cb, char *type, char *info, char *element);
+int netconf_bad_element_xml(cxobj **xret, char *type, char *info, char *element);
 int netconf_unknown_element(cbuf *cb, char *type, char *element, char *message);
+int netconf_unknown_element_xml(cxobj **xret, char *type, char *element, char *message);
 int netconf_unknown_namespace(cbuf *cb, char *type, char *info, char *message);
 int netconf_access_denied(cbuf *cb, char *type, char *message);
 int netconf_access_denied_xml(cxobj **xret, char *type, char *message);
diff --git a/lib/src/clixon_netconf_lib.c b/lib/src/clixon_netconf_lib.c
index 6c284fc6..8db94c4a 100644
--- a/lib/src/clixon_netconf_lib.c
+++ b/lib/src/clixon_netconf_lib.c
@@ -307,6 +307,45 @@ netconf_unknown_attribute(cbuf *cb,
     goto done;
 }
 
+/*! Common Netconf element XML tree according to RFC 6241 App A
+ * @param[out] xret    Error XML tree. Free with xml_free after use
+ * @param[in]  type    Error type: "application" or "protocol"
+ * @param[in]  tag     Error tag
+ * @param[in]  element bad-element xml
+ * @param[in]  message Error message
+ */
+static int
+netconf_element_xml_common(cxobj **xret,
+			   char   *type,
+			   char   *tag,
+			   char   *element,
+			   char   *message)
+{
+    int   retval =-1;
+    cxobj *xerr;
+    
+    if (*xret == NULL){
+	if ((*xret = xml_new("rpc-reply", NULL, NULL)) == NULL)
+	    goto done;
+    }
+    else if (xml_name_set(*xret, "rpc-reply") < 0)
+	goto done;
+    if ((xerr = xml_new("rpc-error", *xret, NULL)) == NULL)
+	goto done;
+    if (xml_parse_va(&xerr, NULL, "<error-type>%s</error-type>"
+		     "<error-tag>%s</error-tag>"
+		     "<error-info><bad-element>%s</bad-element></error-info>"
+		     "<error-severity>error</error-severity>",
+		     type, tag, element) < 0)
+	goto done;
+    if (message && xml_parse_va(&xerr, NULL, "<error-message>%s</error-message>",
+			 message) < 0)
+	goto done;
+    retval = 0;
+ done:
+    return retval;
+}    
+
 /*! Create Netconf missing-element error XML tree according to RFC 6241 App A
  *
  * An expected element is missing.
@@ -321,32 +360,34 @@ netconf_missing_element(cbuf      *cb,
 			char      *element,
 			char      *message)
 {
-    int   retval = -1;
-    char *encstr = NULL;
+    int    retval = -1;
+    cxobj *xret = NULL;
 
-    if (cprintf(cb, "<rpc-reply><rpc-error>"
-		"<error-type>%s</error-type>"
-		"<error-tag>missing-element</error-tag>"
-		"<error-info><bad-element>%s</bad-element></error-info>"
-		"<error-severity>error</error-severity>",
-		type, element) <0)
-	goto err;
-    if (message){
-	if (xml_chardata_encode(&encstr, "%s", message) < 0)
-	    goto done;
-	if (cprintf(cb, "<error-message>%s</error-message>", encstr) < 0)
-	    goto err;
-    }
-    if (cprintf(cb, "</rpc-error></rpc-reply>") <0)
-	goto err;
+    if (netconf_element_xml_common(&xret, type, "missing-element", element, message) < 0)
+	goto done;
+    if (clicon_xml2cbuf(cb, xret, 0, 0) < 0)
+	goto done;
     retval = 0;
  done:
-    if (encstr)
-	free(encstr);
+    if (xret)
+	xml_free(xret);
     return retval;
- err:
-    clicon_err(OE_XML, errno, "cprintf");
-    goto done;
+}
+
+
+/*! Create Netconf missing-element error XML tree according to RFC 6241 App A
+ * @param[out] xret    Error XML tree. Free with xml_free after use
+ * @param[in]  type    Error type: "application" or "protocol"
+ * @param[in]  element bad-element xml
+ * @param[in]  message Error message
+ */
+int
+netconf_missing_element_xml(cxobj **xret,
+			    char   *type,
+			    char   *element,
+			    char   *message)
+{
+    return netconf_element_xml_common(xret, type, "missing-element", element, message);
 }
 
 /*! Create Netconf bad-element error XML tree according to RFC 6241 App A
@@ -364,32 +405,26 @@ netconf_bad_element(cbuf *cb,
 		    char *element,
 		    char *message)
 {
-    int   retval = -1;
-    char *encstr = NULL;
+    int    retval = -1;
+    cxobj *xret = NULL;
 
-    if (cprintf(cb, "<rpc-reply><rpc-error>"
-		"<error-type>%s</error-type>"
-		"<error-tag>bad-element</error-tag>"
-		"<error-info><bad-element>%s</bad-element></error-info>"
-		"<error-severity>error</error-severity>",
-		type, element) <0)
-	goto err;
-    if (message){
-	if (xml_chardata_encode(&encstr, "%s", message) < 0)
-	    goto done;
-	if (cprintf(cb, "<error-message>%s</error-message>", encstr) < 0)
-	    goto err;
-    }
-    if (cprintf(cb, "</rpc-error></rpc-reply>") <0)
-	goto err;
+    if (netconf_element_xml_common(&xret, type, "bad-element", element, message) < 0)
+	goto done;
+    if (clicon_xml2cbuf(cb, xret, 0, 0) < 0)
+	goto done;
     retval = 0;
  done:
-    if (encstr)
-	free(encstr);
+    if (xret)
+	xml_free(xret);
     return retval;
- err:
-    clicon_err(OE_XML, errno, "cprintf");
-    goto done;
+}
+int
+netconf_bad_element_xml(cxobj **xret,
+			char   *type,
+			char   *element,
+			char   *message)
+{
+    return netconf_element_xml_common(xret, type, "bad-element", element, message);
 }
 
 /*! Create Netconf unknown-element error XML tree according to RFC 6241 App A
@@ -406,32 +441,26 @@ netconf_unknown_element(cbuf *cb,
 			char *element,
 			char *message)
 {
-    int   retval = -1;
-    char *encstr = NULL;
+    int    retval = -1;
+    cxobj *xret = NULL;
 
-    if (cprintf(cb, "<rpc-reply><rpc-error>"
-		"<error-type>%s</error-type>"
-		"<error-tag>unknown-element</error-tag>"
-		"<error-info><bad-element>%s</bad-element></error-info>"
-		"<error-severity>error</error-severity>",
-		type, element) <0)
-	goto err;
-    if (message){
-	if (xml_chardata_encode(&encstr, "%s", message) < 0)
-	    goto done;
-	if (cprintf(cb, "<error-message>%s</error-message>", encstr) < 0)
-	    goto err;
-    }
-    if (cprintf(cb, "</rpc-error></rpc-reply>") <0)
-	goto err;
+    if (netconf_element_xml_common(&xret, type, "unknown-element", element, message) < 0)
+	goto done;
+    if (clicon_xml2cbuf(cb, xret, 0, 0) < 0)
+	goto done;
     retval = 0;
  done:
-    if (encstr)
-	free(encstr);
+    if (xret)
+	xml_free(xret);
     return retval;
- err:
-    clicon_err(OE_XML, errno, "cprintf");
-    goto done;
+}
+int
+netconf_unknown_element_xml(cxobj **xret,
+			    char   *type,
+			    char   *element,
+			    char   *message)
+{
+    return netconf_element_xml_common(xret, type, "unknown-element", element, message);
 }
 
 /*! Create Netconf unknown-namespace error XML tree according to RFC 6241 App A
@@ -476,53 +505,48 @@ netconf_unknown_namespace(cbuf *cb,
     goto done;
 }
 
-/*! Create Netconf access-denied error XML tree according to RFC 6241 App A
+/*! Create Netconf access-denied error cbuf according to RFC 6241 App A
  *
  * Access to the requested protocol operation or data model is denied because 
  * authorization failed.
  * @param[out] cb      CLIgen buf. Error XML is written in this buffer
  * @param[in]  type    Error type: "application" or "protocol"
  * @param[in]  message Error message
+ * @see netconf_access_denied_xml  Same but returns XML tree
  */
 int
 netconf_access_denied(cbuf *cb,
 		      char *type,
 		      char *message)
 {
-    int retval = -1;
-    char *encstr = NULL;
-    
-    if (cprintf(cb, "<rpc-reply><rpc-error>"
-		"<error-type>%s</error-type>"
-		"<error-tag>access-denied</error-tag>"
-		"<error-severity>error</error-severity>",
-		type) <0)
-	goto err;
-    if (message){
-	if (xml_chardata_encode(&encstr, "%s", message) < 0)
-	    goto done;
-	if (cprintf(cb, "<error-message>%s</error-message>", encstr) < 0)
-	    goto err;
-    }
-    if (cprintf(cb, "</rpc-error></rpc-reply>") <0)
-	goto err;
+    int    retval = -1;
+    cxobj *xret = NULL;
+
+    if (netconf_access_denied_xml(&xret, type, message) < 0)
+	goto done;
+    if (clicon_xml2cbuf(cb, xret, 0, 0) < 0)
+	goto done;
     retval = 0;
  done:
-    if (encstr)
-	free(encstr);
+    if (xret)
+	xml_free(xret);
     return retval;
- err:
-    clicon_err(OE_XML, errno, "cprintf");
-    goto done;
 }
 
 /*! Create Netconf access-denied error XML tree according to RFC 6241 App A
  *
  * Access to the requested protocol operation or data model is denied because
  * authorization failed.
- * @param[out] xret    Error XML tree 
+ * @param[out] xret    Error XML tree. Free with xml_free after use
  * @param[in]  type    Error type: "application" or "protocol"
  * @param[in]  message Error message
+ * @code
+ *  cxobj *xret = NULL;
+ *  if (netconf_access_denied_xml(&xret, "protocol", "Unauthorized") < 0)
+ *    err;
+ *  xml_free(xret);
+ * @endcode
+ * @see netconf_access_denied  Same but returns cligen buffer
  */
 int
 netconf_access_denied_xml(cxobj **xret,
@@ -795,37 +819,25 @@ netconf_operation_not_supported(cbuf *cb,
  * @param[out] cb      CLIgen buf. Error XML is written in this buffer
  * @param[in]  type    Error type: "rpc", "application" or "protocol"
  * @param[in]  message Error message
+ * @see netconf_operation_failed_xml  Same but returns XML tree
  */
 int
 netconf_operation_failed(cbuf  *cb,
 			 char  *type,
 			 char  *message)
 {
-    int   retval = -1;
-    char *encstr = NULL;
+    int    retval = -1;
+    cxobj *xret = NULL;
 
-    if (cprintf(cb, "<rpc-reply><rpc-error>"
-		"<error-type>%s</error-type>"
-		"<error-tag>operation-failed</error-tag>"
-		"<error-severity>error</error-severity>",
-		type) <0)
-	goto err;
-    if (message){
-	if (xml_chardata_encode(&encstr, "%s", message) < 0)
-	    goto done;
-	if (cprintf(cb, "<error-message>%s</error-message>", encstr) < 0)
-	    goto err;
-    }
-    if (cprintf(cb, "</rpc-error></rpc-reply>") < 0)
-	goto err;
+    if (netconf_operation_failed_xml(&xret, type, message) < 0)
+	goto done;
+    if (clicon_xml2cbuf(cb, xret, 0, 0) < 0)
+	goto done;
     retval = 0;
  done:
-    if (encstr)
-	free(encstr);
+    if (xret)
+	xml_free(xret);
     return retval;
- err:
-    clicon_err(OE_XML, errno, "cprintf");
-    goto done;
 }
 
 /*! Create Netconf operation-failed error XML tree according to RFC 6241 App A
@@ -835,6 +847,13 @@ netconf_operation_failed(cbuf  *cb,
  * @param[out] xret    Error XML tree 
  * @param[in]  type    Error type: "rpc", "application" or "protocol"
  * @param[in]  message Error message
+ * @code
+ *  cxobj *xret = NULL;
+ *  if (netconf_operation_failed_xml(&xret, "protocol", "Unauthorized") < 0)
+ *    err;
+ *  xml_free(xret);
+ * @endcode
+ * @see netconf_operation_failed  Same but returns cligen buffer
  */
 int
 netconf_operation_failed_xml(cxobj **xret,
@@ -872,35 +891,24 @@ netconf_operation_failed_xml(cxobj **xret,
  * @param[out]  cb      CLIgen buf. Error XML is written in this buffer
  * @param[in]   message Error message
  * @note New in :base:1.1
+ * @see netconf_malformed_message_xml  Same but returns XML tree
  */
 int
 netconf_malformed_message(cbuf  *cb,
 			  char  *message)
 {
     int   retval = -1;
-    char *encstr = NULL;
+    cxobj *xret = NULL;
 
-    if (cprintf(cb, "<rpc-reply><rpc-error>"
-		"<error-type>rpc</error-type>"
-		"<error-tag>malformed-message</error-tag>"
-		"<error-severity>error</error-severity>") <0)
-	goto err;
-    if (message){
-	if (xml_chardata_encode(&encstr, "%s", message) < 0)
-	    goto done;
-	if (cprintf(cb, "<error-message>%s</error-message>", encstr) < 0)
-	    goto err;
-    }
-    if (cprintf(cb, "</rpc-error></rpc-reply>") <0)
-	goto err;
+    if (netconf_malformed_message_xml(&xret, message) < 0)
+	goto done;
+    if (clicon_xml2cbuf(cb, xret, 0, 0) < 0)
+	goto done;
     retval = 0;
  done:
-    if (encstr)
-	free(encstr);
+    if (xret)
+	xml_free(xret);
     return retval;
- err:
-    clicon_err(OE_XML, errno, "cprintf");
-    goto done;
 }
 
 /*! Create Netconf malformed-message error XML tree according to RFC 6241 App A
@@ -911,10 +919,17 @@ netconf_malformed_message(cbuf  *cb,
  * @param[out] xret    Error XML tree 
  * @param[in]  message Error message
  * @note New in :base:1.1
+ * @code
+ *  cxobj *xret = NULL;
+ *  if (netconf_malformed_message_xml(&xret, "Unauthorized") < 0)
+ *    err;
+ *  xml_free(xret);
+ * @endcode
+ * @see netconf_malformed_message  Same but returns cligen buffer
  */
 int
 netconf_malformed_message_xml(cxobj **xret,
-			     char  *message)
+			      char   *message)
 {
     int   retval =-1;
     cxobj *xerr;
diff --git a/lib/src/clixon_xml_map.c b/lib/src/clixon_xml_map.c
index 2263bde2..2644f494 100644
--- a/lib/src/clixon_xml_map.c
+++ b/lib/src/clixon_xml_map.c
@@ -398,6 +398,8 @@ validate_identityref(cxobj     *xt,
  * in [RFC6241].  If output parameters are returned, they are encoded as
  * child elements to the <rpc-reply> element defined in [RFC6241], in
  * the same order as they are defined within the "output" statement.
+ * @see xml_yang_validate_all
+ * @note Should need a variant accepting cxobj **xret
  */
 int
 xml_yang_validate_rpc(cxobj *xrpc,
@@ -454,6 +456,7 @@ xml_yang_validate_rpc(cxobj *xrpc,
  *      fail;
  * @endcode
  * @see xml_yang_validate_all
+ * @note Should need a variant accepting cxobj **xret
  */
 int
 xml_yang_validate_add(cxobj   *xt, 
@@ -503,15 +506,14 @@ xml_yang_validate_add(cxobj   *xt,
 	     * needs to be reparsed when concrete type is selected
 	     */
 	    if ((body = xml_body(xt)) != NULL){
-		if (cv_parse(body, cv) <0){
-		    clicon_err(OE_UNIX, errno, "cv_parse");
-		    goto done;
+		if (cv_parse1(body, cv, &reason) != 1){
+		    if (netconf_bad_element(cbret, "application",  ys->ys_argument, reason) < 0)
+			goto done;
+		    goto fail;
 		}
 		if ((ys_cv_validate(cv, ys, &reason)) != 1){
 		    if (netconf_bad_element(cbret, "application",  ys->ys_argument, reason) < 0)
 			goto done;
-		    if (reason)
-			free(reason);
 		    goto fail;
 		}
 	    }
@@ -531,6 +533,8 @@ xml_yang_validate_add(cxobj   *xt,
  done:
     if (cv)
 	cv_free(cv);
+    if (reason)
+	free(reason);
     return retval;
  fail:
     retval = 0;
@@ -544,7 +548,6 @@ xml_yang_validate_add(cxobj   *xt,
  * @retval     1     Validation OK
  * @retval     0     Validation failed
  * @retval    -1     Error
- * @see xml_yang_validate_add
  * @code
  *   cxobj *x;
  *   cbuf *cbret = cbuf_new();
@@ -553,6 +556,9 @@ xml_yang_validate_add(cxobj   *xt,
  *   if (ret == 0)
  *      fail;
  * @endcode
+ * @see xml_yang_validate_add
+ * @see xml_yang_validate_rpc
+ * @note Should need a variant accepting cxobj **xret
  */
 int
 xml_yang_validate_all(cxobj   *xt, 
diff --git a/test/README.md b/test/README.md
index 7ae292bb..59832663 100644
--- a/test/README.md
+++ b/test/README.md
@@ -1,9 +1,9 @@
 # Clixon tests
 
 This directory contains testing code for clixon and the example
-routing application. Assumes setup of http daemon as describe under apps/restonf
-- clixon    A top-level script clones clixon in /tmp and starts all.sh. You can copy this file (review it first) and place as cron script
-- all.sh    Run through all tests named 'test*.sh' in this directory. Therefore, if you place a test in this directory matching 'test*.sh' it will be run automatically. 
+application. Assumes setup of http daemon as describe under apps/restonf
+- clixon            A top-level script clones clixon in /tmp and starts all.sh. You can copy this file (review it first) and place as cron script
+- all.sh            Run through all tests named 'test*.sh' in this directory. Therefore, if you place a test in this directory matching 'test*.sh' it will be run automatically. By default the script will exit on first error. Run as `all.sh summary` to continue and print a summary on all tests.
 - test_nacm.sh      Auth tests using internal NACM
 - test_nacm_ext.sh  Auth tests using external NACM (separate file)
 - test_cli.sh       CLI tests
@@ -13,3 +13,14 @@ routing application. Assumes setup of http daemon as describe under apps/restonf
 - test_leafref.sh   Yang leafref tests
 - test_datastore.sh Datastore tests
 
+Example runs:
+```
+> run.sh
+# Runs through all tests matching 'test_*.sh' in the directory. Prints test output
+# and stops on first error
+
+> run.sh summary
+# Same as above but continues after errors and does not print test output.
+```
+
+
diff --git a/test/all.sh b/test/all.sh
index d0e92410..79a0309f 100755
--- a/test/all.sh
+++ b/test/all.sh
@@ -1,17 +1,43 @@
 #!/bin/bash
 # Run, eg as:
-# ./run.sh 2>&1 | tee test.log
+# ./all.sh 2>&1 | tee test.log # break on first test
+# ./all.sh summary # to run all tests and print 
+
+summary=0
+if [ $# -gt 0 ]; then 
+    summary=1
+fi
+if [ $# -gt 1 ]; then 
+    echo "usage: $0 [summary] # pipe to dev/null and continue on error"
+    exit -1
+fi
 
 # include err() and new() functions
 . ./lib.sh
-
+err=0
 for test in test*.sh; do
     echo "Running $test"
-    ./$test
-    errcode=$?
+    if [ $summary -ne 0 ]; then
+	./$test  > /dev/null 2>&1
+	errcode=$?
+    else
+	./$test 
+	errcode=$?
+    fi
     if [ $errcode -ne 0 ]; then
-	echo "Error in $test errcode=$errcode"
-	exit $errcode
+	err=1
+	echo -e "\e[31mError in $test errcode=$errcode"
+	echo -ne "\e[0m"
+	if [ $summary -eq 0 ]; then
+	    exit $errcode
+	fi
     fi
 done
-echo OK
+if [ $err -eq 0 ]; then 
+    echo OK
+else
+    echo -e "\e[31mError"
+    echo -ne "\e[0m"
+fi
+
+
diff --git a/test/lib.sh b/test/lib.sh
index 2a66d2d5..3d82e32d 100755
--- a/test/lib.sh
+++ b/test/lib.sh
@@ -38,7 +38,9 @@ if [ ! -d $dir ]; then
 fi
 rm -rf $dir/*
 
-# error and exit, arg is optional extra errmsg
+# error and exit,
+# arg1: expected
+# arg2: errmsg[optional]
 err(){
   echo -e "\e[31m\nError in Test$testnr [$testname]:"
   if [ $# -gt 0 ]; then 
@@ -53,7 +55,7 @@ err(){
   echo "$expect"| od -t c > $dir/clixon-expect
   diff $dir/clixon-expect $dir/clixon-ret 
 
-  exit $testnr
+  exit -1 #$testnr
 }
 
 # Increment test number and print a nice string
@@ -221,8 +223,9 @@ expectwait(){
   done
 #  cat /tmp/flag
   if [ $(cat /tmp/flag) != "ok" ]; then
-      cat /tmp/flag
-      exit
+#      err "ok" $(cat /tmp/flag)
+#      cat /tmp/flag
+      exit -1
   fi
 }
 
@@ -250,5 +253,4 @@ expectmatch(){
 	    fi
 	fi
     fi
-
 }
diff --git a/test/test_nacm.sh b/test/test_nacm.sh
index afd1c29d..389ae010 100755
--- a/test/test_nacm.sh
+++ b/test/test_nacm.sh
@@ -123,7 +123,7 @@ sudo pkill -u www-data -f "/www-data/clixon_restconf"
 
 sleep 1
 new "start restconf daemon (-a is enable basic authentication)"
-sudo su -c "$clixon_restconf -f $cfg -y $fyang -- -a" -s /bin/sh www-data &
+sudo su -c "$clixon_restconf -f $cfg -y $fyang -D $DBG -- -a" -s /bin/sh www-data &
 
 sleep $RCWAIT
 
diff --git a/test/test_nacm_ext.sh b/test/test_nacm_ext.sh
index 2701b2da..9bdee51d 100755
--- a/test/test_nacm_ext.sh
+++ b/test/test_nacm_ext.sh
@@ -155,7 +155,7 @@ new "kill old restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"
 
 new "start restconf daemon (-a is enable http basic auth)"
-sudo su -c "$clixon_restconf -f $cfg -y $fyang -- -a" -s /bin/sh www-data &
+sudo su -c "$clixon_restconf -f $cfg -y $fyang -D $DBG -- -a" -s /bin/sh www-data &
 
 sleep $RCWAIT
 
diff --git a/test/test_nacm_protocol.sh b/test/test_nacm_protocol.sh
index aebaa843..963218e5 100755
--- a/test/test_nacm_protocol.sh
+++ b/test/test_nacm_protocol.sh
@@ -147,7 +147,7 @@ sudo pkill -u www-data -f "/www-data/clixon_restconf"
 
 sleep 1
 new "start restconf daemon (-a is enable basic authentication)"
-sudo su -c "$clixon_restconf -f $cfg -y $fyang -- -a" -s /bin/sh www-data &
+sudo su -c "$clixon_restconf -f $cfg -y $fyang -D $DBG -- -a" -s /bin/sh www-data &
 
 sleep $RCWAIT
 
diff --git a/test/test_perf.sh b/test/test_perf.sh
index 66c7a5b1..4d9d6dfc 100755
--- a/test/test_perf.sh
+++ b/test/test_perf.sh
@@ -78,7 +78,7 @@ new "kill old restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"
 
 new "start restconf daemon"
-sudo su -c "$clixon_restconf -f $cfg -y $fyang" -s /bin/sh www-data &
+sudo su -c "$clixon_restconf -f $cfg -y $fyang -D $DBG" -s /bin/sh www-data &
 
 sleep $RCWAIT
 
diff --git a/test/test_restconf.sh b/test/test_restconf.sh
index 03d20bd9..1874a0b3 100755
--- a/test/test_restconf.sh
+++ b/test/test_restconf.sh
@@ -282,10 +282,10 @@ new2 "restconf rpc using POST json without mandatory element"
 expecteq "$(curl -s -X POST -d '{"input":{"wrongelement":"ipv4"}}' http://localhost/restconf/operations/ietf-routing:fib-route)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "wrongelement"},"error-severity": "error"}}}
'
 
 new2 "restconf rpc non-existing rpc without namespace"
-expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations/kalle)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "yang node not found"}}}
'
+expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations/kalle)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "kalle"},"error-severity": "error","error-message": "RPC not defined"}}}
'
 
 new2 "restconf rpc non-existing rpc"
-expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations/example:kalle)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "yang node not found"}}}
'
+expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations/example:kalle)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "kalle"},"error-severity": "error","error-message": "RPC not defined"}}}
'
 
 new2 "restconf rpc missing name"
 expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "Operation name expected"}}}
'
diff --git a/test/test_restconf2.sh b/test/test_restconf2.sh
index ee820082..1cf7188f 100755
--- a/test/test_restconf2.sh
+++ b/test/test_restconf2.sh
@@ -65,7 +65,7 @@ new "kill old restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"
 
 new "start restconf daemon"
-sudo su -c "$clixon_restconf -f $cfg -y $fyang" -s /bin/sh www-data &
+sudo su -c "$clixon_restconf -f $cfg -y $fyang -D $DBG" -s /bin/sh www-data &
 
 sleep $RCWAIT
 
diff --git a/test/test_rpc.sh b/test/test_rpc.sh
index b1b04251..f28a4df9 100755
--- a/test/test_rpc.sh
+++ b/test/test_rpc.sh
@@ -46,7 +46,7 @@ new "kill old restconf daemon"
 sudo pkill -u www-data clixon_restconf
 
 new "start restconf daemon"
-sudo su -c "$clixon_restconf -f $cfg" -s /bin/sh www-data &
+sudo su -c "$clixon_restconf -f $cfg -D $DBG" -s /bin/sh www-data &
 
 sleep $RCWAIT
 
@@ -54,7 +54,7 @@ new "rpc tests"
 
 # 1.First some positive tests vary media types
 #
-new2 "restconf example rpc json/json default - no headers"
+new2 "restconf example rpc json/json default - no http media headers"
 expecteq "$(curl -s -X POST -d '{"input":{"x":"0"}}' http://localhost/restconf/operations/example:example)" '{"output": {"x": "0","y": "42"}}
 
'
 
@@ -93,13 +93,13 @@ new2 "restconf add extra"
 expecteq "$(curl -s -X POST -d '{"input":{"x":"0","extra":"0"}}' http://localhost/restconf/operations/example:example)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "extra"},"error-severity": "error"}}}
'
 
 new2 "restconf wrong method"
-expecteq "$(curl -s -X POST -d '{"input":{"x":"0"}}' http://localhost/restconf/operations/example:wrong)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "yang node not found"}}}
'
+expecteq "$(curl -s -X POST -d '{"input":{"x":"0"}}' http://localhost/restconf/operations/example:wrong)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "wrong"},"error-severity": "error","error-message": "RPC not defined"}}}
'
 
 new2 "restconf edit-config missing mandatory"
 expecteq "$(curl -s -X POST -d '{"input":null}' http://localhost/restconf/operations/ietf-netconf:edit-config)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "yang module not found"}}}
'
 
 new "netconf kill-session missing session-id mandatory"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><kill-session/></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>missing-element</error-tag><error-info><bad-element>session-id</bad-element></error-info><error-severity>error</error-severity><error-message>Mandatory variable</error-message></rpc-error></rpc-reply>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><kill-session/></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>missing-element</error-tag><error-info><bad-element>session-id</bad-element></error-info><error-severity>error</error-severity><error-message>Mandatory variable</error-message></rpc-error></rpc-reply>]]>]]>$'
 
 # edit-config?
 
diff --git a/test/test_stream.sh b/test/test_stream.sh
index 19ad9802..87932744 100755
--- a/test/test_stream.sh
+++ b/test/test_stream.sh
@@ -121,7 +121,7 @@ new "kill old restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"
       
 new "start restconf daemon"
-sudo su -c "$clixon_restconf -f $cfg -y $fyang" -s /bin/sh www-data &
+sudo su -c "$clixon_restconf -f $cfg -y $fyang -D $DBG" -s /bin/sh www-data &
 
 sleep $RCWAIT
 
@@ -153,7 +153,7 @@ new "netconf NONEXIST subscription"
 expectwait "$clixon_netconf -qf $cfg -y $fyang" '<rpc><create-subscription><stream>NONEXIST</stream></create-subscription></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>invalid-value</error-tag><error-severity>error</error-severity><error-message>No such stream</error-message></rpc-error></rpc-reply>]]>]]>$' $NCWAIT
 
 new "netconf EXAMPLE subscription with wrong date"
-expectwait "$clixon_netconf -qf $cfg -y $fyang" '<rpc><create-subscription><stream>EXAMPLE</stream><startTime>kallekaka</startTime></create-subscription></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>startTime</bad-element></error-info><error-severity>error</error-severity><error-message>Expected timestamp</error-message></rpc-error></rpc-reply>]]>]]>$' 0
+expectwait "$clixon_netconf -qf $cfg -y $fyang" '<rpc><create-subscription><stream>EXAMPLE</stream><startTime>kallekaka</startTime></create-subscription></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>startTime</bad-element></error-info><error-severity>error</error-severity><error-message>Invalid time: kallekaka</error-message></rpc-error></rpc-reply>]]>]]>$' 0
 
 #new "netconf EXAMPLE subscription with replay"
 #NOW=$(date +"%Y-%m-%dT%H:%M:%S")

From 0baebc93fdc86388afe3a205ea192ba8d536f1ec Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Wed, 2 Jan 2019 15:18:29 +0100
Subject: [PATCH 17/72] * Strict namespace setting can be a problem when
 upgrading existing database files, such as startup-db or persistent
 running-db, or any other saved XML file.   * For backward compatibility, load
 of startup and running set CLICON_XML_NS_STRICT to false temporarily. * Added
 three-valued return values for several validate functions where -1 is fatal
 error, 0 is validation failed and 1 is validation OK.   * This includes:
 `xmldb_put`, `xml_yang_validate_all`, `xml_yang_validate_add`,
 `xml_yang_validate_rpc`, `api_path2xml`, `api_path2xpath` * Added new xml
 functions for specific types: `xml_child_nr_notype`, `xml_child_nr_notype`,
 `xml_child_i_type`, `xml_find_type`.

---
 CHANGELOG.md                                  |  75 +-
 DEVELOP.md                                    |   3 +
 README.md                                     |  20 +
 apps/backend/backend_client.c                 |  70 +-
 apps/backend/backend_commit.c                 |  36 +-
 apps/backend/backend_main.c                   | 147 +--
 apps/backend/backend_plugin.c                 |   2 +-
 apps/cli/cli_common.c                         |  33 +-
 apps/cli/cli_show.c                           |  12 +-
 apps/netconf/netconf_main.c                   |   2 +
 apps/netconf/netconf_rpc.c                    |  10 +-
 apps/restconf/README.md                       |  50 +-
 apps/restconf/restconf_methods.c              | 927 +++++++++++++-----
 apps/restconf/restconf_stream.c               |   2 +-
 datastore/datastore_client.c                  |   9 +-
 datastore/text/clixon_xmldb_text.c            |  97 +-
 doc/FAQ.md                                    | 144 +--
 example/README.md                             | 289 +++---
 example/example_backend.c                     |  27 +-
 example/example_cli.c                         |   2 +-
 example/example_cli.cli                       |   2 +-
 example/example_netconf.c                     |   2 +-
 example/example_restconf.c                    |   2 +-
 include/clixon_custom.h                       |   5 -
 lib/clixon/clixon_json.h                      |   1 +
 lib/clixon/clixon_netconf_lib.h               |   3 +-
 lib/clixon/clixon_options.h                   |   3 +
 lib/clixon/clixon_string.h                    |   2 +-
 lib/clixon/clixon_xml.h                       |  13 +-
 lib/clixon/clixon_xml_map.h                   |   6 +-
 lib/clixon/clixon_xml_sort.h                  |   8 +-
 lib/clixon/clixon_yang.h                      |   3 +-
 lib/src/clixon_err.c                          |   1 +
 lib/src/clixon_json.c                         | 151 ++-
 lib/src/clixon_netconf_lib.c                  |  86 +-
 lib/src/clixon_options.c                      |  10 +-
 lib/src/clixon_proto_client.c                 |   4 +-
 lib/src/clixon_string.c                       |  48 +
 lib/src/clixon_xml.c                          | 131 ++-
 lib/src/clixon_xml_db.c                       |   7 +-
 lib/src/clixon_xml_map.c                      | 596 +++++++----
 lib/src/clixon_xml_parse.y                    |  35 +-
 lib/src/clixon_xml_sort.c                     |  37 +-
 lib/src/clixon_yang.c                         | 258 +----
 lib/src/clixon_yang_module.c                  |  12 +-
 test/all.sh                                   |   1 +
 test/test_cli.sh                              |   2 +-
 test/test_compat.sh                           | 116 +++
 test/test_datastore.sh                        |   9 +-
 test/test_feature.sh                          |  14 +-
 test/test_identity.sh                         |  18 +-
 test/test_leafref.sh                          |  17 +-
 test/test_list.sh                             |  14 +-
 test/test_nacm.sh                             |  22 +-
 test/test_nacm_ext.sh                         |  18 +-
 test/test_nacm_protocol.sh                    |  14 +-
 test/test_netconf.sh                          |  49 +-
 test/test_order.sh                            |  67 +-
 test/test_perf.sh                             |  16 +-
 test/test_restconf.sh                         |  97 +-
 test/test_restconf2.sh                        |  55 +-
 test/test_rpc.sh                              |  48 +-
 test/test_startup.sh                          |  12 +-
 test/test_stream.sh                           |  27 +-
 test/test_type.sh                             |   8 +-
 test/test_when_must.sh                        |  12 +-
 test/test_yang.sh                             |  47 +-
 test/test_yang_load.sh                        |  54 +-
 test/test_yang_namespace.sh                   | 116 ++-
 yang/clixon-config@2018-10-21.yang            |  13 +-
 .../ietf-netconf-notification@2008-07-01.yang |   3 +-
 71 files changed, 2679 insertions(+), 1573 deletions(-)
 create mode 100755 test/test_compat.sh

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce4188a4..ad2ebd7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,61 @@
 # Clixon Changelog
 
-## 3.9.0 (Preliminary Target: 31 December 2018)
+## 3.9.0 (Preliminary Target: Mid-January 2019)
 
 ### Planned new features
 * [Roadmap](ROADMAP.md) (Uncommitted and unprioritized)
 
 ### Major New features
+* Correct XML namespace handling
+  * XML multiple modules was based on non-strict semantics so that yang modules were found by iterating thorugh namespaces until a match was made. This did not adhere to proper [XML namespace handling](https://www.w3.org/TR/2009/REC-xml-names-20091208) as well as strict Netconf and Restconf namespace handling, which causes problems with overlapping names and false positives, and most importantly, with standard conformance.
+  * There are still the following non-strict namespace handling:
+    * Everything in ietf-netconf base syntax with namespace `urn:ietf:params:xml:ns:netconf:base:1.0` is default and need not be explicitly given
+    * edit-config xpath select statement does not support namespaces
+    * notifications do not support namespaces.
+  * Below see netconf old (but wrong) netconf RPC:
+  ```
+     <rpc>
+       <my-own-method/>
+     </rpc> 
+     <rpc-reply>
+       <route>
+         <address-family>ipv4</address-family>
+       </route>
+     </rpc-reply>
+  ```
+  This is the currently correct Netconf RPC:
+  ```
+     <rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"> # xmlns may be ommitted
+       <my-own-method xmlns="urn:example:my-own">
+     </rpc>
+     <rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+       <route xmlns="urn:ietf:params:xml:ns:yang:ietf-routing">
+         <address-family>ipv4</address-family>
+       </route>
+     </rpc-reply>
+  ```
+  * Another example for restconf rpc with new correct syntax. Note that while Netconf uses xmlns attribute syntax, Restconf uses module name prefix. First the request:
+  ```
+    POST http://localhost/restconf/operations/example:example)
+    Content-Type: application/yang-data+json
+    {
+      "example:input":{
+        "x":0
+      }
+    }
+  ```
+  then the reply:
+  ```
+    HTTP/1.1 200 OK
+    {
+      "example:output": {
+        "x": "0",
+        "y": "42"
+      }
+    }
+  ```
+  * To keep previous non-strict namespace handling (backwards compatible), set CLICON_XML_NS_STRICT to false.
+  * See https://github.com/clicon/clixon/issues/49
 * NACM extension (RFC8341)
   * NACM module support (RFC8341 A1+A2)
   * Recovery user "_nacm_recovery" added.
@@ -27,25 +77,15 @@
       * Note CLIXON_DATADIR (=/usr/local/share/clixon) need to be in the list
     * CLICON_YANG_MAIN_FILE Provides a filename with a single module filename.
     * CLICON_YANG_MAIN_DIR Provides a directory where all yang modules should be loaded.
-* Correct XML namespace handling
-  * XML multiple modules was based on "loose" semantics so that yang modules were found by iterating thorugh namespaces until a match was made. This did not adhere to proper [XML namespace handling](https://www.w3.org/TR/2009/REC-xml-names-20091208), and causes problems with overlapping names and false positives. Below see XML accepted (but wrong), and correct namespace declaration:
-  ```
-     <rpc><my-own-method></rpc> # Wrong but accepted
-     <rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"> # Correct
-       <my-own-method xmlns="http://example.net/me/my-own/1.0">
-     </rpc>
-  ```
-  * To keep old loose semantics set config option CLICON_XML_NS_ITERATE (true by default)
-  * XML to JSON translator support for mapping xmlns attribute to module name prefix.
-  * Default namespace is still "urn:ietf:params:xml:ns:netconf:base:1.0"
-  * See https://github.com/clicon/clixon/issues/49
 
 ### API changes on existing features (you may need to change your code)
-* Removed delete-config support for candidate db since it is not supported in RFC6241.
+* Strict namespace setting can be a problem when upgrading existing database files, such as startup-db or persistent running-db, or any other saved XML file.
+  * For backward compatibility, load of startup and running set CLICON_XML_NS_STRICT to false temporarily.
+* Removed `delete-config` support for candidate db since it is not supported in RFC6241.
 * Switched the order of `error-type` and `error-tag` in all netconf and restconf error messages to comply to RFC order.
 * Yang parser is stricter (see above) which may break parsing of existing yang specs.
 * XML namespace handling is corrected (see above)
-  * For backward compatibility set config option  CLICON_XML_NS_ITERATE
+  * For backward compatibility set config option  CLICON_XML_NS_LOOSE
 * Yang parser functions have changed signatures. Please check the source if you call these functions.
 * Add `<CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>` to your configuration file, or corresponding CLICON_DATADIR directory for Clixon system yang files.
 * Change all @datamodel:tree to @datamodel in all CLI specification files
@@ -53,6 +93,9 @@
   * For backward compatibility, define CLICON_CLI_MODEL_TREENAME_PATCH in clixon_custom.h
 
 ### Minor changes
+* Added three-valued return values for several validate functions where -1 is fatal error, 0 is validation failed and 1 is validation OK.
+  * This includes: `xmldb_put`, `xml_yang_validate_all`, `xml_yang_validate_add`, `xml_yang_validate_rpc`, `api_path2xml`, `api_path2xpath`
+* Added new xml functions for specific types: `xml_child_nr_notype`, `xml_child_nr_notype`, `xml_child_i_type`, `xml_find_type`.
 * Added example_rpc RPC to example backend
 * Renamed xml_namespace[_set]() to xml_prefix[_set]()
 * Changed all make tags --> make TAGS
@@ -273,7 +316,7 @@ translate {
 
 ### Known issues
 * Namespace name relabeling is not supported.
-  * Eg: if "des" is defined as prefix for an imported module, then a relabeling using xmlfns is not supported, such as:
+  * Eg: if "des" is defined as prefix for an imported module, then a relabeling using xmlns is not supported, such as:
 ```
   <crypto xmlns:x="urn:example:des">x:des3</crypto>
 ```
diff --git a/DEVELOP.md b/DEVELOP.md
index fb66e641..74d7f4ef 100644
--- a/DEVELOP.md
+++ b/DEVELOP.md
@@ -97,6 +97,9 @@ EOF
 
 ## New release
 What to think about when doing a new release.
+* valgrind for memory leaks
+* New clixon-config.yang revision?
+Tagging:
 * git merge --no-ff develop
 * change CLIXON_VERSION in configure.ac
 * git tag -a <version"
diff --git a/README.md b/README.md
index 865cac8a..f086461e 100644
--- a/README.md
+++ b/README.md
@@ -105,6 +105,23 @@ The standards covered include:
 Not supported:
 - !DOCTYPE (ie DTD)
 
+Historically, Clixon has not until 3.9 made strict namespace
+enforcing. For example, the following non-strict netconf was
+previously accepted:
+```
+     <rpc><my-own-method/></rpc> 
+```
+In 3.9, the same statement should be, for example:
+```
+     <rpc><my-own-method xmlns="urn:example:my-own"/></rpc> 
+```
+Note that base netconf syntax is still not enforced but recommended:
+```
+     <rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+        <my-own-method xmlns="urn:example:my-own"/>
+     </rpc> 
+```
+
 Yang
 ====
 YANG and XML is the heart of Clixon.  Yang modules are used as a
@@ -153,6 +170,9 @@ Clixon does not support the following netconf features:
 - edit-config config-text
 - edit-config operation
 
+Some other deviations from the RFC:
+- edit-config xpath select statement does not support namespaces
+
 Restconf
 ========
 Clixon Restconf is a daemon based on FastCGI C-API. Instructions are available to
diff --git a/apps/backend/backend_client.c b/apps/backend/backend_client.c
index baf40269..3e1fa1ad 100644
--- a/apps/backend/backend_client.c
+++ b/apps/backend/backend_client.c
@@ -292,7 +292,7 @@ client_get_streams(clicon_handle   h,
  * @param[in,out] xret    Existing XML tree, merge x into this
  * @retval       -1       Error (fatal)
  * @retval        0       OK
- * @retval        1       Statedata callback failed
+ * @retval        1       Statedata callback failed (clicon_err called)
  */
 static int
 client_statedata(clicon_handle h,
@@ -309,15 +309,15 @@ client_statedata(clicon_handle h,
 	clicon_err(OE_YANG, ENOENT, "No yang spec");
 	goto done;
     }    
-    if (clicon_option_bool(h, "CLICON_STREAM_DISCOVERY_RFC5277") &&
-	(retval = client_get_streams(h, yspec, xpath, "ietf-netconf-notification", "netconf", xret)) != 0)
-    	goto done;
-    if (clicon_option_bool(h, "CLICON_STREAM_DISCOVERY_RFC8040") &&
-	(retval = client_get_streams(h, yspec, xpath, "ietf-restconf-monitoring", "restconf-state", xret)) != 0)
-    	goto done;
-    if (clicon_option_bool(h, "CLICON_MODULE_LIBRARY_RFC7895") &&
-	(retval = yang_modules_state_get(h, yspec, xret)) != 0)
-    	goto done;
+    if (clicon_option_bool(h, "CLICON_STREAM_DISCOVERY_RFC5277"))
+	if ((retval = client_get_streams(h, yspec, xpath, "ietf-netconf-notification", "netconf", xret)) != 0)
+	    goto done;
+    if (clicon_option_bool(h, "CLICON_STREAM_DISCOVERY_RFC8040"))
+	if ((retval = client_get_streams(h, yspec, xpath, "ietf-restconf-monitoring", "restconf-state", xret)) != 0)
+	    goto done;
+    if (clicon_option_bool(h, "CLICON_MODULE_LIBRARY_RFC7895"))
+	if ((retval = yang_modules_state_get(h, yspec, xret)) != 0)
+	    goto done;
     if ((retval = clixon_plugin_statedata(h, yspec, xpath, xret)) != 0)
 	goto done;
     /* Code complex to filter out anything that is outside of xpath */
@@ -339,7 +339,7 @@ client_statedata(clicon_handle h,
     /* reset flag */
     if (xml_apply(*xret, CX_ELMNT, (xml_applyfn_t*)xml_flag_reset, (void*)XML_FLAG_MARK) < 0)
 	goto done;
-    retval = 0;
+    retval = 0; /* OK */
  done:
     if (xvec)
 	free(xvec);
@@ -363,7 +363,6 @@ from_client_get(clicon_handle h,
     char   *xpath = "/";
     cxobj  *xret = NULL;
     int     ret;
-    cbuf   *cbx = NULL; /* Assist cbuf */
     
     if ((xfilter = xml_find(xe, "filter")) != NULL)
 	if ((xpath = xml_find_value(xfilter, "select"))==NULL)
@@ -379,33 +378,24 @@ from_client_get(clicon_handle h,
     clicon_err_reset();
     if ((ret = client_statedata(h, xpath, &xret)) < 0)
 	goto done;
-    if (ret == 0){ /* OK */
-	cprintf(cbret, "<rpc-reply>");
-	if (xret==NULL)
-	    cprintf(cbret, "<data/>");
-	else{
-	    if (xml_name_set(xret, "data") < 0)
-		goto done;
-	    if (clicon_xml2cbuf(cbret, xret, 0, 0) < 0)
-		goto done;
-	}
-	cprintf(cbret, "</rpc-reply>");
-    }
-    else { /* 1 Error from callback */
-	if ((cbx = cbuf_new()) == NULL){
-	    clicon_err(OE_XML, errno, "cbuf_new");
+    if (ret == 1){ /* Error from callback (error in xret) */
+	if (clicon_xml2cbuf(cbret, xret, 0, 0) < 0)
 	    goto done;
-	}	
-	cprintf(cbx, "Internal error:%s", clicon_err_reason);
-	if (netconf_operation_failed(cbret, "rpc", cbuf_get(cbx))< 0)
-	    goto done;
-	clicon_log(LOG_NOTICE, "%s Error in backend_statedata_call:%s", __FUNCTION__, xml_name(xe));
+	goto ok;
     }
+    cprintf(cbret, "<rpc-reply>");     /* OK */
+    if (xret==NULL)
+	cprintf(cbret, "<data/>");
+    else{
+	if (xml_name_set(xret, "data") < 0)
+	    goto done;
+	if (clicon_xml2cbuf(cbret, xret, 0, 0) < 0)
+	    goto done;
+    }
+    cprintf(cbret, "</rpc-reply>");
  ok:
     retval = 0;
  done:
-    if (cbx)
-	cbuf_free(cbx);
     if (xret)
 	xml_free(xret);
     return retval;
@@ -433,6 +423,7 @@ from_client_edit_config(clicon_handle h,
     int                 non_config = 0;
     yang_spec          *yspec;
     cbuf               *cbx = NULL; /* Assist cbuf */
+    int                 ret;
 
     if ((yspec =  clicon_dbspec_yang(h)) == NULL){
 	clicon_err(OE_YANG, ENOENT, "No yang spec9");
@@ -491,24 +482,27 @@ from_client_edit_config(clicon_handle h,
 	/* Cant do this earlier since we dont have a yang spec to
 	 * the upper part of the tree, until we get the "config" tree.
 	 */
-	if (xml_child_sort && xml_apply0(xc, CX_ELMNT, xml_sort, NULL) < 0)
+	if (clicon_xml_sort(h) && xml_apply0(xc, CX_ELMNT, xml_sort, NULL) < 0)
 	    goto done;
-	if (xmldb_put(h, target, operation, xc, cbret) < 0){
+	if ((ret = xmldb_put(h, target, operation, xc, cbret)) < 0){
 	    clicon_debug(1, "%s ERROR PUT", __FUNCTION__);	
 	    if (netconf_operation_failed(cbret, "protocol", clicon_err_reason)< 0)
 		goto done;
 	    goto ok;
 	}
+	if (ret == 0)
+	    goto ok;
     }
+    assert(cbuf_len(cbret) == 0);
+    cprintf(cbret, "<rpc-reply><ok/></rpc-reply>");
  ok:
-    if (!cbuf_len(cbret))
-	cprintf(cbret, "<rpc-reply><ok/></rpc-reply>");
     retval = 0;
  done:
     if (cbx)
 	cbuf_free(cbx);
     clicon_debug(1, "%s done cbret:%s", __FUNCTION__, cbuf_get(cbret));	
     return retval;
+    
 } /* from_client_edit_config */
 
 /*! Internal message: Lock database
diff --git a/apps/backend/backend_commit.c b/apps/backend/backend_commit.c
index 88ea9e99..7c29131a 100644
--- a/apps/backend/backend_commit.c
+++ b/apps/backend/backend_commit.c
@@ -165,12 +165,24 @@ validate_common(clicon_handle       h,
 	clicon_err(OE_FATAL, 0, "No DB_SPEC");
 	goto done;
     }	
-    /* 2. Parse xml trees */
+    /* 2. Parse xml trees 
+     * This is the state we are going from */
     if (xmldb_get(h, "running", "/", 1, &td->td_src) < 0)
 	goto done;
+    /* This is the state we are going to */
     if (xmldb_get(h, candidate, "/", 1, &td->td_target) < 0)
 	goto done;
 
+    /* Validate the target state. It is not completely clear this should be done 
+     * here. It is being made in generic_validate below. 
+     * But xml_diff requires some basic validation, at least check that yang-specs
+     * have been assigned
+     */
+    if ((ret = xml_yang_validate_all_top(td->td_target, cbret)) < 0)
+	goto done;
+    if (ret == 0)
+	goto fail;
+
     /* 3. Compute differences */
     if (xml_diff(yspec, 
 		 td->td_src,
@@ -240,7 +252,7 @@ validate_common(clicon_handle       h,
  * do something more drastic?
  * @param[in]  h         Clicon handle
  * @param[in]  candidate A candidate database, not necessarily "candidate"
- * @retval   -1       Error - or validation failed (but cbret not set)
+ * @retval   -1       Error - or validation failed 
  * @retval    0       Validation failed (with cbret set)
  * @retval    1       Validation OK       
  * @note Need to differentiate between error and validation fail
@@ -259,7 +271,9 @@ candidate_commit(clicon_handle h,
     if ((td = transaction_new()) == NULL)
 	goto done;
 
-    /* Common steps (with validate). Note this is only call that uses 3-values */
+    /* Common steps (with validate). Load candidate and running and compute diffs
+     * Note this is only call that uses 3-values
+     */
     if ((ret = validate_common(h, candidate, td, cbret)) < 0)
 	goto done;
     if (ret == 0)
@@ -270,12 +284,14 @@ candidate_commit(clicon_handle h,
 	 goto done;
 
      /* Optionally write (potentially modified) tree back to candidate */
-     if (clicon_option_bool(h, "CLICON_TRANSACTION_MOD"))
-	 if (xmldb_put(h, candidate, OP_REPLACE, td->td_target, NULL) < 0)
+     if (clicon_option_bool(h, "CLICON_TRANSACTION_MOD")){
+	 if ((ret = xmldb_put(h, candidate, OP_REPLACE, td->td_target, NULL)) < 0)
 	     goto done;
+	 if (ret == 0)
+	     goto fail;
+     }
      /* 8. Success: Copy candidate to running 
       */
-
      if (xmldb_copy(h, candidate, "running") < 0)
 	 goto done;
 
@@ -423,9 +439,11 @@ from_client_validate(clicon_handle h,
 	goto ok;
     }
     /* Optionally write (potentially modified) tree back to candidate */
-     if (clicon_option_bool(h, "CLICON_TRANSACTION_MOD"))
-	 if (xmldb_put(h, "candidate", OP_REPLACE, td->td_target, NULL) < 0)
-	     goto done;
+    if (clicon_option_bool(h, "CLICON_TRANSACTION_MOD")){
+	if ((ret = xmldb_put(h, "candidate", OP_REPLACE, td->td_target, cbret)) < 0)
+	    goto done;
+	goto ok;
+    }
     cprintf(cbret, "<rpc-reply><ok/></rpc-reply>");
  ok:
     retval = 0;
diff --git a/apps/backend/backend_main.c b/apps/backend/backend_main.c
index 8e433d85..ba297852 100644
--- a/apps/backend/backend_main.c
+++ b/apps/backend/backend_main.c
@@ -176,22 +176,24 @@ db_reset(clicon_handle h,
 }
 
 /*! Merge db1 into db2 without commit 
+ * @retval   -1       Error
+ * @retval    0       Validation failed (with cbret set)
+ * @retval    1       Validation OK       
  */
 static int
 db_merge(clicon_handle h,
  	 const char   *db1,
-    	 const char   *db2)
+    	 const char   *db2,
+	 cbuf         *cbret)
 {
-    int retval = -1;
-    cxobj  *xt = NULL;
-
+    int    retval = -1;
+    cxobj *xt = NULL;
+    
     /* Get data as xml from db1 */
     if (xmldb_get(h, (char*)db1, NULL, 1, &xt) < 0)
 	goto done;
     /* Merge xml into db2. Without commit */
-    if (xmldb_put(h, (char*)db2, OP_MERGE, xt, NULL) < 0)
-	goto done;
-    retval = 0;
+    retval = xmldb_put(h, (char*)db2, OP_MERGE, xt, cbret);
  done:
     if (xt)
 	xml_free(xt);
@@ -288,18 +290,22 @@ nacm_load_external(clicon_handle h)
 }
 
 /*! Merge xml in filename into database
+ * @retval   -1       Error
+ * @retval    0       Validation failed (with cbret set)
+ * @retval    1       Validation OK       
  */
 static int
 load_extraxml(clicon_handle h,
 	      char         *filename,
-	      const char   *db)
+	      const char   *db,
+	      cbuf         *cbret)
 {
     int    retval =  -1;
     cxobj *xt = NULL;
     int    fd = -1;
-    
+
     if (filename == NULL)
-	return 0;
+	return 1;
     if ((fd = open(filename, O_RDONLY)) < 0){
 	clicon_err(OE_UNIX, errno, "open(%s)", filename);
 	goto done;
@@ -310,9 +316,7 @@ load_extraxml(clicon_handle h,
     if (xml_rootchild(xt, 0, &xt) < 0)
 	goto done;
     /* Merge user reset state */
-    if (xmldb_put(h, (char*)db, OP_MERGE, xt, NULL) < 0)
-	goto done;
-    retval = 0;
+    retval = xmldb_put(h, (char*)db, OP_MERGE, xt, cbret);
  done:
     if (fd != -1)
 	close(fd);
@@ -385,9 +389,13 @@ static int
 startup_mode_running(clicon_handle h,
     		     char         *extraxml_file)
 {
-    int     retval = -1;
-    cbuf   *cbret = NULL;
+    int   retval = -1;
+    cbuf *cbret = NULL;
 
+    if ((cbret = cbuf_new()) == NULL){
+	clicon_err(OE_XML, errno, "cbuf_new");
+	goto done;
+    }
     /* Stash original running to candidate for later commit */
     if (xmldb_copy(h, "running", "candidate") < 0)
 	goto done;
@@ -400,41 +408,46 @@ startup_mode_running(clicon_handle h,
     /* Application may define extra xml in its reset function*/
     if (clixon_plugin_reset(h, "tmp") < 0)   
 	goto done;
+    /* XXX Kludge to low-level functions to search for xml in all yang modules */
+    _CLICON_XML_NS_STRICT = 0;
     /* Get application extra xml from file */
-    if (load_extraxml(h, extraxml_file, "tmp") < 0)   
-	goto done;	    
+    if (load_extraxml(h, extraxml_file, "tmp", cbret) < 1)   
+	goto fail;	    
     /* Clear running db */
     if (db_reset(h, "running") < 0)
 	goto done;
-    if ((cbret = cbuf_new()) == NULL){
-	clicon_err(OE_XML, errno, "cbuf_new");
-	goto done;
-    }
     /* Commit original running. Assume -1 is validate fail */
-    if (candidate_commit(h, "candidate", cbret) < 1){
-	/*  (1) We cannot differentiate between fatal errors and validation
-	 *      failures
-	 *  (2) If fatal error, we should exit
-	 *  (3) If validation fails we cannot continue. How could we?
-	 *  (4) Need to restore the running db since we destroyed it above
-	 */
-	clicon_log(LOG_NOTICE, "%s: Commit of saved running failed, exiting: %s.",
-		   __FUNCTION__, cbuf_get(cbret));
-	/* Reinstate original */
-	if (xmldb_copy(h, "candidate", "running") < 0)
-	    goto done;
-	goto done;
-    }
+    if (candidate_commit(h, "candidate", cbret) < 1)
+	goto fail;
     /* Merge user reset state and extra xml file (no commit) */
-    if (db_merge(h, "tmp", "running") < 0)
-	goto done;
+    if (db_merge(h, "tmp", "running", cbret) < 1)
+	goto fail;
     retval = 0;
  done:
+    /* XXX Kludge to low-level functions to search for xml in all yang modules */
+    _CLICON_XML_NS_STRICT = clicon_option_bool(h, "CLICON_XML_NS_STRICT");
     if (cbret)
 	cbuf_free(cbret);
     if (xmldb_delete(h, "tmp") < 0)
 	goto done;
     return retval;
+ fail:
+    /*  (1) We cannot differentiate between fatal errors and validation
+     *      failures
+     *  (2) If fatal error, we should exit
+     *  (3) If validation fails we cannot continue. How could we?
+     *  (4) Need to restore the running db since we destroyed it above
+     */
+    if (strlen(cbuf_get(cbret)))
+	clicon_log(LOG_NOTICE, "%s: Commit of running failed, exiting: %s.",
+		   __FUNCTION__, cbuf_get(cbret));
+    else
+	clicon_log(LOG_NOTICE, "%s: Commit of running failed, exiting: %s.",
+		   __FUNCTION__, clicon_err_reason);
+    /* Reinstate original */
+    if (xmldb_copy(h, "candidate", "running") < 0)
+	goto done;
+    goto done;
 }
 
 /*! Clixon startup startup mode: Commit startup configuration into running state
@@ -460,11 +473,16 @@ startup    -------------------------+--|
  */
 static int
 startup_mode_startup(clicon_handle h,
-		     char *extraxml_file)
+		     char         *extraxml_file)
 {
     int     retval = -1;
     cbuf   *cbret = NULL;
 
+    /* Create return buffer for netconf xml errors */
+    if ((cbret = cbuf_new()) == NULL){
+	clicon_err(OE_XML, errno, "cbuf_new");
+	goto done;
+    }
     /* Stash original running to backup */
     if (xmldb_copy(h, "running", "backup") < 0)
 	goto done;
@@ -481,34 +499,25 @@ startup_mode_startup(clicon_handle h,
     /* Application may define extra xml in its reset function*/
     if (clixon_plugin_reset(h, "tmp") < 0)  
 	goto done;
+    /* XXX Kludge to low-level functions to search for xml in all yang modules */
+    _CLICON_XML_NS_STRICT = 0;
     /* Get application extra xml from file */
-    if (load_extraxml(h, extraxml_file, "tmp") < 0)   
-	goto done;	    
+    if (load_extraxml(h, extraxml_file, "tmp", cbret) < 1)   
+	goto fail;	    
     /* Clear running db */
     if (db_reset(h, "running") < 0)
 	goto done;
-    /* Create return buffer (not used) */
-    if ((cbret = cbuf_new()) == NULL){
-	clicon_err(OE_XML, errno, "cbuf_new");
-	goto done;
-    }
+
     /* Commit startup */
-    if (candidate_commit(h, "startup", cbret) < 1){ /* diff */
-	/*  We cannot differentiate between fatal errors and validation
-	 *  failures
-	 *  In both cases we copy back the original running and quit
-	 */
-	clicon_log(LOG_NOTICE, "%s: Commit of startup failed, exiting: %s.",
-		   __FUNCTION__, cbuf_get(cbret));
-	if (xmldb_copy(h, "backup", "running") < 0)
-	    goto done;
-	goto done;
-    }
+    if (candidate_commit(h, "startup", cbret) < 1) /* diff */
+	goto fail;
     /* Merge user reset state and extra xml file (no commit) */
-    if (db_merge(h, "tmp", "running") < 0)
-	goto done;
+    if (db_merge(h, "tmp", "running", cbret) < 1)
+	goto fail;
     retval = 0;
  done:
+    /* XXX Kludge to low-level functions to search for xml in all yang modules */
+    _CLICON_XML_NS_STRICT = clicon_option_bool(h, "CLICON_XML_NS_STRICT");
     if (cbret)
 	cbuf_free(cbret);
     if (xmldb_delete(h, "backup") < 0)
@@ -516,6 +525,20 @@ startup_mode_startup(clicon_handle h,
     if (xmldb_delete(h, "tmp") < 0)
 	goto done;
     return retval;
+ fail:
+    /*  We cannot differentiate between fatal errors and validation
+     *  failures
+     *  In both cases we copy back the original running and quit
+     */
+    if (strlen(cbuf_get(cbret)))
+	clicon_log(LOG_NOTICE, "%s: Commit of startup failed, exiting: %s.",
+		   __FUNCTION__, cbuf_get(cbret));
+    else
+	clicon_log(LOG_NOTICE, "%s: Commit of startup failed, exiting: %s.",
+		   __FUNCTION__, clicon_err_reason);
+    if (xmldb_copy(h, "backup", "running") < 0)
+	goto done;
+    goto done;
 }
 
 int
@@ -540,7 +563,6 @@ main(int    argc,
     int           sockfamily;
     char         *xmldb_plugin;
     int           xml_cache;
-    int           xml_pretty;
     char         *xml_format;
     char         *nacm_mode;
     int           logdst = CLICON_LOG_SYSLOG|CLICON_LOG_STDERR;
@@ -808,9 +830,10 @@ main(int    argc,
     if ((xml_format = clicon_option_str(h, "CLICON_XMLDB_FORMAT")) >= 0)
 	if (xmldb_setopt(h, "format", (void*)xml_format) < 0)
 	    goto done;
-    if ((xml_pretty = clicon_option_bool(h, "CLICON_XMLDB_PRETTY")) >= 0)
-	if (xmldb_setopt(h, "pretty", (void*)(intptr_t)xml_pretty) < 0)
-	    goto done;
+    if (xmldb_setopt(h, "pretty", (void*)(intptr_t)clicon_option_bool(h, "CLICON_XMLDB_PRETTY")) < 0)
+	goto done;
+    if (xmldb_setopt(h, "sort", (void*)(intptr_t)clicon_option_bool(h, "CLICON_XML_SORT")) < 0)
+	goto done;
     /* Startup mode needs to be defined,  */
     startup_mode = clicon_startup_mode(h);
     if (startup_mode == -1){ 	
diff --git a/apps/backend/backend_plugin.c b/apps/backend/backend_plugin.c
index e8ce2972..996a27cb 100644
--- a/apps/backend/backend_plugin.c
+++ b/apps/backend/backend_plugin.c
@@ -117,7 +117,7 @@ clixon_plugin_reset(clicon_handle h,
  * @param[in,out] xtop    State XML tree is merged with existing tree.
  * @retval       -1       Error
  * @retval        0       OK
- * @retval        1       Statedata callback failed
+ * @retval        1       Statedata callback failed (xret set with netconf-error)
  * @note xtop can be replaced
  */
 int
diff --git a/apps/cli/cli_common.c b/apps/cli/cli_common.c
index 7e6f1307..f6796f58 100644
--- a/apps/cli/cli_common.c
+++ b/apps/cli/cli_common.c
@@ -236,8 +236,8 @@ cli_dbxml(clicon_handle       h,
     if ((xtop = xml_new("config", NULL, NULL)) == NULL)
 	goto done;
     xbot = xtop;
-    if (api_path && api_path2xml(api_path, yspec, xtop, YC_DATANODE, &xbot, &y) < 0)
-	goto done;
+    if (api_path && api_path2xml(api_path, yspec, xtop, YC_DATANODE, &xbot, &y) < 1)
+	goto done; 
     if ((xa = xml_new("operation", xbot, NULL)) == NULL)
 	goto done;
     xml_type_set(xa, CX_ATTR);
@@ -293,7 +293,7 @@ cli_set(clicon_handle h,
 	cvec         *cvv,
 	cvec         *argv)
 {
-    int retval = 1;
+    int retval = -1;
 
     if (cli_dbxml(h, cvv, argv, OP_REPLACE) < 0)
 	goto done;
@@ -501,53 +501,54 @@ cli_start_shell(clicon_handle h,
 		cvec         *vars, 
 		cvec         *argv)
 {
-    char *cmd;
+    char          *cmd;
     struct passwd *pw;
-    int retval;
-    char bcmd[128];
-    cg_var *cv1 = cvec_i(vars, 1);
+    int            retval = -1;
+    char           bcmd[128];
+    cg_var        *cv1 = cvec_i(vars, 1);
 
     cmd = (cvec_len(vars)>1 ? cv_string_get(cv1) : NULL);
 
     if ((pw = getpwuid(getuid())) == NULL){
 	fprintf(stderr, "%s: getpwuid: %s\n", 
                __FUNCTION__, strerror(errno));
-	return -1;
+	goto done;
     }
     if (chdir(pw->pw_dir) < 0){
 	fprintf(stderr, "%s: chdir(%s): %s\n",
 		__FUNCTION__, pw->pw_dir, strerror(errno));
 	endpwent();
-	return -1;
+	goto done;
     }
     endpwent();
     cli_signal_flush(h);
     cli_signal_unblock(h);
     if (cmd){
 	snprintf(bcmd, 128, "bash -l -c \"%s\"", cmd);
-	if ((retval = system(bcmd)) < 0){
+	if (system(bcmd) < 0){
 	    cli_signal_block(h);
 	    fprintf(stderr, "%s: system(bash -c): %s\n", 
 		    __FUNCTION__, strerror(errno));
-	    return -1;
+	    goto done;
 	}
     }
     else
-	if ((retval = system("bash -l")) < 0){
+	if (system("bash -l") < 0){
 	    cli_signal_block(h);
 	    fprintf(stderr, "%s: system(bash): %s\n", 
 		    __FUNCTION__, strerror(errno));
-	    return -1;
+	    goto done;
 	}
     cli_signal_block(h);
 #if 0 /* Allow errcodes from bash */
     if (retval != 0){
 	fprintf(stderr, "%s: system(%s) code=%d\n", __FUNCTION__, cmd, retval);
-      return -1;
+	goto done;
     }
 #endif
-
-    return 0;
+    retval = 0;
+ done:
+    return retval;
 }
 
 /*! Generic quit callback
diff --git a/apps/cli/cli_show.c b/apps/cli/cli_show.c
index 2e56f329..ec39ac4e 100644
--- a/apps/cli/cli_show.c
+++ b/apps/cli/cli_show.c
@@ -171,7 +171,7 @@ expand_dbvar(void   *h,
     /* This is primarily to get "y", 
      * xpath2xml would have worked!!
      */
-    if (api_path && api_path2xml(api_path, yspec, xtop, YC_DATANODE, &xbot, &y) < 0)
+    if (api_path && api_path2xml(api_path, yspec, xtop, YC_DATANODE, &xbot, &y) < 1)
 	goto done;
     if (y==NULL)
 	goto ok;
@@ -443,6 +443,7 @@ cli_show_config(clicon_handle h,
     cxobj           *xc;
     cxobj           *xerr;
     enum genmodel_type gt;
+    yang_spec       *yspec;
     
     if (cvec_len(argv) != 3 && cvec_len(argv) != 4){
 	clicon_err(OE_PLUGIN, 0, "Got %d arguments. Expected: <dbname>,<format>,<xpath>[,<attr>]", cvec_len(argv));
@@ -496,6 +497,13 @@ cli_show_config(clicon_handle h,
 	clicon_rpc_generate_error("Get configuration", xerr);
 	goto done;
     }
+    if ((yspec = clicon_dbspec_yang(h)) == NULL){
+	clicon_err(OE_FATAL, 0, "No DB_SPEC");
+	goto done;
+    }
+    /* Some formats (eg cli) require yang */
+    if (xml_apply(xt, CX_ELMNT, xml_spec_populate, yspec) < 0)
+	goto done;
     /* Print configuration according to format */
     switch (format){
     case FORMAT_XML:
@@ -516,7 +524,7 @@ cli_show_config(clicon_handle h,
 	if ((gt = clicon_cli_genmodel_type(h)) == GT_ERR)
 	    goto done;
 	xc = NULL; /* Dont print xt itself */
-	while ((xc = xml_child_each(xt, xc, -1)) != NULL)
+	while ((xc = xml_child_each(xt, xc, CX_ELMNT)) != NULL)
 	    xml2cli(stdout, xc, NULL, gt); /* cli syntax */
 	break;
     case FORMAT_NETCONF:
diff --git a/apps/netconf/netconf_main.c b/apps/netconf/netconf_main.c
index dc57126e..4cdef1a0 100644
--- a/apps/netconf/netconf_main.c
+++ b/apps/netconf/netconf_main.c
@@ -118,6 +118,8 @@ process_incoming_packet(clicon_handle h,
     free(str0);
     if ((xrpc=xpath_first(xreq, "//rpc")) != NULL){
         isrpc++;
+	if (xml_spec_populate_rpc(h, xrpc, yspec) < 0)
+	    goto done;
 	if ((ret = xml_yang_validate_rpc(xrpc, cbret)) < 0) 
 	    goto done;
 	if (ret == 0){
diff --git a/apps/netconf/netconf_rpc.c b/apps/netconf/netconf_rpc.c
index 4d9b354a..7945110e 100644
--- a/apps/netconf/netconf_rpc.c
+++ b/apps/netconf/netconf_rpc.c
@@ -905,13 +905,9 @@ netconf_application_rpc(clicon_handle h,
 	goto ok;
     }
     yrpc = yang_find((yang_node*)ymod, Y_RPC, xml_name(xn));
-    if ((yrpc==NULL) && _CLICON_XML_NS_ITERATE){
-	int i;
-	for (i=0; i<yspec->yp_len; i++){
-	    ymod = yspec->yp_stmt[i];
-	    if ((yrpc = yang_find((yang_node*)ymod, Y_RPC, xml_name(xn))) != NULL)
-		break;
-	}
+    if ((yrpc==NULL) && !_CLICON_XML_NS_STRICT){
+	if (xml_yang_find_non_strict(xn, yspec, &yrpc) < 0) /* Y_RPC */
+		goto done;
     }
     /* Check if found */
     if (yrpc != NULL){
diff --git a/apps/restconf/README.md b/apps/restconf/README.md
index 972ab99f..2295e3fa 100644
--- a/apps/restconf/README.md
+++ b/apps/restconf/README.md
@@ -1,11 +1,11 @@
 # Clixon Restconf
 
-  * [Installation](#Installation)
-  * [Streams](Streams)
-  * [Nchan Streams](Nchan)
-  * [Debugging](Debugging)	
+  * [Installation](#installation)
+  * [Streams](#streams)
+  * [Nchan Streams](#nchan-streams)
+  * [Debugging](#debugging)	
 
-### 1. Installation
+## 1. Installation
 
 The examples are based on Nginx. Other reverse proxies should work but are not verified.
 
@@ -44,39 +44,39 @@ sudo systemctl start start.service
 
 Start clixon restconf daemon
 ```
-olof@vandal> sudo su -c "/www-data/clixon_restconf -f /usr/local/etc/example.xml " -s /bin/sh www-data
+> sudo su -c "/www-data/clixon_restconf -f /usr/local/etc/example.xml " -s /bin/sh www-data
 ```
 
 Make restconf calls with curl
 ```
-olof@vandal> curl -G http://127.0.0.1/restconf/data/interfaces
+> curl -G http://127.0.0.1/restconf/data/ietf-interfaces:interfaces
 [
   {
-    "interfaces": {
+    "ietf-interfaces:interfaces": {
       "interface":[
         {
-          "name": "eth0",
-          "type": "eth",
-          "enabled": "true",
           "name": "eth9",
-          "type": "eth",
-          "enabled": "true"
+          "type": "ex:eth",
+          "enabled": true,
          }
       ]
     }
   }
 ]
-olof@vandal> curl -G http://127.0.0.1/restconf/data/interfaces/interface/name=eth9/type
-[
-  {
-    "type": "eth" 
-  }
-]
-
-curl -sX POST -d '{"interfaces":{"interface":{"name":"eth1","type":"eth","enabled":"true"}}}' http://localhost/restconf/data
+```
+Get the type of a specific interface:
+```
+> curl -G http://127.0.0.1/restconf/data/interfaces/interface=eth9/type
+{
+  "ietf-interfaces:type": "eth" 
+}
+```
+Example of writing a new interfaces specification:
+```
+curl -sX PUT http://localhost/restconf/data -d '{"ietf-interfaces:interfaces":{"interface":{"name":"eth1","type":"ex:eth","enabled":true}}}' 
 ```
 
-### 2. Streams
+## 2. Streams
 
 Clixon have two experimental restconf event stream implementations following
 RFC8040 Section 6 using SSE.  One native and one using Nginx
@@ -112,7 +112,7 @@ Add the following to extend the nginx configuration file with the following stat
 
 AN example of a stream access is as follows:
 ```
-vandal> curl -H "Accept: text/event-stream" -s -X GET http://localhost/streams/EXAMPLE
+> curl -H "Accept: text/event-stream" -s -X GET http://localhost/streams/EXAMPLE
 data: <notification xmlns="urn:ietf:params:xml:ns:netconf:notification:1.0"><eventTime>2018-11-04T14:47:11.373124</eventTime><event><event-class>fault</event-class><reportingEntity><card>Ethernet0</card></reportingEntity><severity>major</severity></event></notification>
 
 data: <notification xmlns="urn:ietf:params:xml:ns:netconf:notification:1.0"><eventTime>2018-11-04T14:47:16.375265</eventTime><event><event-class>fault</event-class><reportingEntity><card>Ethernet0</card></reportingEntity><severity>major</severity></event></notification>
@@ -125,7 +125,7 @@ You can also specify start and stop time. Start-time enables replay of existing
 
 See (stream tests)[../test/test_streams.sh] for more examples.
 
-### 3. Nchan
+## 3. Nchan
 
 As an alternative streams implementation, Nginx/Nchan can be used. 
 Nginx uses pub/sub channels and can be configured in a variety of
@@ -180,7 +180,7 @@ curl -H "Accept: text/event-stream" -H "Last-Event-ID: 1539961709:0" -s -X GET h
 
 See (https://nchan.io/#eventsource) on more info on how to access an SSE sub endpoint.
 
-### 4. Debugging
+## 4. Debugging
 
 Start the restconf fastcgi program with debug flag:
 ```
diff --git a/apps/restconf/restconf_methods.c b/apps/restconf/restconf_methods.c
index a11d55c1..b2910a1b 100644
--- a/apps/restconf/restconf_methods.c
+++ b/apps/restconf/restconf_methods.c
@@ -93,6 +93,7 @@ Mapping netconf error-tag -> status code
                  | malformed-message       | 400         |
                  +-------------------------+-------------+
 
+ * "api-path" is "URI-encoded path expression" definition in RFC8040 3.5.3
  */
 
 #ifdef HAVE_CONFIG_H
@@ -195,20 +196,26 @@ api_data_get2(clicon_handle h,
     size_t     xlen;
     int        i;
     cxobj     *x;
-
+    int        ret;
+    
     clicon_debug(1, "%s", __FUNCTION__);
     yspec = clicon_dbspec_yang(h);
     if ((cbpath = cbuf_new()) == NULL)
         goto done;
     cprintf(cbpath, "/");
-    clicon_debug(1, "%s pi:%d", __FUNCTION__, pi);
     /* We know "data" is element pi-1 */
-    if (api_path2xpath_cvv(yspec, pcvec, pi, cbpath) < 0){
+    if ((ret = api_path2xpath(yspec, pcvec, pi, cbpath)) < 0)
+	goto done;
+    if (ret == 0){
 	if (netconf_operation_failed_xml(&xerr, "protocol", clicon_err_reason) < 0)
 	    goto done;
-	if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
-	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
-		goto done;
+	clicon_err_reset();
+	if ((xe = xpath_first(xerr, "rpc-error")) == NULL){
+	    clicon_err(OE_XML, EINVAL, "rpc-error not found (internal error)");
+	    goto done;
+	}
+	if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+	    goto done;
 	goto ok;
     }
     path = cbuf_get(cbpath);
@@ -216,24 +223,29 @@ api_data_get2(clicon_handle h,
     if (clicon_rpc_get(h, path, &xret) < 0){
 	if (netconf_operation_failed_xml(&xerr, "protocol", clicon_err_reason) < 0)
 	    goto done;
-	if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
-	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
-		goto done;
+	if ((xe = xpath_first(xerr, "rpc-error")) == NULL){
+	    clicon_err(OE_XML, EINVAL, "rpc-error not found (internal error)");
+	    goto done;
+	}
+	if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+	    goto done;
 	goto ok;
     }
+    if (xml_apply(xret, CX_ELMNT, xml_spec_populate, yspec) < 0)
+	goto done;
     /* We get return via netconf which is complete tree from root 
      * We need to cut that tree to only the object.
      */
-#if 1 /* DEBUG */
-    {
+#if 0 /* DEBUG */
+    if (debug){
 	cbuf *cb = cbuf_new();
 	clicon_xml2cbuf(cb, xret, 0, 0);
 	clicon_debug(1, "%s xret:%s", __FUNCTION__, cbuf_get(cb));
 	cbuf_free(cb);
     }
 #endif
-    /* Check if error return XXX this needs more work */
-    if ((xe = xpath_first(xret, "/rpc-error")) != NULL){
+    /* Check if error return  */
+    if ((xe = xpath_first(xret, "//rpc-error")) != NULL){
 	if (api_return_err(h, r, xe, pretty, use_xml) < 0)
 	    goto done;
 	goto ok;
@@ -241,11 +253,12 @@ api_data_get2(clicon_handle h,
     /* Normal return, no error */
     if ((cbx = cbuf_new()) == NULL)
 	goto done;
-    FCGX_SetExitStatus(200, r->out); /* OK */
-    FCGX_FPrintF(r->out, "Content-Type: application/yang-data+%s\r\n", use_xml?"xml":"json");
-    FCGX_FPrintF(r->out, "\r\n");
-    if (head)
+    if (head){
+	FCGX_SetExitStatus(200, r->out); /* OK */
+	FCGX_FPrintF(r->out, "Content-Type: application/yang-data+%s\r\n", use_xml?"xml":"json");
+	FCGX_FPrintF(r->out, "\r\n");
 	goto ok;
+    }
     if (path==NULL || strcmp(path,"/")==0){ /* Special case: data root */
 	if (use_xml){
 	    if (clicon_xml2cbuf(cbx, xret, 0, pretty) < 0) /* Dont print top object?  */
@@ -261,16 +274,32 @@ api_data_get2(clicon_handle h,
 	    goto done;
 	if (use_xml){
 	    for (i=0; i<xlen; i++){
+		char *prefix, *namespace;
 		x = xvec[i];
+		/* Some complexities in grafting namespace in existing trees to new */
+		prefix = xml_prefix(x);
+		if (xml_find_type_value(x, prefix, "xmlns", CX_ATTR) == NULL){
+		    if (xml2ns(x, prefix, &namespace) < 0)
+			goto done;
+		    if (namespace && xmlns_set(x, prefix, namespace) < 0)
+			goto done;
+		}
 		if (clicon_xml2cbuf(cbx, x, 0, pretty) < 0) /* Dont print top object?  */
 		    goto done;
 	    }
 	}
-	else
+	else{
+	    /* In: <x xmlns="urn:example:clixon">0</x>
+	     * Out: {"example:x": {"0"}}
+	     */
 	    if (xml2json_cbuf_vec(cbx, xvec, xlen, pretty) < 0)
 		goto done;
+	}
     }
-    //    clicon_debug(1, "%s cbuf:%s", __FUNCTION__, cbuf_get(cbx));
+    clicon_debug(1, "%s cbuf:%s", __FUNCTION__, cbuf_get(cbx));
+    FCGX_SetExitStatus(200, r->out); /* OK */
+    FCGX_FPrintF(r->out, "Content-Type: application/yang-data+%s\r\n", use_xml?"xml":"json");
+    FCGX_FPrintF(r->out, "\r\n");
     FCGX_FPrintF(r->out, "%s", cbx?cbuf_get(cbx):"");
     FCGX_FPrintF(r->out, "\r\n\r\n");
  ok:
@@ -414,7 +443,8 @@ api_data_post(clicon_handle h,
     cxobj     *xerr = NULL; /* malloced must be freed */
     cxobj     *xe;            /* dont free */
     char      *username;
-	
+    int        ret;
+    
     clicon_debug(1, "%s api_path:\"%s\" json:\"%s\"",
 		 __FUNCTION__, 
 		 api_path, data);
@@ -429,25 +459,45 @@ api_data_post(clicon_handle h,
 	goto done;
     /* Translate api_path to xtop/xbot */
     xbot = xtop;
-    if (api_path && api_path2xml(api_path, yspec, xtop, YC_DATANODE, &xbot, &y) < 0)
-	goto done;
+    if (api_path){
+	if ((ret = api_path2xml(api_path, yspec, xtop, YC_DATANODE, &xbot, &y)) < 0)
+	    goto done;
+	if (ret == 0){ /* validation failed */
+	    if (netconf_malformed_message_xml(&xerr, clicon_err_reason) < 0)
+		goto done;
+	    clicon_err_reset();
+	    if ((xe = xpath_first(xerr, "rpc-error")) == NULL){
+		clicon_err(OE_XML, EINVAL, "rpc-error not found (internal error)");
+		goto done;
+	    }
+	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		goto done;
+	    goto ok;
+	}
+    }
     /* Parse input data as json or xml into xml */
     if (parse_xml){
 	if (xml_parse_string(data, NULL, &xdata) < 0){
 	    if (netconf_malformed_message_xml(&xerr, clicon_err_reason) < 0)
 		goto done;
-	    if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
-		if (api_return_err(h, r, xe, pretty, use_xml) < 0)
-		    goto done;
+	    if ((xe = xpath_first(xerr, "rpc-error")) == NULL){
+		clicon_err(OE_XML, EINVAL, "rpc-error not found (internal error)");
+		goto done;
+	    }
+	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		goto done;
 	    goto ok;
 	}
     }
     else if (json_parse_str(data, &xdata) < 0){
 	if (netconf_malformed_message_xml(&xerr, clicon_err_reason) < 0)
 	    goto done;
-	if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
-	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
-		goto done;
+	if ((xe = xpath_first(xerr, "rpc-error")) == NULL){
+	    clicon_err(OE_XML, EINVAL, "rpc-error not found (internal error)");
+	    goto done;
+	}
+	if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+	    goto done;
 	goto ok;
     }
     /* 4.4.1: The message-body MUST contain exactly one instance of the
@@ -456,9 +506,12 @@ api_data_post(clicon_handle h,
     if (xml_child_nr(xdata) != 1){
 	if (netconf_malformed_message_xml(&xerr, clicon_err_reason) < 0)
 	    goto done;
-	if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
-	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
-		goto done;
+	if ((xe = xpath_first(xerr, "rpc-error")) == NULL){
+	    clicon_err(OE_XML, EINVAL, "rpc-error not found (internal error)");
+	    goto done;
+	}
+	if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+	    goto done;
 	goto ok;
     }
     x = xml_child_i(xdata,0);
@@ -471,6 +524,19 @@ api_data_post(clicon_handle h,
     /* Replace xbot with x, ie bottom of api-path with data */
     if (xml_addsub(xbot, x) < 0)
 	goto done;
+    if (!parse_xml){ /* If JSON, translate namespace from module:name to xmlns=uri */
+	if (json2xml_ns(yspec, x, &xerr) < 0)
+	    goto done;
+	if (xerr){
+	    if ((xe = xpath_first(xerr, "rpc-error")) == NULL){
+		clicon_err(OE_XML, EINVAL, "rpc-error not found (internal error)");
+		goto done;
+	    }
+	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		goto done;
+	    goto ok;
+	}
+    }
     /* Create text buffer for transfer to backend */
     if ((cbx = cbuf_new()) == NULL)
 	goto done;
@@ -509,7 +575,7 @@ api_data_post(clicon_handle h,
 	/* log errors from discard, but ignore */
 	if ((xpath_first(xretdis, "//rpc-error")) != NULL)
 	    clicon_log(LOG_WARNING, "%s: discard-changes failed which may lead candidate in an inconsistent state", __FUNCTION__);
-	if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+	if (api_return_err(h, r, xe, pretty, use_xml) < 0) /* Use original xe */
 	    goto done;
 	goto ok;
     }
@@ -644,6 +710,8 @@ api_data_put(clicon_handle h,
     cxobj     *xerr = NULL; /* malloced must be freed */
     cxobj     *xe;
     char      *username;
+    int        ret;
+    char      *namespace0;
 
     clicon_debug(1, "%s api_path:\"%s\" json:\"%s\"",
 		 __FUNCTION__, api_path0, data);
@@ -659,46 +727,91 @@ api_data_put(clicon_handle h,
 	goto done;
     /* Translate api_path to xtop/xbot */
     xbot = xtop;
-
-    if (api_path && api_path2xml(api_path, yspec, xtop, YC_DATANODE, &xbot, &y) < 0)
-	goto done;
+    if (api_path){
+	if ((ret = api_path2xml(api_path, yspec, xtop, YC_DATANODE, &xbot, &y)) < 0)
+	    goto done;
+	if (ret == 0){ /* validation failed */
+	    if (netconf_malformed_message_xml(&xerr, clicon_err_reason) < 0)
+		goto done;
+	    clicon_err_reset();
+	    if ((xe = xpath_first(xerr, "rpc-error")) == NULL){
+		clicon_err(OE_XML, EINVAL, "rpc-error not found (internal error)");
+		goto done;
+	    }
+	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		goto done;
+	    goto ok;
+	}
+    }
     /* Parse input data as json or xml into xml */
     if (parse_xml){
 	if (xml_parse_string(data, NULL, &xdata) < 0){
 	    if (netconf_malformed_message_xml(&xerr, clicon_err_reason) < 0)
 		goto done;
-	    if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
-		if (api_return_err(h, r, xe, pretty, use_xml) < 0)
-		    goto done;
+	    if ((xe = xpath_first(xerr, "rpc-error")) == NULL){
+		clicon_err(OE_XML, EINVAL, "rpc-error not found (internal error)");
+		goto done;
+	    }
+	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		goto done;
 	    goto ok;
 	}
     }
-    else if (json_parse_str(data, &xdata) < 0){
-	if (netconf_malformed_message_xml(&xerr, clicon_err_reason) < 0)
-	    goto done;
-	if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
+    else{
+	if (json_parse_str(data, &xdata) < 0){
+	    if (netconf_malformed_message_xml(&xerr, clicon_err_reason) < 0)
+		goto done;
+	    if ((xe = xpath_first(xerr, "rpc-error")) == NULL){
+		clicon_err(OE_XML, EINVAL, "rpc-error not found (internal error)");
+		goto done;
+	    }
 	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
 		goto done;
-	goto ok;
-    }
+	    goto ok;
+	}
+    }      
     /* The message-body MUST contain exactly one instance of the
      * expected data resource. 
      */
     if (xml_child_nr(xdata) != 1){
 	if (netconf_malformed_message_xml(&xerr, clicon_err_reason) < 0)
 	    goto done;
-	if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
-	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
-		goto done;
+	if ((xe = xpath_first(xerr, "rpc-error")) == NULL){
+	    clicon_err(OE_XML, EINVAL, "rpc-error not found (internal error)");
+	    goto done;
+	}
+	if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+	    goto done;
 	goto ok;
     }
     x = xml_child_i(xdata,0);
+    if (!parse_xml){ /* If JSON, translate namespace from module:name to xmlns=uri */
+	if (json2xml_ns(yspec, x, &xerr) < 0)
+	    goto done;
+	if (xerr){
+	    if ((xe = xpath_first(xerr, "rpc-error")) == NULL){
+		clicon_err(OE_XML, EINVAL, "rpc-error not found (internal error)");
+		goto done;
+	    }
+	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		goto done;
+	    goto ok;
+	}
+    }
     /* Add operation (create/replace) as attribute */
     if ((xa = xml_new("operation", x, NULL)) == NULL)
 	goto done;
     xml_type_set(xa, CX_ATTR);
     if (xml_value_set(xa, xml_operation2str(op)) < 0)
 	goto done;
+#if 0
+    if (debug){
+	cbuf *ccc=cbuf_new();
+	if (clicon_xml2cbuf(ccc, xdata, 0, 0) < 0)
+	    goto done;
+	clicon_debug(1, "%s DATA:%s", __FUNCTION__, cbuf_get(ccc));
+    }
+#endif
     /* Replace xparent with x, ie bottom of api-path with data */	    
     if (api_path==NULL && strcmp(xml_name(x),"data")==0){
 	if (xml_addsub(NULL, x) < 0)
@@ -713,9 +826,12 @@ api_data_put(clicon_handle h,
 	if (strcmp(xml_name(x), xml_name(xbot))){
 	    if (netconf_operation_failed_xml(&xerr, "protocol", "Not same symbol in api-path as data") < 0)
 		goto done;
-	    if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
-		if (api_return_err(h, r, xe, pretty, use_xml) < 0)
-		    goto done;
+	    if ((xe = xpath_first(xerr, "rpc-error")) == NULL){
+		clicon_err(OE_XML, EINVAL, "rpc-error not found (internal error)");
+		goto done;
+	    }
+	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		goto done;
 	    goto ok;
 	}
 	/* If list or leaf-list, api-path keys must match data keys */	    
@@ -723,9 +839,12 @@ api_data_put(clicon_handle h,
 	    if (match_list_keys((yang_stmt*)y, x, xbot) < 0){
 		if (netconf_operation_failed_xml(&xerr, "protocol", "api-path keys do not match data keys") < 0)
 		    goto done;
-		if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
-		    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
-			goto done;
+		if ((xe = xpath_first(xerr, "rpc-error")) == NULL){
+		    clicon_err(OE_XML, EINVAL, "rpc-error not found (internal error)");
+		    goto done;
+		}
+		if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		    goto done;
 		goto ok;
 	    }
 	}
@@ -733,8 +852,15 @@ api_data_put(clicon_handle h,
 	xml_purge(xbot);
 	if (xml_addsub(xparent, x) < 0)
 	    goto done;
+	/* If we already have that default namespace, remove it in child */
+	if ((xa = xml_find_type(x, NULL, "xmlns", CX_ATTR)) != NULL){
+	    if (xml2ns(xparent, NULL, &namespace0) < 0)
+		goto done;
+	    /* Set xmlns="" default namespace attribute (if diff from default) */
+	    if (strcmp(namespace0, xml_value(xa))==0)
+		xml_purge(xa);
+	}		
     }
-
     /* Create text buffer for transfer to backend */
     if ((cbx = cbuf_new()) == NULL)
 	goto done;
@@ -859,6 +985,8 @@ api_data_delete(clicon_handle h,
     cxobj     *xretdis = NULL; /* return from discard */
     cxobj     *xerr = NULL;
     char      *username;
+    int        ret;
+    cxobj     *xe; /* xml error, no free */
 
     clicon_debug(1, "%s api_path:%s", __FUNCTION__, api_path);
     if ((yspec = clicon_dbspec_yang(h)) == NULL){
@@ -871,8 +999,22 @@ api_data_delete(clicon_handle h,
     if ((xtop = xml_new("config", NULL, NULL)) == NULL)
 	goto done;
     xbot = xtop;
-    if (api_path && api_path2xml(api_path, yspec, xtop, YC_DATANODE, &xbot, &y) < 0)
-	goto done;
+    if (api_path){
+	if ((ret = api_path2xml(api_path, yspec, xtop, YC_DATANODE, &xbot, &y)) < 0)
+	    goto done;
+	if (ret == 0){ /* validation failed */
+	    if (netconf_malformed_message_xml(&xerr, clicon_err_reason) < 0)
+		goto done;
+	    clicon_err_reset();
+	    if ((xe = xpath_first(xerr, "rpc-error")) == NULL){
+		clicon_err(OE_XML, EINVAL, "rpc-error not found (internal error)");
+		goto done;
+	    }
+	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		goto done;
+	    goto ok;
+	}
+    }
     if ((xa = xml_new("operation", xbot, NULL)) == NULL)
 	goto done;
     xml_type_set(xa, CX_ATTR);
@@ -891,8 +1033,8 @@ api_data_delete(clicon_handle h,
     cprintf(cbx, "</edit-config></rpc>");
     if (clicon_rpc_netconf(h, cbuf_get(cbx), &xret, NULL) < 0)
 	goto done;
-    if ((xerr = xpath_first(xret, "//rpc-error")) != NULL){
-	if (api_return_err(h, r, xerr, pretty, use_xml) < 0)
+    if ((xe = xpath_first(xret, "//rpc-error")) != NULL){
+	if (api_return_err(h, r, xe, pretty, use_xml) < 0)
 	    goto done;
 	goto ok;
     }
@@ -905,7 +1047,7 @@ api_data_delete(clicon_handle h,
     cprintf(cbx, "<commit/></rpc>");
     if (clicon_rpc_netconf(h, cbuf_get(cbx), &xretcom, NULL) < 0)
 	goto done;
-    if ((xerr = xpath_first(xretcom, "//rpc-error")) != NULL){
+    if ((xe = xpath_first(xretcom, "//rpc-error")) != NULL){
 	cbuf_reset(cbx);
 	cprintf(cbx, "<rpc username=\"%s\">", NACM_RECOVERY_USER);
 	cprintf(cbx, "<discard-changes/></rpc>");
@@ -914,7 +1056,7 @@ api_data_delete(clicon_handle h,
 	/* log errors from discard, but ignore */
 	if ((xpath_first(xretdis, "//rpc-error")) != NULL)
 	    clicon_log(LOG_WARNING, "%s: discard-changes failed which may lead candidate in an inconsistent state", __FUNCTION__);
-	if (api_return_err(h, r, xerr, pretty, use_xml) < 0)
+	if (api_return_err(h, r, xe, pretty, use_xml) < 0)
 	    goto done;
 	goto ok;
     }
@@ -981,36 +1123,41 @@ api_operations_get(clicon_handle h,
     char      *namespace;
     cbuf      *cbx = NULL;
     cxobj     *xt = NULL;
+    int        i;
     
     clicon_debug(1, "%s", __FUNCTION__);
     yspec = clicon_dbspec_yang(h);
     if ((cbx = cbuf_new()) == NULL)
 	goto done;
-    cprintf(cbx, "<operations>");
+    if (use_xml)
+	cprintf(cbx, "<operations>");
+    else
+	cprintf(cbx, "{\"operations\": ");
     ymod = NULL;
     while ((ymod = yn_each((yang_node*)yspec, ymod)) != NULL) {
 	namespace = yang_find_mynamespace(ymod);
-	yc = NULL;
+	yc = NULL; i=0;
 	while ((yc = yn_each((yang_node*)ymod, yc)) != NULL) {
 	    if (yc->ys_keyword != Y_RPC)
 		continue;
-	    cprintf(cbx, "<%s xmlns=\"%s\"/>", yc->ys_argument, namespace);
+	    if (use_xml)
+		cprintf(cbx, "<%s xmlns=\"%s\"/>", yc->ys_argument, namespace);
+	    else{
+		if (i==0)
+		    cprintf(cbx, "{");
+		if (i)
+		    cprintf(cbx, ",");
+		cprintf(cbx, "\"%s:%s\": null", ymod->ys_argument, yc->ys_argument);
+	    }
+	    i++;
 	}
+	if (!use_xml && i)
+	    cprintf(cbx, "}");
     }
-    cprintf(cbx, "</operations>");
-    if (xml_parse_string(cbuf_get(cbx), yspec, &xt) < 0)
-	goto done;
-    if (xml_rootchild(xt, 0, &xt) < 0)
-	goto done;
-    cbuf_reset(cbx); /* reuse same cbuf */
-    if (use_xml){
-	if (clicon_xml2cbuf(cbx, xt, 0, pretty) < 0) /* Dont print top object?  */
-	    goto done;
-    }
-    else{
-	if (xml2json_cbuf(cbx, xt, pretty) < 0)
-	    goto done;
-    }
+    if (use_xml)
+	cprintf(cbx, "</operations>");
+    else
+	cprintf(cbx, "}");
     FCGX_SetExitStatus(200, r->out); /* OK */
     FCGX_FPrintF(r->out, "Content-Type: application/yang-data+%s\r\n", use_xml?"xml":"json");
     FCGX_FPrintF(r->out, "\r\n");
@@ -1027,6 +1174,298 @@ api_operations_get(clicon_handle h,
     return retval;
 }
 
+/*! Handle input data to api_operations_post 
+ * @param[in]  h      CLIXON handle
+ * @param[in]  r      Fastcgi request handle
+ * @param[in]  data   Stream input data
+ * @param[in]  yspec  Yang top-level specification 
+ * @param[in]  yrpc   Yang rpc spec
+ * @param[in]  xrpc   XML pointer to rpc method
+ * @param[in]  pretty Set to 1 for pretty-printed xml/json output
+ * @param[in]  use_xml Set to 0 for JSON and 1 for XML for output data
+ * @param[in]  parse_xml Set to 0 for JSON and 1 for XML for input data
+ * @retval     1      OK
+ * @retval     0      Fail, Error message sent
+ * @retval    -1      Fatal error, clicon_err called
+ *
+ * RFC8040 3.6.1
+ *  If the "rpc" or "action" statement has an "input" section, then
+ *  instances of these input parameters are encoded in the module
+ *  namespace where the "rpc" or "action" statement is defined, in an XML
+ *  element or JSON object named "input", which is in the module
+ *  namespace where the "rpc" or "action" statement is defined.
+ * (Any other input is assumed as error.)
+ */
+static int
+api_operations_post_input(clicon_handle h,
+			  FCGX_Request *r, 
+			  char         *data,
+			  yang_spec    *yspec,
+			  yang_stmt    *yrpc,
+			  cxobj        *xrpc,
+			  int           pretty,
+			  int           use_xml,
+			  int           parse_xml)
+{
+    int        retval = -1;
+    cxobj     *xdata = NULL;
+    cxobj     *xerr = NULL; /* malloced must be freed */
+    cxobj     *xe;
+    cxobj     *xinput;
+    cxobj     *x;
+    cbuf      *cbret = NULL;
+
+    clicon_debug(1, "%s %s", __FUNCTION__, data);
+    if ((cbret = cbuf_new()) == NULL){
+	clicon_err(OE_UNIX, 0, "cbuf_new");
+	goto done;
+    }
+    /* Parse input data as json or xml into xml */
+    if (parse_xml){
+	if (xml_parse_string(data, yspec, &xdata) < 0){
+	    if (netconf_malformed_message_xml(&xerr, clicon_err_reason) < 0)
+		goto done;
+	    if ((xe = xpath_first(xerr, "rpc-error")) == NULL){
+		clicon_err(OE_XML, EINVAL, "rpc-error not found (internal error)");
+		goto done;
+	    }
+	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		goto done;
+	    goto fail;
+	}
+    }
+    else { /* JSON */
+	if (json_parse_str(data, &xdata) < 0){
+	    if (netconf_malformed_message_xml(&xerr, clicon_err_reason) < 0)
+		goto done;
+	    if ((xe = xpath_first(xerr, "rpc-error")) == NULL){
+		clicon_err(OE_XML, EINVAL, "rpc-error not found (internal error)");
+		goto done;
+	    }
+	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		goto done;
+	    goto fail;
+	}
+	/* Special case for JSON: It looks like: <top><module:input>
+	 * Need to translate to <top><input xmlns="">
+	 */
+	if (json2xml_ns(yspec, xdata, &xerr) < 0)
+	    goto done;
+	if (xerr){
+	    if ((xe = xpath_first(xerr, "rpc-error")) == NULL){
+		clicon_err(OE_XML, EINVAL, "rpc-error not found (internal error)");
+		goto done;
+	    }
+	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		goto done;
+	    goto fail;
+	}
+    }
+    xml_name_set(xdata, "data");
+    /* Here xdata is: 
+     * <data><input xmlns="urn:example:clixon">...</input></data>
+     * Validate that exactly only <input> tag 
+     */
+#if 0
+    if (debug){
+	cbuf *ccc=cbuf_new();
+	if (clicon_xml2cbuf(ccc, xdata, 0, 0) < 0)
+	    goto done;
+	clicon_debug(1, "%s DATA:%s", __FUNCTION__, cbuf_get(ccc));
+    }
+#endif
+    if ((xinput = xml_child_i_type(xdata, 0, CX_ELMNT)) == NULL ||
+	strcmp(xml_name(xinput),"input") != 0 ||
+	xml_child_nr_type(xdata, CX_ELMNT) != 1){
+
+	if (xml_child_nr_type(xdata, CX_ELMNT) == 0){
+	    if (netconf_malformed_message_xml(&xerr, "restconf RPC does not have input statement") < 0)
+		goto done;
+	}
+	else
+	    if (netconf_malformed_message_xml(&xerr, "restconf RPC has malformed input statement (multiple or not called input)") < 0)
+		goto done;	
+	if ((xe = xpath_first(xerr, "rpc-error")) == NULL){
+	    clicon_err(OE_XML, EINVAL, "rpc-error not found (internal error)");
+	    goto done;
+	}
+	if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+	    goto done;
+	goto fail;
+    }
+    //    clicon_debug(1, "%s input validation passed", __FUNCTION__);
+    /* Add all input under <rpc>path */
+    x = NULL;
+    while ((x = xml_child_i_type(xinput, 0, CX_ELMNT)) != NULL)
+	if (xml_addsub(xrpc, x) < 0) 	
+	    goto done;
+    /* Here xrpc is:  <myfn xmlns="uri"><x>42</x></myfn>
+     */
+    // ok:
+    retval = 1;
+ done:
+    clicon_debug(1, "%s retval: %d", __FUNCTION__, retval);
+    if (cbret)
+	cbuf_free(cbret);
+    if (xerr)
+	xml_free(xerr);
+    if (xdata)
+	xml_free(xdata);
+    return retval;
+ fail:
+    retval = 0;
+    goto done;
+}
+
+/*! Handle output data to api_operations_post 
+ * @param[in]  h        CLIXON handle
+ * @param[in]  r        Fastcgi request handle
+ * @param[in]  xret     XML reply messages from backend/handler
+ * @param[in]  yspec    Yang top-level specification 
+ * @param[in]  youtput  Yang rpc output specification
+ * @param[in]  pretty Set to 1 for pretty-printed xml/json output
+ * @param[in]  use_xml Set to 0 for JSON and 1 for XML for output data
+ * @param[out] xoutputp Restconf JSON/XML output
+ * @retval     1        OK
+ * @retval     0        Fail, Error message sent
+ * @retval    -1        Fatal error, clicon_err called
+ * xret should like: <top><rpc-reply><x xmlns="uri">0</x></rpc-reply></top>
+ */
+static int
+api_operations_post_output(clicon_handle h,
+			   FCGX_Request *r, 
+			   cxobj        *xret,
+			   yang_spec    *yspec,
+			   yang_stmt    *youtput,
+			   char         *namespace,
+			   int           pretty,
+			   int           use_xml,
+			   cxobj       **xoutputp)
+    
+{
+    int        retval = -1;
+    cxobj     *xoutput = NULL;
+    cxobj     *xerr = NULL; /* assumed malloced, will be freed */
+    cxobj     *xe;          /* just pointer */
+    cxobj     *xa;          /* xml attribute (xmlns) */
+    cxobj     *x;
+    cxobj     *xok;
+    cbuf      *cbret = NULL;
+    int        ret;
+
+    if ((cbret = cbuf_new()) == NULL){
+	clicon_err(OE_UNIX, 0, "cbuf_new");
+	goto done;
+    }
+    /* Validate that exactly only <rpc-reply> tag */
+    if ((xoutput = xml_child_i_type(xret, 0, CX_ELMNT)) == NULL ||
+	strcmp(xml_name(xoutput),"rpc-reply") != 0 ||
+	xml_child_nr_type(xret, CX_ELMNT) != 1){
+	if (netconf_malformed_message_xml(&xerr, "restconf RPC does not have single input") < 0)
+	    goto done;	
+	if ((xe = xpath_first(xerr, "rpc-error")) == NULL){
+	    clicon_err(OE_XML, EINVAL, "rpc-error not found (internal error)");
+	    goto done;
+	}
+	if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+	    goto done;
+	goto fail;
+    }
+    /* xoutput should now look: <rpc-reply><x xmlns="uri">0</x></rpc-reply> */
+    /* 9. Translate to restconf RPC data */
+    xml_name_set(xoutput, "output");
+    /* xoutput should now look: <output><x xmlns="uri">0</x></output> */
+#if 0
+    if (debug){
+	cbuf *ccc=cbuf_new();
+	if (clicon_xml2cbuf(ccc, xoutput, 0, 0) < 0)
+	    goto done;
+	clicon_debug(1, "%s XOUTPUT:%s", __FUNCTION__, cbuf_get(ccc));
+    }
+#endif
+    /* Validate output (in case handlers are wrong) */
+    if (youtput==NULL){ 
+	/* Special case, no yang output
+	 * RFC 7950 7.14.4
+	 * If the RPC operation invocation succeeded and no output parameters
+	 * are returned, the <rpc-reply> contains a single <ok/> element
+	 * RFC 8040 3.6.2
+	 * If the "rpc" statement has no "output" section, the response message
+	 * MUST NOT include a message-body and MUST send a "204 No Content"
+	 * status-line instead.
+	 */
+	if ((xok = xml_child_i_type(xoutput, 0, CX_ELMNT)) == NULL ||
+	    strcmp(xml_name(xok),"ok") != 0 ||
+	    xml_child_nr_type(xoutput, CX_ELMNT) != 1){
+	    /* Internal error - invalid output from rpc handler */
+	    if (xok){
+		if (netconf_operation_failed_xml(&xerr, "application",
+					"Internal error: Empty RPC reply is not ok") < 0)
+		    goto done;
+	    }
+	    else
+		if (netconf_operation_failed_xml(&xerr, "application",
+						"Internal error: Empty RPC reply should have OK") < 0)
+		    goto done;
+	    if ((xe = xpath_first(xerr, "rpc-error")) == NULL){
+		clicon_err(OE_XML, EINVAL, "rpc-error not found (internal error)");
+		goto done;
+	    }
+	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		goto done;
+	    goto fail;
+	}
+	FCGX_SetExitStatus(204, r->out); /* OK */
+	FCGX_FPrintF(r->out, "Status: 204 No Content\r\n");
+	FCGX_FPrintF(r->out, "\r\n");
+	goto fail;
+    }
+    else{
+	xml_spec_set(xoutput, youtput); /* needed for xml_spec_populate */
+	if (xml_apply(xoutput, CX_ELMNT, xml_spec_populate, yspec) < 0)
+	    goto done;
+	if ((ret = xml_yang_validate_all(xoutput, cbret)) < 0)
+	    goto done;
+	if (ret == 1 &&
+	    (ret = xml_yang_validate_add(xoutput, cbret)) < 0)
+	    goto done;
+	if (ret == 0){ /* validation failed */
+	    if (xml_parse_string(cbuf_get(cbret), yspec, &xerr) < 0)
+		goto done;
+	    if ((xe = xpath_first(xerr, "rpc-reply/rpc-error")) == NULL){
+		clicon_err(OE_XML, EINVAL, "rpc-error not found (internal error)");
+		goto done;
+	    }
+	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		goto done;
+	    goto fail;
+	}
+    
+	/* Clear namespace of parameters */
+	x = NULL;
+	while ((x = xml_child_each(xoutput, x, CX_ELMNT)) != NULL) {
+	    if ((xa = xml_find_type(x, NULL, "xmlns", CX_ATTR)) != NULL)
+		if (xml_purge(xa) < 0)
+		    goto done;
+	}
+    }
+    /* Set namespace on output */
+    if (xmlns_set(xoutput, NULL, namespace) < 0)
+	goto done;
+    *xoutputp = xoutput;
+    retval = 1;
+ done:
+    clicon_debug(1, "%s retval: %d", __FUNCTION__, retval);
+    if (cbret)
+	cbuf_free(cbret);
+    if (xerr)
+	xml_free(xerr);
+    return retval;
+ fail:
+    retval = 0;
+    goto done;
+}
+
 /*! REST operation POST method 
  * @param[in]  h      CLIXON handle
  * @param[in]  r      Fastcgi request handle
@@ -1040,7 +1479,24 @@ api_operations_get(clicon_handle h,
  * @param[in]  parse_xml Set to 0 for JSON and 1 for XML for input data
  * See RFC 8040 Sec 3.6 / 4.4.2
  * @note We map post to edit-config create. 
-      POST {+restconf}/operations/<operation>
+ *      POST {+restconf}/operations/<operation>
+ * 1. Initialize
+ * 2. Get rpc module and name from uri (oppath) and find yang spec
+ * 3. Build xml tree with user and rpc: <rpc username="foo"><myfn xmlns="uri"/>
+ * 4. Parse input data (arguments):
+ *             JSON: {"example:input":{"x":0}}
+ *             XML:  <input xmlns="uri"><x>0</x></input>
+ * 5. Translate input args to Netconf RPC, add to xml tree:
+ *             <rpc username="foo"><myfn xmlns="uri"><x>42</x></myfn></rpc>
+ * 6. Validate outgoing RPC and fill in default values
+ *  <rpc username="foo"><myfn xmlns="uri"><x>42</x><y>99</y></myfn></rpc>
+ * 7. Send to RPC handler, either local or backend
+ * 8. Receive reply from local/backend handler as Netconf RPC
+ *       <rpc-reply><x xmlns="uri">0</x></rpc-reply>
+ * 9. Translate to restconf RPC data:
+ *             JSON: {"example:output":{"x":0}}
+ *             XML:  <output xmlns="uri"><x>0</x></input>
+ * 10. Validate and send reply to originator
  */
 int
 api_operations_post(clicon_handle h,
@@ -1057,20 +1513,15 @@ api_operations_post(clicon_handle h,
     int        retval = -1;
     int        i;
     char      *oppath = path;
-    yang_stmt *yrpc = NULL;
     yang_spec *yspec;
-    yang_stmt *yinput;
-    yang_stmt *youtput;
-    cxobj     *xdata = NULL;
+    yang_stmt *youtput = NULL;
+    yang_stmt *yrpc = NULL;
     cxobj     *xret = NULL;
     cxobj     *xerr = NULL; /* malloced must be freed */
-    cbuf      *cbx = NULL;
     cxobj     *xtop = NULL; /* xpath root */
     cxobj     *xbot = NULL;
     yang_node *y = NULL;
-    cxobj     *xinput;
-    cxobj     *xoutput;
-    cxobj     *x;
+    cxobj     *xoutput = NULL;
     cxobj     *xa;
     cxobj     *xe;
     char      *username;
@@ -1079,8 +1530,10 @@ api_operations_post(clicon_handle h,
     char      *prefix = NULL;
     char      *id = NULL;
     yang_stmt *ys = NULL;
+    char      *namespace = NULL;
     
     clicon_debug(1, "%s json:\"%s\" path:\"%s\"", __FUNCTION__, data, path);
+    /* 1. Initialize */
     if ((yspec = clicon_dbspec_yang(h)) == NULL){
 	clicon_err(OE_FATAL, 0, "No DB_SPEC");
 	goto done;
@@ -1094,216 +1547,188 @@ api_operations_post(clicon_handle h,
     if (oppath == NULL || strcmp(oppath,"/")==0){
 	if (netconf_operation_failed_xml(&xerr, "protocol", "Operation name expected") < 0)
 	    goto done;
-	if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
-	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
-		goto done;
+	if ((xe = xpath_first(xerr, "rpc-error")) == NULL){
+	    clicon_err(OE_XML, EINVAL, "rpc-error not found (internal error)");
+	    goto done;
+	}
+	if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+	    goto done;
 	goto ok;
     }
-    clicon_debug(1, "%s oppath: %s", __FUNCTION__, oppath);
-
-    /* Find yang rpc statement, return yang rpc statement if found 
+    /* 2. Get rpc module and name from uri (oppath) and find yang spec 
      *       POST {+restconf}/operations/<operation>
      *
      * The <operation> field identifies the module name and rpc identifier
      * string for the desired operation.
      */
-    if (yang_nodeid_split(oppath+1, &prefix, &id) < 0) /* +1 skip / */
+    if (nodeid_split(oppath+1, &prefix, &id) < 0) /* +1 skip / */
 	goto done;
     if ((ys = yang_find((yang_node*)yspec, Y_MODULE, prefix)) == NULL){
 	if (netconf_operation_failed_xml(&xerr, "protocol", "yang module not found") < 0)
 	    goto done;
-	if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
-	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
-		goto done;
+	if ((xe = xpath_first(xerr, "rpc-error")) == NULL){
+	    clicon_err(OE_XML, EINVAL, "rpc-error not found (internal error)");
+	    goto done;
+	}
+	if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+	    goto done;
 	goto ok;
     }
     if ((yrpc = yang_find((yang_node*)ys, Y_RPC, id)) == NULL){
-	clicon_debug(1, "%s rpc %s not found", __FUNCTION__, id);
 	if (netconf_missing_element_xml(&xerr, "application", id, "RPC not defined") < 0)
 	    goto done;
-	if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
-	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
-		goto done;
+	if ((xe = xpath_first(xerr, "rpc-error")) == NULL){
+	    clicon_err(OE_XML, EINVAL, "rpc-error not found (internal error)");
+	    goto done;
+	}
+	if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+	    goto done;
 	goto ok;
     }
-    /* Create an xml message: 
-     * <"rpc"><operation><input-args>...
-     * eg <rpc><fib-route><name>
+    /* 3. Build xml tree with user and rpc: 
+     * <rpc username="foo"><myfn xmlns="uri"/>
      */
-    /* Create config top-of-tree */
     if ((xtop = xml_new("rpc", NULL, NULL)) == NULL)
 	goto done;
     xbot = xtop;
-    /* For internal XML protocol: add username attribute for backend access control
-     */
+    /* Here xtop is: <rpc/> */
     if ((username = clicon_username_get(h)) != NULL){
 	if ((xa = xml_new("username", xtop, NULL)) == NULL)
 	    goto done;
 	xml_type_set(xa, CX_ATTR);
 	if (xml_value_set(xa, username) < 0)
 	    goto done;
+	/* Here xtop is: <rpc username="foo"/> */
     }
-    /* XXX: something strange for rpc user */
-    if (api_path2xml(oppath, yspec, xtop, YC_SCHEMANODE, &xbot, &y) < 0)
+    if ((ret = api_path2xml(oppath, yspec, xtop, YC_SCHEMANODE, &xbot, &y)) < 0)
 	goto done;
+    if (ret == 0){ /* validation failed */
+	if (netconf_malformed_message_xml(&xerr, clicon_err_reason) < 0)
+	    goto done;
+	clicon_err_reset();
+	if ((xe = xpath_first(xerr, "rpc-error")) == NULL){
+	    clicon_err(OE_XML, EINVAL, "rpc-error not found (internal error)");
+	    goto done;
+	}
+	if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+	    goto done;
+	goto ok;
+    }
+    /* Here xtop is: <rpc username="foo"><myfn xmlns="uri"/></rpc> 
+     * xbot is <myfn xmlns="uri"/>
+     * 4. Parse input data (arguments):
+     *             JSON: {"example:input":{"x":0}}
+     *             XML:  <input xmlns="uri"><x>0</x></input>
+     */
+    namespace = xml_find_type_value(xbot, NULL, "xmlns", CX_ATTR);
+    clicon_debug(1, "%s : 4. Parse input data: %s", __FUNCTION__, data);
     if (data && strlen(data)){
-	/* Parse input data as json or xml into xml */
-	if (parse_xml){
-	    if (xml_parse_string(data, NULL, &xdata) < 0){
-		if (netconf_malformed_message_xml(&xerr, clicon_err_reason) < 0)
-		    goto done;
-		if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
-		    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
-			goto done;
-		goto ok;
-	    }
-	}
-	else if (json_parse_str(data, &xdata) < 0){
-	    if (netconf_malformed_message_xml(&xerr, clicon_err_reason) < 0)
-		goto done;
-	    if ((xe = xpath_first(xerr, "rpc-error")) != NULL)
-		if (api_return_err(h, r, xe, pretty, use_xml) < 0)
-		    goto done;
+	if ((ret = api_operations_post_input(h, r, data, yspec, yrpc, xbot,
+					     pretty, use_xml, parse_xml)) < 0)
+	    goto done;
+	if (ret == 0)
 	    goto ok;
-	}
-	yinput = yang_find((yang_node*)yrpc, Y_INPUT, NULL);
-	/* xdata should have format <top><input> */
-	if ((xinput = xpath_first(xdata, "/input")) == NULL){
-	    xml_name_set(xdata, "input");
-	    xml_spec_set(xdata, yinput); /* needed for xml_spec_populate */
-	    if (yinput){
-		if ((ret = xml_yang_validate_add(xdata, cbret)) < 0)
-		    goto done;
-		if (ret == 0){ /* validation failed */
-		    if (xml_parse_string(cbuf_get(cbret), yspec, &xerr) < 0)
-			goto done;
-		    if ((xe=xpath_first(xerr, "rpc-reply/rpc-error")) != NULL)
-			if (api_return_err(h, r, xe, pretty, use_xml) < 0)
-			    goto done;
-		    goto ok;
-		}
-	    }
-	}
-	else{
-	    /* Add all input under <rpc>path */
-	    x = NULL;
-	    while (xml_child_nr(xinput)){
-		x = xml_child_i(xinput, 0);
-		if (xml_addsub(xbot, x) < 0) 	
-		    goto done;
-	    }
-	    if (yinput){
-		xml_spec_set(xbot, yinput); /* needed for xml_spec_populate */
-		/* XXX yinput <-> h ?*/
-		if (xml_apply(xbot, CX_ELMNT, xml_spec_populate, yspec) < 0)
-		    goto done;
-		if ((ret = xml_yang_validate_all(xbot, cbret)) < 0)
-		    goto done;
-		if (ret == 0){ /* validation failed */
-		    clicon_debug(1, "%s err: %s", __FUNCTION__, cbuf_get(cbret));
-		    if (xml_parse_string(cbuf_get(cbret), yspec, &xerr) < 0)
-			goto done;
-		    if ((xe=xpath_first(xerr, "rpc-reply/rpc-error")) != NULL)
-			if (api_return_err(h, r, xe, pretty, use_xml) < 0)
-			    goto done;
-		    goto ok;
-		}
-		if ((ret = xml_yang_validate_add(xbot, cbret)) < 0){
-		    if (xml_parse_string(cbuf_get(cbret), yspec, &xerr) < 0)
-			goto done;
-		    if ((xe=xpath_first(xerr, "rpc-reply/rpc-error")) != NULL)
-			if (api_return_err(h, r, xe, pretty, use_xml) < 0)
-			    goto done;
-		    goto ok;
-		}
-		if (xml_apply0(xbot, CX_ELMNT, xml_default, NULL) < 0)
-		    goto done;
-	    }
-	}
     }
-    ret = 0;
-    xe = NULL;
-    while ((xe = xml_child_each(xtop, xe, CX_ELMNT)) != NULL) {
-	/* Look for local (client-side) restconf plugins. */
-	if ((ret = rpc_callback_call(h, xe, cbret, r)) < 0)
+    /* Here xtop is: 
+      <rpc username="foo"><myfn xmlns="uri"><x>42</x></myfn></rpc> */
+#if 0
+    if (debug){
+	cbuf *ccc=cbuf_new();
+	if (clicon_xml2cbuf(ccc, xtop, 0, 0) < 0)
 	    goto done;
-	if (ret == 1){ /* Handled locally */
-	    if (xml_parse_string(cbuf_get(cbret), NULL, &xret) < 0)
-		goto done;
-	    /* Local error: return it and quit */
-	    if ((xe = xpath_first(xret, "rpc-reply/rpc-error")) != NULL){
-		if (api_return_err(h, r, xe, pretty, use_xml) < 0)
-		    goto done;
-		goto ok;
-	    }
-	}
-	break; /* Just one if local */
+	clicon_debug(1, "%s 5. Translate input args: %s",
+		     __FUNCTION__, cbuf_get(ccc));
     }
-    if (ret == 0){ /* Send to backend */
-	if (clicon_rpc_netconf_xml(h, xtop, &xret, NULL) < 0)
+#endif
+    /* 6. Validate outgoing RPC and fill in defaults */
+    if (xml_spec_populate_rpc(h, xtop, yspec) < 0)
+	goto done;
+    if ((ret = xml_yang_validate_rpc(xtop, cbret)) < 0)
+	goto done;
+    if (ret == 0){
+	if (xml_parse_string(cbuf_get(cbret), NULL, &xret) < 0)
 	    goto done;
-	if ((xe = xpath_first(xret, "rpc-reply/rpc-error")) != NULL){
+	if ((xe = xpath_first(xret, "rpc-reply/rpc-error")) == NULL){
+	    clicon_err(OE_XML, EINVAL, "rpc-error not found (internal error)");
+	    goto done;
+	}
+	if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+	    goto done;
+	goto ok;
+    }
+    /* Here xtop is (default values):
+     * <rpc username="foo"><myfn xmlns="uri"><x>42</x><y>99</y></myfn></rpc>
+    */
+#if 0
+    if (debug){
+	cbuf *ccc=cbuf_new();
+	if (clicon_xml2cbuf(ccc, xtop, 0, 0) < 0)
+	    goto done;
+	clicon_debug(1, "%s 6. Validate and defaults:%s", __FUNCTION__, cbuf_get(ccc));
+    }
+#endif
+    /* 7. Send to RPC handler, either local or backend
+     * Note (1) xtop is <rpc><method> xbot is <method>
+     *      (2) local handler wants <method> and backend wants <rpc><method>
+     */
+    /* Look for local (client-side) restconf plugins. 
+     * -1:Error, 0:OK local, 1:OK backend 
+     */
+    if ((ret = rpc_callback_call(h, xbot, cbret, r)) < 0)
+	goto done;
+    if (ret == 1){ /* Handled locally */
+	if (xml_parse_string(cbuf_get(cbret), NULL, &xret) < 0)
+	    goto done;
+	/* Local error: return it and quit */
+	if ((xe = xpath_first(xret, "//rpc-error")) != NULL){
 	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
 		goto done;
 	    goto ok;
 	}
     }
-    /* Check if RPC output section */
-    if ((youtput = yang_find((yang_node*)yrpc, Y_OUTPUT, NULL)) == NULL){
-	/* If the RPC operation is invoked without errors and if the "rpc" or
-	 * "action" statement has no "output" section, the response message
-	 * MUST NOT include a message-body and MUST send a "204 No Content"
-	 * status-line instead.
-	 */
-	FCGX_SetExitStatus(204, r->out); /* OK */
-	FCGX_FPrintF(r->out, "\r\n");
-	goto ok;
+    else {    /* Send to backend */
+	if (clicon_rpc_netconf_xml(h, xtop, &xret, NULL) < 0)
+	    goto done;
+	if ((xe = xpath_first(xret, "rpc-error")) != NULL){
+	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		goto done;
+	    goto ok;
+	}
     }
-    if ((cbx = cbuf_new()) == NULL)
+    /* 8. Receive reply from local/backend handler as Netconf RPC
+     *       <rpc-reply><x xmlns="uri">0</x></rpc-reply>
+     */
+#if 0
+    if (debug){
+	cbuf *ccc=cbuf_new();
+	if (clicon_xml2cbuf(ccc, xret, 0, 0) < 0)
+	    goto done;
+	clicon_debug(1, "%s 8. Receive reply:%s", __FUNCTION__, cbuf_get(ccc));
+    }
+#endif
+    youtput = yang_find((yang_node*)yrpc, Y_OUTPUT, NULL);
+    if ((ret = api_operations_post_output(h, r, xret, yspec, youtput, namespace,
+					  pretty, use_xml, &xoutput)) < 0)
 	goto done;
-    if ((xoutput=xpath_first(xret, "/")) != NULL){
-	xml_name_set(xoutput, "output");
-	cbuf_reset(cbx);
-	xml_spec_set(xoutput, youtput); /* needed for xml_spec_populate */
-	if (xml_apply(xoutput, CX_ELMNT, xml_spec_populate, yspec) < 0)
-	    goto done;
-	if ((ret = xml_yang_validate_all(xoutput, cbret)) < 0)
-	    goto done;
-	if (ret == 0){ /* validation failed */
-	    clicon_debug(1, "%s output validation failed", __FUNCTION__);
-	    if (xml_parse_string(cbuf_get(cbret), yspec, &xerr) < 0)
-		goto done;
-	    if ((xe = xpath_first(xret, "rpc-reply/rpc-error")) != NULL)
-		if (api_return_err(h, r, xe, pretty, use_xml) < 0)
-		goto done;
-	    goto ok;
-	}
-	if ((ret = xml_yang_validate_add(xoutput, cbret)) < 0)
-	    goto done;
-	if (ret == 0){ /* validation failed */
-	    if (xml_parse_string(cbuf_get(cbret), yspec, &xerr) < 0)
-		goto done;
-	    if ((xe = xpath_first(xret, "rpc-reply/rpc-error")) != NULL)
-		if (api_return_err(h, r, xe, pretty, use_xml) < 0)
-		    goto done;
-	    goto ok;
-	}
-    }
-    /* Sanity check of outgoing XML */
+    if (ret == 0)
+	goto ok;
+    /* xoutput should now look: <output xmlns="uri"><x>0</x></output> */
     FCGX_SetExitStatus(200, r->out); /* OK */
     FCGX_FPrintF(r->out, "Content-Type: application/yang-data+%s\r\n", use_xml?"xml":"json");
     FCGX_FPrintF(r->out, "\r\n");
-    if (xoutput){
-	if (use_xml){
-	    if (clicon_xml2cbuf(cbx, xoutput, 0, pretty) < 0)
-		goto done;
-	}
-	else
-	    if (xml2json_cbuf(cbx, xoutput, pretty) < 0)
-		goto done;
-	FCGX_FPrintF(r->out, "%s", cbx?cbuf_get(cbx):"");
-	FCGX_FPrintF(r->out, "\r\n\r\n");
+    cbuf_reset(cbret);
+    if (use_xml){
+	if (clicon_xml2cbuf(cbret, xoutput, 0, pretty) < 0)
+	    goto done;
+	/* xoutput should now look: <output xmlns="uri"><x>0</x></output> */
     }
+    else{
+	if (xml2json_cbuf(cbret, xoutput, pretty) < 0)
+	    goto done;
+	/* xoutput should now look: {"example:output": {"x":0,"y":42}} */
+    }
+    FCGX_FPrintF(r->out, "%s", cbuf_get(cbret));
+    FCGX_FPrintF(r->out, "\r\n\r\n");
  ok:
     retval = 0;
  done:
@@ -1312,16 +1737,12 @@ api_operations_post(clicon_handle h,
 	free(prefix);
     if (id)
 	free(id);
-    if (xdata)
-	xml_free(xdata);
     if (xtop)
 	xml_free(xtop);
     if (xret)
 	xml_free(xret);
     if (xerr)
 	xml_free(xerr);
-     if (cbx)
-	cbuf_free(cbx); 
     if (cbret)
 	cbuf_free(cbret);
    return retval;
diff --git a/apps/restconf/restconf_stream.c b/apps/restconf/restconf_stream.c
index 08424521..ec20f373 100644
--- a/apps/restconf/restconf_stream.c
+++ b/apps/restconf/restconf_stream.c
@@ -249,7 +249,7 @@ restconf_stream(clicon_handle h,
 	clicon_err(OE_XML, errno, "cbuf_new");
 	goto done;
     }
-    cprintf(cb, "<rpc><create-subscription><stream>%s</stream>", name);
+    cprintf(cb, "<rpc><create-subscription xmlns=\"urn:ietf:params:xml:ns:netmod:notification\"><stream>%s</stream>", name);
     /* Print all fields */
     for (i=0; i<cvec_len(qvec); i++){
         cv = cvec_i(qvec, i);
diff --git a/datastore/datastore_client.c b/datastore/datastore_client.c
index 63f1e7a0..b2a20029 100644
--- a/datastore/datastore_client.c
+++ b/datastore/datastore_client.c
@@ -239,15 +239,18 @@ main(int argc, char **argv)
 	    clicon_err(OE_DB, 0, "Unrecognized operation: %s", argv[1]);
 	    usage(argv0);
 	}
-	_CLICON_XML_NS_ITERATE = 1;
+	_CLICON_XML_NS_STRICT = 0;
 	if (xml_parse_string(argv[2], NULL, &xt) < 0)
 	    goto done;
 	if (xml_rootchild(xt, 0, &xt) < 0)
 	    goto done;
-	if ((cbret = cbuf_new()) == NULL)
+	if ((cbret = cbuf_new()) == NULL){
+	    clicon_err(OE_UNIX, errno, "cbuf_new");
 	    goto done;
-	if (xmldb_put(h, db, op, xt, cbret) < 0)
+	}
+	if (xmldb_put(h, db, op, xt, cbret) < 1)
 	    goto done;
+	    
     }
     else if (strcmp(cmd, "copy")==0){
 	if (argc != 2)
diff --git a/datastore/text/clixon_xmldb_text.c b/datastore/text/clixon_xmldb_text.c
index 8727daa0..645fef97 100644
--- a/datastore/text/clixon_xmldb_text.c
+++ b/datastore/text/clixon_xmldb_text.c
@@ -88,6 +88,8 @@ struct text_handle {
 				   Assumes single backend*/
     char          *th_format;   /* Datastroe format: xml / json */
     int            th_pretty;   /* Store xml/json pretty-printed. */
+    int            th_sort;     /* Sort XML lists and leaf-lists alphabetically 
+				   (unless ordered-by user) */
 };
 
 /* Struct per database in hash */
@@ -239,6 +241,8 @@ text_getopt(xmldb_handle xh,
 	*value = th->th_format;
     else if (strcmp(optname, "pretty") == 0)
 	*value = &th->th_pretty;
+    else if (strcmp(optname, "sort") == 0)
+	*value = &th->th_sort;
     else{
 	clicon_err(OE_PLUGIN, 0, "Option %s not implemented by plugin", optname);
 	goto done;
@@ -288,6 +292,9 @@ text_setopt(xmldb_handle xh,
     else if (strcmp(optname, "pretty") == 0){
 	th->th_pretty = (intptr_t)value;
     }
+    else if (strcmp(optname, "sort") == 0){
+	th->th_sort = (intptr_t)value;
+    }
     else{
 	clicon_err(OE_PLUGIN, 0, "Option %s not implemented by plugin", optname);
 	goto done;
@@ -358,6 +365,16 @@ xml_copy_marked(cxobj *x0,
 
     assert(x0 && x1);
     yt = xml_spec(x0); /* can be null */
+    /* Copy all attributes */
+    x = NULL;
+    while ((x = xml_child_each(x0, x, CX_ATTR)) != NULL) {
+	name = xml_name(x);
+	if ((xcopy = xml_new(name, x1, xml_spec(x))) == NULL)
+	    goto done;
+	if (xml_copy(x, xcopy) < 0) 
+	    goto done;
+    }
+
     /* Go through children to detect any marked nodes:
      * (3) Special case: key nodes in lists are copied if any 
      * node in list is marked
@@ -470,6 +487,10 @@ text_get(xmldb_handle xh,
 	    if (singleconfigroot(xt, &xt) < 0)
 		goto done;
 	}
+	/* XXX: should we validate file if read from disk? 
+	 * Argument against: we may want to have a semantically wrong file and wish
+	 * to edit?
+	 */
     } /* xt == NULL */
     /* Here xt looks like: <config>...</config> */
 
@@ -530,12 +551,15 @@ text_get(xmldb_handle xh,
     /* Add default values (if not set) */
     if (xml_apply(xt, CX_ELMNT, xml_default, NULL) < 0)
 	goto done;
-    /* Order XML children according to YANG */
-    if (!xml_child_sort && xml_apply(xt, CX_ELMNT, xml_order, NULL) < 0)
-	goto done;
-#if 0 /* debug */
-    if (xml_child_sort && xml_apply0(xt, -1, xml_sort_verify, NULL) < 0)
-	clicon_log(LOG_NOTICE, "%s: verify failed #2", __FUNCTION__);
+    /* Order XML children according to YANG.
+     * XXX: should this be !th->th_sort?
+     */
+    if (!th->th_sort)
+	if (xml_apply(xt, CX_ELMNT, xml_order, NULL) < 0)
+	    goto done;
+#if 1 /* debug */
+    if (th->th_sort && xml_apply0(xt, -1, xml_sort_verify, NULL) < 0)
+	clicon_log(LOG_NOTICE, "%s: sort verify failed #2", __FUNCTION__);
 #endif
     if (debug>1)
     	clicon_xml2file(stderr, xt, 0, 1);
@@ -555,6 +579,7 @@ text_get(xmldb_handle xh,
 }
 
 /*! Modify a base tree x0 with x1 with yang spec y according to operation op
+ * @param[in]  th  text handle
  * @param[in]  x0  Base xml tree (can be NULL in add scenarios)
  * @param[in]  y0  Yang spec corresponding to xml-node x0. NULL if x0 is NULL
  * @param[in]  x0p Parent of x0
@@ -562,10 +587,11 @@ text_get(xmldb_handle xh,
  * @param[in]  op  OP_MERGE, OP_REPLACE, OP_REMOVE, etc 
  * @param[out] cbret  Initialized cligen buffer. Contains return XML or "".
  * Assume x0 and x1 are same on entry and that y is the spec
- * @see put in clixon_keyvalue.c
+ * @see text_modify_top
  */
 static int
-text_modify(cxobj              *x0,
+text_modify(struct text_handle *th,
+	    cxobj              *x0,
 	    yang_node          *y0,
 	    cxobj              *x0p,
 	    cxobj              *x1,
@@ -576,6 +602,8 @@ text_modify(cxobj              *x0,
     char      *opstr;
     char      *x1name;
     char      *x1cname; /* child name */
+    cxobj     *x0a; /* attribute */
+    cxobj     *x1a; /* attribute */
     cxobj     *x0c; /* base child */
     cxobj     *x0b; /* base body */
     cxobj     *x1c; /* mod child */
@@ -607,6 +635,13 @@ text_modify(cxobj              *x0,
 		//		int iamkey=0;
 		if ((x0 = xml_new(x1name, x0p, (yang_stmt*)y0)) == NULL)
 		    goto done;
+		/* Copy xmlns attributes */
+		if ((x1a = xml_find_type(x1, NULL, "xmlns", CX_ATTR)) != 0){
+		    if ((x0a = xml_dup(x1a)) == NULL)
+			goto done;
+		    if (xml_addsub(x0, x0a) < 0)
+			goto done;
+		}
 #if 0
 		/* If it is key I dont want to mark it */
 		if ((iamkey=yang_key_match(y0->yn_parent, x1name)) < 0)
@@ -679,6 +714,13 @@ text_modify(cxobj              *x0,
 	    if (x0==NULL){
 		if ((x0 = xml_new(x1name, x0p, (yang_stmt*)y0)) == NULL)
 		    goto done;
+		/* Copy xmlns attributes */
+		if ((x1a = xml_find_type(x1, NULL, "xmlns", CX_ATTR)) != 0){
+		    if ((x0a = xml_dup(x1a)) == NULL)
+			goto done;
+		    if (xml_addsub(x0, x0a) < 0)
+			goto done;
+		}
 		if (op==OP_NONE)
 		    xml_flag_set(x0, XML_FLAG_NONE); /* Mark for potential deletion */
 	    }
@@ -699,7 +741,7 @@ text_modify(cxobj              *x0,
 		}
 		/* See if there is a corresponding node in the base tree */
 		x0c = NULL;
-		if (match_base_child(x0, x1c, &x0c, yc) < 0)
+		if (match_base_child(x0, x1c, &x0c, th->th_sort, yc) < 0)
 		    goto done;
 		x0vec[i++] = x0c;
 	    }
@@ -709,7 +751,7 @@ text_modify(cxobj              *x0,
 	    while ((x1c = xml_child_each(x1, x1c, CX_ELMNT)) != NULL) {
 		x1cname = xml_name(x1c);
 		yc = yang_find_datanode(y0, x1cname);
-		if (text_modify(x0vec[i++], (yang_node*)yc, x0, x1c, op, cbret) < 0)
+		if (text_modify(th, x0vec[i++], (yang_node*)yc, x0, x1c, op, cbret) < 0)
 		    goto done;
 		/* If xml return - ie netconf error xml tree, then stop and return OK */
 		if (cbuf_len(cbret))
@@ -740,6 +782,7 @@ text_modify(cxobj              *x0,
 } /* text_modify */
 
 /*! Modify a top-level base tree x0 with modification tree x1
+ * @param[in]  th  text handle
  * @param[in]  x0  Base xml tree (can be NULL in add scenarios)
  * @param[in]  x1  xml tree which modifies base
  * @param[in]  yspec Top-level yang spec (if y is NULL)
@@ -812,23 +855,19 @@ text_modify_top(struct text_handle *th,
 	    goto done;
 	if (ymod != NULL)
 	    yc = yang_find_datanode((yang_node*)ymod, x1cname);
-	if (yc == NULL && _CLICON_XML_NS_ITERATE){
-	    int i;
-	    for (i=0; i<yspec->yp_len; i++){
-		ymod = yspec->yp_stmt[i];
-		if ((yc = yang_find_datanode((yang_node*)ymod, x1cname)) != NULL)
-		    break;
-	    }
+	if (yc == NULL && !_CLICON_XML_NS_STRICT){
+	    if (xml_yang_find_non_strict(x1c, yspec, &yc) < 0)
+		goto done;
 	}
 	if (yc == NULL){
-	    if (netconf_operation_failed(cbret, "application", "Validation failed")< 0)
+	    if (netconf_unknown_element(cbret, "application", x1cname, "Unassigned yang spec") < 0)
 		goto done;
 	    goto ok;
 	}
 	/* See if there is a corresponding node in the base tree */
-	if (match_base_child(x0, x1c, &x0c, yc) < 0)
+	if (match_base_child(x0, x1c, &x0c, th->th_sort, yc) < 0)
 	    goto done;
-	if (text_modify(x0c, (yang_node*)yc, x0, x1c, op, cbret) < 0)
+	if (text_modify(th, x0c, (yang_node*)yc, x0, x1c, op, cbret) < 0)
 	    goto done;
 	/* If xml return - ie netconf error xml tree, then stop and return OK */
 	if (cbuf_len(cbret))
@@ -840,7 +879,7 @@ text_modify_top(struct text_handle *th,
     return retval;
 } /* text_modify_top */
 
-/*! For containers without presence and no children, remove
+/*! For containers without presence and no children(except attrs), remove
  * @param[in]   x       XML tree node
  * See section 7.5.1 in rfc6020bis-02.txt:
  * No presence:
@@ -869,7 +908,7 @@ xml_container_presence(cxobj  *x,
     }
     /* Mark node that is: container, have no children, dont have presence */
     if (y->ys_keyword == Y_CONTAINER && 
-	xml_child_nr(x)==0 &&
+	xml_child_nr_notype(x, CX_ATTR)==0 &&
 	yang_find((yang_node*)y, Y_PRESENCE, NULL) == NULL)
 	xml_flag_set(x, XML_FLAG_MARK); /* Mark, remove later */
     retval = 0;
@@ -964,7 +1003,7 @@ text_put(xmldb_handle        xh,
        goto done;
 #endif
 #if 0 /* debug */
-    if (xml_child_sort && xml_apply0(x1, -1, xml_sort_verify, NULL) < 0)
+    if (th->th_sort && xml_apply0(x1, -1, xml_sort_verify, NULL) < 0)
 	clicon_log(LOG_NOTICE, "%s: verify failed #1", __FUNCTION__);
 #endif
     /* 
@@ -975,7 +1014,7 @@ text_put(xmldb_handle        xh,
 	goto done;
     /* If xml return - ie netconf error xml tree, then stop and return OK */
     if (cbuf_len(cbret))
-	goto ok;
+	goto fail;
 
     /* Remove NONE nodes if all subs recursively are also NONE */
     if (xml_tree_prune_flagged_sub(x0, XML_FLAG_NONE, 0, NULL) <0)
@@ -990,7 +1029,7 @@ text_put(xmldb_handle        xh,
     if (xml_tree_prune_flagged(x0, XML_FLAG_MARK, 1) < 0)
 	goto done;
 #if 0 /* debug */
-    if (xml_child_sort && xml_apply0(x0, -1, xml_sort_verify, NULL) < 0)
+    if (th->th_sort && xml_apply0(x0, -1, xml_sort_verify, NULL) < 0)
 	clicon_log(LOG_NOTICE, "%s: verify failed #3", __FUNCTION__);
 #endif
     /* Write back to datastore cache if first time */
@@ -1025,8 +1064,7 @@ text_put(xmldb_handle        xh,
     }
     else if (clicon_xml2file(f, x0, 0, th->th_pretty) < 0)
 	goto done;
- ok:
-    retval = 0;
+    retval = 1;
  done:
     if (cbretlocal && cbret)
 	cbuf_free(cbret);
@@ -1041,6 +1079,9 @@ text_put(xmldb_handle        xh,
     if (!th->th_cache && x0)
 	xml_free(x0);
     return retval;
+ fail:
+    retval = 0;
+    goto done;
 }
 
 /*! Copy database from db1 to db2
@@ -1434,7 +1475,7 @@ main(int    argc,
 	    op = OP_REMOVE;
 	else
 	    usage(argv[0]);
-	if (xmldb_put(h, db, op, NULL, xn, NULL) < 0)
+	if (xmldb_put(h, db, op, NULL, xn, NULL) < 1)
 	    goto done;
     }
     else
diff --git a/doc/FAQ.md b/doc/FAQ.md
index 9ecf46ff..7ab690e0 100644
--- a/doc/FAQ.md
+++ b/doc/FAQ.md
@@ -42,9 +42,9 @@ The example:
 	 sudo make install
 ```
 
-## How do you run Clixon example commands?
+## How do I run Clixon example commands?
 
-- Start a backend server: `clixon_backend -Ff /usr/local/etc/example.xml`
+- Start a backend server: `clixon_backend -F -s init -f /usr/local/etc/example.xml`
 - Start a cli session: `clixon_cli -f /usr/local/etc/example.xml`
 - Start a netconf session: `clixon_netconf -f /usr/local/etc/example.xml`
 - Start a restconf daemon: `sudo su -c "/www-data/clixon_restconf -f /usr/local/etc/example.xml " -s /bin/sh www-data`
@@ -72,6 +72,82 @@ grep clicon /etc/group
 clicon:x:1001:<user>,www-data
 ```
 
+## How do I use the CLI?
+
+The easiest way to use Clixon is via the CLI. Once the backend is started
+Example:
+```
+clixon_cli -f /usr/local/etc/example.xml 
+cli> set interfaces interface eth9 ?
+ description               enabled                   ipv4                     
+ ipv6                      link-up-down-trap-enable  type                     
+cli> set interfaces interface eth9 type ex:eth
+cli> validate 
+cli> commit 
+cli> show configuration xml 
+<interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
+   <interface>
+      <name>eth9</name>
+      <type>ex:eth</type>
+      <enabled>true</enabled>
+   </interface>
+</interfaces>
+cli> delete interfaces interface eth9
+```
+
+## How do I use netconf?
+
+As an alternative to cli configuration, you can use netconf. Easiest is to just pipe netconf commands to the clixon_netconf application.
+Example:
+```
+clixon_netconf -qf /usr/local/etc/example.xml
+<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>
+<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth9</name><type>ex:eth</type><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>
+```
+
+However, more useful is to run clixon_netconf as an SSH
+subsystem. Register the subsystem in /etc/sshd_config:
+```
+	Subsystem netconf /usr/local/bin/clixon_netconf -f /usr/local/etc/example.xml
+```
+and then invoke it from a client using
+```
+	ssh -s <host> netconf
+```
+
+## How do I use restconf?
+
+You can access clixon via REST API using restconf, such as using
+curl. GET, PUT, POST are supported.
+
+You need a web-server, such as nginx, and start a restconf fcgi
+daemon, clixon_restconf.
+
+For example, using nginx, install, and edit config file: /etc/nginx/sites-available/default:
+```
+server {
+  ...
+  location /restconf {
+    fastcgi_pass unix:/www-data/fastcgi_restconf.sock;
+    include fastcgi_params;
+  }
+}
+```
+Start nginx daemon
+```
+sudo /etc/init.d/nginx start
+```
+
+Example:
+```
+   curl -G http://127.0.0.1/restconf/data/ietf-interfaces:interfaces/interface=eth9/type
+   [
+     {
+       "ietf-interfaces:type": "ex:eth" 
+     }
+   ]
+```
+Read more in the (restconf)[../apps/restconf] docs.
 ## What about reference documentation?
 Clixon uses [Doxygen](http://www.doxygen.nl/index.html) for reference documentation.
 You need to install doxygen and graphviz on your system.
@@ -161,59 +237,6 @@ sudo docker run -td olofhagsand/clixon_example
 ```
 Look in the example documentation for more info.
 
-## How do I use netconf?
-
-As an alternative to cli configuration, you can use netconf. Easiest is to just pipe netconf commands to the clixon_netconf application.
-Example:
-```
-	echo "<rpc><get-config><source><candidate/></source><configuration/></get-config></rpc>]]>]]>" | clixon_netconf -f /usr/local/etc/example.xml
-```
-
-However, more useful is to run clixon_netconf as an SSH
-subsystem. Register the subsystem in /etc/sshd_config:
-```
-	Subsystem netconf /usr/local/bin/clixon_netconf -f /usr/local/etc/example.xml
-```
-and then invoke it from a client using
-```
-	ssh -s <host> netconf
-```
-
-## How do I use restconf?
-
-You can access clixon via REST API using restconf, such as using
-curl. GET, PUT, POST are supported.
-
-You need a web-server, such as nginx, and start a restconf fcgi
-daemon, clixon_restconf.
-
-For example, using nginx, install, and edit config file: /etc/nginx/sites-available/default:
-```
-server {
-  ...
-  location /restconf {
-    fastcgi_pass unix:/www-data/fastcgi_restconf.sock;
-    include fastcgi_params;
-  }
-}
-```
-Start nginx daemon
-```
-sudo /etc/init.d/nginx start
-```
-
-Example:
-```
-   curl -G http://127.0.0.1/restconf/data/interfaces/interface/name=eth9/type
-   [
-     {
-       "type": "eth" 
-     }
-   ]
-```
-Read more in the (restconf)[../apps/restconf] docs.
-
-
 ## Does Clixon support event streams? 
 
 Yes, Clixon supports event notification streams in the CLI, Netconf and Restconf API:s.
@@ -233,7 +256,7 @@ severity major;
 or via NETCONF:
 ```
 clixon_netconf -qf /usr/local/etc/example.xml 
-<rpc><create-subscription><stream>EXAMPLE</stream></create-subscription></rpc>]]>]]>
+<rpc><create-subscription xmlns="urn:ietf:params:xml:ns:netmod:notification"><stream>EXAMPLE</stream></create-subscription></rpc>]]>]]>
 <rpc-reply><ok/></rpc-reply>]]>]]>
 <notification xmlns="urn:ietf:params:xml:ns:netconf:notification:1.0"><eventTime>2018-09-30T12:44:59.657276</eventTime><event xmlns="http://example.com/event/1.0"><event-class>fault</event-class><reportingEntity><card>Ethernet0</card></reportingEntity><severity>major</severity></event></notification>]]>]]>
 ...
@@ -242,11 +265,11 @@ or via restconf:
 ```
    curl -H "Accept: text/event-stream" -s -X GET http://localhost/streams/EXAMPLE
 ```
-Consult (../apps/restconf/README.md) on more information on how to setup a reverse proxy for restconf streams. It is also possible to configure a pub/sub system such as (Nginx Nchan)[https://nchan.io]. 
+Consult [clixon restconf](../apps/restconf/README.md) on more information on how to setup a reverse proxy for restconf streams. It is also possible to configure a pub/sub system such as [Nginx Nchan](https://nchan.io). 
 
 ## How should I start the backend daemon?
 
-There are four different backend startup modes. There is differences in running state treatment, ie what state the machine is when you startthe daemon and how loading the configuration affects it:
+There are four different backend startup modes. There is differences in running state treatment, ie what state the machine is when you start the daemon and how loading the configuration affects it:
 - none - Do not touch running state. Typically after crash when running state and db are synched.
 - init - Initialize running state. Start with a completely clean running state.
 - running - Commit running db configuration into running state. Typically after reboot if a persistent running db exists.
@@ -277,7 +300,7 @@ There are two ways to add extra XML to running database  after start. Note that
 The first way is via a file. Assume you want to add this xml (the config tag is a necessary top-level tag):
 ```
 <config>
-   <x>extra</x>
+   <x xmlns="urn:example:clixon">extra</x>
 </config>
 ```
 You add this via the -c option:
@@ -289,12 +312,13 @@ The second way is by programming the plugin_reset() in the backend
 plugin. The example code contains an example on how to do this (see plugin_reset() in example_backend.c).
 
 ## I want to program. How do I extend the example?
-See [../apps/example] 
+See [../apps/example](../apps/example)
 - example.xml - Change the configuration file
 - The yang specifications - This is the central part. It changes the XML, database and the config cli.
 - example_cli.cli - Change the fixed part of the CLI commands 
 - example_cli.c - Cli C-commands are placed here.
 - example_backend.c - Commit and validate functions.
+- example_backend_nacm.c - Secondary example plugin (for authorization)
 - example_netconf.c - Netconf plugin
 - example_restconf.c - Add restconf authentication, etc.
 
diff --git a/example/README.md b/example/README.md
index 7621d9b5..a0a1d621 100644
--- a/example/README.md
+++ b/example/README.md
@@ -1,19 +1,33 @@
 # Clixon example
 
+  * [Content](#content)
+  * [Compile and run](#compile)
+  * [Using the CLI](#using-the-cli)
+  * [Using netconf](#using-netconf)
+  * [Streams](#streams)
+  * [RPC Operations](#rpc-operations)
+  * [State data](#state-data)
+  * [Authentication and NACM](#authentication-and-nacm)
+  * [Systemd](#systemd)
+  * [Docker](#docker)
+  * [Plugins](#plugins)
+  
+## Content
+
 This directory contains a Clixon example which includes a simple example. It contains the following files:
-* example.xml       The configuration file. See yang/clixon-config@<date>.yang for all available fields.
-* example.yang      The yang spec of the example. It mainly includes ietf routing and IP modules.
-* example_cli.cli   CLIgen specification.
-* example_cli.c     CLI callback plugin containing functions called in the cli file above: a generic callback (`mycallback`) and an RPC (`fib_route_rpc`).
-* example_backend.c Backend callback plugin including example of:
+* `example.xml`       The configuration file. See (yang/clixon-config@<date>.yang)[../yang/clixon-config@2018-10-21.yang] for the documentation of all available fields.
+* `example.yang`      The yang spec of the example. It mainly includes ietf routing and IP modules.
+* `example_cli.cli`   CLIgen specification.
+* `example_cli.c`     CLI callback plugin containing functions called in the cli file above: a generic callback (`mycallback`) and an RPC (`fib_route_rpc`).
+* `example_backend.c` Backend callback plugin including example of:
   * transaction callbacks (validate/commit),
   * notification,
   * rpc handler
   * state-data handler, ie non-config data
-* example_backend_nacm.c Secondary backend plugin. Plugins are loaded alphabetically.
-* example_restconf.c Restconf callback plugin containing an HTTP basic authentication callback
-* example_netconf.c Netconf callback plugin
-* Makefile.in       Example makefile where plugins are built and installed
+* `example_backend_nacm.c` Secondary backend plugin. Plugins are loaded alphabetically.
+* `example_restconf.c` Restconf callback plugin containing an HTTP basic authentication callback
+* `example_netconf.c` Netconf callback plugin
+* `Makefile.in`       Example makefile where plugins are built and installed
 
 
 ## Compile and run
@@ -47,10 +61,37 @@ Send restconf command
     curl -G http://127.0.0.1/restconf/data
 ```
 
-## Setting data example using netconf
+## Using the CLI
+
+The example CLI allows you to modify and view the data model using `set`, `delete` and `show` via generated code.
+There are also many other commands available as examples. View the source file (example_cli.cli)[example_cli.cli] for more details.
+
+The following example shows how to add an interface in candidate, validate and commit it to running, then look at it (as xml) and finally delete it.
+```
+clixon_cli -f /usr/local/etc/example.xml 
+cli> set interfaces interface eth9 ?
+ description               enabled                   ipv4                     
+ ipv6                      link-up-down-trap-enable  type                     
+cli> set interfaces interface eth9 type ex:eth
+cli> validate 
+cli> commit 
+cli> show configuration xml 
+<interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
+   <interface>
+      <name>eth9</name>
+      <type>ex:eth</type>
+      <enabled>true</enabled>
+   </interface>
+</interfaces>
+cli> delete interfaces interface eth9
+```
+
+## Using Netconf
+
+The following example shows how to set data using netconf:
 ```
 <rpc><edit-config><target><candidate/></target><config>
-      <interfaces>
+      <interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
          <interface>
             <name>eth1</name>
             <enabled>true</enabled>
@@ -65,13 +106,13 @@ Send restconf command
 </config></edit-config></rpc>]]>]]>
 ```
 
-## Getting data using netconf
+### Getting data using netconf
 ```
 <rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>
 <rpc><get-config><source><candidate/></source><filter/></get-config></rpc>]]>]]>
 <rpc><get-config><source><candidate/></source><filter type="xpath"/></get-config></rpc>]]>]]>
-<rpc><get-config><source><candidate/></source><filter type="subtree"><configuration><interfaces><interface><ipv4/></interface></interfaces></configuration></filter></get-config></rpc>]]>]]>
-<rpc><get-config><source><candidate/></source><filter type="xpath" select="/interfaces/interface/ipv4"/></get-config></rpc>]]>]]>
+<rpc><get-config><source><candidate/></source><filter type="subtree"><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth9</name><type>ex:eth</type></interface></interfaces></data></filter></get-config></rpc>]]>]]>
+<rpc><get-config><source><candidate/></source><filter type="xpath" select="/interfaces/interface"/></get-config></rpc>]]>]]>
 <rpc><validate><source><candidate/></source></validate></rpc>]]>]]>
 ```
 
@@ -80,23 +121,134 @@ Send restconf command
 The example has an EXAMPLE stream notification triggering every 5s. To start a notification 
 stream in the session using netconf, create a subscription:
 ```
-<rpc><create-subscription><stream>EXAMPLE</stream></create-subscription></rpc>]]>]]>
+<rpc><create-subscription xmlns="urn:ietf:params:xml:ns:netmod:notification"><stream>EXAMPLE</stream></create-subscription></rpc>]]>]]>
 <rpc-reply><ok/></rpc-reply>]]>]]>
-<notification><event>Routing notification</event></notification>]]>]]>
-<notification><event>Routing notification</event></notification>]]>]]>
+<notification xmlns="urn:ietf:params:xml:ns:netconf:notification:1.0"><eventTime>2019-01-02T10:20:05.929272</eventTime><event><event-class>fault</event-class><reportingEntity><card>Ethernet0</card></reportingEntity><severity>major</severity></event></notification>]]>]]>
 ...
 ```
 This can also be triggered via the CLI:
 ```
-cli> notify 
-cli> Routing notification
-Routing notification
+clixon_cli -f /usr/local/etc/example.xml
+cli> notify
+cli> event-class fault;
+reportingEntity {
+    card Ethernet0;
+}
+severity major;
 ...
+cli> no notify
+cli>
 ```
 
-Restconf support is also supported, see [../apps/restconf/README.md].
+Restconf support is also supported, see (restc)[../apps/restconf/README.md].
 
-## Initializing a plugin
+
+## RPC Operations
+
+Clixon implements Yang RPC operations by an extension mechanism. The
+extension mechanism enables you to add application-specific
+operations. It works by adding user-defined callbacks for added
+netconf operations. It is possible to use the extension mechanism
+independent of the yang rpc construct, but it is recommended. The example includes an example:
+
+Example using CLI:
+```
+cli> rpc ipv4
+    rpc-reply {
+        route {
+            address-family ipv4;
+            next-hop {
+                next-hop-list 2.3.4.5;
+            }
+            source-protocol static;
+        }
+    }
+```
+Netconf:
+```
+<rpc><fib-route xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"><routing-instance-name>ipv4</routing-instance-name></fib-route></rpc>]]>]]>
+<rpc-reply><route xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"><address-family>ipv4</address-family><next-hop><next-hop-list>2.3.4.5</next-hop-list></next-hop><source-protocol>static</source-protocol></route></rpc-reply>]]>]]>
+```
+Restconf:
+```
+curl -X POST  http://localhost/restconf/operations/ietf-routing:fib-route -d '{"ietf-routing:input":{"routing-instance-name":"ipv4"}}'
+```
+
+### Details
+
+The example works by creating a netconf rpc call and sending it to the backend: (see the fib_route_rpc() function in [example_cli.c](example_cli.c)).
+
+In the (example_backend.c)[example_backend.c], a callback is registered (fib_route()) which handles the RPC (this is just dummy data):
+```
+static int 
+fib_route(clicon_handle h, 
+	  cxobj        *xe,           /* Request: <rpc><xn></rpc> */
+	  cbuf         *cbret,        /* Reply eg <rpc-reply>... */
+	  void         *arg,          /* Client session */
+	  void         *regarg)       /* Argument given at register */
+{
+    cprintf(cbret, "<rpc-reply><route xmlns=\"urn:ietf:params:xml:ns:yang:ietf-routing\">"
+	    "<address-family>ipv4</address-family>"
+	    "<next-hop><next-hop-list>2.3.4.5</next-hop-list></next-hop>"
+	    "<source-protocol>static</source-protocol>"
+	    "</route></rpc-reply>");    
+    return 0;
+}
+int
+clixon_plugin_init(clicon_handle h)
+{
+...
+   rpc_callback_register(h, fib_route, NULL, "fib-route");
+...
+}
+```
+
+## State data
+
+Netconf <get> and restconf GET also returns state data(not only configuration data).
+
+In YANG state data is specified with `config false;`. In the example,
+`state` is state data, see (example.yang)[example.yang]
+
+To return state data, you need to write a backend state data callback
+with the name "plugin_statedata" where you return an XML tree with
+state. This is then merged with config data by the system.
+
+A static example of returning state data is in the example. Note that
+a real example would poll or get the interface counters via a system
+call, as well as use the "xpath" argument to identify the requested
+state data.
+
+## Authentication and NACM
+The example contains some stubs for authorization according to [RFC8341(NACM)](https://tools.ietf.org/html/rfc8341):
+* A basic auth HTTP callback, see: example_restconf_credentials() containing three example users: andy, wilma, and guest, according to the examples in Appendix A in [RFC8341](https://tools.ietf.org/html/rfc8341).
+* A NACM backend plugin reporting the mandatory NACM state variables.
+
+## Systemd
+
+Example systemd files for backend and restconf daemons are found under the systemd directory. Install them under /etc/systemd/system for example.
+
+## Docker
+
+Run the example as a docker container and access it from a host CLI as follows:
+```
+ID=$(sudo docker run -td olofhagsand/clixon_example)
+IP=$(sudo docker inspect -f '{{.NetworkSettings.IPAddress }}' $ID)
+clixon_cli -a IPv4 -u $IP -f ./example.xml
+```
+
+Build the container and push yourself: First change the IMAGE variable in Makefile (eg to "you/clixon_example). Then build and push:
+```
+make docker
+make push
+sudo docker run -ti --rm you/clixon_example
+```
+
+Note that the configuration database is internal in the container, so
+it is deleted if the container is restarted. To make the configuration
+database persistent, you need to mount running_db using `-v`
+
+## Plugins
 
 The example includes a restonf, netconf, CLI and two backend plugins.
 Each plugin is initiated with an API struct followed by a plugin init function.
@@ -127,96 +279,3 @@ clixon_plugin_init(clicon_handle h)
     return &api; /* Return NULL on error */
 }
 ```
-
-## Operation data
-
-Clixon implements Yang RPC operations by an extension mechanism. The
-extension mechanism enables you to add application-specific
-operations. It works by adding user-defined callbacks for added
-netconf operations. It is possible to use the extension mechanism
-independent of the yang rpc construct, but it is recommended. The example includes an example:
-
-Example:
-```
-cli> rpc ipv4
-<rpc-reply>
-   <ok/>
-</rpc-reply>
-```
-
-The example works by creating a netconf rpc call and sending it to the backend: (see the fib_route_rpc() function).
-```
-  <rpc>
-    <fib-route>
-      <routing-instance-name>ipv4</routing-instance-name>
-    </fib-route>
-   </rpc>
-```
-
-In the backend, a callback is registered (fib_route()) which handles the RPC.
-```
-static int 
-fib_route(clicon_handle h, 
-	  cxobj        *xe,           /* Request: <rpc><xn></rpc> */
-	  cbuf         *cbret,        /* Reply eg <rpc-reply>... */
-	  void         *arg,          /* Client session */
-	  void         *regarg)       /* Argument given at register */
-{
-    cprintf(cbret, "<rpc-reply><ok/></rpc-reply>");    
-    return 0;
-}
-int
-clixon_plugin_init(clicon_handle h)
-{
-...
-   rpc_callback_register(h, fib_route, NULL, "fib-route");
-...
-}
-```
-## State data
-
-Netconf <get> and restconf GET also returns state data, in contrast to
-config data. 
-p
-In YANG state data is specified with "config false;". In the example, interface-state is state data.
-
-To return state data, you need to write a backend state data callback
-with the name "plugin_statedata" where you return an XML tree with
-state. This is then merged with config data by the system.
-
-A static example of returning state data is in the example. Note that
-a real example would poll or get the interface counters via a system
-call, as well as use the "xpath" argument to identify the requested
-state data.
-
-## Authentication and NACM
-The example contains some stubs for authorization according to [RFC8341(NACM)](https://tools.ietf.org/html/rfc8341):
-* A basic auth HTTP callback, see: example_restconf_credentials() containing three example users: andy, wilma, and guest, according to the examples in Appendix A in [RFC8341](https://tools.ietf.org/html/rfc8341).
-* A NACM backend plugin reporting the mandatory NACM state variables.
-
-## Systemd files
-
-Example systemd files for backend and restconf daemons are found under the systemd directory. Install them under /etc/systemd/system for example.
-
-## Docker
-
-Run the example as a docker container and access it from a host CLI as follows:
-```
-ID=$(sudo docker run -td olofhagsand/clixon_example)
-IP=$(sudo docker inspect -f '{{.NetworkSettings.IPAddress }}' $ID)
-clixon_cli -a IPv4 -u $IP -f ./example.xml
-```
-
-Build the container and push yourself: First change the IMAGE variable in Makefile (eg to "you/clixon_example). Then build and push:
-```
-make docker
-make push
-sudo docker run -ti --rm you/clixon_example
-```
-
-Note that the configuration database is internal in the container, so
-it is deleted if the container is restarted. To make the configuration
-database persistent, you need to mount running_db using `-v`
-
-
-
diff --git a/example/example_backend.c b/example/example_backend.c
index 35fe20d4..ae1f51d4 100644
--- a/example/example_backend.c
+++ b/example/example_backend.c
@@ -96,7 +96,7 @@ example_stream_timer(int   fd,
     int                    retval = -1;
     clicon_handle          h = (clicon_handle)arg;
 
-    /* XXX Change to actual netconf notifications */
+    /* XXX Change to actual netconf notifications and namespace */
     if (stream_notify(h, "EXAMPLE", "<event><event-class>fault</event-class><reportingEntity><card>Ethernet0</card></reportingEntity><severity>major</severity></event>") < 0)
 	goto done;
     if (example_stream_timer_setup(h) < 0)
@@ -129,7 +129,7 @@ fib_route(clicon_handle h,            /* Clicon handle */
 	  void         *arg,          /* Client session */
 	  void         *regarg)       /* Argument given at register */
 {
-    cprintf(cbret, "<rpc-reply><route>"
+    cprintf(cbret, "<rpc-reply><route xmlns=\"urn:ietf:params:xml:ns:yang:ietf-routing\">"
 	    "<address-family>ipv4</address-family>"
 	    "<next-hop><next-hop-list>2.3.4.5</next-hop-list></next-hop>"
 	    "<source-protocol>static</source-protocol>"
@@ -147,7 +147,7 @@ route_count(clicon_handle h,
 	    void         *arg,
 	    void         *regarg)          /* Argument given at register */
 {
-    cprintf(cbret, "<rpc-reply><number-of-routes>42</number-of-routes></rpc-reply>");    
+    cprintf(cbret, "<rpc-reply><number-of-routes xmlns=\"urn:ietf:params:xml:ns:yang:ietf-routing\">42</number-of-routes></rpc-reply>");    
     return 0;
 }
 
@@ -180,9 +180,17 @@ example_rpc(clicon_handle h,            /* Clicon handle */
 {
     int    retval = -1;
     cxobj *x = NULL;
+    char  *namespace;
 
+    /* get namespace from rpc name, return back in each output parameter */
+    if ((namespace = xml_find_type_value(xe, NULL, "xmlns", CX_ATTR)) == NULL){
+	clicon_err(OE_XML, ENOENT, "No namespace given in rpc %s", xml_name(xe));
+	goto done;
+    }
     cprintf(cbret, "<rpc-reply>");
     while ((x = xml_child_each(xe, x, CX_ELMNT)) != NULL) {
+	if (xmlns_set(x, NULL, namespace) < 0)
+	    goto done;
 	if (clicon_xml2cbuf(cbret, x, 0, 0) < 0)
 	    goto done;
     }
@@ -222,7 +230,7 @@ example_statedata(clicon_handle h,
      * Note this state needs to be accomanied by yang snippet
      * above
      */
-    if (xml_parse_string("<state>"
+    if (xml_parse_string("<state xmlns=\"urn:example:clixon\">"
 			 "<op>42</op>"
 			 "</state>", NULL, &xstate) < 0)
 	goto done;
@@ -251,17 +259,22 @@ example_reset(clicon_handle h,
 {
     int    retval = -1;
     cxobj *xt = NULL;
+    int    ret;
 
-    if (xml_parse_string("<config><interfaces><interface>"
+    if (xml_parse_string("<config><interfaces xmlns=\"urn:ietf:params:xml:ns:yang:ietf-interfaces\"><interface>"
 			 "<name>lo</name><type>ex:loopback</type>"
 			 "</interface></interfaces></config>", NULL, &xt) < 0)
 	goto done;
-    /* Replace parent w fiorst child */
+    /* Replace parent w first child */
     if (xml_rootchild(xt, 0, &xt) < 0)
 	goto done;
     /* Merge user reset state */
-    if (xmldb_put(h, (char*)db, OP_MERGE, xt, NULL) < 0)
+    if ((ret = xmldb_put(h, (char*)db, OP_MERGE, xt, NULL)) < 0)
 	goto done;
+    if (ret == 0){
+	clicon_err(OE_XML, 0, "Error when writing to XML database");
+	goto done;
+    }
     retval = 0;
  done:
     if (xt != NULL)
diff --git a/example/example_cli.c b/example/example_cli.c
index 987aae30..01a375a3 100644
--- a/example/example_cli.c
+++ b/example/example_cli.c
@@ -110,7 +110,7 @@ fib_route_rpc(clicon_handle h,
 	goto done;
     }
     /* Print result */
-    xml_print(stdout, xml_child_i(xret, 0));
+    xml2txt(stdout, xml_child_i(xret, 0), 1);
     retval = 0;
  done:
     if (xret)
diff --git a/example/example_cli.cli b/example/example_cli.cli
index 302a6cf3..892c687a 100644
--- a/example/example_cli.cli
+++ b/example/example_cli.cli
@@ -24,7 +24,7 @@ debug("Debugging parts of the system"), cli_debug_cli((int32)1);{
 }
 copy("Copy and create a new object") {
     interface("Copy interface"){
-	<name:string expand_dbvar("candidate","/interfaces/interface=%s/name")>("name of interface to copy from") to("Copy to interface") <toname:string>("Name of interface to copy to"), cli_copy_config("candidate","//interface[%s='%s']","name","name","toname");
+	<name:string expand_dbvar("candidate","/ietf-interfaces:interfaces/interface=%s/name")>("name of interface to copy from") to("Copy to interface") <toname:string>("Name of interface to copy to"), cli_copy_config("candidate","//interface[%s='%s']","name","name","toname");
     }
 }
 discard("Discard edits (rollback 0)"), discard_changes();
diff --git a/example/example_netconf.c b/example/example_netconf.c
index 9993e851..b70128de 100644
--- a/example/example_netconf.c
+++ b/example/example_netconf.c
@@ -71,7 +71,7 @@ int netconf_client_rpc(clicon_handle h,
 		       void         *regarg)
 {
     clicon_debug(1, "%s restconf", __FUNCTION__);
-    cprintf(cbret, "<rpc-reply><result>ok</result></rpc-reply>");
+    cprintf(cbret, "<rpc-reply><result xmlns=\"urn:example:clixon\">ok</result></rpc-reply>");
     return 0;
 }
 
diff --git a/example/example_restconf.c b/example/example_restconf.c
index 43771662..ec0e8d27 100644
--- a/example/example_restconf.c
+++ b/example/example_restconf.c
@@ -275,7 +275,7 @@ restconf_client_rpc(clicon_handle h,
 {
     //    FCGX_Request *r = (FCGX_Request *)arg;
     clicon_debug(1, "%s", __FUNCTION__);
-    cprintf(cbret, "<rpc-reply><result>ok</result></rpc-reply>");
+    cprintf(cbret, "<rpc-reply><result xmlns=\"urn:example:clixon\">ok</result></rpc-reply>");
     return 0;
 }
 
diff --git a/include/clixon_custom.h b/include/clixon_custom.h
index cbb3f1df..8b7c5ae6 100644
--- a/include/clixon_custom.h
+++ b/include/clixon_custom.h
@@ -51,11 +51,6 @@ int strverscmp (__const char *__s1, __const char *__s2);
 */
 #define XMLNS_YANG_ONLY 1
 
-/* Set for full XML namespace code in XML, NETCONF and YANG
- * Experimental
- */
-#undef ENABLE_XMLNS
-
 /* If set, patch all CLI spec calls to @datamodel:tree to @datamodel.
  * This is a backward compatible fix for 3.9 for CLIgen specification files
  * using model generation (CLIXON_CLI_GENMODEL).
diff --git a/lib/clixon/clixon_json.h b/lib/clixon/clixon_json.h
index 68b19559..0a644680 100644
--- a/lib/clixon/clixon_json.h
+++ b/lib/clixon/clixon_json.h
@@ -43,6 +43,7 @@ int xml2json_cbuf(cbuf *cb, cxobj *x, int pretty);
 int xml2json_cbuf_vec(cbuf *cb, cxobj **vec, size_t veclen, int pretty);
 int xml2json(FILE *f, cxobj *x, int pretty);
 int xml2json_vec(FILE *f, cxobj **vec, size_t veclen, int pretty);
+int json2xml_ns(yang_spec *yspec, cxobj *x, cxobj **xerr);
 int json_parse_str(char *str, cxobj **xt);
 int json_parse_file(int fd, yang_spec *yspec, cxobj **xt);
 
diff --git a/lib/clixon/clixon_netconf_lib.h b/lib/clixon/clixon_netconf_lib.h
index 8f1b9da0..a615c663 100644
--- a/lib/clixon/clixon_netconf_lib.h
+++ b/lib/clixon/clixon_netconf_lib.h
@@ -52,7 +52,8 @@ int netconf_bad_element(cbuf *cb, char *type, char *info, char *element);
 int netconf_bad_element_xml(cxobj **xret, char *type, char *info, char *element);
 int netconf_unknown_element(cbuf *cb, char *type, char *element, char *message);
 int netconf_unknown_element_xml(cxobj **xret, char *type, char *element, char *message);
-int netconf_unknown_namespace(cbuf *cb, char *type, char *info, char *message);
+int netconf_unknown_namespace(cbuf *cb, char *type, char *namespace, char *message);
+int netconf_unknown_namespace_xml(cxobj **xret, char *type, char *namespace, char *message);
 int netconf_access_denied(cbuf *cb, char *type, char *message);
 int netconf_access_denied_xml(cxobj **xret, char *type, char *message);
 int netconf_lock_denied(cbuf *cb, char *info, char *message);
diff --git a/lib/clixon/clixon_options.h b/lib/clixon/clixon_options.h
index b5cb55c3..a849c6cd 100644
--- a/lib/clixon/clixon_options.h
+++ b/lib/clixon/clixon_options.h
@@ -153,6 +153,9 @@ static inline char *clicon_xmldb_dir(clicon_handle h){
 static inline char *clicon_xmldb_plugin(clicon_handle h){
     return clicon_option_str(h, "CLICON_XMLDB_PLUGIN");
 }
+static inline int clicon_xml_sort(clicon_handle h){
+    return clicon_option_bool(h, "CLICON_XML_SORT");
+}
 
 /*-- Specific option access functions for YANG options w type conversion--*/
 int   clicon_cli_genmodel(clicon_handle h);
diff --git a/lib/clixon/clixon_string.h b/lib/clixon/clixon_string.h
index cebb0871..dd2eb290 100644
--- a/lib/clixon/clixon_string.h
+++ b/lib/clixon/clixon_string.h
@@ -86,7 +86,7 @@ int xml_chardata_encode(char **escp, char *fmt, ...);
 int uri_percent_decode(char *enc, char **str);
 const char *clicon_int2str(const map_str2int *mstab, int i);
 int clicon_str2int(const map_str2int *mstab, char *str);
-
+int nodeid_split(char *nodeid,	char **prefix, char **id);
 #ifndef HAVE_STRNDUP
 char *clicon_strndup (const char *, size_t);
 #endif /* ! HAVE_STRNDUP */
diff --git a/lib/clixon/clixon_xml.h b/lib/clixon/clixon_xml.h
index 68f332ab..2117bfef 100644
--- a/lib/clixon/clixon_xml.h
+++ b/lib/clixon/clixon_xml.h
@@ -45,6 +45,8 @@
  * namespace (rfc6241 3.1)
  */
 #define DEFAULT_XML_RPC_NAMESPACE "urn:ietf:params:xml:ns:netconf:base:1.0"
+/* default namespace statement, such as in <rpc xmlns="..."> */
+#define DEFAULT_XMLNS "xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\""
 
 /*
  * Types
@@ -84,14 +86,13 @@ typedef int (xml_applyfn_t)(cxobj *x, void *arg);
 #define XML_FLAG_CHANGE 0x08  /* Node is changed (commits) or child changed rec */
 #define XML_FLAG_NONE   0x10  /* Node is added as NONE */
 
-
 /* Iterate through modules to find the matching datanode
  * or rpc if no xmlns attribute specifies namespace.
- * This is loose semantics of finding namespaces.
+ * This is lazy non-strict semantics of finding namespaces.
  * And it is wrong, but is the way Clixon originally was written."
- * @see CLICON_XML_NS_ITERATE clixon configure option 
+ * @see CLICON_XML_NS_STRICT clixon configure option 
  */
-extern int _CLICON_XML_NS_ITERATE;
+extern int _CLICON_XML_NS_STRICT;
 
 /*
  * Prototypes
@@ -102,6 +103,7 @@ int       xml_name_set(cxobj *xn, char *name);
 char     *xml_prefix(cxobj *xn);
 int       xml_prefix_set(cxobj *xn, char *name);
 int       xml2ns(cxobj *x, char *localname, char **namespace);
+int       xmlns_set(cxobj *x, char *prefix, char *namespace);
 cxobj    *xml_parent(cxobj *xn);
 int       xml_parent_set(cxobj *xn, cxobj *parent);
 
@@ -117,7 +119,9 @@ int       xml_type_set(cxobj *xn, enum cxobj_type type);
 
 int       xml_child_nr(cxobj *xn);
 int       xml_child_nr_type(cxobj *xn, enum cxobj_type type);
+int       xml_child_nr_notype(cxobj *xn, enum cxobj_type type);
 cxobj    *xml_child_i(cxobj *xn, int i);
+cxobj    *xml_child_i_type(cxobj *xn, int i, enum cxobj_type type);
 cxobj    *xml_child_i_set(cxobj *xt, int i, cxobj *xc);
 cxobj    *xml_child_each(cxobj *xparent, cxobj *xprev,  enum cxobj_type type);
 
@@ -139,6 +143,7 @@ char     *xml_body(cxobj *xn);
 cxobj    *xml_body_get(cxobj *xn);
 char     *xml_find_type_value(cxobj *xn_parent, char *prefix,
 			      char *name, enum cxobj_type type);
+cxobj    *xml_find_type(cxobj *xn_parent, char *prefix, char *name, enum cxobj_type type);
 char     *xml_find_value(cxobj *xn_parent, char *name);
 char     *xml_find_body(cxobj *xn, char *name);
 cxobj    *xml_find_body_obj(cxobj *xt, char *name, char *val);
diff --git a/lib/clixon/clixon_xml_map.h b/lib/clixon/clixon_xml_map.h
index dba82884..9eba5bfd 100644
--- a/lib/clixon/clixon_xml_map.h
+++ b/lib/clixon/clixon_xml_map.h
@@ -43,10 +43,13 @@
  */
 int xml2txt(FILE *f, cxobj *x, int level);
 int xml2cli(FILE *f, cxobj *x, char *prepend, enum genmodel_type gt);
+int xml_yang_root(cxobj *x, cxobj **xr);
+int xmlns_assign(cxobj *x);
 int xml_yang_validate_rpc(cxobj *xrpc, cbuf *cbret);
 int xml_yang_validate_add(cxobj *xt, cbuf *cbret);
 int xml_yang_validate_all(cxobj *xt, cbuf *cbret);
 int xml_yang_validate_all_top(cxobj *xt, cbuf *cbret);
+int xml_yang_find_non_strict(cxobj *x, yang_spec *yspec, yang_stmt **y);
 int xml2cvec(cxobj *xt, yang_stmt *ys, cvec **cvv0);
 int cvec2xml_1(cvec *cvv, char *toptag, cxobj *xp, cxobj **xt0);
 int xml_diff(yang_spec *yspec, cxobj *xt1, cxobj *xt2, 	 
@@ -64,8 +67,7 @@ int xml_sanity(cxobj *x, void  *arg);
 int xml_non_config_data(cxobj *xt, void *arg);
 int xml_spec_populate_rpc(clicon_handle h, cxobj *x, yang_spec *yspec);
 int xml_spec_populate(cxobj *x, void *arg);
-int api_path2xpath_cvv(yang_spec *yspec, cvec *cvv, int offset, cbuf *xpath);
-int api_path2xpath(yang_spec *yspec, char *api_path, cbuf *xpath);
+int api_path2xpath(yang_spec *yspec, cvec *cvv, int offset, cbuf *xpath);
 int api_path2xml(char *api_path, yang_spec *yspec, cxobj *xtop, 
 		 yang_class nodeclass, cxobj **xpathp, yang_node **ypathp);
 int xml_merge(cxobj *x0, cxobj *x1, yang_spec *yspec, char **reason);
diff --git a/lib/clixon/clixon_xml_sort.h b/lib/clixon/clixon_xml_sort.h
index 620456a0..c4ffeab3 100644
--- a/lib/clixon/clixon_xml_sort.h
+++ b/lib/clixon/clixon_xml_sort.h
@@ -37,14 +37,16 @@
 #define _CLIXON_XML_SORT_H
 
 /* Sort and binary search of XML children
- * Experimental
+ * XXX This variable is a kludge since low-level functions xml_merge/xml_diff calls 
+ * match_base_child without handle
+ * @see clicon_xml_sort
  */
 extern int xml_child_sort;
 
 /*
  * Prototypes
  */
-int xml_child_spec(char *name, cxobj *xp, yang_spec *yspec, yang_stmt **yp);
+int xml_child_spec(cxobj *x, cxobj *xp, yang_spec *yspec, yang_stmt **yp);
 int xml_cmp(const void* arg1, const void* arg2);
 int xml_sort(cxobj *x0, void *arg);
 cxobj *xml_search(cxobj *x, char *name, int yangi, enum rfc_6020 keyword, int keynr, char **keyvec, char **keyval);
@@ -53,6 +55,6 @@ int    xml_insert_pos(cxobj *x0, char *name, int yangi, enum rfc_6020 keyword,
 		      int upper);
 cxobj *xml_match(cxobj *x0, char *name, enum rfc_6020 keyword, int keynr, char **keyvec, char **keyval);
 int    xml_sort_verify(cxobj *x, void *arg);
-int    match_base_child(cxobj *x0, cxobj *x1c, cxobj **x0cp, yang_stmt *yc);
+int    match_base_child(cxobj *x0, cxobj *x1c, cxobj **x0cp, int xml_sort, yang_stmt *yc);
 
 #endif /* _CLIXON_XML_SORT_H */
diff --git a/lib/clixon/clixon_yang.h b/lib/clixon/clixon_yang.h
index e9aee2e6..a9291583 100644
--- a/lib/clixon/clixon_yang.h
+++ b/lib/clixon/clixon_yang.h
@@ -252,17 +252,16 @@ yang_stmt *yn_each(yang_node *yn, yang_stmt *ys);
 char      *yang_key2str(int keyword);
 char      *yarg_prefix(yang_stmt *ys);
 char      *yarg_id(yang_stmt *ys);
-int        yang_nodeid_split(char *nodeid, char **prefix, char **id);
 int        ys_module_by_xml(yang_spec *ysp, struct xml *xt, yang_stmt **ymodp);
 yang_stmt *ys_module(yang_stmt *ys);
 yang_spec *ys_spec(yang_stmt *ys);
 yang_stmt *yang_find_module_by_prefix(yang_stmt *ys, char *prefix);
 yang_stmt *yang_find_module_by_namespace(yang_spec *yspec, char *namespace);
+yang_stmt *yang_find_module_by_name(yang_spec *yspec, char *name);
 yang_stmt *yang_find(yang_node *yn, int keyword, const char *argument);
 int        yang_match(yang_node *yn, int keyword, char *argument);
 yang_stmt *yang_find_datanode(yang_node *yn, char *argument);
 yang_stmt *yang_find_schemanode(yang_node *yn, char *argument);
-yang_stmt *yang_find_topnode(yang_spec *ysp, char *name, yang_class class);
 char      *yang_find_myprefix(yang_stmt *ys);
 char      *yang_find_mynamespace(yang_stmt *ys);
 int        yang_order(yang_stmt *y);
diff --git a/lib/src/clixon_err.c b/lib/src/clixon_err.c
index aa4576df..6ec992c6 100644
--- a/lib/src/clixon_err.c
+++ b/lib/src/clixon_err.c
@@ -140,6 +140,7 @@ clicon_err_reset(void)
  * @param[in]    err      Error number, typically errno
  * @param[in]    suberr   Sub-error number   
  * @param[in]    reason   Error string, format with argv
+ * @see clicon_err_reser  Resetting the global error variables.
  */
 int
 clicon_err_fn(const char *fn, 
diff --git a/lib/src/clixon_json.c b/lib/src/clixon_json.c
index 06aa71c9..1cd99af1 100644
--- a/lib/src/clixon_json.c
+++ b/lib/src/clixon_json.c
@@ -55,10 +55,12 @@
 #include "clixon_err.h"
 #include "clixon_log.h"
 #include "clixon_queue.h"
+#include "clixon_string.h"
 #include "clixon_hash.h"
 #include "clixon_handle.h"
 #include "clixon_yang.h"
 #include "clixon_xml.h"
+#include "clixon_netconf_lib.h"
 #include "clixon_json.h"
 #include "clixon_json_parse.h"
 
@@ -90,43 +92,31 @@ enum childtype{
     ANY_CHILD,    /* eg <a><b/></a> or <a><b/><c/></a> */
 };
 
-/*! Number of children EXCEPT attributes
- * @param[in]  xn    xml node
- * @retval     number of children in XML tree (except children of type CX_ATTR)
- * @see xml_child_nr
- */
-static int   
-xml_child_nr_noattr(cxobj *xn)
-{
-    cxobj *x = NULL;
-    int    nr = 0;
-
-    while ((x = xml_child_each(xn, x, -1)) != NULL) {
-	if (xml_type(x) != CX_ATTR)
-	    nr++;
-    }
-    return nr;
-}
-
 /*! x is element and has exactly one child which in turn has none 
  * remove attributes from x
  * Clone from clixon_xml_map.c
  */
 static enum childtype
-childtype(cxobj *x)
+child_type(cxobj *x)
 {
-    cxobj *xc1; /* the only child of x */
+    cxobj *xc;   /* the only child of x */
     int    clen; /* nr of children */
 
-    clen = xml_child_nr_noattr(x);
+    clen = xml_child_nr_notype(x, CX_ATTR);
     if (xml_type(x) != CX_ELMNT)
 	return -1; /* n/a */
     if (clen == 0)
     	return NULL_CHILD;
     if (clen > 1)
 	return ANY_CHILD;
-    xc1 = xml_child_i(x, 0); /* From here exactly one child */
-    if (xml_child_nr_noattr(xc1) == 0 && xml_type(xc1)==CX_BODY)
+    /* From here exactly one noattr child, get it */
+    xc = NULL;
+    while ((xc = xml_child_each(x, xc, -1)) != NULL)
+	if (xml_type(xc) != CX_ATTR)
+	    break;
+    if (xc == NULL)
+	return -2; /* n/a */
+    if (xml_child_nr_notype(xc, CX_ATTR) == 0 && xml_type(xc)==CX_BODY)
 	return BODY_CHILD;
     else
 	return ANY_CHILD;
@@ -175,6 +165,9 @@ arraytype2str(enum array_element_type lt)
     return "";
 }
 
+/*! Check typeof x in array
+ * Some complexity when x is in different namespaces
+ */
 static enum array_element_type
 array_eval(cxobj *xprev, 
 	   cxobj *x, 
@@ -184,7 +177,10 @@ array_eval(cxobj *xprev,
     int                     eqprev=0;
     int                     eqnext=0;
     yang_stmt              *ys;
+    char                   *nsx; /* namespace of x */
+    char                   *ns2;
 
+    nsx = xml_find_type_value(x, NULL, "xmlns", CX_ATTR);
     if (xml_type(x)!=CX_ELMNT){
 	array=BODY_ARRAY;
 	goto done;
@@ -192,12 +188,18 @@ array_eval(cxobj *xprev,
     ys = xml_spec(x);
     if (xnext && 
 	xml_type(xnext)==CX_ELMNT &&
-	strcmp(xml_name(x),xml_name(xnext))==0)
-	eqnext++;
+	strcmp(xml_name(x),xml_name(xnext))==0){
+        ns2 = xml_find_type_value(xnext, NULL, "xmlns", CX_ATTR);
+	if (nsx && ns2 && strcmp(nsx,ns2)==0)
+	    eqnext++;
+    }
     if (xprev &&
 	xml_type(xprev)==CX_ELMNT &&
-	strcmp(xml_name(x),xml_name(xprev))==0)
-	eqprev++;
+	strcmp(xml_name(x),xml_name(xprev))==0){
+	ns2 = xml_find_type_value(xprev, NULL, "xmlns", CX_ATTR);
+	if (nsx && ns2 && strcmp(nsx,ns2)==0)
+	    eqprev++;
+    }
     if (eqprev && eqnext)
 	array = MIDDLE_ARRAY;
     else if (eqprev)
@@ -316,8 +318,8 @@ xml2json1_cbuf(cbuf                   *cb,
      * module name
      */
     prefix = xml_prefix(x);
-    if (xml2ns(x, prefix, &namespace) < 0)
-	goto done;
+    namespace = xml_find_type_value(x, prefix, "xmlns", CX_ATTR);
+
     if ((ys = xml_spec(x)) != NULL) /* yang spec associated with x */
 	yspec = ys_spec(ys);
     /* Find module name associated with namspace URI */
@@ -325,7 +327,7 @@ xml2json1_cbuf(cbuf                   *cb,
 	(ymod = yang_find_module_by_namespace(yspec, namespace)) != NULL){
 	modname = ymod->ys_argument;
     }
-    childt = childtype(x);
+    childt = child_type(x);
     if (pretty==2)
 	cprintf(cb, "#%s_array, %s_child ", 
 		arraytype2str(arraytype),
@@ -442,7 +444,7 @@ xml2json1_cbuf(cbuf                   *cb,
 			   xc_arraytype,
 			   level+1, pretty, 0, bodystr0) < 0)
 	    goto done;
-	if (i<xml_child_nr_noattr(x)-1)
+	if (i<xml_child_nr_notype(x, CX_ATTR)-1)
 	    cprintf(cb, ",%s", pretty?"\n":"");
     }
     switch (arraytype){
@@ -532,10 +534,24 @@ xml2json_cbuf(cbuf      *cb,
 {
     int    retval = 1;
     int    level = 0;
+    char  *prefix;
+    char  *namespace;
 
     cprintf(cb, "%*s{%s", 
 	    pretty?level*JSON_INDENT:0,"", 
 	    pretty?"\n":"");
+    /* If x is labelled with a default namespace, it should be translated
+     * to a module name. 
+     * Harder if x has a prefix, then that should also be translated to associated
+     * module name
+     */
+    prefix = xml_prefix(x);
+    if (xml2ns(x, prefix, &namespace) < 0)
+	goto done;
+    /* Some complexities in grafting namespace in existing trees to new */
+    if (xml_find_type_value(x, prefix, "xmlns", CX_ATTR) == NULL && namespace)
+	if (xmlns_set(x, prefix, namespace) < 0)
+		goto done;
     if (xml2json1_cbuf(cb, 
 		       x, 
 		       NO_ARRAY,
@@ -551,7 +567,7 @@ xml2json_cbuf(cbuf      *cb,
     return retval;
 }
 
-/*! Translate a vector of xml objects to JSON CLigen buffer.
+/*! Translate a vector of xml objects to JSON Cligen buffer.
  * This is done by adding a top pseudo-object, and add the vector as subs,
  * and then not printing the top pseudo-object using the 'flat' option.
  * @param[out] cb     Cligen buffer to write to
@@ -575,12 +591,21 @@ xml2json_cbuf_vec(cbuf      *cb,
     int    i;
     cxobj *xp = NULL;
     cxobj *xc;
+    char  *prefix;
+    char  *namespace;
 
-    if ((xp = xml_new("", NULL, NULL)) == NULL)
+    if ((xp = xml_new("xml2json", NULL, NULL)) == NULL)
 	goto done;
+    /* Some complexities in grafting namespace in existing trees to new */
     for (i=0; i<veclen; i++){
+	prefix = xml_prefix(vec[i]);
+	if (xml2ns(vec[i], prefix, &namespace) < 0)
+	    goto done;
 	xc = xml_dup(vec[i]);
 	xml_addsub(xp, xc);
+	if (xml_find_type_value(xc, prefix, "xmlns", CX_ATTR) == NULL && namespace)
+	    if (xmlns_set(xc, prefix, namespace) < 0)
+		goto done;
     }
     if (0){
 	cprintf(cb, "[%s", pretty?"\n":" ");
@@ -677,6 +702,66 @@ xml2json_vec(FILE      *f,
     return retval;
 }
 
+/*! Translate from JSON module:name to XML name xmlns="uri" recursively
+ * @param[in]     yspec Yang spec
+ * @param[in,out] x     XML tree. Translate it in-line
+ * @param[out]    xerr  If namespace not set, create xml error tree
+ * @retval        0     OK (if xerr set see above)
+ * @retval       -1     Error
+ * @note the opposite - xml2ns is made inline in xml2json1_cbuf
+ */
+int
+json2xml_ns(yang_spec *yspec,
+	    cxobj     *x,
+	    cxobj    **xerr)
+{
+    int        retval = -1;
+    yang_stmt *ymod;
+    char      *namespace0;
+    char      *namespace;
+    char      *name = NULL;
+    char      *prefix = NULL;
+    cxobj     *xc;
+    
+    if (nodeid_split(xml_name(x), &prefix, &name) < 0)
+	goto done;
+    if (prefix != NULL){
+	if ((ymod = yang_find_module_by_name(yspec, prefix)) == NULL){
+	    if (netconf_unknown_namespace_xml(xerr, "application",
+					      prefix,
+					      "No yang module found corresponding to prefix") < 0)
+		goto done;
+	    goto ok;
+	}
+	namespace = yang_find_mynamespace(ymod);
+	/* Get existing default namespace in tree */
+	if (xml2ns(x, NULL, &namespace0) < 0)
+	    goto done;
+	/* Set xmlns="" default namespace attribute (if diff from default) */
+	if (namespace0==NULL || strcmp(namespace0, namespace))
+	    if (xmlns_set(x, NULL, namespace) < 0)
+		goto done;
+	/* Remove prefix from name */
+	if (xml_name_set(x, name) < 0)
+	    goto done;
+    }
+    xc = NULL;
+    while ((xc = xml_child_each(x, xc, CX_ELMNT)) != NULL){
+	if (json2xml_ns(yspec, xc, xerr) < 0)
+	    goto done;
+	if (*xerr != NULL)
+	    break;
+    }
+ ok:
+    retval = 0;
+ done:
+    if (prefix)
+	free(prefix);
+    if (name)
+	free(name);
+    return retval;
+}
+
 /*! Parse a string containing JSON and return an XML tree
  * @param[in]  str    Input string containing JSON
  * @param[in]  name   Log string, typically filename
diff --git a/lib/src/clixon_netconf_lib.c b/lib/src/clixon_netconf_lib.c
index 8db94c4a..b8981bbc 100644
--- a/lib/src/clixon_netconf_lib.c
+++ b/lib/src/clixon_netconf_lib.c
@@ -315,11 +315,12 @@ netconf_unknown_attribute(cbuf *cb,
  * @param[in]  message Error message
  */
 static int
-netconf_element_xml_common(cxobj **xret,
-			   char   *type,
-			   char   *tag,
-			   char   *element,
-			   char   *message)
+netconf_common_xml(cxobj **xret,
+		   char   *type,
+		   char   *tag,
+		   char   *infotag,
+		   char   *element,
+		   char   *message)
 {
     int   retval =-1;
     cxobj *xerr;
@@ -334,9 +335,9 @@ netconf_element_xml_common(cxobj **xret,
 	goto done;
     if (xml_parse_va(&xerr, NULL, "<error-type>%s</error-type>"
 		     "<error-tag>%s</error-tag>"
-		     "<error-info><bad-element>%s</bad-element></error-info>"
+		     "<error-info><%s>%s</%s></error-info>"
 		     "<error-severity>error</error-severity>",
-		     type, tag, element) < 0)
+		     type, tag, infotag, element, infotag) < 0)
 	goto done;
     if (message && xml_parse_va(&xerr, NULL, "<error-message>%s</error-message>",
 			 message) < 0)
@@ -363,7 +364,8 @@ netconf_missing_element(cbuf      *cb,
     int    retval = -1;
     cxobj *xret = NULL;
 
-    if (netconf_element_xml_common(&xret, type, "missing-element", element, message) < 0)
+    if (netconf_common_xml(&xret, type, "missing-element",
+			   "bad-element", element, message) < 0)
 	goto done;
     if (clicon_xml2cbuf(cb, xret, 0, 0) < 0)
 	goto done;
@@ -387,7 +389,8 @@ netconf_missing_element_xml(cxobj **xret,
 			    char   *element,
 			    char   *message)
 {
-    return netconf_element_xml_common(xret, type, "missing-element", element, message);
+    return netconf_common_xml(xret, type, "missing-element",
+			      "bad-element", element, message);
 }
 
 /*! Create Netconf bad-element error XML tree according to RFC 6241 App A
@@ -408,7 +411,8 @@ netconf_bad_element(cbuf *cb,
     int    retval = -1;
     cxobj *xret = NULL;
 
-    if (netconf_element_xml_common(&xret, type, "bad-element", element, message) < 0)
+    if (netconf_common_xml(&xret, type, "bad-element",
+			   "bad-element",element, message) < 0)
 	goto done;
     if (clicon_xml2cbuf(cb, xret, 0, 0) < 0)
 	goto done;
@@ -424,7 +428,7 @@ netconf_bad_element_xml(cxobj **xret,
 			char   *element,
 			char   *message)
 {
-    return netconf_element_xml_common(xret, type, "bad-element", element, message);
+    return netconf_common_xml(xret, type, "bad-element", "bad-element", element, message);
 }
 
 /*! Create Netconf unknown-element error XML tree according to RFC 6241 App A
@@ -444,7 +448,8 @@ netconf_unknown_element(cbuf *cb,
     int    retval = -1;
     cxobj *xret = NULL;
 
-    if (netconf_element_xml_common(&xret, type, "unknown-element", element, message) < 0)
+    if (netconf_common_xml(&xret, type, "unknown-element",
+			   "bad-element", element, message) < 0)
 	goto done;
     if (clicon_xml2cbuf(cb, xret, 0, 0) < 0)
 	goto done;
@@ -454,13 +459,23 @@ netconf_unknown_element(cbuf *cb,
 	xml_free(xret);
     return retval;
 }
+
+/*! Create Netconf unknown-element error XML tree according to RFC 6241 App A
+ *
+ * An unexpected element is present.
+ * @param[out] xret    XML buffer
+ * @param[in]  type    Error type: "application" or "protocol"
+ * @param[in]  element Bad element name
+ * @param[in]  message Error message
+ */
 int
 netconf_unknown_element_xml(cxobj **xret,
 			    char   *type,
 			    char   *element,
 			    char   *message)
 {
-    return netconf_element_xml_common(xret, type, "unknown-element", element, message);
+    return netconf_common_xml(xret, type, "unknown-element",
+			      "bad-element", element, message);
 }
 
 /*! Create Netconf unknown-namespace error XML tree according to RFC 6241 App A
@@ -474,35 +489,32 @@ netconf_unknown_element_xml(cxobj **xret,
 int
 netconf_unknown_namespace(cbuf *cb,
 			  char *type,
-			  char *info,
+			  char *namespace,
 			  char *message)
 {
-    int   retval = -1;
-    char *encstr = NULL;
+    int    retval = -1;
+    cxobj *xret = NULL;
 
-    if (cprintf(cb, "<rpc-reply><rpc-error>"
-		"<error-type>%s</error-type>"
-		"<error-tag>unknown-namespace</error-tag>"
-		"<error-info>%s</error-info>"
-		"<error-severity>error</error-severity>",
-		type, info) <0)
-	goto err;
-    if (message){
-	if (xml_chardata_encode(&encstr, "%s", message) < 0)
-	    goto done;
-	if (cprintf(cb, "<error-message>%s</error-message>", encstr) < 0)
-	    goto err;
-    }
-    if (cprintf(cb, "</rpc-error></rpc-reply>") <0)
-	goto err;
+    if (netconf_common_xml(&xret, type, "unknown-namespace",
+			   "bad-namespace", namespace, message) < 0)
+	goto done;
+    if (clicon_xml2cbuf(cb, xret, 0, 0) < 0)
+	goto done;
     retval = 0;
  done:
-    if (encstr)
-	free(encstr);
+    if (xret)
+	xml_free(xret);
     return retval;
- err:
-    clicon_err(OE_XML, errno, "cprintf");
-    goto done;
+}
+
+int
+netconf_unknown_namespace_xml(cxobj **xret,
+			      char   *type,
+			      char   *namespace,
+			      char   *message)
+{
+    return netconf_common_xml(xret, type, "unknown-namespace",
+			      "bad-namespace", namespace, message);
 }
 
 /*! Create Netconf access-denied error cbuf according to RFC 6241 App A
@@ -989,7 +1001,7 @@ netconf_trymerge(cxobj       *x,
 }
 
 /*! Load ietf netconf yang module and set enabled features
- * The features added are:
+ * The features added are (in order):
  *   candidate (8.3)
  *   validate (8.6)
  *   startup (8.7)
diff --git a/lib/src/clixon_options.c b/lib/src/clixon_options.c
index 45c3948b..e6410ad8 100644
--- a/lib/src/clixon_options.c
+++ b/lib/src/clixon_options.c
@@ -253,9 +253,8 @@ clicon_options_main(clicon_handle h,
 	clicon_err(OE_CFG, 0, "%s: suffix %s not recognized (Run ./configure --with-config-compat?)", configfile, suffix);
 	goto done;
     }
-#if 1 /* XXX Kludge to low-level functions to iterate over namspaces or not */
-    _CLICON_XML_NS_ITERATE = 1;
-#endif
+    /* XXX Kludge to low-level functions to search for xml in all yang modules */
+    _CLICON_XML_NS_STRICT = 0;
     /* Read configfile first without yangspec, for bootstrapping */
     if (parse_configfile(h, configfile, yspec, &xconfig) < 0)
 	goto done;
@@ -281,9 +280,8 @@ clicon_options_main(clicon_handle h,
 	xml_child_sort = 1;
     else
 	xml_child_sort = 0;
-#if 1 /* XXX Kludge to low-level functions to iterate over namspaces or not */
-    _CLICON_XML_NS_ITERATE = clicon_option_bool(h, "CLICON_XML_NS_ITERATE");
-#endif
+    /* XXX Kludge to low-level functions to search for xml in all yang modules */
+    _CLICON_XML_NS_STRICT = clicon_option_bool(h, "CLICON_XML_NS_STRICT");
     retval = 0;
  done:
     return retval;
diff --git a/lib/src/clixon_proto_client.c b/lib/src/clixon_proto_client.c
index aa3ac4ac..396a0665 100644
--- a/lib/src/clixon_proto_client.c
+++ b/lib/src/clixon_proto_client.c
@@ -351,7 +351,7 @@ clicon_rpc_edit_config(clicon_handle       h,
 
     if ((cb = cbuf_new()) == NULL)
 	goto done;
-    cprintf(cb, "<rpc");
+    cprintf(cb, "<rpc %s", DEFAULT_XMLNS);
     if ((username = clicon_username_get(h)) != NULL)
 	cprintf(cb, " username=\"%s\"", username);
     cprintf(cb, "><edit-config><target><%s/></target>", db);
@@ -787,7 +787,7 @@ clicon_rpc_create_subscription(clicon_handle    h,
     char              *username;
 
     username = clicon_username_get(h);
-    if ((msg = clicon_msg_encode("<rpc username=\"%s\"><create-subscription>"
+    if ((msg = clicon_msg_encode("<rpc username=\"%s\"><create-subscription xmlns=\"urn:ietf:params:xml:ns:netmod:notification\">"
 				 "<stream>%s</stream>"
 				 "<filter type=\"xpath\" select=\"%s\" />"
 				 "</create-subscription></rpc>", 
diff --git a/lib/src/clixon_string.c b/lib/src/clixon_string.c
index 480805fb..a7c05f39 100644
--- a/lib/src/clixon_string.c
+++ b/lib/src/clixon_string.c
@@ -562,6 +562,54 @@ clicon_str2int(const map_str2int *mstab,
     return -1;
 }
 
+/*! Split colon-separated node identifier into prefix and name
+ * @param[in]  node-id
+ * @param[out] prefix  Malloced string. May be NULL.
+ * @param[out] id      Malloced identifier.
+ * @retval     0       OK
+ * @retval    -1       Error
+ * @code
+ *    char      *prefix = NULL;
+ *    char      *id = NULL;
+ *    if (nodeid_split(nodeid, &prefix, &id) < 0)
+ *	 goto done;
+ *    if (prefix)
+ *	 free(prefix);
+ *    if (id)
+ *	 free(id);
+ * @note caller need to free id and prefix after use
+ */
+int
+nodeid_split(char  *nodeid,
+	     char **prefix,
+	     char **id)
+{
+    int   retval = -1;
+    char *str;
+    
+    if ((str = strchr(nodeid, ':')) == NULL){
+	if ((*id = strdup(nodeid)) == NULL){
+	    clicon_err(OE_YANG, errno, "strdup");
+	    goto done;
+	}
+    }
+    else{
+	if ((*prefix = strdup(nodeid)) == NULL){
+	    clicon_err(OE_YANG, errno, "strdup");
+	    goto done;
+	}
+	(*prefix)[str-nodeid] = '\0';
+	str++;
+	if ((*id = strdup(str)) == NULL){
+	    clicon_err(OE_YANG, errno, "strdup");
+	    goto done;
+	}
+    }
+    retval = 0;
+ done:
+    return retval;
+}
+
 /*! strndup() for systems without it, such as xBSD
  */
 #ifndef HAVE_STRNDUP
diff --git a/lib/src/clixon_xml.c b/lib/src/clixon_xml.c
index 59292ba9..6849e94d 100644
--- a/lib/src/clixon_xml.c
+++ b/lib/src/clixon_xml.c
@@ -62,6 +62,8 @@
 #include "clixon_log.h"
 #include "clixon_yang.h"
 #include "clixon_xml.h"
+#include "clixon_options.h" /* xml_spec_populate */
+#include "clixon_xml_map.h" /* xml_spec_populate */
 #include "clixon_xml_sort.h"
 #include "clixon_xml_parse.h"
 
@@ -133,9 +135,9 @@ struct xml{
  * or rpc if no xmlns attribute specifies namespace.
  * This is loose semantics of finding namespaces.
  * And it is wrong, but is the way Clixon originally was written."
- * @see CLICON_XML_NS_ITERATE clixon configure option 
+ * @see CLICON_XML_NS_STRICT clixon configure option 
  */
-int _CLICON_XML_NS_ITERATE = 0;
+int _CLICON_XML_NS_STRICT = 1;
 
 /* Mapping between xml type <--> string */
 static const map_str2int xsmap[] = {
@@ -226,8 +228,7 @@ xml_prefix_set(cxobj *xn,
     return 0;
 }
 
-
-/*! Given an xml tree return URI namespace: default or localname given
+/*! Given an xml tree return URI namespace recursively : default or localname given
  *
  * Given an XML tree and a prefix (or NULL) return URI namespace.
  * @param[in]  x          XML tree
@@ -235,7 +236,7 @@ xml_prefix_set(cxobj *xn,
  * @param[out] namespace  URI namespace (or NULL). Note pointer into xml tree
  * @retval     0          OK
  * @retval    -1          Error
- * @see xmlns_check XXX coordinate
+ * @see xmlns_check XXX can these be merged?
  */
 int
 xml2ns(cxobj *x,
@@ -246,9 +247,9 @@ xml2ns(cxobj *x,
     char  *ns;
     cxobj *xp;
     
-    if (prefix != NULL) /* xmlns:<prefix> */
+    if (prefix != NULL) /* xmlns:<prefix>="<uri>" */
 	ns = xml_find_type_value(x, "xmlns", prefix, CX_ATTR);
-    else /* default ns */
+    else                /* xmlns="<uri>" */
     	ns = xml_find_type_value(x, NULL, "xmlns", CX_ATTR);
 
     /* namespace not found, try parent */
@@ -270,6 +271,40 @@ xml2ns(cxobj *x,
     return retval;
 }
 
+/*! Add a namespace attribute to an XML node, either default or specific prefix
+ * @param[in]  x          XML tree
+ * @param[in]  prefix     prefix/ns localname. If NULL then set default xmlns
+ * @param[out] namespace  URI namespace (or NULL). Will be copied
+ * @retval     0          OK
+ * @retval    -1          Error
+ * @see xml2ns
+ */
+int
+xmlns_set(cxobj *x,
+	  char  *prefix,
+	  char  *namespace)
+{
+    int    retval = -1;
+    cxobj *xa;
+
+    if (prefix != NULL){ /* xmlns:<prefix>="<uri>" */
+	if ((xa = xml_new(prefix, x, NULL)) == NULL)
+	    goto done;
+	if (xml_prefix_set(xa, "xmlns") < 0)
+	    goto done;
+    }
+    else{                /* xmlns="<uri>" */
+	if ((xa = xml_new("xmlns", x, NULL)) == NULL)
+	    goto done;
+	xml_type_set(xa, CX_ATTR);
+    }
+    if (xml_value_set(xa, namespace) < 0)
+	goto done;
+    retval = 0;
+ done:
+    return retval;
+}
+
 /*! See if xmlns:[<localname>=]<uri> exists, if so return <uri>
  *
  * @param[in]  xn   XML node
@@ -483,6 +518,8 @@ xml_type_set(cxobj          *xn,
 /*! Get number of children
  * @param[in]  xn    xml node
  * @retval     number of children in XML tree
+ * @see xml_child_nr_type
+ * @see xml_child_nr_notype
  */
 int   
 xml_child_nr(cxobj *xn)
@@ -490,10 +527,33 @@ xml_child_nr(cxobj *xn)
     return xn->x_childvec_len;
 }
 
+/*! Get number of children of EXCEPT specific type
+ * @param[in]  xn    xml node
+ * @param[in]  type  XML type or -1 for all
+ * @retval     number of typed children in XML tree (except type)
+ * @see xml_child_nr
+ * @see xml_child_nr_type
+ */
+int   
+xml_child_nr_notype(cxobj          *xn, 
+		    enum cxobj_type type)
+{
+    cxobj *x = NULL;
+    int    nr = 0;
+
+    while ((x = xml_child_each(xn, x, -1)) != NULL) {
+	if (xml_type(x) != type)
+	    nr++;
+    }
+    return nr;
+}
+
 /*! Get number of children of specific type
  * @param[in]  xn    xml node
  * @param[in]  type  XML type or -1 for all
  * @retval     number of typed children in XML tree
+ * @see xml_child_nr
+ * @see xml_child_nr_notype
  */
 int   
 xml_child_nr_type(cxobj          *xn, 
@@ -521,6 +581,28 @@ xml_child_i(cxobj *xn,
     return NULL;
 }
 
+/*! Get a specific child of a specific type
+ * @param[in]  xn    xml node
+ * @param[in]  i     the number of the child of specific type
+ * @param[in]  type  Child type
+ * @retval     child in XML tree, or NULL if no such child, or empty child
+ * @see xml_child_i
+ */
+cxobj *
+xml_child_i_type(cxobj          *xn, 
+		 int             i,
+		 enum cxobj_type type)
+{
+    cxobj *x = NULL;
+    int    it = 0;
+    
+    while ((x = xml_child_each(xn, x, type)) != NULL) {
+	if (x->x_type == type && (i == it++))
+	    return x;
+    }
+    return NULL;
+}
+
 /*! Set specific child
  * @param[in]  xn    xml node
  * @param[in]  i     the number of the child, eg order in children vector
@@ -938,7 +1020,7 @@ xml_body_get(cxobj *xt)
     return NULL;
 }
 
-/*! Find and return the value of an xml child of specific type
+/*! Find and return the value of an xml child of specific type given prefix and name
  *
  * The value can be of an attribute only
  * @param[in]   xt          xml tree node
@@ -950,6 +1032,7 @@ xml_body_get(cxobj *xt)
  * char *str = xml_find_type_value(x, "prefix", "name", CX_ATTR);
  * @endcode
  * @note, make a copy of the return value to use it properly
+ * @see xml_find_type return the xml object
  * @see xml_find_value where a body can be found as well
  */
 char *
@@ -957,6 +1040,32 @@ xml_find_type_value(cxobj           *xt,
 		    char            *prefix,
 		    char            *name,
 		    enum cxobj_type  type)
+{
+    cxobj *x;
+
+    if ((x = xml_find_type(xt, prefix, name, type)) != NULL)
+	return xml_value(x);
+    return NULL;
+}
+
+/*! Find and return the xml child of specific type given prefix and name
+ *
+ * The value can be of an attribute only
+ * @param[in]   xt          xml tree node
+ * @param[in]   prefix      Prefix (namespace local name) or NULL
+ * @param[in]   name        name of xml tree node (eg attr name or "body")
+ * @retval      val         Pointer to the name string
+ * @retval      NULL        No such node or no value in node
+ * @code
+ * cxobj *x = xml_find_type(x, "prefix", "name", CX_ATTR);
+ * @endcode
+ * @see xml_find_value where a body can be found as well
+ */
+cxobj *
+xml_find_type(cxobj           *xt, 
+	      char            *prefix,
+	      char            *name,
+	      enum cxobj_type  type)
 {
     cxobj *x = NULL;
     int    pmatch; /* prefix match */
@@ -969,7 +1078,7 @@ xml_find_type_value(cxobj           *xt,
 	else
 	    pmatch = 1;
 	if (pmatch && strcmp(name, xml_name(x)) == 0)
-	    return xml_value(x);
+	    return x;
     }
     return NULL;
 }
@@ -1397,6 +1506,8 @@ _xml_parse(const char  *str,
     	goto done;
     /* Sort the complete tree after parsing */
     if (yspec){
+	if (xml_apply0(xt, CX_ELMNT, xml_spec_populate, yspec) < 0)
+	    goto done;
 	if (xml_apply0(xt, CX_ELMNT, xml_sort, NULL) < 0)
 	    goto done;
 	if (xml_apply0(xt, -1, xml_sort_verify, NULL) < 0)
@@ -1592,7 +1703,7 @@ xml_parse_va(cxobj     **xtop,
     return retval;
 }
 
-/*! Copy single xml node without copying children
+/*! Copy single xml node frm x0 to x1 without copying children
  */
 int
 xml_copy_one(cxobj *x0, 
diff --git a/lib/src/clixon_xml_db.c b/lib/src/clixon_xml_db.c
index c3a4126a..32aab817 100644
--- a/lib/src/clixon_xml_db.c
+++ b/lib/src/clixon_xml_db.c
@@ -380,7 +380,8 @@ xmldb_get(clicon_handle h,
  * @param[in]  op     Top-level operation, can be superceded by other op in tree
  * @param[in]  xt     xml-tree. Top-level symbol is dummy
  * @param[out] cbret  Initialized cligen buffer or NULL. On exit contains XML or "".
- * @retval     0      OK
+ * @retval     1      OK
+ * @retval     0      Failed, cbret contains error xml message
  * @retval     -1     Error
  * The xml may contain the "operation" attribute which defines the operation.
  * @code
@@ -388,8 +389,10 @@ xmldb_get(clicon_handle h,
  *   cxobj     *xret = NULL;
  *   if (xml_parse_string("<a>17</a>", yspec, &xt) < 0)
  *     err;
- *   if (xmldb_put(xh, "running", OP_MERGE, xt, cbret) < 0)
+ *   if ((ret = xmldb_put(xh, "running", OP_MERGE, xt, cbret)) < 0)
  *     err;
+ *   if (ret==0)
+ *     cbret contains netconf error message
  * @endcode
  * @note that you can add both config data and state data. In comparison,
  *  xmldb_get has a parameter to get config data only.
diff --git a/lib/src/clixon_xml_map.c b/lib/src/clixon_xml_map.c
index 2644f494..5d210644 100644
--- a/lib/src/clixon_xml_map.c
+++ b/lib/src/clixon_xml_map.c
@@ -50,6 +50,7 @@
  *                                        +---------+
  *                                        |  file   |
  *                                        +---------+
+ * "api-path" is "URI-encoded path expression" definition in RFC8040 3.5.3
  */
 #ifdef HAVE_CONFIG_H
 #include "clixon_config.h" /* generated by config & autoconf */
@@ -95,14 +96,20 @@
 static int
 tleaf(cxobj *x)
 {
-    cxobj *c;
+    cxobj *xc;
 
     if (xml_type(x) != CX_ELMNT)
 	return 0;
-    if (xml_child_nr(x) != 1)
+    if (xml_child_nr_notype(x, CX_ATTR) != 1)
 	return 0;
-    c = xml_child_i(x, 0);
-    return (xml_child_nr(c) == 0);
+    /* From here exactly one noattr child, get it */
+    xc = NULL;
+    while ((xc = xml_child_each(x, xc, -1)) != NULL)
+	if (xml_type(xc) != CX_ATTR)
+	    break;
+    if (xc == NULL)
+	return -1; /* n/a */
+    return (xml_child_nr_notype(xc, CX_ATTR) == 0);
 }
 
 /*! Translate XML -> TEXT
@@ -114,39 +121,42 @@ xml2txt(FILE  *f,
 	cxobj *x, 
 	int    level)
 {
-    cxobj *xe = NULL;
+    cxobj *xc = NULL;
     int    children=0;
-    char  *term = NULL;
     int    retval = -1;
 
-    xe = NULL;     /* count children */
-    while ((xe = xml_child_each(x, xe, -1)) != NULL)
-	children++;
-    if (!children){ 
-	if (xml_type(x) == CX_BODY){
-	    term = xml_value(x);
+    xc = NULL;     /* count children (elements and bodies, not attributes) */
+    while ((xc = xml_child_each(x, xc, -1)) != NULL)
+	if (xml_type(xc) == CX_ELMNT || xml_type(xc) == CX_BODY)
+	    children++;
+    if (!children){ /* If no children print line */
+	switch (xml_type(x)){
+	case CX_BODY:
+	    fprintf(f, "%s;\n", xml_value(x));
+	    break;
+	case CX_ELMNT:
+	    fprintf(f, "%*s;\n", 4*level, xml_name(x));
+	    break;
+	default:
+	    break;
 	}
-	else{
-	    fprintf(f, "%*s", 4*level, "");
-	    term = xml_name(x);
-	}
-	fprintf(f, "%s;\n", term);
-	retval = 0;
-	goto done;
+	goto ok;
     }
     fprintf(f, "%*s", 4*level, "");
     fprintf(f, "%s ", xml_name(x));
     if (!tleaf(x))
 	fprintf(f, "{\n");
-    xe = NULL;
-    while ((xe = xml_child_each(x, xe, -1)) != NULL){
-	if (xml2txt(f, xe, level+1) < 0)
-	    break;
+    xc = NULL;
+    while ((xc = xml_child_each(x, xc, -1)) != NULL){
+	if (xml_type(xc) == CX_ELMNT || xml_type(xc) == CX_BODY)
+	    if (xml2txt(f, xc, level+1) < 0)
+		break;
     }
     if (!tleaf(x))
 	fprintf(f, "%*s}\n", 4*level, "");
+ ok:
     retval = 0;
-  done:
+    //  done:
     return retval;
 }
 
@@ -172,7 +182,10 @@ xml2cli(FILE              *f,
     int              match;
     char            *body;
 
-    ys = xml_spec(x);
+    if (xml_type(x)==CX_ATTR)
+	goto ok;
+    if ((ys = xml_spec(x)) == NULL)
+	goto ok;
     if (ys->ys_keyword == Y_LEAF || ys->ys_keyword == Y_LEAF_LIST){
 	if (prepend0)
 	    fprintf(f, "%s", prepend0);
@@ -361,6 +374,37 @@ validate_identityref(cxobj     *xt,
     goto done;
 }
 
+/*! Given an XML node, return root node
+ * A root node is an ancestor xr of x with one or both of the following properties
+ * - its XML parent is NULL parent, 
+ * - its associated yang specification's parent is a yang module.
+ * @param[in]   x    XML node
+ * @param[out]  xr   XML root
+ */
+int
+xml_yang_root(cxobj  *x,
+	      cxobj **xr)
+{
+    int        retval = -1;
+    cxobj     *xp;
+    yang_stmt *y;
+    yang_stmt *yp;
+    
+    while ((xp = xml_parent(x)) != NULL){
+	if ((y = xml_spec(x)) != NULL &&
+	    (yp = (yang_stmt*)y->ys_parent) != NULL)
+	    /* Actually, maybe only the Y_MODULE clause is relevant */
+	    if (yp==NULL ||
+		yp->ys_keyword == Y_MODULE ||
+		yp->ys_keyword == Y_SUBMODULE)
+		break; /* x is the root */
+	x = xp;
+    }
+    *xr = x;
+    retval = 0;
+    return retval;
+}
+
 /*! Validate an RPC node
  * @param[in]  xt  XML node to be validated
  * @retval     1   Validation OK
@@ -408,7 +452,6 @@ xml_yang_validate_rpc(cxobj *xrpc,
     int        retval = -1;
     yang_stmt *yn=NULL;  /* rpc name */
     cxobj     *xn;       /* rpc name */
-    int        ret;
     
     if (strcmp(xml_name(xrpc), "rpc")){
 	clicon_err(OE_XML, EINVAL, "Expected RPC");
@@ -417,16 +460,15 @@ xml_yang_validate_rpc(cxobj *xrpc,
     xn = NULL;
     /* xn is name of rpc, ie <rcp><xn/></rpc> */
     while ((xn = xml_child_each(xrpc, xn, CX_ELMNT)) != NULL) {
-	if ((yn = xml_spec(xn)) == NULL)
-	    goto fail;
-	if ((ret = xml_yang_validate_all(xn, cbret)) < 0)
-	    goto fail;
-	if (ret == 0)
-	    goto fail;
-	if ((ret = xml_yang_validate_add(xn, cbret)) < 0)
-	    goto fail;
-	if (ret == 0)
+	if ((yn = xml_spec(xn)) == NULL){
+	    if (netconf_unknown_element(cbret, "application", xml_name(xn), NULL) < 0)
+		goto done;
 	    goto fail;
+	}
+	if ((retval = xml_yang_validate_all(xn, cbret)) < 1) 
+	    goto done; /* error or validation fail */
+	if ((retval = xml_yang_validate_add(xn, cbret)) < 1)
+	    goto done; /* error or validation fail */
 	if (xml_apply0(xn, CX_ELMNT, xml_default, NULL) < 0)
 	    goto done;
     }
@@ -443,9 +485,9 @@ xml_yang_validate_rpc(cxobj *xrpc,
  * 1. Check if mandatory leafs present as subs.
  * 2. Check leaf values, eg int ranges and string regexps.
  * @param[in]  xt    XML node to be validated
- * @param[out] cbret Error buffer
+ * @param[out] cbret Error buffer (set w netconf error if retval == 0)
  * @retval     1     Validation OK
- * @retval     0     Validation failed
+ * @retval     0     Validation failed (cbret set)
  * @retval    -1     Error
  * @code
  *   cxobj *x;
@@ -456,6 +498,7 @@ xml_yang_validate_rpc(cxobj *xrpc,
  *      fail;
  * @endcode
  * @see xml_yang_validate_all
+ * @see xml_yang_validate_rpc
  * @note Should need a variant accepting cxobj **xret
  */
 int
@@ -544,9 +587,9 @@ xml_yang_validate_add(cxobj   *xt,
 /*! Validate a single XML node with yang specification for all (not only added) entries
  * 1. Check leafrefs. Eg you delete a leaf and a leafref references it.
  * @param[in]  xt  XML node to be validated
- * @param[out] cbret Error buffer
+ * @param[out] cbret Error buffer (set w netconf error if retval == 0)
  * @retval     1     Validation OK
- * @retval     0     Validation failed
+ * @retval     0     Validation failed (cbret set)
  * @retval    -1     Error
  * @code
  *   cxobj *x;
@@ -680,6 +723,8 @@ xml_yang_validate_all(cxobj   *xt,
     goto done;
 }
 
+/*! Translate a single xml node to a cligen variable vector. Note not recursive 
+ */
 int
 xml_yang_validate_all_top(cxobj   *xt, 
 			  cbuf    *cbret)
@@ -695,6 +740,47 @@ xml_yang_validate_all_top(cxobj   *xt,
     return 1;
 }
 
+/*! Given XML node x, find yang spec in _any_ module matching name
+ * This is non-struct namespace semantics (not correct) but necessary
+ * in historic Clixon code.
+ * Also, add a proper default namespaces statement (xmlns="uri") in x
+ * @param[in]  x     XML node (find yang statement on this one)
+ * @param[in]  yspec Top-level yang spec
+ * @param[out] y     Yang stmt associated to x. NULL i not found
+ * @retval     0     OK
+ * @see CLICON_XML_NS_STRICT clixon config option
+ */
+int
+xml_yang_find_non_strict(cxobj      *x,
+			 yang_spec  *yspec,
+			 yang_stmt **yp)
+{
+    int        retval = -1;
+    char      *name;
+    yang_stmt *ymod;    
+    int        i;
+    yang_stmt *y=NULL;
+    char      *ns;
+    
+    name = xml_name(x);
+    for (i=0; i<yspec->yp_len; i++){
+	ymod = yspec->yp_stmt[i];
+	if ((y = yang_find_schemanode((yang_node*)ymod, name)) != NULL)
+	    break;
+    }
+    if (y){
+	*yp = y;
+	if ((ns = yang_find_mynamespace(ymod)) != NULL){
+	    if (xml_find_type_value(x, NULL, "xmlns", CX_ATTR) == NULL)
+		if (xmlns_set(x, NULL, ns) < 0)
+		    goto done;
+	}
+    }
+    retval = 0;
+ done:
+    return retval;
+}
+
 /*! Translate a single xml node to a cligen variable vector. Note not recursive 
  * @param[in]  xt   XML tree containing one top node
  * @param[in]  ys   Yang spec containing type specification of top-node of xt
@@ -861,28 +947,6 @@ cvec2xml_1(cvec   *cvv,
     return retval;
 }
 
-
-/*! Find next yang node, either start from yang_spec or some yang-node
- * @param[in]  y    Node spec or sny yang-node
- * @param[in]  name Name of childnode to find
- * @retval  ys      yang statement
- * @retval  NULL    Error: no node found
- */
-static yang_stmt *
-yang_next(yang_node *y, 
-	  char      *name)
-{
-    yang_stmt *ys;
-
-    if (y->yn_keyword == Y_SPEC)
-	ys = yang_find_topnode((yang_spec*)y, name, YC_DATANODE);
-    else
-	ys = yang_find_datanode(y, name);
-    if (ys == NULL)
-	clicon_err(OE_UNIX, errno, "No yang node found: %s", name);
-    return ys;
-}
-
 /*! Recursive help function to compute differences between two xml trees
  * @param[in]  x1       First XML tree
  * @param[in]  x2       Second XML tree
@@ -920,9 +984,12 @@ xml_diff1(yang_stmt *ys,
      */
     x1c = NULL;
     while ((x1c = xml_child_each(x1, x1c, CX_ELMNT)) != NULL){
-	if ((yc = yang_next((yang_node*)ys, xml_name(x1c))) == NULL)
+	if ((yc = xml_spec(x1c)) == NULL){
+	    clicon_err(OE_UNIX, errno, "Unknown element: %s", xml_name(x1c));
 	    goto done;
-	if (match_base_child(x2, x1c, &x2c, yc) < 0)
+	}
+	/* XXX xml_child_sort is global */
+	if (match_base_child(x2, x1c, &x2c, xml_child_sort, yc) < 0)
 	    goto done;
 	if (x2c == NULL){
 	    if (cxvec_append(x1c, x1vec, x1veclen) < 0) 
@@ -954,9 +1021,12 @@ xml_diff1(yang_stmt *ys,
      */
     x2c = NULL;
     while ((x2c = xml_child_each(x2, x2c, CX_ELMNT)) != NULL){
-	if ((yc = yang_next((yang_node*)ys, xml_name(x2c))) == NULL)
+	if ((yc = xml_spec(x2c)) == NULL){
+	    clicon_err(OE_UNIX, errno, "Unknown element: %s", xml_name(x2c));
 	    goto done;
-        if (match_base_child(x1, x2c, &x1c, yc) < 0)
+	}
+	/* XXX xml_child_sort is global */
+        if (match_base_child(x1, x2c, &x1c, xml_child_sort, yc) < 0)
 	    goto done;
 	if (x1c == NULL)
 	    if (cxvec_append(x2c, x2vec, x2veclen) < 0) 
@@ -1025,10 +1095,11 @@ xml_diff(yang_spec *yspec,
  * Recursively construct it to the top.
  * Example: 
  *   yang:  container a -> list b -> key c -> leaf d
- *   xpath: /a/b/%s/d
+ *   xpath: /modname:a/b/%s/d
  * @param[in]  ys      Yang statement
  * @param[in]  inclkey If set include key leaf (eg last leaf d in ex)
  * @param[out] cb      api_path_fmt,
+ * "api-path" is "URI-encoded path expression" definition in RFC8040 3.5.3
  */ 
 static int
 yang2api_path_fmt_1(yang_stmt *ys, 
@@ -1040,28 +1111,35 @@ yang2api_path_fmt_1(yang_stmt *ys,
     cvec      *cvk = NULL; /* vector of index keys */
     int        retval = -1;
 
-    yp = ys->ys_parent;
-    if (yp != NULL && 
+    if ((yp = ys->ys_parent) == NULL){
+	clicon_err(OE_YANG, EINVAL, "yang expected parent %s", ys->ys_argument);
+	goto done;
+    }
+    if (yp != NULL && /* XXX rm */
 	yp->yn_keyword != Y_MODULE && 
 	yp->yn_keyword != Y_SUBMODULE){
-	if (yang2api_path_fmt_1((yang_stmt *)yp, 1, cb) < 0)
+	if (yang2api_path_fmt_1((yang_stmt *)yp, 1, cb) < 0) /* recursive call */
 	    goto done;
+	cprintf(cb, "/");
     }
+    else /* top symbol - mark with name prefix */
+	cprintf(cb, "/%s:", yp->yn_argument);
+
     if (inclkey){
 	if (ys->ys_keyword != Y_CHOICE && ys->ys_keyword != Y_CASE)
-	    cprintf(cb, "/%s", ys->ys_argument);
+	    cprintf(cb, "%s", ys->ys_argument);
     }
     else{
 #if 1
 	if (ys->ys_keyword == Y_LEAF && yp && 
 	    yp->yn_keyword == Y_LIST){
 	    if (yang_key_match(yp, ys->ys_argument) == 0)
-		cprintf(cb, "/%s", ys->ys_argument); /* Not if leaf and key */
+		cprintf(cb, "%s", ys->ys_argument); /* Not if leaf and key */
 	}
 	else  
 #endif
 	    if (ys->ys_keyword != Y_CHOICE && ys->ys_keyword != Y_CASE)
-		cprintf(cb, "/%s", ys->ys_argument);
+		cprintf(cb, "%s", ys->ys_argument);
     }
 
     switch (ys->ys_keyword){
@@ -1095,6 +1173,7 @@ yang2api_path_fmt_1(yang_stmt *ys,
  * @param[in]  ys           Yang statement
  * @param[in]  inclkey      If set include key leaf (eg last leaf d in ex)
  * @param[out] api_path_fmt XML api path. Needs to be freed after use.
+ * "api-path" is "URI-encoded path expression" definition in RFC8040 3.5.3
  */ 
 int
 yang2api_path_fmt(yang_stmt *ys, 
@@ -1148,6 +1227,8 @@ yang2api_path_fmt(yang_stmt *ys,
  *  api_path_fmt: /subif-entry=%s,%s/subid
  *  cvv:          foo
  *  api_path:     /subif-entry=foo/subid
+ *
+ * "api-path" is "URI-encoded path expression" definition in RFC8040 3.5.3
  */
 int
 api_path_fmt2api_path(char  *api_path_fmt, 
@@ -1211,7 +1292,6 @@ api_path_fmt2api_path(char  *api_path_fmt,
     return retval;
 }
 
-
 /*! Transform an xml key format and a vector of values to an XML path
  * Used to input xmldb_get() or xmldb_get_vec
  * @param[in]  api_path_fmt  XML key format
@@ -1230,6 +1310,8 @@ api_path_fmt2api_path(char  *api_path_fmt,
  *   api_path_fmt: /subif-entry=%s,%s/subid
  *   cvv:          foo
  *   xpath:        /subif-entry[if-name=foo]/subid"
+ *
+ * "api-path" is "URI-encoded path expression" definition in RFC8040 3.5.3
  */ 
 int
 api_path_fmt2xpath(char  *api_path_fmt, 
@@ -1470,6 +1552,9 @@ xml_default(cxobj *xt,
 
 /*! Order XML children according to YANG
  * @param[in]   xt      XML top of tree
+ * @param[in]   arg     Dummy (so it can be called from xml_apply)
+ * @see xml_sort XXX: how do they relate?
+ * Called from text_get *only*
  */
 int
 xml_order(cxobj *xt, 
@@ -1603,9 +1688,7 @@ xml_spec_populate_rpc(clicon_handle h,
     yang_stmt *y=NULL;    /* yang node */
     yang_stmt *ymod=NULL; /* yang module */
     yang_stmt *yi = NULL; /* input */
-    //    yang_stmt *ya = NULL; /* arg */
     cxobj     *x;
-    //    cxobj     *xi;
     int        i;
     
     if ((strcmp(xml_name(xrpc), "rpc"))!=0){
@@ -1621,7 +1704,7 @@ xml_spec_populate_rpc(clicon_handle h,
 	/* Loose semantics: loop through all modules to find the node 
 	 */
 	if (y == NULL &&
-	    clicon_option_bool(h, "CLICON_XML_NS_ITERATE")){
+	    !clicon_option_bool(h, "CLICON_XML_NS_STRICT")){
 	    for (i=0; i<yspec->yp_len; i++){
 		ymod = yspec->yp_stmt[i];
 		if ((y = yang_find((yang_node*)ymod, Y_RPC, xml_name(x))) != NULL)
@@ -1633,16 +1716,8 @@ xml_spec_populate_rpc(clicon_handle h,
 	    if ((yi = yang_find((yang_node*)y, Y_INPUT, NULL)) != NULL){
 		/* kludge rpc -> input */
 		xml_spec_set(x, yi); 
-#if 1
 		if (xml_apply(x, CX_ELMNT, xml_spec_populate, yspec) < 0)
 		    goto done;
-#else
-		xi = NULL;
-		while ((xi = xml_child_each(x, xi, CX_ELMNT)) != NULL) {
-		    if ((ya = yang_find_datanode((yang_node*)yi, xml_name(xi))) != NULL)
-			xml_spec_set(xi, ya);
-		}
-#endif		
 	    }
 	}
     }
@@ -1651,13 +1726,14 @@ xml_spec_populate_rpc(clicon_handle h,
     return retval;
 }
 
+
 /*! Add yang specification backpointer to XML node
  * @param[in]   xt      XML tree node
  * @param[in]   arg     Yang spec
  * @note This may be unnecessary if yspec is set on creation
  * @note For subs to anyxml nodes will not have spec set
  * @note No validation is done,... XXX
- * @note relies on kludge _CLICON_XML_NS_ITERATE
+ * @note relies on kludge _CLICON_XML_NS_STRICT
  * @code
  * xml_apply(xc, CX_ELMNT, xml_spec_populate, yspec)
  * @endcode
@@ -1674,7 +1750,6 @@ xml_spec_populate(cxobj  *x,
     yang_stmt *ymod;    /* yang module */
     cxobj     *xp;      /* xml parent */
     char      *name;
-    int        i;
 
     yspec = (yang_spec*)arg;
     if (xml_spec(x))
@@ -1688,15 +1763,12 @@ xml_spec_populate(cxobj  *x,
 	    goto done;
 	if (ymod != NULL)
 	    y = yang_find_datanode((yang_node*)ymod, name);
-	/* Loose semantics: loop through all modules to find the node 
-	 * XXX clicon_option_bool(h, "CLICON_XML_NS_ITERATE")
+	/* Non-strict semantics: loop through all modules to find the node 
+	 * XXX clicon_option_bool(h, "CLICON_XML_NS_STRICT")
 	 */
-	if (y == NULL && _CLICON_XML_NS_ITERATE){
-	    for (i=0; i<yspec->yp_len; i++){
-		ymod = yspec->yp_stmt[i];
-		if ((y = yang_find_datanode((yang_node*)ymod, name)) != NULL)
-		    break;
-	    }
+	if (y == NULL && !_CLICON_XML_NS_STRICT){
+	    if (xml_yang_find_non_strict(x, yspec, &y) < 0)
+		goto done;
 	}
     }
     if (y) 
@@ -1713,15 +1785,19 @@ xml_spec_populate(cxobj  *x,
     return retval;
 }
 
-
 /*! Translate from restconf api-path in cvv form to xml xpath
  * eg a/b=c -> a/[b=c] 
- * @param[in]  yspec Yang spec
- * @param[in]  pcvec api-path as cvec
- * @param[in]  pi    Offset of cvec, where api-path starts
- * @param[out] path  The xpath as cbuf variable string, must be initializeed
- * The api-path has some wierd encoding, use api_path2xpath() if you are 
- * confused. 
+ * eg example:a/b -> ex:a/b
+ * @param[in]  yspec  Yang spec
+ * @param[in]  cvv    api-path as cvec
+ * @param[in]  offset Offset of cvec, where api-path starts
+ * @param[out] xpath  The xpath as cbuf variable string, must be initializeed
+ * @retval     1      OK
+ * @retval     0      Invalid api_path or associated XML, clicon_err called
+ * @retval    -1      Fatal error, clicon_err called
+ *
+ * @note both retval 0 and -1 set clicon_err, but the later is fatal
+ * @note Not proper namespace translation from api-path 2 xpath
  * It works like this:
  * Assume origin incoming path is 
  * "www.foo.com/restconf/a/b=c",  pi is 2 and pcvec is:
@@ -1729,46 +1805,63 @@ xml_spec_populate(cxobj  *x,
  * which means the api-path is ["a" "b=c"] corresponding to "a/b=c"
  * @code
  *   cbuf *xpath = cbuf_new();
- *   if (api_path2xpath_cvv(yspec, cvv, i, xpath)
+ *   cvec *cvv = NULL; 
+ *   if (str2cvec("www.foo.com/restconf/a/b=c", '/', '=', &cvv) < 0)
  *      err;
+ *   if ((ret = api_path2xpath(yspec, cvv, 0, cxpath)) < 0)
+ *      err;
+ *   if (ret == 0){
+ *      ... access error string in clicon_err_reason
+ *      clicon_err_reset();
+ *      return;
+ *   }
  *   ... access xpath as cbuf_get(xpath) 
  *   cbuf_free(xpath)
  * @endcode
- * @see api_path2xpath for string api-path argument
+ * @note "api-path" is "URI-encoded path expression" definition in RFC8040 3.5.3
+ * @see api_path2xml  For api-path to xml tree
  */
 int
-api_path2xpath_cvv(yang_spec *yspec,
-		   cvec      *cvv,
-		   int        offset,
-		   cbuf      *xpath)
+api_path2xpath(yang_spec *yspec,
+	       cvec      *cvv,
+	       int        offset,
+	       cbuf      *xpath)
 {
     int        retval = -1;
     int        i;
     cg_var    *cv;
-    char      *name;
+    char      *nodeid;
+    char      *prefix = NULL;
+    char      *name = NULL;
     cvec      *cvk = NULL; /* vector of index keys */
     yang_stmt *y = NULL;
+    yang_stmt *ymod;
     char      *val;
     char      *v;
     cg_var    *cvi;
 
     for (i=offset; i<cvec_len(cvv); i++){
         cv = cvec_i(cvv, i);
-	name = cv_name_get(cv);
-	clicon_debug(1, "[%d] cvname:%s", i, name);
-	clicon_debug(1, "cv2str%d", cv2str(cv, NULL, 0));
-	if (i == offset){
-	    if ((y = yang_find_topnode(yspec, name, YC_DATANODE)) == NULL){
-		clicon_err(OE_UNIX, errno, "No yang node found: %s", name);
-		goto done;
+	nodeid = cv_name_get(cv);
+	if (nodeid_split(nodeid, &prefix, &name) < 0)
+	    goto done;
+	clicon_debug(1, "%s [%d] cvname:%s", __FUNCTION__, i, name);
+	if (i == offset){ /* top-node */
+	    if (prefix == NULL){
+		clicon_err(OE_XML, EINVAL, "'%s': Expected prefix:name", nodeid);
+		goto fail;
 	    }
+	    if ((ymod = yang_find_module_by_name(yspec, prefix)) == NULL){
+		clicon_err(OE_YANG, ENOENT, "No such yang module: %s", prefix);
+		goto fail;
+	    }
+	    y = yang_find_datanode((yang_node*)ymod, name);
 	}
-	else{
-	    assert(y!=NULL);
-	    if ((y = yang_find_datanode((yang_node*)y, name)) == NULL){
-		clicon_err(OE_UNIX, errno, "No yang node found: %s", name);
-		goto done;
-	    }
+	else
+	    y = yang_find_datanode((yang_node*)y, name);
+	if (y == NULL){
+	    clicon_err(OE_YANG, errno, "Unknown element: '%s'", name);
+	    goto fail;
 	}
 	/* Check if has value, means '=' */
         if (cv2str(cv, NULL, 0) > 0){
@@ -1783,6 +1876,7 @@ api_path2xpath_cvv(yang_spec *yspec,
 	    cvk = y->ys_cvec; /* Use Y_LIST cache, see ys_populate_list() */
 	    cvi = NULL;
 	    /* Iterate over individual yang keys  */
+
 	    cprintf(xpath, "/%s", name);
 	    v = val;
 	    while ((cvi = cvec_each(cvk, cvi)) != NULL){
@@ -1792,46 +1886,27 @@ api_path2xpath_cvv(yang_spec *yspec,
 	    if (val)
 		free(val);
         }
-        else{
+        else
             cprintf(xpath, "%s%s", (i==offset?"":"/"), name);
-        }
-    }
-    retval = 0;
+	if (prefix){
+	    free(prefix);
+	    prefix = NULL;
+	}
+	if (name){
+	    free(name);
+	    name = NULL;
+	}
+    } /* for */
+    retval = 1; /* OK */
  done:
+    if (prefix)
+	free(prefix);
+    if (name)
+	free(name);
     return retval;
-}
-
-/*! Translate from restconf api-path to xml xpath
- * eg a/b=c -> a/[b=c] 
- * @param[in]  yspec Yang spec
- * @param[in]  str   API-path as string
- * @param[out] path  The xpath as cbuf variable string, must be initializeed
- * @code
- *   cbuf *xpath = cbuf_new();
- *   if (api_path2xpath(yspec, "a/b=c", xpath)
- *      err;
- *   ... access xpath as cbuf_get(xpath) 
- *   cbuf_free(xpath)
- * @endcode
- */
-int
-api_path2xpath(yang_spec *yspec,
-	       char      *api_path,
-	       cbuf      *xpath)
-{
-    int   retval = -1;
-    cvec *api_path_cvv = NULL; 
-
-    /* rest url eg /album=ricky/foo */
-    if (str2cvec(api_path, '/', '=', &api_path_cvv) < 0) 
-	goto done;
-    if (api_path2xpath_cvv(yspec, api_path_cvv, 0, xpath) < 0)
-	goto done;
-    retval = 0;
- done:
-    if (api_path_cvv)
-	cvec_free(api_path_cvv);
-    return retval;
+ fail:
+    retval = 0; /* Validation failed */
+    goto done;
 }
 
 /*! Create xml tree from api-path as vector
@@ -1842,6 +1917,12 @@ api_path2xpath(yang_spec *yspec,
  * @param[in]   nodeclass Set to schema nodes, data nodes, etc
  * @param[out]  xpathp    Resulting xml tree 
  * @param[out]  ypathp    Yang spec matching xpathp
+ * @retval      1         OK
+ * @retval     0          Invalid api_path or associated XML, clicon_err called
+ * @retval    -1          Fatal error, clicon_err called
+ *
+ * @note both retval 0 and -1 set clicon_err, but the later is fatal
+ * @see api_path2xpath For api-path to xml xpath translation
  * @see api_path2xml
  */
 static int
@@ -1855,7 +1936,9 @@ api_path2xml_vec(char             **vec,
 {
     int        retval = -1;
     int        j;
-    char      *name;
+    char      *nodeid;
+    char      *name = NULL;
+    char      *prefix = NULL;
     char      *restval = NULL;
     char      *restval_enc;
     cxobj     *xn = NULL; /* new */
@@ -1868,43 +1951,50 @@ api_path2xml_vec(char             **vec,
     int        nvalvec;
     cxobj     *x = NULL;
     yang_stmt *y = NULL;
-    char      *local;
+    yang_stmt *ymod;
+    char      *namespace = NULL;
 
-    if ((name = vec[0]) == NULL){
+    if ((nodeid = vec[0]) == NULL || strlen(nodeid)==0){
 	if (xpathp)
 	    *xpathp = x0;
 	if (ypathp)
 	    *ypathp = y0;
-	return 0;
-    } /* E.g "x=1,2" -> name:x restval=1,2 */
+	goto ok;
+    } /* E.g "x=1,2" -> nodeid:x restval=1,2 */
     /* restval is RFC 3896 encoded */
-    if ((restval_enc = index(name, '=')) != NULL){
+    if ((restval_enc = index(nodeid, '=')) != NULL){
 	*restval_enc = '\0';
 	restval_enc++;
 	if (uri_percent_decode(restval_enc, &restval) < 0)
 	    goto done;
     }
-    /* Split into prefix and localname, ignore prefix for now */
-    if ((local = index(name, ':')) != NULL){
-	*local = '\0';
-	local++;
-	name = local;
-    }
-    if (y0->yn_keyword == Y_SPEC){ /* top-node */
-	y = yang_find_topnode((yang_spec*)y0, name, nodeclass);
-    }
-    else {
-	y = (nodeclass==YC_SCHEMANODE)?yang_find_schemanode((yang_node*)y0, name):
-	    yang_find_datanode((yang_node*)y0, name);
-    }
-    if (y == NULL){
-	clicon_err(OE_YANG, errno, "No yang node found: %s", name);
+    /* Split into prefix and localname */
+    if (nodeid_split(nodeid, &prefix, &name) < 0)
 	goto done;
+    if (y0->yn_keyword == Y_SPEC){ /* top-node */
+	if (prefix == NULL){
+	    clicon_err(OE_XML, EINVAL, "api-path element '%s', expected prefix:name", nodeid);
+	    goto fail;
+	}
+	if ((ymod = yang_find_module_by_name((yang_spec*)y0, prefix)) == NULL){
+	    clicon_err(OE_YANG, EINVAL, "api-path element prefix: '%s', no such yang module", prefix);
+	    goto fail;
+	}
+	namespace = yang_find_mynamespace(ymod);
+	y0 = (yang_node*)ymod;
+
+    }
+    y = (nodeclass==YC_SCHEMANODE)?
+	yang_find_schemanode((yang_node*)y0, name):
+	yang_find_datanode((yang_node*)y0, name);
+    if (y == NULL){
+	clicon_err(OE_YANG, EINVAL, "api-path name: '%s', no such yang element", name);
+	goto fail;
     }
     switch (y->ys_keyword){
     case Y_LEAF_LIST:
 	if (0 && restval==NULL){
-	    clicon_err(OE_XML, 0, "malformed key, expected '=<restval>'");
+	    clicon_err(OE_XML, 0, "malformed key, expected '=restval'");
 	    goto done;
 	}
 	if ((x = xml_new(y->ys_argument, x0, y)) == NULL)
@@ -1924,21 +2014,21 @@ api_path2xml_vec(char             **vec,
 	}
 	if (restval==NULL){
 	    // XXX patch to allow for lists without restval to be backward compat
-	    //	    clicon_err(OE_XML, 0, "malformed key, expected '=<restval>'");
+	    //	    clicon_err(OE_XML, 0, "malformed key, expected '=restval'");
 	    //	    goto done;
 	}
 	else{
 	    if ((valvec = clicon_strsep(restval, ",", &nvalvec)) == NULL)
 		goto done;
 	    if (nvalvec > cvec_len(cvk)){ 	    
-		clicon_err(OE_XML, errno, "List %s  key length mismatch", name);
-		goto done;
+		clicon_err(OE_XML, EINVAL, "List key %s length mismatch", name);
+		goto fail;
 	    }
 	}
 	cvi = NULL;
 	/* create list object */
 	if ((x = xml_new(name, x0, y)) == NULL)
-	    goto done; 
+	    goto done;
 	xml_type_set(x, CX_ELMNT);
 	j = 0;
 	/* Create keys */
@@ -1957,31 +2047,47 @@ api_path2xml_vec(char             **vec,
 	break;
     default: /* eg Y_CONTAINER, Y_LEAF */
 	if ((x = xml_new(name, x0, y)) == NULL)
-	    goto done; 
+	    goto done;
 	xml_type_set(x, CX_ELMNT);
 	break;
     }
-    if (api_path2xml_vec(vec+1, nvec-1, 
-			 x, (yang_node*)y, 
-			 nodeclass,
-			 xpathp, ypathp) < 0)
+    if (x && namespace){
+	if (xmlns_set(x, NULL, namespace) < 0)
+	    goto done;
+    }
+    if ((retval = api_path2xml_vec(vec+1, nvec-1, 
+				   x, (yang_node*)y, 
+				   nodeclass,
+				   xpathp, ypathp)) < 1)
 	goto done;
-    retval = 0;
+ ok:
+    retval = 1; /* OK */
  done:
+    if (prefix)
+	free(prefix);
+    if (name)
+	free(name);
     if (restval)
 	free(restval);
     if (valvec)
 	free(valvec);
     return retval;
+ fail:
+    retval = 0; /* invalid api-path or XML */
+    goto done;
 }
 
 /*! Create xml tree from api-path
- * @param[in]     api_path   API-path as defined in RFC 8040
+ * @param[in]     api_path   (Absolute) API-path as defined in RFC 8040
  * @param[in]     yspec      Yang spec
  * @param[in,out] xtop       Incoming XML tree
  * @param[in]     nodeclass  Set to schema nodes, data nodes, etc
  * @param[out]    xbotp      Resulting xml tree (end of xpath)
  * @param[out]    ybotp      Yang spec matching xbotp
+ * @retval        1          OK
+ * @retval        0          Invalid api_path or associated XML, clicon_err called
+ * @retval       -1          Fatal error, clicon_err called
+ * @note both retval 0 and -1 set clicon_err, but the later is fatal
  * @example
  *   api_path: /subif-entry=foo/subid
  *   xtop[in]  <config/> 
@@ -1990,7 +2096,8 @@ api_path2xml_vec(char             **vec,
  *                       </subif-entry></config>
  *   xbotp:    <subid/>
  *   ybotp:    Y_LEAF subid
- * @see api_path2xml_vec
+ * @note "api-path" is "URI-encoded path expression" definition in RFC8040 3.5.3
+ * @see api_path2xpath For api-path to xml xpath translation
  */
 int
 api_path2xml(char       *api_path,
@@ -2003,10 +2110,13 @@ api_path2xml(char       *api_path,
     int    retval = -1;
     char **vec = NULL;
     int    nvec;
+    cxobj *xroot;
 
+    clicon_debug(1, "%s", __FUNCTION__);
     if (*api_path!='/'){
-	clicon_log(LOG_WARNING, "Invalid key: %s (must start with '/')", api_path);
-	goto ok;
+	clicon_err(OE_XML, EINVAL, "Invalid api-path: %s (must start with '/')",
+		   api_path);
+	goto fail;
     }
     if ((vec = clicon_strsep(api_path, "/", &nvec)) == NULL)
 	goto done;
@@ -2014,19 +2124,70 @@ api_path2xml(char       *api_path,
     if (nvec > 1 && !strlen(vec[nvec-1]))
 	nvec--;
     if (nvec < 1){
-	clicon_err(OE_XML, 0, "Malformed key: %s", api_path);
-	goto done;
+	clicon_err(OE_XML, EINVAL, "Malformed api-path: %s", api_path);
+	goto fail;
     }
     nvec--; /* NULL-terminated */
-    if (api_path2xml_vec(vec+1, nvec, 
-			 xtop, (yang_node*)yspec, nodeclass,
-			 xbotp, ybotp) < 0)
+    if ((retval = api_path2xml_vec(vec+1, nvec, 
+				   xtop, (yang_node*)yspec, nodeclass,
+				   xbotp, ybotp)) < 1)
+	goto done;
+    xml_yang_root(*xbotp, &xroot);
+    if (xmlns_assign(xroot) < 0)
+	goto done;
+    // ok:
+    retval = 1;
+ done:
+    if (vec)
+	free(vec);
+    return retval;
+ fail:
+    retval = 0;
+    goto done;
+}
+
+/*! Check if the module tree x is in is assigned right XML namespace, assign if not
+ * @param[in]  x   XML node
+ *(0. You should probably find the XML root and apply this function to that.)
+ * 1. Check which namespace x should have (via yang). This is correct namespace.
+ * 2. Check which namespace x has via its XML tree
+ * 3. If equal, OK
+ * 4. Assign the correct namespace to the XML node
+ * Assign default namespace to x. Create an "xmlns"
+ * @code
+ *    xml_yang_root(x, &xroot);
+ *    xmlns_assign(xroot);
+ * @endcode
+ */
+int
+xmlns_assign(cxobj *x)
+{
+    int        retval = -1;
+    yang_stmt *y;
+    char      *ns_correct; /* correct uri */
+    char      *ns_xml;     /* may be null or incorrect */
+
+    if ((y = xml_spec(x)) == NULL){
+	clicon_err(OE_YANG, ENOENT, "XML %s does not have yang spec", xml_name(x));
+	goto done;
+    }
+    /* 1. Check which namespace x should have (via yang). This is correct namespace. */
+    if ((ns_correct = yang_find_mynamespace(y)) == NULL){
+	clicon_err(OE_YANG, ENOENT, "yang node %s does not have namespace", y->ys_argument);
+	goto done;
+    }
+    /* 2. Check which namespace x has via its XML tree */
+    if (xml2ns(x, NULL, &ns_xml) < 0)
+	goto done;
+    /* 3. If equal, OK, 4. Else, find root of XML tree */
+    if (ns_xml && strcmp(ns_xml, ns_correct)==0)
+	goto ok;
+    /* 4. Assign the correct namespace */
+    if (xmlns_set(x, NULL, ns_correct) < 0)
 	goto done;
  ok:
     retval = 0;
  done:
-    if (vec)
-	free(vec);
     return retval;
 }
 
@@ -2053,6 +2214,8 @@ xml_merge1(cxobj              *x0,
     cxobj     *x0c; /* base child */
     cxobj     *x0b; /* base body */
     cxobj     *x1c; /* mod child */
+    cxobj     *x0a; /* x0 xmlns attribute */
+    cxobj     *x1a; /* x1 xmlns attribute */
     char      *x1bstr; /* mod body string */
     yang_stmt *yc;  /* yang child */
     cbuf      *cbr = NULL; /* Reason buffer */
@@ -2109,7 +2272,7 @@ xml_merge1(cxobj              *x0,
 	    }
 	    /* See if there is a corresponding node in the base tree */
 	    x0c = NULL;
-	    if (yc && match_base_child(x0, x1c, &x0c, yc) < 0)
+	    if (yc && match_base_child(x0, x1c, &x0c, xml_child_sort, yc) < 0)
 		goto done;
 	    if (xml_merge1(x0c, (yang_node*)yc, x0, x1c, reason) < 0)
 		goto done;
@@ -2117,6 +2280,17 @@ xml_merge1(cxobj              *x0,
 		goto ok;
 	}
     } /* else Y_CONTAINER  */
+    assert(x0);
+    /* Copy xmlns attributes (if it does not already exist) */
+    if ((x1a = xml_find_type(x1, NULL, "xmlns", CX_ATTR)) != NULL)
+	if (xml_find_type(x0, NULL, "xmlns", CX_ATTR)==NULL){
+	    if ((x0a = xml_dup(x1a)) == NULL)
+		goto done;
+	    if (xml_addsub(x0, x0a) < 0)
+		goto done;
+	}
+
+
  ok:
     retval = 0;
  done:
@@ -2147,20 +2321,31 @@ xml_merge(cxobj     *x0,
     cxobj     *x0c; /* base child */
     cxobj     *x1c; /* mod child */
     yang_stmt *yc;
+    yang_stmt *ymod;
     cbuf      *cbr = NULL; /* Reason buffer */
 
     /* Loop through children of the modification tree */
     x1c = NULL;
     while ((x1c = xml_child_each(x1, x1c, CX_ELMNT)) != NULL) {
 	x1cname = xml_name(x1c);
+	if ((ys_module_by_xml(yspec, x1c, &ymod)) < 0)
+	    goto done;
+	if (ymod == NULL){
+	    if (reason &&
+		(*reason = strdup("No namespace in XML tree found")) == NULL){
+		    clicon_err(OE_UNIX, errno, "strdup");
+		    goto done;
+	    }
+	    goto ok;	
+	}
 	/* Get yang spec of the child */
-	if ((yc = yang_find_topnode(yspec, x1cname, YC_DATANODE)) == NULL){
+	if ((yc = yang_find_datanode((yang_node*)ymod, x1cname)) == NULL){
 	    if (reason){
 		if ((cbr = cbuf_new()) == NULL){
 		    clicon_err(OE_XML, errno, "cbuf_new");
 		    goto done;
 		}
-		cprintf(cbr, "XML node %s/%s has no corresponding yang specification (Invalid XML or wrong Yang spec?", xml_name(x1), x1cname);
+		cprintf(cbr, "XML node %s/%s has no corresponding yang specification (Invalid XML or wrong Yang spec?)", xml_name(x1), x1cname);
 		if ((*reason = strdup(cbuf_get(cbr))) == NULL){
 		    clicon_err(OE_UNIX, errno, "strdup");
 		    goto done;
@@ -2169,13 +2354,14 @@ xml_merge(cxobj     *x0,
 	    break;
 	}
 	/* See if there is a corresponding node in the base tree */
-	if (match_base_child(x0, x1c, &x0c, yc) < 0)
+	if (match_base_child(x0, x1c, &x0c, xml_child_sort, yc) < 0)
 	    goto done;
 	if (xml_merge1(x0c, (yang_node*)yc, x0, x1c, reason) < 0)
 	    goto done;
 	if (*reason != NULL)
 	    break;
     }
+ ok:
     retval = 0; /* OK */
  done:
     if (cbr)
diff --git a/lib/src/clixon_xml_parse.y b/lib/src/clixon_xml_parse.y
index 7600d249..d6a1200f 100644
--- a/lib/src/clixon_xml_parse.y
+++ b/lib/src/clixon_xml_parse.y
@@ -130,6 +130,7 @@ xml_parse_version(struct xml_parse_yacc_arg *ya,
  * @param[in] ya        XML parser yacc handler struct 
  * @param[in] prefix    Prefix, namespace, or NULL
  * @param[in] localpart Name
+ * @note the call to xml_child_spec() may not have xmlns attribute read yet XXX
  */
 static int
 xml_parse_unprefixed_name(struct xml_parse_yacc_arg *ya,
@@ -138,12 +139,14 @@ xml_parse_unprefixed_name(struct xml_parse_yacc_arg *ya,
     int        retval = -1;
     cxobj     *x;
     yang_stmt *y = NULL;  /* yang node */   
-    cxobj     *xp;      /* xml parent */ 
+    cxobj     *xp;        /* xml parent */ 
 
     xp = ya->ya_xparent;
-    if (xml_child_spec(name, xp, ya->ya_yspec, &y) < 0)
+    if ((x = xml_new(name, xp, NULL)) == NULL) 
 	goto done;
-    if ((x = xml_new(name, xp, y)) == NULL) 
+    if (xml_child_spec(x, xp, ya->ya_yspec, &y) < 0)
+	goto done;
+    if (y && xml_spec_set(x, y) < 0)
 	goto done;
     ya->ya_xelement = x;
     retval = 0;
@@ -168,9 +171,11 @@ xml_parse_prefixed_name(struct xml_parse_yacc_arg *ya,
     cxobj     *xp;      /* xml parent */ 
 
     xp = ya->ya_xparent;
-    if (xml_child_spec(name, xp, ya->ya_yspec, &y) < 0)
+    if ((x = xml_new(name, xp, NULL)) == NULL) 
 	goto done;
-    if ((x = xml_new(name, xp, y)) == NULL) 
+    if (xml_child_spec(x, xp, ya->ya_yspec, &y) < 0)
+	goto done;
+    if (y && xml_spec_set(x, y) < 0)
 	goto done;
     if (xml_prefix_set(x, prefix) < 0)
 	goto done;
@@ -313,19 +318,15 @@ xml_parse_attr(struct xml_parse_yacc_arg *ya,
 	       char                      *attval)
 {
     int    retval = -1;
-    cxobj *xa; 
+    cxobj *xa = NULL; 
 
-#ifdef ENABLE_XMLNS
-    if (prefix && strcmp(prefix,"xmlns")==0)
-	fprintf(stderr, "PrefixedAttName NCNAME:%s = %s\n", name, attval);
-    if (prefix==NULL && strcmp(name,"xmlns")==0)
-	fprintf(stderr, "DefaultAttName = %s\n", attval);
-#endif /* notyet */
-    if ((xa = xml_new(name, ya->ya_xelement, NULL)) == NULL)
-	goto done;
-    xml_type_set(xa, CX_ATTR);
-    if (prefix && xml_prefix_set(xa, prefix) < 0)
-	goto done;
+    if ((xa = xml_find_type(ya->ya_xelement, prefix, name, CX_ATTR)) == NULL){
+	if ((xa = xml_new(name, ya->ya_xelement, NULL)) == NULL)
+	    goto done;
+	xml_type_set(xa, CX_ATTR);
+	if (prefix && xml_prefix_set(xa, prefix) < 0)
+	    goto done;
+    }
     if (xml_value_set(xa, attval) < 0)
 	goto done;
     retval = 0;
diff --git a/lib/src/clixon_xml_sort.c b/lib/src/clixon_xml_sort.c
index befb5bcb..265d82a5 100644
--- a/lib/src/clixon_xml_sort.c
+++ b/lib/src/clixon_xml_sort.c
@@ -61,6 +61,8 @@
 #include "clixon_handle.h"
 #include "clixon_yang.h"
 #include "clixon_xml.h"
+#include "clixon_options.h"
+#include "clixon_xml_map.h"
 #include "clixon_xml_sort.h"
 
 /*
@@ -68,7 +70,9 @@
  */
 
 /* Sort and binary search of XML children
- * Experimental
+ * XXX kludge since low-level functions xml_merge/xml_diff calls 
+ * match_base_child without handle
+ * @see clicon_xml_sort
  */
 int xml_child_sort = 1;
 
@@ -83,7 +87,7 @@ int xml_child_sort = 1;
  *       xmlns and xmlns:ns are used.
  */
 int
-xml_child_spec(char       *name,
+xml_child_spec(cxobj      *x,
 	       cxobj      *xp,
 	       yang_spec  *yspec,
 	       yang_stmt **yresult)
@@ -93,8 +97,9 @@ xml_child_spec(char       *name,
     yang_stmt *yparent; /* parent yang */
     yang_stmt *ymod = NULL;
     yang_stmt *yi;
-    int        i;
+    char      *name;
 	    
+    name = xml_name(x);
     if (xp && (yparent = xml_spec(xp)) != NULL){
 	if (yparent->ys_keyword == Y_RPC){
 	    if ((yi = yang_find((yang_node*)yparent, Y_INPUT, NULL)) != NULL)
@@ -108,12 +113,9 @@ xml_child_spec(char       *name,
 	    goto done;
 	if (ymod != NULL)
 	    y = yang_find_schemanode((yang_node*)ymod, name);
-	if (y == NULL && _CLICON_XML_NS_ITERATE){
-	    for (i=0; i<yspec->yp_len; i++){
-		ymod = yspec->yp_stmt[i];
-		if ((y = yang_find_schemanode((yang_node*)ymod, name)) != NULL)
-		    break;
-	    }
+	if (y == NULL && !_CLICON_XML_NS_STRICT){
+	    if (xml_yang_find_non_strict(x, yspec, &y) < 0) /* schemanode */
+		goto done;
 	}
     }
     else
@@ -265,6 +267,7 @@ xml_cmp1(cxobj        *x,
  * Assume populated by yang spec.
  * @param[in] x0   XML node
  * @param[in] arg  Dummy so it can be called by xml_apply()
+ * @see xml_order XXX: how do they relate?
  */
 int
 xml_sort(cxobj *x,
@@ -560,9 +563,10 @@ xml_sort_verify(cxobj *x0,
 }
 
 /*! Given child tree x1c, find matching child in base tree x0 and return as x0cp
- * param[in]  x0   Base tree node
- * param[in]  x1c  Modification tree child
- * param[in]  yc   Yang spec of tree child
+ * param[in]  x0      Base tree node
+ * param[in]  x1c     Modification tree child
+ * param[in]  yc      Yang spec of tree child
+ * param[in]  xml_sort Value of CLICON_XML_SORT option
  * param[out] x0cp Matching base tree child (if any)
  * @note XXX: room for optimization? on 1K calls we have 1M body calls and
 	   500K xml_child_each/cvec_each calls. 
@@ -575,6 +579,7 @@ int
 match_base_child(cxobj     *x0, 
 		 cxobj     *x1c,
 		 cxobj    **x0cp,
+		 int        xml_sort,
 		 yang_stmt *yc)
 {
     int        retval = -1;
@@ -632,7 +637,7 @@ match_base_child(cxobj     *x0,
 	break;
     }
     /* Get match. Sorting mode(optimized) or not?*/
-    if (xml_child_sort==0)
+    if (xml_sort==0)
 	*x0cp = xml_match(x0, xml_name(x1c), yc->ys_keyword, keynr, keyvec, keyval);
     else{
 	if (xml_child_nr(x0)==0 || xml_spec(xml_child_i(x0,0))!=NULL){
@@ -640,12 +645,6 @@ match_base_child(cxobj     *x0,
 	    *x0cp = xml_search(x0, xml_name(x1c), yorder, yc->ys_keyword, keynr, keyvec, keyval);
 	}
 	else{
-#if 1 /* This is just a warning, but a catcher for when xml tree is not
-	 populated with yang spec. If you see this, a previous invacation of,
-	 for example  xml_spec_populate() may be missing
-      */
-	    clicon_log(LOG_WARNING, "%s No yspec", __FUNCTION__);
-#endif
 	    *x0cp = xml_match(x0, xml_name(x1c), yc->ys_keyword, keynr, keyvec, keyval);
 	}
     }
diff --git a/lib/src/clixon_yang.c b/lib/src/clixon_yang.c
index 68c9ce9f..2298235a 100644
--- a/lib/src/clixon_yang.c
+++ b/lib/src/clixon_yang.c
@@ -469,94 +469,6 @@ yang_match(yang_node *yn,
     }
     return match;
 }
-#ifdef NOTYET
-/*! Prototype more generic than yang_find_datanode and yang_find_schemanode
- */
-yang_stmt *
-yang_find_class(yang_node *yn, 
-		char      *argument,
-		yang_class class)
-{
-    yang_stmt *ys = NULL;
-    yang_stmt *yc = NULL;
-    yang_stmt *ysmatch = NULL;
-    int        i, j;
-    int        ok;
-
-    for (i=0; i<yn->yn_len; i++){
-	ys = yn->yn_stmt[i];
-	switch(class){
-	case YC_NONE:
-	    ok = 1;
-	    break;
-	case YC_DATANODE:
-	    ok = yang_datanode(ys);
-	    break;
-	case YC_DATADEFINITION:
-	    ok = yang_datadefinition(ys);
-	    break;
-	case YC_SCHEMANODE:
-	    ok = yang_schemanode(ys);
-	    break;
-	}
-	if (!ok)
-	    continue;
-	switch(class){
-	case YC_NONE:
-	    if (argument == NULL)
-		ysmatch = ys;
-	    else
-		if (ys->ys_argument && strcmp(argument, ys->ys_argument) == 0)
-		    ysmatch = ys;
-	    if (ysmatch)
-		goto match;
-	    break;
-	case YC_DATANODE:
-	case YC_DATADEFINITION:
-	    if (argument == NULL)
-		ysmatch = ys;
-	    else
-		if (ys->ys_argument && strcmp(argument, ys->ys_argument) == 0)
-		    ysmatch = ys;
-	    if (ysmatch)
-		goto match;
-	    break;
-	case YC_SCHEMANODE:
-	    if (ys->ys_keyword == Y_CHOICE){ /* Look for its children */
-	    for (j=0; j<ys->ys_len; j++){
-		yc = ys->ys_stmt[j];
-		if (yc->ys_keyword == Y_CASE) /* Look for its children */
-		    ysmatch = yang_find_class((yang_node*)yc, argument, class);
-		else{
-		    if (yang_schemanode(yc)){
-			if (argument == NULL)
-			    ysmatch = yc;
-			else
-			    if (yc->ys_argument && strcmp(argument, yc->ys_argument) == 0)
-				ysmatch = yc;
-		    }
-		}
-		if (ysmatch)
-		    goto match;
-	    }
-	} /* Y_CHOICE */
-	else{
-	    if (argument == NULL)
-		ysmatch = ys;
-	    else
-		if (ys->ys_argument && strcmp(argument, ys->ys_argument) == 0)
-		    ysmatch = ys;
-	    if (ysmatch)
-		goto match;
-
-	}
-	break;
-	} /* switch */
-    } /* for */
- match:
-    return ysmatch;
-}
-#endif /* NOTYET */
 
 /*! Find child data node with matching argument (container, leaf, etc)
  *
@@ -658,69 +570,6 @@ yang_find_schemanode(yang_node *yn,
     return ysmatch;
 }
 
-/*! Find first matching data node in all modules in a yang spec (prefixes)
- *
- * @param[in]  ysp        Yang specification
- * @param[in]  nodeid     Name of node. If NULL match first
- * @param[in]  class      See yang_class for class of yang nodes
- * A yang specification has modules as children which in turn can have 
- * syntax-nodes as children. This function goes through all the modules to
- * look for nodes. Note that if a child to a module is a choice, 
- * the search is made recursively made to the choice's children.
- * @note works for import prefix, but not work for generic XML parsing where
- *       xmlns and xmlns:ns are used.
- * @see yang_find_top_ns
- */
-yang_stmt *
-yang_find_topnode(yang_spec *ysp, 
-		  char      *nodeid,
-		  yang_class class)
-{
-    yang_stmt *ymod = NULL; /* module */
-    yang_stmt *yres = NULL; /* result */
-    char      *prefix = NULL;
-    char      *id = NULL;
-    int        i;
-
-    if (yang_nodeid_split(nodeid, &prefix, &id) < 0)
-	goto done;
-    if (prefix){
-	if ((ymod = yang_find((yang_node*)ysp, Y_MODULE, prefix)) != NULL ||
-	    (ymod = yang_find((yang_node*)ysp, Y_SUBMODULE, prefix)) != NULL){
-	    if ((yres = yang_find((yang_node*)ymod, 0, id)) != NULL)
-		goto ok;
-	    goto done;
-	}
-    }
-    else /* No prefix given - loop through and find first */
-	for (i=0; i<ysp->yp_len; i++){
-	    ymod = ysp->yp_stmt[i];
-	    switch (class){
-	    case YC_NONE:
-		if ((yres = yang_find((yang_node*)ymod, 0, id)) != NULL)
-		    goto ok;
-		break;
-	    case YC_DATANODE:
-		if ((yres = yang_find_datanode((yang_node*)ymod, id)) != NULL)
-		    goto ok;
-		break;
-	    case YC_SCHEMANODE:
-		if ((yres = yang_find_schemanode((yang_node*)ymod, id)) != NULL)
-		    goto ok;
-		break;
-	    case YC_DATADEFINITION:
-		break; /* nyi */
-	    }
-	}
- ok:
- done:
-    if (prefix)
-	free(prefix);
-    if (id)
-	free(id);
-    return yres;
-}
-
 /*! Given a yang statement, find the prefix associated to this module
  * @param[in]  ys        Yang statement in module tree (or module itself)
  * @retval     NULL      Not found
@@ -775,7 +624,6 @@ yang_find_mynamespace(yang_stmt *ys)
     return namespace;
 }
 
-
 /*! Find matching y in yp:s children, return 0 and index or -1 if not found.
  * @retval 0 not found
  * @retval 1 found
@@ -972,60 +820,15 @@ yarg_prefix(yang_stmt *ys)
     return prefix;
 }
 
-/*! Split yang node identifier into prefix and identifer.
- * @param[in]  node-id
- * @param[out] prefix  Malloced string. May be NULL.
- * @param[out] id      Malloced identifier.
- * @retval     0       OK
- * @retval    -1       Error
- * @code
- *    char      *prefix = NULL;
- *    char      *id = NULL;
- *    if (yang_nodeid_split(nodeid, &prefix, &id) < 0)
- *	 goto done;
- *    if (prefix)
- *	 free(prefix);
- *    if (id)
- *	 free(id);
- * @note caller need to free id and prefix after use
- */
-int
-yang_nodeid_split(char  *nodeid,
-		  char **prefix,
-    		  char **id)
-{
-    int   retval = -1;
-    char *str;
-    
-    if ((str = strchr(nodeid, ':')) == NULL){
-	if ((*id = strdup(nodeid)) == NULL){
-	    clicon_err(OE_YANG, errno, "strdup");
-	    goto done;
-	}
-    }
-    else{
-	if ((*prefix = strdup(nodeid)) == NULL){
-	    clicon_err(OE_YANG, errno, "strdup");
-	    goto done;
-	}
-	(*prefix)[str-nodeid] = '\0';
-	str++;
-	if ((*id = strdup(str)) == NULL){
-	    clicon_err(OE_YANG, errno, "strdup");
-	    goto done;
-	}
-    }
-    retval = 0;
- done:
-    return retval;
-}
-
-/*! Given a yang statement and a prefix, return yang module to that prefix
+/*! Given a yang statement and a prefix, return yang module to that relative prefix
  * Note, not the other module but the proxy import statement only
  * @param[in]  ys      A yang statement
  * @param[in]  prefix  prefix
  * @retval     ymod    Yang module statement if found
  * @retval     NULL    not found
+ * @node Prefixes are relative to the module they are defined
+ * @see yang_find_module_by_name
+ * @see yang_find_module_by_namespace
  */
 yang_stmt *
 yang_find_module_by_prefix(yang_stmt *ys, 
@@ -1081,12 +884,14 @@ yang_find_module_by_prefix(yang_stmt *ys,
     return ymod;
 }
 
-/*! Given a yang statement and a namespace, return yang module
+/*! Given a yang spec and a namespace, return yang module 
  *
  * @param[in]  yspec      A yang specification
  * @param[in]  namespace  namespace
  * @retval     ymod       Yang module statement if found
  * @retval     NULL       not found
+ * @see yang_find_module_by_name
+ * @see yang_find_module_by_prefix    module-specific prefix
  */
 yang_stmt *
 yang_find_module_by_namespace(yang_spec *yspec, 
@@ -1104,6 +909,28 @@ yang_find_module_by_namespace(yang_spec *yspec,
     return ymod;
 }
 
+/*! Given a yang spec and a module name, return yang module
+ *
+ * @param[in]  yspec      A yang specification
+ * @param[in]  name       Name of module
+ * @retval     ymod       Yang module statement if found
+ * @retval     NULL       not found
+ * @see yang_find_module_by_namespace
+ * @see yang_find_module_by_prefix    module-specific prefix
+ */
+yang_stmt *
+yang_find_module_by_name(yang_spec *yspec, 
+			 char      *name)
+{
+    yang_stmt *ymod = NULL;
+    
+    while ((ymod = yn_each((yang_node*)yspec, ymod)) != NULL) 
+	if ((ymod->ys_keyword == Y_MODULE || ymod->ys_keyword == Y_SUBMODULE) &&
+	    strcmp(ymod->ys_argument, name)==0)
+	    return ymod;
+    return NULL;
+}
+
 /*! string is quoted if it contains space or tab, needs double '' */
 static int inline
 quotedstring(char *s)
@@ -1541,7 +1368,7 @@ ys_populate_feature(clicon_handle h,
 	if (strcmp(xml_name(xc), "CLICON_FEATURE") != 0)
 	    continue;
 	/* get m and f from configuration feature rules */
-	if (yang_nodeid_split(xml_body(xc), &m, &f) < 0)
+	if (nodeid_split(xml_body(xc), &m, &f) < 0)
 	    goto done;
 	if (m && f &&
 	    (strcmp(m,"*")==0 ||
@@ -1558,7 +1385,8 @@ ys_populate_feature(clicon_handle h,
     }
     cv_name_set(cv, feature);
     cv_bool_set(cv, found);
-    clicon_debug(1, "%s %s:%s %d", __FUNCTION__, module, feature, found);
+    if (found)
+	clicon_debug(1, "%s %s:%s", __FUNCTION__, module, feature);
     ys->ys_cv = cv;
  ok:
     retval = 0;
@@ -1936,7 +1764,7 @@ yang_parse_str(char         *str,
 }
 
 /*! Parse yang spec from an open file descriptor
- * @param[in]  fd    File descriptor containing the YANG file as ASCII characters
+ * @param[in] fd     File descriptor containing the YANG file as ASCII characters
  * @param[in] name   For debug, eg filename
  * @param[in] ysp    Yang specification. Should have been created by caller using yspec_new
  * @retval ymod      Top-level yang (sub)module
@@ -2083,7 +1911,7 @@ yang_parse_filename(const char   *filename,
     int           fd = -1;
     struct stat   st;
 
-    //    clicon_debug(1, "%s %s", __FUNCTION__, filename);
+    clicon_debug(1, "%s %s", __FUNCTION__, filename);
     if (stat(filename, &st) < 0){
 	clicon_err(OE_YANG, errno, "%s not found", filename);
 	goto done;
@@ -2258,7 +2086,7 @@ yang_features(clicon_handle h,
     while (i<yt->ys_len){ /* Note, children may be removed */
 	ys = yt->ys_stmt[i];
 	if (ys->ys_keyword == Y_IF_FEATURE){
-	    if (yang_nodeid_split(ys->ys_argument, &prefix, &feature) < 0)
+	    if (nodeid_split(ys->ys_argument, &prefix, &feature) < 0)
 		goto done;
 	    /* Specifically need to handle? strcmp(prefix, myprefix)) */
 	    if (prefix == NULL)
@@ -2680,7 +2508,6 @@ yang_abs_schema_nodeid(yang_spec    *yspec,
     char            *id;
     char            *prefix = NULL;
     yang_stmt       *yprefix;
-    yang_stmt       *ys;
 
     /* check absolute schema_nodeid */
     if (schema_nodeid[0] != '/'){
@@ -2719,21 +2546,6 @@ yang_abs_schema_nodeid(yang_spec    *yspec,
 	    }
 	}
     }
-    if (ymod == NULL){ /* Try find id from topnode without prefix XXX remove?*/
-	if ((ys = yang_find_topnode(yspec, id, YC_SCHEMANODE)) == NULL){
-	    clicon_err(OE_YANG, 0, "Module with id:\"%s:%s\" not found", prefix,id);
-	    goto done;
-	}
-	if ((ymod = ys_module(ys)) == NULL){
-	    clicon_err(OE_YANG, 0, "Module with id:%s:%s not found2", prefix,id);
-	    goto done;
-	}
-	if ((yprefix = yang_find((yang_node*)ymod, Y_PREFIX, NULL)) != NULL &&
-	    strcmp(yprefix->ys_argument, prefix) != 0){
-	    clicon_err(OE_YANG, 0, "Module with id:\"%s:%s\" not found", prefix,id);
-	    goto done;
-	}
-    }
     if (schema_nodeid_vec((yang_node*)ymod, vec+1, nvec-1, keyword, yres) < 0)
 	goto done;
  ok: /* yres may not be set */
diff --git a/lib/src/clixon_yang_module.c b/lib/src/clixon_yang_module.c
index 6e08c96e..c0b1e408 100644
--- a/lib/src/clixon_yang_module.c
+++ b/lib/src/clixon_yang_module.c
@@ -81,7 +81,7 @@
 int
 yang_modules_init(clicon_handle h)
 {
-    int retval = -1;
+    int        retval = -1;
     yang_spec *yspec;
 
     yspec = clicon_dbspec_yang(h);	
@@ -203,7 +203,7 @@ yang_modules_state_get(clicon_handle    h,
 	    cprintf(cb,"<namespace>%s</namespace>", ys->ys_argument);
 	else
 	    cprintf(cb,"<namespace></namespace>");
-        cprintf(cb, "<conformance-type>implement</conformance-type>");
+	/* This follows order in rfc 7895: feature, conformance-type, submodules */
 	yc = NULL;
 	while ((yc = yn_each((yang_node*)ymod, yc)) != NULL) {
 	    switch(yc->ys_keyword){
@@ -211,6 +211,14 @@ yang_modules_state_get(clicon_handle    h,
 		if (yc->ys_cv && cv_bool_get(yc->ys_cv))
 		    cprintf(cb,"<feature>%s</feature>", yc->ys_argument);
 		break;
+	    default:
+		break;
+	    }
+	}
+        cprintf(cb, "<conformance-type>implement</conformance-type>");
+	yc = NULL;
+	while ((yc = yn_each((yang_node*)ymod, yc)) != NULL) {
+	    switch(yc->ys_keyword){
 	    case Y_SUBMODULE:
 		cprintf(cb,"<submodule>");
 		cprintf(cb,"<name>%s</name>", yc->ys_argument);
diff --git a/test/all.sh b/test/all.sh
index 79a0309f..1e036ab1 100755
--- a/test/all.sh
+++ b/test/all.sh
@@ -38,6 +38,7 @@ if [ $err -eq 0 ]; then
 else
     echo -e "\e[31mError"
     echo -ne "\e[0m"
+    exit -1
 fi
 
 
diff --git a/test/test_cli.sh b/test/test_cli.sh
index aa1379d9..b4005433 100755
--- a/test/test_cli.sh
+++ b/test/test_cli.sh
@@ -59,7 +59,7 @@ expectfn "$clixon_cli -1 -f $cfg delete interfaces" 0 "^$"
 new "cli show configuration delete top"
 expectfn "$clixon_cli -1 -f $cfg show conf cli" 0 "^$"
 
-new "cli configure"
+new "cli configure set interfaces"
 expectfn "$clixon_cli -1 -f $cfg set interfaces interface eth/0/0" 0 "^$"
 
 new "cli show configuration"
diff --git a/test/test_compat.sh b/test/test_compat.sh
new file mode 100755
index 00000000..77875410
--- /dev/null
+++ b/test/test_compat.sh
@@ -0,0 +1,116 @@
+#!/bin/bash
+# Test of backward compatibility
+# 1) Load <3.9 startup/running/extra files without namespaces - ensure it returns namespaces
+#
+
+APPNAME=example
+# include err() and new() functions and creates $dir
+. ./lib.sh
+cfg=$dir/conf_startup.xml
+
+cat <<EOF > $cfg
+<config>
+  <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
+  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
+  <CLICON_CLI_MODE>$APPNAME</CLICON_CLI_MODE>
+  <CLICON_BACKEND_DIR>/usr/local/lib/$APPNAME/backend</CLICON_BACKEND_DIR>
+  <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_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
+  <CLICON_SOCK>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
+  <CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
+  <CLICON_CLI_GENMODEL_COMPLETION>1</CLICON_CLI_GENMODEL_COMPLETION>
+  <CLICON_XMLDB_DIR>/usr/local/var/$APPNAME</CLICON_XMLDB_DIR>
+  <CLICON_XMLDB_PLUGIN>/usr/local/lib/xmldb/text.so</CLICON_XMLDB_PLUGIN>
+  <CLICON_CLI_LINESCROLLING>0</CLICON_CLI_LINESCROLLING>
+  <CLICON_STARTUP_MODE>init</CLICON_STARTUP_MODE>
+  <CLICON_XML_SORT>true</CLICON_XML_SORT>
+</config>
+
+EOF
+
+
+run(){
+    mode=$1
+    expect=$2
+
+    dbdir=$dir/db
+    cat <<EOF > $dbdir
+<config>
+   <interfaces>
+      <interface>
+         <name>run</name>
+         <type>ex:eth</type>
+      </interface>
+    </interfaces>
+</config>
+EOF
+    sudo mv $dbdir /usr/local/var/$APPNAME/running_db
+
+    cat <<EOF > $dbdir
+<config>
+   <interfaces>
+      <interface>
+         <name>startup</name>
+         <type>ex:eth</type>
+      </interface>
+    </interfaces>
+</config>
+EOF
+    sudo mv $dbdir /usr/local/var/$APPNAME/startup_db
+
+    cat <<EOF > $dir/config
+<config>
+   <interfaces>
+      <interface>
+         <name>extra</name>
+         <type>ex:eth</type>
+      </interface>
+    </interfaces>
+</config>
+EOF
+
+    new "test params: -f $cfg -s $mode -c $dir/config"
+
+    if [ $BE -ne 0 ]; then
+	new "kill old backend"
+	sudo clixon_backend -zf $cfg
+	if [ $? -ne 0 ]; then
+ 	    err
+	fi
+    
+	new "start backend  -f $cfg -s $mode -c $dir/config"
+	sudo $clixon_backend -f $cfg -s $mode -c $dir/config
+	if [ $? -ne 0 ]; then
+	    err
+	fi
+    fi
+
+    new "Check $mode"
+    expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><get-config><source><running/></source></get-config></rpc>]]>]]>' "^<rpc-reply>$expect</rpc-reply>]]>]]>$"
+
+    if [ $BE -eq 0 ]; then
+	exit # BE
+    fi
+
+    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
+    sudo clixon_backend -z -f $cfg
+    if [ $? -ne 0 ]; then
+	err "kill backend"
+    fi
+
+} # run 
+
+run running '<data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>extra</name><type>ex:eth</type><enabled>true</enabled></interface><interface><name>lo</name><type>ex:loopback</type><enabled>true</enabled></interface><interface><name>run</name><type>ex:eth</type><enabled>true</enabled></interface></interfaces></data>'
+run startup '<data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>extra</name><type>ex:eth</type><enabled>true</enabled></interface><interface><name>lo</name><type>ex:loopback</type><enabled>true</enabled></interface><interface><name>startup</name><type>ex:eth</type><enabled>true</enabled></interface></interfaces></data>'
+
+rm -rf $dir
diff --git a/test/test_datastore.sh b/test/test_datastore.sh
index bcc7b27b..9744413d 100755
--- a/test/test_datastore.sh
+++ b/test/test_datastore.sh
@@ -50,9 +50,6 @@ 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>'
 
-# Without xmlns
-xmlxxx='<config><x><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>'
-
 run(){
     name=$1
     mydir=$dir/$name
@@ -72,7 +69,7 @@ run(){
     expectmatch "$ret" $? "0" ""
 
     new "datastore $name get"
-    expectfn "$datastore $conf get /" 0 "^$xmlxxx$"
+    expectfn "$datastore $conf get /" 0 "^$xml$"
 
     new "datastore $name put all remove"
     expectfn "$datastore $conf put remove <config/>" 0 ""
@@ -87,7 +84,7 @@ run(){
 #    expectfn "$datastore $conf put merge $xml" 0 ""
 
     new "datastore $name get"
-    expectfn "$datastore $conf get /" 0 "^$xmlxxx$"
+    expectfn "$datastore $conf get /" 0 "^$xml$"
 
     new "datastore $name put all delete"
     expectfn "$datastore $conf put remove <config/>" 0 ""
@@ -100,7 +97,7 @@ run(){
     expectmatch "$ret" $? "0" ""
 
     new "datastore $name get"
-    expectfn "$datastore $conf get /" 0 "^$xmlxxx$"
+    expectfn "$datastore $conf get /" 0 "^$xml$"
 
     new "datastore $name put top create"
     expectfn "$datastore $conf put create <config><x/></config>" 0 "" # error
diff --git a/test/test_feature.sh b/test/test_feature.sh
index dfb99172..20adfa3f 100755
--- a/test/test_feature.sh
+++ b/test/test_feature.sh
@@ -90,13 +90,13 @@ new "netconf discard-changes"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf enabled feature"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><x>foo</x></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><x xmlns="urn:example:clixon">foo</x></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf validate enabled feature"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf disabled feature"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><A>foo</A></config></edit-config></rpc>]]>]]>" '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>Validation failed</error-message></rpc-error></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><y xmlns="urn:example:clixon">foo</y></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>unknown-element</error-tag><error-info><bad-element>y</bad-element></error-info><error-severity>error</error-severity><error-message>Unassigned yang spec</error-message></rpc-error></rpc-reply>]]>]]>$'
 
 # This test has been broken up into all different modules instead of one large
 # reply since the modules change so often
@@ -105,6 +105,13 @@ ret=$($clixon_netconf -qf $cfg -y $fyang<<EOF
 <rpc><get><filter type="xpath" select="modules-state/module" xmlns="urn:ietf:params:xml:ns:yang:ietf-yang-library"/></get></rpc>]]>]]>
 EOF
 )
+new "netconf modules-state header"
+expect='^<rpc-reply><data><modules-state xmlns="urn:ietf:params:xml:ns:yang:ietf-yang-library"><module><name>'
+match=`echo "$ret" | grep -GZo "$expect"`
+if [ -z "$match" ]; then
+      err "$expect" "$ret"
+fi
+
 new "netconf module A"
 expect="<module><name>example</name><revision/><namespace>urn:example:clixon</namespace><feature>A</feature><conformance-type>implement</conformance-type></module>"
 match=`echo "$ret" | grep -GZo "$expect"`
@@ -135,8 +142,9 @@ if [ -z "$match" ]; then
       err "$expect" "$ret"
 fi
 
+# Note order of features in ietf-netconf yang is alphabetically: candidate, startup, validate, xpath
 new "netconf module ietf-netconf"
-expect="module><name>ietf-netconf</name><revision>2011-06-01</revision><namespace>urn:ietf:params:xml:ns:netconf:base:1.0</namespace><feature>candidate</feature><feature>startup</feature><feature>validate</feature><feature>xpath</feature><conformance-type>implement</conformance-type></module>"
+expect="<module><name>ietf-netconf</name><revision>2011-06-01</revision><namespace>urn:ietf:params:xml:ns:netconf:base:1.0</namespace><feature>candidate</feature><feature>startup</feature><feature>validate</feature><feature>xpath</feature><conformance-type>implement</conformance-type></module>"
 match=`echo "$ret" | grep -GZo "$expect"`
 if [ -z "$match" ]; then
       err "$expect" "$ret"
diff --git a/test/test_identity.sh b/test/test_identity.sh
index 14d6b996..eeaa6198 100755
--- a/test/test_identity.sh
+++ b/test/test_identity.sh
@@ -122,44 +122,44 @@ if [ $BE -ne 0 ]; then
 fi
 
 new "Set crypto to aes"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><edit-config><target><candidate/></target><config><crypto>aes</crypto></config></edit-config></rpc>]]>]]>' '^<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><edit-config><target><candidate/></target><config><crypto xmlns="urn:example:my-crypto">aes</crypto></config></edit-config></rpc>]]>]]>' '^<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><ok/></rpc-reply>]]>]]>$'
 
 new "netconf validate "
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "Set crypto to mc:aes"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><crypto>mc:aes</crypto></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><crypto xmlns="urn:example:my-crypto">mc:aes</crypto></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf validate"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "Set crypto to des:des3"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><crypto>des:des3</crypto></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><crypto xmlns="urn:example:my-crypto">des:des3</crypto></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf validate"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "Set crypto to mc:foo"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><crypto>mc:foo</crypto></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><crypto xmlns="urn:example:my-crypto">mc:foo</crypto></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf validate"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "Set crypto to des:des3 using xmlns"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><crypto xmlns:des=\"urn:example:des\">des:des3</crypto></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><crypto xmlns="urn:example:my-crypto" xmlns:des="urn:example:des">des:des3</crypto></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf validate"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 # XXX this is not supported
 #new "Set crypto to x:des3 using xmlns"
-#expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><crypto xmlns:x=\"urn:example:des\">x:des3</crypto></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+#expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><crypto xmlns="urn:example:my-crypto" xmlns:x="urn:example:des">x:des3</crypto></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
-#new "netconf validate"
-#expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+new "netconf validate"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "Set crypto to foo:bar"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><crypto>foo:bar</crypto></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><crypto xmlns="urn:example:my-crypto">foo:bar</crypto></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf validate"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>Identityref validation failed, foo:bar not derived from crypto-alg</error-message></rpc-error></rpc-reply>]]>]]>$"
diff --git a/test/test_leafref.sh b/test/test_leafref.sh
index 6e66c7f3..63c6a270 100755
--- a/test/test_leafref.sh
+++ b/test/test_leafref.sh
@@ -88,22 +88,19 @@ if [ $BE -ne 0 ]; then
 fi
 
 new "leafref base config"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><interfaces>
-<interface><name>eth0</name><type>ex:eth</type>  <ipv4><address><ip>192.0.2.1</ip></address><address><ip>192.0.2.2</ip></address></ipv4></interface>
-<interface><name>lo</name><type>ex:lo</type><ipv4><address><ip>127.0.0.1</ip></address></ipv4></interface>
-</interfaces></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth0</name><type>ex:eth</type>  <ipv4><address><ip>192.0.2.1</ip></address><address><ip>192.0.2.2</ip></address></ipv4></interface><interface><name>lo</name><type>ex:lo</type><ipv4><address><ip>127.0.0.1</ip></address></ipv4></interface></interfaces></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "leafref get config"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '^<rpc-reply><data><interfaces><interface><name>eth0</name>'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth0</name>'
 
 new "leafref base commit"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "leafref get config"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '^<rpc-reply><data><interfaces><interface><name>eth0</name>'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth0</name>'
 
 new "leafref add wrong ref"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><default-address><absname>eth3</absname><address>10.0.4.6</address></default-address></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><default-address xmlns="urn:example:clixon"><absname>eth3</absname><address>10.0.4.6</address></default-address></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "leafref validate"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>eth3</bad-element></error-info><error-severity>error</error-severity><error-message>Leafref validation failed: No such leaf</error-message></rpc-error></rpc-reply>]]>]]>$'
@@ -112,10 +109,10 @@ new "leafref discard-changes"
 expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "leafref add correct absref"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><default-address><absname>eth0</absname></default-address></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><default-address xmlns="urn:example:clixon"><absname>eth0</absname></default-address></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "leafref add correct relref"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><default-address><relname>eth0</relname></default-address></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><default-address xmlns="urn:example:clixon"><relname>eth0</relname></default-address></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 # XXX add address
 
@@ -123,7 +120,7 @@ new "leafref validate (ok)"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>"
 
 new "leafref delete leaf"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><interfaces><interface operation=\"delete\"><name>eth0</name></interface></interfaces></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface operation="delete"><name>eth0</name></interface></interfaces></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>'
 
 new "leafref validate (should fail)"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>"  '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>eth0</bad-element></error-info><error-severity>error</error-severity><error-message>Leafref validation failed: No such leaf</error-message></rpc-error></rpc-reply>]]>]]>$'
diff --git a/test/test_list.sh b/test/test_list.sh
index 37fb8c6c..1b9bdc2e 100755
--- a/test/test_list.sh
+++ b/test/test_list.sh
@@ -81,19 +81,19 @@ if [ $BE -ne 0 ]; then
 fi
 
 new "minmax: minimal"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c><a1><k>0</k></a1><b1>0</b1></c></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"><a1><k>0</k></a1><b1>0</b1></c></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "minmax: minimal validate ok"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "minmax: maximal"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c><a0><k>0</k></a0><a0><k>1</k></a0><a0><k>unbounded</k></a0><a1><k>0</k></a1><a1><k>1</k></a1><b0>0</b0><b0>1</b0><b0>unbounded</b0><b1>0</b1><b0>1</b0></c></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"><a0><k>0</k></a0><a0><k>1</k></a0><a0><k>unbounded</k></a0><a1><k>0</k></a1><a1><k>1</k></a1><b0>0</b0><b0>1</b0><b0>unbounded</b0><b1>0</b1><b0>1</b0></c></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "minmax: validate ok"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "minmax: empty"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c/></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"/></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 # NYI
 if false; then 
@@ -101,25 +101,25 @@ new "minmax: validate should fail"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error/></rpc-reply>]]>]]>$"
 
 new "minmax: no list"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c><b1>0</b1></c></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"><b1>0</b1></c></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "minmax: validate should fail"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error/></rpc-reply>]]>]]>$"
 
 new "minmax: no leaf-list"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c><a1><k>0</k></a1></c></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"><a1><k>0</k></a1></c></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "minmax: validate should fail"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error/></rpc-reply>]]>]]>$"
 
 new "minmax: Too large list"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c><a1><k>0</k></a1><a1><k>1</k></a1><a1><k>2</k></a1><b1>0</b1></c></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"><a1><k>0</k></a1><a1><k>1</k></a1><a1><k>2</k></a1><b1>0</b1></c></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "minmax: validate should fail"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error/></rpc-reply>]]>]]>$"
 
 new "minmax: Too large leaf-list"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c><a1><k>0</k></a1><b1>0</b1><b1>1</b1><b1>2</b1></c></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"><a1><k>0</k></a1><b1>0</b1><b1>1</b1><b1>2</b1></c></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "minmax: validate should fail"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error/></rpc-reply>]]>]]>$"
diff --git a/test/test_nacm.sh b/test/test_nacm.sh
index 389ae010..aac4be87 100755
--- a/test/test_nacm.sh
+++ b/test/test_nacm.sh
@@ -49,7 +49,7 @@ EOF
 # The groups are slightly modified from RFC8341 A.1
 # The rule-list is from A.2
 RULES=$(cat <<EOF
-   <nacm>
+   <nacm xmlns="urn:ietf:params:xml:ns:yang:ietf-netconf-acm">
      <enable-nacm>false</enable-nacm>
      <read-default>deny</read-default>
      <write-default>deny</write-default>
@@ -99,7 +99,7 @@ RULES=$(cat <<EOF
      $NADMIN
 
    </nacm>
-   <x>0</x>
+   <x xmlns="urn:example:clixon">0</x>
 EOF
 )
 
@@ -131,7 +131,7 @@ new "restconf DELETE whole datastore"
 expecteq "$(curl -u andy:bar -sS -X DELETE http://localhost/restconf/data)" ""
 
 new2 "auth get"
-expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/x)" 'null
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/example:x)" 'null
 
'
 
 new "auth set authentication config"
@@ -147,33 +147,33 @@ new2 "auth get (wrong passwd: access denied)"
 expecteq "$(curl -u andy:foo -sS -X GET http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
 
 new2 "auth get (access)"
-expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/x)" '{"x": 0}
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"example:x": 0}
 
'
 
 #----------------Enable NACM
 
 new "enable nacm"
-expecteq "$(curl -u andy:bar -sS -X PUT -d '{"enable-nacm": true}' http://localhost/restconf/data/nacm/enable-nacm)" ""
+expecteq "$(curl -u andy:bar -sS -X PUT -d '{"ietf-netconf-acm:enable-nacm": true}' http://localhost/restconf/data/ietf-netconf-acm:nacm/enable-nacm)" ""
 
 new2 "admin get nacm"
-expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/x)" '{"x": 0}
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"example:x": 0}
 
'
 
 new2 "limited get nacm"
-expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/x)" '{"x": 0}
+expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"example:x": 0}
 
'
 
 new2 "guest get nacm"
-expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
+expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
 
 new "admin edit nacm"
-expecteq "$(curl -u andy:bar -sS -X PUT -d '{"x": 1}' http://localhost/restconf/data/x)" ""
+expecteq "$(curl -u andy:bar -sS -X PUT -d '{"example:x": 1}' http://localhost/restconf/data/example:x)" ""
 
 new2 "limited edit nacm"
-expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"x": 2}' http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"example:x": 2}' http://localhost/restconf/data/example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
 new2 "guest edit nacm"
-expecteq "$(curl -u guest:bar -sS -X PUT -d '{"x": 3}' http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
+expecteq "$(curl -u guest:bar -sS -X PUT -d '{"example:x": 3}' http://localhost/restconf/data/example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
 
 new "Kill restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"
diff --git a/test/test_nacm_ext.sh b/test/test_nacm_ext.sh
index 9bdee51d..b706b96f 100755
--- a/test/test_nacm_ext.sh
+++ b/test/test_nacm_ext.sh
@@ -163,11 +163,11 @@ new "restconf DELETE whole datastore"
 expecteq "$(curl -u andy:bar -sS -X DELETE http://localhost/restconf/data)" ""
 
 new2 "auth get"
-expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/state)" '{"state": {"op": "42"}}
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/example:state)" '{"example:state": {"op": "42"}}
 
'
 
 new "Set x to 0"
-expecteq "$(curl -u andy:bar -sS -X PUT -d '{"x": 0}' http://localhost/restconf/data/x)" ""
+expecteq "$(curl -u andy:bar -sS -X PUT -d '{"example:x": 0}' http://localhost/restconf/data/example:x)" ""
 
 new2 "auth get (no user: access denied)"
 expecteq "$(curl -sS -X GET -H \"Accept:\ application/yang-data+json\" http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
@@ -176,28 +176,28 @@ new2 "auth get (wrong passwd: access denied)"
 expecteq "$(curl -u andy:foo -sS -X GET http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
 
 new2 "auth get (access)"
-expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/x)" '{"x": 0}
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"example:x": 0}
 
'
 
 new2 "admin get nacm"
-expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/x)" '{"x": 0}
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"example:x": 0}
 
'
 
 new2 "limited get nacm"
-expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/x)" '{"x": 0}
+expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"example:x": 0}
 
'
 
 new2 "guest get nacm"
-expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
+expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
 
 new "admin edit nacm"
-expecteq "$(curl -u andy:bar -sS -X PUT -d '{"x": 1}' http://localhost/restconf/data/x)" ""
+expecteq "$(curl -u andy:bar -sS -X PUT -d '{"example:x": 1}' http://localhost/restconf/data/example:x)" ""
 
 new2 "limited edit nacm"
-expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"x": 2}' http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"x": 2}' http://localhost/restconf/data/example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
 new2 "guest edit nacm"
-expecteq "$(curl -u guest:bar -sS -X PUT -d '{"x": 3}' http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
+expecteq "$(curl -u guest:bar -sS -X PUT -d '{"x": 3}' http://localhost/restconf/data/example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
 
 new "cli show conf as admin"
 expectfn "$clixon_cli -1 -U andy -l o -f $cfg -y $fyang show conf" 0 "^x 1;$"
diff --git a/test/test_nacm_protocol.sh b/test/test_nacm_protocol.sh
index 963218e5..b4e5bc2f 100755
--- a/test/test_nacm_protocol.sh
+++ b/test/test_nacm_protocol.sh
@@ -122,7 +122,7 @@ RULES=$(cat <<EOF
      $NADMIN
 
    </nacm>
-   <x>0</x>
+   <x xmlns="urn:example:clixon">0</x>
 EOF
 )
 
@@ -158,10 +158,10 @@ new "commit it"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "enable nacm"
-expecteq "$(curl -u andy:bar -sS -X PUT -d '{"enable-nacm": true}' http://localhost/restconf/data/nacm/enable-nacm)" ""
+expecteq "$(curl -u andy:bar -sS -X PUT -d '{"enable-nacm": true}' http://localhost/restconf/data/ietf-netconf-acm:nacm/enable-nacm)" ""
 
 new2 "admin get nacm"
-expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/x)" '{"x": 0}
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"example:x": 0}
 
'
 
 # Rule 1: deny-kill-session
@@ -186,7 +186,7 @@ new "deny-delete-config: limited fail (restconf) ok"
 expecteq "$(curl -u wilma:bar -sS -X DELETE http://localhost/restconf/data)" ''
 
 new2 "admin get nacm (should be null)"
-expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/x)" 'null
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/example:x)" 'null
 
'
 
 new "deny-delete-config: admin ok (restconf)"
@@ -200,14 +200,14 @@ new "commit it"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "enable nacm"
-expecteq "$(curl -u andy:bar -sS -X PUT -d '{"enable-nacm": true}' http://localhost/restconf/data/nacm/enable-nacm)" ""
+expecteq "$(curl -u andy:bar -sS -X PUT -d '{"ietf-netconf-acm:enable-nacm": true}' http://localhost/restconf/data/ietf-netconf-acm:nacm/enable-nacm)" ""
 
 # Rule 3: permit-edit-config
 new "permit-edit-config: limited ok restconf"
-expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"x": 2}' http://localhost/restconf/data/x)" ''
+expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"example:x": 2}' http://localhost/restconf/data/example:x)" ''
 
 new2 "permit-edit-config: guest fail restconf"
-expecteq "$(curl -u guest:bar -sS -X PUT -d '{"x": 2}' http://localhost/restconf/data/x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+expecteq "$(curl -u guest:bar -sS -X PUT -d '{"example:x": 2}' http://localhost/restconf/data/example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
 new "Kill restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"
diff --git a/test/test_netconf.sh b/test/test_netconf.sh
index 7b060875..ced3047d 100755
--- a/test/test_netconf.sh
+++ b/test/test_netconf.sh
@@ -114,14 +114,13 @@ new "netconf get-config single quotes"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc message-id='101' xmlns='urn:ietf:params:xml:ns:netconf:base:1.0'><get-config><source><candidate/></source></get-config></rpc>]]>]]>" '^<rpc-reply message-id="101" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><data/></rpc-reply>]]>]]>$'
 
 new "Add subtree eth/0/0 using none which should not change anything"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><default-operation>none</default-operation><target><candidate/></target><config><interfaces><interface><name>eth/0/0</name></interface></interfaces></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><default-operation>none</default-operation><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth/0/0</name></interface></interfaces></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "Check nothing added"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc message-id="101"><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '^<rpc-reply message-id="101"><data/></rpc-reply>]]>]]>$'
 
 new "Add subtree eth/0/0 using none and create which should add eth/0/0"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces><interface operation="create"><name>eth/0/0</name><type>ex:eth</type></interface></interfaces></config><default-operation>none</default-operation> </edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
-
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface operation="create"><name>eth/0/0</name><type>ex:eth</type></interface></interfaces></config><default-operation>none</default-operation> </edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 # Too many quotes, (single inside double inside single) need to fool bash
 cat <<EOF > $tmp # new
@@ -129,22 +128,22 @@ cat <<EOF > $tmp # new
 EOF
 
 new "Check eth/0/0 added using xpath"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "$(cat $tmp)" "^<rpc-reply><data><interfaces><interface><name>eth/0/0</name><type>ex:eth</type><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "$(cat $tmp)" '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth/0/0</name><type>ex:eth</type><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>$'
 
 new "Re-create same eth/0/0 which should generate error"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces><interface operation="create"><name>eth/0/0</name><type>ex:eth</type></interface></interfaces></config><default-operation>none</default-operation> </edit-config></rpc>]]>]]>' "^<rpc-reply><rpc-error>"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface operation="create"><name>eth/0/0</name><type>ex:eth</type></interface></interfaces></config><default-operation>none</default-operation> </edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error>'
 
 new "Delete eth/0/0 using none config"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces><interface operation="delete"><name>eth/0/0</name><type>ex:eth</type></interface></interfaces></config><default-operation>none</default-operation> </edit-config></rpc>]]>]]>'  "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface operation="delete"><name>eth/0/0</name><type>ex:eth</type></interface></interfaces></config><default-operation>none</default-operation> </edit-config></rpc>]]>]]>'  '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "Check deleted eth/0/0 (non-presence container)"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc message-id="101"><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '^<rpc-reply message-id="101"><data/></rpc-reply>]]>]]>$'
 
 new "Re-Delete eth/0/0 using none should generate error"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces><interface operation="delete"><name>eth/0/0</name><type>ex:eth</type></interface></interfaces></config><default-operation>none</default-operation> </edit-config></rpc>]]>]]>'  "^<rpc-reply><rpc-error>"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface operation="delete"><name>eth/0/0</name><type>ex:eth</type></interface></interfaces></config><default-operation>none</default-operation> </edit-config></rpc>]]>]]>'  '^<rpc-reply><rpc-error>'
 
 new "netconf edit config"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><interfaces><interface><name>eth/0/0</name></interface><interface><name>eth1</name><enabled>true</enabled><ipv4><address><ip>9.2.3.4</ip><prefix-length>24</prefix-length></address></ipv4></interface></interfaces></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth/0/0</name></interface><interface><name>eth1</name><enabled>true</enabled><ipv4><address><ip>9.2.3.4</ip><prefix-length>24</prefix-length></address></ipv4></interface></interfaces></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 # Too many quotes
 cat <<EOF > $tmp # new
@@ -152,7 +151,7 @@ cat <<EOF > $tmp # new
 EOF
 
 new "netconf get config xpath"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "$(cat $tmp)" "^<rpc-reply><data><interfaces><interface><name>eth1</name><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "$(cat $tmp)" '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth1</name><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>$'
 
 # Too many quotes
 cat <<EOF > $tmp # new
@@ -160,7 +159,7 @@ cat <<EOF > $tmp # new
 EOF
 
 new "netconf get config xpath parent"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "$(cat $tmp)" "^<rpc-reply><data><interfaces><interface><name>eth/0/0</name><enabled>true</enabled></interface><interface><name>eth1</name><enabled>true</enabled><ipv4><enabled>true</enabled><forwarding>false</forwarding><address><ip>9.2.3.4</ip><prefix-length>24</prefix-length></address></ipv4></interface></interfaces></data></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "$(cat $tmp)" '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth/0/0</name><enabled>true</enabled></interface><interface><name>eth1</name><enabled>true</enabled><ipv4><enabled>true</enabled><forwarding>false</forwarding><address><ip>9.2.3.4</ip><prefix-length>24</prefix-length></address></ipv4></interface></interfaces></data></rpc-reply>]]>]]>$'
 
 new "netconf validate missing type"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error>"
@@ -172,13 +171,13 @@ new "netconf get empty config2"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data/></rpc-reply>]]>]]>$"
 
 new "netconf edit extra xml"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><interfaces><extra/></interfaces></config></edit-config></rpc>]]>]]>" "^<rpc-reply><rpc-error>"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><extra/></interfaces></config></edit-config></rpc>]]>]]>' "^<rpc-reply><rpc-error>"
 
 new "netconf discard-changes"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf edit config eth1"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><interfaces><interface><name>eth1</name><type>ex:eth</type></interface></interfaces></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth1</name><type>ex:eth</type></interface></interfaces></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf validate"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
@@ -187,32 +186,32 @@ new "netconf commit"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf edit config merge"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><interfaces><interface><name>eth2</name><type>ex:eth</type></interface></interfaces></config><default-operation>merge</default-operation></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth2</name><type>ex:eth</type></interface></interfaces></config><default-operation>merge</default-operation></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf edit ampersand encoding(<&): name:'eth&' type:'t<>'"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><interfaces><interface><name>eth&amp;</name><type>t&lt;&gt;</type></interface></interfaces></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth&amp;</name><type>t&lt;&gt;</type></interface></interfaces></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "netconf get replaced config"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data><interfaces><interface><name>eth&amp;</name><type>t&lt;&gt;</type><enabled>true</enabled></interface><interface><name>eth1</name><type>ex:eth</type><enabled>true</enabled></interface><interface><name>eth2</name><type>ex:eth</type><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth&amp;</name><type>t&lt;&gt;</type><enabled>true</enabled></interface><interface><name>eth1</name><type>ex:eth</type><enabled>true</enabled></interface><interface><name>eth2</name><type>ex:eth</type><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>$'
 
 new "cli show configuration eth& - encoding tests"
 expectfn "$clixon_cli -1 -f $cfg -y $fyang show conf cli" 0 "interfaces interface eth& type t<>
 interfaces interface eth& enabled true"
 
 new "netconf edit CDATA"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><interfaces><interface><name>eth/0/0</name><type>ex:eth</type><description><![CDATA[myeth&]]></description></interface></interfaces></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth/0/0</name><type>ex:eth</type><description><![CDATA[myeth&]]></description></interface></interfaces></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 #new "netconf get CDATA"
-#expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source><filter type=\"xpath\" select=\"/interfaces/interface[name='eth/0/0']/description\" /></get-config></rpc>]]>]]>" "<rpc-reply><data><interfaces><interface><name>eth/0/0</name><description><![CDATA[myeth&]]></description><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>"
+#expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get-config><source><candidate/></source><filter type=\"xpath\" select=\"/interfaces/interface[name='eth/0/0']/description\" /></get-config></rpc>]]>]]>' '<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth/0/0</name><description><![CDATA[myeth&]]></description><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>'
 
 new "netconf discard-changes"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf edit state operation should fail"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><state><op>42</op></state></config></edit-config></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-type>protocol</error-type><error-tag>invalid-value</error-tag>"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><state xmlns="urn:example:clixon"><op>42</op></state></config></edit-config></rpc>]]>]]>' "^<rpc-reply><rpc-error><error-type>protocol</error-type><error-tag>invalid-value</error-tag>"
 
 new "netconf get state operation"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get><filter type=\"xpath\" select=\"/state\"/></get></rpc>]]>]]>" "^<rpc-reply><data><state><op>42</op></state></data></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get><filter type=\"xpath\" select=\"/state\"/></get></rpc>]]>]]>" '^<rpc-reply><data><state xmlns="urn:example:clixon"><op>42</op></state></data></rpc-reply>]]>]]>$'
 
 new "netconf lock/unlock"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><lock><target><candidate/></target></lock></rpc>]]>]]><rpc><unlock><target><candidate/></target></unlock></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]><rpc-reply><ok/></rpc-reply>]]>]]>$"
@@ -234,7 +233,7 @@ new "copy startup"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><copy-config><target><startup/></target><source><candidate/></source></copy-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf get startup"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><startup/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data><interfaces><interface><name>eth1</name><type>ex:eth</type><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><startup/></source></get-config></rpc>]]>]]>" '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth1</name><type>ex:eth</type><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>$'
 
 new "netconf delete startup"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><delete-config><target><startup/></target></delete-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
@@ -243,16 +242,16 @@ new "netconf check empty startup"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><startup/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data/></rpc-reply>]]>]]>$"
 
 new "netconf rpc"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><fib-route xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"><routing-instance-name>ipv4</routing-instance-name><destination-address><address-family>ipv4</address-family></destination-address></fib-route></rpc>]]>]]>' "^<rpc-reply><route><address-family>ipv4</address-family><next-hop><next-hop-list>"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><fib-route xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"><routing-instance-name>ipv4</routing-instance-name><destination-address><address-family>ipv4</address-family></destination-address></fib-route></rpc>]]>]]>' '^<rpc-reply><route xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"><address-family>ipv4</address-family><next-hop><next-hop-list>'
 
-new "netconf rpc without namespace (iterate kludge should work)"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><fib-route><routing-instance-name>ipv4</routing-instance-name><destination-address><address-family>ipv4</address-family></destination-address></fib-route></rpc>]]>]]>" "^<rpc-reply><route><address-family>ipv4</address-family><next-hop><next-hop-list>"
+#new "netconf rpc without namespace (iterate kludge should work)"
+#expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><fib-route><routing-instance-name>ipv4</routing-instance-name><destination-address><address-family>ipv4</address-family></destination-address></fib-route></rpc>]]>]]>" "^<rpc-reply><route><address-family>ipv4</address-family><next-hop><next-hop-list>"
 
 new "netconf empty rpc"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><ex:empty/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><empty xmlns="urn:example:clixon"/></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf client-side rpc"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><ex:client-rpc><request>example</request></ex:client-rpc></rpc>]]>]]>" "^<rpc-reply><result>ok</result></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><client-rpc xmlns="urn:example:clixon"><request>example</request></client-rpc></rpc>]]>]]>' '^<rpc-reply><result xmlns="urn:example:clixon">ok</result></rpc-reply>]]>]]>$'
 
 if [ $BE -eq 0 ]; then
     exit # BE
diff --git a/test/test_order.sh b/test/test_order.sh
index cb9eb780..4db73e9c 100755
--- a/test/test_order.sh
+++ b/test/test_order.sh
@@ -16,7 +16,6 @@ fyang=$dir/order.yang
 
 dbdir=$dir/order
 
-new "Set up $dbdir"
 rm -rf $dbdir
 if [ ! -d $dbdir ]; then
     mkdir $dbdir
@@ -84,30 +83,32 @@ module example{
 }
 EOF
 
+rm -f $dbdir/candidate_db
+# alt
 cat <<EOF > $dbdir/running_db
 <config>
-  <y0>d</y0>
-  <y1>d</y1>
-  <y2><k>d</k><a>bar</a></y2>
-  <y3><k>d</k><a>bar</a></y3>
-  <y0>b</y0>
-  <y1>b</y1>
-  <c><d>hej</d></c>
-  <y0>c</y0>
-  <y1>c</y1>
-  <y2><k>a</k><a>bar</a></y2>
-  <y3><k>a</k><a>bar</a></y3>
-  <l>hopp</l>
-  <y0>a</y0>
-  <y1>a</y1>
-  <y2><k>c</k><a>bar</a></y2>
-  <y3><k>c</k><a>bar</a></y3>
-  <y2><k>b</k><a>bar</a></y2>
-  <y3><k>b</k><a>bar</a></y3>
+  <y0 xmlns="urn:example:clixon">d</y0>
+  <y1 xmlns="urn:example:clixon">d</y1>
+  <y2 xmlns="urn:example:clixon"><k>d</k><a>bar</a></y2>
+  <y3 xmlns="urn:example:clixon"><k>d</k><a>bar</a></y3>
+  <y0 xmlns="urn:example:clixon">b</y0>
+  <y1 xmlns="urn:example:clixon">b</y1>
+  <c xmlns="urn:example:clixon"><d>hej</d></c>
+  <y0 xmlns="urn:example:clixon">c</y0>
+  <y1 xmlns="urn:example:clixon">c</y1>
+  <y2 xmlns="urn:example:clixon"><k>a</k><a>bar</a></y2>
+  <y3 xmlns="urn:example:clixon"><k>a</k><a>bar</a></y3>
+  <l xmlns="urn:example:clixon">hopp</l>
+  <y0 xmlns="urn:example:clixon">a</y0>
+  <y1 xmlns="urn:example:clixon">a</y1>
+  <y2 xmlns="urn:example:clixon"><k>c</k><a>bar</a></y2>
+  <y3 xmlns="urn:example:clixon"><k>c</k><a>bar</a></y3>
+  <y2 xmlns="urn:example:clixon"><k>b</k><a>bar</a></y2>
+  <y3 xmlns="urn:example:clixon"><k>b</k><a>bar</a></y3>
 </config>
 EOF
 
-new "test params: -f $cfg -y $fyang"
+new "test params: -s running -f $cfg -y $fyang"
 
 if [ $BE -ne 0 ]; then
     new "kill old backend"
@@ -123,20 +124,20 @@ if [ $BE -ne 0 ]; then
 fi
 
 # Check as file
-new "verify running from start, should be: l,c,y0,y1,y2,y3; y1 and y3 sorted. Note this fails if XML_SORT set to false"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><running/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data><c><d>hej</d></c><l>hopp</l><y0>d</y0><y0>b</y0><y0>c</y0><y0>a</y0><y1>a</y1><y1>b</y1><y1>c</y1><y1>d</y1><y2><k>d</k><a>bar</a></y2><y2><k>a</k><a>bar</a></y2><y2><k>c</k><a>bar</a></y2><y2><k>b</k><a>bar</a></y2><y3><k>a</k><a>bar</a></y3><y3><k>b</k><a>bar</a></y3><y3><k>c</k><a>bar</a></y3><y3><k>d</k><a>bar</a></y3></data></rpc-reply>]]>]]>$"
+new "verify running from start, should be: c,l,y0,y1,y2,y3; y1 and y3 sorted. Note this fails if CLICON_XML_SORT set to false"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get-config><source><running/></source></get-config></rpc>]]>]]>' '^<rpc-reply><data><c xmlns="urn:example:clixon"><d>hej</d></c><l xmlns="urn:example:clixon">hopp</l><y0 xmlns="urn:example:clixon">d</y0><y0 xmlns="urn:example:clixon">b</y0><y0 xmlns="urn:example:clixon">c</y0><y0 xmlns="urn:example:clixon">a</y0><y1 xmlns="urn:example:clixon">a</y1><y1 xmlns="urn:example:clixon">b</y1><y1 xmlns="urn:example:clixon">c</y1><y1 xmlns="urn:example:clixon">d</y1><y2 xmlns="urn:example:clixon"><k>d</k><a>bar</a></y2><y2 xmlns="urn:example:clixon"><k>a</k><a>bar</a></y2><y2 xmlns="urn:example:clixon"><k>c</k><a>bar</a></y2><y2 xmlns="urn:example:clixon"><k>b</k><a>bar</a></y2><y3 xmlns="urn:example:clixon"><k>a</k><a>bar</a></y3><y3 xmlns="urn:example:clixon"><k>b</k><a>bar</a></y3><y3 xmlns="urn:example:clixon"><k>c</k><a>bar</a></y3><y3 xmlns="urn:example:clixon"><k>d</k><a>bar</a></y3></data></rpc-reply>]]>]]>$'
 
 new "get each ordered-by user leaf-list"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><running/></source><filter type=\"xpath\" select=\"/y2[k='a']\"/></get-config></rpc>]]>]]>" "^<rpc-reply><data><y2><k>a</k><a>bar</a></y2></data></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><running/></source><filter type=\"xpath\" select=\"/y2[k='a']\"/></get-config></rpc>]]>]]>" '^<rpc-reply><data><y2 xmlns="urn:example:clixon"><k>a</k><a>bar</a></y2></data></rpc-reply>]]>]]>$'
 
 new "get each ordered-by user leaf-list"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><running/></source><filter type=\"xpath\" select=\"/y3[k='a']\"/></get-config></rpc>]]>]]>" "^<rpc-reply><data><y3><k>a</k><a>bar</a></y3></data></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><running/></source><filter type=\"xpath\" select=\"/y3[k='a']\"/></get-config></rpc>]]>]]>" '^<rpc-reply><data><y3 xmlns="urn:example:clixon"><k>a</k><a>bar</a></y3></data></rpc-reply>]]>]]>$'
 
 new "get each ordered-by user leaf-list"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><running/></source><filter type=\"xpath\" select=\"/y2[k='b']\"/></get-config></rpc>]]>]]>" "^<rpc-reply><data><y2><k>b</k><a>bar</a></y2></data></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><running/></source><filter type=\"xpath\" select=\"/y2[k='b']\"/></get-config></rpc>]]>]]>" '^<rpc-reply><data><y2 xmlns="urn:example:clixon"><k>b</k><a>bar</a></y2></data></rpc-reply>]]>]]>$'
 
 new "get each ordered-by user leaf-list"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><running/></source><filter type=\"xpath\" select=\"/y3[k='b']\"/></get-config></rpc>]]>]]>" "^<rpc-reply><data><y3><k>b</k><a>bar</a></y3></data></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><running/></source><filter type=\"xpath\" select=\"/y3[k='b']\"/></get-config></rpc>]]>]]>" '^<rpc-reply><data><y3 xmlns="urn:example:clixon"><k>b</k><a>bar</a></y3></data></rpc-reply>]]>]]>$'
 
 new "delete candidate"
 expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><default-operation>none</default-operation><config operation="delete"/></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
@@ -144,33 +145,33 @@ expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></
 # LEAF_LISTS
 
 new "add two entries to leaf-list user order"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><y0>c</y0><y0>b</y0></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><y0 xmlns="urn:example:clixon">c</y0><y0 xmlns="urn:example:clixon">b</y0></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "add one entry to leaf-list user order"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><y0>a</y0></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><y0 xmlns="urn:example:clixon">a</y0></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf commit"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "add one entry to leaf-list user order after commit"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><y0>0</y0></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><y0 xmlns="urn:example:clixon">0</y0></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf commit"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "verify leaf-list user order in running (as entered)"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><running/></source><filter type=\"xpath\" select=\"/y0\"/></get-config></rpc>]]>]]>" "^<rpc-reply><data><y0>c</y0><y0>b</y0><y0>a</y0><y0>0</y0></data></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get-config><source><running/></source><filter type="xpath" select="/y0"/></get-config></rpc>]]>]]>' '^<rpc-reply><data><y0 xmlns="urn:example:clixon">c</y0><y0 xmlns="urn:example:clixon">b</y0><y0 xmlns="urn:example:clixon">a</y0><y0 xmlns="urn:example:clixon">0</y0></data></rpc-reply>]]>]]>$'
 
 # LISTS
 
 new "add two entries to list user order"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><y2><k>c</k><a>bar</a></y2><y2><k>b</k><a>foo</a></y2></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><y2 xmlns="urn:example:clixon"><k>c</k><a>bar</a></y2><y2 xmlns="urn:example:clixon"><k>b</k><a>foo</a></y2></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "add one entry to list user order"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><y2><k>a</k><a>fie</a></y2></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><y2 xmlns="urn:example:clixon"><k>a</k><a>fie</a></y2></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "verify list user order (as entered)"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source><filter type=\"xpath\" select=\"/y2\"/></get-config></rpc>]]>]]>" "^<rpc-reply><data><y2><k>c</k><a>bar</a></y2><y2><k>b</k><a>foo</a></y2><y2><k>a</k><a>fie</a></y2></data></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get-config><source><candidate/></source><filter type="xpath" select="/y2"/></get-config></rpc>]]>]]>' '^<rpc-reply><data><y2 xmlns="urn:example:clixon"><k>c</k><a>bar</a></y2><y2 xmlns="urn:example:clixon"><k>b</k><a>foo</a></y2><y2 xmlns="urn:example:clixon"><k>a</k><a>fie</a></y2></data></rpc-reply>]]>]]>$'
 
 if [ $BE -eq 0 ]; then
     exit # BE
diff --git a/test/test_perf.sh b/test/test_perf.sh
index 4d9d6dfc..eb1fe687 100755
--- a/test/test_perf.sh
+++ b/test/test_perf.sh
@@ -83,7 +83,7 @@ sudo su -c "$clixon_restconf -f $cfg -y $fyang -D $DBG" -s /bin/sh www-data &
 sleep $RCWAIT
 
 new "generate 'large' config with $number list entries"
-echo -n "<rpc><edit-config><target><candidate/></target><config><x>" > $fconfig
+echo -n "<rpc><edit-config><target><candidate/></target><config><x xmlns=\"urn:example:clixon\">" > $fconfig
 for (( i=0; i<$number; i++ )); do  
     echo -n "<y><a>$i</a><b>$i</b></y>" >> $fconfig
 done
@@ -111,7 +111,7 @@ new "netconf commit large config again"
 expecteof "time -f %e $clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$" 
 
 new "netconf add small (1 entry) config"
-expecteof "time -f %e $clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><x><y><a>x</a><b>y</b></y></x></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$" 
+expecteof "time -f %e $clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><x xmlns="urn:example:clixon"><y><a>x</a><b>y</b></y></x></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$" 
 
 new "netconf get $req small config"
 time -p for (( i=0; i<$req; i++ )); do
@@ -128,7 +128,7 @@ done
 new "netconf add $req small config"
 time -p for (( i=0; i<$req; i++ )); do
     rnd=$(( ( RANDOM % $number ) ))
-    echo "<rpc><edit-config><target><candidate/></target><config><x><y><a>$rnd</a><b>$rnd</b></y></x></config></edit-config></rpc>]]>]]>"
+    echo "<rpc><edit-config><target><candidate/></target><config><x xmlns=\"urn:example:clixon\"><y><a>$rnd</a><b>$rnd</b></y></x></config></edit-config></rpc>]]>]]>"
 done | $clixon_netconf -qf $cfg  -y $fyang > /dev/null
 
 new "netconf add $req restconf small config"
@@ -138,10 +138,10 @@ time -p for (( i=0; i<$req; i++ )); do
 done 
 
 new "netconf get large config"
-expecteof "time -f %e $clixon_netconf -qf $cfg  -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data><x><y><a>0</a><b>0</b></y><y><a>1</a><b>1</b>"
+expecteof "time -f %e $clixon_netconf -qf $cfg  -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" '^<rpc-reply><data><x xmlns="urn:example:clixon"><y><a>0</a><b>0</b></y><y><a>1</a><b>1</b>'
 
 new "generate large leaf-list config"
-echo -n "<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><x>" > $fconfig
+echo -n "<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><x xmlns=\"urn:example:clixon\">" > $fconfig
 for (( i=0; i<$number; i++ )); do  
     echo -n "<c>$i</c>" >> $fconfig
 done
@@ -158,17 +158,17 @@ expecteof "time -f %e $clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc
 new "netconf add $req small leaf-list config"
 time -p for (( i=0; i<$req; i++ )); do
     rnd=$(( ( RANDOM % $number ) ))
-    echo "<rpc><edit-config><target><candidate/></target><config><x><c>$rnd</c></x></config></edit-config></rpc>]]>]]>"
+    echo "<rpc><edit-config><target><candidate/></target><config><x xmlns=\"urn:example:clixon\"><c>$rnd</c></x></config></edit-config></rpc>]]>]]>"
 done | $clixon_netconf -qf $cfg  -y $fyang > /dev/null
 
 new "netconf add small leaf-list config"
-expecteof "time -f %e $clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><x><c>x</c></x></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$" 
+expecteof "time -f %e $clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><x xmlns="urn:example:clixon"><c>x</c></x></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$" 
 
 new "netconf commit small leaf-list config"
 expecteof "time -f %e $clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$" 
 
 new "netconf get large leaf-list config"
-expecteof "time -f %e $clixon_netconf -qf $cfg  -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data><x><c>0</c><c>1</c>"
+expecteof "time -f %e $clixon_netconf -qf $cfg  -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" '^<rpc-reply><data><x xmlns="urn:example:clixon"><c>0</c><c>1</c>'
 
 new "Kill restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"
diff --git a/test/test_restconf.sh b/test/test_restconf.sh
index 1874a0b3..e7451d0a 100755
--- a/test/test_restconf.sh
+++ b/test/test_restconf.sh
@@ -76,7 +76,7 @@ module example{
 EOF
 
 # This is a fixed 'state' implemented in routing_backend. It is assumed to be always there
-state='{"state": {"op": "42"}}'
+state='{"example:state": {"op": "42"}}'
 
 new "test params: -f $cfg -y $fyang"
 if [ $BE -ne 0 ]; then
@@ -102,9 +102,6 @@ sleep $RCWAIT
 
 new "restconf tests"
 
-new2 "restconf rpc using POST json without mandatory element"
-expecteq "$(curl -s -X POST -d '{"input":{"wrongelement":"ipv4"}}' http://localhost/restconf/operations/ietf-routing:fib-route)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "wrongelement"},"error-severity": "error"}}}
'
-
 new2 "restconf root discovery. RFC 8040 3.1 (xml+xrd)"
 expecteq "$(curl  -s -X GET http://localhost/.well-known/host-meta)" "<XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'>
    <Link rel='restconf' href='/restconf'/>
@@ -119,13 +116,14 @@ new2 "restconf get restconf resource. RFC 8040 3.3 (xml)"
 expecteq "$(curl -s -H 'Accept: application/yang-data+xml' -G http://localhost/restconf)" '<restconf><data/><operations/><yang-library-version>2016-06-21</yang-library-version></restconf>
 
'
 
+# Should be alphabetically ordered
 new2 "restconf get restconf/operations. RFC8040 3.3.2 (json)"
-expecteq "$(curl -sG http://localhost/restconf/operations)" '{"operations": {"example:client-rpc": null,"ietf-routing:fib-route": null,"ietf-routing:route-count": null,"example:empty": null}}
+expecteq "$(curl -sG http://localhost/restconf/operations)" '{"operations": {"example:empty": null,"example:client-rpc": null}{"ietf-routing:fib-route": null,"ietf-routing:route-count": null}}
 
'
 
 new "restconf get restconf/operations. RFC8040 3.3.2 (xml)"
 ret=$(curl -s -H "Accept: application/yang-data+xml" -G http://localhost/restconf/operations)
-expect='<operations><client-rpc xmlns="urn:example:clixon"/><fib-route xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"/><route-count xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"/><empty xmlns="urn:example:clixon"/></operations>'
+expect='<operations><empty xmlns="urn:example:clixon"/><client-rpc xmlns="urn:example:clixon"/><fib-route xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"/><route-count xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"/></operations>'
 match=`echo $ret | grep -EZo "$expect"`
 if [ -z "$match" ]; then
     err "$expect" "$ret"
@@ -142,8 +140,8 @@ if [ -z "$match" ]; then
     err "$expect" "$ret"
 fi
 
-new2 "restconf schema resource, RFC 8040 sec 3.7 according to RFC 7895"
-expecteq "$(curl -s -H 'Accept: application/yang-data+json' -G http://localhost/restconf/data/ietf-yang-library:modules-state/module=ietf-routing,2014-10-26/)" '{"module": [{"name": "ietf-routing","revision": "2014-10-26","namespace": "urn:ietf:params:xml:ns:yang:ietf-routing","conformance-type": "implement"}]}
+new2 "restconf schema resource, RFC 8040 sec 3.7 according to RFC 7895 (explicit resource)"
+expecteq "$(curl -s -H 'Accept: application/yang-data+json' -G http://localhost/restconf/data/ietf-yang-library:modules-state/module=ietf-routing,2014-10-26/)" '{"ietf-yang-library:module": [{"name": "ietf-routing","revision": "2014-10-26","namespace": "urn:ietf:params:xml:ns:yang:ietf-routing","conformance-type": "implement"}]}
 
'
 
 new "restconf options. RFC 8040 4.1"
@@ -154,132 +152,133 @@ expectfn "curl -s -I http://localhost/restconf/data" 0 "HTTP/1.1 200 OK"
 #Content-Type: application/yang-data+json"
 
 new "restconf empty rpc"
-expecteq "$(curl -s -X POST -d {\"input\":null} http://localhost/restconf/operations/example:empty)" ""
+expecteq "$(curl -s -X POST -d {\"example:input\":null} http://localhost/restconf/operations/example:empty)" ""
 
 new2 "restconf empty rpc with extra args (should fail)"
-expecteq "$(curl -s -X POST -d {\"input\":{\"extra\":null}} http://localhost/restconf/operations/example:empty)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "extra"},"error-severity": "error"}}}
'
+expecteq "$(curl -s -X POST -d {\"example:input\":{\"extra\":null}} http://localhost/restconf/operations/example:empty)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "extra"},"error-severity": "error"}}}
'
 
 new2 "restconf get empty config + state json"
-expecteq "$(curl -sSG http://localhost/restconf/data/state)" '{"state": {"op": "42"}}
+expecteq "$(curl -sSG http://localhost/restconf/data/example:state)" '{"example:state": {"op": "42"}}
 
'
 
 new2 "restconf get empty config + state json + module"
-expecteq "$(curl -sSG http://localhost/restconf/data/example:state)" '{"state": {"op": "42"}}
+expecteq "$(curl -sSG http://localhost/restconf/data/example:state)" '{"example:state": {"op": "42"}}
 
'
 
 new2 "restconf get empty config + state json with wrong module name"
-expecteq "$(curl -sSG http://localhost/restconf/data/badmodule:state)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "No yang node found: badmodule:state"}}}
'
+expecteq "$(curl -sSG http://localhost/restconf/data/badmodule:state)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "No such yang module: badmodule"}}}
'
 
 new "restconf get empty config + state xml"
-ret=$(curl -s -H "Accept: application/yang-data+xml" -G http://localhost/restconf/data/state)
-expect="<state><op>42</op></state>"
+ret=$(curl -s -H "Accept: application/yang-data+xml" -G http://localhost/restconf/data/example:state)
+expect='<state xmlns="urn:example:clixon"><op>42</op></state>'
 match=`echo $ret | grep -EZo "$expect"`
 if [ -z "$match" ]; then
     err "$expect" "$ret"
 fi
 
 new2 "restconf get data/ json"
-expecteq "$(curl -s -G http://localhost/restconf/data/state/op=42)" '{"op": "42"}
+expecteq "$(curl -s -G http://localhost/restconf/data/example:state/op=42)" '{"example:op": "42"}
 
'
 
 new "restconf get state operation eth0 xml"
 # Cant get shell macros to work, inline matching from lib.sh
-ret=$(curl -s -H "Accept: application/yang-data+xml" -G http://localhost/restconf/data/state/op=42)
-expect="<op>42</op>"
+ret=$(curl -s -H "Accept: application/yang-data+xml" -G http://localhost/restconf/data/example:state/op=42)
+expect='<op xmlns="urn:example:clixon">42</op>'
 match=`echo $ret | grep -EZo "$expect"`
 if [ -z "$match" ]; then
     err "$expect" "$ret"
 fi
 
 new2 "restconf get state operation eth0 type json"
-expecteq "$(curl -s -G http://localhost/restconf/data/state/op=42)" '{"op": "42"}
+expecteq "$(curl -s -G http://localhost/restconf/data/example:state/op=42)" '{"example:op": "42"}
 
'
 
 new "restconf get state operation eth0 type xml"
 # Cant get shell macros to work, inline matching from lib.sh
-ret=$(curl -s -H "Accept: application/yang-data+xml" -G http://localhost/restconf/data/state/op=42)
-expect="<op>42</op>"
+ret=$(curl -s -H "Accept: application/yang-data+xml" -G http://localhost/restconf/data/example:state/op=42)
+expect='<op xmlns="urn:example:clixon">42</op>'
 match=`echo $ret | grep -EZo "$expect"`
 if [ -z "$match" ]; then
     err "$expect" "$ret"
 fi
 
 new2 "restconf GET datastore"
-expecteq "$(curl -s -X GET http://localhost/restconf/data/state)" '{"state": {"op": "42"}}
+expecteq "$(curl -s -X GET http://localhost/restconf/data/example:state)" '{"example:state": {"op": "42"}}
 
'
 
 # Exact match
 new "restconf Add subtree to datastore using POST"
-expectfn 'curl -s -i -X POST -H "Accept: application/yang-data+json" -d {"interfaces":{"interface":{"name":"eth/0/0","type":"ex:eth","enabled":true}}} http://localhost/restconf/data' 0 'HTTP/1.1 200 OK'
+expectfn 'curl -s -i -X POST -H "Accept: application/yang-data+json" -d {"ietf-interfaces:interfaces":{"interface":{"name":"eth/0/0","type":"ex:eth","enabled":true}}} http://localhost/restconf/data' 0 'HTTP/1.1 200 OK'
 
 new "restconf Re-add subtree which should give error"
-expectfn 'curl -s -X POST -d {"interfaces":{"interface":{"name":"eth/0/0","type":"ex:eth","enabled":true}}} http://localhost/restconf/data' 0 '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "data-exists","error-severity": "error","error-message": "Data already exists; cannot create new resource"}}}'
+expectfn 'curl -s -X POST -d {"ietf-interfaces:interfaces":{"interface":{"name":"eth/0/0","type":"ex:eth","enabled":true}}} http://localhost/restconf/data' 0 '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "data-exists","error-severity": "error","error-message": "Data already exists; cannot create new resource"}}}'
 
 # XXX Cant get this to work
 #expecteq "$(curl -s -X POST -d {\"interfaces\":{\"interface\":{\"name\":\"eth/0/0\",\"type\":\"ex:eth\",\"enabled\":true}}} http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "data-exists","error-severity": "error","error-message": "Data already exists; cannot create new resource"}}}'
 
 new "restconf Check interfaces eth/0/0 added"
-expectfn "curl -s -G http://localhost/restconf/data" 0 '{"interfaces": {"interface": \[{"name": "eth/0/0","type": "ex:eth","enabled": true}\]},"state": {"op": "42"}}
-
'
+expectfn "curl -s -G http://localhost/restconf/data" 0 '"ietf-interfaces:interfaces": {"interface": \[{"name": "eth/0/0","type": "ex:eth","enabled": true}\]}'
 
 new "restconf delete interfaces"
-expecteq $(curl -s -X DELETE  http://localhost/restconf/data/interfaces) ""
+expecteq $(curl -s -X DELETE  http://localhost/restconf/data/ietf-interfaces:interfaces) ""
 
 new "restconf Check empty config"
-expectfn "curl -sG http://localhost/restconf/data/state" 0 "$state"
+expectfn "curl -sG http://localhost/restconf/data/example:state" 0 "$state"
 
+# XXX: gives  <interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
+#      <interface xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
 new "restconf Add interfaces subtree eth/0/0 using POST"
-expectfn 'curl -s -X POST -d {"interface":{"name":"eth/0/0","type":"ex:eth","enabled":true}} http://localhost/restconf/data/interfaces' 0 ""
+expectfn 'curl -s -X POST -d {"ietf-interfaces:interface":{"name":"eth/0/0","type":"ex:eth","enabled":true}} http://localhost/restconf/data/ietf-interfaces:interfaces' 0 ""
 # XXX cant get this to work
 #expecteq "$(curl -s -X POST -d '{"interface":{"name":"eth/0/0","type\":"ex:eth","enabled":true}}' http://localhost/restconf/data/interfaces)" ""
 
 new2 "restconf Check eth/0/0 added config"
-expecteq "$(curl -s -G http://localhost/restconf/data/interfaces)" '{"interfaces": {"interface": [{"name": "eth/0/0","type": "ex:eth","enabled": true}]}}
+expecteq "$(curl -s -G http://localhost/restconf/data/ietf-interfaces:interfaces)" '{"ietf-interfaces:interfaces": {"interface": [{"name": "eth/0/0","type": "ex:eth","enabled": true}]}}
 
'
 
 new2 "restconf Check eth/0/0 added state"
-expecteq "$(curl -s -G http://localhost/restconf/data/state)" '{"state": {"op": "42"}}
+expecteq "$(curl -s -G http://localhost/restconf/data/example:state)" '{"example:state": {"op": "42"}}
 
'
 
 new2 "restconf Re-post eth/0/0 which should generate error"
-expecteq "$(curl -s -X POST -d '{"interface":{"name":"eth/0/0","type":"ex:eth","enabled":true}}' http://localhost/restconf/data/interfaces)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "data-exists","error-severity": "error","error-message": "Data already exists; cannot create new resource"}}}
'
+expecteq "$(curl -s -X POST -d '{"ietf-interfaces:interface":{"name":"eth/0/0","type":"ex:eth","enabled":true}}' http://localhost/restconf/data/ietf-interfaces:interfaces)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "data-exists","error-severity": "error","error-message": "Data already exists; cannot create new resource"}}}
'
 
 new "Add leaf description using POST"
-expecteq "$(curl -s -X POST -d '{"description":"The-first-interface"}' http://localhost/restconf/data/interfaces/interface=eth%2f0%2f0)" ""
+expecteq "$(curl -s -X POST -d '{"ietf-interfaces:description":"The-first-interface"}' http://localhost/restconf/data/ietf-interfaces:interfaces/interface=eth%2f0%2f0)" ""
 
 new "Add nothing using POST"
-expectfn 'curl -s -X POST http://localhost/restconf/data/interfaces/interface=eth%2f0%2f0' 0 '"ietf-restconf:errors" : {"error": {"error-type": "rpc","error-tag": "malformed-message","error-severity": "error","error-message": " on line 1: syntax error at or before:'
+expectfn 'curl -s -X POST http://localhost/restconf/data/ietf-interfaces:interfaces/interface=eth%2f0%2f0' 0 '"ietf-restconf:errors" : {"error": {"error-type": "rpc","error-tag": "malformed-message","error-severity": "error","error-message": " on line 1: syntax error at or before:'
 
 new2 "restconf Check description added"
-expecteq "$(curl -s -G http://localhost/restconf/data/interfaces)" '{"interfaces": {"interface": [{"name": "eth/0/0","description": "The-first-interface","type": "ex:eth","enabled": true}]}}
+expecteq "$(curl -s -G http://localhost/restconf/data/ietf-interfaces:interfaces)" '{"ietf-interfaces:interfaces": {"interface": [{"name": "eth/0/0","description": "The-first-interface","type": "ex:eth","enabled": true}]}}
 
'
 
 new "restconf delete eth/0/0"
-expecteq "$(curl -s -X DELETE  http://localhost/restconf/data/interfaces/interface=eth%2f0%2f0)" ""
+expecteq "$(curl -s -X DELETE  http://localhost/restconf/data/ietf-interfaces:interfaces/interface=eth%2f0%2f0)" ""
 
 new "Check deleted eth/0/0"
 expectfn 'curl -s -G http://localhost/restconf/data' 0 $state
 
 new2 "restconf Re-Delete eth/0/0 using none should generate error"
-expecteq "$(curl -s -X DELETE  http://localhost/restconf/data/interfaces/interface=eth%2f0%2f0)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "data-missing","error-severity": "error","error-message": "Data does not exist; cannot delete resource"}}}
'
+expecteq "$(curl -s -X DELETE  http://localhost/restconf/data/ietf-interfaces:interfaces/interface=eth%2f0%2f0)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "data-missing","error-severity": "error","error-message": "Data does not exist; cannot delete resource"}}}
'
 
 new "restconf Add subtree eth/0/0 using PUT"
-expecteq "$(curl -s -X PUT -d '{"interface":{"name":"eth/0/0","type":"ex:eth","enabled":true}}' http://localhost/restconf/data/interfaces/interface=eth%2f0%2f0)" ""
+expecteq "$(curl -s -X PUT -d '{"ietf-interfaces:interface":{"name":"eth/0/0","type":"ex:eth","enabled":true}}' http://localhost/restconf/data/ietf-interfaces:interfaces/interface=eth%2f0%2f0)" ""
 
 new2 "restconf get subtree"
-expecteq "$(curl -s -G http://localhost/restconf/data/interfaces)" '{"interfaces": {"interface": [{"name": "eth/0/0","type": "ex:eth","enabled": true}]}}
+expecteq "$(curl -s -G http://localhost/restconf/data/ietf-interfaces:interfaces)" '{"ietf-interfaces:interfaces": {"interface": [{"name": "eth/0/0","type": "ex:eth","enabled": true}]}}
 
'
 
 new2 "restconf rpc using POST json"
-expecteq "$(curl -s -X POST -d '{"input":{"routing-instance-name":"ipv4","destination-address":{"address-family":"ipv6"}}}' http://localhost/restconf/operations/ietf-routing:fib-route)" '{"output": {"route": {"address-family": "ipv4","next-hop": {"next-hop-list": "2.3.4.5"},"source-protocol": "static"}}}
+expecteq "$(curl -s -X POST -d '{"ietf-routing:input":{"routing-instance-name":"ipv4","destination-address":{"address-family":"ipv6"}}}' http://localhost/restconf/operations/ietf-routing:fib-route)" '{"ietf-routing:output": {"route": {"address-family": "ipv4","next-hop": {"next-hop-list": "2.3.4.5"},"source-protocol": "static"}}}
 
'
 
 # Cant get this to work due to quoting
 #new2 "restconf rpc using POST wrong JSON"
-#expecteq "$(curl -s -X POST -d '{"input":{"routing-instance-name":ipv4}}' http://localhost/restconf/operations/ietf-routing:fib-route)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": " on line 1: syntax error at or before: i"}}}
'
+#expecteq "$(curl -s -X POST -d '{"ietf-routing:input":{"routing-instance-name":ipv4}}' http://localhost/restconf/operations/ietf-routing:fib-route)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": " on line 1: syntax error at or before: i"}}}
'
 
 new2 "restconf rpc using POST json without mandatory element"
-expecteq "$(curl -s -X POST -d '{"input":{"wrongelement":"ipv4"}}' http://localhost/restconf/operations/ietf-routing:fib-route)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "wrongelement"},"error-severity": "error"}}}
'
+expecteq "$(curl -s -X POST -d '{"ietf-routing:input":{"wrongelement":"ipv4"}}' http://localhost/restconf/operations/ietf-routing:fib-route)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "wrongelement"},"error-severity": "error"}}}
'
 
 new2 "restconf rpc non-existing rpc without namespace"
 expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations/kalle)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "kalle"},"error-severity": "error","error-message": "RPC not defined"}}}
'
@@ -291,29 +290,29 @@ new2 "restconf rpc missing name"
 expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "Operation name expected"}}}
'
 
 new2 "restconf rpc missing input"
-expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations/ietf-routing:fib-route)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "routing-instance-name"},"error-severity": "error","error-message": "Mandatory variable"}}}
'
+expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations/ietf-routing:fib-route)" '{"ietf-restconf:errors" : {"error": {"error-type": "rpc","error-tag": "malformed-message","error-severity": "error","error-message": "restconf RPC does not have input statement"}}}
'
 
 new "restconf rpc using POST xml"
-ret=$(curl -s -X POST -H "Accept: application/yang-data+xml" -d '{"input":{"routing-instance-name":"ipv4"}}' http://localhost/restconf/operations/ietf-routing:fib-route)
-expect="<output><route><address-family>ipv4</address-family><next-hop><next-hop-list>2.3.4.5</next-hop-list></next-hop><source-protocol>static</source-protocol></route></output>"
+ret=$(curl -s -X POST -H "Accept: application/yang-data+xml" -d '{"ietf-routing:input":{"routing-instance-name":"ipv4"}}' http://localhost/restconf/operations/ietf-routing:fib-route)
+expect='<output xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"><route><address-family>ipv4</address-family><next-hop><next-hop-list>2.3.4.5</next-hop-list></next-hop><source-protocol>static</source-protocol></route></output>'
 match=`echo $ret | grep -EZo "$expect"`
 if [ -z "$match" ]; then
     err "$expect" "$ret"
 fi
 
 new2 "restconf rpc using wrong prefix"
-expecteq "$(curl -s -X POST -d '{"input":{"routing-instance-name":"ipv4"}}' http://localhost/restconf/operations/wrong:fib-route)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "yang module not found"}}}
'
+expecteq "$(curl -s -X POST -d '{"wrong:input":{"routing-instance-name":"ipv4"}}' http://localhost/restconf/operations/wrong:fib-route)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "yang module not found"}}}
'
 
 new "restconf local client rpc using POST xml"
-ret=$(curl -s -X POST -H "Accept: application/yang-data+xml" -d '{"input":{"request":"example"}}' http://localhost/restconf/operations/example:client-rpc)
-expect="<output><result>ok</result></output>"
+ret=$(curl -s -X POST -H "Accept: application/yang-data+xml" -d '{"example:input":{"request":"example"}}' http://localhost/restconf/operations/example:client-rpc)
+expect='<output xmlns="urn:example:clixon"><result>ok</result></output>'
 match=`echo $ret | grep -EZo "$expect"`
 if [ -z "$match" ]; then
     err "$expect" "$ret"
 fi
 
 # XXX cant get -H to work
-#expecteq 'curl -s -X POST -H "Accept: application/yang-data+xml" -d {"input":{"routing-instance-name":"ipv4"}} http://localhost/restconf/operations/ietf-routing:fib-route' '<output><route><address-family>ipv4</address-family><next-hop><next-hop-list>2.3.4.5</next-hop-list></next-hop></route></output>'
+#expecteq 'curl -s -X POST -H "Accept: application/yang-data+xml" -d {"ietf-routing:input":{"routing-instance-name":"ipv4"}} http://localhost/restconf/operations/ietf-routing:fib-route' '<output><route><address-family>ipv4</address-family><next-hop><next-hop-list>2.3.4.5</next-hop-list></next-hop></route></output>'
 
 # Cant get shell macros to work, inline matching from lib.sh
 
diff --git a/test/test_restconf2.sh b/test/test_restconf2.sh
index 1cf7188f..68677250 100755
--- a/test/test_restconf2.sh
+++ b/test/test_restconf2.sh
@@ -72,73 +72,82 @@ sleep $RCWAIT
 new "restconf tests"
 
 new "restconf POST initial tree"
-expectfn 'curl -s -X POST -d {"cont1":{"interface":{"name":"local0","type":"regular"}}} http://localhost/restconf/data' 0 ""
+expectfn 'curl -s -X POST -d {"example:cont1":{"interface":{"name":"local0","type":"regular"}}} http://localhost/restconf/data' 0 ""
 
 new "restconf GET datastore intial"
-expectfn "curl -s -X GET http://localhost/restconf/data/cont1" 0 '{"cont1": {"interface": \[{"name": "local0","type": "regular"}\]}}'
+expectfn "curl -s -X GET http://localhost/restconf/data/example:cont1" 0 '{"example:cont1": {"interface": \[{"name": "local0","type": "regular"}\]}}'
 
-new "restconf GET interface"
-expectfn "curl -s -X GET http://localhost/restconf/data/cont1/interface=local0" 0 '{"interface": \[{"name": "local0","type": "regular"}\]}'
+new "restconf GET interface subtree"
+expectfn "curl -s -X GET http://localhost/restconf/data/example:cont1/interface=local0" 0 '{"example:interface": \[{"name": "local0","type": "regular"}\]}'
+
+new "restconf GET interface subtree xml"
+ret=$(curl -s -H "Accept: application/yang-data+xml" -G http://localhost/restconf/data/example:cont1/interface=local0)
+expect='<interface xmlns="urn:example:clixon"><name>local0</name><type>regular</type></interface>'
+match=`echo $ret | grep -EZo "$expect"`
+if [ -z "$match" ]; then
+    err "$expect" "$ret"
+fi
 
 new "restconf GET if-type"
-expectfn "curl -s -X GET http://localhost/restconf/data/cont1/interface=local0/type" 0 '{"type": "regular"}'
+expectfn "curl -s -X GET http://localhost/restconf/data/example:cont1/interface=local0/type" 0 '{"example:type": "regular"}'
 
 new "restconf POST interface without mandatory type"
-expectfn 'curl -s -X POST -d {"interface":{"name":"TEST"}} http://localhost/restconf/data/cont1' 0 '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "type"},"error-severity": "error","error-message": "Mandatory variable"}}}
'
+expectfn 'curl -s -X POST -d {"interface":{"name":"TEST"}} http://localhost/restconf/data/example:cont1' 0 '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "type"},"error-severity": "error","error-message": "Mandatory variable"}}}
'
 
 new "restconf POST interface"
-expectfn 'curl -s -X POST -d {"interface":{"name":"TEST","type":"eth0"}} http://localhost/restconf/data/cont1' 0 ""
+expectfn 'curl -s -X POST -d {"example:interface":{"name":"TEST","type":"eth0"}} http://localhost/restconf/data/example:cont1' 0 ""
 
+# XXX should it be example:interface?
 new2 "restconf POST again"
-expecteq "$(curl -s -X POST -d '{"interface":{"name":"TEST","type":"eth0"}}' http://localhost/restconf/data/cont1)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "data-exists","error-severity": "error","error-message": "Data already exists; cannot create new resource"}}}
'
+expecteq "$(curl -s -X POST -d '{"interface":{"name":"TEST","type":"eth0"}}' http://localhost/restconf/data/example:cont1)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "data-exists","error-severity": "error","error-message": "Data already exists; cannot create new resource"}}}
'
 
 new2 "restconf POST from top"
-expecteq "$(curl -s -X POST -d '{"cont1":{"interface":{"name":"TEST","type":"eth0"}}}' http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "data-exists","error-severity": "error","error-message": "Data already exists; cannot create new resource"}}}
'
+expecteq "$(curl -s -X POST -d '{"example:cont1":{"interface":{"name":"TEST","type":"eth0"}}}' http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "data-exists","error-severity": "error","error-message": "Data already exists; cannot create new resource"}}}
'
 
 new "restconf DELETE"
-expectfn 'curl -s -X DELETE http://localhost/restconf/data/cont1' 0 ""
+expectfn 'curl -s -X DELETE http://localhost/restconf/data/example:cont1' 0 ""
 
 new "restconf GET null datastore"
-expectfn "curl -s -X GET http://localhost/restconf/data/cont1" 0 'null'
+expectfn "curl -s -X GET http://localhost/restconf/data/example:cont1" 0 'null'
 
 new "restconf POST initial tree"
-expectfn 'curl -s -X POST -d {"cont1":{"interface":{"name":"local0","type":"regular"}}} http://localhost/restconf/data' 0 ""
+expectfn 'curl -s -X POST -d {"example:cont1":{"interface":{"name":"local0","type":"regular"}}} http://localhost/restconf/data' 0 ""
 
 new "restconf GET initial tree"
-expectfn "curl -s -X GET http://localhost/restconf/data/cont1" 0 '{"cont1": {"interface": \[{"name": "local0","type": "regular"}\]}}'
+expectfn "curl -s -X GET http://localhost/restconf/data/example:cont1" 0 '{"example:cont1": {"interface": \[{"name": "local0","type": "regular"}\]}}'
 
 new "restconf DELETE whole datastore"
 expectfn 'curl -s -X DELETE http://localhost/restconf/data' 0 ""
 
 new "restconf GET null datastore"
-expectfn "curl -s -X GET http://localhost/restconf/data/cont1" 0 'null'
+expectfn "curl -s -X GET http://localhost/restconf/data/example:cont1" 0 'null'
 
 new "restconf PUT initial datastore" 
-expectfn 'curl -s -X PUT -d {"data":{"cont1":{"interface":{"name":"local0","type":"regular"}}}} http://localhost/restconf/data' 0 ""
+expectfn 'curl -s -X PUT -d {"data":{"example:cont1":{"interface":{"name":"local0","type":"regular"}}}} http://localhost/restconf/data' 0 ""
 
 new "restconf GET datastore"
-expectfn "curl -s -X GET http://localhost/restconf/data/cont1" 0 '{"cont1": {"interface": \[{"name": "local0","type": "regular"}\]}}'
+expectfn "curl -s -X GET http://localhost/restconf/data/example:cont1" 0 '{"example:cont1": {"interface": \[{"name": "local0","type": "regular"}\]}}'
 
 new "restconf PUT replace datastore" 
-expectfn 'curl -s -X PUT -d {"data":{"cont2":{"name":"foo"}}} http://localhost/restconf/data' 0 ""
+expectfn 'curl -s -X PUT -d {"data":{"example:cont2":{"name":"foo"}}} http://localhost/restconf/data' 0 ""
 
 new "restconf GET replaced datastore"
-expectfn "curl -s -X GET http://localhost/restconf/data/cont2" 0 '{"cont2": {"name": "foo"}}'
+expectfn "curl -s -X GET http://localhost/restconf/data/example:cont2" 0 '{"example:cont2": {"name": "foo"}}'
 
 new "restconf PUT initial datastore again" 
-expectfn 'curl -s -X PUT -d {"data":{"cont1":{"interface":{"name":"local0","type":"regular"}}}} http://localhost/restconf/data' 0 ""
+expectfn 'curl -s -X PUT -d {"data":{"example:cont1":{"interface":{"name":"local0","type":"regular"}}}} http://localhost/restconf/data' 0 ""
 
 new "restconf PUT change interface"
-expectfn 'curl -s -X PUT -d {"interface":{"name":"local0","type":"atm0"}} http://localhost/restconf/data/cont1/interface=local0' 0 ""
+expectfn 'curl -s -X PUT -d {"interface":{"name":"local0","type":"atm0"}} http://localhost/restconf/data/example:cont1/interface=local0' 0 ""
 
 new "restconf GET datastore atm"
-expectfn "curl -s -X GET http://localhost/restconf/data/cont1" 0 '{"cont1": {"interface": \[{"name": "local0","type": "atm0"}\]}}'
+expectfn "curl -s -X GET http://localhost/restconf/data/example:cont1" 0 '{"example:cont1": {"interface": \[{"name": "local0","type": "atm0"}\]}}'
 
 new "restconf PUT add interface"
-expectfn 'curl -s -X PUT -d {"interface":{"name":"TEST","type":"eth0"}} http://localhost/restconf/data/cont1/interface=TEST' 0 ""
+expectfn 'curl -s -X PUT -d {"interface":{"name":"TEST","type":"eth0"}} http://localhost/restconf/data/example:cont1/interface=TEST' 0 ""
 
 new "restconf PUT change key error"
-expectfn 'curl -is -X PUT -d {"interface":{"name":"ALPHA","type":"eth0"}} http://localhost/restconf/data/cont1/interface=TEST' 0 '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "api-path keys do not match data keys"}}}'
+expectfn 'curl -is -X PUT -d {"interface":{"name":"ALPHA","type":"eth0"}} http://localhost/restconf/data/example:cont1/interface=TEST' 0 '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "api-path keys do not match data keys"}}}'
 
 new "Kill restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"
diff --git a/test/test_rpc.sh b/test/test_rpc.sh
index f28a4df9..f033dfb0 100755
--- a/test/test_rpc.sh
+++ b/test/test_rpc.sh
@@ -53,50 +53,70 @@ sleep $RCWAIT
 new "rpc tests"
 
 # 1.First some positive tests vary media types
-#
+# extra complex because pattern matching on return haders
+new "restconf empty rpc"
+ret=$(curl -is -X POST http://localhost/restconf/operations/example:empty)
+expect="204 No Content"
+match=`echo $ret | grep -EZo "$expect"`
+if [ -z "$match" ]; then
+    err "$expect" "$ret"
+fi
+
+new "netconf empty rpc"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><empty xmlns="urn:example:clixon"/></rpc>]]>]]>' '^<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><ok/></rpc-reply>]]>]]>$'
+
 new2 "restconf example rpc json/json default - no http media headers"
-expecteq "$(curl -s -X POST -d '{"input":{"x":"0"}}' http://localhost/restconf/operations/example:example)" '{"output": {"x": "0","y": "42"}}
+expecteq "$(curl -s -X POST -d '{"example:input":{"x":0}}' http://localhost/restconf/operations/example:example)" '{"example:output": {"x": "0","y": "42"}}
 
'
 
 new2 "restconf example rpc json/json change y default"
-expecteq "$(curl -s -X POST -d '{"input":{"x":"0","y":"99"}}' http://localhost/restconf/operations/example:example)" '{"output": {"x": "0","y": "99"}}
+expecteq "$(curl -s -X POST -d '{"example:input":{"x":"0","y":"99"}}' http://localhost/restconf/operations/example:example)" '{"example:output": {"x": "0","y": "99"}}
 
'
 
 new2 "restconf example rpc json/json"
 # XXX example:input example:output
-expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+json' -H 'Content-Type: application/yang-data+json' -d '{"input":{"x":"0"}}' http://localhost/restconf/operations/example:example)" '{"output": {"x": "0","y": "42"}}
+expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+json' -H 'Content-Type: application/yang-data+json' -d '{"example:input":{"x":"0"}}' http://localhost/restconf/operations/example:example)" '{"example:output": {"x": "0","y": "42"}}
 
'
 
 new2 "restconf example rpc xml/json"
-expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+xml' -H 'Content-Type: application/yang-data+json' -d '<input xmlns="urn:example:clixon"><x>0</x></input>' http://localhost/restconf/operations/example:example)"  '{"output": {"x": "0","y": "42"}}
+expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+xml' -H 'Content-Type: application/yang-data+json' -d '<input xmlns="urn:example:clixon"><x>0</x></input>' http://localhost/restconf/operations/example:example)"  '{"example:output": {"x": "0","y": "42"}}
 
'
 
 new2 "restconf example rpc json/xml"
-# <output xmlns="rn:example:clixon"
-expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+json' -H 'Accept: application/yang-data+xml' -d '{"input":{"x":"0"}}' http://localhost/restconf/operations/example:example)" '<output><x>0</x><y>42</y></output>
+expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+json' -H 'Accept: application/yang-data+xml' -d '{"example:input":{"x":"0"}}' http://localhost/restconf/operations/example:example)" '<output xmlns="urn:example:clixon"><x>0</x><y>42</y></output>
 
'
 
 new2 "restconf example rpc xml/xml"
-# <output xmlns="rn:example:clixon"
-expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+xml' -H 'Accept: application/yang-data+xml'  -d '<input xmlns="urn:example:clixon"><x>0</x></input>' http://localhost/restconf/operations/example:example)" '<output><x>0</x><y>42</y></output>
+expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+xml' -H 'Accept: application/yang-data+xml' -d '<input xmlns="urn:example:clixon"><x>0</x></input>' http://localhost/restconf/operations/example:example)" '<output xmlns="urn:example:clixon"><x>0</x><y>42</y></output>
 
'
 
 new "netconf example rpc"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><example><x>0</x></example></rpc>]]>]]>' '^<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><x>0</x><y>42</y></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><example xmlns="urn:example:clixon"><x>0</x></example></rpc>]]>]]>' '^<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><x xmlns="urn:example:clixon">0</x><y xmlns="urn:example:clixon">42</y></rpc-reply>]]>]]>$'
 
 # 2. Then error cases
 #
+new "restconf empy rpc with null input"
+ret=$(curl -is -X POST -d '{"example:input":null}' http://localhost/restconf/operations/example:empty)
+expect="204 No Content"
+match=`echo $ret | grep -EZo "$expect"`
+if [ -z "$match" ]; then
+    err "$expect" "$ret"
+fi
+
+new2 "restconf empy rpc with input x"
+expecteq "$(curl -s -X POST -d '{"example:input":{"x":0}}' http://localhost/restconf/operations/example:empty)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "x"},"error-severity": "error"}}}
'
+
 new2 "restconf omit mandatory"
-expecteq "$(curl -s -X POST -d '{"input":null}' http://localhost/restconf/operations/example:example)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "x"},"error-severity": "error","error-message": "Mandatory variable"}}}
'
+expecteq "$(curl -s -X POST -d '{"example:input":null}' http://localhost/restconf/operations/example:example)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "x"},"error-severity": "error","error-message": "Mandatory variable"}}}
'
 
 new2 "restconf add extra"
-expecteq "$(curl -s -X POST -d '{"input":{"x":"0","extra":"0"}}' http://localhost/restconf/operations/example:example)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "extra"},"error-severity": "error"}}}
'
+expecteq "$(curl -s -X POST -d '{"example:input":{"x":"0","extra":"0"}}' http://localhost/restconf/operations/example:example)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "extra"},"error-severity": "error"}}}
'
 
 new2 "restconf wrong method"
-expecteq "$(curl -s -X POST -d '{"input":{"x":"0"}}' http://localhost/restconf/operations/example:wrong)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "wrong"},"error-severity": "error","error-message": "RPC not defined"}}}
'
+expecteq "$(curl -s -X POST -d '{"example:input":{"x":"0"}}' http://localhost/restconf/operations/example:wrong)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "wrong"},"error-severity": "error","error-message": "RPC not defined"}}}
'
 
 new2 "restconf edit-config missing mandatory"
-expecteq "$(curl -s -X POST -d '{"input":null}' http://localhost/restconf/operations/ietf-netconf:edit-config)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "yang module not found"}}}
'
+expecteq "$(curl -s -X POST -d '{"example:input":null}' http://localhost/restconf/operations/ietf-netconf:edit-config)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "yang module not found"}}}
'
 
 new "netconf kill-session missing session-id mandatory"
 expecteof "$clixon_netconf -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><kill-session/></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>missing-element</error-tag><error-info><bad-element>session-id</bad-element></error-info><error-severity>error</error-severity><error-message>Mandatory variable</error-message></rpc-error></rpc-reply>]]>]]>$'
diff --git a/test/test_startup.sh b/test/test_startup.sh
index d9ec5b07..ab0acb0f 100755
--- a/test/test_startup.sh
+++ b/test/test_startup.sh
@@ -41,7 +41,7 @@ run(){
     dbdir=$dir/db
     cat <<EOF > $dbdir
 <config>
-   <interfaces>
+   <interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
       <interface>
          <name>run</name>
          <type>ex:eth</type>
@@ -53,7 +53,7 @@ EOF
 
     cat <<EOF > $dbdir
 <config>
-   <interfaces>
+   <interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
       <interface>
          <name>startup</name>
          <type>ex:eth</type>
@@ -65,7 +65,7 @@ EOF
 
     cat <<EOF > $dir/config
 <config>
-   <interfaces>
+   <interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
       <interface>
          <name>extra</name>
          <type>ex:eth</type>
@@ -104,8 +104,8 @@ EOF
 }
 
 run init    '<data/>'
-run none    '<data><interfaces><interface><name>run</name><type>ex:eth</type><enabled>true</enabled></interface></interfaces></data>'
-run running '<data><interfaces><interface><name>extra</name><type>ex:eth</type><enabled>true</enabled></interface><interface><name>lo</name><type>ex:loopback</type><enabled>true</enabled></interface><interface><name>run</name><type>ex:eth</type><enabled>true</enabled></interface></interfaces></data>'
-run startup '<data><interfaces><interface><name>extra</name><type>ex:eth</type><enabled>true</enabled></interface><interface><name>lo</name><type>ex:loopback</type><enabled>true</enabled></interface><interface><name>startup</name><type>ex:eth</type><enabled>true</enabled></interface></interfaces></data>'
+run none    '<data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>run</name><type>ex:eth</type><enabled>true</enabled></interface></interfaces></data>'
+run running '<data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>extra</name><type>ex:eth</type><enabled>true</enabled></interface><interface><name>lo</name><type>ex:loopback</type><enabled>true</enabled></interface><interface><name>run</name><type>ex:eth</type><enabled>true</enabled></interface></interfaces></data>'
+run startup '<data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>extra</name><type>ex:eth</type><enabled>true</enabled></interface><interface><name>lo</name><type>ex:loopback</type><enabled>true</enabled></interface><interface><name>startup</name><type>ex:eth</type><enabled>true</enabled></interface></interfaces></data>'
 
 rm -rf $dir
diff --git a/test/test_stream.sh b/test/test_stream.sh
index 87932744..2673b832 100755
--- a/test/test_stream.sh
+++ b/test/test_stream.sh
@@ -65,7 +65,7 @@ EOF
 # using reportingEntity (rfc5277) not reporting-entity (rfc8040)
 cat <<EOF > $fyang
      module example {
-       namespace "http://example.com/event/1.0";
+       namespace "urn:example:clixon";
        prefix ex;
        organization "Example, Inc.";
        contact "support at example.com";
@@ -130,35 +130,35 @@ sleep $RCWAIT
 new "1. Netconf RFC5277 stream testing"
 # 1.1 Stream discovery
 new "netconf event stream discovery RFC5277 Sec 3.2.5"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get><filter type="xpath" select="netconf/streams" xmlns="urn:ietf:params:xml:ns:netmod:notification"/></get></rpc>]]>]]>' '<rpc-reply><data><netconf><streams><stream><name>EXAMPLE</name><description>Example event stream</description><replay-support>true</replay-support></stream></streams></netconf></data></rpc-reply>]]>]]>'
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get><filter type="xpath" select="netconf/streams" xmlns="urn:ietf:params:xml:ns:netmod:notification"/></get></rpc>]]>]]>' '<rpc-reply><data><netconf xmlns="urn:ietf:params:xml:ns:netmod:notification"><streams><stream><name>EXAMPLE</name><description>Example event stream</description><replay-support>true</replay-support></stream></streams></netconf></data></rpc-reply>]]>]]>'
 
 new "netconf event stream discovery RFC8040 Sec 6.2"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get><filter type="xpath" select="restconf-state/streams" xmlns="urn:ietf:params:xml:ns:netmod:notification"/></get></rpc>]]>]]>' '<rpc-reply><data><restconf-state><streams><stream><name>EXAMPLE</name><description>Example event stream</description><replay-support>true</replay-support><access><encoding>xml</encoding><location>https://localhost/streams/EXAMPLE</location></access></stream></streams></restconf-state></data></rpc-reply>]]>]]>'
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get><filter type="xpath" select="restconf-state/streams"/></get></rpc>]]>]]>' '<rpc-reply><data><restconf-state xmlns="urn:ietf:params:xml:ns:yang:ietf-restconf-monitoring"><streams><stream><name>EXAMPLE</name><description>Example event stream</description><replay-support>true</replay-support><access><encoding>xml</encoding><location>https://localhost/streams/EXAMPLE</location></access></stream></streams></restconf-state></data></rpc-reply>]]>]]>'
 
 #
 # 1.2 Netconf stream subscription
 new "netconf EXAMPLE subscription"
-expectwait "$clixon_netconf -qf $cfg -y $fyang" '<rpc><create-subscription><stream>EXAMPLE</stream></create-subscription></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]><notification xmlns="urn:ietf:params:xml:ns:netconf:notification:1.0"><eventTime>20' $NCWAIT
+expectwait "$clixon_netconf -qf $cfg -y $fyang" '<rpc><create-subscription xmlns="urn:ietf:params:xml:ns:netmod:notification"><stream>EXAMPLE</stream></create-subscription></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]><notification xmlns="urn:ietf:params:xml:ns:netconf:notification:1.0"><eventTime>20' $NCWAIT
 
 new "netconf subscription with empty startTime"
-expectwait "$clixon_netconf -qf $cfg -y $fyang" '<rpc><create-subscription><stream>EXAMPLE</stream><startTime/></create-subscription></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]><notification xmlns="urn:ietf:params:xml:ns:netconf:notification:1.0"><eventTime>20' $NCWAIT
+expectwait "$clixon_netconf -qf $cfg -y $fyang" '<rpc><create-subscription xmlns="urn:ietf:params:xml:ns:netmod:notification"><stream>EXAMPLE</stream><startTime/></create-subscription></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]><notification xmlns="urn:ietf:params:xml:ns:netconf:notification:1.0"><eventTime>20' $NCWAIT
 
 new "netconf EXAMPLE subscription with simple filter"
-expectwait "$clixon_netconf -qf $cfg -y $fyang" "<rpc><create-subscription><stream>EXAMPLE</stream><filter type=\"xpath\" select=\"event\"/></create-subscription></rpc>]]>]]>" '^<rpc-reply><ok/></rpc-reply>]]>]]><notification xmlns="urn:ietf:params:xml:ns:netconf:notification:1.0"><eventTime>20' $NCWAIT
+expectwait "$clixon_netconf -qf $cfg -y $fyang" '<rpc><create-subscription xmlns="urn:ietf:params:xml:ns:netmod:notification"><stream>EXAMPLE</stream><filter type="xpath" select="event"/></create-subscription></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]><notification xmlns="urn:ietf:params:xml:ns:netconf:notification:1.0"><eventTime>20' $NCWAIT
 
 new "netconf EXAMPLE subscription with filter classifier"
-expectwait "$clixon_netconf -qf $cfg -y $fyang" "<rpc><create-subscription><stream>EXAMPLE</stream><filter type=\"xpath\" select=\"event[event-class='fault']\"/></create-subscription></rpc>]]>]]>" '^<rpc-reply><ok/></rpc-reply>]]>]]><notification xmlns="urn:ietf:params:xml:ns:netconf:notification:1.0"><eventTime>20' $NCWAIT
+expectwait "$clixon_netconf -qf $cfg -y $fyang" "<rpc><create-subscription xmlns=\"urn:ietf:params:xml:ns:netmod:notification\"><stream>EXAMPLE</stream><filter type=\"xpath\" select=\"event[event-class='fault']\"/></create-subscription></rpc>]]>]]>" '^<rpc-reply><ok/></rpc-reply>]]>]]><notification xmlns="urn:ietf:params:xml:ns:netconf:notification:1.0"><eventTime>20' $NCWAIT
 
 new "netconf NONEXIST subscription"
-expectwait "$clixon_netconf -qf $cfg -y $fyang" '<rpc><create-subscription><stream>NONEXIST</stream></create-subscription></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>invalid-value</error-tag><error-severity>error</error-severity><error-message>No such stream</error-message></rpc-error></rpc-reply>]]>]]>$' $NCWAIT
+expectwait "$clixon_netconf -qf $cfg -y $fyang" '<rpc><create-subscription xmlns="urn:ietf:params:xml:ns:netmod:notification"><stream>NONEXIST</stream></create-subscription></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>invalid-value</error-tag><error-severity>error</error-severity><error-message>No such stream</error-message></rpc-error></rpc-reply>]]>]]>$' $NCWAIT
 
 new "netconf EXAMPLE subscription with wrong date"
-expectwait "$clixon_netconf -qf $cfg -y $fyang" '<rpc><create-subscription><stream>EXAMPLE</stream><startTime>kallekaka</startTime></create-subscription></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>startTime</bad-element></error-info><error-severity>error</error-severity><error-message>Invalid time: kallekaka</error-message></rpc-error></rpc-reply>]]>]]>$' 0
+expectwait "$clixon_netconf -qf $cfg -y $fyang" '<rpc><create-subscription xmlns="urn:ietf:params:xml:ns:netmod:notification"><stream>EXAMPLE</stream><startTime>kallekaka</startTime></create-subscription></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>startTime</bad-element></error-info><error-severity>error</error-severity><error-message>Invalid time: kallekaka</error-message></rpc-error></rpc-reply>]]>]]>$' 0
 
 #new "netconf EXAMPLE subscription with replay"
 #NOW=$(date +"%Y-%m-%dT%H:%M:%S")
 #sleep 10
-#expectwait "$clixon_netconf -qf $cfg -y $fyang" "<rpc><create-subscription><stream>EXAMPLE</stream><startTime>$NOW</startTime></create-subscription></rpc>]]>]]>" '^<rpc-reply><ok/></rpc-reply>]]>]]><notification xmlns="urn:ietf:params:xml:ns:netconf:notification:1.0"><eventTime>20' 10
+#expectwait "$clixon_netconf -qf $cfg -y $fyang" "<rpc><create-subscription xmlns=\"urn:ietf:params:xml:ns:netmod:notification\"><stream>EXAMPLE</stream><startTime>$NOW</startTime></create-subscription></rpc>]]>]]>" '^<rpc-reply><ok/></rpc-reply>]]>]]><notification xmlns="urn:ietf:params:xml:ns:netconf:notification:1.0"><eventTime>20' 10
 sleep 2
 
 #
@@ -166,11 +166,11 @@ sleep 2
 new "2. Restconf RFC8040 stream testing"
 # 2.1 Stream discovery
 new "restconf event stream discovery RFC8040 Sec 6.2"
-expectfn "curl -s -X GET http://localhost/restconf/data/ietf-restconf-monitoring:restconf-state/streams" 0 '{"streams": {"stream": \[{"name": "EXAMPLE","description": "Example event stream","replay-support": true,"access": \[{"encoding": "xml","location": "https://localhost/streams/EXAMPLE"}\]}\]}'
+expectfn "curl -s -X GET http://localhost/restconf/data/ietf-restconf-monitoring:restconf-state/streams" 0 '{"ietf-restconf-monitoring:streams": {"stream": \[{"name": "EXAMPLE","description": "Example event stream","replay-support": true,"access": \[{"encoding": "xml","location": "https://localhost/streams/EXAMPLE"}\]}\]}'
 
 sleep 2
 new "restconf subscribe RFC8040 Sec 6.3, get location"
-expectfn "curl -s -X GET http://localhost/restconf/data/ietf-restconf-monitoring:restconf-state/streams/stream=EXAMPLE/access=xml/location" 0 '{"location": "https://localhost/streams/EXAMPLE"}'
+expectfn "curl -s -X GET http://localhost/restconf/data/ietf-restconf-monitoring:restconf-state/streams/stream=EXAMPLE/access=xml/location" 0 '{"ietf-restconf-monitoring:location": "https://localhost/streams/EXAMPLE"}'
 
 sleep 2
 # Restconf stream subscription RFC8040 Sec 6.3
@@ -246,13 +246,12 @@ if [ $nr -lt 9 -o $nr -gt 14 ]; then
     err 10 "$nr"
 fi
 
-
 # Try parallell
 # start background job
 curl -s -X GET  -H "Accept: text/event-stream" -H "Cache-Control: no-cache" -H "Connection: keep-alive" "http://localhost/streams/EXAMPLE" > /dev/null &
 PID=$!
 
-new "Start subscription in parallell"
+new "Start subscriptions in parallell"
 ret=$($UTIL -u http://localhost/streams/EXAMPLE -t 8)
 expect="data: <notification xmlns=\"urn:ietf:params:xml:ns:netconf:notification:1.0\"><eventTime>${DATE}T[0-9:.]*</eventTime><event><event-class>fault</event-class><reportingEntity><card>Ethernet0</card></reportingEntity><severity>major</severity></event>"
 
diff --git a/test/test_type.sh b/test/test_type.sh
index 1261d2ba..20f6f7aa 100755
--- a/test/test_type.sh
+++ b/test/test_type.sh
@@ -214,7 +214,7 @@ new "cli set transitive string error"
 expectfn "$clixon_cli -1f $cfg -l o -y $fyang set c talle 9xx" 255 "^$"
 
 new "netconf set transitive string error"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><c><talle>9xx</talle></c></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><c xmlns="urn:example:clixon"><talle>9xx</talle></c></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>"
 
 new "netconf validate should fail"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" '<rpc-reply><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>talle</bad-element></error-info><error-severity>error</error-severity><error-message>regexp match fail: "9xx" does not match \[a-z\]\[0-9\]\*</error-message></rpc-error></rpc-reply>]]>]]>$'
@@ -241,7 +241,7 @@ new "cli set transitive union error int"
 expectfn "$clixon_cli -1f $cfg -l o -y $fyang set c ulle 55" 255 ""
 
 new "netconf set transitive union error int"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><c><ulle>55</ulle></c></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><c xmlns="urn:example:clixon"><ulle>55</ulle></c></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>"
 
 new "netconf validate should fail"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>ulle</bad-element></error-info><error-severity>error</error-severity><error-message>'55' does not match enumeration</error-message></rpc-error></rpc-reply>]]>]]>$"
@@ -276,7 +276,7 @@ new "netconf validate ok"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf set ab wrong"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><list><ip>a.b&amp; c.d</ip></list></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><list xmlns="urn:example:clixon"><ip>a.b&amp; c.d</ip></list></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf validate"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error>"
@@ -298,7 +298,7 @@ expectfn "$clixon_cli -1f $cfg -l o -y $fyang set mbits create" 0 "^$"
 #expectfn "$clixon_cli -1f $cfg -l o -y $fyang set mbits \"create read\"" 0 "^$"
 
 new "netconf bits two values"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><mbits>create read</mbits></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><mbits xmlns="urn:example:clixon">create read</mbits></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "cli bits validate"
 expectfn "$clixon_cli -1f $cfg -l o -y $fyang validate" 0 "^$"
diff --git a/test/test_when_must.sh b/test/test_when_must.sh
index 9f4c8d4b..82fc5647 100755
--- a/test/test_when_must.sh
+++ b/test/test_when_must.sh
@@ -106,16 +106,16 @@ if [ $BE -ne 0 ]; then
 fi
 
 new "when: add static route"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><whenex><type>static</type><name>r1</name><static-routes/></whenex></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><whenex xmlns="urn:example:clixon"><type>static</type><name>r1</name><static-routes/></whenex></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "when: validate ok"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "when: add direct route"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><whenex><type>direct</type><name>r2</name><static-routes/></whenex></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><whenex xmlns="urn:example:clixon"><type>direct</type><name>r2</name><static-routes/></whenex></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "when get config"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data><whenex><type>direct</type><name>r2</name><static-routes/></whenex><whenex><type>static</type><name>r1</name><static-routes/></whenex></data></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" '^<rpc-reply><data><whenex xmlns="urn:example:clixon"><type>direct</type><name>r2</name><static-routes/></whenex><whenex xmlns="urn:example:clixon"><type>static</type><name>r1</name><static-routes/></whenex></data></rpc-reply>]]>]]>$'
 
 new "when: validate fail"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>when xpath validation failed</error-message></rpc-error></rpc-reply>]]>]]>$"
@@ -124,19 +124,19 @@ new "when: discard-changes"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "must: add interface"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><interface><ifType>ethernet</ifType><ifMTU>1500</ifMTU></interface></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interface xmlns="urn:example:clixon"><ifType>ethernet</ifType><ifMTU>1500</ifMTU></interface></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "must: validate ok"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "must: add atm interface"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><interface><ifType>atm</ifType><ifMTU>32</ifMTU></interface></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interface xmlns="urn:example:clixon"><ifType>atm</ifType><ifMTU>32</ifMTU></interface></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "must: atm validate fail"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>An ATM MTU must be 64 .. 17966</error-message></rpc-error></rpc-reply>]]>]]>$"
 
 new "must: add eth interface"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><interface><ifType>ethernet</ifType><ifMTU>989</ifMTU></interface></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interface xmlns="urn:example:clixon"><ifType>ethernet</ifType><ifMTU>989</ifMTU></interface></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "must: eth validate fail"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>An Ethernet MTU must be 1500</error-message></rpc-error></rpc-reply>]]>]]>"
diff --git a/test/test_yang.sh b/test/test_yang.sh
index 1d953dc5..46eb6234 100755
--- a/test/test_yang.sh
+++ b/test/test_yang.sh
@@ -160,13 +160,13 @@ new "cli defined extension"
 expectfn "$clixon_cli -1f $cfg -y $fyang show version" 0 "3."
 
 new "empty values in leaf-list"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><x><f><e>a</e></f></x></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><x xmlns="urn:example:clixon"><f><e>a</e></f></x></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "empty values in leaf-list2"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><x><f><e/></f></x></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><x xmlns="urn:example:clixon"><f><e/></f></x></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf get config"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data><x><f><e/><e>a</e></f></x></data></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" '^<rpc-reply><data><x xmlns="urn:example:clixon"><f><e/><e>a</e></f></x></data></rpc-reply>]]>]]>$'
 
 new "netconf discard-changes"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
@@ -182,7 +182,7 @@ new "netconf schema resource, RFC 7895"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get><filter type="xpath" select="modules-state/module" xmlns="urn:ietf:params:xml:ns:yang:ietf-yang-library"/></get></rpc>]]>]]>' '<module><name>ietf-yang-types</name><revision>2013-07-15</revision><namespace>urn:ietf:params:xml:ns:yang:ietf-yang-types</namespace><conformance-type>implement</conformance-type></module>'
 
 new "netconf edit config"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><x><y><a>1</a><b>2</b><c>5</c><val>one</val></y><d/></x></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><x xmlns="urn:example:clixon"><y><a>1</a><b>2</b><c>5</c><val>one</val></y><d/></x></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf commit"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
@@ -192,33 +192,34 @@ new "netconf commit 2nd"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf get config xpath"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source><filter type=\"xpath\" select=\"/x/y[a=1][b=2][c=5]\"/></get-config></rpc>]]>]]>" "^<rpc-reply><data><x><y><a>1</a><b>2</b><c>5</c><val>one</val></y></x></data></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source><filter type=\"xpath\" select=\"/x/y[a=1][b=2][c=5]\"/></get-config></rpc>]]>]]>" '^<rpc-reply><data><x xmlns="urn:example:clixon"><y><a>1</a><b>2</b><c>5</c><val>one</val></y></x></data></rpc-reply>]]>]]>$'
 
 new "netconf edit leaf-list"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><x><f><e>hej</e><e>hopp</e></f></x></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><x xmlns="urn:example:clixon"><f><e>hej</e><e>hopp</e></f></x></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf get leaf-list"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source><filter type=\"xpath\" select=\"/x/f/e\"/></get-config></rpc>]]>]]>" "^<rpc-reply><data><x><f><e>hej</e><e>hopp</e></f></x></data></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get-config><source><candidate/></source><filter type="xpath" select="/x/f/e"/></get-config></rpc>]]>]]>' '^<rpc-reply><data><x xmlns="urn:example:clixon"><f><e>hej</e><e>hopp</e></f></x></data></rpc-reply>]]>]]>$'
 
 new "netconf get leaf-list path"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source><filter type=\"xpath\" select=\"/x/f[e='hej']\"/></get-config></rpc>]]>]]>" "^<rpc-reply><data><x><f><e>hej</e><e>hopp</e></f></x></data></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source><filter type=\"xpath\" select=\"/x/f[e='hej']\"/></get-config></rpc>]]>]]>" "^<rpc-reply><data><x xmlns=\"urn:example:clixon\"><f><e>hej</e><e>hopp</e></f></x></data></rpc-reply>]]>]]>$"
 
 new "netconf get (should be some)"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get><filter type=\"xpath\" select=\"/\"/></get></rpc>]]>]]>" "^<rpc-reply><data><x><y><a>1</a><b>2</b><c>5</c><val>one</val></y><d/></x>"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get><filter type=\"xpath\" select=\"/\"/></get></rpc>]]>]]>" '^<rpc-reply><data><x xmlns="urn:example:clixon"><y><a>1</a><b>2</b><c>5</c><val>one</val></y><d/></x>'
 
 new "cli set leaf-list"
 expectfn "$clixon_cli -1f $cfg -y $fyang set x f e foo" 0 ""
 
 new "cli show leaf-list"
 expectfn "$clixon_cli -1f $cfg -y $fyang show xpath /x/f/e" 0 "<e>foo</e>"
+
 new "netconf set state data (not allowed)"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><state><op>42</op></state></config></edit-config></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-type>protocol</error-type><error-tag>invalid-value"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><state xmlns="urn:example:clixon"><op>42</op></state></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>protocol</error-type><error-tag>invalid-value</error-tag><error-severity>error</error-severity><error-message>State data not allowed</error-message></rpc-error></rpc-reply>]]>]]>$'
 
 new "netconf set presence and not present"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><x><nopresence/><presence/></x></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><x xmlns="urn:example:clixon"><nopresence/><presence/></x></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf get presence only"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get-config><source><candidate/></source><filter type="xpath" select="/x/presence"/></get-config></rpc>]]>]]>' "^<rpc-reply><data><x><presence/></x></data></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get-config><source><candidate/></source><filter type="xpath" select="/x/presence"/></get-config></rpc>]]>]]>' '^<rpc-reply><data><x xmlns="urn:example:clixon"><presence/></x></data></rpc-reply>]]>]]>$'
 
 new "netconf get presence only"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get-config><source><candidate/></source><filter type="xpath" select="/x/nopresence"/></get-config></rpc>]]>]]>' "^<rpc-reply><data/></rpc-reply>]]>]]>$"
@@ -227,7 +228,7 @@ new "netconf discard-changes"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf anyxml"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><x><any><foo><bar a=\"nisse\"/></foo></any></x></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><x xmlns="urn:example:clixon"><any><foo><bar a="nisse"/></foo></any></x></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf validate anyxml"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
@@ -237,28 +238,28 @@ expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><can
 
 # Check 3-keys
 new "netconf add one 3-key entry"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><x><y><a>1</a><b>1</b><c>1</c><val>one</val></y></x></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><x xmlns="urn:example:clixon"><y><a>1</a><b>1</b><c>1</c><val>one</val></y></x></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf check add one 3-key"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '<rpc-reply><data><x><y><a>1</a><b>1</b><c>1</c><val>one</val></y></x></data></rpc-reply>]]>]]>'
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '<rpc-reply><data><x xmlns="urn:example:clixon"><y><a>1</a><b>1</b><c>1</c><val>one</val></y></x></data></rpc-reply>]]>]]>'
 
 new "netconf add another (with same 1st key)"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><x><y><a>1</a><b>2</b><c>1</c><val>two</val></y></x></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><x xmlns="urn:example:clixon"><y><a>1</a><b>2</b><c>1</c><val>two</val></y></x></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf check add another"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '<rpc-reply><data><x><y><a>1</a><b>1</b><c>1</c><val>one</val></y><y><a>1</a><b>2</b><c>1</c><val>two</val></y></x></data></rpc-reply>]]>]]>'
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '<rpc-reply><data><x xmlns="urn:example:clixon"><y><a>1</a><b>1</b><c>1</c><val>one</val></y><y><a>1</a><b>2</b><c>1</c><val>two</val></y></x></data></rpc-reply>]]>]]>'
 
 new "netconf replace first"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><x><y><a>1</a><b>1</b><c>1</c><val>replace</val></y></x></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><x xmlns="urn:example:clixon"><y><a>1</a><b>1</b><c>1</c><val>replace</val></y></x></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf check replace"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '<rpc-reply><data><x><y><a>1</a><b>1</b><c>1</c><val>replace</val></y><y><a>1</a><b>2</b><c>1</c><val>two</val></y></x></data></rpc-reply>]]>]]>'
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '<rpc-reply><data><x xmlns="urn:example:clixon"><y><a>1</a><b>1</b><c>1</c><val>replace</val></y><y><a>1</a><b>2</b><c>1</c><val>two</val></y></x></data></rpc-reply>]]>]]>'
 
 new "netconf delete first"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><x><y operation="remove"><a>1</a><b>1</b><c>1</c></y></x></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><x xmlns="urn:example:clixon"><y operation="remove"><a>1</a><b>1</b><c>1</c></y></x></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf check delete"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '<rpc-reply><data><x><y><a>1</a><b>2</b><c>1</c><val>two</val></y></x></data></rpc-reply>]]>]]>'
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '<rpc-reply><data><x xmlns="urn:example:clixon"><y><a>1</a><b>2</b><c>1</c><val>two</val></y></x></data></rpc-reply>]]>]]>'
 
 # clear db for next test
 new "netconf delete candidate"
@@ -268,10 +269,10 @@ new "netconf commit empty candidate"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconfig config submodule"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><mylist><x>a</x><subm-container><subm-leaf>foo</subm-leaf></subm-container></mylist></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><mylist xmlns="urn:example:clixon"><x>a</x><subm-container><subm-leaf>foo</subm-leaf></subm-container></mylist></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf submodule get config"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data><mylist><x>a</x><subm-container><subm-leaf>foo</subm-leaf></subm-container></mylist></data></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '^<rpc-reply><data><mylist xmlns="urn:example:clixon"><x>a</x><subm-container><subm-leaf>foo</subm-leaf></subm-container></mylist></data></rpc-reply>]]>]]>$'
 
 new "netconf submodule validate"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
diff --git a/test/test_yang_load.sh b/test/test_yang_load.sh
index 90fc10e4..4f168fca 100755
--- a/test/test_yang_load.sh
+++ b/test/test_yang_load.sh
@@ -20,7 +20,7 @@ cat <<EOF > $fyang1
 module $APPNAME{
   prefix ex;
   revision 2018-12-02;
-  namespace "urn:example:example";
+  namespace "urn:example:clixon";
   leaf newex{
     type string;
   }
@@ -32,7 +32,7 @@ cat <<EOF > $fyang2
 module $APPNAME{
   prefix ex;
   revision 2018-01-01;
-  namespace "urn:example:example";
+  namespace "urn:example:clixon";
   leaf oldex{
     type string;
   }
@@ -44,7 +44,7 @@ cat <<EOF > $fyang3
 module other{
   prefix oth;
   revision 2018-01-01;
-  namespace "urn:example:example2";
+  namespace "urn:example:clixon2";
   leaf other{
     type string;
   }
@@ -85,13 +85,13 @@ if [ $BE -ne 0 ]; then
 fi
 
 new "1. Set newex"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex>str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex xmlns="urn:example:clixon">str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "Set oldex should fail (since oldex is in old revision and only the new is loaded)"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex>str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>Validation failed</error-message></rpc-error></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex xmlns="urn:example:clixon">str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>unknown-element</error-tag><error-info><bad-element>oldex</bad-element></error-info><error-severity>error</error-severity><error-message>Unassigned yang spec</error-message></rpc-error></rpc-reply>]]>]]>$'
 
 new "Set other should fail"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other>str</other></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>Validation failed</error-message></rpc-error></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other xmlns="urn:example:clixon2">str</other></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>unknown-element</error-tag><error-info><bad-element>other</bad-element></error-info><error-severity>error</error-severity><error-message>Unassigned yang spec</error-message></rpc-error></rpc-reply>]]>]]>$'
 
 if [ $BE -eq 0 ]; then
     exit # BE
@@ -137,13 +137,13 @@ if [ $? -ne 0 ]; then
 fi
 
 new "Set oldex"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex>str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex xmlns="urn:example:clixon">str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "Set newex should fail"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex>str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>Validation failed</error-message></rpc-error></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex xmlns="urn:example:clixon">str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>unknown-element</error-tag><error-info><bad-element>newex</bad-element></error-info><error-severity>error</error-severity><error-message>Unassigned yang spec</error-message></rpc-error></rpc-reply>]]>]]>$'
 
 new "Set other should fail"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other>str</other></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>Validation failed</error-message></rpc-error></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other xmlns="urn:example:clixon2">str</other></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>unknown-element</error-tag><error-info><bad-element>other</bad-element></error-info><error-severity>error</error-severity><error-message>Unassigned yang spec</error-message></rpc-error></rpc-reply>]]>]]>$'
 
 new "Kill backend"
 # Check if premature kill
@@ -181,13 +181,13 @@ if [ $? -ne 0 ]; then
 fi
 
 new "Set newex"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex>str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex xmlns="urn:example:clixon">str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "Set oldex should fail"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex>str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex xmlns="urn:example:clixon">str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>unknown-element</error-tag><error-info><bad-element>oldex</bad-element></error-info><error-severity>error</error-severity><error-message>Unassigned yang spec</error-message></rpc-error></rpc-reply>]]>]]>$'
 
 new "Set other should fail"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other>str</other></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other xmlns="urn:example:clixon2">str</other></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>unknown-element</error-tag><error-info><bad-element>other</bad-element></error-info><error-severity>error</error-severity><error-message>Unassigned yang spec</error-message></rpc-error></rpc-reply>]]>]]>$'
 
 new "Kill backend"
 # Check if premature kill
@@ -226,13 +226,13 @@ if [ $? -ne 0 ]; then
 fi
 
 new "Set oldex"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex>str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex xmlns="urn:example:clixon">str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "Set newex should fail"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex>str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex xmlns="urn:example:clixon">str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>unknown-element</error-tag><error-info><bad-element>newex</bad-element></error-info><error-severity>error</error-severity><error-message>Unassigned yang spec</error-message></rpc-error></rpc-reply>]]>]]>$'
 
 new "Set other should fail"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other>str</other></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other xmlns="urn:example:clixon2">str</other></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>unknown-element</error-tag><error-info><bad-element>other</bad-element></error-info><error-severity>error</error-severity><error-message>Unassigned yang spec</error-message></rpc-error></rpc-reply>]]>]]>$'
 
 new "Kill backend"
 # Check if premature kill
@@ -270,13 +270,13 @@ if [ $? -ne 0 ]; then
 fi
 
 new "Set newex"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex>str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex xmlns="urn:example:clixon">str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "Set oldex should fail"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex>str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex xmlns="urn:example:clixon">str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>unknown-element</error-tag><error-info><bad-element>oldex</bad-element></error-info><error-severity>error</error-severity><error-message>Unassigned yang spec</error-message></rpc-error></rpc-reply>]]>]]>$'
 
 new "Set other"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other>str</other></config></edit-config></rpc>]]>]]>'  '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other xmlns="urn:example:clixon2">str</other></config></edit-config></rpc>]]>]]>'  '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "Kill backend"
 # Check if premature kill
@@ -315,13 +315,13 @@ if [ $? -ne 0 ]; then
 fi
 
 new "Set oldex"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex>str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex xmlns="urn:example:clixon">str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "Set newex should fail"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex>str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex xmlns="urn:example:clixon">str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>unknown-element</error-tag><error-info><bad-element>newex</bad-element></error-info><error-severity>error</error-severity><error-message>Unassigned yang spec</error-message></rpc-error></rpc-reply>]]>]]>'
 
 new "Set other"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other>str</other></config></edit-config></rpc>]]>]]>'  '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other xmlns="urn:example:clixon2">str</other></config></edit-config></rpc>]]>]]>'  '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "Kill backend"
 # Check if premature kill
@@ -362,13 +362,13 @@ if [ $? -ne 0 ]; then
 fi
 
 new "Set oldex"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex>str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex xmlns="urn:example:clixon">str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "Set newex should fail"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex>str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex xmlns="urn:example:clixon">str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>unknown-element</error-tag><error-info><bad-element>newex</bad-element></error-info><error-severity>error</error-severity><error-message>Unassigned yang spec</error-message></rpc-error></rpc-reply>]]>]]>$'
 
 new "Set other"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other>str</other></config></edit-config></rpc>]]>]]>'  '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other xmlns="urn:example:clixon2">str</other></config></edit-config></rpc>]]>]]>'  '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "Kill backend"
 # Check if premature kill
@@ -408,13 +408,13 @@ if [ $? -ne 0 ]; then
 fi
 
 new "Set oldex"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex>str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><oldex xmlns="urn:example:clixon">str</oldex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "Set newex should fail"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex>str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><newex xmlns="urn:example:clixon">str</newex></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>unknown-element</error-tag><error-info><bad-element>newex</bad-element></error-info><error-severity>error</error-severity><error-message>Unassigned yang spec</error-message></rpc-error></rpc-reply>]]>]]>$'
 
 new "Set other should fail"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other>str</other></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>operation-failed</error-tag><error-severity>error</error-severity><error-message>'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><other xmlns="urn:example:clixon2">str</other></config></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>unknown-element</error-tag><error-info><bad-element>other</bad-element></error-info><error-severity>error</error-severity><error-message>Unassigned yang spec</error-message></rpc-error></rpc-reply>]]>]]>$'
 
 new "Kill backend"
 # Check if premature kill
diff --git a/test/test_yang_namespace.sh b/test/test_yang_namespace.sh
index 19447f80..43fb2893 100755
--- a/test/test_yang_namespace.sh
+++ b/test/test_yang_namespace.sh
@@ -1,11 +1,15 @@
 #!/bin/bash
-# Yang specifics: multi-keys and empty type
+
 APPNAME=example
-# include err() and new() functions and creates $dir
+# test two modules example1 and example2 with overlapping statements x.
+# x is leaf in example1 and list on example2.
+# Test netconf and restconf
+# BTW, this is not supported in generated CLI
+
 . ./lib.sh
 
 cfg=$dir/conf_yang.xml
-fyang=$dir/example.yang
+fyang1=$dir/example1.yang
 fyang2=$dir/example2.yang
 
 #  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
@@ -18,17 +22,35 @@ cat <<EOF > $cfg
   <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_RESTCONF_PRETTY>false</CLICON_RESTCONF_PRETTY>
   <CLICON_SOCK>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
   <CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
   <CLICON_CLI_GENMODEL_COMPLETION>1</CLICON_CLI_GENMODEL_COMPLETION>
   <CLICON_XMLDB_DIR>/usr/local/var/$APPNAME</CLICON_XMLDB_DIR>
   <CLICON_XMLDB_PLUGIN>/usr/local/lib/xmldb/text.so</CLICON_XMLDB_PLUGIN>
+  <CLICON_XML_NS_STRICT>true</CLICON_XML_NS_STRICT> <!-- Must be strict -->
   <CLICON_MODULE_LIBRARY_RFC7895>true</CLICON_MODULE_LIBRARY_RFC7895>
 </config>
 EOF
 
+
+cat <<EOF > $fyang1
+module example1{
+   yang-version 1.1;
+   prefix ex1;
+   namespace "urn:example:clixon1";
+   import ietf-routing {
+        description "defines fib-route";
+	prefix rt;
+   }
+   leaf x{
+     type int32;
+   }
+}
+EOF
+
 # For testing namespaces -
-# x.y is different type. Here it is string whereas in fyang it is list.
+# x.y is different type. Here it is string whereas in fyang1 it is list.
 #
 cat <<EOF > $fyang2
 module example2{
@@ -43,37 +65,6 @@ module example2{
 }
 EOF
 
-cat <<EOF > $fyang
-module example{
-   yang-version 1.1;
-   prefix ex;
-   namespace "urn:example:clixon";
-   import ietf-routing {
-        description "defines fib-route";
-	prefix rt;
-   }
-   leaf x{
-     type int32;
-   }
-   rpc client-rpc {
-	description "Example local client-side RPC that is processed by the
-                     the netconf/restconf and not sent to the backend.
-                     This is a clixon implementation detail: some rpc:s
-                     are better processed by the client for API or perf reasons";
-	input {
-	    leaf request {
-		type string;
-	    }
-	}
-	output {
-	    leaf result{
-		type string;
-	    }
-	}
-    }
-}
-EOF
-
 new "test params: -f $cfg"
 
 if [ $BE -ne 0 ]; then
@@ -91,36 +82,57 @@ if [ $BE -ne 0 ]; then
     fi
 fi
 
+new "kill old restconf daemon"
+sudo pkill -u www-data clixon_restconf
 
+new "start restconf daemon"
+sudo su -c "$clixon_restconf -f $cfg -D $DBG" -s /bin/sh www-data &
 
-new "netconf xmlns module ex"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><edit-config><target><candidate/></target><config><x xmlns="urn:example:clixon">42</x></config></edit-config></rpc>]]>]]>' '^<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><ok/></rpc-reply>]]>]]>$'
+new "netconf set x in example1"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><edit-config><target><candidate/></target><config><x xmlns="urn:example:clixon1">42</x></config></edit-config></rpc>]]>]]>' '^<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><ok/></rpc-reply>]]>]]>$'
 
-new "netconf get config XXX xmlfn in return"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data><x>42</x></data></rpc-reply>]]>]]>$"
+new "netconf get config example1"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" '^<rpc-reply><data><x xmlns="urn:example:clixon1">42</x></data></rpc-reply>]]>]]>$'
 
-new "netconf xmlns module ex2"
+new "netconf set x in example2"
 expecteof "$clixon_netconf -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><edit-config><target><candidate/></target><config><x xmlns="urn:example:clixon2"><y>99</y></x></config></edit-config></rpc>]]>]]>' '^<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><ok/></rpc-reply>]]>]]>$'
 
-new "netconf get config XXX xmlns"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data><x>42</x><x><y>99</y></x></data></rpc-reply>]]>]]>$"
+new "netconf get config example1 and example2"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" '^<rpc-reply><data><x xmlns="urn:example:clixon1">42</x><x xmlns="urn:example:clixon2"><y>99</y></x></data></rpc-reply>]]>]]>$'
 
 new "netconf discard-changes"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang1" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
-new "netconf xmlns:ex"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:ex="urn:example:clixon"><edit-config><target><candidate/></target><config><ex:x>4422</ex:x></config></edit-config></rpc>]]>]]>' '^<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:ex="urn:example:clixon"><ok/></rpc-reply>]]>]]>$'
+new "restconf set x in example1"
+expecteq "$(curl -s -X POST -d '{"example1:x":42}' http://localhost/restconf/data)" ''
 
-new "netconf get config XXX xmlns:ex"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data><x>4422</x></data></rpc-reply>]]>]]>$"
+new2 "restconf get config example1"
+expecteq "$(curl -s -X GET http://localhost/restconf/data/example1:x)" '{"example1:x": 42}
+
'
 
-new "netconf xmlns:ex2"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:ex2="urn:example:clixon2"><edit-config><target><candidate/></target><config><ex2:x><ex2:y>9999</ex2:y></ex2:x></config></edit-config></rpc>]]>]]>' '^<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:ex2="urn:example:clixon2"><ok/></rpc-reply>]]>]]>$'
+new "restconf set x in example2"
+expecteq "$(curl -s -X POST -d '{"example2:x":{"y":99}}' http://localhost/restconf/data)" ''
 
-new "netconf get config XXX xmlns:ex2"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data><x>4422</x><x><y>9999</y></x></data></rpc-reply>]]>]]>$"
+# XXX GET ../example1:x is translated to select=/x which gets both example1&2
+#new "restconf get config example1"
+#expecteq "$(curl -s -X GET http://localhost/restconf/data/example1:x)" '{"example1:x": 42}
+#
'
 
-# rpc
+# XXX GET ../example2:x is translated to select=/x which gets both example1&2
+#new "restconf get config example2"
+#expecteq "$(curl -s -X GET http://localhost/restconf/data/example2:x)" '{"example2:x": {"y":42}}
+#
'
+
+new "restconf get config example1 and example2"
+ret=$(curl -s -X GET http://localhost/restconf/data)
+expect='"example1:x": 42,"example2:x": {"y": 99}'
+match=`echo $ret | grep -EZo "$expect"`
+if [ -z "$match" ]; then
+    err "$expect" "$ret"
+fi
+
+new "Kill restconf daemon"
+sudo pkill -u www-data -f "/www-data/clixon_restconf"
 
 if [ $BE -eq 0 ]; then
     exit # BE
diff --git a/yang/clixon-config@2018-10-21.yang b/yang/clixon-config@2018-10-21.yang
index 162c3c0b..99d5b596 100644
--- a/yang/clixon-config@2018-10-21.yang
+++ b/yang/clixon-config@2018-10-21.yang
@@ -353,14 +353,19 @@ module clixon-config {
                  Only works for Yang specified XML.
                  If not set, all lists accessed via linear search.";
 	}
-	leaf CLICON_XML_NS_ITERATE {
+	leaf CLICON_XML_NS_STRICT {
 	    type boolean;
 	    default true;
 	    description
-		"If set, iterate through modules to find the matching datanode
+		"If not set, make non-strict laze namespace checks, by iterating
+                 through modules to find the matching datanode
                  or rpc if no xmlns attribute specifies namespace.
-                 This is loose semantics of finding namespaces.
-                 And it is wrong, but is the way Clixon originally was written.";
+                 This is lazy semantics of finding namespaces, which means you
+                 do not need to explicitly give the namespace if the symbol exists
+                 in some loaded module.
+                 Example: <x/> is enough, instead of <x xmlns='urn:example:clixon'/>
+                 But it is wrong, but is the way Clixon originally was written.
+                 Strict semantics is the default.";
 	}
 	leaf CLICON_USE_STARTUP_CONFIG {
 	    type int32;
diff --git a/yang/ietf-netconf-notification@2008-07-01.yang b/yang/ietf-netconf-notification@2008-07-01.yang
index 978cdd4b..1db3ee3e 100644
--- a/yang/ietf-netconf-notification@2008-07-01.yang
+++ b/yang/ietf-netconf-notification@2008-07-01.yang
@@ -1,5 +1,6 @@
 module ietf-netconf-notification {
-    namespace "urn:ietf:params:xml:ns:netconf:notification:1:0";
+    /*    namespace "urn:ietf:params:xml:ns:netconf:notification:1.0";*/
+    namespace "urn:ietf:params:xml:ns:netmod:notification";
     prefix "rcmon";
 
     import ietf-yang-types { prefix yang; }

From 0103d589945a9f7e325e8d500db5dce621f3074f Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Wed, 2 Jan 2019 15:48:30 +0100
Subject: [PATCH 18/72] 2019

---
 .gitignore                                | 3 +--
 LICENSE.md                                | 2 +-
 Makefile.in                               | 2 +-
 apps/Makefile.in                          | 2 +-
 apps/backend/Makefile.in                  | 2 +-
 apps/backend/backend_client.c             | 2 +-
 apps/backend/backend_client.h             | 2 +-
 apps/backend/backend_commit.c             | 2 +-
 apps/backend/backend_commit.h             | 2 +-
 apps/backend/backend_handle.h             | 2 +-
 apps/backend/backend_main.c               | 2 +-
 apps/backend/backend_plugin.c             | 2 +-
 apps/backend/backend_plugin.h             | 2 +-
 apps/backend/backend_socket.c             | 2 +-
 apps/backend/backend_socket.h             | 2 +-
 apps/backend/clixon_backend.h             | 2 +-
 apps/backend/clixon_backend_handle.c      | 2 +-
 apps/backend/clixon_backend_handle.h      | 2 +-
 apps/backend/clixon_backend_transaction.c | 2 +-
 apps/backend/clixon_backend_transaction.h | 2 +-
 apps/cli/Makefile.in                      | 2 +-
 apps/cli/cli_common.c                     | 2 +-
 apps/cli/cli_common.h                     | 2 +-
 apps/cli/cli_generate.c                   | 2 +-
 apps/cli/cli_generate.h                   | 2 +-
 apps/cli/cli_handle.c                     | 2 +-
 apps/cli/cli_handle.h                     | 2 +-
 apps/cli/cli_main.c                       | 2 +-
 apps/cli/cli_plugin.c                     | 2 +-
 apps/cli/cli_plugin.h                     | 2 +-
 apps/cli/cli_show.c                       | 2 +-
 apps/cli/clixon_cli.h                     | 2 +-
 apps/cli/clixon_cli_api.h                 | 2 +-
 apps/netconf/Makefile.in                  | 2 +-
 apps/netconf/clixon_netconf.h             | 2 +-
 apps/netconf/netconf_filter.c             | 2 +-
 apps/netconf/netconf_filter.h             | 2 +-
 apps/netconf/netconf_hello.c              | 2 +-
 apps/netconf/netconf_hello.h              | 2 +-
 apps/netconf/netconf_lib.c                | 2 +-
 apps/netconf/netconf_lib.h                | 2 +-
 apps/netconf/netconf_main.c               | 2 +-
 apps/netconf/netconf_rpc.c                | 2 +-
 apps/netconf/netconf_rpc.h                | 2 +-
 apps/restconf/Makefile.in                 | 2 +-
 apps/restconf/clixon_restconf.h           | 2 +-
 apps/restconf/restconf_lib.c              | 2 +-
 apps/restconf/restconf_lib.h              | 2 +-
 apps/restconf/restconf_main.c             | 2 +-
 apps/restconf/restconf_methods.c          | 2 +-
 apps/restconf/restconf_methods.h          | 2 +-
 apps/restconf/restconf_stream.c           | 2 +-
 apps/restconf/restconf_stream.h           | 2 +-
 configure.ac                              | 2 +-
 datastore/Makefile.in                     | 2 +-
 datastore/datastore_client.c              | 2 +-
 datastore/text/Makefile.in                | 2 +-
 datastore/text/clixon_xmldb_text.c        | 2 +-
 datastore/text/clixon_xmldb_text.h        | 2 +-
 doc/Makefile.in                           | 2 +-
 docker/Dockerfile                         | 2 +-
 docker/Makefile.in                        | 2 +-
 etc/Makefile.in                           | 2 +-
 etc/clixonrc.in                           | 2 +-
 example/Dockerfile                        | 2 +-
 example/Makefile.in                       | 2 +-
 example/example_backend.c                 | 2 +-
 example/example_backend_nacm.c            | 2 +-
 example/example_cli.c                     | 2 +-
 example/example_netconf.c                 | 2 +-
 example/example_restconf.c                | 2 +-
 include/Makefile.in                       | 2 +-
 include/clixon_custom.h                   | 2 +-
 lib/Makefile.in                           | 2 +-
 lib/clixon/Makefile.in                    | 2 +-
 lib/clixon/clixon.h.in                    | 2 +-
 lib/clixon/clixon_err.h                   | 2 +-
 lib/clixon/clixon_event.h                 | 2 +-
 lib/clixon/clixon_file.h                  | 2 +-
 lib/clixon/clixon_handle.h                | 2 +-
 lib/clixon/clixon_hash.h                  | 2 +-
 lib/clixon/clixon_json.h                  | 2 +-
 lib/clixon/clixon_log.h                   | 2 +-
 lib/clixon/clixon_nacm.h                  | 2 +-
 lib/clixon/clixon_netconf_lib.h           | 2 +-
 lib/clixon/clixon_options.h               | 2 +-
 lib/clixon/clixon_plugin.h                | 2 +-
 lib/clixon/clixon_proto.h                 | 2 +-
 lib/clixon/clixon_proto_client.h          | 2 +-
 lib/clixon/clixon_queue.h                 | 2 +-
 lib/clixon/clixon_sha1.h                  | 2 +-
 lib/clixon/clixon_sig.h                   | 2 +-
 lib/clixon/clixon_stream.h                | 2 +-
 lib/clixon/clixon_string.h                | 2 +-
 lib/clixon/clixon_xml.h                   | 2 +-
 lib/clixon/clixon_xml_db.h                | 2 +-
 lib/clixon/clixon_xml_map.h               | 2 +-
 lib/clixon/clixon_xml_sort.h              | 2 +-
 lib/clixon/clixon_xpath.h                 | 2 +-
 lib/clixon/clixon_xpath_ctx.h             | 2 +-
 lib/clixon/clixon_yang.h                  | 2 +-
 lib/clixon/clixon_yang_module.h           | 2 +-
 lib/clixon/clixon_yang_type.h             | 2 +-
 lib/src/Makefile.in                       | 2 +-
 lib/src/clixon_err.c                      | 2 +-
 lib/src/clixon_event.c                    | 2 +-
 lib/src/clixon_file.c                     | 2 +-
 lib/src/clixon_handle.c                   | 2 +-
 lib/src/clixon_hash.c                     | 2 +-
 lib/src/clixon_json.c                     | 2 +-
 lib/src/clixon_json_parse.h               | 2 +-
 lib/src/clixon_json_parse.l               | 2 +-
 lib/src/clixon_json_parse.y               | 2 +-
 lib/src/clixon_log.c                      | 2 +-
 lib/src/clixon_nacm.c                     | 2 +-
 lib/src/clixon_netconf_lib.c              | 2 +-
 lib/src/clixon_options.c                  | 2 +-
 lib/src/clixon_plugin.c                   | 2 +-
 lib/src/clixon_proto.c                    | 2 +-
 lib/src/clixon_proto_client.c             | 2 +-
 lib/src/clixon_sig.c                      | 2 +-
 lib/src/clixon_stream.c                   | 2 +-
 lib/src/clixon_string.c                   | 2 +-
 lib/src/clixon_xml.c                      | 2 +-
 lib/src/clixon_xml_db.c                   | 2 +-
 lib/src/clixon_xml_map.c                  | 2 +-
 lib/src/clixon_xml_parse.h                | 2 +-
 lib/src/clixon_xml_parse.l                | 2 +-
 lib/src/clixon_xml_parse.y                | 2 +-
 lib/src/clixon_xml_sort.c                 | 2 +-
 lib/src/clixon_xpath.c                    | 2 +-
 lib/src/clixon_xpath_ctx.c                | 2 +-
 lib/src/clixon_xpath_parse.h              | 2 +-
 lib/src/clixon_xpath_parse.l              | 2 +-
 lib/src/clixon_xpath_parse.y              | 2 +-
 lib/src/clixon_yang.c                     | 2 +-
 lib/src/clixon_yang_cardinality.c         | 2 +-
 lib/src/clixon_yang_cardinality.h         | 2 +-
 lib/src/clixon_yang_module.c              | 2 +-
 lib/src/clixon_yang_parse.h               | 2 +-
 lib/src/clixon_yang_parse.l               | 2 +-
 lib/src/clixon_yang_parse.y               | 2 +-
 lib/src/clixon_yang_type.c                | 2 +-
 util/Makefile.in                          | 2 +-
 util/clixon_util_json.c                   | 2 +-
 util/clixon_util_stream.c                 | 2 +-
 util/clixon_util_xml.c                    | 2 +-
 util/clixon_util_xpath.c                  | 2 +-
 util/clixon_util_yang.c                   | 2 +-
 yang/Makefile.in                          | 2 +-
 yang/clixon-config@2018-10-21.yang        | 2 +-
 151 files changed, 151 insertions(+), 152 deletions(-)

diff --git a/.gitignore b/.gitignore
index cd4446bc..c04c1244 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,10 +14,9 @@ lib/Makefile
 lib/*/Makefile
 autom4te.cache/
 
-clixon.conf.cpp
-clixon.mk
 config.log
 config.status
+TAGS
 
 apps/backend/clixon_backend
 apps/backend/test
diff --git a/LICENSE.md b/LICENSE.md
index 84997252..af683735 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright 2009-2018 Olof Hagsand and Benny Holmgren
+Copyright 2009-2019 Olof Hagsand and Benny Holmgren
 
 CLIXON is dual license. 
 
diff --git a/Makefile.in b/Makefile.in
index 3d34933a..a1a9f1f0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
 #
 # ***** BEGIN LICENSE BLOCK *****
 # 
-# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+# Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 #
 # This file is part of CLIXON
 #
diff --git a/apps/Makefile.in b/apps/Makefile.in
index bfcc31cf..d8125aa0 100644
--- a/apps/Makefile.in
+++ b/apps/Makefile.in
@@ -1,7 +1,7 @@
 #
 # ***** BEGIN LICENSE BLOCK *****
 # 
-# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+# Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 #
 # This file is part of CLIXON
 #
diff --git a/apps/backend/Makefile.in b/apps/backend/Makefile.in
index 4d57dfc8..b3700e33 100644
--- a/apps/backend/Makefile.in
+++ b/apps/backend/Makefile.in
@@ -1,7 +1,7 @@
 #
 # ***** BEGIN LICENSE BLOCK *****
 # 
-# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+# Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 #
 # This file is part of CLIXON
 #
diff --git a/apps/backend/backend_client.c b/apps/backend/backend_client.c
index 3e1fa1ad..c9ea04ad 100644
--- a/apps/backend/backend_client.c
+++ b/apps/backend/backend_client.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/backend/backend_client.h b/apps/backend/backend_client.h
index 81620d4a..c9a1da11 100644
--- a/apps/backend/backend_client.h
+++ b/apps/backend/backend_client.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/backend/backend_commit.c b/apps/backend/backend_commit.c
index 7c29131a..61e9a246 100644
--- a/apps/backend/backend_commit.c
+++ b/apps/backend/backend_commit.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/backend/backend_commit.h b/apps/backend/backend_commit.h
index 45b0f922..3af2461a 100644
--- a/apps/backend/backend_commit.h
+++ b/apps/backend/backend_commit.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/backend/backend_handle.h b/apps/backend/backend_handle.h
index 8eb3e073..f2acea6f 100644
--- a/apps/backend/backend_handle.h
+++ b/apps/backend/backend_handle.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/backend/backend_main.c b/apps/backend/backend_main.c
index ba297852..77d791cf 100644
--- a/apps/backend/backend_main.c
+++ b/apps/backend/backend_main.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/backend/backend_plugin.c b/apps/backend/backend_plugin.c
index 996a27cb..6218c0cd 100644
--- a/apps/backend/backend_plugin.c
+++ b/apps/backend/backend_plugin.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/backend/backend_plugin.h b/apps/backend/backend_plugin.h
index a2736b19..eb038319 100644
--- a/apps/backend/backend_plugin.h
+++ b/apps/backend/backend_plugin.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/backend/backend_socket.c b/apps/backend/backend_socket.c
index ec32fb53..0d823ec8 100644
--- a/apps/backend/backend_socket.c
+++ b/apps/backend/backend_socket.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/backend/backend_socket.h b/apps/backend/backend_socket.h
index df6ac149..8778be50 100644
--- a/apps/backend/backend_socket.h
+++ b/apps/backend/backend_socket.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/backend/clixon_backend.h b/apps/backend/clixon_backend.h
index b3a75763..37e046b1 100644
--- a/apps/backend/clixon_backend.h
+++ b/apps/backend/clixon_backend.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/backend/clixon_backend_handle.c b/apps/backend/clixon_backend_handle.c
index f4707de4..3ab58e9c 100644
--- a/apps/backend/clixon_backend_handle.c
+++ b/apps/backend/clixon_backend_handle.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/backend/clixon_backend_handle.h b/apps/backend/clixon_backend_handle.h
index bdfbb425..491778aa 100644
--- a/apps/backend/clixon_backend_handle.h
+++ b/apps/backend/clixon_backend_handle.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/backend/clixon_backend_transaction.c b/apps/backend/clixon_backend_transaction.c
index 173ba01c..727a7332 100644
--- a/apps/backend/clixon_backend_transaction.c
+++ b/apps/backend/clixon_backend_transaction.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/backend/clixon_backend_transaction.h b/apps/backend/clixon_backend_transaction.h
index a290c5f1..447cd15f 100644
--- a/apps/backend/clixon_backend_transaction.h
+++ b/apps/backend/clixon_backend_transaction.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/cli/Makefile.in b/apps/cli/Makefile.in
index a55918d9..2b75b479 100644
--- a/apps/cli/Makefile.in
+++ b/apps/cli/Makefile.in
@@ -1,7 +1,7 @@
 #
 # ***** BEGIN LICENSE BLOCK *****
 # 
-# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+# Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 #
 # This file is part of CLIXON
 #
diff --git a/apps/cli/cli_common.c b/apps/cli/cli_common.c
index f6796f58..ebab38a7 100644
--- a/apps/cli/cli_common.c
+++ b/apps/cli/cli_common.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/cli/cli_common.h b/apps/cli/cli_common.h
index 8e177e5e..4e29838f 100644
--- a/apps/cli/cli_common.h
+++ b/apps/cli/cli_common.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/cli/cli_generate.c b/apps/cli/cli_generate.c
index 022e41b8..b25067c4 100644
--- a/apps/cli/cli_generate.c
+++ b/apps/cli/cli_generate.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/cli/cli_generate.h b/apps/cli/cli_generate.h
index 371063ba..d049d600 100644
--- a/apps/cli/cli_generate.h
+++ b/apps/cli/cli_generate.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/cli/cli_handle.c b/apps/cli/cli_handle.c
index 58e03948..34a92c4d 100644
--- a/apps/cli/cli_handle.c
+++ b/apps/cli/cli_handle.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/cli/cli_handle.h b/apps/cli/cli_handle.h
index bbf66742..c7fd728b 100644
--- a/apps/cli/cli_handle.h
+++ b/apps/cli/cli_handle.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/cli/cli_main.c b/apps/cli/cli_main.c
index b22e1c9f..e6d7925a 100644
--- a/apps/cli/cli_main.c
+++ b/apps/cli/cli_main.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/cli/cli_plugin.c b/apps/cli/cli_plugin.c
index 633c46ae..4f17f948 100644
--- a/apps/cli/cli_plugin.c
+++ b/apps/cli/cli_plugin.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/cli/cli_plugin.h b/apps/cli/cli_plugin.h
index 2df7fb47..75aa99c2 100644
--- a/apps/cli/cli_plugin.h
+++ b/apps/cli/cli_plugin.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/cli/cli_show.c b/apps/cli/cli_show.c
index ec39ac4e..0fa9fa56 100644
--- a/apps/cli/cli_show.c
+++ b/apps/cli/cli_show.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/cli/clixon_cli.h b/apps/cli/clixon_cli.h
index c41d7185..aaebfb19 100644
--- a/apps/cli/clixon_cli.h
+++ b/apps/cli/clixon_cli.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/cli/clixon_cli_api.h b/apps/cli/clixon_cli_api.h
index 3507e31f..d2926029 100644
--- a/apps/cli/clixon_cli_api.h
+++ b/apps/cli/clixon_cli_api.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/netconf/Makefile.in b/apps/netconf/Makefile.in
index 81d86577..ee2d0082 100644
--- a/apps/netconf/Makefile.in
+++ b/apps/netconf/Makefile.in
@@ -1,7 +1,7 @@
 #
 # ***** BEGIN LICENSE BLOCK *****
 # 
-# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+# Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 #
 # This file is part of CLIXON
 #
diff --git a/apps/netconf/clixon_netconf.h b/apps/netconf/clixon_netconf.h
index 9fed0a1a..470474f1 100644
--- a/apps/netconf/clixon_netconf.h
+++ b/apps/netconf/clixon_netconf.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/netconf/netconf_filter.c b/apps/netconf/netconf_filter.c
index 89b698e9..8451c33b 100644
--- a/apps/netconf/netconf_filter.c
+++ b/apps/netconf/netconf_filter.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/netconf/netconf_filter.h b/apps/netconf/netconf_filter.h
index ed5e3d98..ce7d76e6 100644
--- a/apps/netconf/netconf_filter.h
+++ b/apps/netconf/netconf_filter.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/netconf/netconf_hello.c b/apps/netconf/netconf_hello.c
index 1be1211c..9c4b07ba 100644
--- a/apps/netconf/netconf_hello.c
+++ b/apps/netconf/netconf_hello.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/netconf/netconf_hello.h b/apps/netconf/netconf_hello.h
index 4f877b32..2ccec1b8 100644
--- a/apps/netconf/netconf_hello.h
+++ b/apps/netconf/netconf_hello.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/netconf/netconf_lib.c b/apps/netconf/netconf_lib.c
index 50723de4..0a6b869b 100644
--- a/apps/netconf/netconf_lib.c
+++ b/apps/netconf/netconf_lib.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/netconf/netconf_lib.h b/apps/netconf/netconf_lib.h
index 6d2de111..d243ac6a 100644
--- a/apps/netconf/netconf_lib.h
+++ b/apps/netconf/netconf_lib.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/netconf/netconf_main.c b/apps/netconf/netconf_main.c
index 4cdef1a0..e60a5d08 100644
--- a/apps/netconf/netconf_main.c
+++ b/apps/netconf/netconf_main.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/netconf/netconf_rpc.c b/apps/netconf/netconf_rpc.c
index 7945110e..f2bbb605 100644
--- a/apps/netconf/netconf_rpc.c
+++ b/apps/netconf/netconf_rpc.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/netconf/netconf_rpc.h b/apps/netconf/netconf_rpc.h
index 3ce6a615..4a20397f 100644
--- a/apps/netconf/netconf_rpc.h
+++ b/apps/netconf/netconf_rpc.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/restconf/Makefile.in b/apps/restconf/Makefile.in
index 32366f89..768a261d 100644
--- a/apps/restconf/Makefile.in
+++ b/apps/restconf/Makefile.in
@@ -1,7 +1,7 @@
 #
 # ***** BEGIN LICENSE BLOCK *****
 # 
-# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+# Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 #
 # This file is part of CLIXON
 #
diff --git a/apps/restconf/clixon_restconf.h b/apps/restconf/clixon_restconf.h
index 2c79c3cc..a8625e9f 100644
--- a/apps/restconf/clixon_restconf.h
+++ b/apps/restconf/clixon_restconf.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/restconf/restconf_lib.c b/apps/restconf/restconf_lib.c
index 062dff65..500a07c3 100644
--- a/apps/restconf/restconf_lib.c
+++ b/apps/restconf/restconf_lib.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/restconf/restconf_lib.h b/apps/restconf/restconf_lib.h
index e05eb054..8c478370 100644
--- a/apps/restconf/restconf_lib.h
+++ b/apps/restconf/restconf_lib.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/restconf/restconf_main.c b/apps/restconf/restconf_main.c
index d5067c4f..e6234884 100644
--- a/apps/restconf/restconf_main.c
+++ b/apps/restconf/restconf_main.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/restconf/restconf_methods.c b/apps/restconf/restconf_methods.c
index b2910a1b..8f3cb4a5 100644
--- a/apps/restconf/restconf_methods.c
+++ b/apps/restconf/restconf_methods.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/restconf/restconf_methods.h b/apps/restconf/restconf_methods.h
index 11daaa26..42525946 100644
--- a/apps/restconf/restconf_methods.h
+++ b/apps/restconf/restconf_methods.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/restconf/restconf_stream.c b/apps/restconf/restconf_stream.c
index ec20f373..667db0ad 100644
--- a/apps/restconf/restconf_stream.c
+++ b/apps/restconf/restconf_stream.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/apps/restconf/restconf_stream.h b/apps/restconf/restconf_stream.h
index 480832f1..0cea952f 100644
--- a/apps/restconf/restconf_stream.h
+++ b/apps/restconf/restconf_stream.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/configure.ac b/configure.ac
index ebdccaf6..94710961 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #
 # ***** BEGIN LICENSE BLOCK *****
 # 
-# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+# Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 #
 # This file is part of CLIXON
 #
diff --git a/datastore/Makefile.in b/datastore/Makefile.in
index 6943dec5..5adde268 100644
--- a/datastore/Makefile.in
+++ b/datastore/Makefile.in
@@ -1,7 +1,7 @@
 #
 # ***** BEGIN LICENSE BLOCK *****
 # 
-# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+# Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 #
 # This file is part of CLIXON
 #
diff --git a/datastore/datastore_client.c b/datastore/datastore_client.c
index b2a20029..0bbe5a3b 100644
--- a/datastore/datastore_client.c
+++ b/datastore/datastore_client.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/datastore/text/Makefile.in b/datastore/text/Makefile.in
index 23c2a7bf..9eadb121 100644
--- a/datastore/text/Makefile.in
+++ b/datastore/text/Makefile.in
@@ -1,7 +1,7 @@
 #
 # ***** BEGIN LICENSE BLOCK *****
 # 
-# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+# Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 #
 # This file is part of CLIXON
 #
diff --git a/datastore/text/clixon_xmldb_text.c b/datastore/text/clixon_xmldb_text.c
index 645fef97..d4160253 100644
--- a/datastore/text/clixon_xmldb_text.c
+++ b/datastore/text/clixon_xmldb_text.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/datastore/text/clixon_xmldb_text.h b/datastore/text/clixon_xmldb_text.h
index 19e9351d..9bb46e42 100644
--- a/datastore/text/clixon_xmldb_text.h
+++ b/datastore/text/clixon_xmldb_text.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/doc/Makefile.in b/doc/Makefile.in
index ad0f4203..f67f183d 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,7 +1,7 @@
 #
 # ***** BEGIN LICENSE BLOCK *****
 # 
-# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+# Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 #
 # This file is part of CLIXON
 #
diff --git a/docker/Dockerfile b/docker/Dockerfile
index b1a71ce3..a15c874b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,7 +1,7 @@
 #
 # ***** BEGIN LICENSE BLOCK *****
 # 
-# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+# Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 #
 # This file is part of CLIXON
 #
diff --git a/docker/Makefile.in b/docker/Makefile.in
index c18b9fad..375fa22d 100644
--- a/docker/Makefile.in
+++ b/docker/Makefile.in
@@ -1,7 +1,7 @@
 #
 # ***** BEGIN LICENSE BLOCK *****
 # 
-# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+# Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 #
 # This file is part of CLIXON
 #
diff --git a/etc/Makefile.in b/etc/Makefile.in
index 263840df..09c671af 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -1,7 +1,7 @@
 #
 # ***** BEGIN LICENSE BLOCK *****
 # 
-# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+# Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 #
 # This file is part of CLIXON
 #
diff --git a/etc/clixonrc.in b/etc/clixonrc.in
index e06018c6..c2a5cde3 100644
--- a/etc/clixonrc.in
+++ b/etc/clixonrc.in
@@ -1,7 +1,7 @@
 #
 # ***** BEGIN LICENSE BLOCK *****
 # 
-# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+# Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 #
 # This file is part of CLIXON
 #
diff --git a/example/Dockerfile b/example/Dockerfile
index 08314bf8..27cfb737 100644
--- a/example/Dockerfile
+++ b/example/Dockerfile
@@ -1,7 +1,7 @@
 #
 # ***** BEGIN LICENSE BLOCK *****
 # 
-# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+# Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 #
 # This file is part of CLIXON
 #
diff --git a/example/Makefile.in b/example/Makefile.in
index bbbd9070..8e18d3ea 100644
--- a/example/Makefile.in
+++ b/example/Makefile.in
@@ -1,7 +1,7 @@
 #
 # ***** BEGIN LICENSE BLOCK *****
 # 
-# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+# Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 #
 # This file is part of CLIXON
 #
diff --git a/example/example_backend.c b/example/example_backend.c
index ae1f51d4..7c09ee3d 100644
--- a/example/example_backend.c
+++ b/example/example_backend.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/example/example_backend_nacm.c b/example/example_backend_nacm.c
index 3814a975..608916a8 100644
--- a/example/example_backend_nacm.c
+++ b/example/example_backend_nacm.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/example/example_cli.c b/example/example_cli.c
index 01a375a3..3aaf9259 100644
--- a/example/example_cli.c
+++ b/example/example_cli.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/example/example_netconf.c b/example/example_netconf.c
index b70128de..742b1d98 100644
--- a/example/example_netconf.c
+++ b/example/example_netconf.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/example/example_restconf.c b/example/example_restconf.c
index ec0e8d27..e49a48f4 100644
--- a/example/example_restconf.c
+++ b/example/example_restconf.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/include/Makefile.in b/include/Makefile.in
index 75aa04a1..d55e6e97 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -1,7 +1,7 @@
 #
 # ***** BEGIN LICENSE BLOCK *****
 # 
-# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+# Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 #
 # This file is part of CLIXON
 #
diff --git a/include/clixon_custom.h b/include/clixon_custom.h
index 8b7c5ae6..7a6c342a 100644
--- a/include/clixon_custom.h
+++ b/include/clixon_custom.h
@@ -1,7 +1,7 @@
 /*
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/Makefile.in b/lib/Makefile.in
index d34e81ac..a0f09147 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,7 +1,7 @@
 #
 # ***** BEGIN LICENSE BLOCK *****
 # 
-# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+# Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 #
 # This file is part of CLIXON
 #
diff --git a/lib/clixon/Makefile.in b/lib/clixon/Makefile.in
index e455a860..eee5ce91 100644
--- a/lib/clixon/Makefile.in
+++ b/lib/clixon/Makefile.in
@@ -1,7 +1,7 @@
 #
 # ***** BEGIN LICENSE BLOCK *****
 # 
-# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+# Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 #
 # This file is part of CLIXON
 #
diff --git a/lib/clixon/clixon.h.in b/lib/clixon/clixon.h.in
index 2fc6c50d..6615433c 100644
--- a/lib/clixon/clixon.h.in
+++ b/lib/clixon/clixon.h.in
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_err.h b/lib/clixon/clixon_err.h
index b5961453..63fff1fe 100644
--- a/lib/clixon/clixon_err.h
+++ b/lib/clixon/clixon_err.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_event.h b/lib/clixon/clixon_event.h
index 99b598e2..c2ef6edc 100644
--- a/lib/clixon/clixon_event.h
+++ b/lib/clixon/clixon_event.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_file.h b/lib/clixon/clixon_file.h
index 3e34b6ce..44915abd 100644
--- a/lib/clixon/clixon_file.h
+++ b/lib/clixon/clixon_file.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_handle.h b/lib/clixon/clixon_handle.h
index 711e6cb8..944f5911 100644
--- a/lib/clixon/clixon_handle.h
+++ b/lib/clixon/clixon_handle.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_hash.h b/lib/clixon/clixon_hash.h
index 0adbb047..0cbb8129 100644
--- a/lib/clixon/clixon_hash.h
+++ b/lib/clixon/clixon_hash.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_json.h b/lib/clixon/clixon_json.h
index 0a644680..0a4af828 100644
--- a/lib/clixon/clixon_json.h
+++ b/lib/clixon/clixon_json.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_log.h b/lib/clixon/clixon_log.h
index 7db79142..a9835488 100644
--- a/lib/clixon/clixon_log.h
+++ b/lib/clixon/clixon_log.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_nacm.h b/lib/clixon/clixon_nacm.h
index 978b5486..cdae13bb 100644
--- a/lib/clixon/clixon_nacm.h
+++ b/lib/clixon/clixon_nacm.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_netconf_lib.h b/lib/clixon/clixon_netconf_lib.h
index a615c663..2bb4e8f2 100644
--- a/lib/clixon/clixon_netconf_lib.h
+++ b/lib/clixon/clixon_netconf_lib.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_options.h b/lib/clixon/clixon_options.h
index a849c6cd..af92305c 100644
--- a/lib/clixon/clixon_options.h
+++ b/lib/clixon/clixon_options.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_plugin.h b/lib/clixon/clixon_plugin.h
index cd6038aa..09703d90 100644
--- a/lib/clixon/clixon_plugin.h
+++ b/lib/clixon/clixon_plugin.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_proto.h b/lib/clixon/clixon_proto.h
index e3290c3f..3d9e6603 100644
--- a/lib/clixon/clixon_proto.h
+++ b/lib/clixon/clixon_proto.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_proto_client.h b/lib/clixon/clixon_proto_client.h
index ac917d77..07d808b5 100644
--- a/lib/clixon/clixon_proto_client.h
+++ b/lib/clixon/clixon_proto_client.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_queue.h b/lib/clixon/clixon_queue.h
index 70127756..ee277134 100644
--- a/lib/clixon/clixon_queue.h
+++ b/lib/clixon/clixon_queue.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_sha1.h b/lib/clixon/clixon_sha1.h
index 6f788e14..fbf9bfc5 100644
--- a/lib/clixon/clixon_sha1.h
+++ b/lib/clixon/clixon_sha1.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_sig.h b/lib/clixon/clixon_sig.h
index ac03a908..51c29341 100644
--- a/lib/clixon/clixon_sig.h
+++ b/lib/clixon/clixon_sig.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_stream.h b/lib/clixon/clixon_stream.h
index a1870395..ae09a8ab 100644
--- a/lib/clixon/clixon_stream.h
+++ b/lib/clixon/clixon_stream.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_string.h b/lib/clixon/clixon_string.h
index dd2eb290..1b2b20fc 100644
--- a/lib/clixon/clixon_string.h
+++ b/lib/clixon/clixon_string.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_xml.h b/lib/clixon/clixon_xml.h
index 2117bfef..be3e2352 100644
--- a/lib/clixon/clixon_xml.h
+++ b/lib/clixon/clixon_xml.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_xml_db.h b/lib/clixon/clixon_xml_db.h
index 58607396..a79349d1 100644
--- a/lib/clixon/clixon_xml_db.h
+++ b/lib/clixon/clixon_xml_db.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_xml_map.h b/lib/clixon/clixon_xml_map.h
index 9eba5bfd..5148589a 100644
--- a/lib/clixon/clixon_xml_map.h
+++ b/lib/clixon/clixon_xml_map.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_xml_sort.h b/lib/clixon/clixon_xml_sort.h
index c4ffeab3..2a58472f 100644
--- a/lib/clixon/clixon_xml_sort.h
+++ b/lib/clixon/clixon_xml_sort.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_xpath.h b/lib/clixon/clixon_xpath.h
index ce62fc23..d0d6a360 100644
--- a/lib/clixon/clixon_xpath.h
+++ b/lib/clixon/clixon_xpath.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_xpath_ctx.h b/lib/clixon/clixon_xpath_ctx.h
index 03854495..0a1bb122 100644
--- a/lib/clixon/clixon_xpath_ctx.h
+++ b/lib/clixon/clixon_xpath_ctx.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_yang.h b/lib/clixon/clixon_yang.h
index a9291583..fb727dfd 100644
--- a/lib/clixon/clixon_yang.h
+++ b/lib/clixon/clixon_yang.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_yang_module.h b/lib/clixon/clixon_yang_module.h
index 0ca4760c..2a26b7ba 100644
--- a/lib/clixon/clixon_yang_module.h
+++ b/lib/clixon/clixon_yang_module.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_yang_type.h b/lib/clixon/clixon_yang_type.h
index 61b581af..8fecdd5f 100644
--- a/lib/clixon/clixon_yang_type.h
+++ b/lib/clixon/clixon_yang_type.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/Makefile.in b/lib/src/Makefile.in
index ce0c0587..fc8fa3e4 100644
--- a/lib/src/Makefile.in
+++ b/lib/src/Makefile.in
@@ -1,7 +1,7 @@
 #
 # ***** BEGIN LICENSE BLOCK *****
 # 
-# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+# Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 #
 # This file is part of CLIXON
 #
diff --git a/lib/src/clixon_err.c b/lib/src/clixon_err.c
index 6ec992c6..b4f07fbf 100644
--- a/lib/src/clixon_err.c
+++ b/lib/src/clixon_err.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_event.c b/lib/src/clixon_event.c
index d15e12c5..3085f89c 100644
--- a/lib/src/clixon_event.c
+++ b/lib/src/clixon_event.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_file.c b/lib/src/clixon_file.c
index 22998553..73a2b894 100644
--- a/lib/src/clixon_file.c
+++ b/lib/src/clixon_file.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_handle.c b/lib/src/clixon_handle.c
index dcb6da5c..a89d81fd 100644
--- a/lib/src/clixon_handle.c
+++ b/lib/src/clixon_handle.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_hash.c b/lib/src/clixon_hash.c
index aa397d4d..4769abfa 100644
--- a/lib/src/clixon_hash.c
+++ b/lib/src/clixon_hash.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_json.c b/lib/src/clixon_json.c
index 1cd99af1..f6f8ff23 100644
--- a/lib/src/clixon_json.c
+++ b/lib/src/clixon_json.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_json_parse.h b/lib/src/clixon_json_parse.h
index 8196e942..0f088a32 100644
--- a/lib/src/clixon_json_parse.h
+++ b/lib/src/clixon_json_parse.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_json_parse.l b/lib/src/clixon_json_parse.l
index 3763d7f1..6d720140 100644
--- a/lib/src/clixon_json_parse.l
+++ b/lib/src/clixon_json_parse.l
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_json_parse.y b/lib/src/clixon_json_parse.y
index 1cf6a583..a6533a06 100644
--- a/lib/src/clixon_json_parse.y
+++ b/lib/src/clixon_json_parse.y
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_log.c b/lib/src/clixon_log.c
index 87e0c8de..4c8641c3 100644
--- a/lib/src/clixon_log.c
+++ b/lib/src/clixon_log.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_nacm.c b/lib/src/clixon_nacm.c
index bf60b865..8efa4421 100644
--- a/lib/src/clixon_nacm.c
+++ b/lib/src/clixon_nacm.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_netconf_lib.c b/lib/src/clixon_netconf_lib.c
index b8981bbc..cfa93882 100644
--- a/lib/src/clixon_netconf_lib.c
+++ b/lib/src/clixon_netconf_lib.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_options.c b/lib/src/clixon_options.c
index e6410ad8..449b33ae 100644
--- a/lib/src/clixon_options.c
+++ b/lib/src/clixon_options.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_plugin.c b/lib/src/clixon_plugin.c
index 03ed2b29..f0a28a6f 100644
--- a/lib/src/clixon_plugin.c
+++ b/lib/src/clixon_plugin.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_proto.c b/lib/src/clixon_proto.c
index 17b09614..30da4e59 100644
--- a/lib/src/clixon_proto.c
+++ b/lib/src/clixon_proto.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_proto_client.c b/lib/src/clixon_proto_client.c
index 396a0665..0dbb76d1 100644
--- a/lib/src/clixon_proto_client.c
+++ b/lib/src/clixon_proto_client.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_sig.c b/lib/src/clixon_sig.c
index c1374876..d7c27335 100644
--- a/lib/src/clixon_sig.c
+++ b/lib/src/clixon_sig.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_stream.c b/lib/src/clixon_stream.c
index ae454256..6bad4671 100644
--- a/lib/src/clixon_stream.c
+++ b/lib/src/clixon_stream.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_string.c b/lib/src/clixon_string.c
index a7c05f39..b3e5e588 100644
--- a/lib/src/clixon_string.c
+++ b/lib/src/clixon_string.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_xml.c b/lib/src/clixon_xml.c
index 6849e94d..d4f15a13 100644
--- a/lib/src/clixon_xml.c
+++ b/lib/src/clixon_xml.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_xml_db.c b/lib/src/clixon_xml_db.c
index 32aab817..8fb5da70 100644
--- a/lib/src/clixon_xml_db.c
+++ b/lib/src/clixon_xml_db.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_xml_map.c b/lib/src/clixon_xml_map.c
index 5d210644..5b4f513d 100644
--- a/lib/src/clixon_xml_map.c
+++ b/lib/src/clixon_xml_map.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_xml_parse.h b/lib/src/clixon_xml_parse.h
index 3122e8f0..35ee2dee 100644
--- a/lib/src/clixon_xml_parse.h
+++ b/lib/src/clixon_xml_parse.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_xml_parse.l b/lib/src/clixon_xml_parse.l
index 39173634..812b246c 100644
--- a/lib/src/clixon_xml_parse.l
+++ b/lib/src/clixon_xml_parse.l
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_xml_parse.y b/lib/src/clixon_xml_parse.y
index d6a1200f..9e2eafaa 100644
--- a/lib/src/clixon_xml_parse.y
+++ b/lib/src/clixon_xml_parse.y
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_xml_sort.c b/lib/src/clixon_xml_sort.c
index 265d82a5..d227a961 100644
--- a/lib/src/clixon_xml_sort.c
+++ b/lib/src/clixon_xml_sort.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_xpath.c b/lib/src/clixon_xpath.c
index 2fec113a..b814ffc4 100644
--- a/lib/src/clixon_xpath.c
+++ b/lib/src/clixon_xpath.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_xpath_ctx.c b/lib/src/clixon_xpath_ctx.c
index 721df45c..a50ff5c2 100644
--- a/lib/src/clixon_xpath_ctx.c
+++ b/lib/src/clixon_xpath_ctx.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_xpath_parse.h b/lib/src/clixon_xpath_parse.h
index 1affce3c..6ba57672 100644
--- a/lib/src/clixon_xpath_parse.h
+++ b/lib/src/clixon_xpath_parse.h
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_xpath_parse.l b/lib/src/clixon_xpath_parse.l
index 5ac54644..a886dd70 100644
--- a/lib/src/clixon_xpath_parse.l
+++ b/lib/src/clixon_xpath_parse.l
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_xpath_parse.y b/lib/src/clixon_xpath_parse.y
index 4e055ca7..b121cc2c 100644
--- a/lib/src/clixon_xpath_parse.y
+++ b/lib/src/clixon_xpath_parse.y
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_yang.c b/lib/src/clixon_yang.c
index 2298235a..36404682 100644
--- a/lib/src/clixon_yang.c
+++ b/lib/src/clixon_yang.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_yang_cardinality.c b/lib/src/clixon_yang_cardinality.c
index 9c26fe92..638a077b 100644
--- a/lib/src/clixon_yang_cardinality.c
+++ b/lib/src/clixon_yang_cardinality.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_yang_cardinality.h b/lib/src/clixon_yang_cardinality.h
index eb71e8ea..815d8d56 100644
--- a/lib/src/clixon_yang_cardinality.h
+++ b/lib/src/clixon_yang_cardinality.h
@@ -1,7 +1,7 @@
 /*
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_yang_module.c b/lib/src/clixon_yang_module.c
index c0b1e408..500aaf89 100644
--- a/lib/src/clixon_yang_module.c
+++ b/lib/src/clixon_yang_module.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_yang_parse.h b/lib/src/clixon_yang_parse.h
index baa136df..d85e8f6b 100644
--- a/lib/src/clixon_yang_parse.h
+++ b/lib/src/clixon_yang_parse.h
@@ -5,7 +5,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_yang_parse.l b/lib/src/clixon_yang_parse.l
index 58715c0c..905eb388 100644
--- a/lib/src/clixon_yang_parse.l
+++ b/lib/src/clixon_yang_parse.l
@@ -1,7 +1,7 @@
 /*
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_yang_parse.y b/lib/src/clixon_yang_parse.y
index 7bd42cc1..9ffac45e 100644
--- a/lib/src/clixon_yang_parse.y
+++ b/lib/src/clixon_yang_parse.y
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_yang_type.c b/lib/src/clixon_yang_type.c
index 788af4f7..d043abff 100644
--- a/lib/src/clixon_yang_type.c
+++ b/lib/src/clixon_yang_type.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/util/Makefile.in b/util/Makefile.in
index 5095b612..657cd3db 100644
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -1,7 +1,7 @@
 #
 # ***** BEGIN LICENSE BLOCK *****
 # 
-# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+# Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 #
 # This file is part of CLIXON
 #
diff --git a/util/clixon_util_json.c b/util/clixon_util_json.c
index dd16e0e0..b60e2299 100644
--- a/util/clixon_util_json.c
+++ b/util/clixon_util_json.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/util/clixon_util_stream.c b/util/clixon_util_stream.c
index 6f45de57..3530514f 100644
--- a/util/clixon_util_stream.c
+++ b/util/clixon_util_stream.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/util/clixon_util_xml.c b/util/clixon_util_xml.c
index 88d2ab53..8b3e3fa6 100644
--- a/util/clixon_util_xml.c
+++ b/util/clixon_util_xml.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/util/clixon_util_xpath.c b/util/clixon_util_xpath.c
index 81b33361..b711b072 100644
--- a/util/clixon_util_xpath.c
+++ b/util/clixon_util_xpath.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/util/clixon_util_yang.c b/util/clixon_util_yang.c
index 3615fd27..9f3b0e15 100644
--- a/util/clixon_util_yang.c
+++ b/util/clixon_util_yang.c
@@ -2,7 +2,7 @@
  *
   ***** BEGIN LICENSE BLOCK *****
  
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+  Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 
   This file is part of CLIXON.
 
diff --git a/yang/Makefile.in b/yang/Makefile.in
index b595b5ea..fb32b74d 100644
--- a/yang/Makefile.in
+++ b/yang/Makefile.in
@@ -1,7 +1,7 @@
 #
 # ***** BEGIN LICENSE BLOCK *****
 # 
-# Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+# Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
 #
 # This file is part of CLIXON
 #
diff --git a/yang/clixon-config@2018-10-21.yang b/yang/clixon-config@2018-10-21.yang
index 99d5b596..d6b8c2c1 100644
--- a/yang/clixon-config@2018-10-21.yang
+++ b/yang/clixon-config@2018-10-21.yang
@@ -12,7 +12,7 @@ module clixon-config {
     description
       "Clixon configuration file
        ***** BEGIN LICENSE BLOCK *****
-       Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
+       Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
        
        This file is part of CLIXON
 

From 32ea957a524c36828b879d3498741baae00f20c0 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Wed, 2 Jan 2019 17:43:58 +0100
Subject: [PATCH 19/72] CLICON_XML_SORT option (in clixon-config.yang) has been
 removed and set to true permanently since setting it to false is obsolete.

---
 CHANGELOG.md                       |  1 +
 apps/backend/backend_client.c      |  2 +-
 apps/backend/backend_main.c        |  2 -
 datastore/text/clixon_xmldb_text.c | 29 ++----------
 example/example_cli.c              |  2 +-
 lib/clixon/clixon_options.h        |  3 --
 lib/clixon/clixon_xml_map.h        |  1 -
 lib/clixon/clixon_xml_sort.h       |  9 +---
 lib/src/clixon_options.c           |  7 +--
 lib/src/clixon_xml_map.c           | 74 ++----------------------------
 lib/src/clixon_xml_sort.c          | 24 ++--------
 test/test_cli.sh                   |  8 +++-
 test/test_nacm_ext.sh              |  2 +-
 yang/clixon-config@2018-10-21.yang |  9 ----
 14 files changed, 28 insertions(+), 145 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad2ebd7a..cbc70587 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -79,6 +79,7 @@
     * CLICON_YANG_MAIN_DIR Provides a directory where all yang modules should be loaded.
 
 ### API changes on existing features (you may need to change your code)
+* CLICON_XML_SORT option (in clixon-config.yang) has been removed and set to true permanently since setting it to false is obsolete.
 * Strict namespace setting can be a problem when upgrading existing database files, such as startup-db or persistent running-db, or any other saved XML file.
   * For backward compatibility, load of startup and running set CLICON_XML_NS_STRICT to false temporarily.
 * Removed `delete-config` support for candidate db since it is not supported in RFC6241.
diff --git a/apps/backend/backend_client.c b/apps/backend/backend_client.c
index c9ea04ad..6a8b5943 100644
--- a/apps/backend/backend_client.c
+++ b/apps/backend/backend_client.c
@@ -482,7 +482,7 @@ from_client_edit_config(clicon_handle h,
 	/* Cant do this earlier since we dont have a yang spec to
 	 * the upper part of the tree, until we get the "config" tree.
 	 */
-	if (clicon_xml_sort(h) && xml_apply0(xc, CX_ELMNT, xml_sort, NULL) < 0)
+	if (xml_apply0(xc, CX_ELMNT, xml_sort, NULL) < 0)
 	    goto done;
 	if ((ret = xmldb_put(h, target, operation, xc, cbret)) < 0){
 	    clicon_debug(1, "%s ERROR PUT", __FUNCTION__);	
diff --git a/apps/backend/backend_main.c b/apps/backend/backend_main.c
index 77d791cf..8e05c175 100644
--- a/apps/backend/backend_main.c
+++ b/apps/backend/backend_main.c
@@ -832,8 +832,6 @@ main(int    argc,
 	    goto done;
     if (xmldb_setopt(h, "pretty", (void*)(intptr_t)clicon_option_bool(h, "CLICON_XMLDB_PRETTY")) < 0)
 	goto done;
-    if (xmldb_setopt(h, "sort", (void*)(intptr_t)clicon_option_bool(h, "CLICON_XML_SORT")) < 0)
-	goto done;
     /* Startup mode needs to be defined,  */
     startup_mode = clicon_startup_mode(h);
     if (startup_mode == -1){ 	
diff --git a/datastore/text/clixon_xmldb_text.c b/datastore/text/clixon_xmldb_text.c
index d4160253..42210170 100644
--- a/datastore/text/clixon_xmldb_text.c
+++ b/datastore/text/clixon_xmldb_text.c
@@ -88,8 +88,6 @@ struct text_handle {
 				   Assumes single backend*/
     char          *th_format;   /* Datastroe format: xml / json */
     int            th_pretty;   /* Store xml/json pretty-printed. */
-    int            th_sort;     /* Sort XML lists and leaf-lists alphabetically 
-				   (unless ordered-by user) */
 };
 
 /* Struct per database in hash */
@@ -241,8 +239,6 @@ text_getopt(xmldb_handle xh,
 	*value = th->th_format;
     else if (strcmp(optname, "pretty") == 0)
 	*value = &th->th_pretty;
-    else if (strcmp(optname, "sort") == 0)
-	*value = &th->th_sort;
     else{
 	clicon_err(OE_PLUGIN, 0, "Option %s not implemented by plugin", optname);
 	goto done;
@@ -292,9 +288,6 @@ text_setopt(xmldb_handle xh,
     else if (strcmp(optname, "pretty") == 0){
 	th->th_pretty = (intptr_t)value;
     }
-    else if (strcmp(optname, "sort") == 0){
-	th->th_sort = (intptr_t)value;
-    }
     else{
 	clicon_err(OE_PLUGIN, 0, "Option %s not implemented by plugin", optname);
 	goto done;
@@ -551,14 +544,8 @@ text_get(xmldb_handle xh,
     /* Add default values (if not set) */
     if (xml_apply(xt, CX_ELMNT, xml_default, NULL) < 0)
 	goto done;
-    /* Order XML children according to YANG.
-     * XXX: should this be !th->th_sort?
-     */
-    if (!th->th_sort)
-	if (xml_apply(xt, CX_ELMNT, xml_order, NULL) < 0)
-	    goto done;
 #if 1 /* debug */
-    if (th->th_sort && xml_apply0(xt, -1, xml_sort_verify, NULL) < 0)
+    if (xml_apply0(xt, -1, xml_sort_verify, NULL) < 0)
 	clicon_log(LOG_NOTICE, "%s: sort verify failed #2", __FUNCTION__);
 #endif
     if (debug>1)
@@ -741,7 +728,7 @@ text_modify(struct text_handle *th,
 		}
 		/* See if there is a corresponding node in the base tree */
 		x0c = NULL;
-		if (match_base_child(x0, x1c, &x0c, th->th_sort, yc) < 0)
+		if (match_base_child(x0, x1c, &x0c, yc) < 0)
 		    goto done;
 		x0vec[i++] = x0c;
 	    }
@@ -865,7 +852,7 @@ text_modify_top(struct text_handle *th,
 	    goto ok;
 	}
 	/* See if there is a corresponding node in the base tree */
-	if (match_base_child(x0, x1c, &x0c, th->th_sort, yc) < 0)
+	if (match_base_child(x0, x1c, &x0c, yc) < 0)
 	    goto done;
 	if (text_modify(th, x0c, (yang_node*)yc, x0, x1c, op, cbret) < 0)
 	    goto done;
@@ -996,14 +983,8 @@ text_put(xmldb_handle        xh,
 		   xml_name(x0));
 	goto done;
     }
-#if 0
-    /* Add yang specification backpointer to all XML nodes 
-     * This  is already done in from_client_edit_config() */
-    if (xml_apply(x1, CX_ELMNT, xml_spec_populate, yspec) < 0)
-       goto done;
-#endif
 #if 0 /* debug */
-    if (th->th_sort && xml_apply0(x1, -1, xml_sort_verify, NULL) < 0)
+    if (xml_apply0(x1, -1, xml_sort_verify, NULL) < 0)
 	clicon_log(LOG_NOTICE, "%s: verify failed #1", __FUNCTION__);
 #endif
     /* 
@@ -1029,7 +1010,7 @@ text_put(xmldb_handle        xh,
     if (xml_tree_prune_flagged(x0, XML_FLAG_MARK, 1) < 0)
 	goto done;
 #if 0 /* debug */
-    if (th->th_sort && xml_apply0(x0, -1, xml_sort_verify, NULL) < 0)
+    if (xml_apply0(x0, -1, xml_sort_verify, NULL) < 0)
 	clicon_log(LOG_NOTICE, "%s: verify failed #3", __FUNCTION__);
 #endif
     /* Write back to datastore cache if first time */
diff --git a/example/example_cli.c b/example/example_cli.c
index 3aaf9259..bf24064d 100644
--- a/example/example_cli.c
+++ b/example/example_cli.c
@@ -110,7 +110,7 @@ fib_route_rpc(clicon_handle h,
 	goto done;
     }
     /* Print result */
-    xml2txt(stdout, xml_child_i(xret, 0), 1);
+    xml2txt(stdout, xml_child_i(xret, 0), 0);
     retval = 0;
  done:
     if (xret)
diff --git a/lib/clixon/clixon_options.h b/lib/clixon/clixon_options.h
index af92305c..04aae2e6 100644
--- a/lib/clixon/clixon_options.h
+++ b/lib/clixon/clixon_options.h
@@ -153,9 +153,6 @@ static inline char *clicon_xmldb_dir(clicon_handle h){
 static inline char *clicon_xmldb_plugin(clicon_handle h){
     return clicon_option_str(h, "CLICON_XMLDB_PLUGIN");
 }
-static inline int clicon_xml_sort(clicon_handle h){
-    return clicon_option_bool(h, "CLICON_XML_SORT");
-}
 
 /*-- Specific option access functions for YANG options w type conversion--*/
 int   clicon_cli_genmodel(clicon_handle h);
diff --git a/lib/clixon/clixon_xml_map.h b/lib/clixon/clixon_xml_map.h
index 5148589a..2fa2afeb 100644
--- a/lib/clixon/clixon_xml_map.h
+++ b/lib/clixon/clixon_xml_map.h
@@ -62,7 +62,6 @@ int api_path_fmt2xpath(char *api_path_fmt, cvec *cvv, char **xpath);
 int xml_tree_prune_flagged_sub(cxobj *xt, int flag, int test, int *upmark);
 int xml_tree_prune_flagged(cxobj *xt, int flag, int test);
 int xml_default(cxobj *x, void  *arg);
-int xml_order(cxobj *x, void  *arg);
 int xml_sanity(cxobj *x, void  *arg);
 int xml_non_config_data(cxobj *xt, void *arg);
 int xml_spec_populate_rpc(clicon_handle h, cxobj *x, yang_spec *yspec);
diff --git a/lib/clixon/clixon_xml_sort.h b/lib/clixon/clixon_xml_sort.h
index 2a58472f..83f94f44 100644
--- a/lib/clixon/clixon_xml_sort.h
+++ b/lib/clixon/clixon_xml_sort.h
@@ -36,13 +36,6 @@
 #ifndef _CLIXON_XML_SORT_H
 #define _CLIXON_XML_SORT_H
 
-/* Sort and binary search of XML children
- * XXX This variable is a kludge since low-level functions xml_merge/xml_diff calls 
- * match_base_child without handle
- * @see clicon_xml_sort
- */
-extern int xml_child_sort;
-
 /*
  * Prototypes
  */
@@ -55,6 +48,6 @@ int    xml_insert_pos(cxobj *x0, char *name, int yangi, enum rfc_6020 keyword,
 		      int upper);
 cxobj *xml_match(cxobj *x0, char *name, enum rfc_6020 keyword, int keynr, char **keyvec, char **keyval);
 int    xml_sort_verify(cxobj *x, void *arg);
-int    match_base_child(cxobj *x0, cxobj *x1c, cxobj **x0cp, int xml_sort, yang_stmt *yc);
+int    match_base_child(cxobj *x0, cxobj *x1c, cxobj **x0cp, yang_stmt *yc);
 
 #endif /* _CLIXON_XML_SORT_H */
diff --git a/lib/src/clixon_options.c b/lib/src/clixon_options.c
index 449b33ae..4fdb1dce 100644
--- a/lib/src/clixon_options.c
+++ b/lib/src/clixon_options.c
@@ -207,6 +207,8 @@ parse_configfile(clicon_handle  h,
     *xconfig = xt;
     xt = NULL;
   done:
+    if (cbret)
+	cbuf_free(cbret);
     if (xt)
 	xml_free(xt);
     if (f)
@@ -275,11 +277,6 @@ clicon_options_main(clicon_handle h,
 	goto done;
     /* Set clixon_conf pointer to handle */
     clicon_conf_xml_set(h, xconfig);
-    /* Specific option handling */
-    if (clicon_option_bool(h, "CLICON_XML_SORT") == 1)
-	xml_child_sort = 1;
-    else
-	xml_child_sort = 0;
     /* XXX Kludge to low-level functions to search for xml in all yang modules */
     _CLICON_XML_NS_STRICT = clicon_option_bool(h, "CLICON_XML_NS_STRICT");
     retval = 0;
diff --git a/lib/src/clixon_xml_map.c b/lib/src/clixon_xml_map.c
index 5b4f513d..d3585ee4 100644
--- a/lib/src/clixon_xml_map.c
+++ b/lib/src/clixon_xml_map.c
@@ -988,8 +988,7 @@ xml_diff1(yang_stmt *ys,
 	    clicon_err(OE_UNIX, errno, "Unknown element: %s", xml_name(x1c));
 	    goto done;
 	}
-	/* XXX xml_child_sort is global */
-	if (match_base_child(x2, x1c, &x2c, xml_child_sort, yc) < 0)
+	if (match_base_child(x2, x1c, &x2c, yc) < 0)
 	    goto done;
 	if (x2c == NULL){
 	    if (cxvec_append(x1c, x1vec, x1veclen) < 0) 
@@ -1025,8 +1024,7 @@ xml_diff1(yang_stmt *ys,
 	    clicon_err(OE_UNIX, errno, "Unknown element: %s", xml_name(x2c));
 	    goto done;
 	}
-	/* XXX xml_child_sort is global */
-        if (match_base_child(x1, x2c, &x1c, xml_child_sort, yc) < 0)
+        if (match_base_child(x1, x2c, &x1c, yc) < 0)
 	    goto done;
 	if (x1c == NULL)
 	    if (cxvec_append(x2c, x2vec, x2veclen) < 0) 
@@ -1550,70 +1548,6 @@ xml_default(cxobj *xt,
     return retval;
 }
 
-/*! Order XML children according to YANG
- * @param[in]   xt      XML top of tree
- * @param[in]   arg     Dummy (so it can be called from xml_apply)
- * @see xml_sort XXX: how do they relate?
- * Called from text_get *only*
- */
-int
-xml_order(cxobj *xt, 
-	  void  *arg)
-{
-    int        retval = -1;
-    yang_stmt *y;
-    yang_stmt *yc;
-    int        i;
-    int        j0;
-    int        j;
-    cxobj     *xc;
-    cxobj     *xj;
-    char      *yname; /* yang child name */
-    char      *xname; /* xml child name */
-
-    if ((y = (yang_stmt*)xml_spec(xt)) == NULL){
-	retval = 0;
-	goto done;
-    }
-    j0 = 0;
-    /* Go through yang node's children and ensure that the 
-     * xml children follow this order.
-     * Do not order the list or leaf-list children (have same name).
-     */
-    for (i=0; i<y->ys_len; i++){
-	yc = y->ys_stmt[i];
-	if (!yang_datanode(yc))
-	    continue;
-	yname = yc->ys_argument;
-	/* First go thru xml children with same name in rest of list */
-	for (; j0<xml_child_nr(xt); j0++){
-	    xc = xml_child_i(xt, j0);
-	    if (xml_type(xc) != CX_ELMNT)
-		continue;
-	    xname = xml_name(xc);
-	    if (strcmp(xname, yname))
-		break;
-	}
-	/* Now we have children not with same name */
-	for (j=j0; j<xml_child_nr(xt); j++){
-	    xc = xml_child_i(xt, j);
-	    if (xml_type(xc) != CX_ELMNT)
-		continue;
-	    xname = xml_name(xc);
-	    if (strcmp(xname, yname))
-		continue;
-	    /* reorder */
-	    xj = xml_child_i(xt, j0);
-	    xml_child_i_set(xt, j0, xc);
-	    xml_child_i_set(xt, j, xj);
-	    j0++;
-	}
-    }
-    retval = 0;
- done:
-    return retval;
-}
-
 /*! Sanitize an xml tree: xml node has matching yang_stmt pointer 
  * @param[in]   xt      XML top of tree
  */
@@ -2272,7 +2206,7 @@ xml_merge1(cxobj              *x0,
 	    }
 	    /* See if there is a corresponding node in the base tree */
 	    x0c = NULL;
-	    if (yc && match_base_child(x0, x1c, &x0c, xml_child_sort, yc) < 0)
+	    if (yc && match_base_child(x0, x1c, &x0c, yc) < 0)
 		goto done;
 	    if (xml_merge1(x0c, (yang_node*)yc, x0, x1c, reason) < 0)
 		goto done;
@@ -2354,7 +2288,7 @@ xml_merge(cxobj     *x0,
 	    break;
 	}
 	/* See if there is a corresponding node in the base tree */
-	if (match_base_child(x0, x1c, &x0c, xml_child_sort, yc) < 0)
+	if (match_base_child(x0, x1c, &x0c, yc) < 0)
 	    goto done;
 	if (xml_merge1(x0c, (yang_node*)yc, x0, x1c, reason) < 0)
 	    goto done;
diff --git a/lib/src/clixon_xml_sort.c b/lib/src/clixon_xml_sort.c
index d227a961..7f08b35e 100644
--- a/lib/src/clixon_xml_sort.c
+++ b/lib/src/clixon_xml_sort.c
@@ -69,13 +69,6 @@
  * Variables
  */
 
-/* Sort and binary search of XML children
- * XXX kludge since low-level functions xml_merge/xml_diff calls 
- * match_base_child without handle
- * @see clicon_xml_sort
- */
-int xml_child_sort = 1;
-
 /*! Given a child name and an XML object, return yang stmt of child
  * If no xml parent, find root yang stmt matching name
  * @param[in]  x        Child
@@ -267,7 +260,6 @@ xml_cmp1(cxobj        *x,
  * Assume populated by yang spec.
  * @param[in] x0   XML node
  * @param[in] arg  Dummy so it can be called by xml_apply()
- * @see xml_order XXX: how do they relate?
  */
 int
 xml_sort(cxobj *x,
@@ -566,7 +558,6 @@ xml_sort_verify(cxobj *x0,
  * param[in]  x0      Base tree node
  * param[in]  x1c     Modification tree child
  * param[in]  yc      Yang spec of tree child
- * param[in]  xml_sort Value of CLICON_XML_SORT option
  * param[out] x0cp Matching base tree child (if any)
  * @note XXX: room for optimization? on 1K calls we have 1M body calls and
 	   500K xml_child_each/cvec_each calls. 
@@ -579,7 +570,6 @@ int
 match_base_child(cxobj     *x0, 
 		 cxobj     *x1c,
 		 cxobj    **x0cp,
-		 int        xml_sort,
 		 yang_stmt *yc)
 {
     int        retval = -1;
@@ -637,16 +627,12 @@ match_base_child(cxobj     *x0,
 	break;
     }
     /* Get match. Sorting mode(optimized) or not?*/
-    if (xml_sort==0)
-	*x0cp = xml_match(x0, xml_name(x1c), yc->ys_keyword, keynr, keyvec, keyval);
+    if (xml_child_nr(x0)==0 || xml_spec(xml_child_i(x0,0))!=NULL){
+	yorder = yang_order(yc);
+	*x0cp = xml_search(x0, xml_name(x1c), yorder, yc->ys_keyword, keynr, keyvec, keyval);
+    }
     else{
-	if (xml_child_nr(x0)==0 || xml_spec(xml_child_i(x0,0))!=NULL){
-	    yorder = yang_order(yc);
-	    *x0cp = xml_search(x0, xml_name(x1c), yorder, yc->ys_keyword, keynr, keyvec, keyval);
-	}
-	else{
-	    *x0cp = xml_match(x0, xml_name(x1c), yc->ys_keyword, keynr, keyvec, keyval);
-	}
+	*x0cp = xml_match(x0, xml_name(x1c), yc->ys_keyword, keynr, keyvec, keyval);
     }
  ok:
     retval = 0;
diff --git a/test/test_cli.sh b/test/test_cli.sh
index b4005433..23fee546 100755
--- a/test/test_cli.sh
+++ b/test/test_cli.sh
@@ -115,7 +115,13 @@ expectfn "$clixon_cli -1 -f $cfg -l o debug level 1" 0 "^$"
 expectfn "$clixon_cli -1 -f $cfg -l o debug level 0" 0 "^$"
 
 new "cli rpc"
-expectfn "$clixon_cli -1 -f $cfg -l o rpc ipv4" 0 "<address-family>ipv4</address-family>" "<next-hop-list>2.3.4.5</next-hop-list>"
+expectfn "$clixon_cli -1 -f $cfg -l o rpc ipv4" 0 'rpc-reply {
+    route {
+        address-family ipv4;
+        next-hop {
+            next-hop-list 2.3.4.5;
+        }
+        source-protocol static;'
 
 if [ $BE -eq 0 ]; then
     exit # BE
diff --git a/test/test_nacm_ext.sh b/test/test_nacm_ext.sh
index b706b96f..b9cef0e1 100755
--- a/test/test_nacm_ext.sh
+++ b/test/test_nacm_ext.sh
@@ -209,7 +209,7 @@ new "cli show conf as guest"
 expectfn "$clixon_cli -1 -U guest -l o -f $cfg -y $fyang show conf" 255 "protocol access-denied"
 
 new "cli rpc as admin"
-expectfn "$clixon_cli -1 -U andy -l o -f $cfg -y $fyang rpc ipv4" 0 "<next-hop-list>2.3.4.5</next-hop-list>"
+expectfn "$clixon_cli -1 -U andy -l o -f $cfg -y $fyang rpc ipv4" 0 "next-hop-list 2.3.4.5;"
 
 new "cli rpc as limited"
 expectfn "$clixon_cli -1 -U wilma -l o -f $cfg -y $fyang rpc ipv4" 255 "protocol access-denied default deny"
diff --git a/yang/clixon-config@2018-10-21.yang b/yang/clixon-config@2018-10-21.yang
index d6b8c2c1..efa777e3 100644
--- a/yang/clixon-config@2018-10-21.yang
+++ b/yang/clixon-config@2018-10-21.yang
@@ -344,15 +344,6 @@ module clixon-config {
                  If set, insert spaces and line-feeds making the XML/JSON human
                  readable. If not set, make the XML/JSON more compact.";
 	}
-	leaf CLICON_XML_SORT {
-	    type boolean;
-	    default true;
-	    description
-		"If set, sort XML lists and leaf-lists alphabetically and uses binary
-                 search. Unless ordered-by user is used. 
-                 Only works for Yang specified XML.
-                 If not set, all lists accessed via linear search.";
-	}
 	leaf CLICON_XML_NS_STRICT {
 	    type boolean;
 	    default true;

From 6c48165340540c865de5d173990f7c1b14599e6d Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Wed, 2 Jan 2019 18:20:50 +0100
Subject: [PATCH 20/72] three-valued return values for datastore text_modify

---
 apps/backend/backend_commit.c      |  2 +-
 datastore/text/clixon_xmldb_text.c | 84 ++++++++++++++++++------------
 example/example_backend.c          | 12 ++++-
 lib/src/clixon_xml_db.c            |  2 +-
 4 files changed, 63 insertions(+), 37 deletions(-)

diff --git a/apps/backend/backend_commit.c b/apps/backend/backend_commit.c
index 61e9a246..d7c2d6c3 100644
--- a/apps/backend/backend_commit.c
+++ b/apps/backend/backend_commit.c
@@ -285,7 +285,7 @@ candidate_commit(clicon_handle h,
 
      /* Optionally write (potentially modified) tree back to candidate */
      if (clicon_option_bool(h, "CLICON_TRANSACTION_MOD")){
-	 if ((ret = xmldb_put(h, candidate, OP_REPLACE, td->td_target, NULL)) < 0)
+	 if ((ret = xmldb_put(h, candidate, OP_REPLACE, td->td_target, cbret)) < 0)
 	     goto done;
 	 if (ret == 0)
 	     goto fail;
diff --git a/datastore/text/clixon_xmldb_text.c b/datastore/text/clixon_xmldb_text.c
index 42210170..c4d2d1b4 100644
--- a/datastore/text/clixon_xmldb_text.c
+++ b/datastore/text/clixon_xmldb_text.c
@@ -572,7 +572,10 @@ text_get(xmldb_handle xh,
  * @param[in]  x0p Parent of x0
  * @param[in]  x1  xml tree which modifies base
  * @param[in]  op  OP_MERGE, OP_REPLACE, OP_REMOVE, etc 
- * @param[out] cbret  Initialized cligen buffer. Contains return XML or "".
+ * @param[out] cbret  Initialized cligen buffer. Contains return XML if retval is 0.
+ * @retval    -1     Error
+ * @retval     0     Failed (cbret set)
+ * @retval     1     OK
  * Assume x0 and x1 are same on entry and that y is the spec
  * @see text_modify_top
  */
@@ -598,6 +601,7 @@ text_modify(struct text_handle *th,
     yang_stmt *yc;  /* yang child */
     cxobj    **x0vec = NULL;
     int        i;
+    int        ret;
 
     assert(x1 && xml_type(x1) == CX_ELMNT);
     assert(y0);
@@ -613,7 +617,7 @@ text_modify(struct text_handle *th,
 	    if (x0){
 		if (netconf_data_exists(cbret, "Data already exists; cannot create new resource") < 0)
 		    goto done;
-		goto ok;
+		goto fail;
 	    }
 	case OP_NONE: /* fall thru */
 	case OP_MERGE:
@@ -658,7 +662,7 @@ text_modify(struct text_handle *th,
 	    if (x0==NULL){
 		if (netconf_data_missing(cbret, "Data does not exist; cannot delete resource") < 0)
 		    goto done;
-		goto ok;
+		goto fail;
 	    }
 	case OP_REMOVE: /* fall thru */
 	    if (x0){
@@ -675,7 +679,7 @@ text_modify(struct text_handle *th,
 	    if (x0){
 		if (netconf_data_exists(cbret, "Data already exists; cannot create new resource") < 0)
 		    goto done;
-		goto ok;
+		goto fail;
 	    }
 	case OP_REPLACE: /* fall thru */
 	    if (x0){
@@ -738,18 +742,18 @@ text_modify(struct text_handle *th,
 	    while ((x1c = xml_child_each(x1, x1c, CX_ELMNT)) != NULL) {
 		x1cname = xml_name(x1c);
 		yc = yang_find_datanode(y0, x1cname);
-		if (text_modify(th, x0vec[i++], (yang_node*)yc, x0, x1c, op, cbret) < 0)
+		if ((ret = text_modify(th, x0vec[i++], (yang_node*)yc, x0, x1c, op, cbret)) < 0)
 		    goto done;
 		/* If xml return - ie netconf error xml tree, then stop and return OK */
-		if (cbuf_len(cbret))
-		    goto ok;
+		if (ret == 0)
+		    goto fail;
 	    }
 	    break;
 	case OP_DELETE:
 	    if (x0==NULL){
 		if (netconf_data_missing(cbret, "Data does not exist; cannot delete resource") < 0)
 		    goto done;
-		goto ok;
+		goto fail;
 	    }
 	case OP_REMOVE: /* fall thru */
 	    if (x0)
@@ -760,21 +764,26 @@ text_modify(struct text_handle *th,
 	} /* CONTAINER switch op */
     } /* else Y_CONTAINER  */
     xml_sort(x0p, NULL);
- ok:
-    retval = 0;
+    retval = 1;
  done:
     if (x0vec)
 	free(x0vec);
     return retval;
+ fail: /* cbret set */
+    retval = 0;
+    goto done;
 } /* text_modify */
 
 /*! Modify a top-level base tree x0 with modification tree x1
- * @param[in]  th  text handle
- * @param[in]  x0  Base xml tree (can be NULL in add scenarios)
- * @param[in]  x1  xml tree which modifies base
+ * @param[in]  th    text handle
+ * @param[in]  x0    Base xml tree (can be NULL in add scenarios)
+ * @param[in]  x1    xml tree which modifies base
  * @param[in]  yspec Top-level yang spec (if y is NULL)
- * @param[in]  op  OP_MERGE, OP_REPLACE, OP_REMOVE, etc 
- * @param[out] cbret  Initialized cligen buffer. Contains return XML or "".
+ * @param[in]  op    OP_MERGE, OP_REPLACE, OP_REMOVE, etc 
+ * @param[out] cbret  Initialized cligen buffer. Contains return XML if retval is 0.
+ * @retval    -1     Error
+ * @retval     0     Failed (cbret set)
+ * @retval     1     OK
  * @see text_modify
  */
 static int
@@ -792,6 +801,7 @@ text_modify_top(struct text_handle *th,
     yang_stmt *yc;  /* yang child */
     yang_stmt *ymod;/* yang module */
     char      *opstr;
+    int        ret;
 
     /* Assure top-levels are 'config' */
     assert(x0 && strcmp(xml_name(x0),"config")==0);
@@ -820,7 +830,7 @@ text_modify_top(struct text_handle *th,
 	    case OP_DELETE:
 		if (netconf_data_missing(cbret, "Data does not exist; cannot delete resource") < 0)
 		    goto done;
-		goto ok;
+		goto fail;
 		break;
 	    default:
 		break;
@@ -849,21 +859,24 @@ text_modify_top(struct text_handle *th,
 	if (yc == NULL){
 	    if (netconf_unknown_element(cbret, "application", x1cname, "Unassigned yang spec") < 0)
 		goto done;
-	    goto ok;
+	    goto fail;
 	}
 	/* See if there is a corresponding node in the base tree */
 	if (match_base_child(x0, x1c, &x0c, yc) < 0)
 	    goto done;
-	if (text_modify(th, x0c, (yang_node*)yc, x0, x1c, op, cbret) < 0)
+	if ((ret = text_modify(th, x0c, (yang_node*)yc, x0, x1c, op, cbret)) < 0)
 	    goto done;
 	/* If xml return - ie netconf error xml tree, then stop and return OK */
-	if (cbuf_len(cbret))
-	    goto ok;
+	if (ret == 0)
+	    goto fail;
     }
- ok:
-    retval = 0;
+    // ok:
+    retval = 1;
  done:
     return retval;
+ fail: /* cbret set */
+    retval = 0;
+    goto done;
 } /* text_modify_top */
 
 /*! For containers without presence and no children(except attrs), remove
@@ -923,14 +936,11 @@ text_put(xmldb_handle        xh,
     yang_spec          *yspec;
     cxobj              *x0 = NULL;
     struct db_element  *de = NULL;
-    int                 cbretlocal = 0; /* Set if cbret is NULL on entry */
+    int                 ret;
     
     if (cbret == NULL){
-	if ((cbret = cbuf_new()) == NULL){
-	    clicon_err(OE_XML, errno, "cbuf_new");
-	    goto done;
-	}
-	cbretlocal++;
+	clicon_err(OE_XML, EINVAL, "cbret is NULL");
+	goto done;
     }
     if ((yspec = th->th_yangspec) == NULL){
 	clicon_err(OE_YANG, ENOENT, "No yang spec");
@@ -991,10 +1001,10 @@ text_put(xmldb_handle        xh,
      * Modify base tree x with modification x1. This is where the
      * new tree is made.
      */
-    if (text_modify_top(th, x0, x1, yspec, op, cbret) < 0)
+    if ((ret = text_modify_top(th, x0, x1, yspec, op, cbret)) < 0)
 	goto done;
     /* If xml return - ie netconf error xml tree, then stop and return OK */
-    if (cbuf_len(cbret))
+    if (ret == 0)
 	goto fail;
 
     /* Remove NONE nodes if all subs recursively are also NONE */
@@ -1047,8 +1057,6 @@ text_put(xmldb_handle        xh,
 	goto done;
     retval = 1;
  done:
-    if (cbretlocal && cbret)
-	cbuf_free(cbret);
     if (f != NULL)
 	fclose(f);
     if (dbfile)
@@ -1408,6 +1416,8 @@ main(int    argc,
     char       *yangmod; /* yang file */
     yang_spec  *yspec = NULL;
     clicon_handle h;
+    cbuf       *cbret = NULL;
+    int         ret;
 
     if ((h = clicon_handle_init()) == NULL)
 	goto done;
@@ -1456,13 +1466,21 @@ main(int    argc,
 	    op = OP_REMOVE;
 	else
 	    usage(argv[0]);
-	if (xmldb_put(h, db, op, NULL, xn, NULL) < 1)
+	if ((cbret = cbuf_new()) == NULL){
+	    clicon_err(OE_UNIX, errno, "cbuf_new");
 	    goto done;
+	}
+	if ((ret = xmldb_put(h, db, op, NULL, xn, cbret)) < 0)
+	    goto done;
+	if (ret == 0)
+	    fprintf(stderr, "%s\n", cbuf_get(cbret));
     }
     else
 	usage(argv[0]);
     printf("\n");
  done:
+    if (cbret)
+	cbuf_free(cbret);
     return 0;
 }
 
diff --git a/example/example_backend.c b/example/example_backend.c
index 7c09ee3d..a322ad1e 100644
--- a/example/example_backend.c
+++ b/example/example_backend.c
@@ -260,6 +260,7 @@ example_reset(clicon_handle h,
     int    retval = -1;
     cxobj *xt = NULL;
     int    ret;
+    cbuf  *cbret = NULL;
 
     if (xml_parse_string("<config><interfaces xmlns=\"urn:ietf:params:xml:ns:yang:ietf-interfaces\"><interface>"
 			 "<name>lo</name><type>ex:loopback</type>"
@@ -268,15 +269,22 @@ example_reset(clicon_handle h,
     /* Replace parent w first child */
     if (xml_rootchild(xt, 0, &xt) < 0)
 	goto done;
+    if ((cbret = cbuf_new()) == NULL){
+	clicon_err(OE_UNIX, errno, "cbuf_new");
+	goto done;
+    }
     /* Merge user reset state */
-    if ((ret = xmldb_put(h, (char*)db, OP_MERGE, xt, NULL)) < 0)
+    if ((ret = xmldb_put(h, (char*)db, OP_MERGE, xt, cbret)) < 0)
 	goto done;
     if (ret == 0){
-	clicon_err(OE_XML, 0, "Error when writing to XML database");
+	clicon_err(OE_XML, 0, "Error when writing to XML database: %s",
+		   cbuf_get(cbret));
 	goto done;
     }
     retval = 0;
  done:
+    if (cbret)
+	cbuf_free(cbret);
     if (xt != NULL)
 	xml_free(xt);
     return retval;
diff --git a/lib/src/clixon_xml_db.c b/lib/src/clixon_xml_db.c
index 8fb5da70..73959bf7 100644
--- a/lib/src/clixon_xml_db.c
+++ b/lib/src/clixon_xml_db.c
@@ -379,7 +379,7 @@ xmldb_get(clicon_handle h,
  * @param[in]  db     running or candidate
  * @param[in]  op     Top-level operation, can be superceded by other op in tree
  * @param[in]  xt     xml-tree. Top-level symbol is dummy
- * @param[out] cbret  Initialized cligen buffer or NULL. On exit contains XML or "".
+ * @param[out] cbret  Initialized cligen buffer. On exit contains XML if retval == 0
  * @retval     1      OK
  * @retval     0      Failed, cbret contains error xml message
  * @retval     -1     Error

From b443471e7b3426c2e3068aa5c89a2f0c1ddd7280 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Wed, 2 Jan 2019 18:44:27 +0100
Subject: [PATCH 21/72] Removed CLI generation for yang notifications (and
 other non-data yang nodes

---
 CHANGELOG.md            |  1 +
 apps/cli/cli_generate.c | 14 +++++---------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cbc70587..82ba6372 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -110,6 +110,7 @@
   * <!DOCTYPE (ie DTD) is not supported.
 
 ### Corrected Bugs
+* Removed CLI generation for yang notifications (and other non-data yang nodes)
 * Some restconf error messages contained "rpc-reply" or "rpc-error" which have now been removed.
 * getopt return value changed from char to int (https://github.com/clicon/clixon/issues/58)
 * Netconf/Restconf RPC extra input arguments are ignored (https://github.com/clicon/clixon/issues/47)
diff --git a/apps/cli/cli_generate.c b/apps/cli/cli_generate.c
index b25067c4..8c87a0d7 100644
--- a/apps/cli/cli_generate.c
+++ b/apps/cli/cli_generate.c
@@ -751,11 +751,6 @@ yang2cli_stmt(clicon_handle h,
 
     if (yang_config(ys)){
 	switch (ys->ys_keyword){
-	case Y_GROUPING:
-	case Y_RPC:
-	case Y_AUGMENT:
-	    return 0;
-	    break;
 	case Y_CONTAINER:
 	    if (yang2cli_container(h, ys, cbuf, gt, level) < 0)
 		goto done;
@@ -773,19 +768,20 @@ yang2cli_stmt(clicon_handle h,
 	    if (yang2cli_leaf(h, ys, cbuf, gt, level, 1) < 0)
 		goto done;
 	    break;
-	default:
+	case Y_SUBMODULE:
+	case Y_MODULE:
 	    for (i=0; i<ys->ys_len; i++)
 		if ((yc = ys->ys_stmt[i]) != NULL)
 		    if (yang2cli_stmt(h, yc, cbuf, gt, level+1) < 0)
 			goto done;
 	    break;
+	default: /* skip */
+	    break;
 	}
     }
-
     retval = 0;
   done:
     return retval;
-
 }
 
 /*! Generate CLI code for Yang specification
@@ -814,7 +810,7 @@ yang2cli(clicon_handle      h,
 	clicon_err(OE_XML, errno, "cbuf_new");
 	goto done;
     }
-    /* Traverse YANG specification: loop through statements */
+    /* Traverse YANG, loop through all modules and generate CLI */
     for (i=0; i<yspec->yp_len; i++)
 	if ((ymod = yspec->yp_stmt[i]) != NULL){
 	    if (yang2cli_stmt(h, ymod, cbuf, gt, 0) < 0)

From 11479f7ec3840c1611b1192d84736f205739b004 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Wed, 2 Jan 2019 20:59:57 +0100
Subject: [PATCH 22/72] add yang-spec as arg to decode clicon msg

---
 apps/backend/backend_client.c   | 12 +++++++-----
 apps/cli/cli_common.c           |  2 +-
 apps/netconf/netconf_rpc.c      |  7 +++++--
 apps/restconf/restconf_stream.c |  2 +-
 lib/clixon/clixon_proto.h       |  2 +-
 lib/src/clixon_proto.c          |  4 +++-
 lib/src/clixon_xml_map.c        | 14 +++++---------
 7 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/apps/backend/backend_client.c b/apps/backend/backend_client.c
index 6a8b5943..a141f09f 100644
--- a/apps/backend/backend_client.c
+++ b/apps/backend/backend_client.c
@@ -965,6 +965,7 @@ from_client_msg(clicon_handle        h,
 
     clicon_debug(1, "%s", __FUNCTION__);
     pid = ce->ce_pid;
+    yspec = clicon_dbspec_yang(h); 
     /* Return netconf message. Should be filled in by the dispatch(sub) functions 
      * as wither rpc-error or by positive response.
      */
@@ -972,21 +973,22 @@ from_client_msg(clicon_handle        h,
 	clicon_err(OE_XML, errno, "cbuf_new");
 	goto done;
     }
-    if (clicon_msg_decode(msg, &xt) < 0){
+    if (clicon_msg_decode(msg, yspec, &xt) < 0){
 	if (netconf_malformed_message(cbret, "XML parse error")< 0)
 	    goto done;
 	goto reply;
     }
-    /* Get yang spec */ 
-    yspec = clicon_dbspec_yang(h); /* XXX maybe move to clicon_msg_decode? */
+
     if ((x = xpath_first(xt, "/rpc")) == NULL){
 	if (netconf_malformed_message(cbret, "rpc keyword expected")< 0)
 	    goto done;
 	goto reply;
     }
-    /* Populate incoming XML tree with yang */
+    /* Populate incoming XML tree with yang - 
+     * should really have been dealt with by decode above
+     * maybe not necessary since it should be */
     if (xml_spec_populate_rpc(h, x, yspec) < 0)
-	goto done;
+    	goto done;
     if ((ret = xml_yang_validate_rpc(x, cbret)) < 0)
 	goto done;
     if (ret == 0)
diff --git a/apps/cli/cli_common.c b/apps/cli/cli_common.c
index ebab38a7..8a52207e 100644
--- a/apps/cli/cli_common.c
+++ b/apps/cli/cli_common.c
@@ -959,7 +959,7 @@ cli_notification_cb(int   s,
 	event_unreg_fd(s, cli_notification_cb);
 	goto done;
     }
-    if (clicon_msg_decode(reply, &xt) < 0) 
+    if (clicon_msg_decode(reply, NULL, &xt) < 0) /* XXX pass yang_spec */
 	goto done;
     if ((xe = xpath_first(xt, "//event")) != NULL){
 	x = NULL;
diff --git a/apps/netconf/netconf_rpc.c b/apps/netconf/netconf_rpc.c
index f2bbb605..0770a0b9 100644
--- a/apps/netconf/netconf_rpc.c
+++ b/apps/netconf/netconf_rpc.c
@@ -754,6 +754,8 @@ netconf_notification_cb(int   s,
     cbuf              *cb;
     cxobj             *xn = NULL; /* event xml */
     cxobj             *xt = NULL; /* top xml */
+    clicon_handle      h = (clicon_handle)arg;
+    yang_spec         *yspec = NULL;
 
     clicon_debug(1, "%s", __FUNCTION__);
     /* get msg (this is the reason this function is called) */
@@ -767,7 +769,8 @@ netconf_notification_cb(int   s,
 	event_unreg_fd(s, netconf_notification_cb);
 	goto done;
     }
-    if (clicon_msg_decode(reply, &xt) < 0) 
+    yspec = clicon_dbspec_yang(h);
+    if (clicon_msg_decode(reply, yspec, &xt) < 0) 
 	goto done;
     if ((xn = xpath_first(xt, "notification")) == NULL)
 	goto ok;
@@ -839,7 +842,7 @@ netconf_create_subscription(clicon_handle h,
 	goto ok;
     if (event_reg_fd(s, 
 		     netconf_notification_cb, 
-		     NULL,
+		     h,
 		     "notification socket") < 0)
 	goto done;
  ok:
diff --git a/apps/restconf/restconf_stream.c b/apps/restconf/restconf_stream.c
index 667db0ad..3d34c798 100644
--- a/apps/restconf/restconf_stream.c
+++ b/apps/restconf/restconf_stream.c
@@ -180,7 +180,7 @@ restconf_stream_cb(int   s,
 	clicon_exit_set(); 
 	goto done;
     }
-    if (clicon_msg_decode(reply, &xtop) < 0) 
+    if (clicon_msg_decode(reply, NULL, &xtop) < 0)  /* XXX pass yang_spec */
 	goto done;
     /* create event */
     if ((cb = cbuf_new()) == NULL){
diff --git a/lib/clixon/clixon_proto.h b/lib/clixon/clixon_proto.h
index 3d9e6603..e5457685 100644
--- a/lib/clixon/clixon_proto.h
+++ b/lib/clixon/clixon_proto.h
@@ -66,7 +66,7 @@ struct clicon_msg *clicon_msg_encode(char *format, ...) __attribute__ ((format (
 #else
 struct clicon_msg *clicon_msg_encode(char *format, ...);
 #endif
-int clicon_msg_decode(struct clicon_msg *msg, cxobj **xml);
+int clicon_msg_decode(struct clicon_msg *msg, yang_spec *yspec, cxobj **xml);
 
 int clicon_connect_unix(char *sockpath);
 
diff --git a/lib/src/clixon_proto.c b/lib/src/clixon_proto.c
index 30da4e59..76c7816e 100644
--- a/lib/src/clixon_proto.c
+++ b/lib/src/clixon_proto.c
@@ -160,10 +160,12 @@ clicon_msg_encode(char *format, ...)
 
 /*! Decode a clicon netconf message
  * @param[in]  msg    CLICON msg
+ * @param[in]  yspec  Yang specification, (can be NULL)
  * @param[out] xml    XML parse tree
  */
 int
 clicon_msg_decode(struct clicon_msg *msg, 
+		  yang_spec         *yspec,
 		  cxobj            **xml)
 {
     int   retval = -1;
@@ -172,7 +174,7 @@ clicon_msg_decode(struct clicon_msg *msg,
     /* body */
     xmlstr = msg->op_body;
     clicon_debug(1, "%s %s", __FUNCTION__, xmlstr);
-    if (xml_parse_string(xmlstr, NULL, xml) < 0)
+    if (xml_parse_string(xmlstr, yspec, xml) < 0)
 	goto done;
     retval = 0;
  done:
diff --git a/lib/src/clixon_xml_map.c b/lib/src/clixon_xml_map.c
index d3585ee4..660c4849 100644
--- a/lib/src/clixon_xml_map.c
+++ b/lib/src/clixon_xml_map.c
@@ -1623,7 +1623,7 @@ xml_spec_populate_rpc(clicon_handle h,
     yang_stmt *ymod=NULL; /* yang module */
     yang_stmt *yi = NULL; /* input */
     cxobj     *x;
-    int        i;
+    //    int        i;
     
     if ((strcmp(xml_name(xrpc), "rpc"))!=0){
 	clicon_err(OE_UNIX, EINVAL, "RPC expected");
@@ -1635,15 +1635,12 @@ xml_spec_populate_rpc(clicon_handle h,
 	    goto done;
 	if (ymod != NULL)
 	    y = yang_find((yang_node*)ymod, Y_RPC, xml_name(x));
-	/* Loose semantics: loop through all modules to find the node 
+	/* Non-strict semantics: loop through all modules to find the node 
 	 */
 	if (y == NULL &&
 	    !clicon_option_bool(h, "CLICON_XML_NS_STRICT")){
-	    for (i=0; i<yspec->yp_len; i++){
-		ymod = yspec->yp_stmt[i];
-		if ((y = yang_find((yang_node*)ymod, Y_RPC, xml_name(x))) != NULL)
-		    break;
-	    }
+	    if (xml_yang_find_non_strict(x, yspec, &y) < 0) /* find rpc */
+		goto done;
 	}
 	if (y){
 	    xml_spec_set(x, y);
@@ -1696,9 +1693,8 @@ xml_spec_populate(cxobj  *x,
 	if (ys_module_by_xml(yspec, x, &ymod) < 0)
 	    goto done;
 	if (ymod != NULL)
-	    y = yang_find_datanode((yang_node*)ymod, name);
+	    y = yang_find_schemanode((yang_node*)ymod, name);
 	/* Non-strict semantics: loop through all modules to find the node 
-	 * XXX clicon_option_bool(h, "CLICON_XML_NS_STRICT")
 	 */
 	if (y == NULL && !_CLICON_XML_NS_STRICT){
 	    if (xml_yang_find_non_strict(x, yspec, &y) < 0)

From 7a8f242a09f3403ae1473a70132bd27b42da70a4 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Wed, 2 Jan 2019 22:50:03 +0100
Subject: [PATCH 23/72] Added new clixon-lib yang module for internal netconf
 protocol. Currently only extends the standard with a debug RPC.

---
 CHANGELOG.md                       |   1 +
 apps/backend/backend_main.c        |   3 +
 apps/cli/cli_main.c                |   3 +
 apps/netconf/netconf_main.c        |   4 +-
 apps/restconf/restconf_main.c      |   4 +-
 apps/restconf/restconf_methods.c   |  12 +-
 example/example.yang               |   9 -
 lib/src/clixon_proto_client.c      |   2 +-
 test/test_install.sh               |   6 +-
 test/test_restconf.sh              |   4 +-
 yang/Makefile.in                   |   2 +
 yang/clixon-config@2018-10-21.yang |  10 +-
 yang/clixon-lib@2019-01-02.yang    |  55 ++++++
 yang/ietf-restconf@2017-01-26.yang | 279 +++++++++++++++++++++++++++++
 14 files changed, 362 insertions(+), 32 deletions(-)
 create mode 100644 yang/clixon-lib@2019-01-02.yang
 create mode 100644 yang/ietf-restconf@2017-01-26.yang

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82ba6372..588c5e10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -94,6 +94,7 @@
   * For backward compatibility, define CLICON_CLI_MODEL_TREENAME_PATCH in clixon_custom.h
 
 ### Minor changes
+* Added new clixon-lib yang module for internal netconf protocol. Currently only extends the standard with a debug RPC.
 * Added three-valued return values for several validate functions where -1 is fatal error, 0 is validation failed and 1 is validation OK.
   * This includes: `xmldb_put`, `xml_yang_validate_all`, `xml_yang_validate_add`, `xml_yang_validate_rpc`, `api_path2xml`, `api_path2xpath`
 * Added new xml functions for specific types: `xml_child_nr_notype`, `xml_child_nr_notype`, `xml_child_i_type`, `xml_find_type`.
diff --git a/apps/backend/backend_main.c b/apps/backend/backend_main.c
index 8e05c175..6fbb8750 100644
--- a/apps/backend/backend_main.c
+++ b/apps/backend/backend_main.c
@@ -805,6 +805,9 @@ main(int    argc,
     if ((str = clicon_yang_main_dir(h)) != NULL)
 	if (yang_spec_load_dir(h, str, yspec) < 0)
 	    goto done;
+     /* Load clixon lib yang module */
+    if (yang_spec_parse_module(h, "clixon-lib", NULL, yspec) < 0)
+	goto done;
      /* Load yang module library, RFC7895 */
     if (yang_modules_init(h) < 0)
 	goto done;
diff --git a/apps/cli/cli_main.c b/apps/cli/cli_main.c
index e6d7925a..ce994fee 100644
--- a/apps/cli/cli_main.c
+++ b/apps/cli/cli_main.c
@@ -446,6 +446,9 @@ main(int argc, char **argv)
 	if (yang_spec_load_dir(h, str, yspec) < 0)
 	    goto done;
     }
+    /* Load clixon lib yang module */
+    if (yang_spec_parse_module(h, "clixon-lib", NULL, yspec) < 0)
+	goto done;
 
      /* Load yang module library, RFC7895 */
     if (yang_modules_init(h) < 0)
diff --git a/apps/netconf/netconf_main.c b/apps/netconf/netconf_main.c
index e60a5d08..eadbcc1b 100644
--- a/apps/netconf/netconf_main.c
+++ b/apps/netconf/netconf_main.c
@@ -468,7 +468,9 @@ main(int    argc,
 	if (yang_spec_load_dir(h, str, yspec) < 0)
 	    goto done;
     }
-    
+    /* Load clixon lib yang module */
+    if (yang_spec_parse_module(h, "clixon-lib", NULL, yspec) < 0)
+	goto done;
      /* Load yang module library, RFC7895 */
     if (yang_modules_init(h) < 0)
 	goto done;
diff --git a/apps/restconf/restconf_main.c b/apps/restconf/restconf_main.c
index e6234884..0819c7cb 100644
--- a/apps/restconf/restconf_main.c
+++ b/apps/restconf/restconf_main.c
@@ -645,7 +645,9 @@ main(int    argc,
 	if (yang_spec_load_dir(h, str, yspec) < 0)
 	    goto done;
     }
-
+    /* Load clixon lib yang module */
+    if (yang_spec_parse_module(h, "clixon-lib", NULL, yspec) < 0)
+	goto done;
      /* Load yang module library, RFC7895 */
     if (yang_modules_init(h) < 0)
 	goto done;
diff --git a/apps/restconf/restconf_methods.c b/apps/restconf/restconf_methods.c
index 8f3cb4a5..58980589 100644
--- a/apps/restconf/restconf_methods.c
+++ b/apps/restconf/restconf_methods.c
@@ -1132,27 +1132,23 @@ api_operations_get(clicon_handle h,
     if (use_xml)
 	cprintf(cbx, "<operations>");
     else
-	cprintf(cbx, "{\"operations\": ");
+	cprintf(cbx, "{\"operations\": {");
     ymod = NULL;
+    i = 0;
     while ((ymod = yn_each((yang_node*)yspec, ymod)) != NULL) {
 	namespace = yang_find_mynamespace(ymod);
-	yc = NULL; i=0;
+	yc = NULL; 
 	while ((yc = yn_each((yang_node*)ymod, yc)) != NULL) {
 	    if (yc->ys_keyword != Y_RPC)
 		continue;
 	    if (use_xml)
 		cprintf(cbx, "<%s xmlns=\"%s\"/>", yc->ys_argument, namespace);
 	    else{
-		if (i==0)
-		    cprintf(cbx, "{");
-		if (i)
+		if (i++)
 		    cprintf(cbx, ",");
 		cprintf(cbx, "\"%s:%s\": null", ymod->ys_argument, yc->ys_argument);
 	    }
-	    i++;
 	}
-	if (!use_xml && i)
-	    cprintf(cbx, "}");
     }
     if (use_xml)
 	cprintf(cbx, "</operations>");
diff --git a/example/example.yang b/example/example.yang
index 749b10ff..f5e82063 100644
--- a/example/example.yang
+++ b/example/example.yang
@@ -128,13 +128,4 @@ module example {
 	    }
 	}
     }
-    rpc debug {
-	description "Set debug level of backend. XXX should be in clixon-config";
-	input {
-	    leaf level {
-		type uint32;
-	    }
-	}
-    }
-
 }
diff --git a/lib/src/clixon_proto_client.c b/lib/src/clixon_proto_client.c
index 0dbb76d1..b454b608 100644
--- a/lib/src/clixon_proto_client.c
+++ b/lib/src/clixon_proto_client.c
@@ -827,7 +827,7 @@ clicon_rpc_debug(clicon_handle h,
 
     username = clicon_username_get(h);
     /* XXX: hardcoded example yang, should be clixon-config!!! */
-    if ((msg = clicon_msg_encode("<rpc username=\"%s\"><debug xmlns=\"urn:example:clixon\"><level>%d</level></debug></rpc>", username?username:"", level)) == NULL)
+    if ((msg = clicon_msg_encode("<rpc username=\"%s\"><debug xmlns=\"http://clicon.org/lib\"><level>%d</level></debug></rpc>", username?username:"", level)) == NULL)
 	goto done;
     if (clicon_rpc_msg(h, msg, &xret, NULL) < 0)
 	goto done;
diff --git a/test/test_install.sh b/test/test_install.sh
index 032bba4a..09867c42 100755
--- a/test/test_install.sh
+++ b/test/test_install.sh
@@ -12,19 +12,23 @@ if [ $? -ne 0 ]; then
     err
 fi
 
-new "Check installed files"
+new "Check installed files /usr"
 if [ ! -d $dir/usr ]; then
     err $dir/usr
 fi
+new "Check installed files /www-data"
 if [ ! -d $dir/www-data ]; then
     err $dir/www-data
 fi
+new "Check installed files clixon-config"
 if [ ! -f $dir/usr/local/share/clixon/clixon-config* ]; then
     err $dir/usr/local/share/clixon/clixon-config*
 fi
+new "Check installed files libclixon.so"
 if [ ! -h $dir/usr/local/lib/libclixon.so ]; then
     err $dir/usr/local/lib/libclixon.so
 fi
+new "Check installed files libclixon_backend.so"
 if [ ! -h $dir/usr/local/lib/libclixon_backend.so ]; then
     err $dir/usr/local/lib/libclixon_backend.so
 fi
diff --git a/test/test_restconf.sh b/test/test_restconf.sh
index e7451d0a..2a1fd961 100755
--- a/test/test_restconf.sh
+++ b/test/test_restconf.sh
@@ -118,12 +118,12 @@ expecteq "$(curl -s -H 'Accept: application/yang-data+xml' -G http://localhost/r
 
 # Should be alphabetically ordered
 new2 "restconf get restconf/operations. RFC8040 3.3.2 (json)"
-expecteq "$(curl -sG http://localhost/restconf/operations)" '{"operations": {"example:empty": null,"example:client-rpc": null}{"ietf-routing:fib-route": null,"ietf-routing:route-count": null}}
+expecteq "$(curl -sG http://localhost/restconf/operations)" '{"operations": {"example:empty": null,"example:client-rpc": null,"ietf-routing:fib-route": null,"ietf-routing:route-count": null,"clixon-lib:debug": null}
 
'
 
 new "restconf get restconf/operations. RFC8040 3.3.2 (xml)"
 ret=$(curl -s -H "Accept: application/yang-data+xml" -G http://localhost/restconf/operations)
-expect='<operations><empty xmlns="urn:example:clixon"/><client-rpc xmlns="urn:example:clixon"/><fib-route xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"/><route-count xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"/></operations>'
+expect='<operations><empty xmlns="urn:example:clixon"/><client-rpc xmlns="urn:example:clixon"/><fib-route xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"/><route-count xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"/><debug xmlns="http://clicon.org/lib"/></operations>'
 match=`echo $ret | grep -EZo "$expect"`
 if [ -z "$match" ]; then
     err "$expect" "$ret"
diff --git a/yang/Makefile.in b/yang/Makefile.in
index fb32b74d..a1d0be57 100644
--- a/yang/Makefile.in
+++ b/yang/Makefile.in
@@ -41,10 +41,12 @@ datarootdir     = @datarootdir@
 CLIXON_DATADIR   = @CLIXON_DATADIR@
 
 YANGSPECS	 = clixon-config@2018-10-21.yang
+YANGSPECS	+= clixon-lib@2019-01-02.yang
 YANGSPECS	+= ietf-netconf@2011-06-01.yang
 YANGSPECS	+= ietf-netconf-acm@2018-02-14.yang
 YANGSPECS	+= ietf-inet-types@2013-07-15.yang
 YANGSPECS	+= ietf-yang-types@2013-07-15.yang
+YANGSPECS	+= ietf-restconf@2017-01-26.yang
 YANGSPECS	+= ietf-restconf-monitoring@2017-01-26.yang
 YANGSPECS	+= ietf-netconf-notification@2008-07-01.yang
 YANGSPECS	+= ietf-yang-library@2016-06-21.yang
diff --git a/yang/clixon-config@2018-10-21.yang b/yang/clixon-config@2018-10-21.yang
index efa777e3..a9ad7414 100644
--- a/yang/clixon-config@2018-10-21.yang
+++ b/yang/clixon-config@2018-10-21.yang
@@ -1,6 +1,6 @@
 module clixon-config {
     yang-version 1.1;
-    namespace "http://clicon.org";
+    namespace "http://clicon.org/config";
     prefix cc;
 
     organization
@@ -455,12 +455,4 @@ module clixon-config {
 
 	}
     }
-    rpc debug {
-	description "Set debug level of backend.";
-	input {
-	    leaf level {
-		type uint32;
-	    }
-	}
-    }
 }
diff --git a/yang/clixon-lib@2019-01-02.yang b/yang/clixon-lib@2019-01-02.yang
new file mode 100644
index 00000000..1e26187b
--- /dev/null
+++ b/yang/clixon-lib@2019-01-02.yang
@@ -0,0 +1,55 @@
+module clixon-lib {
+    yang-version 1.1;
+    namespace "http://clicon.org/lib";
+    prefix cl;
+
+    organization
+	"Clicon / Clixon";
+
+    contact
+	"Olof Hagsand <olof@hagsand.se>";
+
+    description
+      "Clixon Netconf extensions for communication between clients and backend.
+      
+       ***** BEGIN LICENSE BLOCK *****
+       Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
+       
+       This file is part of CLIXON
+
+       Licensed under the Apache License, Version 2.0 (the \"License\");
+       you may not use this file except in compliance with the License.
+       You may obtain a copy of the License at
+            http://www.apache.org/licenses/LICENSE-2.0
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an \"AS IS\" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+       See the License for the specific language governing permissions and
+       limitations under the License.
+
+       Alternatively, the contents of this file may be used under the terms of
+       the GNU General Public License Version 3 or later (the \"GPL\"),
+       in which case the provisions of the GPL are applicable instead
+       of those above. If you wish to allow use of your version of this file only
+       under the terms of the GPL, and not to allow others to
+       use your version of this file under the terms of Apache License version 2, 
+       indicate your decision by deleting the provisions above and replace them with
+       the notice and other provisions required by the GPL. If you do not delete
+       the provisions above, a recipient may use your version of this file under
+       the terms of any one of the Apache License version 2 or the GPL.
+
+       ***** END LICENSE BLOCK *****";
+
+    revision 2019-01-02 {
+	description
+	    "Released in Clixon 3.9";
+    }
+    rpc debug {
+	description "Set debug level of backend.";
+	input {
+	    leaf level {
+		type uint32;
+	    }
+	}
+    }
+}
diff --git a/yang/ietf-restconf@2017-01-26.yang b/yang/ietf-restconf@2017-01-26.yang
new file mode 100644
index 00000000..249006af
--- /dev/null
+++ b/yang/ietf-restconf@2017-01-26.yang
@@ -0,0 +1,279 @@
+module ietf-restconf {
+    yang-version 1.1;
+    namespace "urn:ietf:params:xml:ns:yang:ietf-restconf";
+    prefix "rc";
+
+    organization
+	"IETF NETCONF (Network Configuration) Working Group";
+
+    contact
+	"WG Web:   <https://datatracker.ietf.org/wg/netconf/>
+        WG List:  <mailto:netconf@ietf.org>
+
+        Author:   Andy Bierman
+                  <mailto:andy@yumaworks.com>
+
+        Author:   Martin Bjorklund
+                  <mailto:mbj@tail-f.com>
+
+        Author:   Kent Watsen
+                  <mailto:kwatsen@juniper.net>";
+
+    description
+	"This module contains conceptual YANG specifications
+        for basic RESTCONF media type definitions used in
+        RESTCONF protocol messages.
+
+        Note that the YANG definitions within this module do not
+        represent configuration data of any kind.
+        The 'restconf-media-type' YANG extension statement
+        provides a normative syntax for XML and JSON
+        message-encoding purposes.
+
+        Copyright (c) 2017 IETF Trust and the persons identified as
+        authors of the code.  All rights reserved.
+
+        Redistribution and use in source and binary forms, with or
+        without modification, is permitted pursuant to, and subject
+        to the license terms contained in, the Simplified BSD License
+        set forth in Section 4.c of the IETF Trust's Legal Provisions
+        Relating to IETF Documents
+        (http://trustee.ietf.org/license-info).
+
+        This version of this YANG module is part of RFC 8040; see
+        the RFC itself for full legal notices.";
+
+    revision 2017-01-26 {
+	description
+	    "Initial revision.";
+	reference
+	    "RFC 8040: RESTCONF Protocol.";
+    }
+
+    extension yang-data {
+	argument name {
+	    yin-element true;
+	}
+	description
+	    "This extension is used to specify a YANG data template that
+          represents conceptual data defined in YANG.  It is
+          intended to describe hierarchical data independent of
+          protocol context or specific message-encoding format.
+          Data definition statements within a yang-data extension
+          specify the generic syntax for the specific YANG data
+          template, whose name is the argument of the 'yang-data'
+          extension statement.
+
+          Note that this extension does not define a media type.
+          A specification using this extension MUST specify the
+          message-encoding rules, including the content media type.
+
+          The mandatory 'name' parameter value identifies the YANG
+          data template that is being defined.  It contains the
+          template name.
+
+          This extension is ignored unless it appears as a top-level
+          statement.  It MUST contain data definition statements
+          that result in exactly one container data node definition.
+          An instance of a YANG data template can thus be translated
+          into an XML instance document, whose top-level element
+          corresponds to the top-level container.
+
+          The module name and namespace values for the YANG module using
+          the extension statement are assigned to instance document data
+          conforming to the data definition statements within
+          this extension.
+
+          The substatements of this extension MUST follow the
+          'data-def-stmt' rule in the YANG ABNF.
+
+          The XPath document root is the extension statement itself,
+          such that the child nodes of the document root are
+          represented by the data-def-stmt substatements within
+          this extension.  This conceptual document is the context
+          for the following YANG statements:
+
+            - must-stmt
+            - when-stmt
+            - path-stmt
+            - min-elements-stmt
+            - max-elements-stmt
+            - mandatory-stmt
+            - unique-stmt
+            - ordered-by
+            - instance-identifier data type
+
+          The following data-def-stmt substatements are constrained
+          when used within a 'yang-data' extension statement.
+
+            - The list-stmt is not required to have a key-stmt defined.
+            - The if-feature-stmt is ignored if present.
+            - The config-stmt is ignored if present.
+            - The available identity values for any 'identityref'
+              leaf or leaf-list nodes are limited to the module
+              containing this extension statement and the modules
+              imported into that module.
+         ";
+    }
+
+    rc:yang-data yang-errors {
+	uses errors;
+    }
+
+    rc:yang-data yang-api {
+	uses restconf;
+    }
+
+    grouping errors {
+	description
+	    "A grouping that contains a YANG container
+          representing the syntax and semantics of a
+          YANG Patch error report within a response message.";
+
+	container errors {
+	    description
+		"Represents an error report returned by the server if
+            a request results in an error.";
+
+	    list error {
+		description
+		    "An entry containing information about one
+              specific error that occurred while processing
+              a RESTCONF request.";
+		reference
+		    "RFC 6241, Section 4.3.";
+
+		leaf error-type {
+		    type enumeration {
+			enum transport {
+			    description
+			    "The transport layer.";
+			}
+			enum rpc {
+			    description
+				"The rpc or notification layer.";
+			}
+			enum protocol {
+			    description
+			    "The protocol operation layer.";
+			}
+			enum application {
+			    description
+			    "The server application layer.";
+			}
+		    }
+		    mandatory true;
+		    description
+			"The protocol layer where the error occurred.";
+		}
+
+		leaf error-tag {
+		    type string;
+		    mandatory true;
+		    description
+			"The enumerated error-tag.";
+		}
+
+		leaf error-app-tag {
+		    type string;
+		    description
+			"The application-specific error-tag.";
+		}
+
+		leaf error-path {
+		    type instance-identifier;
+		    description
+			"The YANG instance identifier associated
+                with the error node.";
+		}
+
+		leaf error-message {
+		    type string;
+		    description
+			"A message describing the error.";
+		}
+
+		anydata error-info {
+		    description
+			"This anydata value MUST represent a container with
+                 zero or more data nodes representing additional
+                 error information.";
+		}
+	    }
+	}
+    }
+
+    grouping restconf {
+	description
+	    "Conceptual grouping representing the RESTCONF
+          root resource.";
+
+	container restconf {
+	    description
+		"Conceptual container representing the RESTCONF
+            root resource.";
+	    container data {
+		description
+		    "Container representing the datastore resource.
+              Represents the conceptual root of all state data
+              and configuration data supported by the server.
+              The child nodes of this container can be any data
+              resources that are defined as top-level data nodes
+              from the YANG modules advertised by the server in
+              the 'ietf-yang-library' module.";
+	    }
+
+	    container operations {
+		description
+		    "Container for all operation resources.
+
+              Each resource is represented as an empty leaf with the
+              name of the RPC operation from the YANG 'rpc' statement.
+
+              For example, the 'system-restart' RPC operation defined
+              in the 'ietf-system' module would be represented as
+              an empty leaf in the 'ietf-system' namespace.  This is
+              a conceptual leaf and will not actually be found in
+              the module:
+
+                 module ietf-system {
+                   leaf system-reset {
+                     type empty;
+                   }
+                 }
+
+              To invoke the 'system-restart' RPC operation:
+
+                 POST /restconf/operations/ietf-system:system-restart
+
+              To discover the RPC operations supported by the server:
+
+                 GET /restconf/operations
+
+              In XML, the YANG module namespace identifies the module:
+
+                <system-restart
+                   xmlns='urn:ietf:params:xml:ns:yang:ietf-system'/>
+
+              In JSON, the YANG module name identifies the module:
+
+                { 'ietf-system:system-restart' : [null] }
+             ";
+	    }
+	    
+	    leaf yang-library-version {
+		type string {
+		    pattern '\d{4}-\d{2}-\d{2}';
+		}
+		config false;
+		mandatory true;
+		description
+		    "Identifies the revision date of the 'ietf-yang-library'
+              module that is implemented by this RESTCONF server.
+              Indicates the year, month, and day in YYYY-MM-DD
+              numeric format.";
+	    }
+	}
+    }
+
+}

From 058a14579f4969258de84c4f82d76fd3c1b6e1d7 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Fri, 4 Jan 2019 11:37:26 +0100
Subject: [PATCH 24/72] Yang choice functionality improved and stricter
 validation for CLI generation, mandatory flags, etc.

---
 CHANGELOG.md                       |   2 +
 apps/cli/cli_generate.c            |   1 +
 apps/netconf/netconf_main.c        |  17 ++-
 apps/netconf/netconf_rpc.c         |  15 +-
 datastore/text/clixon_xmldb_text.c |  35 ++++-
 lib/clixon/clixon_xml_sort.h       |   2 +-
 lib/clixon/clixon_yang.h           |   1 +
 lib/src/clixon_json_parse.y        |   2 +-
 lib/src/clixon_xml_map.c           | 106 ++++++++++-----
 lib/src/clixon_xml_sort.c          |  56 +++++---
 lib/src/clixon_xpath_parse.y       |   2 +-
 lib/src/clixon_yang.c              |  24 +++-
 lib/src/clixon_yang_parse.y        |   2 +-
 test/test_choice.sh                | 212 +++++++++++++++++++++++++++++
 test/test_leafref.sh               |   2 +-
 test/test_rpc.sh                   |  19 ++-
 16 files changed, 412 insertions(+), 86 deletions(-)
 create mode 100755 test/test_choice.sh

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 588c5e10..58ca127d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -79,6 +79,7 @@
     * CLICON_YANG_MAIN_DIR Provides a directory where all yang modules should be loaded.
 
 ### API changes on existing features (you may need to change your code)
+* Stricter YANG choice validation leads to enforcement of structures like: `choice c{ mandatory true; leaf x` statements. `x` was not previously enforced.
 * CLICON_XML_SORT option (in clixon-config.yang) has been removed and set to true permanently since setting it to false is obsolete.
 * Strict namespace setting can be a problem when upgrading existing database files, such as startup-db or persistent running-db, or any other saved XML file.
   * For backward compatibility, load of startup and running set CLICON_XML_NS_STRICT to false temporarily.
@@ -94,6 +95,7 @@
   * For backward compatibility, define CLICON_CLI_MODEL_TREENAME_PATCH in clixon_custom.h
 
 ### Minor changes
+* Yang choice functionality improved and stricter validation for CLI generation, mandatory flags, etc.
 * Added new clixon-lib yang module for internal netconf protocol. Currently only extends the standard with a debug RPC.
 * Added three-valued return values for several validate functions where -1 is fatal error, 0 is validation failed and 1 is validation OK.
   * This includes: `xmldb_put`, `xml_yang_validate_all`, `xml_yang_validate_add`, `xml_yang_validate_rpc`, `api_path2xml`, `api_path2xpath`
diff --git a/apps/cli/cli_generate.c b/apps/cli/cli_generate.c
index 8c87a0d7..b91a5242 100644
--- a/apps/cli/cli_generate.c
+++ b/apps/cli/cli_generate.c
@@ -768,6 +768,7 @@ yang2cli_stmt(clicon_handle h,
 	    if (yang2cli_leaf(h, ys, cbuf, gt, level, 1) < 0)
 		goto done;
 	    break;
+	case Y_CASE:
 	case Y_SUBMODULE:
 	case Y_MODULE:
 	    for (i=0; i<ys->ys_len; i++)
diff --git a/apps/netconf/netconf_main.c b/apps/netconf/netconf_main.c
index eadbcc1b..7e1163dc 100644
--- a/apps/netconf/netconf_main.c
+++ b/apps/netconf/netconf_main.c
@@ -80,7 +80,7 @@
  * @param[in]   cb   Packet buffer
  */
 static int
-process_incoming_packet(clicon_handle h, 
+netconf_input_packet(clicon_handle h, 
 			cbuf         *cb)
 {
     int        retval = -1;
@@ -94,6 +94,8 @@ process_incoming_packet(clicon_handle h,
     cxobj     *xc;
     yang_spec *yspec;
     int        ret;
+    cxobj     *xa;
+    cxobj     *xa2;
 
     clicon_debug(1, "RECV");
     clicon_debug(2, "%s: RCV: \"%s\"", __FUNCTION__, cbuf_get(cb));
@@ -110,7 +112,7 @@ process_incoming_packet(clicon_handle h,
     /* Parse incoming XML message */
     if (xml_parse_string(str, yspec, &xreq) < 0){ 
 	free(str0);
-	if (netconf_operation_failed(cbret, "rpc", "internal error")< 0)
+	if (netconf_operation_failed(cbret, "rpc", clicon_err_reason)< 0)
 	    goto done;
 	netconf_output_encap(1, cbret, "rpc-error");
 	goto done;
@@ -143,8 +145,13 @@ process_incoming_packet(clicon_handle h,
 	    goto done;
 	}
 	else{ /* there is a return message in xret */
-	    cxobj *xa, *xa2;
-	    assert(xret);
+
+	    if (xret == NULL){
+		if (netconf_operation_failed(cbret, "rpc", "Internal error: no xml return")< 0)
+		    goto done;
+		netconf_output_encap(1, cbret, "rpc-error");
+		goto done;
+	    }
 	    if ((xc = xml_child_i(xret,0))!=NULL){
 		xa=NULL;
 		/* Copy message-id attribute from incoming to reply. 
@@ -228,7 +235,7 @@ netconf_input_cb(int   s,
 		/* OK, we have an xml string from a client */
 		/* Remove trailer */
 		*(((char*)cbuf_get(cb)) + cbuf_len(cb) - strlen("]]>]]>")) = '\0';
-		if (process_incoming_packet(h, cb) < 0)
+		if (netconf_input_packet(h, cb) < 0)
 		    ; //goto done; // ignore errors
 		if (cc_closed)
 		    break;
diff --git a/apps/netconf/netconf_rpc.c b/apps/netconf/netconf_rpc.c
index 0770a0b9..21a02193 100644
--- a/apps/netconf/netconf_rpc.c
+++ b/apps/netconf/netconf_rpc.c
@@ -314,7 +314,6 @@ netconf_edit_config(clicon_handle h,
     enum operation_type operation = OP_MERGE;
     enum test_option    testopt = TEST_THEN_SET;/* only supports this */
     enum error_option   erropt = STOP_ON_ERROR; /* only supports this */
-    cxobj              *xc;       /* config */
     cxobj              *x;
     cxobj              *xfilter;
     char               *ftype = NULL;
@@ -366,18 +365,8 @@ netconf_edit_config(clicon_handle h,
 			 "</rpc-error></rpc-reply>");
 	goto ok;
     }    
-
-    /* operation is OP_REPLACE, OP_MERGE, or OP_NONE pass all to backend */
-    if ((xc  = xpath_first(xn, "config")) != NULL){
-#if 0
-	/* application-specific code registers 'config' */
-	if ((ret = netconf_plugin_callbacks(h, xc, xret)) < 0){
-	    goto ok;
-	}
-#endif
-	if (clicon_rpc_netconf_xml(h, xml_parent(xn), xret, NULL) < 0)
-	     goto done;	
-    }
+    if (clicon_rpc_netconf_xml(h, xml_parent(xn), xret, NULL) < 0)
+	goto done;	
  ok:
     retval = 0;
  done:
diff --git a/datastore/text/clixon_xmldb_text.c b/datastore/text/clixon_xmldb_text.c
index c4d2d1b4..689e9a4b 100644
--- a/datastore/text/clixon_xmldb_text.c
+++ b/datastore/text/clixon_xmldb_text.c
@@ -715,8 +715,9 @@ text_modify(struct text_handle *th,
 		if (op==OP_NONE)
 		    xml_flag_set(x0, XML_FLAG_NONE); /* Mark for potential deletion */
 	    }
-	    /* First pass: mark existing children in base */
-	    /* Loop through children of the modification tree */
+	    /* First pass: Loop through children of the x1 modification tree 
+	     * collect matching nodes from x0 in x0vec (no changes to x0 children)
+	     */
 	    if ((x0vec = calloc(xml_child_nr(x1), sizeof(x1))) == NULL){
 		clicon_err(OE_UNIX, errno, "calloc");
 		goto done;
@@ -732,17 +733,29 @@ text_modify(struct text_handle *th,
 		}
 		/* See if there is a corresponding node in the base tree */
 		x0c = NULL;
-		if (match_base_child(x0, x1c, &x0c, yc) < 0)
+		if (match_base_child(x0, x1c, yc, &x0c) < 0)
 		    goto done;
-		x0vec[i++] = x0c;
+#if 1
+		if (x0c && (yc != xml_spec(x0c))){
+		    /* There is a match but is should be replaced (choice)*/
+		    if (xml_purge(x0c) < 0)
+			goto done;
+		    x0c = NULL;
+		}
+#endif
+		x0vec[i++] = x0c; /* != NULL if x0c is matching x1c */
 	    }
-	    /* Second pass: modify tree */
+	    /* Second pass: Loop through children of the x1 modification tree again
+	     * Now potentially modify x0:s children 
+	     * Here x0vec contains one-to-one matching nodes of x1:s children.
+	     */
 	    x1c = NULL;
 	    i = 0;
 	    while ((x1c = xml_child_each(x1, x1c, CX_ELMNT)) != NULL) {
 		x1cname = xml_name(x1c);
+		x0c = x0vec[i++];
 		yc = yang_find_datanode(y0, x1cname);
-		if ((ret = text_modify(th, x0vec[i++], (yang_node*)yc, x0, x1c, op, cbret)) < 0)
+		if ((ret = text_modify(th, x0c, (yang_node*)yc, x0, x1c, op, cbret)) < 0)
 		    goto done;
 		/* If xml return - ie netconf error xml tree, then stop and return OK */
 		if (ret == 0)
@@ -862,8 +875,16 @@ text_modify_top(struct text_handle *th,
 	    goto fail;
 	}
 	/* See if there is a corresponding node in the base tree */
-	if (match_base_child(x0, x1c, &x0c, yc) < 0)
+	if (match_base_child(x0, x1c, yc, &x0c) < 0)
 	    goto done;
+#if 1
+	if (x0c && (yc != xml_spec(x0c))){
+	    /* There is a match but is should be replaced (choice)*/
+	    if (xml_purge(x0c) < 0)
+		goto done;
+	    x0c = NULL;
+	}
+#endif
 	if ((ret = text_modify(th, x0c, (yang_node*)yc, x0, x1c, op, cbret)) < 0)
 	    goto done;
 	/* If xml return - ie netconf error xml tree, then stop and return OK */
diff --git a/lib/clixon/clixon_xml_sort.h b/lib/clixon/clixon_xml_sort.h
index 83f94f44..8b1e6f82 100644
--- a/lib/clixon/clixon_xml_sort.h
+++ b/lib/clixon/clixon_xml_sort.h
@@ -48,6 +48,6 @@ int    xml_insert_pos(cxobj *x0, char *name, int yangi, enum rfc_6020 keyword,
 		      int upper);
 cxobj *xml_match(cxobj *x0, char *name, enum rfc_6020 keyword, int keynr, char **keyvec, char **keyval);
 int    xml_sort_verify(cxobj *x, void *arg);
-int    match_base_child(cxobj *x0, cxobj *x1c, cxobj **x0cp, yang_stmt *yc);
+int    match_base_child(cxobj *x0, cxobj *x1c, yang_stmt *yc, cxobj **x0cp);
 
 #endif /* _CLIXON_XML_SORT_H */
diff --git a/lib/clixon/clixon_yang.h b/lib/clixon/clixon_yang.h
index fb727dfd..b0635385 100644
--- a/lib/clixon/clixon_yang.h
+++ b/lib/clixon/clixon_yang.h
@@ -264,6 +264,7 @@ yang_stmt *yang_find_datanode(yang_node *yn, char *argument);
 yang_stmt *yang_find_schemanode(yang_node *yn, char *argument);
 char      *yang_find_myprefix(yang_stmt *ys);
 char      *yang_find_mynamespace(yang_stmt *ys);
+yang_node *yang_choice(yang_stmt *y);
 int        yang_order(yang_stmt *y);
 int        yang_print(FILE *f, yang_node *yn);
 int        yang_print_cbuf(cbuf *cb, yang_node *yn, int marginal);
diff --git a/lib/src/clixon_json_parse.y b/lib/src/clixon_json_parse.y
index a6533a06..07da89a4 100644
--- a/lib/src/clixon_json_parse.y
+++ b/lib/src/clixon_json_parse.y
@@ -103,7 +103,7 @@ object.
 
 #define _YYERROR(msg) {clicon_err(OE_XML, 0, "YYERROR %s '%s' %d", (msg), clixon_json_parsetext, _JY->jy_linenum); YYERROR;}
 
-/* add _yy to error paramaters */
+/* add _yy to error parameters */
 #define YY_(msgid) msgid 
 
 #include "clixon_config.h"
diff --git a/lib/src/clixon_xml_map.c b/lib/src/clixon_xml_map.c
index 660c4849..4b51e30b 100644
--- a/lib/src/clixon_xml_map.c
+++ b/lib/src/clixon_xml_map.c
@@ -189,13 +189,14 @@ xml2cli(FILE              *f,
     if (ys->ys_keyword == Y_LEAF || ys->ys_keyword == Y_LEAF_LIST){
 	if (prepend0)
 	    fprintf(f, "%s", prepend0);
-	body = xml_body(x);
 	if (gt == GT_ALL || gt == GT_VARS)
 	    fprintf(f, "%s ", xml_name(x));
-	if (index(body, ' '))
-	    fprintf(f, "\"%s\"", body);
-	else
-	    fprintf(f, "%s", body);
+	if ((body = xml_body(x)) != NULL){
+	    if (index(body, ' '))
+		fprintf(f, "\"%s\"", body);
+	    else
+		fprintf(f, "%s", body);
+	}
 	fprintf(f, "\n");
 	goto ok;
     }
@@ -508,32 +509,56 @@ xml_yang_validate_add(cxobj   *xt,
     int        retval = -1;
     cg_var    *cv = NULL;
     char      *reason = NULL;
-    yang_stmt *yc;
+    yang_stmt *yt;   /* yang spec of xt going in */
+    yang_stmt *yc;   /* yang spec of yt child */
+    yang_stmt *yx;   /* yang spec of xt children */
+    yang_node *yp;   /* yang spec of parent of yang spec of xt children */
     int        i;
-    yang_stmt *ys;
     char      *body;
     int        ret;
     cxobj     *x;
     
     /* if not given by argument (overide) use default link 
        and !Node has a config sub-statement and it is false */
-    if ((ys = xml_spec(xt)) != NULL && yang_config(ys) != 0){
-	switch (ys->ys_keyword){
+    if ((yt = xml_spec(xt)) != NULL && yang_config(yt) != 0){
+	switch (yt->ys_keyword){
 	case Y_RPC:
 	case Y_INPUT:
 	case Y_LIST:
 	    /* fall thru */
 	case Y_CONTAINER:
-	    for (i=0; i<ys->ys_len; i++){
-		yc = ys->ys_stmt[i];
-		if (yc->ys_keyword != Y_LEAF)
-		    continue;
-		if (yang_config(yc)==0)
-		    continue;
-		if (yang_mandatory(yc) && xml_find(xt, yc->ys_argument)==NULL){
-		    if (netconf_missing_element(cbret, "application", yc->ys_argument, "Mandatory variable") < 0)
-			goto done;
-		    goto fail;
+	    for (i=0; i<yt->ys_len; i++){
+		yc = yt->ys_stmt[i];
+		switch (yc->ys_keyword){
+		case Y_LEAF:
+		    if (yang_config(yc)==0)
+			break;
+		    if (yang_mandatory(yc) && xml_find(xt, yc->ys_argument)==NULL){
+			if (netconf_missing_element(cbret, "application", yc->ys_argument, "Mandatory variable") < 0)
+			    goto done;
+			goto fail;
+		    }
+		    break;
+		case Y_CHOICE:
+		    if (yang_mandatory(yc)){
+			/* If there is one child with this choice as parent */
+			x = NULL;
+			while ((x = xml_child_each(xt, x, CX_ELMNT)) != NULL) {
+			    if ((yx = xml_spec(x)) != NULL &&
+				(yp = yang_choice(yx)) != NULL &&
+				yp == (yang_node*)yc){
+				break; /* leave loop with x set */
+			    }
+			}
+			if (x == NULL){ /* No hit */
+			    if (netconf_missing_element(cbret, "application", yc->ys_argument, "Mandatory choice") < 0)
+				goto done;
+			    goto fail;
+			}
+		    }
+		    break;
+		default:
+		    break;
 		}
 	    }
 	    break;
@@ -541,7 +566,7 @@ xml_yang_validate_add(cxobj   *xt,
 	    /* fall thru */
 	case Y_LEAF_LIST:
 	    /* validate value against ranges, etc */
-	    if ((cv = cv_dup(ys->ys_cv)) == NULL){
+	    if ((cv = cv_dup(yt->ys_cv)) == NULL){
 		clicon_err(OE_UNIX, errno, "cv_dup");
 		goto done;
 	    }
@@ -550,12 +575,12 @@ xml_yang_validate_add(cxobj   *xt,
 	     */
 	    if ((body = xml_body(xt)) != NULL){
 		if (cv_parse1(body, cv, &reason) != 1){
-		    if (netconf_bad_element(cbret, "application",  ys->ys_argument, reason) < 0)
+		    if (netconf_bad_element(cbret, "application",  yt->ys_argument, reason) < 0)
 			goto done;
 		    goto fail;
 		}
-		if ((ys_cv_validate(cv, ys, &reason)) != 1){
-		    if (netconf_bad_element(cbret, "application",  ys->ys_argument, reason) < 0)
+		if ((ys_cv_validate(cv, yt, &reason)) != 1){
+		    if (netconf_bad_element(cbret, "application",  yt->ys_argument, reason) < 0)
 			goto done;
 		    goto fail;
 		}
@@ -948,12 +973,12 @@ cvec2xml_1(cvec   *cvv,
 }
 
 /*! Recursive help function to compute differences between two xml trees
- * @param[in]  x1       First XML tree
- * @param[in]  x2       Second XML tree
+ * @param[in]  x1        First XML tree
+ * @param[in]  x2        Second XML tree
  * @param[out] x1vec     Pointervector to XML nodes existing in only first tree
  * @param[out] x1veclen  Length of first vector
- * @param[out] x2vec    Pointervector to XML nodes existing in only second tree
- * @param[out] x2veclen Length of x2vec vector
+ * @param[out] x2vec     Pointervector to XML nodes existing in only second tree
+ * @param[out] x2veclen  Length of x2vec vector
  * @param[out] changed_x1  Pointervector to XML nodes changed orig value
  * @param[out] changed_x2  Pointervector to XML nodes changed wanted value
  * @param[out] changedlen Length of changed vector
@@ -988,13 +1013,21 @@ xml_diff1(yang_stmt *ys,
 	    clicon_err(OE_UNIX, errno, "Unknown element: %s", xml_name(x1c));
 	    goto done;
 	}
-	if (match_base_child(x2, x1c, &x2c, yc) < 0)
+	if (match_base_child(x2, x1c, yc, &x2c) < 0)
 	    goto done;
 	if (x2c == NULL){
 	    if (cxvec_append(x1c, x1vec, x1veclen) < 0) 
 		goto done;
 	}
-	else{
+	else if (yang_choice(yc)){
+	    /* if x1c and x2c are choice/case, then they are changed */
+	    if (cxvec_append(x1c, changed_x1, changedlen) < 0) 
+		goto done;
+	    (*changedlen)--; /* append two vectors */
+	    if (cxvec_append(x2c, changed_x2, changedlen) < 0) 
+		goto done;
+	}
+	else{  /* if x1c and x2c are leafs w bodies, then they are changed */
 	    if (yc->ys_keyword == Y_LEAF){
 		if ((b1 = xml_body(x1c)) == NULL) /* empty type */
 		    break;
@@ -1024,7 +1057,7 @@ xml_diff1(yang_stmt *ys,
 	    clicon_err(OE_UNIX, errno, "Unknown element: %s", xml_name(x2c));
 	    goto done;
 	}
-        if (match_base_child(x1, x2c, &x1c, yc) < 0)
+        if (match_base_child(x1, x2c, yc, &x1c) < 0)
 	    goto done;
 	if (x1c == NULL)
 	    if (cxvec_append(x2c, x2vec, x2veclen) < 0) 
@@ -1118,7 +1151,8 @@ yang2api_path_fmt_1(yang_stmt *ys,
 	yp->yn_keyword != Y_SUBMODULE){
 	if (yang2api_path_fmt_1((yang_stmt *)yp, 1, cb) < 0) /* recursive call */
 	    goto done;
-	cprintf(cb, "/");
+	if (yp->yn_keyword != Y_CHOICE && yp->yn_keyword != Y_CASE)
+	    cprintf(cb, "/");
     }
     else /* top symbol - mark with name prefix */
 	cprintf(cb, "/%s:", yp->yn_argument);
@@ -1128,14 +1162,12 @@ yang2api_path_fmt_1(yang_stmt *ys,
 	    cprintf(cb, "%s", ys->ys_argument);
     }
     else{
-#if 1
 	if (ys->ys_keyword == Y_LEAF && yp && 
 	    yp->yn_keyword == Y_LIST){
 	    if (yang_key_match(yp, ys->ys_argument) == 0)
 		cprintf(cb, "%s", ys->ys_argument); /* Not if leaf and key */
 	}
 	else  
-#endif
 	    if (ys->ys_keyword != Y_CHOICE && ys->ys_keyword != Y_CASE)
 		cprintf(cb, "%s", ys->ys_argument);
     }
@@ -2202,7 +2234,7 @@ xml_merge1(cxobj              *x0,
 	    }
 	    /* See if there is a corresponding node in the base tree */
 	    x0c = NULL;
-	    if (yc && match_base_child(x0, x1c, &x0c, yc) < 0)
+	    if (yc && match_base_child(x0, x1c, yc, &x0c) < 0)
 		goto done;
 	    if (xml_merge1(x0c, (yang_node*)yc, x0, x1c, reason) < 0)
 		goto done;
@@ -2284,8 +2316,12 @@ xml_merge(cxobj     *x0,
 	    break;
 	}
 	/* See if there is a corresponding node in the base tree */
-	if (match_base_child(x0, x1c, &x0c, yc) < 0)
+	if (match_base_child(x0, x1c, yc, &x0c) < 0)
 	    goto done;
+	/* There is a case where x0c and x1c are choice nodes, if so,
+	 * it is treated as a match, and x0c will remain 
+	 * If it is overwritten, then x0c should be removed here.
+	 */
 	if (xml_merge1(x0c, (yang_node*)yc, x0, x1c, reason) < 0)
 	    goto done;
 	if (*reason != NULL)
diff --git a/lib/src/clixon_xml_sort.c b/lib/src/clixon_xml_sort.c
index 7f08b35e..fb5e412b 100644
--- a/lib/src/clixon_xml_sort.c
+++ b/lib/src/clixon_xml_sort.c
@@ -75,6 +75,8 @@
  * @param[in]  xp       XML parent, can be NULL.
  * @param[in]  yspec    Yang specification (top level)
  * @param[out] yresult  Pointer to yang stmt of result, or NULL, if not found
+ * @retval     0       OK
+ * @retval    -1       Error
  * @note special rule for rpc, ie <rpc><foo>,look for top "foo" node.
  * @note works for import prefix, but not work for generic XML parsing where
  *       xmlns and xmlns:ns are used.
@@ -555,22 +557,18 @@ xml_sort_verify(cxobj *x0,
 }
 
 /*! Given child tree x1c, find matching child in base tree x0 and return as x0cp
- * param[in]  x0      Base tree node
- * param[in]  x1c     Modification tree child
- * param[in]  yc      Yang spec of tree child
- * param[out] x0cp Matching base tree child (if any)
- * @note XXX: room for optimization? on 1K calls we have 1M body calls and
-	   500K xml_child_each/cvec_each calls. 
-	   The outer loop is large for large lists
-	   The inner loop is small
-	   Major time in xml_find_body()
-	   Can one do a binary search in the x0 list?
-*/
+ * @param[in]  x0      Base tree node
+ * @param[in]  x1c     Modification tree child
+ * @param[in]  yc      Yang spec of tree child
+ * @param[out] x0cp    Matching base tree child (if any)
+ * @retval     0       OK
+ * @retval    -1       Error
+ */
 int
-match_base_child(cxobj     *x0, 
-		 cxobj     *x1c,
-		 cxobj    **x0cp,
-		 yang_stmt *yc)
+match_base_child(cxobj      *x0, 
+		 cxobj      *x1c,
+		 yang_stmt  *yc,
+		 cxobj     **x0cp)
 {
     int        retval = -1;
     cvec      *cvk = NULL; /* vector of index keys */
@@ -582,8 +580,29 @@ match_base_child(cxobj     *x0,
     char     **keyvec = NULL;
     int        i;
     int        yorder;
+    cxobj     *x0c = NULL;
+    yang_stmt *y0c;
+    yang_node *y0p;
+    yang_node *yp; /* yang parent */
     
-    *x0cp = NULL; /* return value */
+    *x0cp = NULL; /* init return value */
+#if 1
+    /* Special case is if yc parent (yp) is choice/case
+     * then find x0 child with same yc even though it does not match lexically
+     * However this will give another y0c != yc
+     */
+    if ((yp = yang_choice(yc)) != NULL){
+	x0c = NULL;
+	while ((x0c = xml_child_each(x0, x0c, CX_ELMNT)) != NULL) {
+	    if ((y0c = xml_spec(x0c)) != NULL &&
+		(y0p = yang_choice(y0c)) != NULL &&
+		y0p == yp)
+		break;	/* x0c will have a value */
+	}
+	*x0cp = x0c;
+	goto ok; /* What to do if not found? */
+    }
+#endif
     switch (yc->ys_keyword){
     case Y_CONTAINER: 	/* Equal regardless */
     case Y_LEAF: 	/* Equal regardless */
@@ -629,11 +648,12 @@ match_base_child(cxobj     *x0,
     /* Get match. Sorting mode(optimized) or not?*/
     if (xml_child_nr(x0)==0 || xml_spec(xml_child_i(x0,0))!=NULL){
 	yorder = yang_order(yc);
-	*x0cp = xml_search(x0, xml_name(x1c), yorder, yc->ys_keyword, keynr, keyvec, keyval);
+	x0c = xml_search(x0, xml_name(x1c), yorder, yc->ys_keyword, keynr, keyvec, keyval);
     }
     else{
-	*x0cp = xml_match(x0, xml_name(x1c), yc->ys_keyword, keynr, keyvec, keyval);
+	x0c = xml_match(x0, xml_name(x1c), yc->ys_keyword, keynr, keyvec, keyval);
     }
+    *x0cp = x0c;
  ok:
     retval = 0;
  done:
diff --git a/lib/src/clixon_xpath_parse.y b/lib/src/clixon_xpath_parse.y
index b121cc2c..db672129 100644
--- a/lib/src/clixon_xpath_parse.y
+++ b/lib/src/clixon_xpath_parse.y
@@ -95,7 +95,7 @@
 
 #define _YYERROR(msg) {clicon_err(OE_XML, 0, "YYERROR %s '%s' %d", (msg), clixon_xpath_parsetext, _XY->xy_linenum); YYERROR;}
 
-/* add _yy to error paramaters */
+/* add _yy to error parameters */
 #define YY_(msgid) msgid 
 
 #include "clixon_config.h"
diff --git a/lib/src/clixon_yang.c b/lib/src/clixon_yang.c
index 36404682..b618f037 100644
--- a/lib/src/clixon_yang.c
+++ b/lib/src/clixon_yang.c
@@ -624,6 +624,28 @@ yang_find_mynamespace(yang_stmt *ys)
     return namespace;
 }
 
+/*! If a given yang stmt has a choice/case as parent, return the choice statement 
+ */
+yang_node *
+yang_choice(yang_stmt *y)
+{
+    yang_node *yp;
+
+    if ((yp = y->ys_parent) != NULL){
+	switch (yp->yn_keyword){
+	case Y_CHOICE:
+	    return yp;
+	    break;
+	case Y_CASE:
+	    return yp->yn_parent;
+	    break;
+	default:
+	    break;
+	}
+    }
+    return NULL;
+}
+
 /*! Find matching y in yp:s children, return 0 and index or -1 if not found.
  * @retval 0 not found
  * @retval 1 found
@@ -2685,7 +2707,7 @@ yang_mandatory(yang_stmt *ys)
 {
     yang_stmt *ym;
 
-    if (ys->ys_keyword != Y_LEAF)
+    if (ys->ys_keyword != Y_LEAF && ys->ys_keyword != Y_CHOICE)
 	return 0;
     if ((ym = yang_find((yang_node*)ys, Y_MANDATORY, NULL)) != NULL){
 	if (ym->ys_cv == NULL) /* shouldnt happen */
diff --git a/lib/src/clixon_yang_parse.y b/lib/src/clixon_yang_parse.y
index 9ffac45e..aef0cc07 100644
--- a/lib/src/clixon_yang_parse.y
+++ b/lib/src/clixon_yang_parse.y
@@ -165,7 +165,7 @@
 
 #define _YYERROR(msg) {clicon_debug(2, "YYERROR %s '%s' %d", (msg), clixon_yang_parsetext, _YY->yy_linenum); YYERROR;}
 
-/* add _yy to error paramaters */
+/* add _yy to error parameters */
 #define YY_(msgid) msgid 
 
 #include "clixon_config.h"
diff --git a/test/test_choice.sh b/test/test_choice.sh
new file mode 100755
index 00000000..c2b2f91f
--- /dev/null
+++ b/test/test_choice.sh
@@ -0,0 +1,212 @@
+#!/bin/bash
+# Choice type and mandatory
+# Example from RFC7950 Sec 7.9.6
+# Also test mandatory behaviour as in 7.6.5
+# (XXX Would need default test in 7.6.4)
+# Use-case: The ietf-netconf edit-config has a shorthand version of choice w mandatory:
+# container { choice target { mandatory; leaf candidate; leaf running; }}
+
+APPNAME=example
+# include err() and new() functions and creates $dir
+. ./lib.sh
+
+cfg=$dir/choice.xml
+fyang=$dir/type.yang
+
+cat <<EOF > $cfg
+<config>
+  <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
+  <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_MODULE_MAIN>system</CLICON_YANG_MODULE_MAIN>
+  <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_RESTCONF_PRETTY>false</CLICON_RESTCONF_PRETTY>
+  <CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
+  <CLICON_CLI_GENMODEL_COMPLETION>1</CLICON_CLI_GENMODEL_COMPLETION>
+  <CLICON_XMLDB_DIR>/usr/local/var/$APPNAME</CLICON_XMLDB_DIR>
+  <CLICON_XMLDB_PLUGIN>/usr/local/lib/xmldb/text.so</CLICON_XMLDB_PLUGIN>
+</config>
+EOF
+
+cat <<EOF > $fyang
+module system{
+  yang-version 1.1;
+  namespace "urn:example:config";
+  prefix ex;
+  container system{
+    /* From RFC 7950 7.9.6 */
+    container protocol {
+       presence true;
+         choice name {
+           case a {
+             leaf udp {
+               type empty;
+             }
+           }
+           case b {
+             leaf tcp {
+               type empty;
+             }
+           }
+         }
+     }
+    /* Same but shorthand */
+    container shorthand {
+       presence true;
+         choice name {
+             leaf udp {
+               type empty;
+             }
+             leaf tcp {
+               type empty;
+             }
+         }
+     }
+    /* Same with mandatory true */
+    container mandatory {
+       presence true;
+         choice name {
+           mandatory true;
+           case a {
+             leaf udp {
+               type empty;
+             }
+           }
+           case b {
+             leaf tcp {
+               type empty;
+             }
+           }
+         }
+     }
+  }
+}
+EOF
+
+new "test params: -f $cfg -y $fyang"
+
+if [ $BE -ne 0 ]; then
+    new "kill old backend"
+    sudo clixon_backend -zf $cfg
+    if [ $? -ne 0 ]; then
+	err
+    fi
+    new "start backend -s init -f $cfg -y $fyang"
+    sudo $clixon_backend -s init -f $cfg -y $fyang
+    if [ $? -ne 0 ]; then
+	err
+    fi
+fi
+
+new "kill old restconf daemon"
+sudo pkill -u www-data clixon_restconf
+
+new "start restconf daemon"
+sudo su -c "$clixon_restconf -f $cfg -y $fyang -D $DBG" -s /bin/sh www-data &
+
+# First vanilla (protocol) case
+new "netconf validate empty"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "netconf set empty protocol"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><system xmlns="urn:example:config"><protocol/></system></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "netconf validate protocol"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "netconf set protocol tcp"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><system xmlns="urn:example:config"><protocol><tcp/></protocol></system></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "netconf get protocol tcp"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" '^<rpc-reply><data><system xmlns="urn:example:config"><protocol><tcp/></protocol></system></data></rpc-reply>]]>]]>$'
+
+new "netconf commit protocol tcp"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "netconf changing from TCP to UDP (RFC7950 7.9.6)"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc message-id="101" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0"><edit-config><target><candidate/></target><config><system xmlns="urn:example:config"><protocol><udp nc:operation="create"/></protocol></system></config></edit-config></rpc>]]>]]>' '^<rpc-reply message-id="101" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0"><ok/></rpc-reply>]]>]]>$'
+
+new "netconf get protocol udp"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" '^<rpc-reply><data><system xmlns="urn:example:config"><protocol><udp/></protocol></system></data></rpc-reply>]]>]]>$'
+
+new "netconf commit protocol udp"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "restconf set protocol tcp"
+expecteq "$(curl -s -X PUT http://localhost/restconf/data/system:system/protocol -d {\"system:protocol\":{\"tcp\":null}})" ""
+
+new2 "restconf get protocol tcp"
+expecteq "$(curl -s -X GET http://localhost/restconf/data/system:system)" '{"system:system": {"protocol": {"tcp": null}}}
+
'
+
+new "cli set protocol udp"
+expectfn "$clixon_cli -1 -f $cfg -y $fyang -l o set system protocol udp" 0 "^$"
+
+new "cli get protocol udp"
+expectfn "$clixon_cli -1 -f $cfg -y $fyang -l o show configuration cli " 0 "^system protocol udp$"
+
+new "cli delete all"
+expectfn "$clixon_cli -1 -f $cfg -y $fyang -l o delete all" 0 "^$"
+
+new "commit"
+expectfn "$clixon_cli -1 -f $cfg -y $fyang -l o commit" 0 "^$"
+
+# Second shorthand (no case)
+new "netconf set shorthand tcp"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><system xmlns="urn:example:config"><shorthand><tcp/></shorthand></system></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "netconf changing from TCP to UDP (RFC7950 7.9.6)"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc message-id="101" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0"><edit-config><target><candidate/></target><config><system xmlns="urn:example:config"><shorthand><udp/></shorthand></system></config></edit-config></rpc>]]>]]>' '^<rpc-reply message-id="101" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0"><ok/></rpc-reply>]]>]]>$'
+
+new "netconf get shorthand udp"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" '^<rpc-reply><data><system xmlns="urn:example:config"><shorthand><udp/></shorthand></system></data></rpc-reply>]]>]]>$'
+
+new "netconf validate shorthand"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "netconf discard-changes"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+# Third check mandatory
+new "netconf set empty mandatory"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><system xmlns="urn:example:config"><mandatory/></system></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "netconf get mandatory empty"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" '^<rpc-reply><data><system xmlns="urn:example:config"><mandatory/></system></data></rpc-reply>]]>]]>$'
+
+new "netconf validate mandatory"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>missing-element</error-tag><error-info><bad-element>name</bad-element></error-info><error-severity>error</error-severity><error-message>Mandatory choice</error-message></rpc-error></rpc-reply>]]>]]>$'
+
+new "netconf set mandatory udp"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><system xmlns="urn:example:config"><mandatory><udp/></mandatory></system></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "netconf get mandatory udp"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" '^<rpc-reply><data><system xmlns="urn:example:config"><mandatory><udp/></mandatory></system></data></rpc-reply>]]>]]>$'
+
+new "netconf validate mandatory"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "Kill restconf daemon"
+sudo pkill -u www-data -f "/www-data/clixon_restconf"
+
+if [ $BE -eq 0 ]; then
+    exit # BE
+fi
+
+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
+sudo clixon_backend -z -f $cfg
+if [ $? -ne 0 ]; then
+    err "kill backend"
+fi
+
+rm -rf $dir
diff --git a/test/test_leafref.sh b/test/test_leafref.sh
index 63c6a270..4bb83b5c 100755
--- a/test/test_leafref.sh
+++ b/test/test_leafref.sh
@@ -88,7 +88,7 @@ if [ $BE -ne 0 ]; then
 fi
 
 new "leafref base config"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth0</name><type>ex:eth</type>  <ipv4><address><ip>192.0.2.1</ip></address><address><ip>192.0.2.2</ip></address></ipv4></interface><interface><name>lo</name><type>ex:lo</type><ipv4><address><ip>127.0.0.1</ip></address></ipv4></interface></interfaces></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth0</name><type>ex:eth</type><ipv4><address><ip>192.0.2.1</ip><prefix-length>24</prefix-length></address><address><ip>192.0.2.2</ip><prefix-length>24</prefix-length></address></ipv4></interface><interface><name>lo</name><type>ex:lo</type><ipv4><address><ip>127.0.0.1</ip><prefix-length>32</prefix-length></address></ipv4></interface></interfaces></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "leafref get config"
 expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth0</name>'
diff --git a/test/test_rpc.sh b/test/test_rpc.sh
index f033dfb0..45b357f1 100755
--- a/test/test_rpc.sh
+++ b/test/test_rpc.sh
@@ -115,13 +115,28 @@ expecteq "$(curl -s -X POST -d '{"example:input":{"x":"0","extra":"0"}}' http://
 new2 "restconf wrong method"
 expecteq "$(curl -s -X POST -d '{"example:input":{"x":"0"}}' http://localhost/restconf/operations/example:wrong)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "wrong"},"error-severity": "error","error-message": "RPC not defined"}}}
'
 
-new2 "restconf edit-config missing mandatory"
+new2 "restconf example missing input"
 expecteq "$(curl -s -X POST -d '{"example:input":null}' http://localhost/restconf/operations/ietf-netconf:edit-config)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "yang module not found"}}}
'
 
+
 new "netconf kill-session missing session-id mandatory"
 expecteof "$clixon_netconf -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><kill-session/></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>missing-element</error-tag><error-info><bad-element>session-id</bad-element></error-info><error-severity>error</error-severity><error-message>Mandatory variable</error-message></rpc-error></rpc-reply>]]>]]>$'
 
-# edit-config?
+new "netconf edit-config ok"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><target><candidate/></target><config/></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "netconf edit-config extra arg should fail"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><target><candidate/></target><extra/><config/></edit-config></rpc>]]>]]>' "^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>unknown-element</error-tag><error-info><bad-element>extra</bad-element></error-info><error-severity>error</error-severity></rpc-error></rpc-reply>]]>]]>$"
+
+new "netconf edit-config empty target should fail"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><target/><config/></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>missing-element</error-tag><error-info><bad-element>config-target</bad-element></error-info><error-severity>error</error-severity><error-message>Mandatory choice</error-message></rpc-error></rpc-reply>]]>]]>
+$'
+
+new "netconf edit-config missing target should fail"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><config/></edit-config></rpc>]]>]]>' "^<rpc-reply><rpc-error><error-tag>missing-element</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-info><bad-element>target</bad-element></error-info></rpc-error></rpc-reply>]]>]]>$"
+
+new "netconf edit-config missing config should fail"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><target><candidate/></target></edit-config></rpc>]]>]]>' '<rpc-reply><rpc-error><error-type>application</error-type><error-tag>missing-element</error-tag><error-info><bad-element>edit-content</bad-element></error-info><error-severity>error</error-severity><error-message>Mandatory choice</error-message></rpc-error></rpc-reply>]]>]]>$'
 
 new "Kill restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"

From 5b6af82e2989107559d020437c8f36d0880f1c81 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sat, 5 Jan 2019 11:08:16 +0100
Subject: [PATCH 25/72] Validation of mandatory choice and recursive mandatory
 containers.

---
 CHANGELOG.md                  |  17 +++--
 apps/backend/backend_client.c |   5 +-
 apps/backend/backend_commit.c |   4 +-
 apps/netconf/netconf_main.c   |   4 +-
 apps/restconf/README.md       |  10 +--
 example/example_cli.c         |   2 +-
 lib/src/clixon_xml_map.c      | 132 ++++++++++++++++++++++------------
 lib/src/clixon_yang.c         |  52 +++++++++++---
 test/test_choice.sh           |   2 +-
 test/test_nacm_ext.sh         |   4 +-
 test/test_nacm_protocol.sh    |   5 +-
 test/test_openconfig.sh       |  34 ++++++---
 test/test_restconf.sh         |   2 +-
 test/test_rpc.sh              |   7 +-
 14 files changed, 186 insertions(+), 94 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58ca127d..36269387 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 ## 3.9.0 (Preliminary Target: Mid-January 2019)
 
 ### Planned new features
-* [Roadmap](ROADMAP.md) (Uncommitted and unprioritized)
+* [Roadmap](ROADMAP.md)
 
 ### Major New features
 * Correct XML namespace handling
@@ -56,11 +56,6 @@
   ```
   * To keep previous non-strict namespace handling (backwards compatible), set CLICON_XML_NS_STRICT to false.
   * See https://github.com/clicon/clixon/issues/49
-* NACM extension (RFC8341)
-  * NACM module support (RFC8341 A1+A2)
-  * Recovery user "_nacm_recovery" added.
-    * Example use is restconf PUT when NACM edit-config is permitted, then automatic commit and discard are permitted using recovery user.
-  * Example user changed adm1 to andy to comply with RFC8341 example
 * Yang code upgrade (RFC7950)
   * YANG parser cardinality checked (https://github.com/clicon/clixon/issues/48)
     * See https://github.com/clicon/clixon/issues/84
@@ -70,13 +65,18 @@
   * Openconfig yang specs parsed: https://github.com/openconfig/public
   * Improved "unknown" handling
   * More precise Yang validation and better error messages
-    * Example: adding bad-, missing-, or unknown-element error messages, etc instead of operation-failed, bad-element instead of "yang node not found", etc.
-    * 
+    * Example: adding bad-, missing-, or unknown-element error messages, instead of operation-failed.
+    * Validation of mandatory choice and recursive mandatory containers
   * Yang load file configure options changed
     * `CLICON_YANG_DIR` is changed from a single directory to a path of directories
       * Note CLIXON_DATADIR (=/usr/local/share/clixon) need to be in the list
     * CLICON_YANG_MAIN_FILE Provides a filename with a single module filename.
     * CLICON_YANG_MAIN_DIR Provides a directory where all yang modules should be loaded.
+* NACM extension (RFC8341)
+  * NACM module support (RFC8341 A1+A2)
+  * Recovery user "_nacm_recovery" added.
+    * Example use is restconf PUT when NACM edit-config is permitted, then automatic commit and discard are permitted using recovery user.
+  * Example user changed adm1 to andy to comply with RFC8341 example
 
 ### API changes on existing features (you may need to change your code)
 * Stricter YANG choice validation leads to enforcement of structures like: `choice c{ mandatory true; leaf x` statements. `x` was not previously enforced.
@@ -95,7 +95,6 @@
   * For backward compatibility, define CLICON_CLI_MODEL_TREENAME_PATCH in clixon_custom.h
 
 ### Minor changes
-* Yang choice functionality improved and stricter validation for CLI generation, mandatory flags, etc.
 * Added new clixon-lib yang module for internal netconf protocol. Currently only extends the standard with a debug RPC.
 * Added three-valued return values for several validate functions where -1 is fatal error, 0 is validation failed and 1 is validation OK.
   * This includes: `xmldb_put`, `xml_yang_validate_all`, `xml_yang_validate_add`, `xml_yang_validate_rpc`, `api_path2xml`, `api_path2xpath`
diff --git a/apps/backend/backend_client.c b/apps/backend/backend_client.c
index a141f09f..2bbfbf85 100644
--- a/apps/backend/backend_client.c
+++ b/apps/backend/backend_client.c
@@ -430,8 +430,9 @@ from_client_edit_config(clicon_handle h,
 	goto done;
     }
     if ((target = netconf_db_find(xn, "target")) == NULL){
-	clicon_err(OE_XML, 0, "db not found");
-	goto done;
+	if (netconf_missing_element(cbret, "protocol", "target", NULL) < 0)
+	    goto done;
+	goto ok;
     }
     if ((cbx = cbuf_new()) == NULL){
 	clicon_err(OE_XML, errno, "cbuf_new");
diff --git a/apps/backend/backend_commit.c b/apps/backend/backend_commit.c
index d7c2d6c3..8c406d69 100644
--- a/apps/backend/backend_commit.c
+++ b/apps/backend/backend_commit.c
@@ -117,8 +117,8 @@ generic_validate(yang_spec          *yspec,
     for (i=0; i<td->td_dlen; i++){
 	x1 = td->td_dvec[i];
 	ys = xml_spec(x1);
-	if (ys && yang_mandatory(ys)){
-	    if (netconf_missing_element(cbret, "protocol", xml_name(x1), "Removed mandatory variable") < 0)
+	if (ys && yang_mandatory(ys) && yang_config(ys)==0){
+	    if (netconf_missing_element(cbret, "protocol", xml_name(x1), "Missing mandatory variable") < 0)
 		goto done;
 	    goto fail;
 	}
diff --git a/apps/netconf/netconf_main.c b/apps/netconf/netconf_main.c
index 7e1163dc..19ec4ee6 100644
--- a/apps/netconf/netconf_main.c
+++ b/apps/netconf/netconf_main.c
@@ -97,8 +97,8 @@ netconf_input_packet(clicon_handle h,
     cxobj     *xa;
     cxobj     *xa2;
 
-    clicon_debug(1, "RECV");
-    clicon_debug(2, "%s: RCV: \"%s\"", __FUNCTION__, cbuf_get(cb));
+    clicon_debug(1, "%s", __FUNCTION__);
+    clicon_debug(2, "%s: \"%s\"", __FUNCTION__, cbuf_get(cb));
     if ((cbret = cbuf_new()) == NULL){
 	clicon_err(LOG_ERR, errno, "cbuf_new");
 	goto done;
diff --git a/apps/restconf/README.md b/apps/restconf/README.md
index 2295e3fa..e951e18a 100644
--- a/apps/restconf/README.md
+++ b/apps/restconf/README.md
@@ -2,10 +2,10 @@
 
   * [Installation](#installation)
   * [Streams](#streams)
-  * [Nchan Streams](#nchan-streams)
+  * [Nchan Streams](#nchan)
   * [Debugging](#debugging)	
 
-## 1. Installation
+## Installation
 
 The examples are based on Nginx. Other reverse proxies should work but are not verified.
 
@@ -76,7 +76,7 @@ Example of writing a new interfaces specification:
 curl -sX PUT http://localhost/restconf/data -d '{"ietf-interfaces:interfaces":{"interface":{"name":"eth1","type":"ex:eth","enabled":true}}}' 
 ```
 
-## 2. Streams
+## Streams
 
 Clixon have two experimental restconf event stream implementations following
 RFC8040 Section 6 using SSE.  One native and one using Nginx
@@ -125,7 +125,7 @@ You can also specify start and stop time. Start-time enables replay of existing
 
 See (stream tests)[../test/test_streams.sh] for more examples.
 
-## 3. Nchan
+## Nchan
 
 As an alternative streams implementation, Nginx/Nchan can be used. 
 Nginx uses pub/sub channels and can be configured in a variety of
@@ -180,7 +180,7 @@ curl -H "Accept: text/event-stream" -H "Last-Event-ID: 1539961709:0" -s -X GET h
 
 See (https://nchan.io/#eventsource) on more info on how to access an SSE sub endpoint.
 
-## 4. Debugging
+## Debugging
 
 Start the restconf fastcgi program with debug flag:
 ```
diff --git a/example/example_cli.c b/example/example_cli.c
index bf24064d..ebd2305a 100644
--- a/example/example_cli.c
+++ b/example/example_cli.c
@@ -96,7 +96,7 @@ fib_route_rpc(clicon_handle h,
     /* User supplied variable in CLI command */
     instance = cvec_find(cvv, "instance"); /* get a cligen variable from vector */
     /* Create XML for fib-route netconf RPC */
-    if (xml_parse_va(&xtop, NULL, "<rpc xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\" username=\"%s\"><fib-route xmlns=\"urn:ietf:params:xml:ns:yang:ietf-routing\"><routing-instance-name>%s</routing-instance-name></fib-route></rpc>",
+    if (xml_parse_va(&xtop, NULL, "<rpc xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\" username=\"%s\"><fib-route xmlns=\"urn:ietf:params:xml:ns:yang:ietf-routing\"><routing-instance-name>%s</routing-instance-name><destination-address><address-family>ipv4</address-family></destination-address></fib-route></rpc>",
 		     clicon_username_get(h),
 		     cv_string_get(instance)) < 0)
 	goto done;
diff --git a/lib/src/clixon_xml_map.c b/lib/src/clixon_xml_map.c
index 4b51e30b..faac0666 100644
--- a/lib/src/clixon_xml_map.c
+++ b/lib/src/clixon_xml_map.c
@@ -482,6 +482,89 @@ xml_yang_validate_rpc(cxobj *xrpc,
     goto done;
 }
 
+/*! Check if an xml node lacks mandatory children
+ * @param[in]  xt    XML node to be validated
+ * @param[in]  yt    xt:s yang statement
+ * @param[out] cbret Error buffer (set w netconf error if retval == 0)
+ * @retval     1     Validation OK
+ * @retval     0     Validation failed (cbret set)
+ * @retval    -1     Error
+ */
+static int
+check_mandatory(cxobj     *xt, 
+		yang_stmt *yt,
+		cbuf      *cbret)
+{
+    int        retval = -1;
+    int        i;
+    cxobj     *x;
+    yang_stmt *y;
+    yang_stmt *yc;
+    yang_node *yp;
+    
+    for (i=0; i<yt->ys_len; i++){
+	yc = yt->ys_stmt[i];
+	if (!yang_mandatory(yc))
+	    continue;
+	switch (yc->ys_keyword){
+	case Y_CONTAINER:
+	case Y_ANYDATA:
+	case Y_ANYXML:
+	case Y_LEAF: 
+	    if (yang_config(yc)==0) 
+		 break;
+	    /* Find a child with the mandatory yang */
+	    x = NULL;
+	    while ((x = xml_child_each(xt, x, CX_ELMNT)) != NULL) {
+		if ((y = xml_spec(x)) != NULL
+		    && y==yc)
+		    break; /* got it */
+	    }
+	    if (x == NULL){
+		if (netconf_missing_element(cbret, "application", yc->ys_argument, "Mandatory variable") < 0)
+		    goto done;
+		goto fail;
+	    }
+	    break;
+	case Y_CHOICE: /* More complex because of choice/case structure */
+	    x = NULL;
+	    while ((x = xml_child_each(xt, x, CX_ELMNT)) != NULL) {
+		if ((y = xml_spec(x)) != NULL &&
+		    (yp = yang_choice(y)) != NULL &&
+		    yp == (yang_node*)yc){
+		    break; /* leave loop with x set */
+		}
+	    }
+	    if (x == NULL){
+		/* @see RFC7950: 15.6 Error Message for Data That Violates 
+		 * a Mandatory "choice" Statement */
+		if (cprintf(cbret, "<rpc-reply><rpc-error>"
+			    "<error-type>application</error-type>"
+			    "<error-tag>data-missing</error-tag>"
+			    "<error-app-tag>missing-choice</error-app-tag>"
+#ifdef NYI
+			    //  "<error-path></error-path>"
+#endif
+			    "<error-info><missing-choice>%s</missing-choice></error-info>"
+			    "<error-severity>error</error-severity>"
+			    "</rpc-error></rpc-reply>",
+			    yc->ys_argument) <0)
+		    goto done;
+		goto fail;
+	    }
+	    break;
+	default:
+	    break;
+	} /* switch */
+    }
+    retval = 1;
+ done:
+    return retval;
+ fail:
+    retval = 0;
+    goto done;
+}
+
 /*! Validate a single XML node with yang specification for added entry
  * 1. Check if mandatory leafs present as subs.
  * 2. Check leaf values, eg int ranges and string regexps.
@@ -510,10 +593,6 @@ xml_yang_validate_add(cxobj   *xt,
     cg_var    *cv = NULL;
     char      *reason = NULL;
     yang_stmt *yt;   /* yang spec of xt going in */
-    yang_stmt *yc;   /* yang spec of yt child */
-    yang_stmt *yx;   /* yang spec of xt children */
-    yang_node *yp;   /* yang spec of parent of yang spec of xt children */
-    int        i;
     char      *body;
     int        ret;
     cxobj     *x;
@@ -521,47 +600,12 @@ xml_yang_validate_add(cxobj   *xt,
     /* if not given by argument (overide) use default link 
        and !Node has a config sub-statement and it is false */
     if ((yt = xml_spec(xt)) != NULL && yang_config(yt) != 0){
+	if ((ret = check_mandatory(xt, yt, cbret)) < 0)
+	    goto done;
+	if (ret == 0)
+	    goto fail;
+	/* Check leaf values */
 	switch (yt->ys_keyword){
-	case Y_RPC:
-	case Y_INPUT:
-	case Y_LIST:
-	    /* fall thru */
-	case Y_CONTAINER:
-	    for (i=0; i<yt->ys_len; i++){
-		yc = yt->ys_stmt[i];
-		switch (yc->ys_keyword){
-		case Y_LEAF:
-		    if (yang_config(yc)==0)
-			break;
-		    if (yang_mandatory(yc) && xml_find(xt, yc->ys_argument)==NULL){
-			if (netconf_missing_element(cbret, "application", yc->ys_argument, "Mandatory variable") < 0)
-			    goto done;
-			goto fail;
-		    }
-		    break;
-		case Y_CHOICE:
-		    if (yang_mandatory(yc)){
-			/* If there is one child with this choice as parent */
-			x = NULL;
-			while ((x = xml_child_each(xt, x, CX_ELMNT)) != NULL) {
-			    if ((yx = xml_spec(x)) != NULL &&
-				(yp = yang_choice(yx)) != NULL &&
-				yp == (yang_node*)yc){
-				break; /* leave loop with x set */
-			    }
-			}
-			if (x == NULL){ /* No hit */
-			    if (netconf_missing_element(cbret, "application", yc->ys_argument, "Mandatory choice") < 0)
-				goto done;
-			    goto fail;
-			}
-		    }
-		    break;
-		default:
-		    break;
-		}
-	    }
-	    break;
 	case Y_LEAF:
 	    /* fall thru */
 	case Y_LEAF_LIST:
diff --git a/lib/src/clixon_yang.c b/lib/src/clixon_yang.c
index b618f037..7a81bc6b 100644
--- a/lib/src/clixon_yang.c
+++ b/lib/src/clixon_yang.c
@@ -2701,26 +2701,62 @@ ys_parse_sub(yang_stmt *ys,
  * Note: one can cache this value in ys_cvec instead of functionally evaluating it.
  * @retval 1 yang statement is leaf and it has a mandatory sub-stmt with value true
  * @retval 0 The negation of conditions for return value 1.
+ * @see RFC7950 Sec 3:
+ *   o  mandatory node: A mandatory node is one of:
+ *      1)  A leaf, choice, anydata, or anyxml node with a "mandatory"
+ *         statement with the value "true".
+ *      2)  A list or leaf-list node with a "min-elements" statement with a
+ *         value greater than zero.
+ *      3)  A container node without a "presence" statement and that has at
+ *         least one mandatory node as a child.
  */
 int
 yang_mandatory(yang_stmt *ys)
 {
     yang_stmt *ym;
+    char      *reason = NULL;
+    uint8_t   min_elements; /* XXX change to 32 (need new cligen version) */
 
-    if (ys->ys_keyword != Y_LEAF && ys->ys_keyword != Y_CHOICE)
-	return 0;
-    if ((ym = yang_find((yang_node*)ys, Y_MANDATORY, NULL)) != NULL){
-	if (ym->ys_cv == NULL) /* shouldnt happen */
-	    return 0; 
-	return cv_bool_get(ym->ys_cv);
+    /* 1) A leaf, choice, anydata, or anyxml node with a "mandatory"
+     *    statement with the value "true". */
+    if (ys->ys_keyword == Y_LEAF || ys->ys_keyword == Y_CHOICE ||
+	ys->ys_keyword == Y_ANYDATA || ys->ys_keyword == Y_ANYXML){
+	if ((ym = yang_find((yang_node*)ys, Y_MANDATORY, NULL)) != NULL){
+	    if (ym->ys_cv != NULL) /* shouldnt happen */
+		return cv_bool_get(ym->ys_cv);
+	}
+    }
+    /* 2) A list or leaf-list node with a "min-elements" statement with a
+     *    value greater than zero. */
+    else if (ys->ys_keyword == Y_LIST || ys->ys_keyword == Y_LEAF_LIST){
+	if ((ym = yang_find((yang_node*)ys, Y_MIN_ELEMENTS, NULL)) != NULL){
+	    /* XXX change to 32 (need new cligen version) */
+	    if (parse_uint8(ym->ys_argument, &min_elements, &reason) != 1){
+		clicon_err(OE_YANG, EINVAL, "%s", reason?reason:"parse_uint8");
+		return 0; /* XXX ignore error */
+	    }
+	    return min_elements > 0;
+	}
+    }
+    /* 3) A container node without a "presence" statement and that has at
+     *    least one mandatory node as a child. */
+    else if (ys->ys_keyword == Y_CONTAINER && 
+	     yang_find((yang_node*)ys, Y_PRESENCE, NULL) == NULL){
+	yang_stmt *yc;
+	int i;
+	for (i=0; i<ys->ys_len; i++){
+	    yc = ys->ys_stmt[i];
+	    if (yang_mandatory(yc))
+		return 1;
+	}
     }
     return 0;
 }
 
 /*! Return config state of this node
  * config statement is default true. 
- * Note that a node with config=false may not have a sub
- * statement where config=true. And this function does not check the sttaus of a parent.
+ * @note a node with config=false may not have a sub statement where 
+ * config=true. And this function does not check the status of a parent.
  * @retval 0 if node has a config sub-statement and it is false
  * @retval 1 node has not config sub-statement or it is true
  */
diff --git a/test/test_choice.sh b/test/test_choice.sh
index c2b2f91f..1289a0f5 100755
--- a/test/test_choice.sh
+++ b/test/test_choice.sh
@@ -179,7 +179,7 @@ new "netconf get mandatory empty"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" '^<rpc-reply><data><system xmlns="urn:example:config"><mandatory/></system></data></rpc-reply>]]>]]>$'
 
 new "netconf validate mandatory"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>missing-element</error-tag><error-info><bad-element>name</bad-element></error-info><error-severity>error</error-severity><error-message>Mandatory choice</error-message></rpc-error></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>data-missing</error-tag><error-app-tag>missing-choice</error-app-tag><error-info><missing-choice>name</missing-choice></error-info><error-severity>error</error-severity></rpc-error></rpc-reply>]]>]]>$'
 
 new "netconf set mandatory udp"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><system xmlns="urn:example:config"><mandatory><udp/></mandatory></system></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
diff --git a/test/test_nacm_ext.sh b/test/test_nacm_ext.sh
index b9cef0e1..edbef77f 100755
--- a/test/test_nacm_ext.sh
+++ b/test/test_nacm_ext.sh
@@ -137,8 +137,8 @@ EOF
 new "test params: -f $cfg -y $fyang"
 
 if [ $BE -ne 0 ]; then
-    new "kill old backend -zf $cfg -y $fyang"
-    sudo clixon_backend -zf $cfg -y $fyang
+    new "kill old backend -zf $cfg "
+    sudo clixon_backend -zf $cfg
     if [ $? -ne 0 ]; then
 	err
     fi
diff --git a/test/test_nacm_protocol.sh b/test/test_nacm_protocol.sh
index b4e5bc2f..8a3c298e 100755
--- a/test/test_nacm_protocol.sh
+++ b/test/test_nacm_protocol.sh
@@ -21,7 +21,7 @@
 #  automatically committed to running immediately after each successful
 #  edit.
 # Which means that restconf -X DELETE /data translates to edit-config + commit
-# WHICH IS allowed.
+# which is allowed.
 
 APPNAME=example
 # include err() and new() functions and creates $dir
@@ -65,7 +65,6 @@ module $APPNAME{
   }
 }
 EOF
-
 # The groups are slightly modified from RFC8341 A.1
 # The rule-list is from A.2
 RULES=$(cat <<EOF
@@ -228,4 +227,4 @@ if [ $? -ne 0 ]; then
     err "kill backend"
 fi
 
-#rm -rf $dir # XXX
+rm -rf $dir 
diff --git a/test/test_openconfig.sh b/test/test_openconfig.sh
index 26d81976..f59333e2 100755
--- a/test/test_openconfig.sh
+++ b/test/test_openconfig.sh
@@ -10,14 +10,12 @@ OPENCONFIG=public
 OCDIR=$OPENCONFIG/release/models
 
 # Clone openconfig dir if not there
-if false; then
 if [ ! -d public ]; then 
     git clone https://github.com/openconfig/public
-else
-    (cd public;
-     #git pull
-    )
-fi
+#else
+#    (cd public;
+#     #git pull
+#    )
 fi
 
 # include err() and new() functions and creates $dir
@@ -86,17 +84,33 @@ cat <<EOF > $cfg
 EOF
 
 files=$(find $OPENCONFIG -name "*.yang")
-# Just cound nr of modules (exclude submodule)
-let m=0; # Nr of modules
+# 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
-    if [ -n "$(head -1 $f|grep '^module')" ]; then
+    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
+echo "m:$ms s:$ss"
 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 "cli $f"
+	new "$clixon_cli -1f $cfg -y $f show version"
 	expectfn "$clixon_cli -1f $cfg -y $f show version" 0 "3."
     fi
 
diff --git a/test/test_restconf.sh b/test/test_restconf.sh
index 2a1fd961..66710e91 100755
--- a/test/test_restconf.sh
+++ b/test/test_restconf.sh
@@ -293,7 +293,7 @@ new2 "restconf rpc missing input"
 expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations/ietf-routing:fib-route)" '{"ietf-restconf:errors" : {"error": {"error-type": "rpc","error-tag": "malformed-message","error-severity": "error","error-message": "restconf RPC does not have input statement"}}}
'
 
 new "restconf rpc using POST xml"
-ret=$(curl -s -X POST -H "Accept: application/yang-data+xml" -d '{"ietf-routing:input":{"routing-instance-name":"ipv4"}}' http://localhost/restconf/operations/ietf-routing:fib-route)
+ret=$(curl -s -X POST -H "Accept: application/yang-data+xml" -d '{"ietf-routing:input":{"routing-instance-name":"ipv4","destination-address":{"address-family":"ipv4"}}}' http://localhost/restconf/operations/ietf-routing:fib-route)
 expect='<output xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"><route><address-family>ipv4</address-family><next-hop><next-hop-list>2.3.4.5</next-hop-list></next-hop><source-protocol>static</source-protocol></route></output>'
 match=`echo $ret | grep -EZo "$expect"`
 if [ -z "$match" ]; then
diff --git a/test/test_rpc.sh b/test/test_rpc.sh
index 45b357f1..27fb74c8 100755
--- a/test/test_rpc.sh
+++ b/test/test_rpc.sh
@@ -129,14 +129,13 @@ new "netconf edit-config extra arg should fail"
 expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><target><candidate/></target><extra/><config/></edit-config></rpc>]]>]]>' "^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>unknown-element</error-tag><error-info><bad-element>extra</bad-element></error-info><error-severity>error</error-severity></rpc-error></rpc-reply>]]>]]>$"
 
 new "netconf edit-config empty target should fail"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><target/><config/></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>missing-element</error-tag><error-info><bad-element>config-target</bad-element></error-info><error-severity>error</error-severity><error-message>Mandatory choice</error-message></rpc-error></rpc-reply>]]>]]>
-$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><target/><config/></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>data-missing</error-tag><error-app-tag>missing-choice</error-app-tag><error-info><missing-choice>config-target</missing-choice></error-info><error-severity>error</error-severity></rpc-error></rpc-reply>]]>]]>$'
 
 new "netconf edit-config missing target should fail"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><config/></edit-config></rpc>]]>]]>' "^<rpc-reply><rpc-error><error-tag>missing-element</error-tag><error-type>protocol</error-type><error-severity>error</error-severity><error-info><bad-element>target</bad-element></error-info></rpc-error></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><config/></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>missing-element</error-tag><error-info><bad-element>target</bad-element></error-info><error-severity>error</error-severity><error-message>Mandatory variable</error-message></rpc-error></rpc-reply>]]>]]>$'
 
 new "netconf edit-config missing config should fail"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><target><candidate/></target></edit-config></rpc>]]>]]>' '<rpc-reply><rpc-error><error-type>application</error-type><error-tag>missing-element</error-tag><error-info><bad-element>edit-content</bad-element></error-info><error-severity>error</error-severity><error-message>Mandatory choice</error-message></rpc-error></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><target><candidate/></target></edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>data-missing</error-tag><error-app-tag>missing-choice</error-app-tag><error-info><missing-choice>edit-content</missing-choice></error-info><error-severity>error</error-severity></rpc-error></rpc-reply>]]>]]>$'
 
 new "Kill restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"

From 0502ca4218a3fcd188d3512f7a34e066d2163304 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sat, 5 Jan 2019 14:16:56 +0100
Subject: [PATCH 26/72]  Hand-crafted validation messages removed and replaced
 with generic validations.

---
 CHANGELOG.md               |   4 +-
 apps/netconf/netconf_rpc.c | 390 +++----------------------------------
 2 files changed, 30 insertions(+), 364 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36269387..937eeac7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -80,9 +80,9 @@
 
 ### API changes on existing features (you may need to change your code)
 * Stricter YANG choice validation leads to enforcement of structures like: `choice c{ mandatory true; leaf x` statements. `x` was not previously enforced.
-* CLICON_XML_SORT option (in clixon-config.yang) has been removed and set to true permanently since setting it to false is obsolete.
+* Many hand-crafted validation messages have been removed and replaced with generic validations, which may lead to changed rpc-error messages.
+* CLICON_XML_SORT option (in clixon-config.yang) has been removed and set to true permanently. Unsorted XML lists leads to slower performance and old obsolete code can be removed.
 * Strict namespace setting can be a problem when upgrading existing database files, such as startup-db or persistent running-db, or any other saved XML file.
-  * For backward compatibility, load of startup and running set CLICON_XML_NS_STRICT to false temporarily.
 * Removed `delete-config` support for candidate db since it is not supported in RFC6241.
 * Switched the order of `error-type` and `error-tag` in all netconf and restconf error messages to comply to RFC order.
 * Yang parser is stricter (see above) which may break parsing of existing yang specs.
diff --git a/apps/netconf/netconf_rpc.c b/apps/netconf/netconf_rpc.c
index 21a02193..ba41648a 100644
--- a/apps/netconf/netconf_rpc.c
+++ b/apps/netconf/netconf_rpc.c
@@ -135,20 +135,10 @@ netconf_get_config(clicon_handle h,
 {
      cxobj      *xfilter; /* filter */
      int         retval = -1;
-     char       *source;
      char       *ftype = NULL;
      cxobj      *xfilterconf; 
      cxobj      *xconf;
 
-     if ((source = netconf_get_target(xn, "source")) == NULL){
-	 xml_parse_va(xret, NULL, "<rpc-reply><rpc-error>"
-			  "<error-tag>missing-element</error-tag>"
-			  "<error-type>protocol</error-type>"
-			  "<error-severity>error</error-severity>"
-			  "<error-info><bad-element>source</bad-element></error-info>"
-			  "</rpc-error></rpc-reply>");
-	 goto ok;
-     }
      /* ie <filter>...</filter> */
      if ((xfilter = xpath_first(xn, "filter")) != NULL) 
 	 ftype = xml_find_value(xfilter, "type");
@@ -187,7 +177,6 @@ netconf_get_config(clicon_handle h,
 			  "<error-info>type</error-info>"
 			  "</rpc-error></rpc-reply>");
      }
- ok: /* netconf error is not fatal */
     retval = 0;
  done:
     return retval;
@@ -223,11 +212,9 @@ get_edit_opts(cxobj               *xn,
 	if ((optstr = xml_body(x)) != NULL){
 	    if (strcmp(optstr, "test-then-set") == 0)
 		*testopt = TEST_THEN_SET;
-	    else
-	    if (strcmp(optstr, "set") == 0)
+	    else if (strcmp(optstr, "set") == 0)
 		*testopt = SET;
-	    else
-	    if (strcmp(optstr, "test-only") == 0)
+	    else if (strcmp(optstr, "test-only") == 0)
 		*testopt = TEST_ONLY;
 	    else
 		goto parerr;
@@ -311,52 +298,18 @@ netconf_edit_config(clicon_handle h,
 {
     int                 retval = -1;
     int                 optret;
-    enum operation_type operation = OP_MERGE;
     enum test_option    testopt = TEST_THEN_SET;/* only supports this */
     enum error_option   erropt = STOP_ON_ERROR; /* only supports this */
-    cxobj              *x;
-    cxobj              *xfilter;
-    char               *ftype = NULL;
-    char               *target;  /* db */
 
-    /* must have target, and it should be candidate */
-    if ((target = netconf_get_target(xn, "target")) == NULL ||
-	strcmp(target, "candidate")){
-	xml_parse_va(xret, NULL, "<rpc-reply><rpc-error>"
-			 "<error-tag>missing-element</error-tag>"
-			 "<error-type>protocol</error-type>"
-			 "<error-severity>error</error-severity>"
-			 "<error-info><bad-element>target</bad-element></error-info>"
-			 "</rpc-error></rpc-reply>");
-	goto ok;
-    }
-    /* CLICON addition, eg <filter type="restconf" select=<api-path> /> */
-    if ((xfilter = xpath_first(xn, "filter")) != NULL) {
-	if ((ftype = xml_find_value(xfilter, "type")) != NULL)
-	    if (strcmp(ftype,"restconf")){
-		xml_parse_va(xret, NULL, "<rpc-reply><rpc-error>"
-				 "<error-tag>invalid-value</error-tag>"
-				 "<error-type>protocol</error-type>"
-				 "<error-severity>error</error-severity>"
-				 "</rpc-error></rpc-reply>");
-		goto ok;
-	    }
-    }
-    if ((x = xpath_first(xn, "default-operation")) != NULL){
-	if (xml_operation(xml_body(x), &operation) < 0){
-	    xml_parse_va(xret, NULL, "<rpc-reply><rpc-error>"
-			     "<error-tag>invalid-value</error-tag>"
-			     "<error-type>protocol</error-type>"
-			     "<error-severity>error</error-severity>"
-			     "</rpc-error></rpc-reply>");
-	    goto ok;
-	}
-    }
     if ((optret = get_edit_opts(xn, &testopt, &erropt, xret)) < 0)
 	goto done;
     if (optret == 0) /* error in opt parameters */
 	goto ok;
-    /* not supported opts */
+    /* These constraints are clixon-specific since :validate should 
+     * support all testopts, and erropts should be supported 
+     * And therefore extends the validation 
+     * (implement the features before removing these checks)
+     */
     if (testopt!=TEST_THEN_SET || erropt!=STOP_ON_ERROR){
 	xml_parse_va(xret, NULL, "<rpc-reply><rpc-error>"
 			 "<error-tag>operation-not-supported</error-tag>"
@@ -364,158 +317,15 @@ netconf_edit_config(clicon_handle h,
 			 "<error-severity>error</error-severity>"
 			 "</rpc-error></rpc-reply>");
 	goto ok;
-    }    
-    if (clicon_rpc_netconf_xml(h, xml_parent(xn), xret, NULL) < 0)
-	goto done;	
- ok:
-    retval = 0;
- done:
-    return retval;
-}
-
-/*! Netconf copy configuration
-    <copy-config> 
-        <target> 
-            <candidate/> 
-        </target> 
-        <source> 
-            <url> 
-                <!- - location specifier for file containing the new configuration - -> 
-            </url> 
-        </source> 
-    <copy-config> 
- * @param[in]  h       clicon handle
- * @param[in]  xn      Sub-tree (under xorig) at <rpc>...</rpc> level.
- * @param[out] xret    Return XML, error or OK
- */
-static int
-netconf_copy_config(clicon_handle h,
-		    cxobj        *xn, 
-		    cxobj       **xret)	    
-{
-    int       retval = -1;
-    char     *source;
-    char     *target; /* filenames */
-
-    if ((source = netconf_get_target(xn, "source")) == NULL){
-	xml_parse_va(xret, NULL, "<rpc-reply><rpc-error>"
-			 "<error-tag>missing-element</error-tag>"
-			 "<error-type>protocol</error-type>"
-			 "<error-severity>error</error-severity>"
-			 "<error-info><bad-element>source</bad-element></error-info>"
-			 "</rpc-error></rpc-reply>");
-	goto ok;
-    }
-    if ((target = netconf_get_target(xn, "target")) == NULL){
-	xml_parse_va(xret, NULL, "<rpc-reply><rpc-error>"
-			 "<error-tag>missing-element</error-tag>"
-			 "<error-type>protocol</error-type>"
-			 "<error-severity>error</error-severity>"
-			 "<error-info><bad-element>target</bad-element></error-info>"
-			 "</rpc-error></rpc-reply>");
-	goto ok;
-    }
-    if (clicon_rpc_netconf_xml(h, xml_parent(xn), xret, NULL) < 0)
-	goto done;	
- ok:
-    retval = 0;
-  done:
-    return retval;
-}
-
-/*! Delete configuration
-  <delete-config> 
-        <target> 
-            <candidate/> 
-        </target> 
-    </delete-config> 
-    Delete a configuration datastore.  The <running>
-    configuration datastore cannot be deleted.
- * @param[in]  h       clicon handle
- * @param[in]  xn      Sub-tree (under xorig) at <rpc>...</rpc> level.
- * @param[out] xret    Return XML, error or OK
- */
-static int
-netconf_delete_config(clicon_handle h,
-		      cxobj        *xn, 
-		      cxobj       **xret)
-{
-    char              *target; /* filenames */
-    int                retval = -1;
-
-    if ((target = netconf_get_target(xn, "target")) == NULL ||
-	strcmp(target, "running")==0){
-	xml_parse_va(xret, NULL, "<rpc-reply><rpc-error>"
-			 "<error-tag>missing-element</error-tag>"
-			 "<error-type>protocol</error-type>"
-			 "<error-severity>error</error-severity>"
-			 "<error-info><bad-element>target</bad-element></error-info>"
-			 "</rpc-error></rpc-reply>");
-	goto ok;
-    }
-    if (clicon_rpc_netconf_xml(h, xml_parent(xn), xret, NULL) < 0)
-	goto done;	
- ok:
-    retval = 0;
-  done:
-    return retval;
-}
-
-
-/*! Lock a database
-    <lock> 
-        <target> 
-            <candidate/> 
-        </target> 
-    </lock> 
- * @param[in]  h       clicon handle
- * @param[in]  xn      Sub-tree (under xorig) at <rpc>...</rpc> level.
- * @param[out] xret    Return XML, error or OK
- */
-static int
-netconf_lock(clicon_handle h,
-	     cxobj        *xn, 
-	     cxobj       **xret)
-{
-    int      retval = -1;
-    char    *target;
-
-    if ((target = netconf_get_target(xn, "target")) == NULL){
-	xml_parse_va(xret, NULL, "<rpc-reply><rpc-error>"
-			  "<error-tag>missing-element</error-tag>"
-			  "<error-type>protocol</error-type>"
-			  "<error-severity>error</error-severity>"
-			  "<error-info><bad-element>target</bad-element></error-info>"
-			  "</rpc-error></rpc-reply>");
-	goto ok;
     }
     if (clicon_rpc_netconf_xml(h, xml_parent(xn), xret, NULL) < 0)
 	goto done;
  ok:
     retval = 0;
-  done:
+ done:
     return retval;
 }
 
-/*! Unlock a database
-   <unlock> 
-        <target> 
-            <candidate/> 
-        </target> 
-    </unlock> 
-    XXX
- * @param[in]  h       clicon handle
- * @param[in]  xn      Sub-tree (under xorig) at <rpc>...</rpc> level.
- * @param[out] xret    Return XML, error or OK
- */
-static int
-netconf_unlock(clicon_handle h, 
-	       cxobj        *xn, 
-	       cxobj       **xret)
-{
-    return netconf_lock(h, xn, xret);
-}
-
 /*! Get running configuration and device state information
  * 
  *
@@ -579,138 +389,11 @@ netconf_get(clicon_handle h,
 			  "<error-info>type</error-info>"
 			  "</rpc-error></rpc-reply>");
      }
-     // ok: /* netconf error is not fatal */
     retval = 0;
  done:
     return retval;
 }
 
-
-/*! Close a (user) session
-    <close-session/> 
- * @param[in]  xn      Sub-tree (under xorig) at <rpc>...</rpc> level.
- * @param[out] xret    Return XML, error or OK
-*/
-static int
-netconf_close_session(clicon_handle h,
-		      cxobj        *xn, 
-		      cxobj       **xret)
-{
-    int retval = -1;
-
-    cc_closed++;
-    if (clicon_rpc_netconf_xml(h, xml_parent(xn), xret, NULL) < 0)
-	goto done;
-    retval = 0;
- done:
-    return retval;
-}
-
-/*! Kill other user sessions
-  <kill-session> 
-        <session-id>PID</session-id> 
-  </kill-session> 
- * @param[in]  xn      Sub-tree (under xorig) at <rpc>...</rpc> level.
- * @param[out] xret    Return XML, error or OK
- */
-static int
-netconf_kill_session(clicon_handle h,
-		     cxobj        *xn, 
-		     cxobj       **xret)
-{
-    int    retval=-1;
-    cxobj *xs;
-
-    if ((xs = xpath_first(xn, "//session-id")) == NULL){
-	xml_parse_va(xret, NULL, "<rpc-reply><rpc-error>"
-			  "<error-tag>missing-element</error-tag>"
-			  "<error-type>protocol</error-type>"
-			  "<error-severity>error</error-severity>"
-			  "<error-info><bad-element>session-id</bad-element></error-info>"
-			  "</rpc-error></rpc-reply>");
-	 goto ok;
-    }
-    if (clicon_rpc_netconf_xml(h, xml_parent(xn), xret, NULL) < 0)
-	goto done;
- ok:
-    retval = 0;
- done:
-    return retval;
-}
-/*! Check the semantic consistency of candidate
-    <validate/> 
-    :validate
- * @param[in]  h       clicon handle
- * @param[in]  xn      Sub-tree (under xorig) at <rpc>...</rpc> level.
- * @param[out] xret    Return XML, error or OK
- */
-static int
-netconf_validate(clicon_handle h, 
-		 cxobj        *xn, 
-		 cxobj       **xret)
-{
-    int    retval = -1;
-    char  *target;
-
-    if ((target = netconf_get_target(xn, "source")) == NULL){
-	xml_parse_va(xret, NULL, "<rpc-reply><rpc-error>"
-			  "<error-tag>missing-element</error-tag>"
-			  "<error-type>protocol</error-type>"
-			  "<error-severity>error</error-severity>"
-			  "<error-info><bad-element>target</bad-element></error-info>"
-			  "</rpc-error></rpc-reply>");
-	 goto ok;
-    }
-    if (clicon_rpc_netconf_xml(h, xml_parent(xn), xret, NULL) < 0)
-	goto done;
- ok:
-    retval = 0;
-  done:
-    return retval;
-}
-
-/*! Commit candidate -> running
-    <commit/> 
-    :candidate
- * @param[in]  h       clicon handle
- * @param[in]  xn      Sub-tree (under xorig) at <rpc>...</rpc> level.
- * @param[out] xret    Return XML, error or OK
- */
-static int
-netconf_commit(clicon_handle h,
-	       cxobj        *xn, 
-	       cxobj       **xret)
-{
-    int      retval = -1;
-
-    if (clicon_rpc_netconf_xml(h, xml_parent(xn), xret, NULL) < 0)
-	goto done;
-    retval = 0;
-  done:
-    return retval;
-}
-
-/*! Discard all changes in candidate / revert to running
-    <discard-changes/> 
-    :candidate
- * @param[in]  h       clicon handle
- * @param[in]  xn      Sub-tree (under xorig) at <rpc>...</rpc> level.
- * @param[out] xret    Return XML, error or OK
- */
-static int
-netconf_discard_changes(clicon_handle h,
-			cxobj        *xn, 
-			cxobj       **xret)
-{
-    int     retval = -1;
-
-    if (clicon_rpc_netconf_xml(h, xml_parent(xn), xret, NULL) < 0)
-	goto done;
-    retval = 0;
-  done:
-    return retval;
-}
-
 /*! Called when a notification has happened on backend
  * and this session has registered for that event.
  * Filter it and forward it.
@@ -993,9 +676,25 @@ netconf_rpc_dispatch(clicon_handle h,
 	if (xml_value_set(xa, username) < 0)
 	    goto done;
     }
+    /* Many of these calls are now calling generic clicon_rpc_netconf_xml
+     * directly, since the validation is generic and done before this place
+     * in the call. Some call however need extra validation, such as the 
+     * filter parameter to get/get-config and tes- err-opts of edit-config.
+     */
     xe = NULL;
     while ((xe = xml_child_each(xn, xe, CX_ELMNT)) != NULL) {
-	if (strcmp(xml_name(xe), "get-config") == 0){
+	if (strcmp(xml_name(xe), "copy-config") == 0 ||
+	    strcmp(xml_name(xe), "delete-config") == 0 ||
+	    strcmp(xml_name(xe), "lock") == 0 ||
+	    strcmp(xml_name(xe), "unlock") == 0 ||
+	    strcmp(xml_name(xe), "kill-session") == 0 ||
+	    strcmp(xml_name(xe), "validate") == 0 ||  /* :validate */
+	    strcmp(xml_name(xe), "commit") == 0 || /* :candidate */
+	    strcmp(xml_name(xe), "discard-changes") == 0){
+	    if (clicon_rpc_netconf_xml(h, xml_parent(xe), xret, NULL) < 0)
+		goto done;	
+	}
+	else if (strcmp(xml_name(xe), "get-config") == 0){
 	    if (netconf_get_config(h, xe, xret) < 0)
 		goto done;
 	}
@@ -1003,47 +702,14 @@ netconf_rpc_dispatch(clicon_handle h,
 	    if (netconf_edit_config(h, xe, xret) < 0)
 		goto done;
 	}
-        else if (strcmp(xml_name(xe), "copy-config") == 0){
-	    if (netconf_copy_config(h, xe, xret) < 0)
-		goto done;
-	}
-	else if (strcmp(xml_name(xe), "delete-config") == 0){
-	    if (netconf_delete_config(h, xe, xret) < 0)
-		goto done;
-	}
-	else if (strcmp(xml_name(xe), "lock") == 0) {
-	    if (netconf_lock(h, xe, xret) < 0)
-		goto done;
-	}
-	else if (strcmp(xml_name(xe), "unlock") == 0){
-	    if (netconf_unlock(h, xe, xret) < 0)
-		goto done;
-	}
 	else if (strcmp(xml_name(xe), "get") == 0){
 	    if (netconf_get(h, xe, xret) < 0)
 		goto done;
 	}
 	else if (strcmp(xml_name(xe), "close-session") == 0){
-	    if (netconf_close_session(h, xe, xret) < 0)
-		goto done;
-	}
-	else if (strcmp(xml_name(xe), "kill-session") == 0) {
-	    if (netconf_kill_session(h, xe, xret) < 0)
-		goto done;
-	}
-	/* Validate capability :validate */
-	else if (strcmp(xml_name(xe), "validate") == 0){
-	    if (netconf_validate(h, xe, xret) < 0)
-		goto done;
-	}
-	/* Candidate configuration capability :candidate */
-	else if (strcmp(xml_name(xe), "commit") == 0){
-	    if (netconf_commit(h, xe, xret) < 0)
-		goto done;
-	}
-	else if (strcmp(xml_name(xe), "discard-changes") == 0){
-	    if (netconf_discard_changes(h, xe, xret) < 0)
-		goto done;
+	    cc_closed++;
+	    if (clicon_rpc_netconf_xml(h, xml_parent(xe), xret, NULL) < 0)
+		goto done;	
 	}
 	/* RFC 5277 :notification */
 	else if (strcmp(xml_name(xe), "create-subscription") == 0){

From bd67a2a5f264e106086533c071a8022ae6ad8f5b Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sun, 6 Jan 2019 16:31:36 +0100
Subject: [PATCH 27/72] Support for empty yang string added, eg `default "";`
 if-feature added in yang parser at several places.

---
 CHANGELOG.md                |  1 +
 lib/src/clixon_yang_parse.l |  2 +-
 lib/src/clixon_yang_parse.y | 23 +++++++++++++++++------
 test/lib.sh                 |  8 ++++++++
 test/test_openconfig.sh     | 23 +++++++++--------------
 5 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 937eeac7..d0728483 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -112,6 +112,7 @@
   * <!DOCTYPE (ie DTD) is not supported.
 
 ### Corrected Bugs
+* Support for empty yang string added, eg `default "";`
 * Removed CLI generation for yang notifications (and other non-data yang nodes)
 * Some restconf error messages contained "rpc-reply" or "rpc-error" which have now been removed.
 * getopt return value changed from char to int (https://github.com/clicon/clixon/issues/58)
diff --git a/lib/src/clixon_yang_parse.l b/lib/src/clixon_yang_parse.l
index 905eb388..79ff4eb3 100644
--- a/lib/src/clixon_yang_parse.l
+++ b/lib/src/clixon_yang_parse.l
@@ -206,7 +206,7 @@ identifier      [A-Za-z_][A-Za-z0-9_\-\.]*
 <BOOLEAN>\{               { BEGIN(KEYWORD); return *yytext; }
 <BOOLEAN>.                { return *yytext; }
 
-<INTEGER>[0-9][0-9]*      { clixon_yang_parselval.string = strdup(yytext);
+<INTEGER>\-?[0-9][0-9]*   { clixon_yang_parselval.string = strdup(yytext);
                             return INT; }
 <INTEGER>;                { BEGIN(KEYWORD); return *yytext; }
 <INTEGER>\{                { BEGIN(KEYWORD); return *yytext; }
diff --git a/lib/src/clixon_yang_parse.y b/lib/src/clixon_yang_parse.y
index aef0cc07..31fee4c8 100644
--- a/lib/src/clixon_yang_parse.y
+++ b/lib/src/clixon_yang_parse.y
@@ -641,7 +641,8 @@ identity_substmts : identity_substmts identity_substmt
                       { clicon_debug(2,"identity-substmts -> identity-substmt"); }
               ;
 
-identity_substmt : base_stmt         { clicon_debug(2,"identity-substmt -> base-stmt"); }
+identity_substmt : if_feature_stmt   { clicon_debug(2,"identity-substmt -> if-feature-stmt"); }
+              | base_stmt            { clicon_debug(2,"identity-substmt -> base-stmt"); }
               | status_stmt          { clicon_debug(2,"identity-substmt -> status-stmt"); }
               | description_stmt     { clicon_debug(2,"identity-substmt -> description-stmt"); }
               | reference_stmt       { clicon_debug(2,"identity-substmt -> reference-stmt"); }
@@ -876,7 +877,8 @@ enum_substmts : enum_substmts enum_substmt
                       { clicon_debug(2,"enum-substmts -> enum-substmt"); }
               ;
 
-enum_substmt  : value_stmt           { clicon_debug(2,"enum-substmt -> value-stmt"); }
+enum_substmt  : if_feature_stmt      { clicon_debug(2,"enum-substmt -> if-feature-stmt"); }
+              | value_stmt           { clicon_debug(2,"enum-substmt -> value-stmt"); }
               | status_stmt          { clicon_debug(2,"enum-substmt -> status-stmt"); }
               | description_stmt     { clicon_debug(2,"enum-substmt -> description-stmt"); }
               | reference_stmt       { clicon_debug(2,"enum-substmt -> reference-stmt"); }
@@ -911,7 +913,8 @@ bit_substmts : bit_substmts bit_substmt
                       { clicon_debug(2,"bit-substmts -> bit-substmt"); }
               ;
 
-bit_substmt   : position_stmt        { clicon_debug(2,"bit-substmt -> positition-stmt"); }
+bit_substmt   : if_feature_stmt      { clicon_debug(2,"bit-substmt -> if-feature-stmt"); }
+              | position_stmt        { clicon_debug(2,"bit-substmt -> positition-stmt"); }
               | status_stmt          { clicon_debug(2,"bit-substmt -> status-stmt"); }
               | description_stmt     { clicon_debug(2,"bit-substmt -> description-stmt"); }
               | reference_stmt       { clicon_debug(2,"bit-substmt -> reference-stmt"); }
@@ -1318,9 +1321,16 @@ refine_substmts : refine_substmts refine_substmt
                       { clicon_debug(2,"refine-substmts -> refine-substmt"); }
               ;
 
-refine_substmt  : must_stmt     { clicon_debug(2,"refine-substmt -> must-stmt"); }
-              | mandatory_stmt  { clicon_debug(2,"refine-substmt -> mandatory-stmt"); }
+refine_substmt  : if_feature_stmt     { clicon_debug(2,"refine-substmt -> if-feature-stmt"); }
+              | must_stmt     { clicon_debug(2,"refine-substmt -> must-stmt"); }
+              | presence_stmt  { clicon_debug(2,"refine-substmt -> presence-stmt"); }
               | default_stmt    { clicon_debug(2,"refine-substmt -> default-stmt"); }
+              | config_stmt    { clicon_debug(2,"refine-substmt -> config-stmt"); }
+              | mandatory_stmt  { clicon_debug(2,"refine-substmt -> mandatory-stmt"); }
+              | min_elements_stmt  { clicon_debug(2,"refine-substmt -> min-elements-stmt"); }
+              | max_elements_stmt  { clicon_debug(2,"refine-substmt -> max-elements-stmt"); }
+              | description_stmt  { clicon_debug(2,"refine-substmt -> description-stmt"); }
+              | reference_stmt  { clicon_debug(2,"refine-substmt -> reference-stmt"); }
               | unknown_stmt    { clicon_debug(2,"refine-substmt -> unknown-stmt");} 
               |                 { clicon_debug(2,"refine-substmt -> "); }
               ;
@@ -1561,7 +1571,8 @@ qstrings      : qstrings '+' qstring
                      { $$=$1; clicon_debug(2,"qstrings-> qstring"); } 
               ;
 
-qstring        : DQ ustring DQ  { $$=$2; clicon_debug(2,"string-> \" ustring \"");} 
+qstring        : DQ ustring DQ  { $$=$2; clicon_debug(2,"string-> \" ustring \"");}
+               | DQ DQ  { $$=strdup(""); clicon_debug(2,"string-> \"  \"");} 
                | SQ ustring SQ  { $$=$2; clicon_debug(2,"string-> ' ustring '"); }
   ;
 
diff --git a/test/lib.sh b/test/lib.sh
index 3d82e32d..be102a62 100755
--- a/test/lib.sh
+++ b/test/lib.sh
@@ -13,6 +13,14 @@ testname=
 # If set, enable debugging (of backend)
 : ${DBG:=0}
 
+# Parse yangmodels from https://github.com/YangModels/yang
+# Recommended: checkout yangmodels elsewhere in the tree and set the env
+# to that
+: ${YANGMODELS=$(pwd)/yang}
+
+# Parse yang openconfig models from https://github.com/openconfig/public
+: ${OPENCONFIG=$(pwd)/public}
+
 # For memcheck
 #clixon_cli="valgrind --leak-check=full --show-leak-kinds=all clixon_cli"
 clixon_cli=clixon_cli
diff --git a/test/test_openconfig.sh b/test/test_openconfig.sh
index f59333e2..47574fa2 100755
--- a/test/test_openconfig.sh
+++ b/test/test_openconfig.sh
@@ -6,29 +6,24 @@
 # - release/models/wifi/types/openconfig-wifi-types.yang
 #      issue: https://github.com/clicon/clixon/issues/59
 # 
-OPENCONFIG=public
-OCDIR=$OPENCONFIG/release/models
-
-# Clone openconfig dir if not there
-if [ ! -d public ]; then 
-    git clone https://github.com/openconfig/public
-#else
-#    (cd public;
-#     #git pull
-#    )
-fi
-
-# include err() and new() functions and creates $dir
-. ./lib.sh
 
 # Yang specifics: multi-keys and empty type
 APPNAME=example
+
 # include err() and new() functions and creates $dir
 . ./lib.sh
 
 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?"
+fi
+
+OCDIR=$OPENCONFIG/release/models
+
+
 cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>

From c7e847cd247f1324b6f566f8d546872209cd2fc9 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sun, 6 Jan 2019 22:11:59 +0100
Subject: [PATCH 28/72]  Keyword "min" (not only "max") can be used in built-in
 types "range" and "length" statements.

---
 .gitignore                    |   2 +-
 CHANGELOG.md                  |   1 +
 README.md                     |   3 +-
 apps/cli/cli_generate.c       |  95 +++------
 lib/clixon/clixon_string.h    |   1 +
 lib/clixon/clixon_yang.h      |   3 +-
 lib/clixon/clixon_yang_type.h |  19 +-
 lib/src/clixon_string.c       |  42 +++-
 lib/src/clixon_xml_map.c      |   2 +-
 lib/src/clixon_yang.c         | 210 +++++++++++++-------
 lib/src/clixon_yang_type.c    | 353 +++++++++++++++-------------------
 test/README.md                |   4 +-
 test/test_openconfig.sh       |   3 -
 test/test_type.sh             | 136 +++++++++----
 14 files changed, 469 insertions(+), 405 deletions(-)

diff --git a/.gitignore b/.gitignore
index c04c1244..1d8e315b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,5 +44,5 @@ build-root/*.tar.xz
 build-root/*.rpm
 build-root/rpmbuild
 
-test/public
+test/site.sh
 doc/html
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0728483..b64cdd5a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -112,6 +112,7 @@
   * <!DOCTYPE (ie DTD) is not supported.
 
 ### Corrected Bugs
+* Keyword "min" (not only "max") can be used in built-in types "range" and "length" statements.
 * Support for empty yang string added, eg `default "";`
 * Removed CLI generation for yang notifications (and other non-data yang nodes)
 * Some restconf error messages contained "rpc-reply" or "rpc-error" which have now been removed.
diff --git a/README.md b/README.md
index f086461e..ac3c7fd1 100644
--- a/README.md
+++ b/README.md
@@ -142,7 +142,8 @@ However, the following YANG syntax modules are not implemented:
 - belongs-to
 
 Restrictions on Yang types are as follows:
-- The range statement does not support multiple values (RFC7950 9.2.4)
+- The range statement for built-in integers does not support multiple values (RFC7950 9.2.4)
+- The length statement for built-in strings does not support multiple values (RFC7950 9.4.4)
 - Submodules cannot re-use a prefix in an import statement that is already used for another imported module in the module that the submodule belongs to. (see https://github.com/clicon/clixon/issues/60)
 - default values on leaf-lists (RFC7950 7.7.2)
 
diff --git a/apps/cli/cli_generate.c b/apps/cli/cli_generate.c
index b91a5242..85388d65 100644
--- a/apps/cli/cli_generate.c
+++ b/apps/cli/cli_generate.c
@@ -169,28 +169,6 @@ static int yang2cli_stmt(clicon_handle h, yang_stmt *ys, cbuf *cb,
 static int yang2cli_var_union(clicon_handle h, yang_stmt *ys, char *origtype,
 			      yang_stmt *ytype, cbuf *cb, char *helptext);
 
-/*! Patched maxstring to account for DEC64 types 
- * @note kludge to fix overflow error -> Fix the original error in cvtype_max2str
- * by adding a fraction_digits argument.
- */
-static char *
-cvtype_max2str_dup2(enum cv_type type,
-		    int fraction_digits)
-{
-    int   len;
-    char *str;
-    
-    if (type!=CGV_DEC64 || fraction_digits==0)
-	return cvtype_max2str_dup(type);
-    if ((len = cvtype_max2str(type, NULL, 0)) < 0)
-	return NULL;
-    if ((str = (char *)malloc(len+1)) == NULL)
-	return NULL;
-    memset(str, '\0', len+1);
-    len = snprintf(str, len+1, "%" PRId64 ".0", (INT64_MAX/((int)pow(10,fraction_digits))));
-    return str;
-}
-    
 /*! Generate CLI code for Yang leaf statement to CLIgen variable of specific type
  * Check for completion (of already existent values), ranges (eg range[min:max]) and
  * patterns, (eg regexp:"[0.9]*").
@@ -208,18 +186,17 @@ yang2cli_var_sub(clicon_handle h,
 		 char         *helptext,
 		 enum cv_type  cvtype,
 		 int           options,
-		 cg_var       *mincv,
-		 cg_var       *maxcv,
+		 cvec         *cvv,
 		 char         *pattern,
 		 uint8_t       fraction_digits
     )
 {
     int           retval = -1;
     char         *type;
-    char         *r;
     yang_stmt    *yi = NULL;
     int           i = 0;
     char         *cvtypestr;
+    cg_var       *cv;
 
     if (cvtype == CGV_VOID){
 	retval = 0;
@@ -276,44 +253,30 @@ yang2cli_var_sub(clicon_handle h,
 
     if (options & YANG_OPTIONS_FRACTION_DIGITS)
 	cprintf(cb, " fraction-digits:%u", fraction_digits);
+
     if (options & (YANG_OPTIONS_RANGE|YANG_OPTIONS_LENGTH)){
-	assert(mincv || maxcv);
-	cprintf(cb, " %s[", (options&YANG_OPTIONS_RANGE)?"range":"length");
-	if (mincv){
-	    if ((r = cv2str_dup(mincv)) == NULL){
-		clicon_err(OE_UNIX, errno, "cv2str_dup");
-		goto done;
-	    }
-	    cprintf(cb, "%s:", r);
-	    free(r);
-	    r = NULL;
-	}
-	if (maxcv != NULL){
-	    if ((r = cv2str_dup(maxcv)) == NULL){
-		clicon_err(OE_UNIX, errno, "cv2str_dup");
-		goto done;
-	    }
-	}
-	else{ /* Cligen does not have 'max' keyword in range so need to find actual
-		 max value of type if yang range expression is 0..max 
-	      */
-	    if (cvtype==CGV_STRING){
-		if ((r = malloc(512)) == NULL){
-		    clicon_err(OE_UNIX, errno, "malloc");
-		    goto done;
-		}
-		snprintf(r, 512, "%d", MAXPATHLEN);
-	    }
-	    else {
-		if ((r = cvtype_max2str_dup2(cvtype, fraction_digits)) == NULL){
-		    clicon_err(OE_UNIX, errno, "cvtype_max2str");
-		    goto done;
+	/* Loop through range_min and range_min..rang_max */
+	i = 0;
+	while (i<cvec_len(cvv)){
+	    //	    if (i)
+	    //		clicon_log(LOG_NOTICE, "%s: Warning %s has more ranges, ignoring", __FUNCTION__, ys->ys_argument);
+	    cv = cvec_i(cvv, i++);
+	    if (strcmp(cv_name_get(cv),"range_min") == 0){
+		cprintf(cb, " %s[", (options&YANG_OPTIONS_RANGE)?"range":"length");
+		cv2cbuf(cv, cb);
+		cprintf(cb,":");
+		/* probe next */
+		if (i<cvec_len(cvv) &&
+		    (cv = cvec_i(cvv, i)) != NULL &&
+		    strcmp(cv_name_get(cv),"range_max") == 0){
+		    i++;
+		    cv2cbuf(cv, cb);
 		}
+		else /* If not, it is a single number range [x:x]*/
+		    cv2cbuf(cv, cb);
+		cprintf(cb,"]");
 	    }
 	}
-	cprintf(cb, "%s]", r); /* range */
-	free(r);
-	r = NULL;
     }
     if (options & YANG_OPTIONS_PATTERN)
 	cprintf(cb, " regexp:\"%s\"", pattern);
@@ -347,8 +310,7 @@ yang2cli_var_union_one(clicon_handle h,
 {
     int          retval = -1;
     int          options = 0;
-    cg_var      *mincv = NULL; 
-    cg_var      *maxcv = NULL;
+    cvec        *cvv = NULL; 
     char        *pattern = NULL;
     uint8_t      fraction_digits = 0;
     enum cv_type cvtype;
@@ -358,7 +320,7 @@ yang2cli_var_union_one(clicon_handle h,
     /* Resolve the sub-union type to a resolved type */
     if (yang_type_resolve(ys, ytsub, /* in */
 			  &ytype, &options, /* resolved type */
-			  &mincv, &maxcv, &pattern, &fraction_digits) < 0)
+			  &cvv, &pattern, &fraction_digits) < 0)
 	goto done;
     restype = ytype?ytype->ys_argument:NULL;
 
@@ -370,7 +332,7 @@ yang2cli_var_union_one(clicon_handle h,
 	if (clicon_type2cv(origtype, restype, &cvtype) < 0)
 	    goto done;
 	if ((retval = yang2cli_var_sub(h, ys, ytype, cb, helptext, cvtype, 
-				       options, mincv, maxcv, pattern, fraction_digits)) < 0)
+				       options, cvv, pattern, fraction_digits)) < 0)
 	    goto done;
     }
     retval = 0;
@@ -438,8 +400,7 @@ yang2cli_var(clicon_handle h,
     char         *origtype;
     yang_stmt    *yrestype; /* resolved type */
     char         *restype; /* resolved type */
-    cg_var       *mincv = NULL; 
-    cg_var       *maxcv = NULL;
+    cvec         *cvv = NULL; 
     char         *pattern = NULL;
     uint8_t       fraction_digits = 0;
     enum cv_type  cvtype;
@@ -448,7 +409,7 @@ yang2cli_var(clicon_handle h,
     char         *type;
 
     if (yang_type_get(ys, &origtype, &yrestype, 
-		      &options, &mincv, &maxcv, &pattern, &fraction_digits) < 0)
+		      &options, &cvv, &pattern, &fraction_digits) < 0)
 	goto done;
     restype = yrestype?yrestype->ys_argument:NULL;
 
@@ -485,7 +446,7 @@ yang2cli_var(clicon_handle h,
 	if (completionp)
 	    cprintf(cb, "(");
 	if ((retval = yang2cli_var_sub(h, ys, yrestype, cb, helptext, cvtype, 
-				    options, mincv, maxcv, pattern, fraction_digits)) < 0)
+				    options, cvv, pattern, fraction_digits)) < 0)
 	    goto done;
 	if (completionp){
 	    if (cli_expand_var_generate(h, ys, cvtype, cb, 
diff --git a/lib/clixon/clixon_string.h b/lib/clixon/clixon_string.h
index 1b2b20fc..5895401d 100644
--- a/lib/clixon/clixon_string.h
+++ b/lib/clixon/clixon_string.h
@@ -87,6 +87,7 @@ int uri_percent_decode(char *enc, char **str);
 const char *clicon_int2str(const map_str2int *mstab, int i);
 int clicon_str2int(const map_str2int *mstab, char *str);
 int nodeid_split(char *nodeid,	char **prefix, char **id);
+char *clixon_trim(char *str);
 #ifndef HAVE_STRNDUP
 char *clicon_strndup (const char *, size_t);
 #endif /* ! HAVE_STRNDUP */
diff --git a/lib/clixon/clixon_yang.h b/lib/clixon/clixon_yang.h
index b0635385..3842b225 100644
--- a/lib/clixon/clixon_yang.h
+++ b/lib/clixon/clixon_yang.h
@@ -176,8 +176,7 @@ typedef struct yang_stmt yang_stmt; /* forward */
 */
 struct yang_type_cache{
     int        yc_options;
-    cg_var    *yc_mincv;
-    cg_var    *yc_maxcv;
+    cvec      *yc_cvv; /* range and length restriction */
     char      *yc_pattern;
     uint8_t    yc_fraction;
     yang_stmt *yc_resolved; /* Resolved type object, can be NULL - note direct ptr */
diff --git a/lib/clixon/clixon_yang_type.h b/lib/clixon/clixon_yang_type.h
index 8fecdd5f..bbdfe79e 100644
--- a/lib/clixon/clixon_yang_type.h
+++ b/lib/clixon/clixon_yang_type.h
@@ -55,11 +55,11 @@
  * Prototypes
  */
 int        yang_type_cache_set(yang_type_cache **ycache, 	    
-			       yang_stmt *resolved, int options, cg_var *mincv, 
-			       cg_var *maxcv, char *pattern, uint8_t fraction);
-int        yang_type_cache_get(yang_type_cache *ycache, 
-			       yang_stmt **resolved, int *options, cg_var **mincv, 
-			       cg_var **maxcv, char **pattern, uint8_t *fraction);
+			       yang_stmt *resolved, int options,
+			       cvec *cvv, char *pattern, uint8_t fraction);
+int        yang_type_cache_get(yang_type_cache *ycache, yang_stmt **resolved,
+			       int *options, cvec **cvv, char **pattern,
+			       uint8_t *fraction);
 int        yang_type_cache_cp(yang_type_cache **ycnew, yang_type_cache *ycold);
 int        yang_type_cache_free(yang_type_cache *ycache);
 int        ys_resolve_type(yang_stmt *ys, void *arg);
@@ -69,12 +69,11 @@ yang_stmt *yang_find_identity(yang_stmt *ys, char *identity);
 int        ys_cv_validate(cg_var *cv, yang_stmt *ys, char **reason);
 int        clicon_type2cv(char *type, char *rtype, enum cv_type *cvtype);
 int        yang_type_get(yang_stmt *ys, char **otype, yang_stmt **restype, 
-			 int *options, cg_var **mincv, cg_var **maxcv, char **pattern,
+			 int *options, cvec **cvv, char **pattern,
                          uint8_t *fraction_digits);
-int        yang_type_resolve(yang_stmt   *ys, yang_stmt   *ytype, 
-			     yang_stmt  **restype, int   *options, 
-			     cg_var     **mincv, cg_var     **maxcv, 
-			     char       **pattern,  uint8_t     *fraction);
+int        yang_type_resolve(yang_stmt *ys, yang_stmt *ytype, 
+			     yang_stmt **restype, int *options, 
+			     cvec **cvv, char **pattern, uint8_t *fraction);
 
 
 #endif  /* _CLIXON_YANG_TYPE_H_ */
diff --git a/lib/src/clixon_string.c b/lib/src/clixon_string.c
index b3e5e588..733a1ca4 100644
--- a/lib/src/clixon_string.c
+++ b/lib/src/clixon_string.c
@@ -57,14 +57,15 @@
 /*! Split string into a vector based on character delimiters. Using malloc
  *
  * The given string is split into a vector where the delimiter can be
- * any of the characters in the specified delimiter string. 
+ * _any_ of the characters in the specified delimiter string. 
  *
  * The vector returned is one single memory block that must be freed
  * by the caller
  *
  * @code
- * char      **vec = NULL;
- * int         nvec;
+ * char **vec = NULL;
+ * char  *v;
+ * int    nvec;
  * if ((vec = clicon_strsep("/home/user/src/clixon", "/", &nvec)) == NULL)
  *    err;
  * for (i=0; i<nvec; i++){
@@ -437,15 +438,18 @@ xml_chardata_encode(char **escp,
 /*! Split a string into a cligen variable vector using 1st and 2nd delimiter 
  * Split a string first into elements delimited by delim1, then into
  * pairs delimited by delim2.
- * @param[in] string  String to split
- * @param[in] delim1  First delimiter char that delimits between elements
- * @param[in] delim2  Second delimiter char for pairs within an element
+ * @param[in]  string String to split
+ * @param[in]  delim1 First delimiter char that delimits between elements
+ * @param[in]  delim2 Second delimiter char for pairs within an element
  * @param[out] cvp    Created cligen variable vector, deallocate w cvec_free
- * @retval    0       on OK
+ * @retval     0      OK
  * @retval    -1      error
+ * @code
+ * cvec  *cvv = NULL;
+ * if (str2cvec("a=b&c=d", ';', '=', &cvv) < 0)
+ *   err;
+ * @endcode
  *
- * @example, 
- * Assuming delim1 = '&' and delim2 = '='
  * a=b&c=d    ->  [[a,"b"][c="d"]
  * kalle&c=d  ->  [[c="d"]]  # Discard elements with no delim2
  * XXX differentiate between error and null cvec.
@@ -610,6 +614,26 @@ nodeid_split(char  *nodeid,
     return retval;
 }
 
+/*! Trim blanks from front and end of a string, return new string 
+ * @param[in]  str 
+ * @retval     s   Pointer into existing str after trimming blanks
+ */
+char *
+clixon_trim(char *str)
+{
+    char *s = str;
+    int   i;
+
+    while (strlen(s) && isblank(s[0]))
+	s++;
+    for (i=0; i<strlen(s); i++)
+	if (isblank(s[i])){
+	    s[i] = '\0';
+	    break;
+	}
+    return s;
+}
+
 /*! strndup() for systems without it, such as xBSD
  */
 #ifndef HAVE_STRNDUP
diff --git a/lib/src/clixon_xml_map.c b/lib/src/clixon_xml_map.c
index faac0666..213082b7 100644
--- a/lib/src/clixon_xml_map.c
+++ b/lib/src/clixon_xml_map.c
@@ -2414,7 +2414,7 @@ yang_enum_int_value(cxobj   *node,
     if ((ytype = yang_find((yang_node *)ys, Y_TYPE, NULL)) == NULL)
 	goto done;
     if (yang_type_resolve(ys, ytype, &yrestype, 
-			  NULL, NULL, NULL, NULL, NULL) < 0)
+			  NULL, NULL, NULL, NULL) < 0)
 	goto done;
     if (yrestype==NULL || strcmp(yrestype->ys_argument, "enumeration"))
 	goto done;
diff --git a/lib/src/clixon_yang.c b/lib/src/clixon_yang.c
index 7a81bc6b..66590a56 100644
--- a/lib/src/clixon_yang.c
+++ b/lib/src/clixon_yang.c
@@ -1068,7 +1068,7 @@ ys_populate_leaf(yang_stmt *ys,
 
     yparent = ys->ys_parent;     /* Find parent: list/container */
     /* 1. Find type specification and set cv type accordingly */
-    if (yang_type_get(ys, &type, &yrestype, &options, NULL, NULL, NULL, &fraction_digits) < 0)
+    if (yang_type_get(ys, &type, &yrestype, &options, NULL, NULL, &fraction_digits) < 0)
 	goto done;
     restype = yrestype?yrestype->ys_argument:NULL;
     if (clicon_type2cv(type, restype, &cvtype) < 0) /* This handles non-resolved also */
@@ -1133,12 +1133,62 @@ ys_populate_list(yang_stmt *ys,
     return 0;
 }
 
-/*! Populate range and length statements
+/*! Set range or length boundary for built-in yang types
+ * Help functions to range and length statements 
+ */
+static int
+bound_add(yang_stmt   *ys,
+	  enum cv_type cvtype,
+	  char        *name,
+	  char        *val,
+	  int          options,
+	  uint8_t      fraction_digits
+	  )
+{
+    int     retval = -1;
+    cg_var *cv;
+    char   *reason = NULL;
+    int     ret = 1;
+
+    if ((cv = cvec_add(ys->ys_cvec, cvtype)) == NULL){
+	clicon_err(OE_YANG, errno, "cvec_add");
+	goto done;
+    }
+    if (cv_name_set(cv, name) == NULL){
+	clicon_err(OE_YANG, errno, "cv_name_set(%s)", name);
+	goto done;
+    }
+    if (options & YANG_OPTIONS_FRACTION_DIGITS && cvtype == CGV_DEC64)
+	cv_dec64_n_set(cv, fraction_digits);
+    if (strcmp(val, "min") == 0)
+	cv_min_set(cv);
+    else if (strcmp(val, "max") == 0)
+	cv_max_set(cv);
+    else if ((ret = cv_parse1(val, cv, &reason)) < 0){
+	clicon_err(OE_YANG, errno, "cv_parse1");
+	goto done;
+    }
+    if (ret == 0){ /* parsing failed */
+	clicon_err(OE_YANG, errno, "range statement %s: %s", val, reason);
+	free(reason);
+	goto done;
+    }
+    retval = 0;
+ done:
+    return retval;
+}
+
+/*! Populate string built-in range statement
  *
  * Create cvec variables "range_min" and "range_max". Assume parent is type.
- * Actually: min..max [| min..max]*  
- *   where min,max is integer or keywords 'min' or 'max. 
- * We only allow one range, ie not 1..2|4..5
+ * Actually: bound[..bound] (| bound[..bound])*  
+ *   where bound is integer, decimal or keywords 'min' or 'max. 
+ * RFC 7950 9.2.4:
+ *  A range consists of an explicit value, or a lower-inclusive bound,
+ *  two consecutive dots "..", and an upper-inclusive bound.  Multiple
+ *  values or ranges can be given, separated by "|".  If multiple values
+ *  or ranges are given, they all MUST be disjoint and MUST be in
+ *  ascending order
  */
 static int
 ys_populate_range(yang_stmt *ys, 
@@ -1152,11 +1202,11 @@ ys_populate_range(yang_stmt *ys,
     int             options = 0x0;
     uint8_t         fraction_digits;
     enum cv_type    cvtype = CGV_ERR;
-    char           *minstr = NULL;
-    char           *maxstr;
-    cg_var         *cv;
-    char           *reason = NULL;
-    int             cvret;
+    char          **vec = NULL;
+    char           *v;
+    char           *v2;
+    int             nvec;
+    int             i;
 
     yparent = ys->ys_parent;     /* Find parent: type */
     if (yparent->yn_keyword != Y_TYPE){
@@ -1164,81 +1214,90 @@ ys_populate_range(yang_stmt *ys,
 	goto done;
     }
     if (yang_type_resolve(ys, (yang_stmt*)yparent, &yrestype, 
-			  &options, NULL, NULL, NULL, &fraction_digits) < 0)
+			  &options, NULL, NULL, &fraction_digits) < 0)
 	goto done;
     restype = yrestype?yrestype->ys_argument:NULL;
     origtype = yarg_id((yang_stmt*)yparent);
     /* This handles non-resolved also */
     if (clicon_type2cv(origtype, restype, &cvtype) < 0) 
 	goto done;
-    /* special case for strings, where limit is length, not a string */
-    if (cvtype == CGV_STRING)
-	cvtype = CGV_UINT64;
-    if ((minstr = strdup(ys->ys_argument)) == NULL){
-	clicon_err(OE_YANG, errno, "strdup");
+    if ((vec = clicon_strsep(ys->ys_argument, "|", &nvec)) == NULL)
 	goto done;
-    }
-    if ((maxstr = strstr(minstr, "..")) != NULL){
-	if (strlen(maxstr) < 2){
-	    clicon_err(OE_YANG, 0, "range statement: %s not on the form: <int>..<int>",
-		       ys->ys_argument);
-           goto done;
-       }
-       minstr[maxstr-minstr] = '\0';
-       maxstr += 2;
-       /* minstr and maxstr need trimming */
-       if (isblank(minstr[strlen(minstr)-1]))
-	   minstr[strlen(minstr)-1] = '\0';
-       if (isblank(maxstr[0]))
-	   maxstr++;
-	if ((cv = cvec_add(ys->ys_cvec, cvtype)) == NULL){
-	    clicon_err(OE_YANG, errno, "cvec_add");
-	    goto done;
+    for (i=0; i<nvec; i++){
+	v = vec[i++];
+	v = clixon_trim(v); 	/* trim blanks */
+	if ((v2 = strstr(v, "..")) != NULL){
+	    *v2 = '\0';
+	    v2 += 2;
+	    v2 = clixon_trim(v2); 	    /* trim blanks */
 	}
-	if (cv_name_set(cv, "range_min") == NULL){
-	    clicon_err(OE_YANG, errno, "cv_name_set");
+	if (bound_add(ys, cvtype, "range_min", v,
+		      options, fraction_digits) < 0)
 	    goto done;
-	}
-	if (options & YANG_OPTIONS_FRACTION_DIGITS && cvtype == CGV_DEC64)
-	    cv_dec64_n_set(cv, fraction_digits);
-
-	if ((cvret = cv_parse1(minstr, cv, &reason)) < 0){
-	    clicon_err(OE_YANG, errno, "cv_parse1");
-	    goto done;
-	}
-	if (cvret == 0){ /* parsing failed */
-	    clicon_err(OE_YANG, errno, "range statement, min: %s", reason);
-	    free(reason);
-	    goto done;
-	}
-    }
-    else
-	maxstr = minstr;
-    if (strcmp(maxstr, "max") != 0){ /* no range_max means max */
-	if ((cv = cvec_add(ys->ys_cvec, cvtype)) == NULL){
-	    clicon_err(OE_YANG, errno, "cvec_add");
-	    goto done;
-	}
-	if (cv_name_set(cv, "range_max") == NULL){
-	    clicon_err(OE_YANG, errno, "cv_name_set");
-	    goto done;
-	}
-	if (options & YANG_OPTIONS_FRACTION_DIGITS && cvtype == CGV_DEC64)
-	    cv_dec64_n_set(cv, fraction_digits);
-	if ((cvret = cv_parse1(maxstr, cv, &reason)) < 0){
-	    clicon_err(OE_YANG, errno, "cv_parse1");
-	    goto done;
-	}
-	if (cvret == 0){ /* parsing failed */
-	    clicon_err(OE_YANG, errno, "range statement, max: %s", reason);
-	    free(reason);
-	    goto done;
-	}
+	if (v2)
+	    if (bound_add(ys, cvtype, "range_max",v2,
+			  options, fraction_digits) < 0)
+		goto done;
     }
     retval = 0;
   done:
-    if (minstr)
-	free(minstr);
+    if (vec)
+	free(vec);
+    return retval;
+}
+
+/*! Populate integer built-in length statement
+ *
+ * Create cvec variables "range_min" and "range_max". Assume parent is type.
+ * Actually: len[..len] (| len[..len])*  
+ *   len is unsigned integer or keywords 'min' or 'max. 
+ * RFC 7950 9.4.4
+ *  A length range consists of an explicit value, or a lower bound, two
+ *  consecutive dots "..", and an upper bound.  Multiple values or ranges
+ *  can be given, separated by "|".  Length-restricting values MUST NOT
+ *  be negative.  If multiple values or ranges are given, they all MUST
+ *  be disjoint and MUST be in ascending order.
+ */
+static int
+ys_populate_length(yang_stmt *ys, 
+		  void      *arg)
+{
+    int             retval = -1;
+    yang_node      *yparent;        /* type */
+    enum cv_type    cvtype = CGV_ERR;
+    char          **vec = NULL;
+    char           *v;
+    int             nvec;
+    int             i;
+    char           *v2;
+
+    yparent = ys->ys_parent;     /* Find parent: type */
+    if (yparent->yn_keyword != Y_TYPE){
+	clicon_err(OE_YANG, 0, "parent should be type"); 
+	goto done;
+    }
+    cvtype = CGV_UINT64;
+    if ((vec = clicon_strsep(ys->ys_argument, "|", &nvec)) == NULL)
+	goto done;
+    for (i=0; i<nvec; i++){
+
+	v = vec[i++];
+	v = clixon_trim(v); 	/* trim blanks */
+	if ((v2 = strstr(v, "..")) != NULL){
+	    *v2 = '\0';
+	    v2 += 2;
+	    v2 = clixon_trim(v2); 	    /* trim blanks */
+	}
+	if (bound_add(ys, cvtype, "range_min", v, 0, 0) < 0)
+	    goto done;
+	if (v2)
+	    if (bound_add(ys, cvtype, "range_max",v2, 0, 0) < 0)
+		goto done;
+    }
+    retval = 0;
+  done:
+    if (vec)
+	free(vec);
     return retval;
 }
 
@@ -1485,10 +1544,13 @@ ys_populate(yang_stmt *ys,
 	    goto done;
 	break;
     case Y_RANGE: 
-    case Y_LENGTH: 
 	if (ys_populate_range(ys, NULL) < 0)
 	    goto done;
 	break;
+    case Y_LENGTH: 
+	if (ys_populate_length(ys, NULL) < 0)
+	    goto done;
+	break;
     case Y_MANDATORY: /* call yang_mandatory() to check if set */
     case Y_CONFIG:
 	if (ys_parse(ys, CGV_BOOL) == NULL) 
diff --git a/lib/src/clixon_yang_type.c b/lib/src/clixon_yang_type.c
index d043abff..4ba24fe2 100644
--- a/lib/src/clixon_yang_type.c
+++ b/lib/src/clixon_yang_type.c
@@ -115,8 +115,7 @@ int
 yang_type_cache_set(yang_type_cache **ycache0,
 		    yang_stmt        *resolved,
 		    int               options, 
-		    cg_var           *mincv, 
-		    cg_var           *maxcv, 
+		    cvec             *cvv, 
 		    char             *pattern,
 		    uint8_t           fraction)
 {
@@ -132,13 +131,11 @@ yang_type_cache_set(yang_type_cache **ycache0,
     *ycache0 = ycache;
     ycache->yc_resolved  = resolved;
     ycache->yc_options  = options;
-    if (mincv && (ycache->yc_mincv  = cv_dup(mincv)) == NULL){
-	clicon_err(OE_UNIX, errno, "cv_dup");
-	goto done;
-    }
-    if (maxcv && (ycache->yc_maxcv  = cv_dup(maxcv)) == NULL){
-	clicon_err(OE_UNIX, errno, "cv_dup");
-	goto done;
+    if (cvv){
+	if ((ycache->yc_cvv = cvec_dup(cvv)) == NULL){
+	    clicon_err(OE_UNIX, errno, "cvec_dup");
+	    goto done;
+	}
     }
     if (pattern && (ycache->yc_pattern  = strdup(pattern)) == NULL){
 	clicon_err(OE_UNIX, errno, "strdup");
@@ -155,8 +152,7 @@ int
 yang_type_cache_get(yang_type_cache *ycache,
 		    yang_stmt      **resolved,
 		    int             *options, 
-		    cg_var         **mincv, 
-		    cg_var         **maxcv, 
+		    cvec           **cvv, 
 		    char           **pattern,
 		    uint8_t         *fraction)
 {
@@ -164,10 +160,8 @@ yang_type_cache_get(yang_type_cache *ycache,
 	*resolved = ycache->yc_resolved;
     if (options)
 	*options  = ycache->yc_options;
-    if (mincv)
-	*mincv    = ycache->yc_mincv;
-    if (maxcv)
-	*maxcv    = ycache->yc_maxcv;
+    if (cvv)
+	*cvv    = ycache->yc_cvv;
     if (pattern)
 	*pattern  = ycache->yc_pattern;
     if (fraction)
@@ -181,14 +175,13 @@ yang_type_cache_cp(yang_type_cache **ycnew,
 {
     int        retval = -1;
     int        options;
-    cg_var    *mincv;
-    cg_var    *maxcv;
+    cvec      *cvv;
     char      *pattern;
     uint8_t    fraction;
     yang_stmt *resolved;
 
-    yang_type_cache_get(ycold, &resolved, &options, &mincv, &maxcv, &pattern, &fraction);
-    if (yang_type_cache_set(ycnew, resolved, options, mincv, maxcv, pattern, fraction) < 0)
+    yang_type_cache_get(ycold, &resolved, &options, &cvv, &pattern, &fraction);
+    if (yang_type_cache_set(ycnew, resolved, options, cvv, pattern, fraction) < 0)
 	goto done;
     retval = 0;
  done:
@@ -198,10 +191,8 @@ yang_type_cache_cp(yang_type_cache **ycnew,
 int
 yang_type_cache_free(yang_type_cache *ycache)
 {
-    if (ycache->yc_mincv)
-	cv_free(ycache->yc_mincv);
-    if (ycache->yc_maxcv)
-	cv_free(ycache->yc_maxcv);
+    if (ycache->yc_cvv)
+	cvec_free(ycache->yc_cvv);
     if (ycache->yc_pattern)
 	free(ycache->yc_pattern);
     free(ycache);
@@ -220,8 +211,7 @@ ys_resolve_type(yang_stmt *ys,
 {
     int               retval = -1;
     int               options = 0x0;
-    cg_var           *mincv = NULL;
-    cg_var           *maxcv = NULL;
+    cvec             *cvv = NULL;
     char             *pattern = NULL;
     uint8_t           fraction = 0;
     yang_stmt        *resolved = NULL;
@@ -231,12 +221,12 @@ ys_resolve_type(yang_stmt *ys,
      * Note that the resolved type could be ys itself.
      */
     if (yang_type_resolve((yang_stmt*)ys->ys_parent, ys, &resolved,
-			  &options, &mincv, &maxcv, &pattern, &fraction) < 0)
+			  &options, &cvv, &pattern, &fraction) < 0)
 	goto done;
 
     /* Cache the resolve locally */
     if (yang_type_cache_set(&ys->ys_typecache, 
-			    resolved, options, mincv, maxcv, pattern, fraction) < 0)
+			    resolved, options, cvv, pattern, fraction) < 0)
 	goto done;
     retval = 0;
  done:
@@ -388,132 +378,121 @@ static int
 cv_validate1(cg_var      *cv,
 	     enum cv_type cvtype, 
 	     int          options, 
-	     cg_var      *range_min,
-	     cg_var      *range_max, 
+	     cvec        *cvv,
 	     char        *pattern,
 	     yang_stmt   *yrestype,
 	     char        *restype,
 	     char       **reason)
 {
     int             retval = 1; /* OK */
+    cg_var         *cv1;
+    cg_var         *cv2;
     int             retval2;
     yang_stmt      *yi = NULL;
-    unsigned int    u = 0;
-    int             i = 0;
     char           *str;
     int             found;
     char          **vec = NULL;
     int             nvec;
     char           *v;
+    uint64_t        uu = 0;
+    int64_t         ii = 0;
+    int             i;
+    int             ret;
 
     if (reason && *reason){
 	free(*reason);
 	*reason = NULL;
     }
+    /* check options first for length and range */
+    if ((options & YANG_OPTIONS_RANGE) != 0 ||
+	(options & YANG_OPTIONS_LENGTH) != 0){
+	i = 0;
+	while (i<cvec_len(cvv)){
+	    cv1 = cvec_i(cvv, i++);
+	    if (strcmp(cv_name_get(cv1),"range_min") == 0){
+		if (i<cvec_len(cvv) &&
+		    (cv2 = cvec_i(cvv, i)) != NULL &&
+		    strcmp(cv_name_get(cv2),"range_max") == 0){
+		    i++;
+		}
+		else
+		    cv2 = cv1;
+		ret = 0;
+		switch (cvtype){
+		case CGV_INT8:
+		    ii =  cv_int8_get(cv);
+		    ret = range_check(ii, cv1, cv2, int8);
+		    break;
+		case CGV_INT16:
+		    ii =  cv_int16_get(cv);
+		    ret = range_check(ii, cv1, cv2, int16);
+		    break;
+		case CGV_INT32:
+		    ii =  cv_int32_get(cv);
+		    ret = range_check(ii, cv1, cv2, int32);
+		    break;
+		case CGV_DEC64: /* XXX look at fraction-digit? */
+		case CGV_INT64:
+		    ii =  cv_int64_get(cv);
+		    ret = range_check(ii, cv1, cv2, int64);
+		    break;
+		default:
+		    break;
+		}
+		if (ret){
+		    if (reason)
+			*reason = cligen_reason("Number out of range: %" PRId64, ii);
+		    goto fail;
+		    break;
+		}
+		ret = 0;
+		switch (cvtype){
+		case CGV_UINT8:
+		    uu =  cv_uint8_get(cv);
+		    ret = range_check(uu, cv1, cv2, uint8);
+		    break;
+		case CGV_UINT16:
+		    uu =  cv_uint16_get(cv);
+		    ret = range_check(uu, cv1, cv2, uint16);
+		    break;
+		case CGV_UINT32:
+		    uu =  cv_uint32_get(cv);
+		    ret = range_check(uu, cv1, cv2, uint32);
+		    break;
+		case CGV_UINT64:
+		    uu =  cv_uint32_get(cv);
+		    ret = range_check(uu, cv1, cv2, uint64);
+		    break;
+		default:
+		    break;
+		}
+		if (ret){
+		    if (reason)
+			*reason = cligen_reason("Number out of range: %" PRIu64, uu);
+		    goto fail;
+		    break;
+		}
+		ret = 0;
+		switch (cvtype){
+		case CGV_STRING:
+		case CGV_REST:
+		    if ((str = cv_string_get(cv)) == NULL)
+			break;
+		    uu = strlen(str);
+		    if (range_check(uu, cv1, cv2, uint64)){
+			if (reason)
+			    *reason = cligen_reason("string length out of range: %" PRIu64, uu);
+			goto fail;
+		    }
+		    break;
+		default:
+		    break;
+		}
+	    }
+	}
+    }
+    /* then check options for others */
     switch (cvtype){
-    case CGV_INT8:
-	if ((options & YANG_OPTIONS_RANGE) != 0){
-	    i = cv_int8_get(cv);
-	    if (range_check(i, range_min, range_max, int8)){
-		if (reason)
-		    *reason = cligen_reason("Number out of range: %d", i);
-		retval = 0;
-		break;
-	    }
-	}
-	break;
-    case CGV_INT16:
-	if ((options & YANG_OPTIONS_RANGE) != 0){
-	    i = cv_int16_get(cv);
-	    if (range_check(i, range_min, range_max, int16)){
-		if (reason)
-		    *reason = cligen_reason("Number out of range: %d", i);
-		retval = 0;
-		break;
-	    }
-	}
-	break;
-    case CGV_INT32:
-	if ((options & YANG_OPTIONS_RANGE) != 0){
-	    i = cv_int32_get(cv);
-	    if (range_check(i, range_min, range_max, int32)){
-		if (reason)
-		    *reason = cligen_reason("Number out of range: %d", i);
-		retval = 0;
-		break;
-	    }
-	}
-	break;
-    case CGV_INT64:{
-	int64_t i64;
-	if ((options & YANG_OPTIONS_RANGE) != 0){
-	    i64 = cv_int64_get(cv);
-	    if (range_check(i, range_min, range_max, int64)){
-		if (reason)
-		    *reason = cligen_reason("Number out of range: %" PRId64, i64);
-		retval = 0;
-		break;
-	    }
-	}
-	break;
-    }
-    case CGV_UINT8:
-	if ((options & YANG_OPTIONS_RANGE) != 0){
-	    u = cv_uint8_get(cv);
-	    if (range_check(u, range_min, range_max, uint8)){
-		if (reason)
-		    *reason = cligen_reason("Number out of range: %u", u);
-		retval = 0;
-		break;
-	    }
-	}
-	break;
-    case CGV_UINT16:
-	if ((options & YANG_OPTIONS_RANGE) != 0){
-	    u = cv_uint16_get(cv);
-	    if (range_check(u, range_min, range_max, uint16)){
-		if (reason)
-		    *reason = cligen_reason("Number out of range: %u", u);
-		retval = 0;
-		break;
-	    }
-	}
-	break;
-    case CGV_UINT32:
-	if ((options & YANG_OPTIONS_RANGE) != 0){
-	    u = cv_uint32_get(cv);
-	    if (range_check(u, range_min, range_max, uint32)){
-		if (reason)
-		    *reason = cligen_reason("Number out of range: %u", u);
-		retval = 0;
-		break;
-	    }
-	}
-	break;
-    case CGV_UINT64:{
-	uint64_t u64;
-	if ((options & YANG_OPTIONS_RANGE) != 0){
-	    u64 = cv_uint64_get(cv);
-	    if (range_check(u, range_min, range_max, uint64)){
-		if (reason)
-		    *reason = cligen_reason("Number out of range: %" PRIu64, u64);
-		retval = 0;
-		break;
-	    }
-	}
-	break;
-    }
-    case CGV_DEC64:
-	if ((options & YANG_OPTIONS_RANGE) != 0){
-	    i = cv_int64_get(cv);
-	    if (range_check(i, range_min, range_max, int64)){
-		if (reason)
-		    *reason = cligen_reason("Number out of range: %d", i);
-		retval = 0;
-		break;
-	    }
-	}
-	break;
     case CGV_STRING:
     case CGV_REST:
 	str = cv_string_get(cv);
@@ -531,8 +510,7 @@ cv_validate1(cg_var      *cv,
 		if (!found){
 		    if (reason)
 			*reason = cligen_reason("'%s' does not match enumeration", str);
-		    retval = 0;
-		    break;
+		    goto fail;
 		}
 	    }
 	    if (strcmp(restype, "bits") == 0){
@@ -557,21 +535,12 @@ cv_validate1(cg_var      *cv,
 		    if (!found){
 			if (reason)
 			    *reason = cligen_reason("'%s' does not match enumeration", v);
-			retval = 0;
+			goto fail;
 			break;
 		    }
 		}
 	    }
 	}
-	if ((options & YANG_OPTIONS_LENGTH) != 0){
-	    u = strlen(str);
-	    if (range_check(u, range_min, range_max, uint64)){
-		if (reason)
-		    *reason = cligen_reason("string length out of range: %u", u);
-		retval = 0;
-		break;
-	    }
-	}
 	if ((options & YANG_OPTIONS_PATTERN) != 0){
 	    if ((retval2 = match_regexp(str, pattern)) < 0){
 		clicon_err(OE_DB, 0, "match_regexp: %s", pattern);
@@ -581,7 +550,7 @@ cv_validate1(cg_var      *cv,
 		if (reason)
 		    *reason = cligen_reason("regexp match fail: \"%s\" does not match %s",
 					    str, pattern);
-		retval = 0;
+		goto fail;
 		break;
 	    }
 	}
@@ -591,27 +560,19 @@ cv_validate1(cg_var      *cv,
 	retval = 0;
 	if (reason)
 	    *reason = cligen_reason("Invalid cv");
-	retval = 0;
+	goto fail;
 	break;
-    case CGV_BOOL:
-    case CGV_INTERFACE:
-    case CGV_IPV4ADDR: 
-    case CGV_IPV6ADDR: 
-    case CGV_IPV4PFX: 
-    case CGV_IPV6PFX: 
-    case CGV_MACADDR:
-    case CGV_URL: 
-    case CGV_UUID: 
-    case CGV_TIME: 
-    case CGV_EMPTY:  /* XXX */
+    default:
 	break;
     }
-    if (reason && *reason)
-	assert(retval == 0); /* validation failed with error reason */
+    retval = 1; /* validation OK */
  done:
     if (vec)
 	free(vec);
     return retval;
+ fail:
+    retval = 0; /* validation failed */
+    goto done;
 }
 
 /* Forward */
@@ -633,16 +594,14 @@ ys_cv_validate_union_one(yang_stmt *ys,
     int          retval = -1;
     yang_stmt   *yrt;      /* union subtype */
     int          options = 0;
-    cg_var      *range_min = NULL; 
-    cg_var      *range_max = NULL; 
+    cvec        *cvv = NULL;
     char        *pattern = NULL;
     uint8_t      fraction = 0; 
     char        *restype;
     enum cv_type cvtype;
     cg_var      *cvt=NULL;
 
-    if (yang_type_resolve(ys, yt, &yrt, 
-			  &options, &range_min, &range_max, &pattern, 
+    if (yang_type_resolve(ys, yt, &yrt, &options, &cvv, &pattern,
 			  &fraction) < 0)
 	goto done;
     restype = yrt?yrt->ys_argument:NULL;
@@ -664,7 +623,7 @@ ys_cv_validate_union_one(yang_stmt *ys,
 	}
 	if (retval == 0)
 	    goto done;
-	if ((retval = cv_validate1(cvt, cvtype, options, range_min, range_max, 
+	if ((retval = cv_validate1(cvt, cvtype, options, cvv, 
 				   pattern, yrt, restype, reason)) < 0)
 	    goto done;
     }
@@ -736,8 +695,7 @@ ys_cv_validate(cg_var    *cv,
     int             retval = -1; 
     cg_var         *ycv;        /* cv of yang-statement */  
     int             options = 0;
-    cg_var         *range_min = NULL; 
-    cg_var         *range_max = NULL; 
+    cvec           *cvv = NULL;
     char           *pattern = NULL;
     enum cv_type    cvtype;
     char           *type;  /* orig type */
@@ -756,8 +714,7 @@ ys_cv_validate(cg_var    *cv,
     }
     ycv = ys->ys_cv;
     if (yang_type_get(ys, &type, &yrestype, 
-		      &options, &range_min, &range_max, &pattern,
-		      &fraction) < 0)
+		      &options, &cvv, &pattern, &fraction) < 0)
 	goto done;
     restype = yrestype?yrestype->ys_argument:NULL;
     if (clicon_type2cv(type, restype, &cvtype) < 0)
@@ -782,7 +739,7 @@ ys_cv_validate(cg_var    *cv,
 	retval = retval2; /* invalid (0) with latest reason or valid 1 */
     }
     else
-	if ((retval = cv_validate1(cv, cvtype, options, range_min, range_max, pattern,
+	if ((retval = cv_validate1(cv, cvtype, options, cvv, pattern,
 				   yrestype, restype, reason)) < 0)
 	    goto done;
   done:
@@ -889,7 +846,17 @@ yang_find_identity(yang_stmt *ys,
     return yid;
 }
 
-/*
+/*! Resolve type restrictions, return contraining parameters
+ * @param[in]  yrange    Yang type range restriction if any
+ * @param[in]  ylength   Yang type length restriction if any
+ * @param[in]  ypattern  Yang type pattern restriction if any
+ * @param[in]  yfraction Yang type fraction restriction if any
+ * @param[out] options   Pointer to flags field of optional values. optional
+ * @param[out] cvv       Pointer to cvec with min range or length. 
+ *                       If options&YANG_OPTIONS_RANGE or YANG_OPTIONS_LENGTH
+ * @param[out] pattern   Pointer to static string of yang string pattern. optional
+ * @param[out] fraction  For decimal64, how many digits after period
+ * @retval      0        OK. 
  */
 static int
 resolve_restrictions(yang_stmt   *yrange,
@@ -897,19 +864,16 @@ resolve_restrictions(yang_stmt   *yrange,
 		     yang_stmt   *ypattern,
 		     yang_stmt   *yfraction,
 		     int         *options, 
-		     cg_var     **mincv, 
-		     cg_var     **maxcv, 
+		     cvec       **cvv, 
 		     char       **pattern,
 		     uint8_t     *fraction)
 {
-    if (options && mincv && maxcv && yrange != NULL){
-	*mincv = cvec_find(yrange->ys_cvec, "range_min");
-	*maxcv = cvec_find(yrange->ys_cvec, "range_max");
+    if (options && cvv && yrange != NULL){
+	*cvv = yrange->ys_cvec;
 	*options  |= YANG_OPTIONS_RANGE;
     }
-    if (options && mincv && maxcv && ylength != NULL){
-	*mincv = cvec_find(ylength->ys_cvec, "range_min"); /* XXX fel typ */
-	*maxcv = cvec_find(ylength->ys_cvec, "range_max");
+    if (options && cvv && ylength != NULL){
+	*cvv = ylength->ys_cvec;
 	*options  |= YANG_OPTIONS_LENGTH;
     }
     if (options && pattern && ypattern != NULL){
@@ -928,8 +892,8 @@ resolve_restrictions(yang_stmt   *yrange,
  * @param[in]  ytype    yang-stmt object containing currently resolving type
  * @param[out] yrestype resolved type. return built-in type or NULL. mandatory
  * @param[out] options  pointer to flags field of optional values. optional
- * @param[out] mincv    pointer to cv with min range or length. If options&YANG_OPTIONS_RANGE
- * @param[out] maxcv    pointer to cv with max range or length. If options&YANG_OPTIONS_RANGE
+ * @param[out] cvv      pointer to cvec with min range or length. 
+ *                      If options&YANG_OPTIONS_RANGE or YANG_OPTIONS_LENGTH
  * @param[out] pattern  pointer to static string of yang string pattern. optional
  * @param[out] fraction for decimal64, how many digits after period
  * @retval      0        OK. Note yrestype may still be NULL.
@@ -946,8 +910,7 @@ yang_type_resolve(yang_stmt   *ys,
 		  yang_stmt   *ytype, 
 		  yang_stmt  **yrestype, 
 		  int         *options, 
-		  cg_var     **mincv, 
-		  cg_var     **maxcv, 
+		  cvec       **cvv, 
 		  char       **pattern,
 		  uint8_t     *fraction)
 {
@@ -970,8 +933,8 @@ yang_type_resolve(yang_stmt   *ys,
     prefix    = yarg_prefix(ytype); /* And this its prefix */
     /* Cache does not work for eg string length 32? */
     if (!yang_builtin(type) && ytype->ys_typecache != NULL){
-	if (yang_type_cache_get(ytype->ys_typecache, 
-				yrestype, options, mincv, maxcv, pattern, fraction) < 0)
+	if (yang_type_cache_get(ytype->ys_typecache, yrestype,
+				options, cvv, pattern, fraction) < 0)
 	    goto done;
 	goto ok;
     }
@@ -984,7 +947,7 @@ yang_type_resolve(yang_stmt   *ys,
     if (prefix == NULL && yang_builtin(type)){
 	*yrestype = ytype; 
 	resolve_restrictions(yrange, ylength, ypattern, yfraction, options, 
-			     mincv, maxcv, pattern, fraction);
+			     cvv, pattern, fraction);
 	goto ok;
     }
 
@@ -1022,13 +985,12 @@ yang_type_resolve(yang_stmt   *ys,
 	}
 	/* recursively resolve this new type */
 	if (yang_type_resolve(ys, rytype, yrestype, 
-			      options, mincv, maxcv, pattern, fraction) < 0)
+			      options, cvv, pattern, fraction) < 0)
 	    goto done;
 	/* overwrites the resolved if any */
-	resolve_restrictions(yrange, ylength, ypattern, yfraction, 
-			     options, mincv, maxcv, pattern, fraction);
+	resolve_restrictions(yrange, ylength, ypattern, yfraction, options,
+			     cvv, pattern, fraction);
     }
-
   ok:
     retval = 0;
   done:
@@ -1042,11 +1004,11 @@ yang_type_resolve(yang_stmt   *ys,
  * @code
  *   yang_stmt    *yrestype;
  *   int           options;
- *   int64_t       min, max;
+ *   cvec         *cvv = NULL;
  *   char         *pattern;
  *   uint8_t       fraction;
  *
- *   if (yang_type_get(ys, &type, &yrestype, &options, &min, &max, &pattern, &fraction) < 0)
+ *   if (yang_type_get(ys, &type, &yrestype, &options, &cvv, &pattern, &fraction) < 0)
  *      goto err;
  *   if (yrestype == NULL) # unresolved
  *      goto err;
@@ -1078,8 +1040,7 @@ yang_type_get(yang_stmt    *ys,
 	      char        **origtype, 
 	      yang_stmt   **yrestype, 
 	      int          *options, 
-	      cg_var      **mincv, 
-	      cg_var      **maxcv, 
+	      cvec        **cvv, 
 	      char        **pattern,
 	      uint8_t      *fraction
     )
@@ -1100,7 +1061,7 @@ yang_type_get(yang_stmt    *ys,
     if (origtype)
 	*origtype = type;
     if (yang_type_resolve(ys, ytype, yrestype, 
-			  options, mincv, maxcv, pattern, fraction) < 0)
+			  options, cvv, pattern, fraction) < 0)
 	goto done;
     clicon_debug(3, "%s: %s %s->%s", __FUNCTION__, ys->ys_argument, type, 
 		 *yrestype?(*yrestype)->ys_argument:"null");
diff --git a/test/README.md b/test/README.md
index 59832663..1326365e 100644
--- a/test/README.md
+++ b/test/README.md
@@ -2,8 +2,9 @@
 
 This directory contains testing code for clixon and the example
 application. Assumes setup of http daemon as describe under apps/restonf
-- clixon            A top-level script clones clixon in /tmp and starts all.sh. You can copy this file (review it first) and place as cron script
+- Jenkinsfile       Makefile for Jenkins tests. Build clixon and run tests.
 - all.sh            Run through all tests named 'test*.sh' in this directory. Therefore, if you place a test in this directory matching 'test*.sh' it will be run automatically. By default the script will exit on first error. Run as `all.sh summary` to continue and print a summary on all tests.
+- site.sh           Add your site-specific modifications here
 - test_nacm.sh      Auth tests using internal NACM
 - test_nacm_ext.sh  Auth tests using external NACM (separate file)
 - test_cli.sh       CLI tests
@@ -12,6 +13,7 @@ application. Assumes setup of http daemon as describe under apps/restonf
 - test_yang.sh      Yang tests for constructs not in the example.
 - test_leafref.sh   Yang leafref tests
 - test_datastore.sh Datastore tests
+- and many more...
 
 Example runs:
 ```
diff --git a/test/test_openconfig.sh b/test/test_openconfig.sh
index 47574fa2..f5f56bcf 100755
--- a/test/test_openconfig.sh
+++ b/test/test_openconfig.sh
@@ -3,9 +3,6 @@
 # Note that the 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/60
-# - release/models/wifi/types/openconfig-wifi-types.yang
-#      issue: https://github.com/clicon/clixon/issues/59
-# 
 
 # Yang specifics: multi-keys and empty type
 APPNAME=example
diff --git a/test/test_type.sh b/test/test_type.sh
index 20f6f7aa..188107a6 100755
--- a/test/test_type.sh
+++ b/test/test_type.sh
@@ -1,8 +1,10 @@
 #!/bin/bash
 # Advanced union types and generated code
 # and enum w values
+# XXX NO SUPPORT FOR lists of ranges and lengths !!!
 APPNAME=example
 # include err() and new() functions and creates $dir
+
 . ./lib.sh
 
 cfg=$dir/conf_yang.xml
@@ -123,57 +125,47 @@ module example{
          enum down;
       }
    }
-   leaf length1 {
-       type string {
-       length "1";
-      }
-   }
-/*   leaf length2 {
-       type string {
-         length "max";
-      }
-   }
-   leaf length3 {
-       type string {
-         length "min";
-      }
-   }*/
-   leaf length4 {
-       type string {
-         length "4..4000";
-      }
-   }
-/*   leaf length5 {
-       type string {
-         length "min..max";
-      }
-   }*/
    leaf num1 {
        type int32 {
        range "1";
       }
    }
-/*   leaf num2 {
-       type int32 {
-         range "min";
-      }
-   }
-   leaf num3 {
-       type int32 {
-         range "max";
-      }
-   }
-*/
-   leaf num4 {
+   leaf num2 {
        type int32 {
          range "4..4000";
       }
    }
-/*   leaf num5 {
-       type int32 {
+   leaf num3 {
+       type uint8 {
          range "min..max";
       }
-   }*/
+   }
+   leaf num4 { /* XXX multiple ranges not supported yet - only first*/
+       type uint8 {
+         range "1  ..  2 |  42";
+      }
+   }
+   leaf len1 {
+       type string {
+       length "2";
+      }
+   }
+   leaf len2 {
+       type string {
+         length "4..4000";
+      }
+   }
+   leaf len3 {
+       type string {
+         length "min..max";
+      }
+   }
+   leaf len4 {
+       type string {
+         range "1  ..  2 |  42";
+      }
+   }
+
    typedef mybits {
         description "Test adding several bits";
 	type bits {
@@ -303,6 +295,70 @@ expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><can
 new "cli bits validate"
 expectfn "$clixon_cli -1f $cfg -l o -y $fyang validate" 0 "^$"
 
+#----------------int ranges---------------------
+
+new "cli range test num1 1 OK"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set num1 1" 0 "^$"
+
+#new "cli range test num1 -100 ok" # XXX - cant be given on cmd line
+#expectfn "$clixon_cli -1f $cfg -l o -y $fyang set num1 \-100" 0 "^$"
+
+new "cli range test num1 2 error"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set num1 2" 255 "^$"
+
+new "netconf range set num1 -1"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><num1 xmlns="urn:example:clixon">-1</num1></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "netconf validate num1 -1 wrong"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>num1</bad-element></error-info><error-severity>error</error-severity><error-message>Number out of range: -1</error-message></rpc-error></rpc-reply>]]>]]>$'
+
+new "cli range test num2 1000 ok"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set num2 1000" 0 "^$"
+
+new "cli range test num2 3 error"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set num2 3" 255 "^$"
+
+new "cli range test num2 5000 error"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set num2 5000" 255 "^$"
+
+new "cli range test num3 42 ok"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set num3 42" 0 "^$"
+
+new "cli range test num3 260 error"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set num3 260" 255 "^$"
+
+#----------------string ranges---------------------
+
+new "cli length test len1 1 error"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set len1 x" 255 "^$"
+
+new "cli length test len1 2 OK"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set len1 xy" 0 "^$"
+
+new "cli length test len1 3 error"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set len1 hej" 255 "^$"
+
+new "netconf discard-changes"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "netconf length set len1 1"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><len1 xmlns="urn:example:clixon">x</len1></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "netconf validate len1 1 wrong"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>len1</bad-element></error-info><error-severity>error</error-severity><error-message>string length out of range: 1</error-message></rpc-error></rpc-reply>]]>]]>$'
+
+new "cli length test len2 42 ok"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set len2 hejhophdsakjhkjsadhkjsahdkjsad" 0 "^$"
+
+new "netconf discard-changes"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "cli length test len2 3 error"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set len2 ab" 255 "^$"
+
+new "cli range test len3 42 ok"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set len3 hsakjdhkjsahdkjsahdksahdksajdhsakjhd" 0 "^$"
+
 if [ $BE -eq 0 ]; then
     exit # BE
 fi

From 207858e20dd8b068dd13e7d720aa7c663d87884b Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Thu, 10 Jan 2019 20:52:19 +0100
Subject: [PATCH 29/72] * Support of yangmodels supported, see
 test_yangmodels.sh * Added -o "<option>=<value>" command-line option to all
 programs: backend, cli, netconf, restconf. * Ignore CR(\r) in yang files for
 DOS files

---
 CHANGELOG.md                       |  11 +-
 apps/backend/backend_main.c        |  16 +-
 apps/cli/cli_generate.c            |   4 +-
 apps/cli/cli_main.c                |  14 +-
 apps/netconf/netconf_main.c        |  15 +-
 apps/restconf/restconf_main.c      |  14 +-
 datastore/datastore_client.c       |  10 +-
 datastore/text/clixon_xmldb_text.c |   2 +-
 doc/FAQ.md                         |   2 +-
 lib/clixon/clixon_options.h        |   6 +-
 lib/clixon/clixon_yang.h           |   9 +-
 lib/clixon/clixon_yang_type.h      |   2 +-
 lib/src/clixon_json_parse.l        |   3 +-
 lib/src/clixon_options.c           |  39 ++-
 lib/src/clixon_xml_map.c           |   2 +-
 lib/src/clixon_xml_parse.l         |   1 +
 lib/src/clixon_yang.c              | 366 ++++++++++++++++-------------
 lib/src/clixon_yang_cardinality.c  |   8 +-
 lib/src/clixon_yang_parse.l        |  12 +-
 lib/src/clixon_yang_parse.y        | 221 ++++++++++++++---
 lib/src/clixon_yang_type.c         |  25 +-
 test/lib.sh                        |   4 +
 test/test_openconfig.sh            |   9 +-
 test/test_yangmodels.sh            |  91 +++++++
 util/Makefile.in                   |   3 +
 util/clixon_util_yang.c            |   2 +-
 26 files changed, 635 insertions(+), 256 deletions(-)
 create mode 100755 test/test_yangmodels.sh

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b64cdd5a..1605ed1f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -62,7 +62,11 @@
   * RPC method input parameters validated
     * see https://github.com/clicon/clixon/issues/47
   * Support of submodule, include and belongs-to.
-  * Openconfig yang specs parsed: https://github.com/openconfig/public
+  * Parsing of standard yang files supported, such as:
+    * https://github.com/openconfig/public - except [https://github.com/clicon/clixon/issues/60].
+      * See [test/test_openconfig.sh]
+    * https://github.com/YangModels/yang - except vendor-specific specs
+      * See [test/test_yangmodels.sh]
   * Improved "unknown" handling
   * More precise Yang validation and better error messages
     * Example: adding bad-, missing-, or unknown-element error messages, instead of operation-failed.
@@ -77,7 +81,9 @@
   * Recovery user "_nacm_recovery" added.
     * Example use is restconf PUT when NACM edit-config is permitted, then automatic commit and discard are permitted using recovery user.
   * Example user changed adm1 to andy to comply with RFC8341 example
-
+* Added -o "<option>=<value>" command-line option to all programs: backend, cli, netconf, restconf.
+  * Any config option from file can be overrided by giving them on command-line.
+	
 ### API changes on existing features (you may need to change your code)
 * Stricter YANG choice validation leads to enforcement of structures like: `choice c{ mandatory true; leaf x` statements. `x` was not previously enforced.
 * Many hand-crafted validation messages have been removed and replaced with generic validations, which may lead to changed rpc-error messages.
@@ -112,6 +118,7 @@
   * <!DOCTYPE (ie DTD) is not supported.
 
 ### Corrected Bugs
+* Ignore CR(\r) in yang files for DOS files
 * Keyword "min" (not only "max") can be used in built-in types "range" and "length" statements.
 * Support for empty yang string added, eg `default "";`
 * Removed CLI generation for yang notifications (and other non-data yang nodes)
diff --git a/apps/backend/backend_main.c b/apps/backend/backend_main.c
index 6fbb8750..b7b0bd7e 100644
--- a/apps/backend/backend_main.c
+++ b/apps/backend/backend_main.c
@@ -73,7 +73,7 @@
 #include "backend_handle.h"
 
 /* Command line options to be passed to getopt(3) */
-#define BACKEND_OPTS "hD:f:l:d:b:Fza:u:P:1s:c:g:y:x:" /* substitute s: for IRCc:r */
+#define BACKEND_OPTS "hD:f:l:d:b:Fza:u:P:1s:c:g:y:x:o:" 
 
 #define BACKEND_LOGFILE "/usr/local/var/clixon_backend.log"
 
@@ -154,7 +154,8 @@ usage(clicon_handle h,
 	    "\t-g <group>\tClient membership required to this group (default: %s)\n"
 
 	    "\t-y <file>\tLoad yang spec file (override yang main module)\n"
-	    "\t-x <plugin>\tXMLDB plugin\n",
+	    "\t-x <plugin>\tXMLDB plugin\n"
+	    "\t-o \"<option>=<value>\"\tGive configuration option overriding config file (see clixon-config.yang)\n",
 	    argv0,
 	    plgdir ? plgdir : "none",
 	    confsock ? confsock : "none",
@@ -268,7 +269,7 @@ nacm_load_external(clicon_handle h)
     }
     if ((yspec = yspec_new()) == NULL)
 	goto done;
-    if (yang_parse(h, NULL, "ietf-netconf-acm", NULL, yspec) < 0)
+    if (yang_spec_parse_module(h, "ietf-netconf-acm", NULL, yspec) < 0)
 	goto done;
     fd = fileno(f);
     /* Read configfile */
@@ -701,6 +702,15 @@ main(int    argc,
 	    clicon_option_str_set(h, "CLICON_XMLDB_PLUGIN", optarg);
 	    break;
 	}
+	case 'o':{ /* Configuration option */
+	    char          *val;
+	    if ((val = index(optarg, '=')) == NULL)
+		usage(h, argv0);
+	    *val++ = '\0';
+	    if (clicon_option_add(h, optarg, val) < 0)
+		goto done;
+	    break;
+	}
 	default:
 	    usage(h, argv[0]);
 	    break;
diff --git a/apps/cli/cli_generate.c b/apps/cli/cli_generate.c
index 85388d65..df45bfba 100644
--- a/apps/cli/cli_generate.c
+++ b/apps/cli/cli_generate.c
@@ -318,7 +318,7 @@ yang2cli_var_union_one(clicon_handle h,
     char        *restype;
 
     /* Resolve the sub-union type to a resolved type */
-    if (yang_type_resolve(ys, ytsub, /* in */
+    if (yang_type_resolve(ys, ys, ytsub, /* in */
 			  &ytype, &options, /* resolved type */
 			  &cvv, &pattern, &fraction_digits) < 0)
 	goto done;
@@ -778,7 +778,7 @@ yang2cli(clicon_handle      h,
 	    if (yang2cli_stmt(h, ymod, cbuf, gt, 0) < 0)
 		goto done;
 	}
-    clicon_debug(0, "%s: buf\n%s\n", __FUNCTION__, cbuf_get(cbuf));
+    clicon_debug(2, "%s: buf\n%s\n", __FUNCTION__, cbuf_get(cbuf));
     /* Parse the buffer using cligen parser. XXX why this?*/
     if ((globals = cvec_new(0)) == NULL)
 	goto done;
diff --git a/apps/cli/cli_main.c b/apps/cli/cli_main.c
index ce994fee..deeafd29 100644
--- a/apps/cli/cli_main.c
+++ b/apps/cli/cli_main.c
@@ -71,7 +71,7 @@
 #include "cli_handle.h"
 
 /* Command line options to be passed to getopt(3) */
-#define CLI_OPTS "hD:f:xl:F:1a:u:d:m:qpGLy:c:U:"
+#define CLI_OPTS "hD:f:xl:F:1a:u:d:m:qpGLy:c:U:o:"
 
 #define CLI_LOGFILE "/tmp/clixon_cli.log"
 
@@ -227,7 +227,8 @@ usage(clicon_handle h,
 	    "\t-l <s|e|o|f<file>> \tLog on (s)yslog, std(e)rr, std(o)ut or (f)ile (stderr is default)\n"
 	    "\t-y <file>\tOverride yang spec file (dont include .yang suffix)\n"
 	    "\t-c <file>\tSpecify cli spec file.\n"
-	    "\t-U <user>\tOver-ride unix user with a pseudo user for NACM.\n",
+	    "\t-U <user>\tOver-ride unix user with a pseudo user for NACM.\n"
+	    "\t-o \"<option>=<value>\"\tGive configuration option overriding config file (see clixon-config.yang)\n",
 	    argv0,
 	    plgdir ? plgdir : "none"
 	);
@@ -403,6 +404,15 @@ main(int argc, char **argv)
 	    if (clicon_username_set(h, optarg) < 0)
 		goto done;
 	    break;
+	case 'o':{ /* Configuration option */
+	    char          *val;
+	    if ((val = index(optarg, '=')) == NULL)
+		usage(h, argv0);
+	    *val++ = '\0';
+	    if (clicon_option_add(h, optarg, val) < 0)
+		goto done;
+	    break;
+	}
 	default:
 	    usage(h, argv[0]);
 	    break;
diff --git a/apps/netconf/netconf_main.c b/apps/netconf/netconf_main.c
index 19ec4ee6..b3fd3a22 100644
--- a/apps/netconf/netconf_main.c
+++ b/apps/netconf/netconf_main.c
@@ -71,7 +71,7 @@
 #include "netconf_rpc.h"
 
 /* Command line options to be passed to getopt(3) */
-#define NETCONF_OPTS "hD:f:l:qa:u:d:y:U:t:"
+#define NETCONF_OPTS "hD:f:l:qa:u:d:y:U:t:o:"
 
 #define NETCONF_LOGFILE "/tmp/clixon_netconf.log"
 
@@ -333,7 +333,8 @@ usage(clicon_handle h,
 
 	    "\t-y <file>\tLoad yang spec file (override yang main module)\n"
 	    "\t-U <user>\tOver-ride unix user with a pseudo user for NACM.\n"
-	    "\t-t <sec>\tTimeout in seconds. Quit after this time.\n",
+	    "\t-t <sec>\tTimeout in seconds. Quit after this time.\n"
+	    "\t-o \"<option>=<value>\"\tGive configuration option overriding config file (see clixon-config.yang)\n",
 	    argv0,
 	    clicon_netconf_dir(h)
 	    );
@@ -446,7 +447,15 @@ main(int    argc,
 	case 't': /* timeout in seconds */
 	    tv.tv_sec = atoi(optarg);
 	    break;
-
+	case 'o':{ /* Configuration option */
+	    char          *val;
+	    if ((val = index(optarg, '=')) == NULL)
+		usage(h, argv0);
+	    *val++ = '\0';
+	    if (clicon_option_add(h, optarg, val) < 0)
+		goto done;
+	    break;
+	}
 	default:
 	    usage(h, argv[0]);
 	    break;
diff --git a/apps/restconf/restconf_main.c b/apps/restconf/restconf_main.c
index 0819c7cb..0e33e5b1 100644
--- a/apps/restconf/restconf_main.c
+++ b/apps/restconf/restconf_main.c
@@ -81,7 +81,7 @@
 #include "restconf_stream.h"
 
 /* Command line options to be passed to getopt(3) */
-#define RESTCONF_OPTS "hD:f:l:p:y:a:u:"
+#define RESTCONF_OPTS "hD:f:l:p:y:a:u:o:"
 
 /* RESTCONF enables deployments to specify where the RESTCONF API is 
    located.  The client discovers this by getting the "/.well-known/host-meta"
@@ -495,7 +495,8 @@ usage(clicon_handle h,
 	    "\t-d <dir>\tSpecify restconf plugin directory dir (default: %s)\n"
 	    "\t-y <file>\tLoad yang spec file (override yang main module)\n"
     	    "\t-a UNIX|IPv4|IPv6\tInternal backend socket family\n"
-    	    "\t-u <path|addr>\tInternal socket domain path or IP addr (see -a)\n",
+    	    "\t-u <path|addr>\tInternal socket domain path or IP addr (see -a)\n"
+	    "\t-o \"<option>=<value>\"\tGive configuration option overriding config file (see clixon-config.yang)\n",
 	    argv0,
 	    clicon_restconf_dir(h)
 	    );
@@ -611,6 +612,15 @@ main(int    argc,
 		usage(h, argv[0]);
 	    clicon_option_str_set(h, "CLICON_SOCK", optarg);
 	    break;
+	case 'o':{ /* Configuration option */
+	    char          *val;
+	    if ((val = index(optarg, '=')) == NULL)
+		usage(h, argv0);
+	    *val++ = '\0';
+	    if (clicon_option_add(h, optarg, val) < 0)
+		goto done;
+	    break;
+	}
         default:
             usage(h, argv[0]);
             break;
diff --git a/datastore/datastore_client.c b/datastore/datastore_client.c
index 0bbe5a3b..a5b6ab1e 100644
--- a/datastore/datastore_client.c
+++ b/datastore/datastore_client.c
@@ -106,7 +106,7 @@ main(int argc, char **argv)
     char               *plugin = NULL;
     char               *cmd = NULL;
     yang_spec          *yspec = NULL;
-    char               *yangmodule = NULL;
+    char               *yangfilename = NULL;
     char               *dbdir = NULL;
     int                 ret;
     int                 pid;
@@ -151,7 +151,7 @@ main(int argc, char **argv)
 	case 'y': /* Yang file */
 	    if (!optarg)
 	        usage(argv0);
-	    yangmodule = optarg;
+	    yangfilename = optarg;
 	    break;
 	}
     /* 
@@ -173,8 +173,8 @@ main(int argc, char **argv)
 	clicon_err(OE_DB, 0, "Missing dbdir -b option");
 	goto done;
     }
-    if (yangmodule == NULL){
-	clicon_err(OE_YANG, 0, "Missing yang module -m option");
+    if (yangfilename == NULL){
+	clicon_err(OE_YANG, 0, "Missing yang filename -y option");
 	goto done;
     }
     /* Load datastore plugin */
@@ -187,7 +187,7 @@ main(int argc, char **argv)
     if ((yspec = yspec_new()) == NULL)
 	goto done;
     /* Parse yang spec from given file */
-    if (yang_parse(h, yangmodule, NULL, NULL, yspec) < 0)
+    if (yang_spec_parse_file(h, yangfilename, yspec) < 0)
 	goto done;
     /* Set database directory option */
     if (xmldb_setopt(h, "dbdir", dbdir) < 0)
diff --git a/datastore/text/clixon_xmldb_text.c b/datastore/text/clixon_xmldb_text.c
index 689e9a4b..e7a6999e 100644
--- a/datastore/text/clixon_xmldb_text.c
+++ b/datastore/text/clixon_xmldb_text.c
@@ -1453,7 +1453,7 @@ main(int    argc,
     db_init(db);
     if ((yspec = yspec_new()) == NULL)
 	goto done
-    if (yang_parse(h, NULL, yangmod, NULL, yspec) < 0)
+    if (yang_spec_parse_module(h, yangmod, NULL, yspec) < 0)
 	goto done;
     if (strcmp(cmd, "get")==0){
 	if (argc < 5)
diff --git a/doc/FAQ.md b/doc/FAQ.md
index 7ab690e0..ff49df1a 100644
--- a/doc/FAQ.md
+++ b/doc/FAQ.md
@@ -197,7 +197,7 @@ are included.
 
 The following configuration file options control the loading of Yang files:
 - `CLICON_YANG_DIR` -  A list of directories (yang dir path) where Clixon searches for module and submodules.
-- `CLICON_YANG_MAIN_FILE` - Load a specific Yang module fiven by a file. 
+- `CLICON_YANG_MAIN_FILE` - Load a specific Yang module given by a file. 
 - `CLICON_YANG_MODULE_MAIN` - Specifies a single module to load. The module is searched for in the yang dir path.
 - `CLICON_YANG_MODULE_REVISION` : Specifies a revision to the main module. 
 - `CLICON_YANG_MAIN_DIR` - Load all yang modules in this directory.
diff --git a/lib/clixon/clixon_options.h b/lib/clixon/clixon_options.h
index 04aae2e6..4168b9ed 100644
--- a/lib/clixon/clixon_options.h
+++ b/lib/clixon/clixon_options.h
@@ -80,6 +80,10 @@ enum startup_mode_t{
 
 /* Print registry on file. For debugging. */
 void clicon_option_dump(clicon_handle h, int dblevel);
+
+/* Add a clicon options overriding file setting */
+int clicon_option_add(clicon_handle h,	char *name, char *value);
+
 /* Initialize options: set defaults, read config-file, etc */
 int clicon_options_main(clicon_handle h, yang_spec *yspec);
 
@@ -174,10 +178,8 @@ int clicon_dbspec_yang_set(clicon_handle h, struct yang_spec *ys);
 cxobj * clicon_nacm_ext(clicon_handle h);
 int clicon_nacm_ext_set(clicon_handle h, cxobj *xn);
 
-#if 1 /* Temporary function until "Top-level Yang symbol cannot be called "config"" is fixed */
 yang_spec * clicon_config_yang(clicon_handle h);
 int clicon_config_yang_set(clicon_handle h, struct yang_spec *ys);
-#endif
 
 cxobj *clicon_conf_xml(clicon_handle h);
 int clicon_conf_xml_set(clicon_handle h, cxobj *x);
diff --git a/lib/clixon/clixon_yang.h b/lib/clixon/clixon_yang.h
index 3842b225..1035a429 100644
--- a/lib/clixon/clixon_yang.h
+++ b/lib/clixon/clixon_yang.h
@@ -212,7 +212,6 @@ struct yang_stmt{
     yang_type_cache   *ys_typecache; /* If ys_keyword==Y_TYPE, cache all typedef data except unions */
 };
 
-
 /*! top-level yang parse-tree */
 struct yang_spec{
     int                yp_len;       /* Number of children */
@@ -269,9 +268,6 @@ int        yang_print(FILE *f, yang_node *yn);
 int        yang_print_cbuf(cbuf *cb, yang_node *yn, int marginal);
 int        ys_populate(yang_stmt *ys, void *arg);
 yang_stmt *yang_parse_file(int fd, const char *name, yang_spec *ysp);
-int        yang_parse(clicon_handle h, const char *filename,
-		      const char *module, 
-		      const char *revision, yang_spec *ysp);
 int        yang_apply(yang_node *yn, enum rfc_6020 key, yang_applyfn_t fn, 
 		      void *arg);
 int        yang_abs_schema_nodeid(yang_spec *yspec, yang_stmt *ys,
@@ -283,8 +279,9 @@ cg_var    *ys_parse(yang_stmt *ys, enum cv_type cvtype);
 int        ys_parse_sub(yang_stmt *ys, char *extra);
 int        yang_mandatory(yang_stmt *ys);
 int        yang_config(yang_stmt *ys);
-int        yang_spec_parse_module(clicon_handle h, char *module, char *revision, yang_spec *yspec);
-int        yang_spec_parse_file(clicon_handle h, char *filename, yang_spec *yspec);
+int        yang_spec_parse_module(clicon_handle h, const char *module,
+				  const char *revision, yang_spec *yspec);
+int        yang_spec_parse_file(clicon_handle h, const char *filename, yang_spec *yspec);
 int        yang_spec_load_dir(clicon_handle h, char *dir, yang_spec *yspec);
 cvec      *yang_arg2cvec(yang_stmt *ys, char *delimi);
 int        yang_key_match(yang_node *yn, char *name);
diff --git a/lib/clixon/clixon_yang_type.h b/lib/clixon/clixon_yang_type.h
index bbdfe79e..c023f374 100644
--- a/lib/clixon/clixon_yang_type.h
+++ b/lib/clixon/clixon_yang_type.h
@@ -71,7 +71,7 @@ int        clicon_type2cv(char *type, char *rtype, enum cv_type *cvtype);
 int        yang_type_get(yang_stmt *ys, char **otype, yang_stmt **restype, 
 			 int *options, cvec **cvv, char **pattern,
                          uint8_t *fraction_digits);
-int        yang_type_resolve(yang_stmt *ys, yang_stmt *ytype, 
+int        yang_type_resolve(yang_stmt *yorig, yang_stmt *ys, yang_stmt *ytype, 
 			     yang_stmt **restype, int *options, 
 			     cvec **cvv, char **pattern, uint8_t *fraction);
 
diff --git a/lib/src/clixon_json_parse.l b/lib/src/clixon_json_parse.l
index 6d720140..6700a5c5 100644
--- a/lib/src/clixon_json_parse.l
+++ b/lib/src/clixon_json_parse.l
@@ -87,9 +87,10 @@ exp ({integer}|{real})[eE][+-]{integer}
 %s ESCAPE
 
 %%
+
 <START>[ \t]            
 <START>\n               { _JY->jy_linenum++; }
-<START>\r               { }
+<START>\r               
 <START><<EOF>>          { return J_EOF; }
 <START>\{               { return *yytext; }
 <START>\}               { return *yytext; }
diff --git a/lib/src/clixon_options.c b/lib/src/clixon_options.c
index 4fdb1dce..2ef5b7e6 100644
--- a/lib/src/clixon_options.c
+++ b/lib/src/clixon_options.c
@@ -111,7 +111,6 @@ clicon_option_dump(clicon_handle h,
 	    clicon_debug(dbglevel, "%s = NULL", keys[i]);
     }
     free(keys);
-
 }
 
 /*! Read filename and set values to global options registry. XML variant.
@@ -216,6 +215,42 @@ parse_configfile(clicon_handle  h,
     return retval;
 }
 
+/*! Add configuration option overriding file setting
+ * Add to clicon_options hash, and to clicon_conf_xml tree
+ * @param[in]  h      Clicon handle
+ * @param[in]  name   Name of configuration option (see clixon-config.yang)
+ * @param[in]  value  String value
+ * @retval     0      OK
+ * @retval    -1      Error
+ * @see clicon_options_main  For loading options from file
+ */
+int
+clicon_option_add(clicon_handle h,
+		  char         *name,
+		  char         *value)
+{
+    int            retval = -1;
+    clicon_hash_t *copt = clicon_options(h);
+    cxobj         *x;
+
+    if (strcmp(name, "CLICON_FEATURE")==0 ||
+	strcmp(name, "CLICON_YANG_DIR")==0){
+	if ((x = clicon_conf_xml(h)) == NULL)
+	    goto done;
+	if (xml_parse_va(&x, NULL, "<%s>%s</%s>",
+			 name, value, name) < 0)
+	    goto done;
+    }
+    if (hash_add(copt, 
+		 name,
+		 value,
+		 strlen(value)+1) == NULL)
+	goto done;
+    retval = 0;
+ done:
+    return retval;
+}
+
 /*! Parse clixon yang file. Parse XML config file. Initialize option values
  *
  * Set default options, Read config-file, Check that all values are set.
@@ -265,7 +300,7 @@ clicon_options_main(clicon_handle h,
     /* Set clixon_conf pointer to handle */
     clicon_conf_xml_set(h, xconfig);
     /* Parse clixon yang spec */
-    if (yang_parse(h, NULL, "clixon-config", NULL, yspec) < 0)
+    if (yang_spec_parse_module(h, "clixon-config", NULL, yspec) < 0)
 	goto done;    
     clicon_conf_xml_set(h, NULL);
     if (xconfig)
diff --git a/lib/src/clixon_xml_map.c b/lib/src/clixon_xml_map.c
index 213082b7..3a62a5f7 100644
--- a/lib/src/clixon_xml_map.c
+++ b/lib/src/clixon_xml_map.c
@@ -2413,7 +2413,7 @@ yang_enum_int_value(cxobj   *node,
 	goto done;
     if ((ytype = yang_find((yang_node *)ys, Y_TYPE, NULL)) == NULL)
 	goto done;
-    if (yang_type_resolve(ys, ytype, &yrestype, 
+    if (yang_type_resolve(ys, ys, ytype, &yrestype, 
 			  NULL, NULL, NULL, NULL) < 0)
 	goto done;
     if (yrestype==NULL || strcmp(yrestype->ys_argument, "enumeration"))
diff --git a/lib/src/clixon_xml_parse.l b/lib/src/clixon_xml_parse.l
index 812b246c..c0f0a104 100644
--- a/lib/src/clixon_xml_parse.l
+++ b/lib/src/clixon_xml_parse.l
@@ -106,6 +106,7 @@ ncname     {namestart}{namechar}*
 
 <START,TEXTDECL>[ \t]   ;
 <START,STATEA,CMNT,TEXTDECL>\n   { _YA->ya_linenum++; }
+<START,STATEA,CMNT,TEXTDECL>\r
 
 <START>{ncname}        { clixon_xml_parselval.string = strdup(yytext);
                             return NAME; /* rather be catch-all */
diff --git a/lib/src/clixon_yang.c b/lib/src/clixon_yang.c
index 66590a56..c8197cd4 100644
--- a/lib/src/clixon_yang.c
+++ b/lib/src/clixon_yang.c
@@ -34,6 +34,16 @@
  * Yang functions
  * @see https://tools.ietf.org/html/rfc6020 YANG 1.0
  * @see https://tools.ietf.org/html/rfc7950 YANG 1.1
+ *
+ * yang_spec_parse_module
+ *                       \
+ * yang_spec_parse_file-> yang_parse_post->yang_parse_recurse->yang_parse_module
+ *                    \   /                                         v
+ * yang_spec_load_dir ------------------------------------> yang_parse_filename
+ *                                                                 v  
+ *                                                          yang_parse_file
+ *                                                                 v  
+ *                                                          yang_parse_str
  */
 
 #ifdef HAVE_CONFIG_H
@@ -1068,7 +1078,8 @@ ys_populate_leaf(yang_stmt *ys,
 
     yparent = ys->ys_parent;     /* Find parent: list/container */
     /* 1. Find type specification and set cv type accordingly */
-    if (yang_type_get(ys, &type, &yrestype, &options, NULL, NULL, &fraction_digits) < 0)
+    if (yang_type_get(ys, &type, &yrestype, &options, NULL, NULL, &fraction_digits)
+ < 0)
 	goto done;
     restype = yrestype?yrestype->ys_argument:NULL;
     if (clicon_type2cv(type, restype, &cvtype) < 0) /* This handles non-resolved also */
@@ -1213,7 +1224,7 @@ ys_populate_range(yang_stmt *ys,
 	clicon_err(OE_YANG, 0, "parent should be type"); 
 	goto done;
     }
-    if (yang_type_resolve(ys, (yang_stmt*)yparent, &yrestype, 
+    if (yang_type_resolve(ys, ys, (yang_stmt*)yparent, &yrestype, 
 			  &options, NULL, NULL, &fraction_digits) < 0)
 	goto done;
     restype = yrestype?yrestype->ys_argument:NULL;
@@ -1467,7 +1478,7 @@ ys_populate_feature(clicon_handle h,
     cv_name_set(cv, feature);
     cv_bool_set(cv, found);
     if (found)
-	clicon_debug(1, "%s %s:%s", __FUNCTION__, module, feature);
+	clicon_debug(2, "%s %s:%s", __FUNCTION__, module, feature);
     ys->ys_cv = cv;
  ok:
     retval = 0;
@@ -2085,7 +2096,7 @@ yang_parse_recurse(clicon_handle h,
 	    subrevision = NULL;
 	/* if already loaded, ignore, else parse the file */
 	if (yang_find((yang_node*)ysp,
-		      keyw=Y_IMPORT?Y_MODULE:Y_SUBMODULE,
+		      keyw==Y_IMPORT?Y_MODULE:Y_SUBMODULE,
 		      submodule) == NULL){
 	    /* recursive call */
 	    if ((subymod = yang_parse_module(h, submodule, subrevision, ysp)) == NULL)
@@ -2249,7 +2260,9 @@ yang_merge_submodules(clicon_handle h,
     }
     modname = yb->ys_argument;
     if ((ymod = yang_find((yang_node*)yspec, Y_MODULE, modname)) == NULL){
-	clicon_err(OE_YANG, ENOENT, "Module %s which submodule %s belongs to is not found", modname, ysubm->ys_argument);
+	clicon_err(OE_YANG, ENOENT, "Submodule %s is loaded before/without its main module %s (you need to load the submodule together with or after the main module)",
+		   ysubm->ys_argument,
+		   modname);
 	goto done;
     }
     /* Move sub-module statements to modules 
@@ -2304,64 +2317,29 @@ yang_merge_submodules(clicon_handle h,
  *   yang_parse_str         # Set up yacc parser and call it given a string
  *   clixon_yang_parseparse # Actual yang parsing using yacc
  */
-int
-yang_parse(clicon_handle h, 
-	   const char   *filename, 
-	   const char   *module, 
-	   const char   *revision, 
-	   yang_spec    *yspec)
+static int
+yang_parse_post(clicon_handle h,
+		yang_spec    *yspec,
+		int           modnr)
 {
-    int         retval = -1;
-    yang_stmt  *ymod = NULL; /* Top-level yang (sub)module */
-    int         i;
-    int         modnr;       /* Existing number of modules */
-    char       *base = NULL;;
-
-    /* Apply steps 2.. on new modules, ie ones after modnr. */
-    modnr = yspec->yp_len;
-    if (filename){
-	/* Find module, and do not load file if module already exists */
-	if (basename(filename) == NULL){
-	    clicon_err(OE_YANG, errno, "No basename");
-	    goto done;
-	}
-	if ((base = strdup(basename(filename))) == NULL){
-	    clicon_err(OE_YANG, errno, "strdup");
-	    goto done;
-	}
-	if (index(base, '@') != NULL)
-	    *index(base, '@') = '\0';
-	if (yang_find((yang_node*)yspec, Y_MODULE, base) != NULL)
-	    goto ok;
-	if ((ymod = yang_parse_filename(filename, yspec)) == NULL)
-	    goto done;
-    }
-    else {
-	/* Do not load module if it already exists */
-	if (yang_find((yang_node*)yspec, Y_MODULE, module) != NULL)
-	    goto ok;
-	if ((ymod = yang_parse_module(h, module, revision, yspec)) == NULL)
-	    goto done;
-    }
-
+    int retval = -1;
+    int i;
+    
     /* 1: Parse from text to yang parse-tree. */
     /* Iterate through modules */
-    if (yang_parse_recurse(h, ymod, yspec) < 0)
-	goto done;
+    for (i=modnr; i<yspec->yp_len; i++)
+	if (yang_parse_recurse(h, yspec->yp_stmt[i], yspec) < 0)
+	    goto done;
 
     /* 2. Check cardinality maybe this should be done after grouping/augment */
-    for (i=modnr; i<yspec->yp_len; i++) /* XXX */
+    for (i=modnr; i<yspec->yp_len; i++) 
 	if (yang_cardinality(h, yspec->yp_stmt[i], yspec->yp_stmt[i]->ys_argument) < 0)
 	    goto done;
 
     /* 3: Merge sub-modules with modules - after this step, no submodules exist
      * In the merge, remove submodule headers
      */
-    for (i=modnr; i<yspec->yp_len; i++){
-	if (yspec->yp_stmt[i]->ys_keyword != Y_SUBMODULE)
-	    continue;
-    }
-    i = 0;
+    i = modnr;
     while (i<yspec->yp_len){
 	int j;
 	if (yspec->yp_stmt[i]->ys_keyword != Y_SUBMODULE){
@@ -2416,7 +2394,48 @@ yang_parse(clicon_handle h,
     for (i=modnr; i<yspec->yp_len; i++)
 	if (yang_apply((yang_node*)yspec->yp_stmt[i], -1, ys_schemanode_check, NULL) < 0)
 	    goto done;
-    /* Return main module parsed in step 1 */
+    retval = 0;
+ done:
+    return retval;
+}
+
+/*! Parse yang specification and its dependencies recursively given module
+ * @param[in]     h         clicon handle
+ * @param[in]     module    Module name, or absolute filename (including dir)
+ * @param[in]     dir       Directory where to look for modules and sub-modules
+ * @param[in]     revision  Revision, or NULL
+ * @param[in,out] yspec     Modules parse are added to this yangspec
+ * @retval        0         OK
+ * @retval       -1         Error
+ * @see yang_spec_parse_file
+ */
+int
+yang_spec_parse_module(clicon_handle h, 
+		       const char   *module, 
+		       const char   *revision, 
+		       yang_spec    *yspec)
+{
+    int         retval = -1;
+    int         modnr;       /* Existing number of modules */
+    char       *base = NULL;;
+
+    if (yspec == NULL){
+	clicon_err(OE_YANG, EINVAL, "yang spec is NULL");
+	goto done;
+    }
+    if (module == NULL){
+	clicon_err(OE_YANG, EINVAL, "yang module not set");
+	goto done;
+    }
+    /* Apply steps 2.. on new modules, ie ones after modnr. */
+    modnr = yspec->yp_len;
+    /* Do not load module if it already exists */
+    if (yang_find((yang_node*)yspec, Y_MODULE, module) != NULL)
+	goto ok;
+    if (yang_parse_module(h, module, revision, yspec) == NULL)
+	goto done;
+    if (yang_parse_post(h, yspec, modnr) < 0)
+	goto done;
  ok:
     retval = 0;
  done:
@@ -2425,6 +2444,132 @@ yang_parse(clicon_handle h,
     return retval;
 }
 
+/*! Parse yang specification and its dependencies recursively given filename
+ * @param[in]     h         clicon handle
+ * @param[in]     filename  Actual filename (including dir and revision)
+ * @param[in]     dir       Directory for sub-modules
+ * @param[in,out] yspec     Modules parse are added to this yangspec
+ * @retval        0         OK
+ * @retval       -1         Error
+ * @see yang_spec_parse_module for yang dir,module,revision instead of 
+ *       actual filename
+ * @see yang_spec_load_dir For loading all files in a directory
+ */
+int
+yang_spec_parse_file(clicon_handle h, 
+		     const char   *filename, 
+		     yang_spec    *yspec)
+{
+    int         retval = -1;
+    int         modnr;       /* Existing number of modules */
+    char       *base = NULL;;
+
+    /* Apply steps 2.. on new modules, ie ones after modnr. */
+    modnr = yspec->yp_len;
+    /* Find module, and do not load file if module already exists */
+    if (basename(filename) == NULL){
+	clicon_err(OE_YANG, errno, "No basename");
+	goto done;
+    }
+    if ((base = strdup(basename(filename))) == NULL){
+	clicon_err(OE_YANG, errno, "strdup");
+	goto done;
+    }
+    if (index(base, '@') != NULL)
+	*index(base, '@') = '\0';
+    if (yang_find((yang_node*)yspec, Y_MODULE, base) != NULL)
+	goto ok;
+    if (yang_parse_filename(filename, yspec) == NULL)
+	goto done;
+    if (yang_parse_post(h, yspec, modnr) < 0)
+	goto done;
+ ok:
+    retval = 0;
+ done:
+    if (base)
+	free(base);
+    return retval;
+}
+
+/*! Load all yang modules in directory
+ * @param[in]  h   Clicon handle
+ * @param[in]  dir Load all yang modules in this directory
+ * @param[in,out] yspec     Modules parse are added to this yangspec
+ * @retval        0         OK
+ * @retval       -1         Error
+ * @see yang_spec_parse_file
+ */
+int
+yang_spec_load_dir(clicon_handle h,
+		   char         *dir,
+		   yang_spec    *yspec)
+{
+    int            retval = -1;
+    int            ndp;
+    struct dirent *dp = NULL;
+    int            i;
+    char           filename[MAXPATHLEN];
+    char          *base = NULL; /* filename without dir */
+    char          *b;    
+    int            j;
+    int            modnr;
+    
+    /* Get plugin objects names from plugin directory */
+    if((ndp = clicon_file_dirent(dir, &dp, "(.yang)$", S_IFREG)) < 0)
+	goto done;
+    if (ndp == 0)
+	clicon_log(LOG_WARNING, "%s: No yang files found in %s",
+		   __FUNCTION__, dir);
+    /* Apply post steps on new modules, ie ones after modnr. */
+    modnr = yspec->yp_len;
+    /* Load all yang files in dir */
+    for (i = 0; i < ndp; i++) {
+	/* base = module name [+ @rev ] + .yang */
+	if (base)
+	    free(base);
+	if ((base = strdup(dp[i].d_name)) == NULL){
+	    clicon_err(OE_UNIX, errno, "strdup");
+	    goto done;
+	}
+	*rindex(base, '.') = '\0'; /* strip postfix .yang */
+	/* base = module name [+ @rev] 
+	 * if it hasnt @rev then prefer it (dont check other files w @rev)
+	 * Otherwise see if there is a newer
+	 */
+	if ((b = index(base, '@')) != NULL){
+	    *b = '\0';
+	    /* base = module name */
+
+	    /* Entries are sorted, see if later entry exists (include @), if so
+	     * skip this one and take last.
+	     * Assume file without @ is last
+	     */
+	    for (j = (i+1); j < ndp; j++)
+		if (strncmp(base, dp[j].d_name, strlen(base)) == 0)
+		    break;
+	    if (j<ndp){ /* exists later entry */
+		clicon_debug(1, "%s skip %s", __FUNCTION__, dp[i].d_name);
+		continue;
+	    }
+	}
+	snprintf(filename, MAXPATHLEN-1, "%s/%s", dir, dp[i].d_name);
+	/* Dont parse if already exists */
+	if (yang_find((yang_node*)yspec, Y_MODULE, base) != NULL ||
+	    yang_find((yang_node*)yspec, Y_SUBMODULE, base) != NULL)
+	    continue;
+	if (yang_parse_filename(filename, yspec) == NULL)
+	    goto done;
+    }
+    if (yang_parse_post(h, yspec, modnr) < 0)
+	goto done;
+    retval = 0;
+  done:
+    if (base)
+	free(base);
+    return retval;
+}
+
+
 /*! Apply a function call recursively on all yang-stmt s recursively
  *
  * Recursively traverse all yang-nodes in a parse-tree and apply fn(arg) for 
@@ -2835,121 +2980,6 @@ yang_config(yang_stmt *ys)
     return 1;
 }
 
-/*! Parse yang specification and its dependencies recursively given module
- * @param[in]     h         clicon handle
- * @param[in]     module    Module name, or absolute filename (including dir)
- * @param[in]     dir       Directory where to look for modules and sub-modules
- * @param[in]     revision  Revision, or NULL
- * @param[in,out] yspec     Modules parse are added to this yangspec
- * @retval        0         OK
- * @retval       -1         Error
- * @see yang_spec_parse_file
- */
-int
-yang_spec_parse_module(clicon_handle h,
-		       char         *module,
-		       char         *revision,
-		       yang_spec    *yspec)
-{
-    int retval = -1;
-    
-    if (yspec == NULL){
-	clicon_err(OE_YANG, EINVAL, "yang spec is NULL");
-	goto done;
-    }
-    if (module == NULL){
-	clicon_err(OE_YANG, EINVAL, "yang module not set");
-	goto done;
-    }
-    /* Sanity check - use yang_spec_parse_file instead */
-    if (strlen(module) && module[0] == '/'){
-	clicon_err(OE_YANG, EINVAL, "yang module illegal format");
-	goto done;
-    }
-    if (yang_parse(h, NULL, module, revision, yspec) < 0)
-	goto done;
-    retval = 0;
-  done:
-    return retval;
-}
-
-/*! Parse yang specification and its dependencies recursively given filename
- * @param[in]     h         clicon handle
- * @param[in]     filename  Actual filename (including dir and revision)
- * @param[in]     dir       Directory for sub-modules
- * @param[in,out] yspec     Modules parse are added to this yangspec
- * @retval        0         OK
- * @retval       -1         Error
- * @see yang_spec_parse_module for yang dir,module,revision instead of actual filename
- */
-int
-yang_spec_parse_file(clicon_handle h,
-		     char         *filename,
-		     yang_spec    *yspec)
-{
-    int retval = -1;
-    
-    if (yspec == NULL){
-	clicon_err(OE_YANG, EINVAL, "yang spec is NULL");
-	goto done;
-    }
-    if (yang_parse(h, filename, NULL, NULL, yspec) < 0)
-	goto done;
-    retval = 0;
-  done:
-    return retval;
-}
-
-/*! Load all yang modules in directory
- * @param[in]  h   Clicon handle
- * @param[in]  dir Load all yang modules in this directory
- * @param[in,out] yspec     Modules parse are added to this yangspec
- * @retval        0         OK
- * @retval       -1         Error
- */
-int
-yang_spec_load_dir(clicon_handle h,
-		   char         *dir,
-		   yang_spec    *yspec)
-{
-    int            retval = -1;
-    int            ndp;
-    struct dirent *dp = NULL;
-    int            i;
-    char           filename[MAXPATHLEN];
-    char          *base;
-    char          *b;
-    int            j;
-    int            len;
-    
-    /* Get plugin objects names from plugin directory */
-    if((ndp = clicon_file_dirent(dir, &dp, "(.yang)$", S_IFREG)) < 0)
-	goto done;
-    /* Load all yang files */
-    for (i = 0; i < ndp; i++) {
-	base = dp[i].d_name;
-	/* Entries are sorted, see if later entry exists (include @), if so skip 
-	 * this one and take last.
-	 */
-	if ((b = index(base, '@')) != NULL)
-	    len = b-base;
-	else
-	    len = strlen(base);
-	/* remove duplicates: there may be cornercases that dont work, eg
-	 * mix of revisions and not? */
-	for (j = (i+1); j < ndp; j++)
-	    if (strncmp(base, dp[j].d_name, len) == 0)
-		break;
-	if (j<ndp) /* exists later entry */
-	    continue;
-	snprintf(filename, MAXPATHLEN-1, "%s/%s", dir, dp[i].d_name);
-	if (yang_parse(h, filename, NULL, NULL, yspec) < 0)
-	    goto done;
-    }
-    retval = 0;
-  done:
-    return retval;
-}
 
 /*! Given a yang node, translate the argument string to a cv vector
  *
diff --git a/lib/src/clixon_yang_cardinality.c b/lib/src/clixon_yang_cardinality.c
index 638a077b..8d6d4fba 100644
--- a/lib/src/clixon_yang_cardinality.c
+++ b/lib/src/clixon_yang_cardinality.c
@@ -513,8 +513,12 @@ yang_cardinality(clicon_handle h,
 	    continue;
 	/* Find entry in yang cardinality table from parent/child keyword pair */
 	if ((yc = ycard_find(pk, ck, ycplist, 1)) == NULL){
-	    clicon_err(OE_YANG, 0, "%s: \"%s\" is child of \"%s\", but should not be",
-		       modname, yang_key2str(ck), yang_key2str(pk));
+	    clicon_err(OE_YANG, 0, "%s: \"%s\"(%s) is child of \"%s\"(%s), but should not be",
+		       modname,
+		       yang_key2str(ck),
+		       ys->ys_argument,
+		       yang_key2str(pk),
+		       yt->ys_argument);
 	    goto done;
 	}
     }
diff --git a/lib/src/clixon_yang_parse.l b/lib/src/clixon_yang_parse.l
index 79ff4eb3..a8e994da 100644
--- a/lib/src/clixon_yang_parse.l
+++ b/lib/src/clixon_yang_parse.l
@@ -103,9 +103,10 @@ identifier      [A-Za-z_][A-Za-z0-9_\-\.]*
 
 %%
  /* Common tokens */
-<KEYWORD,BOOLEAN,INTEGER,STRARG,ARGUMENT,STRING>[ \t]            
-<KEYWORD,STRING,UNKNOWN><<EOF>> { return MY_EOF; }
+<KEYWORD,BOOLEAN,INTEGER,STRARG,STRING,ARGUMENT,UNKNOWN>[ \t]            
+<KEYWORD,STRING,UNKNOWN,COMMENT2><<EOF>> { return MY_EOF; }
 <KEYWORD,BOOLEAN,INTEGER,STRARG,STRING,COMMENT1,UNKNOWN>\n   { _YY->yy_linenum++; }
+<KEYWORD,BOOLEAN,INTEGER,STRARG,STRING,COMMENT1,UNKNOWN>\r   
 <KEYWORD,STRING>"/*"    { _YY->yy_lex_state = YYSTATE; BEGIN(COMMENT1); }
 <KEYWORD,STRING>"//"    { _YY->yy_lex_state = YYSTATE; BEGIN(COMMENT2); }
 
@@ -194,7 +195,8 @@ identifier      [A-Za-z_][A-Za-z0-9_\-\.]*
 
 <UNKNOWN>:                { return *yytext; }
 <UNKNOWN>;                { BEGIN(KEYWORD); return *yytext; }
-<UNKNOWN>[ \t]            { return ' '; }
+<UNKNOWN>\"               { _YY->yy_lex_string_state =UNKNOWN; BEGIN(STRINGDQ); return *yytext; }
+<UNKNOWN>\{               { BEGIN(KEYWORD); return *yytext; }
 <UNKNOWN>.                { clixon_yang_parselval.string = strdup(yytext);
                             return CHAR; }
 
@@ -220,14 +222,14 @@ identifier      [A-Za-z_][A-Za-z0-9_\-\.]*
 
 <STRING>\{                { BEGIN(KEYWORD); return *yytext; }
 <STRING>;                 { BEGIN(KEYWORD); return *yytext; }
-<STRING>\"                { _YY->yy_lex_string_state =STRING; BEGIN(STRINGDQ); return DQ; }
+<STRING>\"                { _YY->yy_lex_string_state =STRING; BEGIN(STRINGDQ); return *yytext; }
 <STRING>\'                { _YY->yy_lex_string_state =STRING; BEGIN(STRINGSQ); return SQ; }
 <STRING>\+                { return *yytext; }
 <STRING>.                 { clixon_yang_parselval.string = strdup(yytext);
                             return CHAR;}
 
 <STRINGDQ>\\                { _YY->yy_lex_state = STRINGDQ; BEGIN(ESCAPE); }
-<STRINGDQ>\"                { BEGIN(_YY->yy_lex_string_state); return DQ; }
+<STRINGDQ>\"                { BEGIN(_YY->yy_lex_string_state); return *yytext; }
 <STRINGDQ>\n                { _YY->yy_linenum++; clixon_yang_parselval.string = strdup(yytext); return CHAR;}
 <STRINGDQ>.                 { clixon_yang_parselval.string = strdup(yytext);
                               return CHAR;}
diff --git a/lib/src/clixon_yang_parse.y b/lib/src/clixon_yang_parse.y
index 31fee4c8..6a9cce92 100644
--- a/lib/src/clixon_yang_parse.y
+++ b/lib/src/clixon_yang_parse.y
@@ -56,7 +56,6 @@
 }
 
 %token MY_EOF 
-%token DQ           /* Double quote: " */
 %token SQ           /* Single quote: ' */
 %token <string>   CHAR
 %token <string>   IDENTIFIER
@@ -70,7 +69,8 @@
 %type <string>    integer_value_str
 %type <string>    identifier_ref
 %type <string>    abs_schema_nodeid
-%type <string>    desc_schema_node_str
+%type <string>    desc_schema_nodeid_strs
+%type <string>    desc_schema_nodeid_str
 %type <string>    desc_schema_nodeid
 %type <string>    node_identifier
 %type <string>    identifier_str
@@ -365,19 +365,6 @@ file          : module_stmt MY_EOF
                        { clicon_debug(2,"file->submodule-stmt"); YYACCEPT; } 
               ;
 
-  /* For extensions */
-unknown_stmt  : ustring  ':' ustring ';'
-                 { char *id; if ((id=string_del_join($1, ":", $3)) == NULL) _YYERROR("unknown_stmt");
-		   if (ysp_add(_yy, Y_UNKNOWN, id, NULL) == NULL) _YYERROR("unknown_stmt"); 
-		   clicon_debug(2,"unknown-stmt -> ustring : ustring");
-	       }
-              | ustring  ':' ustring ' ' string ';'
-	        { char *id; if ((id=string_del_join($1, ":", $3)) == NULL) _YYERROR("unknwon_stmt");
-		   if (ysp_add(_yy, Y_UNKNOWN, id, $5) == NULL){ _YYERROR("unknwon_stmt"); }
-		   clicon_debug(2,"unknown-stmt -> ustring : ustring string");
-	       }
-	      ;
-
 /* module identifier-arg-str */
 module_stmt   : K_MODULE identifier_str 
                   { if ((_YY->yy_module = ysp_add_push(_yy, Y_MODULE, $2)) == NULL) _YYERROR("module_stmt");
@@ -591,15 +578,14 @@ revision_date_stmt : K_REVISION_DATE string stmtend  /* XXX date-arg-str */
 
 extension_stmt : K_EXTENSION identifier_str ';' 
 	       { if (ysp_add(_yy, Y_EXTENSION, $2, NULL) == NULL) _YYERROR("extension_stmt");
-                    clicon_debug(2,"extenstion-stmt -> EXTENSION id-arg-str ;"); }
+                    clicon_debug(2,"extenstion-stmt -> EXTENSION id-str ;"); }
               | K_EXTENSION identifier_str 
  	          { if (ysp_add_push(_yy, Y_EXTENSION, $2) == NULL) _YYERROR("extension_stmt"); }
 	       '{' extension_substmts '}' 
 	       { if (ystack_pop(_yy) < 0) _YYERROR("extension_stmt");
-                    clicon_debug(2,"extension-stmt -> FEATURE id-arg-str { extension-substmts }"); }
+                    clicon_debug(2,"extension-stmt -> EXTENSION id-str { extension-substmts }"); }
 	      ;
 
-
 /* extension substmts */
 extension_substmts : extension_substmts extension_substmt 
                   { clicon_debug(2,"extension-substmts -> extension-substmts extension-substmt"); }
@@ -615,10 +601,28 @@ extension_substmt : argument_stmt    { clicon_debug(2,"extension-substmt -> argu
               |                      { clicon_debug(2,"extension-substmt -> "); }
               ;
 
-argument_stmt  : K_ARGUMENT identifier_str ';'     { free($2); }
-               | K_ARGUMENT identifier_str '{' yin_element_stmt1 '}' { free($2); }
+argument_stmt  : K_ARGUMENT identifier_str ';'
+               { if (ysp_add(_yy, Y_ARGUMENT, $2, NULL) == NULL) _YYERROR("argument_stmt");
+			 clicon_debug(2,"argument-stmt -> ARGUMENT identifier ;"); }
+               | K_ARGUMENT identifier_str
+                       { if (ysp_add_push(_yy, Y_ARGUMENT, $2) == NULL) _YYERROR("argument_stmt"); }
+                '{' argument_substmts '}'
+                       { if (ystack_pop(_yy) < 0) _YYERROR("argument_stmt");
+	                 clicon_debug(2,"argument-stmt -> ARGUMENT { argument-substmts }"); }
                ;
 
+/* argument substmts */
+argument_substmts : argument_substmts argument_substmt 
+                      { clicon_debug(2,"argument-substmts -> argument-substmts argument-substmt"); }
+                  | argument_substmt 
+                      { clicon_debug(2,"argument-substmts -> argument-substmt"); }
+                  ;
+
+argument_substmt : yin_element_stmt1 { clicon_debug(2,"argument-substmt -> yin-element-stmt1");}
+                 | unknown_stmt   { clicon_debug(2,"argument-substmt -> unknown-stmt");}
+                 ;
+
+
 /* Example of optional rule, eg [yin-element-stmt] */
 yin_element_stmt1 : K_YIN_ELEMENT bool_str stmtend {free($2);}
                ;
@@ -752,6 +756,8 @@ type_body_stmt/* numerical-restrictions */
               | bit_stmt               { clicon_debug(2,"type-body-stmt -> bit-stmt"); }
               /* union-specification */
               | type_stmt              { clicon_debug(2,"type-body-stmt -> type-stmt"); }
+/* Cisco uses this (eg Cisco-IOS-XR-sysadmin-nto-misc-set-hostname.yang) but I dont see this is in the RFC */
+              | unknown_stmt           { clicon_debug(2,"type-body-stmt -> unknown-stmt");} 
               ;
 
 /* range-stmt */
@@ -1305,10 +1311,10 @@ uses_substmt  : when_stmt            { clicon_debug(2,"uses-substmt -> when-stmt
               ;
 
 /* refine-stmt = refine-keyword sep refine-arg-str */
-refine_stmt   : K_REFINE desc_schema_node_str ';' 
+refine_stmt   : K_REFINE desc_schema_nodeid_strs ';' 
 	       { if (ysp_add(_yy, Y_REFINE, $2, NULL) == NULL) _YYERROR("refine_stmt"); 
 			   clicon_debug(2,"refine-stmt -> REFINE id-arg-str ;"); }
-              | K_REFINE desc_schema_node_str
+              | K_REFINE desc_schema_nodeid_strs
                           { if (ysp_add_push(_yy, Y_REFINE, $2) == NULL) _YYERROR("refine_stmt"); }
 	       '{' refine_substmts '}' 
                            { if (ystack_pop(_yy) < 0) _YYERROR("refine_stmt");
@@ -1335,8 +1341,10 @@ refine_substmt  : if_feature_stmt     { clicon_debug(2,"refine-substmt -> if-fea
               |                 { clicon_debug(2,"refine-substmt -> "); }
               ;
 
-/* uses-augment-stmt = augment-keyword augment-arg-str */
-uses_augment_stmt : K_AUGMENT desc_schema_node_str
+/* uses-augment-stmt = augment-keyword augment-arg-str 
+uses_augment_stmt : K_AUGMENT desc_schema_nodeid_strs
+*/
+uses_augment_stmt : K_AUGMENT string
                       { if (ysp_add_push(_yy, Y_AUGMENT, $2) == NULL) _YYERROR("uses_augment_stmt"); }
                     '{' augment_substmts '}'
                       { if (ystack_pop(_yy) < 0) _YYERROR("uses_augment_stmt");
@@ -1345,6 +1353,7 @@ uses_augment_stmt : K_AUGMENT desc_schema_node_str
 		    
 /* augment-stmt = augment-keyword sep augment-arg-str 
  * XXX abs-schema-nodeid-str is too difficult, it needs the + semantics
+augment_stmt   : K_AUGMENT abs_schema_nodeid_strs
  */
 augment_stmt   : K_AUGMENT string
                     { if (ysp_add_push(_yy, Y_AUGMENT, $2) == NULL) _YYERROR("augment_stmt"); }
@@ -1418,6 +1427,7 @@ rpc_substmt   : if_feature_stmt  { clicon_debug(2,"rpc-substmt -> if-feature-stm
               | grouping_stmt    { clicon_debug(2,"rpc-substmt -> grouping-stmt"); }
               | input_stmt       { clicon_debug(2,"rpc-substmt -> input-stmt"); }
               | output_stmt      { clicon_debug(2,"rpc-substmt -> output-stmt"); }
+              | unknown_stmt     { clicon_debug(2,"rpc-substmt -> unknown-stmt");} 
               |                  { clicon_debug(2,"rpc-substmt -> "); }
               ;
 
@@ -1481,13 +1491,147 @@ deviation_substmts : deviation_substmts deviation_substmt
 
 deviation_substmt : description_stmt  { clicon_debug(2,"deviation-substmt -> description-stmt"); }
                   | reference_stmt  { clicon_debug(2,"deviation-substmt -> reference-stmt"); }
-                  | deviate_not_supported_stmt  { clicon_debug(2,"deviation-substmt -> deviate-not-supported-stmt"); }
+                  | deviate_stmt  { clicon_debug(2,"deviation-substmt -> deviate-stmt"); }
 		  ;
 
-deviate_not_supported_stmt : K_DEVIATE string stmtend
+/* RFC7950 differentiates between deviate-not-supported, deviate-add, 
+ * deviate-replave, and deviate-delete. Here all are bundled into a single
+ * deviate rule. For now, until "deviate" gets supported.
+ */
+deviate_stmt      : K_DEVIATE string ';'
 	                { if (ysp_add(_yy, Y_DEVIATE, $2, NULL) == NULL) _YYERROR("notification_stmt");
     			   clicon_debug(2,"deviate-not-supported-stmt -> DEVIATE string ;"); }
-                             ;
+                  | K_DEVIATE string
+                        { if (ysp_add_push(_yy, Y_DEVIATE, $2) == NULL) _YYERROR("deviate_stmt"); }
+	            '{' deviate_substmts '}' 
+                        { if (ystack_pop(_yy) < 0) _YYERROR("deviate_stmt");
+			     clicon_debug(2,"deviate-stmt -> DEVIATE string { deviate-substmts }"); }
+                   ;
+
+/* RFC7950 differentiates between deviate-not-supported, deviate-add, 
+ * deviate-replave, and deviate-delete. Here all are bundled into a single
+ * deviate-substmt rule. For now, until "deviate" gets supported.
+ */
+deviate_substmts     : deviate_substmts deviate_substmt 
+                         { clicon_debug(2,"deviate-substmts -> deviate-substmts deviate-substmt"); }
+                     | deviate_substmt 
+                         { clicon_debug(2,"deviate-substmts -> deviate-substmt"); }
+                     ;
+/* Bundled */
+deviate_substmt : type_stmt         { clicon_debug(2,"deviate-substmt -> type-stmt"); }
+                | units_stmt        { clicon_debug(2,"deviate-substmt -> units-stmt"); }
+                | must_stmt         { clicon_debug(2,"deviate-substmt -> must-stmt"); }
+                | unique_stmt       { clicon_debug(2,"deviate-substmt -> unique-stmt"); }
+                | default_stmt      { clicon_debug(2,"deviate-substmt -> default-stmt"); }
+                | config_stmt       { clicon_debug(2,"deviate-substmt -> config-stmt"); }
+                | mandatory_stmt    { clicon_debug(2,"deviate-substmt -> mandatory-stmt"); }
+                | min_elements_stmt { clicon_debug(2,"deviate-substmt -> min-elements-stmt"); }
+                | max_elements_stmt { clicon_debug(2,"deviate-substmt -> max-elements-stmt"); }
+                |                   { clicon_debug(2,"deviate-substmt -> "); }
+                ;
+
+
+  /* For extensions */
+unknown_stmt  : ustring  ':' ustring ';'
+                 { char *id; if ((id=string_del_join($1, ":", $3)) == NULL) _YYERROR("unknown_stmt");
+		   if (ysp_add(_yy, Y_UNKNOWN, id, NULL) == NULL) _YYERROR("unknown_stmt"); 
+		   clicon_debug(2,"unknown-stmt -> ustring : ustring");
+	       }
+              | ustring  ':' ustring string ';'
+	        { char *id; if ((id=string_del_join($1, ":", $3)) == NULL) _YYERROR("unknown_stmt");
+		   if (ysp_add(_yy, Y_UNKNOWN, id, $4) == NULL){ _YYERROR("unknwon_stmt"); }
+		   clicon_debug(2,"unknown-stmt -> ustring : ustring string");
+	       }
+              | ustring  ':' ustring
+                       { if (ysp_add_push(_yy, Y_UNKNOWN, NULL) == NULL) _YYERROR("unknown_stmt"); }
+	         '{' yang_stmts '}'
+	               { if (ystack_pop(_yy) < 0) _YYERROR("unknown_stmt");
+			 clicon_debug(2,"unknown-stmt -> ustring : ustring { yang-stmts }"); }
+              | ustring  ':' ustring string
+                       { if (ysp_add_push(_yy, Y_UNKNOWN, NULL) == NULL) _YYERROR("unknown_stmt"); }
+	         '{' yang_stmts '}'
+	               { if (ystack_pop(_yy) < 0) _YYERROR("unknown_stmt");
+			 clicon_debug(2,"unknown-stmt -> ustring : ustring string { yang-stmts }"); }
+	      ;
+
+yang_stmts    : yang_stmts yang_stmt { clicon_debug(2,"yang-stmts -> yang-stmts yang-stmt"); } 
+              | yang_stmt            { clicon_debug(2,"yang-stmts -> yang-stmt");}
+              ;
+
+yang_stmt     : action_stmt          { clicon_debug(2,"yang-stmt -> action-stmt");}
+              | anydata_stmt         { clicon_debug(2,"yang-stmt -> anydata-stmt");}
+              | anyxml_stmt          { clicon_debug(2,"yang-stmt -> anyxml-stmt");}
+              | argument_stmt        { clicon_debug(2,"yang-stmt -> argument-stmt");}
+              | augment_stmt         { clicon_debug(2,"yang-stmt -> augment-stmt");}
+              | base_stmt            { clicon_debug(2,"yang-stmt -> base-stmt");}
+              | bit_stmt             { clicon_debug(2,"yang-stmt -> bit-stmt");}
+              | case_stmt            { clicon_debug(2,"yang-stmt -> case-stmt");}
+              | choice_stmt          { clicon_debug(2,"yang-stmt -> choice-stmt");}
+              | config_stmt          { clicon_debug(2,"yang-stmt -> config-stmt");}
+              | contact_stmt         { clicon_debug(2,"yang-stmt -> contact-stmt");}
+              | container_stmt       { clicon_debug(2,"yang-stmt -> container-stmt");}
+              | default_stmt         { clicon_debug(2,"yang-stmt -> default-stmt");}
+              | description_stmt     { clicon_debug(2,"yang-stmt -> description-stmt");}
+              | deviate_stmt         { clicon_debug(2,"yang-stmt -> deviate-stmt");}
+/* deviate is not yet implemented, the above may be replaced by the following lines
+              | deviate_add_stmt     { clicon_debug(2,"yang-stmt -> deviate-add-stmt");}
+              | deviate_delete_stmt  { clicon_debug(2,"yang-stmt -> deviate-add-stmt");}
+              | deviate_replace_stmt { clicon_debug(2,"yang-stmt -> deviate-add-stmt");}
+*/
+              | deviation_stmt       { clicon_debug(2,"yang-stmt -> deviation-stmt");}
+              | enum_stmt            { clicon_debug(2,"yang-stmt -> enum-stmt");}
+              | error_app_tag_stmt   { clicon_debug(2,"yang-stmt -> error-app-tag-stmt");}
+              | error_message_stmt   { clicon_debug(2,"yang-stmt -> error-message-stmt");}
+              | extension_stmt       { clicon_debug(2,"yang-stmt -> extension-stmt");}
+              | feature_stmt         { clicon_debug(2,"yang-stmt -> feature-stmt");}
+              | fraction_digits_stmt { clicon_debug(2,"yang-stmt -> fraction-digits-stmt");}
+              | grouping_stmt        { clicon_debug(2,"yang-stmt -> grouping-stmt");}
+              | identity_stmt        { clicon_debug(2,"yang-stmt -> identity-stmt");}
+              | if_feature_stmt      { clicon_debug(2,"yang-stmt -> if-feature-stmt");}
+              | import_stmt          { clicon_debug(2,"yang-stmt -> import-stmt");}
+              | include_stmt         { clicon_debug(2,"yang-stmt -> include-stmt");}
+              | input_stmt           { clicon_debug(2,"yang-stmt -> input-stmt");}
+              | key_stmt             { clicon_debug(2,"yang-stmt -> key-stmt");}
+              | leaf_list_stmt       { clicon_debug(2,"yang-stmt -> leaf-list-stmt");}
+              | leaf_stmt            { clicon_debug(2,"yang-stmt -> leaf-stmt");}
+              | length_stmt          { clicon_debug(2,"yang-stmt -> length-stmt");}
+              | list_stmt            { clicon_debug(2,"yang-stmt -> list-stmt");}
+              | mandatory_stmt       { clicon_debug(2,"yang-stmt -> list-stmt");}
+              | max_elements_stmt    { clicon_debug(2,"yang-stmt -> list-stmt");}
+              | min_elements_stmt    { clicon_debug(2,"yang-stmt -> list-stmt");}
+              | modifier_stmt        { clicon_debug(2,"yang-stmt -> list-stmt");}
+              | module_stmt          { clicon_debug(2,"yang-stmt -> list-stmt");}
+              | must_stmt            { clicon_debug(2,"yang-stmt -> list-stmt");}
+              | namespace_stmt       { clicon_debug(2,"yang-stmt -> list-stmt");}
+              | notification_stmt    { clicon_debug(2,"yang-stmt -> notification-stmt");}
+              | ordered_by_stmt      { clicon_debug(2,"yang-stmt -> list-stmt");}
+              | organization_stmt    { clicon_debug(2,"yang-stmt -> list-stmt");}
+              | output_stmt          { clicon_debug(2,"yang-stmt -> list-stmt");}
+              | path_stmt            { clicon_debug(2,"yang-stmt -> list-stmt");}
+              | pattern_stmt         { clicon_debug(2,"yang-stmt -> list-stmt");}
+              | position_stmt        { clicon_debug(2,"yang-stmt -> list-stmt");}
+              | prefix_stmt          { clicon_debug(2,"yang-stmt -> list-stmt");}
+              | presence_stmt        { clicon_debug(2,"yang-stmt -> list-stmt");}
+              | range_stmt           { clicon_debug(2,"yang-stmt -> list-stmt");}
+              | reference_stmt       { clicon_debug(2,"yang-stmt -> list-stmt");}
+              | refine_stmt          { clicon_debug(2,"yang-stmt -> list-stmt");}
+              | require_instance_stmt { clicon_debug(2,"yang-stmt -> list-stmt");}
+              | revision_date_stmt   { clicon_debug(2,"yang-stmt -> list-stmt");}
+              | revision_stmt        { clicon_debug(2,"yang-stmt -> list-stmt");}
+              | rpc_stmt             { clicon_debug(2,"yang-stmt -> rpc-stmt");}
+              | status_stmt          { clicon_debug(2,"yang-stmt -> list-stmt");}
+              | submodule_stmt       { clicon_debug(2,"yang-stmt -> list-stmt");}
+              | typedef_stmt         { clicon_debug(2,"yang-stmt -> typedef-stmt");}
+              | type_stmt            { clicon_debug(2,"yang-stmt -> list-stmt");}
+              | unique_stmt          { clicon_debug(2,"yang-stmt -> list-stmt");}
+              | units_stmt           { clicon_debug(2,"yang-stmt -> list-stmt");}
+              | uses_augment_stmt    { clicon_debug(2,"yang-stmt -> list-stmt");}
+              | uses_stmt            { clicon_debug(2,"yang-stmt -> list-stmt");}
+              | value_stmt           { clicon_debug(2,"yang-stmt -> list-stmt");}
+              | when_stmt            { clicon_debug(2,"yang-stmt -> list-stmt");}
+              | yang_version_stmt    { clicon_debug(2,"yang-stmt -> list-stmt");}
+/*              | yin_element_stmt     { clicon_debug(2,"yang-stmt -> list-stmt");} */
+              ;
 
 /* body */
 body_stmts    : body_stmts body_stmt { clicon_debug(2,"body-stmts -> body-stmts body-stmt"); } 
@@ -1571,8 +1715,8 @@ qstrings      : qstrings '+' qstring
                      { $$=$1; clicon_debug(2,"qstrings-> qstring"); } 
               ;
 
-qstring        : DQ ustring DQ  { $$=$2; clicon_debug(2,"string-> \" ustring \"");}
-               | DQ DQ  { $$=strdup(""); clicon_debug(2,"string-> \"  \"");} 
+qstring        : '"' ustring '"'  { $$=$2; clicon_debug(2,"string-> \" ustring \"");}
+               | '"' '"'  { $$=strdup(""); clicon_debug(2,"string-> \"  \"");} 
                | SQ ustring SQ  { $$=$2; clicon_debug(2,"string-> ' ustring '"); }
   ;
 
@@ -1596,12 +1740,25 @@ abs_schema_nodeid : abs_schema_nodeid '/' node_identifier
 		     clicon_debug(2,"absolute-schema-nodeid -> / node-identifier"); }
               ;
 
-desc_schema_node_str : desc_schema_nodeid
-                         { $$=$1; clicon_debug(2,"descendant-schema-node-str -> descendant-node"); }
+desc_schema_nodeid_strs : desc_schema_nodeid_strs '+' desc_schema_nodeid_str
+                     {
+			 int len = strlen($1);
+			 $$ = realloc($1, len + strlen($3) + 1); 
+			 sprintf($$+len, "%s", $3);
+			 free($3); 
+			 clicon_debug(2,"desc-schema-nodeid-strs-> desc-schema-nodeid-strs + desc-schema-nodeid-str");
+		     }
+                      | desc_schema_nodeid_str
+                           { $$=$1; clicon_debug(2,"desc-schema-nodeid-strs-> desc-schema-nodeid-str"); }
+                      ;
+
+desc_schema_nodeid_str : desc_schema_nodeid
+                         { $$=$1; clicon_debug(2,"descendant-schema-nodeid-str -> descendant-schema-nodeid"); }
                      | '"' desc_schema_nodeid '"'
-                         { $$=$2; clicon_debug(2,"descendant-schema-node-str -> descendant-node"); }
+                         { $$=$2; clicon_debug(2,"descendant-schema-nodeid-str -> descendant-schema-nodeid"); }
                      ;
 
+/* descendant-schema-nodeid */
 desc_schema_nodeid : node_identifier
                      { $$= $1; clicon_debug(2,"descendant-schema-nodeid -> node_identifier"); }
                    | node_identifier abs_schema_nodeid
diff --git a/lib/src/clixon_yang_type.c b/lib/src/clixon_yang_type.c
index 4ba24fe2..56b16842 100644
--- a/lib/src/clixon_yang_type.c
+++ b/lib/src/clixon_yang_type.c
@@ -220,7 +220,8 @@ ys_resolve_type(yang_stmt *ys,
     /* Recursively resolve ys -> resolve with restrictions(options, etc) 
      * Note that the resolved type could be ys itself.
      */
-    if (yang_type_resolve((yang_stmt*)ys->ys_parent, ys, &resolved,
+    if (yang_type_resolve((yang_stmt*)ys->ys_parent, (yang_stmt*)ys->ys_parent,
+			  ys, &resolved,
 			  &options, &cvv, &pattern, &fraction) < 0)
 	goto done;
 
@@ -328,7 +329,7 @@ cv2yang_type(enum cv_type cv_type)
  * to find special cligen types such as ipv4addr.
  * not true yang types
  * @param[in]  origtype Name of original type
- * @param[in]  restype  Resolved type. may be null, in that case origtype is used
+ * @param[in]  restype  Resolved type. May be null, in that case origtype is used
  * @param[out] cvtype   Translation from resolved type 
  * @note Thereis a kludge for handling direct translations of native cligen types
  */
@@ -343,7 +344,7 @@ clicon_type2cv(char         *origtype,
     if (restype != NULL){ 
 	yang2cv_type(restype, cvtype);
 	if (*cvtype == CGV_ERR){
-	    clicon_err(OE_DB, 0, "\"%s\" type not translated", restype);
+	    clicon_err(OE_YANG, EINVAL, "\"%s\" type not translated", restype);
 	    goto done;
 	}
     }
@@ -354,7 +355,7 @@ clicon_type2cv(char         *origtype,
 	 */
 	yang2cv_type(origtype, cvtype);
 	if (*cvtype == CGV_ERR){
-	    clicon_err(OE_DB, 0, "\"%s\": type not resolved", origtype);
+	    clicon_err(OE_YANG, EINVAL, "\"%s\": type not resolved", origtype);
 	    goto done;
 	}
     }
@@ -601,7 +602,7 @@ ys_cv_validate_union_one(yang_stmt *ys,
     enum cv_type cvtype;
     cg_var      *cvt=NULL;
 
-    if (yang_type_resolve(ys, yt, &yrt, &options, &cvv, &pattern,
+    if (yang_type_resolve(ys, ys, yt, &yrt, &options, &cvv, &pattern,
 			  &fraction) < 0)
 	goto done;
     restype = yrt?yrt->ys_argument:NULL;
@@ -888,7 +889,8 @@ resolve_restrictions(yang_stmt   *yrange,
 }
 
 /*! Recursively resolve a yang type to built-in type with optional restrictions
- * @param[in]  ys       (original) type yang-stmt where the current search is based
+ * @param[in]  yorig    (original) type yang-stmt where original search is based
+ * @param[in]  ys       (transitive) yang-stmt where current search is based
  * @param[in]  ytype    yang-stmt object containing currently resolving type
  * @param[out] yrestype resolved type. return built-in type or NULL. mandatory
  * @param[out] options  pointer to flags field of optional values. optional
@@ -906,7 +908,8 @@ resolve_restrictions(yang_stmt   *yrange,
  * Note also that for all pointer arguments, if NULL is given, no value is assigned.
  */
 int 
-yang_type_resolve(yang_stmt   *ys, 
+yang_type_resolve(yang_stmt   *yorig,
+		  yang_stmt   *ys, 
 		  yang_stmt   *ytype, 
 		  yang_stmt  **yrestype, 
 		  int         *options, 
@@ -938,6 +941,7 @@ yang_type_resolve(yang_stmt   *ys,
 	    goto done;
 	goto ok;
     }
+    /* Resolving type restrictions */
     yrange    = yang_find((yang_node*)ytype, Y_RANGE, NULL);
     ylength   = yang_find((yang_node*)ytype, Y_LENGTH, NULL);
     ypattern  = yang_find((yang_node*)ytype, Y_PATTERN, NULL);
@@ -955,11 +959,12 @@ yang_type_resolve(yang_stmt   *ys,
     if (prefix){ /* Go to top and find import that matches */
 	if ((yrmod = yang_find_module_by_prefix(ytype, prefix)) == NULL){
 	    clicon_err(OE_DB, 0, "Type not resolved: \"%s:%s\" in module %s",
-		       prefix, type, ys_module(ys)->ys_argument);
+		       prefix, type, ys_module(yorig)->ys_argument);
 	    goto done;
 	}
 	if ((rytypedef = yang_find((yang_node*)yrmod, Y_TYPEDEF, type)) == NULL)
 	    goto ok; /* unresolved */
+	ys = rytypedef;
     }
     else
 	while (1){
@@ -984,7 +989,7 @@ yang_type_resolve(yang_stmt   *ys,
 	    goto done;
 	}
 	/* recursively resolve this new type */
-	if (yang_type_resolve(ys, rytype, yrestype, 
+	if (yang_type_resolve(yorig, ys, rytype, yrestype, 
 			      options, cvv, pattern, fraction) < 0)
 	    goto done;
 	/* overwrites the resolved if any */
@@ -1060,7 +1065,7 @@ yang_type_get(yang_stmt    *ys,
     type = yarg_id(ytype);
     if (origtype)
 	*origtype = type;
-    if (yang_type_resolve(ys, ytype, yrestype, 
+    if (yang_type_resolve(ys, ys, ytype, yrestype, 
 			  options, cvv, pattern, fraction) < 0)
 	goto done;
     clicon_debug(3, "%s: %s %s->%s", __FUNCTION__, ys->ys_argument, type, 
diff --git a/test/lib.sh b/test/lib.sh
index be102a62..ce980ffa 100755
--- a/test/lib.sh
+++ b/test/lib.sh
@@ -4,6 +4,10 @@
 
 #set -e
 
+if [ -x ./site.sh ]; then
+    . ./site.sh
+fi
+
 testnr=0
 testname=
 
diff --git a/test/test_openconfig.sh b/test/test_openconfig.sh
index f5f56bcf..b9a4f680 100755
--- a/test/test_openconfig.sh
+++ b/test/test_openconfig.sh
@@ -1,10 +1,11 @@
 #!/bin/bash
-# Parse yang openconfig tests
-# Note that the openconfig test suites are patched to counter CLixon issues as follows:
-# - release/models/mpls/openconfig-mpls-te.yang
+# 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/60
+# - Env variable YANGMODELS should point to checkout place. (define it in site.sh for example)
 
-# Yang specifics: multi-keys and empty type
 APPNAME=example
 
 # include err() and new() functions and creates $dir
diff --git a/test/test_yangmodels.sh b/test/test_yangmodels.sh
new file mode 100755
index 00000000..92cc45a0
--- /dev/null
+++ b/test/test_yangmodels.sh
@@ -0,0 +1,91 @@
+#!/bin/bash
+# Parse yangmodels from https://github.com/YangModels/yang
+# Notes:
+# - Env variable YANGMODELS should point to checkout place. (define it in site.sh for example)
+# - Only cisco/nx/9.2-2 # Many other versions
+# - Only cisco/xe/1631  # Many other versions
+# - Only cisco/xr/530   # Many other versions
+# - Only juniper/18.2/18.2R/junos # Many other versions and platoforms
+
+# These are the test scripts:
+#./experimental/ieee/check.sh
+#./standard/ieee/check.sh
+#./standard/ietf/check.sh
+#./vendor/cisco/xr/check.sh
+#./vendor/cisco/check.sh
+#./vendor/cisco/xe/check.sh
+#./vendor/cisco/nx/check.sh
+
+# Yang specifics: multi-keys and empty type
+APPNAME=example
+
+# include err() and new() functions and creates $dir
+. ./lib.sh
+
+cfg=$dir/conf_yang.xml
+fyang=$dir/test.yang
+
+if [ ! -d "$YANGMODELS" ]; then
+    err "Hmm Yangmodels dir does not seem to exist, try git clone https://github.com/YangModels/yang?"
+fi
+
+# Experimental IEEE
+cat <<EOF > $cfg
+<config>
+  <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
+  <CLICON_YANG_DIR>$YANGMODELS/standard/ietf/RFC</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$YANGMODELS/standard/ieee/draft</CLICON_YANG_DIR> 
+  <CLICON_YANG_DIR>$YANGMODELS/standard/ieee/802.1/draft</CLICON_YANG_DIR> 
+  <CLICON_YANG_DIR>/usr/local/share/clixon</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_CLI_GENMODEL_COMPLETION>1</CLICON_CLI_GENMODEL_COMPLETION>
+  <CLICON_XMLDB_DIR>/usr/local/var/$APPNAME</CLICON_XMLDB_DIR>
+  <CLICON_XMLDB_PLUGIN>/usr/local/lib/xmldb/text.so</CLICON_XMLDB_PLUGIN>
+  <CLICON_MODULE_LIBRARY_RFC7895>true</CLICON_MODULE_LIBRARY_RFC7895>
+</config>
+EOF
+
+new "yangmodels parse: -f $cfg"
+
+new "yangmodel Experimental IEEE 802.1: $YANGMODELS/experimental/ieee/802.1"
+expectfn "$clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/experimental/ieee/802.1 -o CLICON_YANG_DIR=$YANGMODELS/experimental/ieee/1588 show version" 0 "3."
+
+# experimental 802.3 dir is empty
+#new "yangmodel Experimental IEEE 802.3: $YANGMODELS/experimental/ieee/802.3"
+#expectfn "$clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/experimental/ieee/802.3 show version" 0 "3."
+
+new "yangmodel Experimental IEEE 1588: $YANGMODELS/experimental/ieee/1588"
+expectfn "$clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/experimental/ieee/1588 show version" 0 "3."
+
+# Standard IEEE
+new "yangmodel Standard IEEE 802.1: $YANGMODELS/standard/ieee/802.1/draft"
+expectfn "$clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/standard/ieee/802.1/draft show version" 0 "3."
+
+new "yangmodel Standard IEEE 802.3: $YANGMODELS/standard/ieee/802.3/draft"
+expectfn "$clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/standard/ieee/802.3/draft show version" 0 "3."
+
+# Standard IETF
+new "yangmodel Standard IETF: $YANGMODELS/standard/ietf/RFC"
+expectfn "$clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/standard/ietf/RFC show version" 0 "3."
+
+if false; then
+# vendor/cisco/xr
+new "yangmodel vendor cisco xr 623: $YANGMODELS/vendor/cisco/xr/623"
+expectfn "$clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/vendor/cisco/xr/623 show version" 0 "3."
+
+new "yangmodel vendor cisco xr 632: $YANGMODELS/vendor/cisco/xr/632"
+expectfn "$clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/vendor/cisco/xr/632 show version" 0 "3."
+
+new "yangmodel vendor cisco xr 623: $YANGMODELS/vendor/cisco/xr/642"
+expectfn "$clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/vendor/cisco/xr/642 show version" 0 "3."
+
+new "yangmodel vendor cisco xr 651: $YANGMODELS/vendor/cisco/xr/651"
+expectfn "$clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/vendor/cisco/xr/651 show version" 0 "3."
+fi
+
+rm -rf $dir
+
diff --git a/util/Makefile.in b/util/Makefile.in
index 657cd3db..9d4cebc0 100644
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -100,6 +100,9 @@ distclean: clean
 	rm -f Makefile *~ .depend
 
 install: 
+#	install -d -m 0755 $(DESTDIR)$(bindir)
+#	install -m 0755 $(INSTALLFLAGS) $(APPS) $(DESTDIR)$(bindir)
+
 
 install-include:
 
diff --git a/util/clixon_util_yang.c b/util/clixon_util_yang.c
index 9f3b0e15..1be09377 100644
--- a/util/clixon_util_yang.c
+++ b/util/clixon_util_yang.c
@@ -68,7 +68,7 @@
 static int
 usage(char *argv0)
 {
-    fprintf(stderr, "usage:%s [options]\n"
+    fprintf(stderr, "usage:%s [options] # input yang spec on stdin\n"
 	    "where options are\n"
             "\t-h \t\tHelp\n"
     	    "\t-D <level> \tDebug\n"

From f48c8f45c6e8b0a5ad76db59bbbbb3ebf095cc06 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Fri, 11 Jan 2019 17:30:08 +0100
Subject: [PATCH 30/72] * Date-and-time type now properly uses ISO 8601 UTC
 timezone designators. * Renamed yang file
 `ietf-netconf-notification@2008-07-01.yang` to `clixon-rfc5277`. * Cligen
 uses posix regex while yang uses XSD. It differs in some aspects. A
 translator function has been added for `\d` -> `[0-9]` translation, there may
 be more. * [ietf-netconf-notification@2008-07-01.yang validation problem
 #62](https://github.com/clicon/clixon/issues/62)

---
 CHANGELOG.md                                  |  8 +++
 apps/backend/backend_client.c                 |  2 +-
 apps/backend/backend_main.c                   |  2 +-
 apps/cli/cli_generate.c                       | 14 ++++--
 apps/restconf/restconf_main.c                 |  2 +-
 lib/clixon/clixon_string.h                    |  1 +
 lib/clixon/clixon_yang_type.h                 |  2 +-
 lib/src/clixon_netconf_lib.c                  |  2 +-
 lib/src/clixon_stream.c                       |  4 +-
 lib/src/clixon_string.c                       | 45 +++++++++++++++++
 lib/src/clixon_yang.c                         |  4 +-
 lib/src/clixon_yang_type.c                    | 50 ++++++-------------
 test/test_stream.sh                           | 15 +++---
 util/clixon_util_stream.c                     |  4 +-
 yang/Makefile.in                              |  2 +-
 ...01.yang => clixon-rfc5277@2008-07-01.yang} | 11 ++--
 16 files changed, 105 insertions(+), 63 deletions(-)
 rename yang/{ietf-netconf-notification@2008-07-01.yang => clixon-rfc5277@2008-07-01.yang} (95%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1605ed1f..dd5694ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -85,6 +85,12 @@
   * Any config option from file can be overrided by giving them on command-line.
 	
 ### API changes on existing features (you may need to change your code)
+* Date-and-time type now properly uses ISO 8601 UTC timezone designators.
+  * Eg 2008-09-21T18:57:21.003456 is changed to 2008-09-21T18:57:21.003456Z
+* Renamed yang file `ietf-netconf-notification@2008-07-01.yang` to `clixon-rfc5277`.
+  * Fixed validation problems, see [https://github.com/clicon/clixon/issues/62]
+  * Name confusion, the file is manually constructed from the rfc.
+  * Changed prefix to `ncevent`
 * Stricter YANG choice validation leads to enforcement of structures like: `choice c{ mandatory true; leaf x` statements. `x` was not previously enforced.
 * Many hand-crafted validation messages have been removed and replaced with generic validations, which may lead to changed rpc-error messages.
 * CLICON_XML_SORT option (in clixon-config.yang) has been removed and set to true permanently. Unsorted XML lists leads to slower performance and old obsolete code can be removed.
@@ -101,6 +107,7 @@
   * For backward compatibility, define CLICON_CLI_MODEL_TREENAME_PATCH in clixon_custom.h
 
 ### Minor changes
+* Cligen uses posix regex while yang uses XSD. It differs in some aspects. A translator function has been added for `\d` -> `[0-9]` translation, there may be more.
 * Added new clixon-lib yang module for internal netconf protocol. Currently only extends the standard with a debug RPC.
 * Added three-valued return values for several validate functions where -1 is fatal error, 0 is validation failed and 1 is validation OK.
   * This includes: `xmldb_put`, `xml_yang_validate_all`, `xml_yang_validate_add`, `xml_yang_validate_rpc`, `api_path2xml`, `api_path2xpath`
@@ -118,6 +125,7 @@
   * <!DOCTYPE (ie DTD) is not supported.
 
 ### Corrected Bugs
+* [ietf-netconf-notification@2008-07-01.yang validation problem #62](https://github.com/clicon/clixon/issues/62)
 * Ignore CR(\r) in yang files for DOS files
 * Keyword "min" (not only "max") can be used in built-in types "range" and "length" statements.
 * Support for empty yang string added, eg `default "";`
diff --git a/apps/backend/backend_client.c b/apps/backend/backend_client.c
index 2bbfbf85..f8766206 100644
--- a/apps/backend/backend_client.c
+++ b/apps/backend/backend_client.c
@@ -310,7 +310,7 @@ client_statedata(clicon_handle h,
 	goto done;
     }    
     if (clicon_option_bool(h, "CLICON_STREAM_DISCOVERY_RFC5277"))
-	if ((retval = client_get_streams(h, yspec, xpath, "ietf-netconf-notification", "netconf", xret)) != 0)
+	if ((retval = client_get_streams(h, yspec, xpath, "clixon-rfc5277", "netconf", xret)) != 0)
 	    goto done;
     if (clicon_option_bool(h, "CLICON_STREAM_DISCOVERY_RFC8040"))
 	if ((retval = client_get_streams(h, yspec, xpath, "ietf-restconf-monitoring", "restconf-state", xret)) != 0)
diff --git a/apps/backend/backend_main.c b/apps/backend/backend_main.c
index b7b0bd7e..5fbfd6e8 100644
--- a/apps/backend/backend_main.c
+++ b/apps/backend/backend_main.c
@@ -830,7 +830,7 @@ main(int    argc,
 	 goto done;
      /* Load yang Netconf stream discovery */
      if (clicon_option_bool(h, "CLICON_STREAM_DISCOVERY_RFC5277") &&
-	 yang_spec_parse_module(h, "ietf-netconf-notification", NULL, yspec)< 0)
+	 yang_spec_parse_module(h, "clixon-rfc5277", NULL, yspec)< 0)
 	 goto done;
     /* Set options: database dir and yangspec (could be hidden in connect?)*/
     if (xmldb_setopt(h, "dbdir", clicon_xmldb_dir(h)) < 0)
diff --git a/apps/cli/cli_generate.c b/apps/cli/cli_generate.c
index df45bfba..70c126bd 100644
--- a/apps/cli/cli_generate.c
+++ b/apps/cli/cli_generate.c
@@ -278,8 +278,14 @@ yang2cli_var_sub(clicon_handle h,
 	    }
 	}
     }
-    if (options & YANG_OPTIONS_PATTERN)
-	cprintf(cb, " regexp:\"%s\"", pattern);
+    if (options & YANG_OPTIONS_PATTERN){
+	char *posix = NULL;
+	if (regexp_xsd2posix(pattern, &posix) < 0)
+	    goto done;
+	cprintf(cb, " regexp:\"%s\"", posix);
+	if (posix)
+	    free(posix);
+    }
     cprintf(cb, ">");
     if (helptext)
 	cprintf(cb, "(\"%s\")", helptext);
@@ -329,7 +335,7 @@ yang2cli_var_union_one(clicon_handle h,
 	    goto done;
     }
     else {
-	if (clicon_type2cv(origtype, restype, &cvtype) < 0)
+	if (clicon_type2cv(origtype, restype, ys, &cvtype) < 0)
 	    goto done;
 	if ((retval = yang2cli_var_sub(h, ys, ytype, cb, helptext, cvtype, 
 				       options, cvv, pattern, fraction_digits)) < 0)
@@ -417,7 +423,7 @@ yang2cli_var(clicon_handle h,
 	retval = 0;
 	goto done;
     }
-    if (clicon_type2cv(origtype, restype, &cvtype) < 0)
+    if (clicon_type2cv(origtype, restype, ys, &cvtype) < 0)
 	goto done;
     /* Note restype can be NULL here for example with unresolved hardcoded uuid */
     if (restype && strcmp(restype, "union") == 0){ 
diff --git a/apps/restconf/restconf_main.c b/apps/restconf/restconf_main.c
index 0e33e5b1..c92a2ff1 100644
--- a/apps/restconf/restconf_main.c
+++ b/apps/restconf/restconf_main.c
@@ -666,7 +666,7 @@ main(int    argc,
 	 yang_spec_parse_module(h, "ietf-restconf-monitoring", NULL, yspec)< 0)
 	 goto done;
      if (clicon_option_bool(h, "CLICON_STREAM_DISCOVERY_RFC5277") &&
-	 yang_spec_parse_module(h, "ietf-netconf-notification", NULL, yspec)< 0)
+	 yang_spec_parse_module(h, "clixon-rfc5277", NULL, yspec)< 0)
 	 goto done;
     /* Call start function in all plugins before we go interactive 
        Pass all args after the standard options to plugin_start
diff --git a/lib/clixon/clixon_string.h b/lib/clixon/clixon_string.h
index 5895401d..f78ddbc9 100644
--- a/lib/clixon/clixon_string.h
+++ b/lib/clixon/clixon_string.h
@@ -88,6 +88,7 @@ const char *clicon_int2str(const map_str2int *mstab, int i);
 int clicon_str2int(const map_str2int *mstab, char *str);
 int nodeid_split(char *nodeid,	char **prefix, char **id);
 char *clixon_trim(char *str);
+int regexp_xsd2posix(char *xsd, char **posix);
 #ifndef HAVE_STRNDUP
 char *clicon_strndup (const char *, size_t);
 #endif /* ! HAVE_STRNDUP */
diff --git a/lib/clixon/clixon_yang_type.h b/lib/clixon/clixon_yang_type.h
index c023f374..2e859e47 100644
--- a/lib/clixon/clixon_yang_type.h
+++ b/lib/clixon/clixon_yang_type.h
@@ -67,7 +67,7 @@ int        yang2cv_type(char *ytype, enum cv_type *cv_type);
 char      *cv2yang_type(enum cv_type cv_type);
 yang_stmt *yang_find_identity(yang_stmt *ys, char *identity);
 int        ys_cv_validate(cg_var *cv, yang_stmt *ys, char **reason);
-int        clicon_type2cv(char *type, char *rtype, enum cv_type *cvtype);
+int        clicon_type2cv(char *type, char *rtype, yang_stmt *ys, enum cv_type *cvtype);
 int        yang_type_get(yang_stmt *ys, char **otype, yang_stmt **restype, 
 			 int *options, cvec **cvv, char **pattern,
                          uint8_t *fraction_digits);
diff --git a/lib/src/clixon_netconf_lib.c b/lib/src/clixon_netconf_lib.c
index cfa93882..427e99fc 100644
--- a/lib/src/clixon_netconf_lib.c
+++ b/lib/src/clixon_netconf_lib.c
@@ -1032,7 +1032,7 @@ netconf_module_load(clicon_handle h)
     /* Load yang spec */
     if (yang_spec_parse_module(h, "ietf-netconf", NULL, yspec)< 0)
 	goto done;
-    if (yang_spec_parse_module(h, "ietf-netconf-notification", NULL, yspec)< 0)
+    if (yang_spec_parse_module(h, "clixon-rfc5277", NULL, yspec)< 0)
 	goto done;
     retval = 0;
  done:
diff --git a/lib/src/clixon_stream.c b/lib/src/clixon_stream.c
index 6bad4671..dbc5467a 100644
--- a/lib/src/clixon_stream.c
+++ b/lib/src/clixon_stream.c
@@ -548,7 +548,7 @@ stream_notify(clicon_handle h,
     yang_spec *yspec = NULL;
     char      *str = NULL;
     cbuf      *cb = NULL;
-    char       timestr[27];
+    char       timestr[28];
     struct timeval tv;
     event_stream_t *es;
 
@@ -622,7 +622,7 @@ stream_notify_xml(clicon_handle h,
     yang_spec *yspec = NULL;
     char      *str = NULL;
     cbuf      *cb = NULL;
-    char       timestr[27];
+    char       timestr[28];
     struct timeval tv;
     event_stream_t *es;
 
diff --git a/lib/src/clixon_string.c b/lib/src/clixon_string.c
index 733a1ca4..f0dc1c24 100644
--- a/lib/src/clixon_string.c
+++ b/lib/src/clixon_string.c
@@ -634,6 +634,51 @@ clixon_trim(char *str)
     return s;
 }
 
+/*! Transform from XSD regex to posix ERE
+ * The usecase is that Yang (RFC7950) supports XSD regexpressions but CLIgen supports
+ * Current translations:
+ * \d --> [0-9]
+ * POSIX ERE regexps according to man regex(3).
+ * @param[in]  xsd    Input regex string according XSD
+ * @param[out] posix  Output (malloced) string according to POSIX ERE
+ * @see http://www.w3.org/TR/2004/REC-xmlschema-2-20041028
+ * @note that the translation is ad-hoc, may need more translations
+ */
+int
+regexp_xsd2posix(char  *xsd,
+		 char **posix)
+{
+    int   retval = -1;
+    char *x;
+    char *p = NULL;
+    int   i;
+    int   len;
+
+    len = strlen(xsd);
+    x = xsd;
+    while ((x = strstr(x, "\\d")) != NULL){
+	len += 3; /* \d --> [0-9] */
+	x += 2;
+    }
+    if ((p = malloc(len+1)) == NULL){
+	clicon_err(OE_UNIX, errno, "malloc");
+	goto done;
+    }
+    memset(p, 0, len+1);
+    *posix = p;
+    for (i=0; i<strlen(xsd); i++){
+	if (strncmp(&xsd[i], "\\d", 2) == 0){
+	    strcpy(p, "[0-9]");
+	    p += 5; i++;
+	}
+	else
+	    *p++ = xsd[i];
+    }
+    retval = 0;
+ done:
+    return retval;
+}
+
 /*! strndup() for systems without it, such as xBSD
  */
 #ifndef HAVE_STRNDUP
diff --git a/lib/src/clixon_yang.c b/lib/src/clixon_yang.c
index c8197cd4..dc55bfee 100644
--- a/lib/src/clixon_yang.c
+++ b/lib/src/clixon_yang.c
@@ -1082,7 +1082,7 @@ ys_populate_leaf(yang_stmt *ys,
  < 0)
 	goto done;
     restype = yrestype?yrestype->ys_argument:NULL;
-    if (clicon_type2cv(type, restype, &cvtype) < 0) /* This handles non-resolved also */
+    if (clicon_type2cv(type, restype, ys, &cvtype) < 0) /* This handles non-resolved also */
 	goto done;
     /* 2. Create the CV using cvtype and name it */
     if ((cv = cv_new(cvtype)) == NULL){
@@ -1230,7 +1230,7 @@ ys_populate_range(yang_stmt *ys,
     restype = yrestype?yrestype->ys_argument:NULL;
     origtype = yarg_id((yang_stmt*)yparent);
     /* This handles non-resolved also */
-    if (clicon_type2cv(origtype, restype, &cvtype) < 0) 
+    if (clicon_type2cv(origtype, restype, ys, &cvtype) < 0) 
 	goto done;
     if ((vec = clicon_strsep(ys->ys_argument, "|", &nvec)) == NULL)
 	goto done;
diff --git a/lib/src/clixon_yang_type.c b/lib/src/clixon_yang_type.c
index 56b16842..ce43aec3 100644
--- a/lib/src/clixon_yang_type.c
+++ b/lib/src/clixon_yang_type.c
@@ -254,35 +254,6 @@ yang2cv_type(char         *ytype,
 	*cv_type = ret;
 	return 0;
     }
-    /* special derived types */
-    if (strcmp("ipv4-address", ytype) == 0){ /* RFC6991 */
-	*cv_type = CGV_IPV4ADDR;
-	return 0;
-    }
-    if (strcmp("ipv6-address", ytype) == 0){ /* RFC6991 */
-	*cv_type = CGV_IPV6ADDR;
-	return 0;
-    }
-    if (strcmp("ipv4-prefix", ytype) == 0){ /* RFC6991 */
-	*cv_type = CGV_IPV4PFX;
-	return 0;
-    }
-    if (strcmp("ipv6-prefix", ytype) == 0){ /* RFC6991 */
-	*cv_type = CGV_IPV6PFX;
-	return 0;
-    }
-    if (strcmp("date-and-time", ytype) == 0){ /* RFC6991 */
-	*cv_type = CGV_TIME;
-	return 0;
-    }
-    if (strcmp("mac-address", ytype) == 0){ /* RFC6991 */
-	*cv_type = CGV_MACADDR;
-	return 0;
-    }
-    if (strcmp("uuid", ytype) == 0){ /* RFC6991 */
-	*cv_type = CGV_UUID;
-	return 0;
-    }
     return 0;
 }
 
@@ -330,12 +301,14 @@ cv2yang_type(enum cv_type cv_type)
  * not true yang types
  * @param[in]  origtype Name of original type
  * @param[in]  restype  Resolved type. May be null, in that case origtype is used
+ * @param[in]  ys       Yang stmt of original resolving node
  * @param[out] cvtype   Translation from resolved type 
  * @note Thereis a kludge for handling direct translations of native cligen types
  */
 int
 clicon_type2cv(char         *origtype, 
 	       char         *restype, 
+	       yang_stmt    *ys,
 	       enum cv_type *cvtype)
 {
     int retval = -1;
@@ -344,7 +317,8 @@ clicon_type2cv(char         *origtype,
     if (restype != NULL){ 
 	yang2cv_type(restype, cvtype);
 	if (*cvtype == CGV_ERR){
-	    clicon_err(OE_YANG, EINVAL, "\"%s\" type not translated", restype);
+	    clicon_err(OE_YANG, 0, "%s: \"%s\" type not translated",
+		       ys_module(ys)->ys_argument, restype);
 	    goto done;
 	}
     }
@@ -355,7 +329,8 @@ clicon_type2cv(char         *origtype,
 	 */
 	yang2cv_type(origtype, cvtype);
 	if (*cvtype == CGV_ERR){
-	    clicon_err(OE_YANG, EINVAL, "\"%s\": type not resolved", origtype);
+	    clicon_err(OE_YANG, 0, "%s:\"%s\": type not resolved",
+		       ys_module(ys)->ys_argument, origtype);
 	    goto done;
 	}
     }
@@ -543,10 +518,15 @@ cv_validate1(cg_var      *cv,
 	    }
 	}
 	if ((options & YANG_OPTIONS_PATTERN) != 0){
-	    if ((retval2 = match_regexp(str, pattern)) < 0){
+	    char *posix = NULL;
+	    if (regexp_xsd2posix(pattern, &posix) < 0)
+		goto done;
+	    if ((retval2 = match_regexp(str, posix)) < 0){
 		clicon_err(OE_DB, 0, "match_regexp: %s", pattern);
 		return -1;
 	    }
+	    if (posix)
+		free(posix);
 	    if (retval2 == 0){
 		if (reason)
 		    *reason = cligen_reason("regexp match fail: \"%s\" does not match %s",
@@ -611,7 +591,7 @@ ys_cv_validate_union_one(yang_stmt *ys,
 	    goto done;
     }
     else {
-	if (clicon_type2cv(type, restype, &cvtype) < 0)
+	if (clicon_type2cv(type, restype, ys, &cvtype) < 0)
 	    goto done;
 	/* reparse value with the new type */
 	if ((cvt = cv_new(cvtype)) == NULL){
@@ -718,7 +698,7 @@ ys_cv_validate(cg_var    *cv,
 		      &options, &cvv, &pattern, &fraction) < 0)
 	goto done;
     restype = yrestype?yrestype->ys_argument:NULL;
-    if (clicon_type2cv(type, restype, &cvtype) < 0)
+    if (clicon_type2cv(type, restype, ys, &cvtype) < 0)
 	goto done;
 
     if (cv_type_get(ycv) != cvtype){
@@ -978,7 +958,7 @@ yang_type_resolve(yang_stmt   *yorig,
 		break;
 	    /* Did not find a matching typedef there, proceed to next level */
 	    yn = ys->ys_parent;
-	    if (yn && yn->yn_keyword == Y_SPEC)
+	    if (yn && (yn->yn_keyword == Y_SPEC))
 		yn = NULL;
 	    ys = (yang_stmt*)yn;
 	}
diff --git a/test/test_stream.sh b/test/test_stream.sh
index 2673b832..75c7e613 100755
--- a/test/test_stream.sh
+++ b/test/test_stream.sh
@@ -153,7 +153,7 @@ new "netconf NONEXIST subscription"
 expectwait "$clixon_netconf -qf $cfg -y $fyang" '<rpc><create-subscription xmlns="urn:ietf:params:xml:ns:netmod:notification"><stream>NONEXIST</stream></create-subscription></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>invalid-value</error-tag><error-severity>error</error-severity><error-message>No such stream</error-message></rpc-error></rpc-reply>]]>]]>$' $NCWAIT
 
 new "netconf EXAMPLE subscription with wrong date"
-expectwait "$clixon_netconf -qf $cfg -y $fyang" '<rpc><create-subscription xmlns="urn:ietf:params:xml:ns:netmod:notification"><stream>EXAMPLE</stream><startTime>kallekaka</startTime></create-subscription></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>startTime</bad-element></error-info><error-severity>error</error-severity><error-message>Invalid time: kallekaka</error-message></rpc-error></rpc-reply>]]>]]>$' 0
+expectwait "$clixon_netconf -qf $cfg -y $fyang" '<rpc><create-subscription xmlns="urn:ietf:params:xml:ns:netmod:notification"><stream>EXAMPLE</stream><startTime>kallekaka</startTime></create-subscription></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>startTime</bad-element></error-info><error-severity>error</error-severity><error-message>regexp match fail: "kallekaka" does not match' 0
 
 #new "netconf EXAMPLE subscription with replay"
 #NOW=$(date +"%Y-%m-%dT%H:%M:%S")
@@ -181,7 +181,7 @@ expectwait 'curl -s -X GET -H "Accept: text/event-stream" -H "Cache-Control: no-
 # 2a) start subscription 8s - expect 1-2 notifications
 new "2a) start subscriptions 8s - expect 1-2 notifications"
 ret=$($UTIL -u http://localhost/streams/EXAMPLE -t 8)
-expect="data: <notification xmlns=\"urn:ietf:params:xml:ns:netconf:notification:1.0\"><eventTime>${DATE}T[0-9:.]*</eventTime><event><event-class>fault</event-class><reportingEntity><card>Ethernet0</card></reportingEntity><severity>major</severity></event>"
+expect="data: <notification xmlns=\"urn:ietf:params:xml:ns:netconf:notification:1.0\"><eventTime>${DATE}T[0-9:.]*Z</eventTime><event><event-class>fault</event-class><reportingEntity><card>Ethernet0</card></reportingEntity><severity>major</severity></event>"
 
 match=$(echo "$ret" | grep -Eo "$expect")
 if [ -z "$match" ]; then
@@ -193,10 +193,11 @@ if [ $nr -lt 1 -o $nr -gt 2 ]; then
 fi
 
 sleep 2
+
 # 2b) start subscription 8s - stoptime after 5s - expect 1-2 notifications
 new "2b) start subscriptions 8s - stoptime after 5s - expect 1-2 notifications"
 ret=$($UTIL -u http://localhost/streams/EXAMPLE -t 8 -e +10)
-expect="data: <notification xmlns=\"urn:ietf:params:xml:ns:netconf:notification:1.0\"><eventTime>${DATE}T[0-9:.]*</eventTime><event><event-class>fault</event-class><reportingEntity><card>Ethernet0</card></reportingEntity><severity>major</severity></event>"
+expect="data: <notification xmlns=\"urn:ietf:params:xml:ns:netconf:notification:1.0\"><eventTime>${DATE}T[0-9:.]*Z</eventTime><event><event-class>fault</event-class><reportingEntity><card>Ethernet0</card></reportingEntity><severity>major</severity></event>"
 match=$(echo "$ret" | grep -Eo "$expect")
 if [ -z "$match" ]; then
     err "$expect" "$ret"
@@ -209,7 +210,7 @@ fi
 # 2c
 new "2c) start sub 8s - replay from start -8s - expect 3-4 notifications"
 ret=$($UTIL -u http://localhost/streams/EXAMPLE -t 10 -s -8)
-expect="data: <notification xmlns=\"urn:ietf:params:xml:ns:netconf:notification:1.0\"><eventTime>${DATE}T[0-9:.]*</eventTime><event><event-class>fault</event-class><reportingEntity><card>Ethernet0</card></reportingEntity><severity>major</severity></event>"
+expect="data: <notification xmlns=\"urn:ietf:params:xml:ns:netconf:notification:1.0\"><eventTime>${DATE}T[0-9:.]*Z</eventTime><event><event-class>fault</event-class><reportingEntity><card>Ethernet0</card></reportingEntity><severity>major</severity></event>"
 match=$(echo "$ret" | grep -Eo "$expect")
 if [ -z "$match" ]; then
     err "$expect" "$ret"
@@ -222,7 +223,7 @@ fi
 # 2d) start sub 8s - replay from start -8s to stop +4s - expect 3 notifications
 new "2d) start sub 8s - replay from start -8s to stop +4s - expect 3 notifications"
 ret=$($UTIL -u http://localhost/streams/EXAMPLE -t 10 -s -30 -e +4)
-expect="data: <notification xmlns=\"urn:ietf:params:xml:ns:netconf:notification:1.0\"><eventTime>${DATE}T[0-9:.]*</eventTime><event><event-class>fault</event-class><reportingEntity><card>Ethernet0</card></reportingEntity><severity>major</severity></event>"
+expect="data: <notification xmlns=\"urn:ietf:params:xml:ns:netconf:notification:1.0\"><eventTime>${DATE}T[0-9:.]*Z</eventTime><event><event-class>fault</event-class><reportingEntity><card>Ethernet0</card></reportingEntity><severity>major</severity></event>"
 match=$(echo "$ret" | grep -Eo "$expect")
 if [ -z "$match" ]; then
     err "$expect" "$ret"
@@ -235,7 +236,7 @@ fi
 # 2e) start sub 8s - replay from -90s w retention 60s - expect 10 notifications
 new "2e) start sub 8s - replay from -90s w retention 60s - expect 10 notifications"
 ret=$($UTIL -u http://localhost/streams/EXAMPLE -t 10 -s -90 -e +0)
-expect="data: <notification xmlns=\"urn:ietf:params:xml:ns:netconf:notification:1.0\"><eventTime>${DATE}T[0-9:.]*</eventTime><event><event-class>fault</event-class><reportingEntity><card>Ethernet0</card></reportingEntity><severity>major</severity></event>"
+expect="data: <notification xmlns=\"urn:ietf:params:xml:ns:netconf:notification:1.0\"><eventTime>${DATE}T[0-9:.]*Z</eventTime><event><event-class>fault</event-class><reportingEntity><card>Ethernet0</card></reportingEntity><severity>major</severity></event>"
 match=$(echo "$ret" | grep -Eo "$expect")
 if [ -z "$match" ]; then
     err "$expect" "$ret"
@@ -253,7 +254,7 @@ PID=$!
 
 new "Start subscriptions in parallell"
 ret=$($UTIL -u http://localhost/streams/EXAMPLE -t 8)
-expect="data: <notification xmlns=\"urn:ietf:params:xml:ns:netconf:notification:1.0\"><eventTime>${DATE}T[0-9:.]*</eventTime><event><event-class>fault</event-class><reportingEntity><card>Ethernet0</card></reportingEntity><severity>major</severity></event>"
+expect="data: <notification xmlns=\"urn:ietf:params:xml:ns:netconf:notification:1.0\"><eventTime>${DATE}T[0-9:.]*Z</eventTime><event><event-class>fault</event-class><reportingEntity><card>Ethernet0</card></reportingEntity><severity>major</severity></event>"
 
 match=$(echo "$ret" | grep -Eo "$expect")
 if [ -z "$match" ]; then
diff --git a/util/clixon_util_stream.c b/util/clixon_util_stream.c
index 3530514f..6b52fb3e 100644
--- a/util/clixon_util_stream.c
+++ b/util/clixon_util_stream.c
@@ -216,8 +216,8 @@ main(int argc, char **argv)
     char  *url = NULL;
     char  *getdata = NULL;
     int    timeout = 10;
-    char   start[27] = {0,}; /* strlen = 0 */
-    char   stop[27] = {0,};
+    char   start[28] = {0,}; /* strlen = 0 */
+    char   stop[28] = {0,};
     int    c;
     char  *argv0 = argv[0];
     struct timeval now;
diff --git a/yang/Makefile.in b/yang/Makefile.in
index a1d0be57..3d8e38dd 100644
--- a/yang/Makefile.in
+++ b/yang/Makefile.in
@@ -48,7 +48,7 @@ YANGSPECS	+= ietf-inet-types@2013-07-15.yang
 YANGSPECS	+= ietf-yang-types@2013-07-15.yang
 YANGSPECS	+= ietf-restconf@2017-01-26.yang
 YANGSPECS	+= ietf-restconf-monitoring@2017-01-26.yang
-YANGSPECS	+= ietf-netconf-notification@2008-07-01.yang
+YANGSPECS	+= clixon-rfc5277@2008-07-01.yang
 YANGSPECS	+= ietf-yang-library@2016-06-21.yang
 
 APPNAME	        = clixon  # subdir ehere these files are installed
diff --git a/yang/ietf-netconf-notification@2008-07-01.yang b/yang/clixon-rfc5277@2008-07-01.yang
similarity index 95%
rename from yang/ietf-netconf-notification@2008-07-01.yang
rename to yang/clixon-rfc5277@2008-07-01.yang
index 1db3ee3e..aaa45ed2 100644
--- a/yang/ietf-netconf-notification@2008-07-01.yang
+++ b/yang/clixon-rfc5277@2008-07-01.yang
@@ -1,7 +1,7 @@
-module ietf-netconf-notification {
+module clixon-rfc5277 {
     /*    namespace "urn:ietf:params:xml:ns:netconf:notification:1.0";*/
     namespace "urn:ietf:params:xml:ns:netmod:notification";
-    prefix "rcmon";
+    prefix "ncevent";
 
     import ietf-yang-types { prefix yang; }
     import ietf-inet-types { prefix inet; }
@@ -10,7 +10,8 @@ module ietf-netconf-notification {
 	"IETF NETCONF (Network Configuration) Working Group";
 
     description
-	"Note this is a translation from RFC 5277 schema in section 4 to Yang.
+	"Note this is a translation from RFC 5277 schema in section 4 to Yang
+         made by Olof Hagsand manually for the Clixon project.
          RFC 5277 is Copyright (C) The IETF Trust (2008).";
 
     revision 2008-07-01 {
@@ -120,14 +121,14 @@ module ietf-netconf-notification {
                for more information on filters";
 	  }
 	  leaf startTime {
-	      type date-and-time;
+	      type yang:date-and-time;
 	      description "used to trigger the replay feature
          and indicate that the replay should start at the time
          specified. If <startTime> is not present, this is not a replay
          subscription.";
 	  }
 	  leaf stopTime {
-	      type date-and-time;
+	      type yang:date-and-time;
 	      description "used with the optional
          replay feature to indicate the newest notifications of
          interest.  If <stopTime> is not present, the notifications will

From 90545b05cd50ae3ab253e3fff3275417ed56cb5d Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sat, 12 Jan 2019 13:52:35 +0100
Subject: [PATCH 31/72] nacm testcases for modules and datastore

---
 test/test_nacm.sh                  |  16 +-
 test/test_nacm_datanode.sh         | 230 +++++++++++++++++++++++++++++
 test/test_nacm_ext.sh              |  21 +--
 test/test_nacm_module.sh           | 187 +++++++++++++++++++++++
 test/test_nacm_protocol.sh         |  30 ++--
 yang/clixon-config@2018-10-21.yang |   4 +-
 6 files changed, 455 insertions(+), 33 deletions(-)
 create mode 100755 test/test_nacm_datanode.sh
 create mode 100755 test/test_nacm_module.sh

diff --git a/test/test_nacm.sh b/test/test_nacm.sh
index aac4be87..82337442 100755
--- a/test/test_nacm.sh
+++ b/test/test_nacm.sh
@@ -16,7 +16,7 @@ cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
-  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_MAIN_FILE>$fyang</CLICON_YANG_MAIN_FILE>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_RESTCONF_DIR>/usr/local/lib/$APPNAME/restconf</CLICON_RESTCONF_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
@@ -103,16 +103,16 @@ RULES=$(cat <<EOF
 EOF
 )
 
-new "test params: -f $cfg -y $fyang"
+new "test params: -f $cfg"
 
 if [ $BE -ne 0 ]; then
     new "kill old backend"
-    sudo clixon_backend -zf $cfg -y $fyang
+    sudo clixon_backend -zf $cfg
     if [ $? -ne 0 ]; then
 	err
     fi
-    new "start backend -s init -f $cfg -y $fyang"
-    sudo $clixon_backend -s init -f $cfg -y $fyang -D $DBG
+    new "start backend -s init -f $cfg"
+    sudo $clixon_backend -s init -f $cfg -D $DBG
     if [ $? -ne 0 ]; then
 	err
     fi
@@ -123,7 +123,7 @@ sudo pkill -u www-data -f "/www-data/clixon_restconf"
 
 sleep 1
 new "start restconf daemon (-a is enable basic authentication)"
-sudo su -c "$clixon_restconf -f $cfg -y $fyang -D $DBG -- -a" -s /bin/sh www-data &
+sudo su -c "$clixon_restconf -f $cfg -D $DBG -- -a" -s /bin/sh www-data &
 
 sleep $RCWAIT
 
@@ -135,10 +135,10 @@ expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/example:x
 
'
 
 new "auth set authentication config"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config>$RULES</config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><edit-config><target><candidate/></target><config>$RULES</config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "commit it"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new2 "auth get (no user: access denied)"
 expecteq "$(curl -sS -X GET -H \"Accept:\ application/yang-data+json\" http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
diff --git a/test/test_nacm_datanode.sh b/test/test_nacm_datanode.sh
new file mode 100755
index 00000000..8bf65f56
--- /dev/null
+++ b/test/test_nacm_datanode.sh
@@ -0,0 +1,230 @@
+#!/bin/bash
+# Authentication and authorization and IETF NACM
+# NACM data node rule
+# @see RFC 8341 A.1 and A.4 (and permit-all from A.2)
+# Tests for:
+# deny-nacm:  This rule denies the "guest" group any access to the
+#     /nacm subtree.
+# permit-acme-config:  This rule gives the "limited" group read-write
+#    access to the acme <config-parameters>.
+# permit-dummy-interface:  This rule gives the "limited" and "guest"
+#     groups read-update access to the acme <interface> entry named
+#     "dummy".  This entry cannot be created or deleted by these groups;
+#     it can only be altered.
+# permit-interface:  This rule gives the "admin" group read-write
+#     access to all acme <interface> entries.
+
+APPNAME=example
+# include err() and new() functions and creates $dir
+. ./lib.sh
+. ./nacm.sh
+
+cfg=$dir/conf_yang.xml
+fyang=$dir/test.yang
+fyangerr=$dir/err.yang
+
+cat <<EOF > $cfg
+<config>
+  <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_MAIN_FILE>$fyang</CLICON_YANG_MAIN_FILE>
+  <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_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>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
+  <CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
+  <CLICON_CLI_GENMODEL_COMPLETION>1</CLICON_CLI_GENMODEL_COMPLETION>
+  <CLICON_XMLDB_DIR>/usr/local/var/$APPNAME</CLICON_XMLDB_DIR>
+  <CLICON_XMLDB_PLUGIN>/usr/local/lib/xmldb/text.so</CLICON_XMLDB_PLUGIN>
+  <CLICON_RESTCONF_PRETTY>false</CLICON_RESTCONF_PRETTY>
+  <CLICON_NACM_MODE>internal</CLICON_NACM_MODE>
+</config>
+EOF
+
+cat <<EOF > $fyang
+module $APPNAME{
+  yang-version 1.1;
+  namespace "urn:example:clixon";
+  prefix ex;
+  import ietf-netconf-acm {
+	prefix nacm;
+  }
+  leaf x{
+    type int32;
+    description "something to edit";
+  }
+}
+EOF
+
+# The groups are slightly modified from RFC8341 A.1
+# The rule-list is from A.2
+RULES=$(cat <<EOF
+   <nacm xmlns="urn:ietf:params:xml:ns:yang:ietf-netconf-acm">
+     <enable-nacm>false</enable-nacm>
+     <read-default>deny</read-default>
+     <write-default>deny</write-default>
+     <exec-default>deny</exec-default>
+
+     $NGROUPS
+
+     <rule-list>
+       <name>guest-acl</name>
+       <group>guest</group>
+
+       <rule>
+         <name>deny-nacm</name>
+         <path xmlns:n="urn:ietf:params:xml:ns:yang:ietf-netconf-acm">
+           /n:nacm
+         </path>
+         <access-operations>*</access-operations>
+         <action>deny</action>
+         <comment>
+           Deny the 'guest' group any access to the /nacm data.
+         </comment>
+       </rule>
+     </rule-list>
+
+     <rule-list>
+       <name>limited-acl</name>
+       <group>limited</group>
+
+       <rule>
+         <name>permit-acme-config</name>
+         <path xmlns:acme="http://example.com/ns/netconf">
+           /acme:acme-netconf/acme:config-parameters
+         </path>
+         <access-operations>
+           read create update delete
+         </access-operations>
+         <action>permit</action>
+         <comment>
+           Allow the 'limited' group complete access to the acme
+           NETCONF configuration parameters.  Showing long form
+           of 'access-operations' instead of shorthand.
+         </comment>
+       </rule>
+     </rule-list>
+     <rule-list>
+       <name>guest-limited-acl</name>
+       <group>guest</group>
+       <group>limited</group>
+
+       <rule>
+         <name>permit-dummy-interface</name>
+         <path xmlns:acme="http://example.com/ns/itf">
+           /acme:interfaces/acme:interface[acme:name='dummy']
+         </path>
+         <access-operations>read update</access-operations>
+         <action>permit</action>
+         <comment>
+           Allow the 'limited' and 'guest' groups read
+           and update access to the dummy interface.
+         </comment>
+       </rule>
+     </rule-list>
+     <rule-list>
+       <name>admin-acl</name>
+       <group>admin</group>
+       <rule>
+         <name>permit-interface</name>
+         <path xmlns:acme="http://example.com/ns/itf">
+           /acme:interfaces/acme:interface
+         </path>
+         <access-operations>*</access-operations>
+         <action>permit</action>
+         <comment>
+           Allow the 'admin' group full access to all acme interfaces.
+         </comment>
+       </rule>
+     </rule-list>
+
+     $NADMIN
+
+   </nacm>
+   <x xmlns="urn:example:clixon">0</x>
+EOF
+)
+
+# kill old backend (if any)
+new "kill old backend"
+sudo clixon_backend -zf $cfg
+if [ $? -ne 0 ]; then
+    err
+fi
+
+new "start backend -s init -f $cfg"
+# start new backend
+sudo $clixon_backend -s init -f $cfg
+if [ $? -ne 0 ]; then
+    err
+fi
+
+new "kill old restconf daemon"
+sudo pkill -u www-data -f "/www-data/clixon_restconf"
+
+sleep 1
+new "start restconf daemon (-a is enable basic authentication)"
+sudo su -c "$clixon_restconf -f $cfg -D $DBG -- -a" -s /bin/sh www-data &
+
+sleep $RCWAIT
+
+new "auth set authentication config"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><edit-config><target><candidate/></target><config>$RULES</config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "commit it"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "enable nacm"
+expecteq "$(curl -u andy:bar -sS -X PUT -d '{"enable-nacm": true}' http://localhost/restconf/data/ietf-netconf-acm:nacm/enable-nacm)" ""
+
+#--------------- nacm enabled
+
+new2 "auth get (wrong passwd: access denied)"
+expecteq "$(curl -u andy:foo -sS -X GET http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
+
+new2 "auth get (access)"
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"example:x": 0}
+
'
+
+#----------------Enable NACM
+
+new "enable nacm"
+expecteq "$(curl -u andy:bar -sS -X PUT -d '{"enable-nacm": true}' http://localhost/restconf/data/ietf-netconf-acm:nacm/enable-nacm)" ""
+
+new2 "admin get nacm"
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"example:x": 0}
+
'
+
+new2 "limited get nacm"
+expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"example:x": 0}
+
'
+
+new2 "guest get nacm"
+expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
+
+new "admin edit nacm"
+expecteq "$(curl -u andy:bar -sS -X PUT -d '{"x": 1}' http://localhost/restconf/data/example:x)" ""
+
+new2 "limited edit nacm"
+expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"x": 2}' http://localhost/restconf/data/example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+
+new2 "guest edit nacm"
+expecteq "$(curl -u guest:bar -sS -X PUT -d '{"x": 3}' http://localhost/restconf/data/example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
+
+new "Kill restconf daemon"
+sudo pkill -u www-data -f "/www-data/clixon_restconf"
+
+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
+sudo clixon_backend -z -f $cfg
+if [ $? -ne 0 ]; then
+    err "kill backend"
+fi
+
+rm -rf $dir
diff --git a/test/test_nacm_ext.sh b/test/test_nacm_ext.sh
index edbef77f..5e2ad832 100755
--- a/test/test_nacm_ext.sh
+++ b/test/test_nacm_ext.sh
@@ -20,6 +20,7 @@ cat <<EOF > $cfg
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>/usr/local/share/example/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</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>
@@ -134,7 +135,7 @@ cat <<EOF > $nacmfile
    </nacm>
 EOF
 
-new "test params: -f $cfg -y $fyang"
+new "test params: -f $cfg"
 
 if [ $BE -ne 0 ]; then
     new "kill old backend -zf $cfg "
@@ -143,9 +144,9 @@ if [ $BE -ne 0 ]; then
 	err
     fi
     sleep 1
-    new "start backend -s init -f $cfg -y $fyang"
+    new "start backend -s init -f $cfg"
     # start new backend
-    sudo $clixon_backend -s init -f $cfg -y $fyang -D $DBG
+    sudo $clixon_backend -s init -f $cfg -D $DBG
     if [ $? -ne 0 ]; then
 	err
     fi
@@ -155,7 +156,7 @@ new "kill old restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"
 
 new "start restconf daemon (-a is enable http basic auth)"
-sudo su -c "$clixon_restconf -f $cfg -y $fyang -D $DBG -- -a" -s /bin/sh www-data &
+sudo su -c "$clixon_restconf -f $cfg -D $DBG -- -a" -s /bin/sh www-data &
 
 sleep $RCWAIT
 
@@ -200,22 +201,22 @@ new2 "guest edit nacm"
 expecteq "$(curl -u guest:bar -sS -X PUT -d '{"x": 3}' http://localhost/restconf/data/example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
 
 new "cli show conf as admin"
-expectfn "$clixon_cli -1 -U andy -l o -f $cfg -y $fyang show conf" 0 "^x 1;$"
+expectfn "$clixon_cli -1 -U andy -l o -f $cfg show conf" 0 "^x 1;$"
 
 new "cli show conf as limited"
-expectfn "$clixon_cli -1 -U wilma -l o -f $cfg -y $fyang show conf" 0 "^x 1;$"
+expectfn "$clixon_cli -1 -U wilma -l o -f $cfg show conf" 0 "^x 1;$"
 
 new "cli show conf as guest"
-expectfn "$clixon_cli -1 -U guest -l o -f $cfg -y $fyang show conf" 255 "protocol access-denied"
+expectfn "$clixon_cli -1 -U guest -l o -f $cfg show conf" 255 "protocol access-denied"
 
 new "cli rpc as admin"
-expectfn "$clixon_cli -1 -U andy -l o -f $cfg -y $fyang rpc ipv4" 0 "next-hop-list 2.3.4.5;"
+expectfn "$clixon_cli -1 -U andy -l o -f $cfg rpc ipv4" 0 "next-hop-list 2.3.4.5;"
 
 new "cli rpc as limited"
-expectfn "$clixon_cli -1 -U wilma -l o -f $cfg -y $fyang rpc ipv4" 255 "protocol access-denied default deny"
+expectfn "$clixon_cli -1 -U wilma -l o -f $cfg rpc ipv4" 255 "protocol access-denied default deny"
 
 new "cli rpc as guest"
-expectfn "$clixon_cli -1 -U guest -l o -f $cfg -y $fyang rpc ipv4" 255 "protocol access-denied access denied"
+expectfn "$clixon_cli -1 -U guest -l o -f $cfg rpc ipv4" 255 "protocol access-denied access denied"
 
 new "Kill restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"
diff --git a/test/test_nacm_module.sh b/test/test_nacm_module.sh
new file mode 100755
index 00000000..e2559feb
--- /dev/null
+++ b/test/test_nacm_module.sh
@@ -0,0 +1,187 @@
+#!/bin/bash
+# Authentication and authorization and IETF NACM
+# NACM module rules
+# @see test_nacm.sh is slightly modified - this follows the RFC more closely
+# See RFC 8341 A.1 and A.2
+# Tests for:
+# deny-ncm:  This rule prevents the "guest" group from reading any
+#     monitoring information in the "ietf-netconf-monitoring" YANG
+#     module.
+# permit-ncm:  This rule allows the "limited" group to read the
+#     "ietf-netconf-monitoring" YANG module.
+# permit-exec:  This rule allows the "limited" group to invoke any
+#     protocol operation supported by the server.
+# permit-all:  This rule allows the "admin" group complete access to
+#     all content in the server.  No subsequent rule will match for the
+#     "admin" group because of this module rule
+
+APPNAME=example
+# include err() and new() functions and creates $dir
+. ./lib.sh
+. ./nacm.sh
+
+cfg=$dir/conf_yang.xml
+fyang=$dir/test.yang
+fyangerr=$dir/err.yang
+
+cat <<EOF > $cfg
+<config>
+  <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
+  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_MAIN_FILE>$fyang</CLICON_YANG_MAIN_FILE>
+  <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_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>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
+  <CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
+  <CLICON_CLI_GENMODEL_COMPLETION>1</CLICON_CLI_GENMODEL_COMPLETION>
+  <CLICON_XMLDB_DIR>/usr/local/var/$APPNAME</CLICON_XMLDB_DIR>
+  <CLICON_XMLDB_PLUGIN>/usr/local/lib/xmldb/text.so</CLICON_XMLDB_PLUGIN>
+  <CLICON_RESTCONF_PRETTY>false</CLICON_RESTCONF_PRETTY>
+  <CLICON_NACM_MODE>internal</CLICON_NACM_MODE>
+</config>
+EOF
+
+cat <<EOF > $fyang
+module $APPNAME{
+  yang-version 1.1;
+  namespace "urn:example:clixon";
+  prefix ex;
+  import ietf-netconf-acm {
+	prefix nacm;
+  }
+  leaf x{
+    type int32;
+    description "something to edit";
+  }
+}
+EOF
+
+# The groups are slightly modified from RFC8341 A.1 ($USER added in admin group)
+# The rule-list is from A.2 
+RULES=$(cat <<EOF
+   <nacm xmlns="urn:ietf:params:xml:ns:yang:ietf-netconf-acm">
+     <enable-nacm>false</enable-nacm>
+     <read-default>deny</read-default>
+     <write-default>deny</write-default>
+     <exec-default>deny</exec-default>
+
+     $NGROUPS
+
+     <rule-list>
+       <name>guest-acl</name>
+       <group>guest</group>
+       <rule>
+         <name>deny-ncm</name>
+         <module-name>ietf-netconf-monitoring</module-name>
+         <access-operations>*</access-operations>
+         <action>deny</action>
+         <comment>
+             Do not allow guests any access to the NETCONF
+             monitoring information.
+         </comment>
+       </rule>
+     </rule-list>
+     <rule-list>
+       <name>limited-acl</name>
+       <group>limited</group>
+       <rule>
+         <name>permit-ncm</name>
+         <rpc-name>get</rpc-name>
+         <module-name>ietf-netconf-monitoring</module-name>
+         <access-operations>read</access-operations>
+         <action>permit</action>
+         <comment>
+             Allow read access to the NETCONF monitoring information.
+         </comment>
+       </rule>
+       <rule>
+         <name>permit-exec</name>
+         <module-name>*</module-name>
+         <access-operations>exec</access-operations>
+         <action>permit</action>
+         <comment>
+             Allow invocation of the supported server operations.
+         </comment>
+       </rule>
+     </rule-list>
+
+     $NADMIN
+
+   </nacm>
+   <x xmlns="urn:example:clixon">0</x>
+EOF
+)
+
+# kill old backend (if any)
+new "kill old backend"
+sudo clixon_backend -zf $cfg
+if [ $? -ne 0 ]; then
+    err
+fi
+
+new "start backend -s init -f $cfg"
+# start new backend
+sudo $clixon_backend -s init -f $cfg
+if [ $? -ne 0 ]; then
+    err
+fi
+
+new "kill old restconf daemon"
+sudo pkill -u www-data -f "/www-data/clixon_restconf"
+
+sleep 1
+new "start restconf daemon (-a is enable basic authentication)"
+sudo su -c "$clixon_restconf -f $cfg -D $DBG -- -a" -s /bin/sh www-data &
+
+sleep $RCWAIT
+
+new "auth set authentication config"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><edit-config><target><candidate/></target><config>$RULES</config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "commit it"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "enable nacm"
+expecteq "$(curl -u andy:bar -sS -X PUT -d '{"enable-nacm": true}' http://localhost/restconf/data/ietf-netconf-acm:nacm/enable-nacm)" ""
+
+#--------------- nacm enabled
+
+# Read monitoring information from ietf-netconf-monitoring
+new2 "admin get nacm"
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"example:x": 0}
+
'
+
+new2 "limited get nacm"
+expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"example:x": 0}
+
'
+
+new2 "guest get nacm"
+expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+
+new "admin edit nacm"
+expecteq "$(curl -u andy:bar -sS -X PUT -d '{"example:x": 1}' http://localhost/restconf/data/example:x)" ""
+
+new2 "limited edit nacm"
+expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"example:x": 2}' http://localhost/restconf/data/example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+
+new2 "guest edit nacm"
+expecteq "$(curl -u guest:bar -sS -X PUT -d '{"example:x": 3}' http://localhost/restconf/data/example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+
+new "Kill restconf daemon"
+sudo pkill -u www-data -f "/www-data/clixon_restconf"
+
+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
+sudo clixon_backend -z -f $cfg
+if [ $? -ne 0 ]; then
+    err "kill backend"
+fi
+
+rm -rf $dir
diff --git a/test/test_nacm_protocol.sh b/test/test_nacm_protocol.sh
index 8a3c298e..c0e89440 100755
--- a/test/test_nacm_protocol.sh
+++ b/test/test_nacm_protocol.sh
@@ -36,7 +36,7 @@ cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
-  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_MAIN_FILE>$fyang</CLICON_YANG_MAIN_FILE>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_RESTCONF_DIR>/usr/local/lib/$APPNAME/restconf</CLICON_RESTCONF_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
@@ -125,17 +125,17 @@ RULES=$(cat <<EOF
 EOF
 )
 
-new "test params: -f $cfg -y $fyang"
+new "test params: -f $cfg"
 
 if [ $BE -ne 0 ]; then
     new "kill old backend"
-    sudo clixon_backend -zf $cfg -y $fyang
+    sudo clixon_backend -zf $cfg
     if [ $? -ne 0 ]; then
 	err
     fi
 
-    new "start backend -s init -f $cfg -y $fyang"
-    sudo $clixon_backend -s init -f $cfg -y $fyang -D $DBG
+    new "start backend -s init -f $cfg"
+    sudo $clixon_backend -s init -f $cfg -D $DBG
     if [ $? -ne 0 ]; then
 	err
     fi
@@ -146,36 +146,38 @@ sudo pkill -u www-data -f "/www-data/clixon_restconf"
 
 sleep 1
 new "start restconf daemon (-a is enable basic authentication)"
-sudo su -c "$clixon_restconf -f $cfg -y $fyang -D $DBG -- -a" -s /bin/sh www-data &
+sudo su -c "$clixon_restconf -f $cfg -D $DBG -- -a" -s /bin/sh www-data &
 
 sleep $RCWAIT
 
 new "auth set authentication config"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config>$RULES</config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><edit-config><target><candidate/></target><config>$RULES</config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "commit it"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "enable nacm"
 expecteq "$(curl -u andy:bar -sS -X PUT -d '{"enable-nacm": true}' http://localhost/restconf/data/ietf-netconf-acm:nacm/enable-nacm)" ""
 
+#--------------- nacm enabled
+
 new2 "admin get nacm"
 expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"example:x": 0}
 
'
 
 # Rule 1: deny-kill-session
 new "deny-kill-session: limited fail (netconf)"
-expecteof "$clixon_netconf -qf $cfg -y $fyang -U wilma" 0 "<rpc><kill-session><session-id>44</session-id></kill-session></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-type>protocol</error-type><error-tag>access-denied</error-tag><error-severity>error</error-severity><error-message>access denied</error-message></rpc-error></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -U wilma" 0 "<rpc><kill-session><session-id>44</session-id></kill-session></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-type>protocol</error-type><error-tag>access-denied</error-tag><error-severity>error</error-severity><error-message>access denied</error-message></rpc-error></rpc-reply>]]>]]>$"
 
 new "deny-kill-session: guest fail (netconf)"
-expecteof "$clixon_netconf -qf $cfg -y $fyang -U guest" 0 "<rpc><kill-session><session-id>44</session-id></kill-session></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-type>protocol</error-type><error-tag>access-denied</error-tag><error-severity>error</error-severity><error-message>access denied</error-message></rpc-error></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -U guest" 0 "<rpc><kill-session><session-id>44</session-id></kill-session></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-type>protocol</error-type><error-tag>access-denied</error-tag><error-severity>error</error-severity><error-message>access denied</error-message></rpc-error></rpc-reply>]]>]]>$"
 
 new "deny-kill-session: admin ok (netconf)"
-expecteof "$clixon_netconf -qf $cfg -y $fyang -U andy" 0 "<rpc><kill-session><session-id>44</session-id></kill-session></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -U andy" 0 "<rpc><kill-session><session-id>44</session-id></kill-session></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 # Rule 2: deny-delete-config
 new "deny-delete-config: limited fail (netconf)"
-expecteof "$clixon_netconf -qf $cfg -y $fyang -U wilma" 0 "<rpc><delete-config><target><startup/></target></delete-config></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-type>protocol</error-type><error-tag>access-denied</error-tag><error-severity>error</error-severity><error-message>access denied</error-message></rpc-error></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -U wilma" 0 "<rpc><delete-config><target><startup/></target></delete-config></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-type>protocol</error-type><error-tag>access-denied</error-tag><error-severity>error</error-severity><error-message>access denied</error-message></rpc-error></rpc-reply>]]>]]>$"
 
 new2 "deny-delete-config: guest fail (restconf)"
 expecteq "$(curl -u guest:bar -sS -X DELETE http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
@@ -193,10 +195,10 @@ expecteq "$(curl -u andy:bar -sS -X DELETE http://localhost/restconf/data)" ''
 
 # Here the whole config is gone so we need to start again
 new "auth set authentication config (restart)"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config>$RULES</config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><edit-config><target><candidate/></target><config>$RULES</config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "commit it"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "enable nacm"
 expecteq "$(curl -u andy:bar -sS -X PUT -d '{"ietf-netconf-acm:enable-nacm": true}' http://localhost/restconf/data/ietf-netconf-acm:nacm/enable-nacm)" ""
diff --git a/yang/clixon-config@2018-10-21.yang b/yang/clixon-config@2018-10-21.yang
index a9ad7414..90c6c1bf 100644
--- a/yang/clixon-config@2018-10-21.yang
+++ b/yang/clixon-config@2018-10-21.yang
@@ -145,7 +145,9 @@ module clixon-config {
 	leaf CLICON_YANG_MAIN_FILE {
 	    type string;
 	    description
-		"If specified load a yang module in a specific absolute filename";
+		"If specified load a yang module in a specific absolute filename.
+                 This corresponds to the -y command-line option in most CLixon
+                 programs.";
 	}
 	leaf CLICON_YANG_MAIN_DIR {
 	    type string;

From 0267afcb21f35c85acebd4eef321e4c7f65c42ff Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sun, 13 Jan 2019 17:30:58 +0100
Subject: [PATCH 32/72] * Added -o "<option>=<value>" command-line option to
 all programs: backend, cli, netconf, restconf. * Added -p <dir> command-line
 option to all programs: backend, cli, netconf, restconf. * Moved and updated
 all standard ietf and iana yang files from example and yang/ to
 `yang/standard`. * Renamed example yang from example.yang ->
 clixon-example.yang

---
 .gitignore                                    |    2 +
 CHANGELOG.md                                  |   11 +-
 README.md                                     |    2 +-
 apps/Makefile.in                              |    1 +
 apps/backend/backend_main.c                   |   40 +-
 apps/cli/cli_main.c                           |   36 +-
 apps/netconf/netconf_main.c                   |   25 +-
 apps/restconf/restconf_main.c                 |    7 +-
 apps/restconf/restconf_methods.c              |   14 +-
 configure                                     |   29 +-
 configure.ac                                  |   17 +
 doc/FAQ.md                                    |   33 +-
 example/Makefile.in                           |   15 +-
 example/README.md                             |   92 +-
 ...le.yang => clixon-example@2019-01-13.yang} |   12 +-
 example/example.xml                           |    3 +-
 example/example_backend.c                     |   44 -
 example/example_cli.c                         |   26 +-
 example/example_cli.cli                       |    2 +-
 example/ietf-interfaces@2014-05-08.yang       |  698 ----
 example/ietf-ipsec@2016-03-09.yang            | 3672 -----------------
 .../ietf-ipv4-unicast-routing@2014-10-26.yang |  232 --
 .../ietf-ipv6-unicast-routing@2014-10-26.yang |  636 ---
 example/ietf-routing@2014-10-26.yang          | 1112 -----
 lib/src/clixon_xml_map.c                      |   31 +-
 lib/src/clixon_xpath.c                        |    9 +-
 lib/src/clixon_yang.c                         |    2 +-
 test/lib.sh                                   |    3 +
 test/test_choice.sh                           |    2 +-
 test/test_cli.sh                              |   12 +-
 test/test_compat.sh                           |    6 +-
 test/test_feature.sh                          |   11 +-
 test/test_identity.sh                         |    1 +
 test/test_leafref.sh                          |   39 +-
 test/test_list.sh                             |   40 +-
 test/test_nacm.sh                             |    1 +
 test/test_nacm_ext.sh                         |   22 +-
 test/test_nacm_protocol.sh                    |    1 +
 test/test_netconf.sh                          |  161 +-
 test/test_openconfig.sh                       |    4 +-
 test/test_order.sh                            |    5 +-
 test/test_perf.sh                             |    1 +
 test/test_restconf.sh                         |  110 +-
 test/test_restconf2.sh                        |    1 +
 test/test_rpc.sh                              |   30 +-
 test/test_startup.sh                          |    4 +-
 test/test_stream.sh                           |    1 +
 test/test_type.sh                             |    3 +-
 test/test_union.sh                            |    3 +-
 test/test_when_must.sh                        |    3 +-
 test/test_yang.sh                             |    5 +-
 test/test_yang_load.sh                        |   14 +-
 test/test_yang_namespace.sh                   |    7 +-
 test/test_yang_parse.sh                       |   11 -
 test/test_yangmodels.sh                       |   22 +-
 yang/Makefile.in                              |   58 +-
 yang/clixon-config@2017-07-02.yang            |  220 -
 yang/clixon-config@2017-12-03.yang            |  256 --
 yang/clixon-config@2017-12-27.yang            |  291 --
 yang/clixon-config@2018-02-12.yang            |  304 --
 yang/clixon-config@2018-04-30.yang            |  353 --
 yang/clixon/Makefile.in                       |   69 +
 .../clixon-config@2018-10-21.yang             |    1 +
 yang/{ => clixon}/clixon-lib@2019-01-02.yang  |    0
 .../clixon-rfc5277@2008-07-01.yang            |    0
 yang/ietf-inet-types@2013-07-15.yang          |  457 --
 yang/ietf-restconf@2017-01-26.yang            |  279 --
 yang/ietf-yang-types@2013-07-15.yang          |  481 ---
 yang/standard/Makefile.in                     |   76 +
 .../standard}/iana-if-type@2014-05-08.yang    |    0
 .../standard}/ietf-inet-types@2013-07-15.yang |    0
 yang/standard/ietf-interfaces@2018-02-20.yang | 1123 +++++
 .../standard}/ietf-ip@2014-06-16.yang         |    0
 .../ietf-netconf-acm@2018-02-14.yang          |    0
 .../ietf-netconf-monitoring@2010-10-04.yang   |    0
 .../ietf-netconf@2011-06-01.yang              |    0
 .../ietf-restconf-monitoring@2017-01-26.yang  |    0
 yang/standard/ietf-routing@2018-03-13.yang    |  684 +++
 .../ietf-yang-library@2016-06-21.yang         |    0
 .../standard}/ietf-yang-types@2013-07-15.yang |    0
 80 files changed, 2473 insertions(+), 9505 deletions(-)
 rename example/{example.yang => clixon-example@2019-01-13.yang} (95%)
 delete mode 100644 example/ietf-interfaces@2014-05-08.yang
 delete mode 100644 example/ietf-ipsec@2016-03-09.yang
 delete mode 100644 example/ietf-ipv4-unicast-routing@2014-10-26.yang
 delete mode 100644 example/ietf-ipv6-unicast-routing@2014-10-26.yang
 delete mode 100644 example/ietf-routing@2014-10-26.yang
 delete mode 100755 test/test_yang_parse.sh
 delete mode 100644 yang/clixon-config@2017-07-02.yang
 delete mode 100644 yang/clixon-config@2017-12-03.yang
 delete mode 100644 yang/clixon-config@2017-12-27.yang
 delete mode 100644 yang/clixon-config@2018-02-12.yang
 delete mode 100644 yang/clixon-config@2018-04-30.yang
 create mode 100644 yang/clixon/Makefile.in
 rename yang/{ => clixon}/clixon-config@2018-10-21.yang (99%)
 rename yang/{ => clixon}/clixon-lib@2019-01-02.yang (100%)
 rename yang/{ => clixon}/clixon-rfc5277@2008-07-01.yang (100%)
 delete mode 100644 yang/ietf-inet-types@2013-07-15.yang
 delete mode 100644 yang/ietf-restconf@2017-01-26.yang
 delete mode 100644 yang/ietf-yang-types@2013-07-15.yang
 create mode 100644 yang/standard/Makefile.in
 rename {example => yang/standard}/iana-if-type@2014-05-08.yang (100%)
 rename {example => yang/standard}/ietf-inet-types@2013-07-15.yang (100%)
 create mode 100644 yang/standard/ietf-interfaces@2018-02-20.yang
 rename {example => yang/standard}/ietf-ip@2014-06-16.yang (100%)
 rename yang/{ => standard}/ietf-netconf-acm@2018-02-14.yang (100%)
 rename yang/{ => standard}/ietf-netconf-monitoring@2010-10-04.yang (100%)
 rename yang/{ => standard}/ietf-netconf@2011-06-01.yang (100%)
 rename yang/{ => standard}/ietf-restconf-monitoring@2017-01-26.yang (100%)
 create mode 100644 yang/standard/ietf-routing@2018-03-13.yang
 rename yang/{ => standard}/ietf-yang-library@2016-06-21.yang (100%)
 rename {example => yang/standard}/ietf-yang-types@2013-07-15.yang (100%)

diff --git a/.gitignore b/.gitignore
index 1d8e315b..5d501780 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,8 @@ etc/Makefile
 example/Makefile
 lib/Makefile
 lib/*/Makefile
+yang/Makefile
+yang/*/Makefile
 autom4te.cache/
 
 config.log
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd5694ce..2a2802e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -81,10 +81,13 @@
   * Recovery user "_nacm_recovery" added.
     * Example use is restconf PUT when NACM edit-config is permitted, then automatic commit and discard are permitted using recovery user.
   * Example user changed adm1 to andy to comply with RFC8341 example
-* Added -o "<option>=<value>" command-line option to all programs: backend, cli, netconf, restconf.
-  * Any config option from file can be overrided by giving them on command-line.
 	
 ### API changes on existing features (you may need to change your code)
+* Moved and updated all standard ietf and iana yang files from example and yang/ to `yang/standard`.
+  * To turn off install of standard yang file: `./configure --disable-stdyangs`
+  * This is to make it easier to use standard IETF/IANA yang files
+* Renamed example yang from example.yang -> clixon-example.yang
+* clixon_cli -p (printspec) changed semantics to add new yang path dir (see minor changes).
 * Date-and-time type now properly uses ISO 8601 UTC timezone designators.
   * Eg 2008-09-21T18:57:21.003456 is changed to 2008-09-21T18:57:21.003456Z
 * Renamed yang file `ietf-netconf-notification@2008-07-01.yang` to `clixon-rfc5277`.
@@ -107,6 +110,10 @@
   * For backward compatibility, define CLICON_CLI_MODEL_TREENAME_PATCH in clixon_custom.h
 
 ### Minor changes
+* Added -o "<option>=<value>" command-line option to all programs: backend, cli, netconf, restconf.
+  * Any config option from file can be overrided by giving them on command-line.
+* Added -p <dir> command-line option to all programs: backend, cli, netconf, restconf.
+  * -p adds a new dir to the yang path dir. (same as -o CLICON_YAN_DIR=<dir>)
 * Cligen uses posix regex while yang uses XSD. It differs in some aspects. A translator function has been added for `\d` -> `[0-9]` translation, there may be more.
 * Added new clixon-lib yang module for internal netconf protocol. Currently only extends the standard with a debug RPC.
 * Added three-valued return values for several validate functions where -1 is fatal error, 0 is validation failed and 1 is validation OK.
diff --git a/README.md b/README.md
index ac3c7fd1..215ac2ea 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ NETCONF and RESTCONF interfaces, an embedded database and transaction
 support.
 
   * [Background](#background)
-  * [Frequently asked questions](doc/FAQ.md)
+  * [Frequently asked questions (FAQ)](doc/FAQ.md)
   * [Installation](#installation)
   * [Licenses](#licenses)
   * [Support](#support)
diff --git a/apps/Makefile.in b/apps/Makefile.in
index d8125aa0..b6513757 100644
--- a/apps/Makefile.in
+++ b/apps/Makefile.in
@@ -44,6 +44,7 @@ SHELL	= /bin/sh
 SUBDIRS  = backend
 SUBDIRS += cli
 SUBDIRS += netconf
+# See configure.ac
 ifeq ($(with_restconf),yes)
 SUBDIRS += restconf
 endif
diff --git a/apps/backend/backend_main.c b/apps/backend/backend_main.c
index 5fbfd6e8..c6a835fe 100644
--- a/apps/backend/backend_main.c
+++ b/apps/backend/backend_main.c
@@ -73,7 +73,7 @@
 #include "backend_handle.h"
 
 /* Command line options to be passed to getopt(3) */
-#define BACKEND_OPTS "hD:f:l:d:b:Fza:u:P:1s:c:g:y:x:o:" 
+#define BACKEND_OPTS "hD:f:l:d:p:b:Fza:u:P:1s:c:g:y:x:o:" 
 
 #define BACKEND_LOGFILE "/usr/local/var/clixon_backend.log"
 
@@ -142,6 +142,7 @@ usage(clicon_handle h,
     	    "\t-f <file>\tCLICON config file\n"
 	    "\t-l (s|e|o|f<file>)  Log on (s)yslog, std(e)rr or std(o)ut (stderr is default) Only valid if -F, if background syslog is on syslog.\n"
 	    "\t-d <dir>\tSpecify backend plugin directory (default: %s)\n"
+	    "\t-p <dir>\tYang directory path (see CLICON_YANG_DIR)\n"
 	    "\t-b <dir>\tSpecify XMLDB database directory\n"
     	    "\t-F\t\tRun in foreground, do not run as daemon\n"
     	    "\t-z\t\tKill other config daemon and exit\n"
@@ -654,12 +655,18 @@ main(int    argc,
 	case 'd':  /* Plugin directory */
 	    if (!strlen(optarg))
 		usage(h, argv[0]);
-	    clicon_option_str_set(h, "CLICON_BACKEND_DIR", optarg);
+	    if (clicon_option_add(h, "CLICON_BACKEND_DIR", optarg) < 0)
+		goto done;
 	    break;
 	case 'b':  /* XMLDB database directory */
 	    if (!strlen(optarg))
 		usage(h, argv[0]);
-	    clicon_option_str_set(h, "CLICON_XMLDB_DIR", optarg);
+	    if (clicon_option_add(h, "CLICON_XMLDB_DIR", optarg) < 0)
+		goto done;
+	    break;
+	case 'p' : /* yang dir path */
+	    if (clicon_option_add(h, "CLICON_YANG_DIR", optarg) < 0)
+		goto done;
 	    break;
 	case 'F' : /* foreground */
 	    foreground = 1;
@@ -668,21 +675,25 @@ main(int    argc,
 	    zap++;
 	    break;
 	case 'a': /* internal backend socket address family */
-	    clicon_option_str_set(h, "CLICON_SOCK_FAMILY", optarg);
+	    if (clicon_option_add(h, "CLICON_SOCK_FAMILY", optarg) < 0)
+		goto done;
 	    break;
 	case 'u': /* config unix domain path / ip address */
 	    if (!strlen(optarg))
 		usage(h, argv[0]);
-	    clicon_option_str_set(h, "CLICON_SOCK", optarg);
+	    if (clicon_option_add(h, "CLICON_SOCK", optarg) < 0)
+		goto done;
 	    break;
 	case 'P': /* pidfile */
-	    clicon_option_str_set(h, "CLICON_BACKEND_PIDFILE", optarg);
+	    if (clicon_option_add(h, "CLICON_BACKEND_PIDFILE", optarg) < 0)
+		goto done;
 	    break;
 	case '1' : /* Quit after reading database once - dont wait for events */
 	    once = 1;
 	    break;
 	case 's' : /* startup mode */
-	    clicon_option_str_set(h, "CLICON_STARTUP_MODE", optarg);
+	    if (clicon_option_add(h, "CLICON_STARTUP_MODE", optarg) < 0)
+		goto done;
 	    if (clicon_startup_mode(h) < 0){
 		fprintf(stderr, "Invalid startup mode: %s\n", optarg);
 		usage(h, argv[0]);
@@ -692,16 +703,17 @@ main(int    argc,
 	    extraxml_file = optarg;
 	    break;
 	case 'g': /* config socket group */
-	    clicon_option_str_set(h, "CLICON_SOCK_GROUP", optarg);
+	    if (clicon_option_add(h, "CLICON_SOCK_GROUP", optarg) < 0)
+		goto done;
 	    break;
-	case 'y' :{ /* Load yang absolute filename */
-	    clicon_option_str_set(h, "CLICON_YANG_MAIN_FILE", optarg);
+	case 'y' : /* Load yang absolute filename */
+	    if (clicon_option_add(h, "CLICON_YANG_MAIN_FILE", optarg) < 0)
+		goto done;
 	    break;
-	}
-	case 'x' :{ /* xmldb plugin */
-	    clicon_option_str_set(h, "CLICON_XMLDB_PLUGIN", optarg);
+	case 'x' : /* xmldb plugin */
+	    if (clicon_option_add(h, "CLICON_XMLDB_PLUGIN", optarg) < 0)
+		goto done;
 	    break;
-	}
 	case 'o':{ /* Configuration option */
 	    char          *val;
 	    if ((val = index(optarg, '=')) == NULL)
diff --git a/apps/cli/cli_main.c b/apps/cli/cli_main.c
index deeafd29..0cbafccd 100644
--- a/apps/cli/cli_main.c
+++ b/apps/cli/cli_main.c
@@ -71,7 +71,7 @@
 #include "cli_handle.h"
 
 /* Command line options to be passed to getopt(3) */
-#define CLI_OPTS "hD:f:xl:F:1a:u:d:m:qpGLy:c:U:o:"
+#define CLI_OPTS "hD:f:xl:F:1a:u:d:m:qp:GLy:c:U:o:"
 
 #define CLI_LOGFILE "/tmp/clixon_cli.log"
 
@@ -221,7 +221,7 @@ usage(clicon_handle h,
 	    "\t-d <dir>\tSpecify plugin directory (default: %s)\n"
             "\t-m <mode>\tSpecify plugin syntax mode\n"
 	    "\t-q \t\tQuiet mode, dont print greetings or prompt, terminate on ctrl-C\n"
-	    "\t-p \t\tPrint database yang specification\n"
+	    "\t-p <dir>\tYang directory path (see CLICON_YANG_DIR)\n"
 	    "\t-G \t\tPrint CLI syntax generated from dbspec (if CLICON_CLI_GENMODEL enabled)\n"
 	    "\t-L \t\tDebug print dynamic CLI syntax including completions and expansions\n"
 	    "\t-l <s|e|o|f<file>> \tLog on (s)yslog, std(e)rr, std(o)ut or (f)ile (stderr is default)\n"
@@ -246,7 +246,6 @@ main(int argc, char **argv)
     char	*tmp;
     char	*argv0 = argv[0];
     clicon_handle h;
-    int          printspec = 0;
     int          printgen  = 0;
     int          logclisyntax  = 0;
     int          help = 0;
@@ -361,28 +360,33 @@ main(int argc, char **argv)
 	    once = 1;
 	    break;
 	case 'a': /* internal backend socket address family */
-	    clicon_option_str_set(h, "CLICON_SOCK_FAMILY", optarg);
+	    if (clicon_option_add(h, "CLICON_SOCK_FAMILY", optarg) < 0)
+		goto done;
 	    break;
 	case 'u': /* internal backend socket unix domain path or ip host */
 	    if (!strlen(optarg))
 		usage(h, argv[0]);
-	    clicon_option_str_set(h, "CLICON_SOCK", optarg);
+	    if (clicon_option_add(h, "CLICON_SOCK", optarg) < 0)
+		goto done;
 	    break;
 	case 'd':  /* Plugin directory: overrides configfile */
 	    if (!strlen(optarg))
 		usage(h, argv[0]);
-	    clicon_option_str_set(h, "CLICON_CLI_DIR", optarg);
+	    if (clicon_option_add(h, "CLICON_CLI_DIR", optarg) < 0)
+		goto done;
 	    break;
 	case 'm': /* CLI syntax mode */
 	    if (!strlen(optarg))
 		usage(h, argv[0]);
-	    clicon_option_str_set(h, "CLICON_CLI_MODE", optarg);
+	    if (clicon_option_add(h, "CLICON_CLI_MODE", optarg) < 0)
+		goto done;
 	    break;
 	case 'q' : /* Quiet mode */
 	    clicon_quiet_mode_set(h, 1);
 	    break;
-	case 'p' : /* Print spec */
-	    printspec++;
+	case 'p' : /* yang dir path */
+	    if (clicon_option_add(h, "CLICON_YANG_DIR", optarg) < 0)
+		goto done;
 	    break;
 	case 'G' : /* Print generated CLI syntax */
 	    printgen++;
@@ -390,14 +394,14 @@ main(int argc, char **argv)
 	case 'L' : /* Debug print dynamic CLI syntax */
 	    logclisyntax++;
 	    break;
-	case 'y' :{ /* Load yang absolute filename */
-	    clicon_option_str_set(h, "CLICON_YANG_MAIN_FILE", optarg);
+	case 'y' : /* Load yang absolute filename */
+	    if (clicon_option_add(h, "CLICON_YANG_MAIN_FILE", optarg) < 0)
+		goto done;
 	    break;
-	}
-	case 'c' :{ /* Overwrite clispec with absolute filename */
-	    clicon_option_str_set(h, "CLICON_CLISPEC_FILE", optarg);
+	case 'c' : /* Overwrite clispec with absolute filename */
+	    if (clicon_option_add(h, "CLICON_CLISPEC_FILE", optarg) < 0)
+		goto done;
 	    break;
-	}
 	case 'U': /* Clixon 'pseudo' user */
 	    if (!strlen(optarg))
 		usage(h, argv[0]);
@@ -463,8 +467,6 @@ main(int argc, char **argv)
      /* Load yang module library, RFC7895 */
     if (yang_modules_init(h) < 0)
 	goto done;
-    if (printspec)
-	yang_print(stdout, (yang_node*)yspec);
 
     /* Create tree generated from dataspec. If no other trees exists, this is
      * the only one.
diff --git a/apps/netconf/netconf_main.c b/apps/netconf/netconf_main.c
index b3fd3a22..b6c1e930 100644
--- a/apps/netconf/netconf_main.c
+++ b/apps/netconf/netconf_main.c
@@ -71,7 +71,7 @@
 #include "netconf_rpc.h"
 
 /* Command line options to be passed to getopt(3) */
-#define NETCONF_OPTS "hD:f:l:qa:u:d:y:U:t:o:"
+#define NETCONF_OPTS "hD:f:l:qa:u:d:p:y:U:t:o:"
 
 #define NETCONF_LOGFILE "/tmp/clixon_netconf.log"
 
@@ -324,13 +324,13 @@ usage(clicon_handle h,
 	    "where options are\n"
             "\t-h\t\tHelp\n"
 	    "\t-D <level>\tDebug level\n"
-            "\t-q\t\tQuiet: dont send hello prompt\n"
     	    "\t-f <file>\tConfiguration file (mandatory)\n"
 	    "\t-l (e|o|s|f<file>) \tLog on std(e)rr, std(o)ut, (s)yslog, (f)ile (syslog is default)\n"
+            "\t-q\t\tQuiet: dont send hello prompt\n"
     	    "\t-a UNIX|IPv4|IPv6\tInternal backend socket family\n"
     	    "\t-u <path|addr>\tInternal socket domain path or IP addr (see -a)\n"
 	    "\t-d <dir>\tSpecify netconf plugin directory dir (default: %s)\n"
-
+	    "\t-p <dir>\tYang directory path (see CLICON_YANG_DIR)\n"
 	    "\t-y <file>\tLoad yang spec file (override yang main module)\n"
 	    "\t-U <user>\tOver-ride unix user with a pseudo user for NACM.\n"
 	    "\t-t <sec>\tTimeout in seconds. Quit after this time.\n"
@@ -418,6 +418,9 @@ main(int    argc,
 	case 'f':  /* config file */
 	case 'l':  /* log  */
 	    break; /* see above */
+	case 'q':  /* quiet: dont write hello */
+	    quiet++;
+	    break;
 	case 'a': /* internal backend socket address family */
 	    clicon_option_str_set(h, "CLICON_SOCK_FAMILY", optarg);
 	    break;
@@ -426,18 +429,20 @@ main(int    argc,
 		usage(h, argv[0]);
 	    clicon_option_str_set(h, "CLICON_SOCK", optarg);
 	    break;
-	case 'q':  /* quiet: dont write hello */
-	    quiet++;
-	    break;
 	case 'd':  /* Plugin directory */
 	    if (!strlen(optarg))
 		usage(h, argv[0]);
-	    clicon_option_str_set(h, "CLICON_NETCONF_DIR", optarg);
+	    if (clicon_option_add(h, "CLICON_NETCONF_DIR", optarg) < 0)
+		goto done;
 	    break;
-	case 'y' :{ /* Load yang spec file (override yang main module) */
-	    clicon_option_str_set(h, "CLICON_YANG_MAIN_FILE", optarg);
+	case 'p' : /* yang dir path */
+	    if (clicon_option_add(h, "CLICON_YANG_DIR", optarg) < 0)
+		goto done;
+	    break;
+	case 'y' : /* Load yang spec file (override yang main module) */
+	    if (clicon_option_add(h, "CLICON_YANG_MAIN_FILE", optarg) < 0)
+		goto done;
 	    break;
-	}
 	case 'U': /* Clixon 'pseudo' user */
 	    if (!strlen(optarg))
 		usage(h, argv[0]);
diff --git a/apps/restconf/restconf_main.c b/apps/restconf/restconf_main.c
index c92a2ff1..d83f1a27 100644
--- a/apps/restconf/restconf_main.c
+++ b/apps/restconf/restconf_main.c
@@ -81,7 +81,7 @@
 #include "restconf_stream.h"
 
 /* Command line options to be passed to getopt(3) */
-#define RESTCONF_OPTS "hD:f:l:p:y:a:u:o:"
+#define RESTCONF_OPTS "hD:f:l:p:d:y:a:u:o:"
 
 /* RESTCONF enables deployments to specify where the RESTCONF API is 
    located.  The client discovers this by getting the "/.well-known/host-meta"
@@ -492,6 +492,7 @@ usage(clicon_handle h,
 	    "\t-D <level>\tDebug level\n"
     	    "\t-f <file>\tConfiguration file (mandatory)\n"
 	    "\t-l <s|f<file>> \tLog on (s)yslog, (f)ile (syslog is default)\n"
+	    "\t-p <dir>\tYang directory path (see CLICON_YANG_DIR)\n"
 	    "\t-d <dir>\tSpecify restconf plugin directory dir (default: %s)\n"
 	    "\t-y <file>\tLoad yang spec file (override yang main module)\n"
     	    "\t-a UNIX|IPv4|IPv6\tInternal backend socket family\n"
@@ -596,6 +597,10 @@ main(int    argc,
 	case 'f':  /* config file */
 	case 'l':  /* log  */
 	    break; /* see above */
+	case 'p' : /* yang dir path */
+	    if (clicon_option_add(h, "CLICON_YANG_DIR", optarg) < 0)
+		goto done;
+	    break;
 	case 'd':  /* Plugin directory */
 	    if (!strlen(optarg))
 		usage(h, argv[0]);
diff --git a/apps/restconf/restconf_methods.c b/apps/restconf/restconf_methods.c
index 58980589..754592c9 100644
--- a/apps/restconf/restconf_methods.c
+++ b/apps/restconf/restconf_methods.c
@@ -270,8 +270,17 @@ api_data_get2(clicon_handle h,
 	}
     }
     else{
-	if (xpath_vec(xret, "%s", &xvec, &xlen, path) < 0)
-	    goto done;
+	if (xpath_vec(xret, "%s", &xvec, &xlen, path) < 0){
+	    if (netconf_operation_failed_xml(&xerr, "application", clicon_err_reason) < 0)
+		goto done;
+	    if ((xe = xpath_first(xerr, "rpc-error")) == NULL){
+		clicon_err(OE_XML, EINVAL, "rpc-error not found (internal error)");
+		goto done;
+	    }
+	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		goto done;
+	    goto ok;
+	}
 	if (use_xml){
 	    for (i=0; i<xlen; i++){
 		char *prefix, *namespace;
@@ -302,6 +311,7 @@ api_data_get2(clicon_handle h,
     FCGX_FPrintF(r->out, "\r\n");
     FCGX_FPrintF(r->out, "%s", cbx?cbuf_get(cbx):"");
     FCGX_FPrintF(r->out, "\r\n\r\n");
+    clicon_debug(1, "%s Z", __FUNCTION__);
  ok:
     retval = 0;
  done:
diff --git a/configure b/configure
index 7eba05ec..a5767406 100755
--- a/configure
+++ b/configure
@@ -635,6 +635,7 @@ EXEEXT
 ac_ct_CC
 wwwuser
 wwwdir
+enable_stdyangs
 with_restconf
 RANLIB
 SH_SUFFIX
@@ -711,6 +712,7 @@ ac_user_opts='
 enable_option_checking
 enable_debug
 with_cligen
+enable_stdyangs
 enable_publish
 with_restconf
 with_configfile
@@ -1350,6 +1352,8 @@ Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-debug          Build with debug symbols, default: no
+  --disable-stdyangs      Include standard yang files in clixon install,
+                          default: yes
   --enable-publish        Enable publish of notification streams using SSE and
                           curl
 
@@ -2457,6 +2461,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
  # If yes, compile apps/restconf
+
 wwwdir=/www-data
 
 wwwuser=www-data
@@ -3691,6 +3696,26 @@ if test "${with_cligen}"; then
   test -d "$with_cligen" && CLIGEN_PREFIX="$with_cligen"
 fi
 
+# Disable/enable standard Yang files.
+# If enable - include yang/standard/*.yang in clixon yang files (default)
+# If disable - get standard yang files from elsewhere
+# Check whether --enable-stdyangs was given.
+if test "${enable_stdyangs+set}" = set; then :
+  enableval=$enable_stdyangs;
+	  if test "$enableval" = no; then
+	      enable_stdyangs=no
+	  else
+	      enable_stdyangs=yes
+          fi
+
+else
+   enable_stdyangs=yes
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: stdyangs is $enable_stdyangs" >&5
+$as_echo "stdyangs is $enable_stdyangs" >&6; }
+
 # Experimental: Curl publish notification stream to eg Nginx nchan.
 # Check whether --enable-publish was given.
 if test "${enable_publish+set}" = set; then :
@@ -4408,7 +4433,7 @@ _ACEOF
 
 
 
-ac_config_files="$ac_config_files Makefile lib/Makefile lib/src/Makefile lib/clixon/Makefile apps/Makefile apps/cli/Makefile apps/backend/Makefile apps/netconf/Makefile apps/restconf/Makefile include/Makefile etc/Makefile etc/clixonrc example/Makefile extras/rpm/Makefile docker/Makefile datastore/Makefile datastore/text/Makefile util/Makefile yang/Makefile doc/Makefile"
+ac_config_files="$ac_config_files Makefile lib/Makefile lib/src/Makefile lib/clixon/Makefile apps/Makefile apps/cli/Makefile apps/backend/Makefile apps/netconf/Makefile apps/restconf/Makefile include/Makefile etc/Makefile etc/clixonrc example/Makefile extras/rpm/Makefile docker/Makefile datastore/Makefile datastore/text/Makefile util/Makefile yang/Makefile yang/clixon/Makefile yang/standard/Makefile doc/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -5121,6 +5146,8 @@ do
     "datastore/text/Makefile") CONFIG_FILES="$CONFIG_FILES datastore/text/Makefile" ;;
     "util/Makefile") CONFIG_FILES="$CONFIG_FILES util/Makefile" ;;
     "yang/Makefile") CONFIG_FILES="$CONFIG_FILES yang/Makefile" ;;
+    "yang/clixon/Makefile") CONFIG_FILES="$CONFIG_FILES yang/clixon/Makefile" ;;
+    "yang/standard/Makefile") CONFIG_FILES="$CONFIG_FILES yang/standard/Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
diff --git a/configure.ac b/configure.ac
index 94710961..f6aa83e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,6 +91,7 @@ AC_SUBST(LIBS)
 AC_SUBST(SH_SUFFIX)
 AC_SUBST(RANLIB)
 AC_SUBST(with_restconf) # If yes, compile apps/restconf
+AC_SUBST(enable_stdyangs) 
 AC_SUBST(wwwdir,/www-data)
 AC_SUBST(wwwuser,www-data)
 #
@@ -145,6 +146,20 @@ if test "${with_cligen}"; then
   test -d "$with_cligen" && CLIGEN_PREFIX="$with_cligen"
 fi
 
+# Disable/enable standard Yang files.
+# If enable - include yang/standard/*.yang in clixon yang files (default)
+# If disable - get standard yang files from elsewhere
+AC_ARG_ENABLE(stdyangs, AS_HELP_STRING([--disable-stdyangs],[Include standard yang files in clixon install, default: yes]),[
+	  if test "$enableval" = no; then
+	      enable_stdyangs=no
+	  else	      
+	      enable_stdyangs=yes
+          fi
+        ],
+	[ enable_stdyangs=yes])
+
+AC_MSG_RESULT(stdyangs is $enable_stdyangs)	
+
 # Experimental: Curl publish notification stream to eg Nginx nchan. 
 AC_ARG_ENABLE(publish, AS_HELP_STRING([--enable-publish],[Enable publish of notification streams using SSE and curl]),[
 	  if test "$enableval" = no; then
@@ -231,6 +246,8 @@ AC_OUTPUT(Makefile
 	  datastore/text/Makefile
   	  util/Makefile 
 	  yang/Makefile
+  	  yang/clixon/Makefile
+  	  yang/standard/Makefile
 	  doc/Makefile
 )
 
diff --git a/doc/FAQ.md b/doc/FAQ.md
index ff49df1a..1677ad7b 100644
--- a/doc/FAQ.md
+++ b/doc/FAQ.md
@@ -137,8 +137,12 @@ Start nginx daemon
 ```
 sudo /etc/init.d/nginx start
 ```
+Start the clixon restconf daemon
+```
+sudo su -c "/www-data/clixon_restconf -f /usr/local/etc/example.xml " -s /bin/sh www-data
+```
 
-Example:
+Then acess:
 ```
    curl -G http://127.0.0.1/restconf/data/ietf-interfaces:interfaces/interface=eth9/type
    [
@@ -147,7 +151,7 @@ Example:
      }
    ]
 ```
-Read more in the (restconf)[../apps/restconf] docs.
+Read more in the [restconf](../apps/restconf) docs.
 ## What about reference documentation?
 Clixon uses [Doxygen](http://www.doxygen.nl/index.html) for reference documentation.
 You need to install doxygen and graphviz on your system.
@@ -188,6 +192,15 @@ Clixon by default finds its configuration file at `/usr/local/etc/clixon.xml`. H
   - Provide --sysconfig=<dir> when configuring. Then FILE is <dir>/etc/clixon.xml
   - FILE is /usr/local/etc/clixon.xml
 
+## Can I modify clixon options at runtime?
+
+Yes, when you start a clixon program, you can supply the `-o` option to modify the configuration specified in the configuration file. Options that are leafs are overriden, whereas options that are leaf-lists are added to.
+
+Example, add the "usr/local/share/ietf" directory to the list of directories where yang files are searched for:
+```
+  clixon_cli -o CLICON_YANG_DIR=/usr/local/share/ietf
+```
+
 ## How are Yang files found?
 
 Yang files contain the configuration specification. A Clixon
@@ -404,7 +417,7 @@ Please look at the example for an example on how to write a state data callback.
 
 A YANG RPC is an application specific operation. Example:
 ```
-   rpc fib-route {
+   rpc example-rpc {
       input {
          leaf inarg { type string; }
       }
@@ -413,7 +426,7 @@ A YANG RPC is an application specific operation. Example:
       }
    }
 ```
-which defines the fib-route operation present in the example (the arguments have been changed).
+which defines the example-rpc operation present in the example (the arguments have been changed).
 
 Clixon automatically relays the RPC to the clixon backend. To
 implement the RFC, you need to register an RPC callback in the backend plugin:
@@ -423,18 +436,18 @@ int
 clixon_plugin_init(clicon_handle h)
 {
 ...
-   rpc_callback_register(h, fib_route, NULL, "fib-route");
+   rpc_callback_register(h, example_rpc, NULL, "example-rpc");
 ...
 }
 ```
 And then define the callback itself:
 ```
 static int 
-fib_route(clicon_handle h,            /* Clicon handle */
-	  cxobj        *xe,           /* Request: <rpc><xn></rpc> */
-	  cbuf         *cbret,        /* Reply eg <rpc-reply>... */
-	  void         *arg,          /* Client session */
-	  void         *regarg)       /* Argument given at register */
+example_rpc(clicon_handle h,            /* Clicon handle */
+	    cxobj        *xe,           /* Request: <rpc><xn></rpc> */
+	    cbuf         *cbret,        /* Reply eg <rpc-reply>... */
+	    void         *arg,          /* Client session */
+	    void         *regarg)       /* Argument given at register */
 {
     cprintf(cbret, "<rpc-reply><ok/></rpc-reply>");    
     return 0;
diff --git a/example/Makefile.in b/example/Makefile.in
index 8e18d3ea..e4e60549 100644
--- a/example/Makefile.in
+++ b/example/Makefile.in
@@ -43,6 +43,8 @@ localstatedir   = @localstatedir@
 libdir          = @exec_prefix@/lib
 
 APPNAME	        = example
+# Here is where example yang appears
+CLIXON_DATADIR  = @CLIXON_DATADIR@
 # Install here if you want default clixon location:
 CLIXON_DEFAULT_CONFIG = @CLIXON_DEFAULT_CONFIG@
 
@@ -70,16 +72,7 @@ all:	$(PLUGINS)
 
 CLISPECS = $(APPNAME)_cli.cli
 
-YANGSPECS	 = $(APPNAME).yang
-YANGSPECS	+= ietf-yang-types@2013-07-15.yang
-YANGSPECS	+= ietf-inet-types@2013-07-15.yang
-YANGSPECS	+= ietf-interfaces@2014-05-08.yang
-YANGSPECS	+= ietf-ip@2014-06-16.yang
-YANGSPECS	+= ietf-routing@2014-10-26.yang
-YANGSPECS	+= ietf-ipv4-unicast-routing@2014-10-26.yang
-YANGSPECS	+= ietf-ipv6-unicast-routing@2014-10-26.yang
-YANGSPECS	+= ietf-ipsec@2016-03-09.yang
-YANGSPECS	+= iana-if-type@2014-05-08.yang
+YANGSPECS	 = clixon-example@2019-01-13.yang
 
 # Backend plugin
 BE_SRC   = $(APPNAME)_backend.c
@@ -125,7 +118,7 @@ install: $(YANGSPECS) $(CLISPECS) $(BE_PLUGIN) $(BE2_PLUGIN) $(CLI_PLUGIN) $(NET
 	install -m 0644 $(APPNAME).xml $(DESTDIR)$(sysconfdir)
 #	install -m 0644 $(APPNAME).xml $(DESTDIR)$(CLIXON_DEFAULT_CONFIG)
 	install -d -m 0755 $(DESTDIR)$(datarootdir)/$(APPNAME)/yang
-	install -m 0644 $(YANGSPECS) $(DESTDIR)$(datarootdir)/$(APPNAME)/yang
+	install -m 0644 $(YANGSPECS) $(DESTDIR)$(DESTDIR)$(CLIXON_DATADIR)
 	install -d -m 0755 $(DESTDIR)$(libdir)/$(APPNAME)/cli
 	install -m 0644 $(INSTALLFLAGS) $(CLI_PLUGIN) $(DESTDIR)$(libdir)/$(APPNAME)/cli
 	install -d -m 0755 $(DESTDIR)$(libdir)/$(APPNAME)/backend
diff --git a/example/README.md b/example/README.md
index a0a1d621..8e9c61f0 100644
--- a/example/README.md
+++ b/example/README.md
@@ -16,9 +16,9 @@
 
 This directory contains a Clixon example which includes a simple example. It contains the following files:
 * `example.xml`       The configuration file. See (yang/clixon-config@<date>.yang)[../yang/clixon-config@2018-10-21.yang] for the documentation of all available fields.
-* `example.yang`      The yang spec of the example. It mainly includes ietf routing and IP modules.
+* `clixon-example@2019-01-13.yang`      The yang spec of the example.
 * `example_cli.cli`   CLIgen specification.
-* `example_cli.c`     CLI callback plugin containing functions called in the cli file above: a generic callback (`mycallback`) and an RPC (`fib_route_rpc`).
+* `example_cli.c`     CLI callback plugin containing functions called in the cli file above: a generic callback (`mycallback`) and an example RPC call (`example_client_rpc`).
 * `example_backend.c` Backend callback plugin including example of:
   * transaction callbacks (validate/commit),
   * notification,
@@ -115,6 +115,31 @@ The following example shows how to set data using netconf:
 <rpc><get-config><source><candidate/></source><filter type="xpath" select="/interfaces/interface"/></get-config></rpc>]]>]]>
 <rpc><validate><source><candidate/></source></validate></rpc>]]>]]>
 ```
+## Restconf
+
+Setup a web/reverse-proxy server.
+For example, using nginx, install, and edit config file: /etc/nginx/sites-available/default:
+```
+server {
+  ...
+  location /restconf {
+    fastcgi_pass unix:/www-data/fastcgi_restconf.sock;
+    include fastcgi_params;
+  }
+}
+```
+Start nginx daemon
+```
+sudo /etc/init.d/nginx start
+```
+Start the clixon restconf daemon
+```
+sudo su -c "/www-data/clixon_restconf -f /usr/local/etc/example.xml " -s /bin/sh www-data
+```
+then access using curl or wget:
+```
+   curl -G http://127.0.0.1/restconf/data/ietf-interfaces:interfaces/interface=eth9/type
+```
 
 ## Streams
 
@@ -153,52 +178,59 @@ independent of the yang rpc construct, but it is recommended. The example includ
 
 Example using CLI:
 ```
+clixon_cli -f /usr/local/etc/example.xml
 cli> rpc ipv4
-    rpc-reply {
-        route {
-            address-family ipv4;
-            next-hop {
-                next-hop-list 2.3.4.5;
-            }
-            source-protocol static;
-        }
-    }
+<rpc-reply><x xmlns="urn:example:clixon">ipv4</x><y xmlns="urn:example:clixon">42</y></rpc-reply>
 ```
-Netconf:
+Example using Netconf:
 ```
-<rpc><fib-route xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"><routing-instance-name>ipv4</routing-instance-name></fib-route></rpc>]]>]]>
-<rpc-reply><route xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"><address-family>ipv4</address-family><next-hop><next-hop-list>2.3.4.5</next-hop-list></next-hop><source-protocol>static</source-protocol></route></rpc-reply>]]>]]>
+clixon_netconf -qf /usr/local/etc/example.xml
+<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><example xmlns="urn:example:clixon"><x>ipv4</x></example></rpc>]]>]]>
+<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><x xmlns="urn:example:clixon">ipv4</x><y xmlns="urn:example:clixon">42</y></rpc-reply>]]>]]>
 ```
-Restconf:
+Restconf (assuming nginx started):
 ```
-curl -X POST  http://localhost/restconf/operations/ietf-routing:fib-route -d '{"ietf-routing:input":{"routing-instance-name":"ipv4"}}'
+sudo su -c "/www-data/clixon_restconf -f /usr/local/etc/example.xml " -s /bin/sh www-data&
+curl -X POST  http://localhost/restconf/operations/clixon-example:example -d '{"clixon-example:input":{"x":"ipv4"}}'
+{
+  "clixon-example:output": {
+    "x": "ipv4",
+    "y": "42"
+  }
+}
 ```
 
 ### Details
 
-The example works by creating a netconf rpc call and sending it to the backend: (see the fib_route_rpc() function in [example_cli.c](example_cli.c)).
+The example works by defining an RPC in clixon-example.yang:
+```
+    rpc example {
+	description "Some example input/output for testing RFC7950 7.14.
+                     RPC simply echoes the input for debugging.";
+    	input {
+	    leaf x {
+        ...
+```
 
-In the (example_backend.c)[example_backend.c], a callback is registered (fib_route()) which handles the RPC (this is just dummy data):
+In the CLI a netconf rpc call is constructed and sent to the backend: See `example_client_rpc()` in [example_cli.c] CLI plugin.
+
+The clixon backend  plugin [example_backend.c] reveives the netconf call and replies. This is made byregistering a callback handling handling the RPC:
 ```
 static int 
-fib_route(clicon_handle h, 
-	  cxobj        *xe,           /* Request: <rpc><xn></rpc> */
-	  cbuf         *cbret,        /* Reply eg <rpc-reply>... */
-	  void         *arg,          /* Client session */
-	  void         *regarg)       /* Argument given at register */
+example_rpc(clicon_handle h, 
+	    cxobj        *xe,           /* Request: <rpc><xn></rpc> */
+	    cbuf         *cbret,        /* Reply eg <rpc-reply>... */
+	    void         *arg,          /* Client session */
+	    void         *regarg)       /* Argument given at register */
 {
-    cprintf(cbret, "<rpc-reply><route xmlns=\"urn:ietf:params:xml:ns:yang:ietf-routing\">"
-	    "<address-family>ipv4</address-family>"
-	    "<next-hop><next-hop-list>2.3.4.5</next-hop-list></next-hop>"
-	    "<source-protocol>static</source-protocol>"
-	    "</route></rpc-reply>");    
+    /* code that echoes the request */
     return 0;
 }
 int
 clixon_plugin_init(clicon_handle h)
 {
 ...
-   rpc_callback_register(h, fib_route, NULL, "fib-route");
+   rpc_callback_register(h, example_rpc, NULL, "example");
 ...
 }
 ```
@@ -274,7 +306,7 @@ clixon_plugin_api *
 clixon_plugin_init(clicon_handle h)
 {
     /* Optional callback registration for RPC calls */
-    rpc_callback_register(h, fib_route, NULL, "fib-route");
+    rpc_callback_register(h, example_rpc, NULL, "example");
     /* Return plugin API */
     return &api; /* Return NULL on error */
 }
diff --git a/example/example.yang b/example/clixon-example@2019-01-13.yang
similarity index 95%
rename from example/example.yang
rename to example/clixon-example@2019-01-13.yang
index f5e82063..40e53cc6 100644
--- a/example/example.yang
+++ b/example/clixon-example@2019-01-13.yang
@@ -1,22 +1,20 @@
-module example {
+module clixon-example {
     yang-version 1.1;
     namespace "urn:example:clixon";
     prefix ex;
+    revision 2019-01-13 {
+	description
+	    "Released in Clixon 3.9";
+    }
     import ietf-interfaces {
 	prefix if;
     }
     import ietf-ip {
 	prefix ip;
     }
-    import ietf-routing {
-        description "defines fib-route";
-	prefix rt;
-    }
     import iana-if-type {
       prefix ianaift;
     }
-    description
-	"Example code that includes ietf-ip and ietf-routing";
     /* Example interface type for tests, local callbacks, etc */
     identity eth {
 	base if:interface-type;
diff --git a/example/example.xml b/example/example.xml
index b6b42cdb..aaf202b0 100644
--- a/example/example.xml
+++ b/example/example.xml
@@ -1,9 +1,8 @@
 <config>
   <CLICON_CONFIGFILE>/usr/local/etc/example.xml</CLICON_CONFIGFILE>
   <CLICON_FEATURE>*:*</CLICON_FEATURE>
-  <CLICON_YANG_DIR>/usr/local/share/example/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
-  <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
+  <CLICON_YANG_MODULE_MAIN>clixon-example</CLICON_YANG_MODULE_MAIN>
   <CLICON_CLI_MODE>example</CLICON_CLI_MODE>
   <CLICON_BACKEND_DIR>/usr/local/lib/example/backend</CLICON_BACKEND_DIR>
   <CLICON_NETCONF_DIR>/usr/local/lib/example/netconf</CLICON_NETCONF_DIR>
diff --git a/example/example_backend.c b/example/example_backend.c
index a322ad1e..615d7937 100644
--- a/example/example_backend.c
+++ b/example/example_backend.c
@@ -119,38 +119,6 @@ example_stream_timer_setup(clicon_handle h)
     return event_reg_timeout(t, example_stream_timer, h, "example stream timer");
 }
 
-/*! IETF Routing fib-route rpc 
- * @see ietf-routing@2014-10-26.yang  (fib-route)
- */
-static int 
-fib_route(clicon_handle h,            /* Clicon handle */
-	  cxobj        *xe,           /* Request: <rpc><xn></rpc> */
-	  cbuf         *cbret,        /* Reply eg <rpc-reply>... */
-	  void         *arg,          /* Client session */
-	  void         *regarg)       /* Argument given at register */
-{
-    cprintf(cbret, "<rpc-reply><route xmlns=\"urn:ietf:params:xml:ns:yang:ietf-routing\">"
-	    "<address-family>ipv4</address-family>"
-	    "<next-hop><next-hop-list>2.3.4.5</next-hop-list></next-hop>"
-	    "<source-protocol>static</source-protocol>"
-	    "</route></rpc-reply>");    
-    return 0;
-}
-
-/*! IETF Routing route-count rpc 
- * @see ietf-routing@2014-10-26.yang  (route-count)
- */
-static int 
-route_count(clicon_handle h, 
-	    cxobj        *xe,           /* Request: <rpc><xn></rpc> */
-	    cbuf         *cbret,        /* Reply eg <rpc-reply>... */
-	    void         *arg,
-	    void         *regarg)          /* Argument given at register */
-{
-    cprintf(cbret, "<rpc-reply><number-of-routes xmlns=\"urn:ietf:params:xml:ns:yang:ietf-routing\">42</number-of-routes></rpc-reply>");    
-    return 0;
-}
-
 /*! Smallest possible RPC declaration for test 
  * Yang/XML:
  * If the RPC operation invocation succeeded and no output parameters
@@ -364,18 +332,6 @@ clixon_plugin_init(clicon_handle h)
 
     /* Register callback for routing rpc calls 
      */
-
-    if (rpc_callback_register(h, fib_route, 
-			      NULL, 
-			      "fib-route"/* Xml tag when callback is made */
-			      ) < 0)
-	goto done;
-    /* From ietf-routing.yang */
-    if (rpc_callback_register(h, route_count, 
-			      NULL, 
-			      "route-count"/* Xml tag when callback is made */
-			      ) < 0)
-	goto done;
     /* From example.yang (clicon) */
     if (rpc_callback_register(h, empty_rpc, 
 			      NULL, 
diff --git a/example/example_cli.c b/example/example_cli.c
index ebd2305a..10e122ee 100644
--- a/example/example_cli.c
+++ b/example/example_cli.c
@@ -71,7 +71,6 @@ mycallback(clicon_handle h, cvec *cvv, cvec *argv)
 			      "/interfaces/interface[name='eth0']",
 			      &xret) < 0)
 	goto done;
-
     xml_print(stdout, xret);
     retval = 0;
  done:
@@ -80,25 +79,25 @@ mycallback(clicon_handle h, cvec *cvv, cvec *argv)
     return retval;
 }
 
-/*! Example "downcall": ietf-routing fib-route RPC */
+/*! Example "downcall", ie initiate an RPC to the backend */
 int
-fib_route_rpc(clicon_handle h, 
-	      cvec         *cvv, 
-	      cvec         *argv)
+example_client_rpc(clicon_handle h, 
+		   cvec         *cvv, 
+		   cvec         *argv)
 {
     int        retval = -1;
-    cg_var    *instance;
+    cg_var    *cva;
     cxobj     *xtop = NULL;
     cxobj     *xrpc;
     cxobj     *xret = NULL;
     cxobj     *xerr;
 
     /* User supplied variable in CLI command */
-    instance = cvec_find(cvv, "instance"); /* get a cligen variable from vector */
-    /* Create XML for fib-route netconf RPC */
-    if (xml_parse_va(&xtop, NULL, "<rpc xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\" username=\"%s\"><fib-route xmlns=\"urn:ietf:params:xml:ns:yang:ietf-routing\"><routing-instance-name>%s</routing-instance-name><destination-address><address-family>ipv4</address-family></destination-address></fib-route></rpc>",
+    cva = cvec_find(cvv, "a"); /* get a cligen variable from vector */
+    /* Create XML for example netconf RPC */
+    if (xml_parse_va(&xtop, NULL, "<rpc message-id=\"101\" xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\" username=\"%s\"><example xmlns=\"urn:example:clixon\"><x>%s</x></example></rpc>",
 		     clicon_username_get(h),
-		     cv_string_get(instance)) < 0)
+		     cv_string_get(cva)) < 0)
 	goto done;
     /* Skip top-level */
     xrpc = xml_child_i(xtop, 0);
@@ -110,7 +109,12 @@ fib_route_rpc(clicon_handle h,
 	goto done;
     }
     /* Print result */
-    xml2txt(stdout, xml_child_i(xret, 0), 0);
+    clicon_xml2file(stdout, xml_child_i(xret, 0), 0, 0);
+    fprintf(stdout,"\n");
+
+    /* pretty-print:
+       xml2txt(stdout, xml_child_i(xret, 0), 0);
+    */
     retval = 0;
  done:
     if (xret)
diff --git a/example/example_cli.cli b/example/example_cli.cli
index 892c687a..52c2bcf7 100644
--- a/example/example_cli.cli
+++ b/example/example_cli.cli
@@ -63,7 +63,7 @@ load("Load configuration from XML file") <filename:string>("Filename (local file
     merge("Merge file with existent candidate"), load_config_file("filename", "merge");
 }
 example("This is a comment") <var:int32>("Just a random number"), mycallback("myarg");
-rpc("ex:fib-route rpc") <instance:string>("routing instance"), fib_route_rpc("myarg");
+rpc("example rpc") <a:string>("routing instance"), example_client_rpc("");
 notify("Get notifications from backend"), cli_notify("EXAMPLE", "1", "text");
 no("Negate") notify("Get notifications from backend"), cli_notify("EXAMPLE", "0", "xml");
 lock,cli_lock("candidate");
diff --git a/example/ietf-interfaces@2014-05-08.yang b/example/ietf-interfaces@2014-05-08.yang
deleted file mode 100644
index 217bd979..00000000
--- a/example/ietf-interfaces@2014-05-08.yang
+++ /dev/null
@@ -1,698 +0,0 @@
-   module ietf-interfaces {
-
-     namespace "urn:ietf:params:xml:ns:yang:ietf-interfaces";
-     prefix if;
-
-     import ietf-yang-types {
-       prefix yang;
-     }
-
-     organization
-       "IETF NETMOD (NETCONF Data Modeling Language) Working Group";
-
-     contact
-       "WG Web:   <http://tools.ietf.org/wg/netmod/>
-        WG List:  <mailto:netmod@ietf.org>
-
-        WG Chair: Thomas Nadeau
-                  <mailto:tnadeau@lucidvision.com>
-
-        WG Chair: Juergen Schoenwaelder
-                  <mailto:j.schoenwaelder@jacobs-university.de>
-
-        Editor:   Martin Bjorklund
-                  <mailto:mbj@tail-f.com>";
-
-     description
-       "This module contains a collection of YANG definitions for
-        managing network interfaces.
-
-        Copyright (c) 2014 IETF Trust and the persons identified as
-        authors of the code.  All rights reserved.
-
-        Redistribution and use in source and binary forms, with or
-        without modification, is permitted pursuant to, and subject
-        to the license terms contained in, the Simplified BSD License
-        set forth in Section 4.c of the IETF Trust's Legal Provisions
-        Relating to IETF Documents
-        (http://trustee.ietf.org/license-info).
-
-        This version of this YANG module is part of RFC 7223; see
-        the RFC itself for full legal notices.";
-
-     revision 2014-05-08 {
-       description
-         "Initial revision.";
-       reference
-         "RFC 7223: A YANG Data Model for Interface Management";
-     }
-
-     /*
-      * Typedefs
-      */
-
-     typedef interface-ref {
-       type leafref {
-         path "/if:interfaces/if:interface/if:name";
-       }
-       description
-         "This type is used by data models that need to reference
-          configured interfaces.";
-     }
-
-     typedef interface-state-ref {
-       type leafref {
-         path "/if:interfaces-state/if:interface/if:name";
-       }
-       description
-         "This type is used by data models that need to reference
-          the operationally present interfaces.";
-     }
-
-     /*
-      * Identities
-      */
-
-     identity interface-type {
-       description
-         "Base identity from which specific interface types are
-          derived.";
-     }
-
-     /*
-      * Features
-      */
-
-     feature arbitrary-names {
-       description
-         "This feature indicates that the device allows user-controlled
-          interfaces to be named arbitrarily.";
-     }
-
-     feature pre-provisioning {
-       description
-         "This feature indicates that the device supports
-          pre-provisioning of interface configuration, i.e., it is
-          possible to configure an interface whose physical interface
-          hardware is not present on the device.";
-     }
-
-     feature if-mib {
-       description
-         "This feature indicates that the device implements
-          the IF-MIB.";
-       reference
-         "RFC 2863: The Interfaces Group MIB";
-     }
-
-     /*
-      * Configuration data nodes
-      */
-
-     container interfaces {
-       description
-         "Interface configuration parameters.";
-
-       list interface {
-         key "name";
-
-         description
-           "The list of configured interfaces on the device.
-
-            The operational state of an interface is available in the
-            /interfaces-state/interface list.  If the configuration of a
-            system-controlled interface cannot be used by the system
-            (e.g., the interface hardware present does not match the
-            interface type), then the configuration is not applied to
-            the system-controlled interface shown in the
-            /interfaces-state/interface list.  If the configuration
-            of a user-controlled interface cannot be used by the system,
-            the configured interface is not instantiated in the
-            /interfaces-state/interface list.";
-
-        leaf name {
-           type string;
-           description
-             "The name of the interface.
-
-              A device MAY restrict the allowed values for this leaf,
-              possibly depending on the type of the interface.
-
-              For system-controlled interfaces, this leaf is the
-              device-specific name of the interface.  The 'config false'
-              list /interfaces-state/interface contains the currently
-              existing interfaces on the device.
-
-              If a client tries to create configuration for a
-              system-controlled interface that is not present in the
-              /interfaces-state/interface list, the server MAY reject
-              the request if the implementation does not support
-              pre-provisioning of interfaces or if the name refers to
-              an interface that can never exist in the system.  A
-              NETCONF server MUST reply with an rpc-error with the
-              error-tag 'invalid-value' in this case.
-
-              If the device supports pre-provisioning of interface
-              configuration, the 'pre-provisioning' feature is
-              advertised.
-
-              If the device allows arbitrarily named user-controlled
-              interfaces, the 'arbitrary-names' feature is advertised.
-
-              When a configured user-controlled interface is created by
-              the system, it is instantiated with the same name in the
-              /interface-state/interface list.";
-         }
-
-         leaf description {
-           type string;
-           description
-             "A textual description of the interface.
-
-              A server implementation MAY map this leaf to the ifAlias
-              MIB object.  Such an implementation needs to use some
-              mechanism to handle the differences in size and characters
-              allowed between this leaf and ifAlias.  The definition of
-              such a mechanism is outside the scope of this document.
-
-              Since ifAlias is defined to be stored in non-volatile
-              storage, the MIB implementation MUST map ifAlias to the
-              value of 'description' in the persistently stored
-              datastore.
-
-              Specifically, if the device supports ':startup', when
-              ifAlias is read the device MUST return the value of
-              'description' in the 'startup' datastore, and when it is
-              written, it MUST be written to the 'running' and 'startup'
-              datastores.  Note that it is up to the implementation to
-
-              decide whether to modify this single leaf in 'startup' or
-              perform an implicit copy-config from 'running' to
-              'startup'.
-
-              If the device does not support ':startup', ifAlias MUST
-              be mapped to the 'description' leaf in the 'running'
-              datastore.";
-           reference
-             "RFC 2863: The Interfaces Group MIB - ifAlias";
-         }
-
-         leaf type {
-           type identityref {
-             base interface-type;
-           }
-           mandatory true;
-           description
-             "The type of the interface.
-
-              When an interface entry is created, a server MAY
-              initialize the type leaf with a valid value, e.g., if it
-              is possible to derive the type from the name of the
-              interface.
-
-              If a client tries to set the type of an interface to a
-              value that can never be used by the system, e.g., if the
-              type is not supported or if the type does not match the
-              name of the interface, the server MUST reject the request.
-              A NETCONF server MUST reply with an rpc-error with the
-              error-tag 'invalid-value' in this case.";
-           reference
-             "RFC 2863: The Interfaces Group MIB - ifType";
-         }
-
-         leaf enabled {
-           type boolean;
-           default "true";
-           description
-             "This leaf contains the configured, desired state of the
-              interface.
-
-              Systems that implement the IF-MIB use the value of this
-              leaf in the 'running' datastore to set
-              IF-MIB.ifAdminStatus to 'up' or 'down' after an ifEntry
-              has been initialized, as described in RFC 2863.
-
-              Changes in this leaf in the 'running' datastore are
-              reflected in ifAdminStatus, but if ifAdminStatus is
-              changed over SNMP, this leaf is not affected.";
-           reference
-             "RFC 2863: The Interfaces Group MIB - ifAdminStatus";
-         }
-
-         leaf link-up-down-trap-enable {
-           if-feature if-mib;
-           type enumeration {
-             enum enabled {
-               value 1;
-             }
-             enum disabled {
-               value 2;
-             }
-           }
-           description
-             "Controls whether linkUp/linkDown SNMP notifications
-              should be generated for this interface.
-
-              If this node is not configured, the value 'enabled' is
-              operationally used by the server for interfaces that do
-              not operate on top of any other interface (i.e., there are
-              no 'lower-layer-if' entries), and 'disabled' otherwise.";
-           reference
-             "RFC 2863: The Interfaces Group MIB -
-                        ifLinkUpDownTrapEnable";
-         }
-       }
-     }
-
-     /*
-      * Operational state data nodes
-      */
-
-     container interfaces-state {
-       config false;
-       description
-         "Data nodes for the operational state of interfaces.";
-
-       list interface {
-         key "name";
-
-         description
-           "The list of interfaces on the device.
-
-            System-controlled interfaces created by the system are
-            always present in this list, whether they are configured or
-            not.";
-
-         leaf name {
-           type string;
-           description
-             "The name of the interface.
-
-              A server implementation MAY map this leaf to the ifName
-              MIB object.  Such an implementation needs to use some
-              mechanism to handle the differences in size and characters
-              allowed between this leaf and ifName.  The definition of
-              such a mechanism is outside the scope of this document.";
-           reference
-             "RFC 2863: The Interfaces Group MIB - ifName";
-         }
-
-         leaf type {
-           type identityref {
-             base interface-type;
-           }
-           mandatory true;
-           description
-             "The type of the interface.";
-           reference
-             "RFC 2863: The Interfaces Group MIB - ifType";
-         }
-
-         leaf admin-status {
-           if-feature if-mib;
-           type enumeration {
-             enum up {
-               value 1;
-               description
-                 "Ready to pass packets.";
-             }
-             enum down {
-               value 2;
-               description
-                 "Not ready to pass packets and not in some test mode.";
-             }
-
-             enum testing {
-               value 3;
-               description
-                 "In some test mode.";
-             }
-           }
-           mandatory true;
-           description
-             "The desired state of the interface.
-
-              This leaf has the same read semantics as ifAdminStatus.";
-           reference
-             "RFC 2863: The Interfaces Group MIB - ifAdminStatus";
-         }
-
-         leaf oper-status {
-           type enumeration {
-             enum up {
-               value 1;
-               description
-                 "Ready to pass packets.";
-             }
-             enum down {
-               value 2;
-               description
-                 "The interface does not pass any packets.";
-             }
-             enum testing {
-               value 3;
-               description
-                 "In some test mode.  No operational packets can
-                  be passed.";
-             }
-             enum unknown {
-               value 4;
-               description
-                 "Status cannot be determined for some reason.";
-             }
-             enum dormant {
-               value 5;
-               description
-                 "Waiting for some external event.";
-             }
-             enum not-present {
-               value 6;
-               description
-                 "Some component (typically hardware) is missing.";
-             }
-
-             enum lower-layer-down {
-               value 7;
-               description
-                 "Down due to state of lower-layer interface(s).";
-             }
-           }
-           mandatory true;
-           description
-             "The current operational state of the interface.
-
-              This leaf has the same semantics as ifOperStatus.";
-           reference
-             "RFC 2863: The Interfaces Group MIB - ifOperStatus";
-         }
-
-         leaf last-change {
-           type yang:date-and-time;
-           description
-             "The time the interface entered its current operational
-              state.  If the current state was entered prior to the
-              last re-initialization of the local network management
-              subsystem, then this node is not present.";
-           reference
-             "RFC 2863: The Interfaces Group MIB - ifLastChange";
-         }
-
-         leaf if-index {
-           if-feature if-mib;
-           type int32 {
-             range "1..2147483647";
-           }
-           mandatory true;
-           description
-             "The ifIndex value for the ifEntry represented by this
-              interface.";
-           reference
-             "RFC 2863: The Interfaces Group MIB - ifIndex";
-         }
-
-         leaf phys-address {
-           type yang:phys-address;
-           description
-             "The interface's address at its protocol sub-layer.  For
-              example, for an 802.x interface, this object normally
-              contains a Media Access Control (MAC) address.  The
-              interface's media-specific modules must define the bit
-              and byte ordering and the format of the value of this
-              object.  For interfaces that do not have such an address
-              (e.g., a serial line), this node is not present.";
-           reference
-             "RFC 2863: The Interfaces Group MIB - ifPhysAddress";
-         }
-
-         leaf-list higher-layer-if {
-           type interface-state-ref;
-           description
-             "A list of references to interfaces layered on top of this
-              interface.";
-           reference
-             "RFC 2863: The Interfaces Group MIB - ifStackTable";
-         }
-
-         leaf-list lower-layer-if {
-           type interface-state-ref;
-           description
-             "A list of references to interfaces layered underneath this
-              interface.";
-           reference
-             "RFC 2863: The Interfaces Group MIB - ifStackTable";
-         }
-
-         leaf speed {
-           type yang:gauge64;
-           units "bits/second";
-           description
-               "An estimate of the interface's current bandwidth in bits
-                per second.  For interfaces that do not vary in
-                bandwidth or for those where no accurate estimation can
-                be made, this node should contain the nominal bandwidth.
-                For interfaces that have no concept of bandwidth, this
-                node is not present.";
-           reference
-             "RFC 2863: The Interfaces Group MIB -
-                        ifSpeed, ifHighSpeed";
-         }
-
-         container statistics {
-           description
-             "A collection of interface-related statistics objects.";
-
-           leaf discontinuity-time {
-             type yang:date-and-time;
-             mandatory true;
-             description
-               "The time on the most recent occasion at which any one or
-                more of this interface's counters suffered a
-                discontinuity.  If no such discontinuities have occurred
-                since the last re-initialization of the local management
-                subsystem, then this node contains the time the local
-                management subsystem re-initialized itself.";
-           }
-
-           leaf in-octets {
-             type yang:counter64;
-             description
-               "The total number of octets received on the interface,
-                including framing characters.
-
-                Discontinuities in the value of this counter can occur
-                at re-initialization of the management system, and at
-                other times as indicated by the value of
-                'discontinuity-time'.";
-             reference
-               "RFC 2863: The Interfaces Group MIB - ifHCInOctets";
-           }
-
-           leaf in-unicast-pkts {
-             type yang:counter64;
-             description
-               "The number of packets, delivered by this sub-layer to a
-                higher (sub-)layer, that were not addressed to a
-                multicast or broadcast address at this sub-layer.
-
-                Discontinuities in the value of this counter can occur
-                at re-initialization of the management system, and at
-                other times as indicated by the value of
-                'discontinuity-time'.";
-             reference
-               "RFC 2863: The Interfaces Group MIB - ifHCInUcastPkts";
-           }
-
-           leaf in-broadcast-pkts {
-             type yang:counter64;
-             description
-               "The number of packets, delivered by this sub-layer to a
-                higher (sub-)layer, that were addressed to a broadcast
-                address at this sub-layer.
-
-                Discontinuities in the value of this counter can occur
-                at re-initialization of the management system, and at
-                other times as indicated by the value of
-                'discontinuity-time'.";
-             reference
-               "RFC 2863: The Interfaces Group MIB -
-                          ifHCInBroadcastPkts";
-           }
-
-           leaf in-multicast-pkts {
-             type yang:counter64;
-             description
-               "The number of packets, delivered by this sub-layer to a
-                higher (sub-)layer, that were addressed to a multicast
-                address at this sub-layer.  For a MAC-layer protocol,
-                this includes both Group and Functional addresses.
-
-                Discontinuities in the value of this counter can occur
-                at re-initialization of the management system, and at
-                other times as indicated by the value of
-                'discontinuity-time'.";
-             reference
-               "RFC 2863: The Interfaces Group MIB -
-                          ifHCInMulticastPkts";
-           }
-
-           leaf in-discards {
-             type yang:counter32;
-             description
-               "The number of inbound packets that were chosen to be
-                discarded even though no errors had been detected to
-                prevent their being deliverable to a higher-layer
-                protocol.  One possible reason for discarding such a
-                packet could be to free up buffer space.
-
-                Discontinuities in the value of this counter can occur
-                at re-initialization of the management system, and at
-                other times as indicated by the value of
-                'discontinuity-time'.";
-
-             reference
-               "RFC 2863: The Interfaces Group MIB - ifInDiscards";
-           }
-
-           leaf in-errors {
-             type yang:counter32;
-             description
-               "For packet-oriented interfaces, the number of inbound
-                packets that contained errors preventing them from being
-                deliverable to a higher-layer protocol.  For character-
-                oriented or fixed-length interfaces, the number of
-                inbound transmission units that contained errors
-                preventing them from being deliverable to a higher-layer
-                protocol.
-
-                Discontinuities in the value of this counter can occur
-                at re-initialization of the management system, and at
-                other times as indicated by the value of
-                'discontinuity-time'.";
-             reference
-               "RFC 2863: The Interfaces Group MIB - ifInErrors";
-           }
-
-           leaf in-unknown-protos {
-             type yang:counter32;
-             description
-               "For packet-oriented interfaces, the number of packets
-                received via the interface that were discarded because
-                of an unknown or unsupported protocol.  For
-                character-oriented or fixed-length interfaces that
-                support protocol multiplexing, the number of
-                transmission units received via the interface that were
-                discarded because of an unknown or unsupported protocol.
-                For any interface that does not support protocol
-                multiplexing, this counter is not present.
-
-                Discontinuities in the value of this counter can occur
-                at re-initialization of the management system, and at
-                other times as indicated by the value of
-                'discontinuity-time'.";
-             reference
-               "RFC 2863: The Interfaces Group MIB - ifInUnknownProtos";
-           }
-           leaf out-octets {
-             type yang:counter64;
-             description
-               "The total number of octets transmitted out of the
-                interface, including framing characters.
-
-                Discontinuities in the value of this counter can occur
-                at re-initialization of the management system, and at
-                other times as indicated by the value of
-                'discontinuity-time'.";
-             reference
-               "RFC 2863: The Interfaces Group MIB - ifHCOutOctets";
-           }
-
-           leaf out-unicast-pkts {
-             type yang:counter64;
-             description
-               "The total number of packets that higher-level protocols
-                requested be transmitted, and that were not addressed
-                to a multicast or broadcast address at this sub-layer,
-                including those that were discarded or not sent.
-
-                Discontinuities in the value of this counter can occur
-                at re-initialization of the management system, and at
-                other times as indicated by the value of
-                'discontinuity-time'.";
-             reference
-               "RFC 2863: The Interfaces Group MIB - ifHCOutUcastPkts";
-           }
-
-           leaf out-broadcast-pkts {
-             type yang:counter64;
-             description
-               "The total number of packets that higher-level protocols
-                requested be transmitted, and that were addressed to a
-                broadcast address at this sub-layer, including those
-                that were discarded or not sent.
-
-                Discontinuities in the value of this counter can occur
-                at re-initialization of the management system, and at
-                other times as indicated by the value of
-                'discontinuity-time'.";
-             reference
-               "RFC 2863: The Interfaces Group MIB -
-                          ifHCOutBroadcastPkts";
-           }
-
-           leaf out-multicast-pkts {
-             type yang:counter64;
-             description
-               "The total number of packets that higher-level protocols
-                requested be transmitted, and that were addressed to a
-                multicast address at this sub-layer, including those
-                that were discarded or not sent.  For a MAC-layer
-                protocol, this includes both Group and Functional
-                addresses.
-
-                Discontinuities in the value of this counter can occur
-                at re-initialization of the management system, and at
-                other times as indicated by the value of
-                'discontinuity-time'.";
-             reference
-               "RFC 2863: The Interfaces Group MIB -
-                          ifHCOutMulticastPkts";
-           }
-
-           leaf out-discards {
-             type yang:counter32;
-             description
-               "The number of outbound packets that were chosen to be
-                discarded even though no errors had been detected to
-                prevent their being transmitted.  One possible reason
-                for discarding such a packet could be to free up buffer
-                space.
-
-                Discontinuities in the value of this counter can occur
-                at re-initialization of the management system, and at
-                other times as indicated by the value of
-                'discontinuity-time'.";
-             reference
-               "RFC 2863: The Interfaces Group MIB - ifOutDiscards";
-           }
-
-           leaf out-errors {
-             type yang:counter32;
-             description
-               "For packet-oriented interfaces, the number of outbound
-                packets that could not be transmitted because of errors.
-                For character-oriented or fixed-length interfaces, the
-                number of outbound transmission units that could not be
-                transmitted because of errors.
-
-                Discontinuities in the value of this counter can occur
-                at re-initialization of the management system, and at
-                other times as indicated by the value of
-                'discontinuity-time'.";
-             reference
-               "RFC 2863: The Interfaces Group MIB - ifOutErrors";
-           }
-         }
-       }
-     }
-   }
-
diff --git a/example/ietf-ipsec@2016-03-09.yang b/example/ietf-ipsec@2016-03-09.yang
deleted file mode 100644
index b8beed47..00000000
--- a/example/ietf-ipsec@2016-03-09.yang
+++ /dev/null
@@ -1,3672 +0,0 @@
-   module ietf-ipsec {
-     namespace "urn:ietf:params:xml:ns:yang:ietf-ipsec";
-     prefix "eipsec";
-
-     import ietf-inet-types {
-       prefix inet;
-     }
-
-     import ietf-yang-types {
-       prefix yang;
-     }
-
-     organization "Ericsson AB.
-                   Huawei Technologies India Pvt Ltd.";
-
-     contact "Web:   <http://www.ericsson.com>";
-
-     description
-       "This YANG module defines the configuration and operational
-        state data for Internet Protocol Security (IPSec) on
-        IETF draft.
-        Copyright (c) 2016 Ericsson AB.
-        All rights reserved.";
-
-     revision 2016-03-09 {
-       description
-         "Third revision.
-          Fix YANG compiling error because it used internal
-          data model econtext and should be removed in the
-          draft.
-          Fix warnings.
-          Run validation on
-          http://www.netconfcentral.org/yangdumpresults";
-       reference
-         "Update since second revision.";
-     }
-     revision 2015-09-13 {
-       description
-         "Second revision.";
-       reference
-         "updates since initial revision.
-         combining:
-          draft-tran-ipecme-yang-ipsec-00.
-          draft-wang-ipsecme-ike-yang-00.
-          draft-wang-ipsecme-ipsec-yang-00.";
-     }
-     revision 2015-05-14 {
-       description
-         "Initial revision.";
-       reference
-         "May 14, 2015  draft-tran-ipecme-yang-ipsec-00.
-          May 22, 2015  draft-wang-ipsecme-ike-yang-00.
-          June 15, 2015 draft-wang-ipsecme-ipsec-yang-00.";
-     }
-     /*--------------------*/
-     /* Feature            */
-     /*--------------------*/
-
-     feature ikev1 {
-       description
-         "Feature IKEv1";
-     }
-
-     feature ike-proposal-state {
-       description
-         "IKEv2 Proposal Operational State";
-     }
-
-     feature ike-policy-state {
-       description
-         "IKEv1 Policy Operational State";
-     }
-
-     feature ikev1-state {
-       description
-         "IKEv1 Operational State";
-     }
-
-     feature ike-reauth-failure {
-       description
-         "IKEv1 Reauthorization Failure";
-     }
-
-     feature ike-rekey-failure {
-       description
-         "IKEv1 Rekey Failure";
-     }
-
-
-     feature ikev2 {
-       description
-         "Feature IKEv2";
-
-     }
-
-     feature ikev2-global {
-       description
-         "Feature IKEv2 Global Parameters";
-
-     }
-
-     feature ikev2-peer {
-       description
-         "Feature IKEv2 Peer";
-
-     }
-
-     feature ikev2-proposal {
-       description
-         "Feature IKEv2 Proposal";
-
-     }
-
-     feature ikev2-policy {
-       description
-         "Feature IKEv2 Policy";
-
-     }
-
-     feature ikev2-proposal-state {
-       description
-         "IKEv2 Proposal Operational State";
-     }
-
-     feature ikev2-state {
-       description
-         "IKEv2 Operational State";
-     }
-
-     feature ipsec {
-       description
-         "Feature IPsec";
-
-     }
-
-     feature ipsec-acl {
-       description
-         "Feature IPsec ACL";
-     }
-     feature ipsec-sad {
-       description
-         "Feature IPsec SAD";
-
-     }
-
-     feature ipsec-proposal {
-       description
-         "Feature IPsec Proposal";
-
-     }
-
-     feature ipsec-spd {
-       description
-         "Feature IPsec SPD";
-
-     }
-
-     feature ipsec-policy-state {
-       description
-         "IPsec Policy Operational State";
-     }
-
-     feature ipsec-proposal-state {
-       description
-         "IPsec Proposal Operational State";
-     }
-
-     feature ipsec-alarms-state {
-       description
-         "IPsec Alarm State Operational State";
-     }
-
-     feature ipsec-sa-ah-state {
-       description
-         "IPsec SA AH Operational State";
-     }
-
-     feature ipsec-sa-state {
-       description
-         "IPsec SA Operational State";
-     }
-
-     feature ipsec-tunnel {
-       description
-         "IPsec Tunnel";
-     }
-
-     feature ipsec-local-address-range {
-       description
-         "IPsec Local Address Range";
-     }
-
-     feature ipsec-remote-address-range {
-       description
-         "IPsec Remote Address Range";
-     }
-
-     feature ipsec-next-protocol-range {
-       description
-         "IPsec Next Protocol Range";
-     }
-
-     feature ipsec-local-port-range {
-       description
-         "IPsec Local Port Range";
-     }
-
-     feature ipsec-remote-port-range {
-       description
-         "IPsec Remote Port Range";
-     }
-
-     feature ipsec-ah-authentication {
-       description
-         "IPsec AH Authentication";
-     }
-
-     feature ipsec-esp-integrity {
-       description
-         "IPsec ESP Integrity";
-     }
-
-     feature ipsec-esp-encrypt {
-       description
-         "IPsec ESP encryption";
-     }
-
-     feature ipsec-stat {
-       description
-         "IPsec Stats";
-     }
-
-     feature ipsec-state {
-       description
-         "IPsec Operational State";
-     }
-
-     feature ipsec-rekey-failure {
-       description
-         "IPsec Rekey Failure";
-     }
-
-     feature ipsec-redundancy {
-       description
-         "IPsec Redundancy State";
-     }
-
-     feature sad {
-       description
-         "Security Association (SA) Database";
-     }
-
-     feature spd {
-       description
-         "Security Policy Database";
-     }
-
-     feature ipsec-global-stats {
-       description
-         "IPsec Global Stats";
-     }
-
-     feature clear-ipsec-group {
-       description
-         "Clear IPsec group";
-     }
-
-     feature clear-ike-group {
-       description
-         "Clear IKE group";
-     }
-
-     feature clear-ikev2-group {
-       description
-         "Clear IKEv2 group";
-     }
-
-     feature reset-ipv4 {
-       description
-         "Reset IPv4";
-     }
-
-     feature reset-ipv6 {
-       description
-         "Reset IPv6";
-     }
-
-     feature reset-global {
-       description
-         "Reset Global";
-     }
-
-     feature peer-authentication-failure {
-       description
-         "Peer Authentication Failure";
-     }
-     /*--------------------*/
-     /* Typedefs           */
-     /*--------------------*/
-
-     typedef authentication-method-t {
-       type enumeration {
-         enum psk {
-           value 0;
-           description
-             "Pre-Sharing Keys.";
-         }
-         enum certificate {
-           value 1;
-           description
-             "Certificate.";
-         }
-       }
-       description
-         "Available authentication methods.";
-     }
-
-     /* IKEv2 Exchange Types (ET) */
-     typedef ikev2-exchange-type-t {
-       type enumeration {
-         enum ikev2-et-ike-sa-init {
-           value 34;
-           description
-             "ikev2-et-ike-sa-init - RFC 7296.";
-         }
-         enum ikev2-et-ike-auth {
-           value 35;
-           description
-             "ikev2-et-ike-auth - RFC 7296.";
-         }
-         enum ikev2-et-create-child-sa {
-           value 36;
-           description
-             "ikev2-et-create-child-sa - RFC 7296.";
-         }
-         enum ikev2-et-informational {
-           value 37;
-           description
-             "ikev2-et-informational - RFC 7296.";
-         }
-         enum ikev2-et-ike-session-resume {
-           value 38;
-           description
-             "ikev2-et-ike-session-resume - RFC 7296.";
-         }
-         enum ikev2-et-gsa-auth {
-           value 39;
-           description
-             "ikev2-et-gsa-auth - RFC 7296.";
-         }
-         enum ikev2-et-gsa-registration {
-           value 40;
-           description
-             "ikev2-et-gsa-registration - RFC 7296.";
-         }
-         enum ikev2-et-gsa-rekey {
-           value 41;
-           description
-             "ikev2-et-gsa-rekey - RFC 7296.";
-         }
-       }
-       description
-         "IKEv2 Exchange Types (ET).";
-     }
-
-      /* Transform Type Values (TTV), RFC 7296 */
-      typedef transform-type-value-t {
-       type enumeration {
-         enum ttv-reserved-0 {
-           value 0;
-           description
-             "ttv-reserved-0 - Transform Type Value Reserved "+
-             "(RFC 7296).";
-         }
-         enum ttv-encr {
-           value 1;
-           description
-             "ttv-encr - Transform Type Value 1,
-              Encryption Algorithm "+
-             "(ENCR) used in IKE and ESP.";
-         }
-         enum ttv-prf {
-           value 2;
-           description
-             "ttv-prf - Transform Type Value 2, "+
-             "Pseudo-Random Function(PRF) used in IKE.";
-         }
-         enum ttv-integ {
-           value 3;
-           description
-             "ttv-integ - Transform Type Value 3, Integrity Algorithm"+
-             " (INTEG) used in IKE, AH, optional ESP.";
-         }
-         enum ttv-dh {
-           value 4;
-           description
-             "ttv-dh - Transform Type Value 4, Diffie-Hellman (DH) "+
-             "used in IKE, optional AH and ESP.";
-         }
-         enum ttv-esn {
-           value 5;
-           description
-             "ttv-esn - Transform Type Value 5, Extended Sequence "+
-             "Numbers (ESN) used in AH and ESP.";
-         }
-       }
-       description
-         "Transform Type Values (RFC 7296).";
-     }
-
-      /* IKEv2 Transform Attribute Types (TAT) */
-      typedef ikev2-transform-attribute-type-t {
-       type enumeration {
-         enum ikev2-tat-reserved-0 {
-           value 0;
-           description
-             "ikev2-tat-reserved-0 - IKEv2 Transform Attribute "+
-             "Type Reserved-0 (RFC 7296).";
-         }
-         enum ikev2-tat-reserved-1 {
-           value 1;
-           description
-             "ikev2-tat-reserved-1 - IKEv2 Transform Attribute "+
-             "Type Reserved-1 (RFC 7296).";
-         }
-         enum ikev2-tat-reserved-13 {
-           value 13;
-           description
-             "ikev2-tat-reserved-13 - IKEv2 Transform Attribute "+
-             "Type Reserved-13 (RFC 7296).";
-         }
-         enum ikev2-tat-key-length {
-           value 41;
-           description
-             "ikev2-tat-key-length - IKEv2 Transform Attribute "+
-             "Type KEY LENGTH (in bits) (RFC 7296).";
-         }
-       }
-       description
-         "IKEv2 Transform Attribute Types (TAT) (RFC 7296).";
-     }
-
-      /* Transform Type 1 (Encryption Algorithm Transform IDs) */
-     typedef ike-encryption-algorithm-t {
-       type enumeration {
-         enum encr-reserved-0 {
-           value 0;
-           description
-             "encr-reserved-0 --> RFC_5996.";
-         }
-         enum encr-des-iv4 {
-           value 1;
-           description
-             "encr-des-iv4 --> RFC_5996.";
-         }
-         enum encr-des {
-           value 2;
-           description
-             "encr-des --> RFC_5996.";
-         }
-         enum encr-3des {
-           value 3;
-           description
-             "encr-3des --> RFC_5996.";
-         }
-         enum encr-rc5 {
-           value 4;
-           description
-             "encr-rc5 --> RFC_5996.";
-         }
-         enum encr-idea {
-           value 5;
-           description
-             "encr-idea --> RFC_5996.";
-         }
-         enum encr-cast {
-           value 6;
-           description
-             "encr-cast --> RFC_5996.";
-         }
-         enum encr-blowfish {
-           value 7;
-           description
-             "encr-blowfish --> RFC_5996.";
-         }
-         enum encr-3idea {
-           value 8;
-           description
-             "encr-3idea --> RFC_5996.";
-         }
-         enum encr-des-iv32 {
-           value 9;
-           description
-             "encr-des-iv32 --> RFC_5996.";
-         }
-         enum encr-reserved-10 {
-           value 10;
-           description
-             "encr-reserved-10 --> RFC_5996.";
-         }
-         enum encr-null {
-           value 11;
-           description
-             "encr-null --> RFC_5996.";
-         }
-         enum encr-aes-cbc {
-           value 12;
-           description
-             "encr-aes-cbc --> RFC_5996.";
-         }
-         enum encr-aes-ctr {
-           value 13;
-           description
-             "encr-aes-ctr --> RFC_5996.";
-         }
-         enum encr-aes-ccm-8 {
-           value 14;
-           description
-             "encr-aes-ccm-8 --> RFC_5996.";
-         }
-         enum encr-aes-ccm-12 {
-           value 15;
-           description
-             "encr-aes-ccm-12 --> RFC_5996.";
-         }
-         enum encr-aes-ccm-16 {
-           value 16;
-           description
-             "encr-aes-ccm-16 --> RFC_5996.";
-         }
-         enum encr-reserved-17 {
-           value 17;
-           description
-             "encr-reserved-17 --> RFC_5996.";
-         }
-         enum encr-aes-gcm-8-icv {
-           value 18;
-           description
-             "encr-aes-gcm-8-icv --> RFC_5996.";
-         }
-         enum encr-aes-gcm-12-icv {
-           value 19;
-           description
-             "encr-aes-gcm-12-icv --> RFC_5996.";
-         }
-         enum encr-aes-gcm-16-icv {
-           value 20;
-           description
-             "encr-aes-gcm-16-icv--> RFC_5996.";
-         }
-         enum encr-null-auth-aes-gmac {
-           value 21;
-           description
-             "encr-null-auth-aes-gmac --> RFC_5996.";
-         }
-         enum encr-ieee-p1619-xts-aes {
-           value 22;
-           description
-             "encr-ieee-p1619-xts-aes --> Reserved for "+
-             "IEEE P1619 XTS-AES.";
-         }
-         enum encr-camellia-cbc {
-           value 23;
-           description
-             "encr-camellia-cbc --> RFC_5996.";
-         }
-         enum encr-camellia-ctr {
-           value 24;
-           description
-             "encr-camellia-ctr --> RFC_5996.";
-         }
-         enum encr-camellia-ccm-8-icv {
-           value 25;
-           description
-             "encr-camellia-ccm-8-icv --> RFC_5996.";
-         }
-         enum encr-camellia-ccm-12-icv {
-           value 26;
-           description
-             "encr-camellia-ccm-12-icv --> RFC_5996.";
-         }
-         enum encr-camellia-ccm-16-icv {
-           value 27;
-           description
-             "encr-camellia-ccm-16-icv --> RFC_5996.";
-         }
-         enum encr-aes-cbc-128 {
-           value 1024;
-           description
-             "encr-aes-cbc-128 --> RFC_5996.";
-         }
-         enum encr-aes-cbc-192 {
-           value 1025;
-           description
-             "encr-aes-cbc-192 --> RFC_5996.";
-         }
-         enum encr-aes-cbc-256 {
-           value 1026;
-           description
-             "encr-aes-cbc-256 --> RFC_5996.";
-         }
-         enum encr-blowfish-128 {
-           value 1027;
-           description
-             "encr-blowfish-128 --> RFC_5996.";
-         }
-         enum encr-blowfish-192 {
-           value 1028;
-           description
-             "encr-blowfish-192 --> RFC_5996.";
-         }
-         enum encr-blowfish-256 {
-           value 1029;
-           description
-             "encr-blowfish-256 --> RFC_5996.";
-         }
-         enum encr-blowfish-448 {
-           value 1030;
-           description
-             "encr-blowfish-448 --> RFC_5996.";
-         }
-         enum encr-camellia-128 {
-           value 1031;
-           description
-             "encr-camellia-128 --> RFC_5996.";
-         }
-         enum encr-camellia-192 {
-           value 1032;
-           description
-             "encr-camellia-192 --> RFC_5996.";
-         }
-         enum encr-camellia-256 {
-           value 1033;
-           description
-             "encr-camellia-256 --> RFC_5996.";
-         }
-       }
-       description
-         "Transform Type 1 - Internet Key Exchange (IKE) "+
-         "encryption algorithms.";
-     }
-
-     /* Transform Type 2 (Pseudo-Random Function PRF) */
-     typedef pseudo-random-function-t {
-       type enumeration {
-         enum prf-reserved-0 {
-           value 0;
-           description
-             "prf-reserved-0 --> RFC_2104.";
-         }
-         enum prf-hmac-md5 {
-           value 1;
-           description
-             "prf-hmac-md5 --> RFC_2104.";
-         }
-         enum prf-hmac-sha1 {
-           value 2;
-           description
-             "prf-hmac-sha1 --> RFC2104.";
-         }
-         enum prf-hmac-tiger {
-           value 3;
-           description
-             "prf-hmac-tiger --> RFC2104.";
-         }
-         enum prf-aes128-xcbc {
-           value 4;
-           description
-             "prf-aes128-xcbc --> RFC_4434.";
-         }
-         enum prf-hmac-sha2-256 {
-           value 5;
-           description
-             "prf-hmac-sha2-256 --> RFC_4434.";
-         }
-         enum prf-hmac-sha2-384 {
-           value 6;
-           description
-             "prf-hmac-sha2-384 --> RFC_4434.";
-         }
-         enum prf-hmac-sha2-512 {
-           value 7;
-           description
-             "prf-hmac-sha2-512 --> RFC_4434.";
-         }
-         enum prf-aes128-cmac {
-           value 8;
-           description
-             "prf-aes128-cmac --> RFC_4615.";
-         }
-       }
-       description
-         "Available Pseudo-Random Functions (PRF).";
-     }
-
-      /* Transform Type 3 (Integrity Algorithm) */
-     typedef ike-integrity-algorithm-t {
-       type enumeration {
-         enum auth-none {
-           value 0;
-           description
-             "auth-none --> RFC_5996.";
-         }
-         enum auth-hmac-md5-96 {
-           value 1;
-           description
-             "auth-hmac-md5-96 --> RFC_5996.";
-         }
-         enum auth-hmac-sha1-96 {
-           value 2;
-           description
-             "auth-hmac-sha1-96 --> RFC_5996.";
-         }
-         enum auth-des-mac {
-           value 3;
-           description
-             "auth-des-mac --> RFC_5996.";
-         }
-         enum auth-kpdk-md5 {
-           value 4;
-           description
-             "auth-kpdk-md5 --> RFC_5996.";
-         }
-         enum auth-aes-xcbc-96 {
-           value 5;
-           description
-             "auth-aes-xcbc-96 --> RFC_5996.";
-         }
-         enum auth-hmac-md5-128 {
-           value 6;
-           description
-             "auth-hmac-md5-128 --> RFC_5996.";
-         }
-         enum auth-hmac-sha1-160 {
-           value 7;
-           description
-             "auth-hmac-sha1-160 --> RFC_5996.";
-         }
-         enum auth-aes-cmac-96 {
-           value 8;
-           description
-             "auth-aes-cmac-96 --> RFC_5996.";
-         }
-         enum auth-aes-128-gmac {
-           value 9;
-           description
-             "auth-aes-128-gmac --> RFC_5996.";
-         }
-         enum auth-aes-192-gmac {
-           value 10;
-           description
-             "auth-aes-192-gmac --> RFC_5996.";
-         }
-         enum auth-aes-256-gmac {
-           value 11;
-           description
-             "auth-aes-256-gmac --> RFC_5996.";
-         }
-         enum auth-hmac-sha2-256-128 {
-           value 12;
-           description
-             "auth-hmac-sha2-256-128 --> RFC_5996.";
-         }
-         enum auth-hmac-sha2-384-192 {
-           value 13;
-           description
-             "auth-hmac-sha2-384-192 --> RFC_5996.";
-         }
-         enum auth-hmac-sha2-512-256 {
-           value 14;
-           description
-             "auth-hmac-sha2-512-256 --> RFC_5996.";
-         }
-         enum auth-hmac-sha2-256-96 {
-           value 1024;
-           description
-             "auth-hmac-sha2-256-96.";
-         }
-       }
-       description
-         "Transform Type 3 - Internet Key Exchange (IKE) "+
-         "Integrity Algorithms.";
-     }
-
-     /* Transform Type 4 (Diffie-Hellman Group) */
-     typedef diffie-hellman-group-t {
-       type enumeration {
-         enum group-none {
-           value 0;
-           description
-             "group-none --> RFC_5996.";
-         }
-         enum modp-768-group-1 {
-           value 1;
-           description
-             "modp-768-group-1 --> RFC_5996.";
-         }
-         enum modp-1024-group-2 {
-           value 2;
-           description
-             "modp-1024-group-2 --> RFC_5996.";
-         }
-         enum modp-1536-group-5 {
-           value 5;
-           description
-             "modp-1536-group-5 --> RFC_3526.";
-         }
-         enum modp-2048-group-14 {
-           value 14;
-           description
-             "modp-2048-group-14 --> RFC_3526.";
-         }
-         enum modp-3072-group-15 {
-           value 15;
-           description
-             "modp-3072-group-15 --> RFC_3526.";
-         }
-         enum modp-4096-group-16 {
-           value 16;
-           description
-             "modp-4096-group-16 --> RFC_3526.";
-         }
-         enum modp-6144-group-17 {
-           value 17;
-           description
-             "modp-6144-group-17 --> RFC_3526.";
-         }
-         enum modp-8192-group-18 {
-           value 18;
-           description
-             "modp-8192-group-18 --> RFC_3526.";
-         }
-         enum recp-256-group-19 {
-           value 19;
-           description
-             "recp-256-group-19 --> RFC_6989. 256-bit"+
-             " Random ECP Group.";
-         }
-         enum recp-384-group-20 {
-           value 20;
-           description
-             "recp-384-group-20 --> RFC_6989. 384-bit"+
-             " Random ECP Group.";
-         }
-         enum recp-521-group-21 {
-           value 21;
-           description
-             "recp-521-group-21 --> RFC_6989. 521-bit"+
-             " Random ECP Group.";
-         }
-         enum modp-1024-160-pos-group-22 {
-           value 22;
-           description
-             "modp-1024-160-pos-group-22 --> RFC_6989."+
-             " 1024-bit MODP Group with"+
-             " 160-bit Prime Order Subgroup (POS).";
-         }
-         enum modp-2048-224-pos-group-23 {
-           value 23;
-           description
-             "modp-2048-224-pos-group-23 --> RFC_6989."+
-             " 2048-bit MODP Group with"+
-             " 224-bit Prime Order Subgroup (POS).";
-         }
-         enum modp-2048-256-pos-group-24 {
-           value 24;
-           description
-             "modp-2048-256-pos-group-24 --> RFC_6989."+
-             " 2048-bit MODP Group with"+
-             " 256-bit Prime Order Subgroup (POS).";
-         }
-         enum recp-192-group-25 {
-           value 25;
-           description
-             "recp-192-group-25 --> RFC_6989."+
-             " 192-bit Random ECP Group.";
-         }
-         enum recp-224-group-26 {
-           value 26;
-           description
-             "recp-224-group-26 --> RFC_6989."+
-             " 224-bit Random ECP Group.";
-         }
-       }
-       description
-         "Diffie-Hellman Groups (RFC 5996).";
-     }
-
-
-     /* Transform Type 5 (Extended Sequence Numbers
-        Transform ESN IDs) */
-     typedef extended-sequence-number-t {
-       type enumeration {
-         enum esn-none {
-           value 0;
-           description
-             "esn-none - Extended Sequence Number None --> RFC_7296.";
-         }
-         enum esn-1 {
-           value 1;
-           description
-             "esn-1 - Extended Sequence Number --> RFC_7296.";
-         }
-       }
-       description
-         "Extended Sequence Number (RFC 7296).";
-     }
-
-
-     typedef connection-type-t {
-       type enumeration {
-         enum initiator-only {
-           value 0;
-           description
-             "initiator-only: ME will act as initiator for"+
-             " bringing up IKEv2"+
-             " session with its IKE peer.";
-         }
-         enum responder-only {
-           value 1;
-           description
-             "responder-only: ME will act as responder for"+
-             " bringing up IKEv2"+
-             " session with its IKE peer.";
-         }
-         enum both {
-           value 2;
-           description
-             "both: ME can act as initiator or responder.";
-         }
-       }
-       description
-         "Connection type for IKE session.";
-     }
-
-     typedef transport-protocol-name-t {
-       type enumeration {
-         enum tcp {
-           value 1;
-           description
-             "Transmission Control Protocol (TCP) Transport Protocol.";
-         }
-         enum udp {
-           value 2;
-           description
-             "User Datagram Protocol (UDP) Transport Protocol";
-         }
-         enum sctp {
-           value 3;
-           description
-             "Stream Control Transmission Protocol (SCTP) Transport "+
-             "Protocol";
-         }
-         enum icmp {
-           value 4;
-           description
-             "Internet Control Message Protocol (ICMP) Transport "+
-             "Protocol";
-         }
-       }
-       description
-         "Enumeration of well known transport protocols.";
-     }
-
-     typedef preshared-key-t {
-       type string;
-       description
-         "Derived string used as Pre-Shared Key.";
-     }
-
-     typedef pad-type-t {
-       type enumeration {
-         enum dns-name {
-           value 1;
-           description
-             "DNS name (specific or partial)";
-         }
-         enum distinguished-name {
-           value 2;
-           description
-             "Distinguished Name (complete or sub-tree constrained)";
-         }
-         enum rfc-822 {
-           value 3;
-           description
-             "RFC 822 email address (complete or partially qualified)";
-         }
-         enum ipv4-range {
-           value 4;
-           description
-             "IPv4 Address Range";
-         }
-         enum ipv6-range {
-           value 5;
-           description
-             "IPv6 Address Range";
-         }
-         enum key-id {
-           value 6;
-           description
-             "Key ID (exact match only)";
-         }
-       }
-       description
-         "PAD Type";
-     }
-
-
-     /*-------------------------------------------------- */
-     /* draft-wang-ipsecme-ipsec-yang-00: ietf-ipsec-type */
-     /*-------------------------------------------------- */
-     typedef ipsec-mode {
-       type enumeration {
-         enum "transport" {
-           description
-             "Transport mode";
-         }
-         enum "tunnel" {
-           description
-             "Tunnel mode";
-         }
-       }
-       description
-         "type define of ipsec mode";
-     }
-
-     typedef ipsec-protocol {
-       type enumeration {
-         enum "ah" {
-           description
-             "AH Protocol";
-         }
-         enum "esp" {
-           description
-             "ESP Protocol";
-         }
-       }
-       description
-         "type define of ipsec security protocol";
-     }
-
-     typedef ipsec-spi {
-       type uint32 {
-         range "1..max";
-       }
-       description
-         "SPI";
-     }
-
-     typedef ipsec-spd-name {
-      type enumeration {
-       enum id_rfc_822_addr {
-           description
-             "Fully qualified user name string.";
-         }
-         enum id_fqdn {
-           description
-             "Fully qualified DNS name.";
-         }
-         enum id_der_asn1_dn {
-           description
-             "X.500 distinguished name.";
-         }
-         enum id_key {
-           description
-             "IKEv2 Key ID.";
-         }
-       }
-       description
-         "IPsec SPD name type";
-     }
-
-     typedef ipsec-traffic-direction {
-       type enumeration {
-         enum inbound {
-           description
-             "Inbound traffic";
-         }
-         enum outbound {
-           description
-             "Outbound traffic";
-         }
-       }
-       description
-         "IPsec traffic direction";
-     }
-
-     typedef ipsec-spd-operation {
-       type enumeration {
-         enum protect {
-           description
-             "PROTECT the traffic with IPsec";
-         }
-         enum bypass {
-           description
-             "BYPASS the traffic";
-         }
-         enum discard {
-           description
-             "DISCARD the traffic";
-         }
-       }
-       description
-         "The operation when traffic matches IPsec security policy";
-     }
-
-
-     /*---------------------------------------------------- */
-     /* draft-wang-ipsecme-ipsec-yang-00: ietf-ipsec-crypto */
-     /*---------------------------------------------------- */
-     typedef ipsec-authentication-algorithm {
-       type enumeration {
-         enum "null" {
-           value 0;
-           description
-             "null";
-         }
-         enum "md5" {
-           value 1;
-           description
-             "MD5 authentication algorithm";
-         }
-         enum "sha1" {
-           value 2;
-           description
-             "SHA1 authentication algorithm";
-         }
-         enum "sha2-256" {
-           value 3;
-           description
-             "SHA2-256 authentication algorithm";
-         }
-         enum "sha2-384" {
-           value 4;
-           description
-             "SHA2-384 authentication algorithm";
-         }
-         enum "sha2-512" {
-           value 5;
-           description
-             "SHA2-512 authentication algorithm";
-         }
-       }
-       description
-         "typedef for ipsec authentication algorithm";
-     }
-
-     typedef ipsec-encryption-algorithm {
-       type enumeration {
-         enum "null" {
-           description
-             "null";
-         }
-         enum "des" {
-           description
-             "DES encryption algorithm";
-         }
-         enum "3des" {
-           description
-             "3DES encryption algorithm";
-         }
-         enum "aes-128" {
-           description
-             "AES-128 encryption algorithm";
-         }
-         enum "aes-192" {
-           description
-             "AES-192 encryption algorithm";
-         }
-         enum "aes-256" {
-           description
-             "AES-256 encryption algorithm";
-         }
-       }
-       description
-        "typedef for ipsec encryption algorithm";
-     }
-
-     /*-------------------------------------------------- */
-     /* draft-wang-ipsecme-ike-yang-00: ietf-ipsec-type */
-     /*-------------------------------------------------- */
-     typedef ike-integrity-algorithm {
-       type enumeration {
-         enum "hmac-md5-96" {
-           description
-             "HMAC-MD5-96 Integrity Algorithm";
-         }
-         enum "hmac-sha1-96" {
-           description
-             "HMAC-SHA1-96 Integrity Algorithm";
-         }
-         enum "hmac-sha2-256" {
-           description
-             "HMAC-SHA2-256 Integrity Algorithm";
-         }
-         enum "hmac-sha2-384" {
-           description
-             "HMAC-SHA2-384 Integrity Algorithm";
-         }
-         enum "hmac-sha2-512" {
-           description
-             "HMAC-SHA2-512 Integrity Algorithm";
-         }
-       }
-       description
-         "typedef for ike integrity algorithm.";
-     }
-
-     typedef ike-encryption-algorithm {
-       type enumeration {
-         enum "des-cbc" {
-           description
-             "DES-CBC Encryption algorithm";
-         }
-         enum "3des-cbc" {
-           description
-             "3DES-CBC Encryption algorithm";
-         }
-         enum "aes-cbc-128" {
-           description
-             "AES-CBC-128 Encryption algorithm";
-         }
-         enum "aes-cbc-192" {
-           description
-             "AES-CBC-192 Encryption algorithm";
-         }
-         enum "aes-cbc-256" {
-           description
-             "AES-CBC-256 Encryption algorithm";
-         }
-       }
-       description
-         "typedef for ike encryption algorithm.";
-     }
-
-     typedef ike-prf-algorithm {
-       type enumeration {
-         enum "hmac-md5-96" {
-           description
-             "HMAC-MD5-96 PRF Algorithm";
-         }
-         enum "hmac-sha1-96" {
-           description
-             "HMAC-SHA1-96 PRF Algorithm";
-         }
-         enum "hmac-sha2-256" {
-           description
-             "HMAC-SHA2-256 PRF Algorithm";
-         }
-         enum "hmac-sha2-384" {
-           description
-             "HMAC-SHA2-384 PRF Algorithm";
-         }
-         enum "hmac-sha2-512" {
-           description
-             "HMAC-SHA2-512 PRF Algorithm";
-         }
-       }
-       description
-         "typedef for ike prf algorithm.";
-     }
-
-     typedef ike-dh-group {
-       type enumeration {
-         enum "dh-group-none" {
-           description
-             "None Diffie-Hellman group";
-         }
-         enum "dh-group-1" {
-           description
-             "768 bits Diffie-Hellman group";
-         }
-         enum "dh-group-2" {
-           description
-             "1024 bits Diffie-Hellman group";
-         }
-         enum "dh-group-5" {
-           description
-             "1536 bits Diffie-Hellman group";
-         }
-         enum "dh-group-14" {
-           description
-             "2048 bits Diffie-Hellman group";
-         }
-       }
-       description
-         "typedef for ike dh group";
-     }
-
-
-     typedef ike-peer-name-ref {
-       type leafref {
-         path "/ikev2/ike-peer/ike-peer-entries/peer-name";
-       }
-       description "reference to ike peer name";
-     }
-
-     typedef ike-proposal-number-ref {
-       type leafref {
-         path "/ikev2/proposal/name";
-       }
-       description "reference to ike proposal name";
-     }
-
-     typedef ipsec-proposal-name-ref{
-       type leafref {
-         path "/ipsec/proposal/ipsec-proposal/name";
-       }
-       description "reference to ike proposal name";
-     }
-
-     typedef ike-auth-method {
-       type enumeration {
-         enum pre-share {
-           description
-             "Select pre-shared key message as the
-              authentication method";
-         }
-         enum rsa-digital-signature {
-           description
-             "Select rsa digital signature as the
-              authentication method";
-         }
-         enum dss-digital-signature {
-           description
-             "Select dss digital signature as the
-              authentication method";
-         }
-       }
-       description "IKE authentication methods";
-     }
-
-     /*--------------------*/
-     /*   grouping         */
-     /*--------------------*/
-
-      /* The following groupings are used in both configuration data
-        and operational state data */
-     grouping name-grouping {
-       description
-         "This grouping provides a leaf identifying the name.";
-       leaf name {
-         type string;
-         description
-           "Name of a identifying.";
-       }
-       leaf description {
-         type string;
-         description
-           "Specify the description.";
-       }
-     }
-
-     grouping sequence-number-grouping {
-       description
-         "This grouping provides a leaf identifying
-          a sequence number.";
-       leaf sequence-number {
-         type uint32 {
-           range "1..4294967295";
-         }
-         description
-           "Specify the sequence number.";
-       }
-     }
-
-     grouping description-grouping {
-       description
-         "description for free use.";
-       leaf description {
-         type string;
-         description
-           "description for free use.";
-       }
-     }
-
-     grouping traffic-selector-grouping {
-       description
-         "Traffic selector to be used for SA negotiation.";
-       leaf traffic-selector-id {
-         type string;
-         mandatory true;
-         description
-           "Traffic selector identifier.";
-       }
-       leaf protocol-name {
-         type transport-protocol-name-t;
-         description
-           "Specifies the protocol selector.";
-       }
-       leaf address-range {
-         type string;
-         mandatory true;
-         description
-           "Specifies the IPv4 or IPv6 address range.";
-       }
-     }
-
-
-
-     grouping ike-general-proposal-grouping {
-       description
-         "IKE proposal.";
-       leaf name {
-          type string;
-          mandatory true;
-          description
-            "IKE Proposal identify.";
-       }
-       leaf description {
-         type string;
-         description
-           "Specify the description.";
-       }
-
-       leaf dh-group {
-         type diffie-hellman-group-t;
-         mandatory true;
-         description
-           "Specifies a Diffie-Hellman group.";
-       }
-       container encryption {
-         description
-           "Specify IKE Proposal encryption configuration";
-         leaf algorithm {
-            type ike-encryption-algorithm-t;
-            description
-              "Specifies an Encryption Algorithm.";
-         }
-       }
-     }
-
-     grouping ike-proposal-grouping {
-       description
-         "Configure the IKE Proposal";
-       uses ike-general-proposal-grouping;
-
-       leaf lifetime {
-         type uint32;
-          mandatory true;
-         description
-           "Configure lifetime for IKE SAs
-            0: for no timeout.
-            300 .. 99999999:  IKE SA lifetime in seconds.";
-       }
-       container authentication {
-         description
-           "Specify IKE Proposal authentication configuration";
-         leaf algorithm {
-           type ike-integrity-algorithm-t;
-           description
-             "Specify the authentication algorithm";
-         }
-         leaf preshared-key {
-           type empty;
-           description
-             "Use pre-shared key based authentication";
-         }
-         leaf rsa-signature {
-           type empty;
-           description
-             "Use signature based authentication by using
-              PKI certificates";
-         }
-       }
-     }
-
-     grouping ikev2-proposal-grouping {
-       description
-         "Holds an IKEv2 transform proposal used during "+
-         "IKEv2 SA negotiation.  Multiple IKEv2 Transforms "+
-         " can be proposed during an IKEv2 session initiation "+
-         "in an ordered list.";
-       uses ike-general-proposal-grouping;
-
-       leaf pseudo-random-function {
-         type pseudo-random-function-t;
-         mandatory true;
-         description
-           "Specifies Pseudo Random Function for IKEv2 key exchange";
-       }
-       container authentication {
-         description
-           "Specify IKEv2 Proposal authentication configuration";
-         leaf algorithm {
-           type ike-integrity-algorithm-t;
-           description
-             "Specify the authentication algorithm";
-         }
-       }
-     }
-
-     grouping ipsec-proposal-grouping {
-       description
-         "Configure IPSec Proposal";
-       leaf name {
-          type string;
-          mandatory true;
-          description
-            "IPSec proposal identifier.";
-       }
-       leaf ah {
-         type ike-integrity-algorithm-t;
-         description
-           "Configure Authentication Header (AH).";
-       }
-       container esp {
-         description
-           "Configure Encapsulating Security Payload (ESP).";
-         leaf authentication {
-           type ike-integrity-algorithm-t;
-           description
-             "Configure ESP authentication";
-         }
-         leaf encryption {
-           type ike-encryption-algorithm-t;
-           description
-             "Configure ESP encryption";
-         }
-       }
-       leaf ip-comp{
-         type empty;
-         description
-           "Enable IPSec proposal IP-COMP which uses the IP Payload "+
-           "compression protocol to compress IP Security (IPSec) "+
-           "packets before encryption";
-       }
-       container lifetime {
-         description
-           "Configure lifetime for IPSEC SAs";
-         leaf kbytes {
-           type uint32 {
-             range "128..2147483647";
-           }
-           description
-             "Enter lifetime kbytes for IPSEC SAs";
-         }
-         leaf seconds {
-           type uint32 {
-             range "300..99999999";
-           }
-           description
-             "Enter lifetime seconds for IPSEC SAs
-             0: lifetime of 0 for no timeout
-             300..99999999: IPSec SA lifetime in seconds";
-         }
-       }
-     }
-
-     grouping identity-grouping {
-       description
-         "Identification type. It is an union identity, "+
-         "possible type as follows: "+
-         "a) ID_FQDN: A fully-qualified domain name string. "+
-         "  An example of a ID_FQDN is, example.com. "+
-         "  The string MUST not contain any terminators "+
-         "(e.g., NULL, CR, etc.). "+
-         "b) ID_RFC822_ADDR: A fully-qualified RFC822 email "+
-         "   address string, An example of a ID_RFC822_ADDR is, "+
-         "   jsmith@example.com. The string MUST not contain "+
-         "   any terminators. "+
-         "c) ID_IPV4_ADDR: A single four (4) octet IPv4 address. "+
-         "d) ID_IPV6_ADDR: A single sixteen (16) octet IPv6 address. "+
-         "e) DN_X509: Distinguished name in the X.509 tradition.";
-       choice identity {
-         description
-           "Choice of identity.";
-         leaf ipv4-address {
-           type inet:ipv4-address;
-           description
-             "Specifies the identity as a single four (4)
-              octet IPv4 address.
-              An example is, 10.10.10.10. ";
-         }
-         leaf ipv6-address {
-           type inet:ipv6-address;
-           description
-             "Specifies the identity as a single sixteen (16) "+
-             "octet IPv6 address. "+
-             "An example is, "+
-             "FF01::101, 2001:DB8:0:0:8:800:200C:417A .";
-         }
-         leaf fqdn-string {
-/*           type inet:domain-name; */
-           type string {
-             pattern
-               '((([a-zA-Z0-9_]([a-zA-Z0-9\-_]){0,61})?[a-zA-Z0-9]\.)*'
-               + '([a-zA-Z0-9_]([a-zA-Z0-9\-_]){0,61})?[a-zA-Z0-9]\.?)'
-               + '|\.';
-             length "1..253";
-           }
-           description
-             "Specifies the identity as a Fully-Qualified
-              Domain Name (FQDN) string.
-              An example is: example.com.
-              The string MUST not contain any terminators
-              (e.g., NULL, CR, etc.).";
-         }
-         leaf rfc822-address-string {
-           type string;
-           description
-             "Specifies the identity as a fully-qualified RFC822
-              email address string.
-              An example is, jsmith@example.com.
-              The string MUST not contain any terminators
-              (e.g., NULL, CR, etc.).";
-         }
-         leaf dnX509 {
-           type string;
-           description
-             "Specifies the identity as a distinguished name
-              in the X.509 tradition.";
-         }
-       }
-     } /* grouping identity-grouping */
-
-     grouping ike-general-policy-profile-grouping {
-       description
-         "IKE policy.";
-       leaf connection-type {
-         type connection-type-t;
-         mandatory true;
-         description
-           "Specify the IKE connection type";
-       }
-       leaf pre-shared-key {
-         type union {
-           type string {
-             length "16";
-           }
-           type string {
-             length "40";
-             pattern '([0-9a-fA-F]{2}(:[0-9a-fA-F]{2})*)?';
-           }
-/*           type yang:hex-string {
-             length "40";
-           }*/
-         }
-         description
-           "Specify IKE pre-shared-key value";
-       }
-       leaf validate-certificate-identity {
-         type empty;
-         description
-           "Validate Remote-ID payload against the
-           ID's available in the certificate";
-       }
-       list seq {
-         key seq-id;
-         description
-           "list of sequence of policy.";
-         leaf seq-id {
-           type uint32 {
-             range "1..429496729";
-           }
-           description
-             "Sequence Number";
-         }
-         leaf proposal {
-           type leafref {
-             path "/eipsec:ikev1/eipsec:proposal"+
-                  "/eipsec:name";
-           }
-           description
-             "IKE Proposal reference.";
-         }
-       }
-       container identity {
-         description
-           "Specify IKE identity value";
-         container local {
-           description
-             "Specify the identity of the local IP Security (IPSec)
-             tunnel endpoint in an Internet Key Exchange (IKE)
-             policy to use when negotiating IKE request with a
-             remote peer.";
-           uses identity-grouping;
-         }
-         container remote {
-           description
-             "Specify the identity of the remote IP Security (IPSec)
-             tunnel endpoint in an
-              Internet Key Exchange (IKE) policy to use when
-              negotiating IKE request with a remote peer.";
-           uses identity-grouping;
-         }
-       }
-     }
-
-     grouping ike-policy-mode-grouping {
-       description
-         "IKE Policy Mode";
-       container mode {
-         description
-           "Specify IKE mode configuration";
-         leaf aggressive {
-           type empty;
-           description
-             "Set IKE Aggressive mode";
-         }
-         leaf main {
-           type empty;
-           description
-             "Set IKE Main mode";
-         }
-       }
-     }
-
-     grouping ike-policy-profile-grouping {
-       description
-         "Configure IKE policy";
-       leaf name {
-         type string;
-         mandatory true;
-         description
-           "Specify an IKE policy name";
-       }
-       uses ike-policy-mode-grouping;
-       uses ike-general-policy-profile-grouping;
-     }
-
-     grouping ikev2-policy-profile-grouping {
-       description
-         "Common information for multiple IKE sessions
-         to be instantiated on a managed element.;
-          One or more Ikev2Session instances might refer
-          to this instance.";
-       leaf name {
-         type string;
-         mandatory true;
-         description
-           "Value component of the RDN.";
-       }
-       container authentication {
-         description
-           "Specify IKE Proposal authentication configuration";
-         leaf preshared-key {
-           type empty;
-           description
-             "Use pre-shared key based authentication";
-         }
-         leaf rsa-signature {
-           type empty;
-           description
-             "Use signature based authentication by using
-             PKI certificates";
-         }
-       }
-       leaf lifetime {
-         type uint32;
-         mandatory true;
-         description
-           "Configure lifetime for IKE SAs
-            0: for no timeout.
-            300 .. 99999999:  IKE SA lifetime in seconds.";
-       }
-
-       container address-allocation {
-         must "../connection-type = 'responder-only'" {
-           description
-             "address-allocation can be configured only with
-             responder-only in ike2 policy";
-         }
-         leaf aaa {
-           type empty;
-           description
-             "IRAC address allocation by AAA";
-         }
-         description
-           "Specify IKE IRAS address allocation option";
-       }
-       uses ike-general-policy-profile-grouping;
-
-       leaf description {
-         type string;
-         description
-           "Specify the description.";
-       }
-     }
-
-     grouping ipsec-policy-grouping {
-       description
-         "Holds configuration information for IPSec policies.";
-       leaf name {
-         type string;
-         mandatory true;
-         description
-           "IPSec Policy Identification";
-       }
-       leaf description {
-         type string;
-         description
-           "Specify the description.";
-       }
-
-       leaf anti-replay-window {
-         type uint32 {
-           range "0..1024";
-         }
-         description
-           "Configure replay window size
-           0: to disable anti-replay-window
-           32..1024: IPSec anti-replay-window size in multiple of 32";
-       }
-       container perfect-forward-secrecy {
-         description
-           "Configure Perfect Forward Secrecy (PFS) for IPSec Policy";
-         leaf dh-group {
-           type diffie-hellman-group-t;
-           description
-             "Configure Diffie-Hellman group for
-              perfect-forward-secrecy";
-         }
-       }
-       list seq {
-         key seq-id;
-         description
-           "Specify IPSEC proposal sequence number";
-         leaf seq-id {
-           type uint32;
-           description
-             "Sequence ID";
-         }
-         leaf description {
-           type string;
-           description
-             "Specify the description.";
-         }
-
-         leaf proposal {
-           type leafref {
-             path "/eipsec:ipsec/"+
-                  "eipsec:proposal/eipsec:ipsec-proposal/eipsec:name";
-           }
-           description
-             "IKE proposal reference.";
-         }
-       }
-     }
-
-     grouping key-string-grouping {
-       description
-         "Configure key for authentication algorithm";
-       leaf key-str {
-         type union {
-           type string {
-             length "16";
-           }
-           type string {
-             length "40";
-             pattern '([0-9a-fA-F]{2}(:[0-9a-fA-F]{2})*)?';
-           }
-/*           type yang:hex-string {
-             length "40";
-           }*/
-         }
-         description
-           "Key string input is either string value (length of 16)
-           or hexadecimal (length of 40)";
-       }
-     }
-
-     grouping ipsec-sa-ah-grouping {
-       description
-         "Configure Authentication Header (AH) for
-          Security Association (SA)";
-       container ah {
-         description
-           "Configure Authentication Header (AH) for SA";
-         choice authentication-algorithm {
-           description
-             "choice for authentication algorithm to set for AH";
-           case hmac-aes-xcbc {
-             container hmac-aes-xcbc {
-               description
-                 "Set the authentication algorithm to hmac-aes-xcbc";
-               uses key-string-grouping;
-             }
-           }
-           case hmac-md5-96 {
-             container hmac-md5-96 {
-               description
-                 "Set the authentication algorithm to hmac-md5-96";
-               uses key-string-grouping;
-             }
-           }
-           case hmac-sha1-96 {
-             container hmac-sha1-96 {
-               description
-                 "Set the authentication algorithm to hmac-sha1-96";
-               uses key-string-grouping;
-             }
-           }
-           case key-string {
-             container key-string {
-               description
-                 "Configure key for authentication algorithm";
-               uses key-string-grouping;
-             }
-           }
-         }
-       }
-     }
-
-     grouping ipsec-sa-esp-grouping {
-       description
-         "Configure IPSec Encapsulation Security Payload (ESP)";
-       container esp {
-         description
-           "Set IPSec Encapsulation Security Payloer (ESP)";
-         container authentication {
-           description
-             "Configure authentication for IPSec
-              Encapsulation Secutiry Payload (ESP)";
-           choice authentication-algorithm {
-             description
-               "choice for authentication algorithm to set";
-             case hmac-aes-xcbc {
-               container hmac-aes-xcbc {
-                 description
-                   "Set the authentication algorithm to hmac-aes-xcbc";
-                 uses key-string-grouping;
-               }
-             }
-             case hmac-md5-96 {
-               container hmac-md5-96 {
-                 description
-                   "Set the authentication algorithm to hmac-md5-96";
-                 uses key-string-grouping;
-               }
-             }
-             case hmac-sha1-96 {
-               container hmac-sha1-96 {
-                 description
-                   "Set the authentication algorithm to hmac-sha1-96";
-                 uses key-string-grouping;
-               }
-             }
-             case key-string {
-               container key-string {
-                 description
-                   "Configure key for authentication algorithm";
-                 uses key-string-grouping;
-               }
-             }
-           }
-         }
-         container encryption {
-           description
-             "Configure encryption for IPSec
-              Encapsulation Secutiry Payload (ESP)";
-           choice encryption-algorithm {
-             description
-               "type of encryption";
-             case des3-cbc {
-               container des3-cbd {
-                 description
-                   "Set the encryption algorithm to des3-cbc";
-                 uses key-string-grouping;
-               }
-             }
-             case aes-128-cbc {
-               container aes-128-cbc {
-                 description
-                   "Set the encryption algorithm to aes-128-cbc";
-                 uses key-string-grouping;
-               }
-             }
-             case aes-192-cbc {
-               container aes-192-cbc {
-                 description
-                   "Set the encryption algorithm to aes-192-cbc";
-                 uses key-string-grouping;
-               }
-             }
-             case aes-256-cbc {
-               container aes-256-cbc {
-                 description
-                   "Set the encryption algorithm to aes-256-cbc";
-                 uses key-string-grouping;
-               }
-             }
-             case des-cbc {
-               container des-cbc {
-                 description
-                   "Set the encryption algorithm to des-cbc";
-                 uses key-string-grouping;
-               }
-             }
-             case key-string {
-               container key-string {
-                 description
-                   "Configure key for encryption algorithm";
-                 uses key-string-grouping;
-               }
-             }
-           }
-         }
-       }
-     }
-
-     grouping ipsec-acl-dest-grouping {
-       description
-         "IPSEC ACL destination.";
-       /* For destination */
-       choice dest-address {
-         description
-           "destination address.";
-         case dest-ipv4-address {
-           leaf destination-ipv4-address {
-             type inet:ipv4-address;
-             description
-               "Destination IPv4 Address A.B.C.D/0..32.";
-           }
-         }
-         case dest-any {
-           leaf dest-any {
-             type empty;
-             description
-               "Match Any Destination IPv4 Address.";
-           }
-         }
-       }
-     }
-
-     grouping ipsec-acl-seq-protocol-number-grouping {
-       description
-         "IPSec ACL Sequence protocol number.";
-       leaf number {
-         type uint16 {
-           range "0..255";
-         }
-         description
-           "Specify protocol number.";
-       }
-       choice argument {
-         description
-           "Source IPv4 address.";
-         case source-ipv4-address {
-           leaf source-ipv4-address {
-             type inet:ipv4-address;
-             description
-               "Source IPv4 Address A.B.C.D/0..32.";
-           }
-         }
-         case any {
-           /* For source */
-           leaf source-any {
-             type empty;
-             description
-               "Match Any Source IPv4 Address.";
-           }
-         }
-       }
-     }
-
-     grouping ipsec-acl-seq-ip-address-grouping {
-       description
-         "IPSec ACL Sequence IP Address.";
-       leaf source-ipv4-address {
-         type inet:ipv4-address;
-         description
-           "Source is IPv4 Address A.B.C.D/0..32.";
-       }
-     }
-
-     grouping ipsec-acl-seq-any-grouping {
-       description
-         "IPSec ACL Sequence Any.";
-       leaf any {
-         type empty;
-         description
-           "Source is Any.";
-       }
-     }
-
-     grouping ipsec-acl-seq-tcp-grouping {
-       description
-         "IPSec ACL Sequence TCP.";
-       leaf tcp {
-         type empty;
-         description
-           "Source is TCP protocol.";
-       }
-     }
-
-     grouping ipsec-acl-seq-udp-grouping {
-       description
-         "IPSec ACL Sequence for UDP.";
-       leaf udp {
-         type empty;
-         description
-           "Source is UDP protocol.";
-       }
-     }
-
-     grouping ipsec-acl-grouping {
-       description
-         "IPSec ACL";
-       list access-list {
-         if-feature ipsec-acl;
-         key "name sequence-number";
-         uses name-grouping;
-         uses sequence-number-grouping;
-         description
-           "Configure the IPSec access-list.";
-         choice protocol {
-           description
-             "IPSec ACL protocol.";
-           case number {
-             uses ipsec-acl-seq-protocol-number-grouping;
-           }
-           case source-ipv4-address {
-             uses ipsec-acl-seq-ip-address-grouping;
-           }
-           case any {
-             uses ipsec-acl-seq-any-grouping;
-           }
-           case tcp {
-             uses ipsec-acl-seq-tcp-grouping;
-           }
-           case udp {
-             uses ipsec-acl-seq-udp-grouping;
-           }
-         }
-         uses ipsec-acl-dest-grouping;
-       }
-     }
-
-     grouping ipsec-df-bit-grouping {
-       description
-         "IPSec Dont Fragment (DF) bit for IP header.";
-       container df-bit {
-         description
-           "Configure Don't Fragment (DF) bit for IP Header.";
-         leaf clear {
-           type empty;
-           description
-             "Clear DF bit for outer IP header.";
-         }
-         leaf propagate {
-           type empty;
-           description
-             "Propagate DF bit for outer IP header.";
-         }
-         leaf set {
-           type empty;
-           description
-             "Set DF bit for outer IP header.";
-         }
-       }
-     }
-
-     grouping ipsec-profile-grouping {
-       description
-         "IPSec profile.";
-       list profile {
-         key "name";
-         uses name-grouping;
-         uses ipsec-df-bit-grouping;
-         description
-           "Configure the IPSec Profile.";
-         leaf mtu {
-           type uint32 {
-             range "256..1600";
-           }
-           description
-             "Set the MTU.";
-         }
-         list seq {
-           key "sequence-number";
-           uses sequence-number-grouping;
-           description
-             "IPSec Access List sequence number.";
-           leaf policy {
-             type leafref {
-               path "/eipsec:ipsec/eipsec:policy"+
-                    "/eipsec:ipsec-policy/eipsec:name";
-             }
-             description
-               "Specify IPSec policy name.";
-           }
-         }
-       }
-     }
-
-
-     grouping ip-address-grouping {
-       description
-         "IP Address grouping";
-
-       choice ip-address {
-         description
-           "Choice of IPv4 or IPv6.";
-         leaf ipv4-address {
-           type inet:ipv4-address;
-           description
-             "Specifies the identity as a single four (4)
-              octet IPv4 address.
-              An example is, 10.10.10.10. ";
-         }
-         leaf ipv6-address {
-           type inet:ipv6-address;
-           description
-             "Specifies the identity as a single sixteen (16) "+
-             "octet IPv6 address. "+
-             "An example is, "+
-             "FF01::101, 2001:DB8:0:0:8:800:200C:417A .";
-         }
-       }
-     }
-
-     grouping ipsec-sa-grouping {
-       description
-         "Configure Security Association (SA)";
-       leaf spi {
-         type uint32;
-         description
-           "Specify Security Parameter Index";
-       }
-       leaf anti-replay-window {
-         type uint16 {
-           range "0..1024";
-         }
-         description
-           "Specify replay window size";
-       }
-       leaf ip-comp {
-         type empty;
-         description
-           "Enables IPCOMP, which uses the IP payload compression
-            protocol to compress IP security (IPsec) packets
-            before encryption";
-       }
-
-       container local-peer {
-         description
-           "Specify the local peer IP address";
-         uses ip-address-grouping;
-       }
-       container remote-peer {
-         description
-           "Specify the remote peer IP address";
-         uses ip-address-grouping;
-       }
-       leaf sa-mode {
-         type ipsec-mode;
-         description
-           "SA Mode: tunnel or transport mode";
-       }
-       leaf security-protocol {
-         type ipsec-protocol;
-         description
-           "Security protocol of IPsec SA: Either AH or ESP.";
-       }
-       leaf sequence-number {
-         type uint64;
-         description
-           "Current sequence number of IPsec packet.";
-       }
-       leaf sequence-number-overflow-flag {
-         type boolean;
-         description
-           "The flag indicating whether overflow of the sequence
-            number counter should prevent transmission of additional
-            packets on the SA, or whether rollover is permitted.";
-       }
-       leaf path-mtu {
-         type uint16;
-         description
-           "maximum size of an IPsec packet that can be transmitted
-            without fragmentation";
-       }
-       container life-time {
-         leaf life-time-in-seconds {
-           type uint32;
-           description
-             "SA life time in seconds";
-         }
-         leaf remain-life-time-in-seconds {
-           type uint32;
-           description
-             "Remain SA life time in seconds";
-         }
-         leaf life-time-in-byte {
-           type uint32;
-           description
-             "SA life time in bytes";
-         }
-         leaf remain-life-time-in-byte {
-           type uint32;
-           description
-             "Remain SA life time in bytes";
-         }
-         description
-           "SA life time information";
-       }
-       leaf upper-protocol {
-         type string;
-         description
-           "Upper-layer protocol to be used";
-       }
-       leaf direction {
-         type ipsec-traffic-direction;
-         description
-           "It indicates whether the SA is inbound SA or
-            out bound SA.";
-       }
-       container source-address {
-         description
-           "Specify the source IP address and
-            port of protected traffic";
-         uses ip-address-grouping;
-         leaf port-number {
-           type uint32;
-           description
-             "port of protected traffic";
-         }
-       }
-       container destination-address {
-         description
-           "Specify the destination IP address and
-            port of protected traffic";
-         uses ip-address-grouping;
-         leaf port-number {
-           type uint32;
-           description
-             "port of protected traffic";
-         }
-       }
-       leaf nat-traversal-flag {
-         type boolean;
-         description
-           "Whether the SA is used to protect traffic that needs
-            nat traversal";
-       }
-       uses ipsec-sa-ah-grouping;
-       uses ipsec-sa-esp-grouping;
-     }
-
-
-     /* draft-wang-ipsecme-ike-yang-00 */
-     grouping ipsec-common-configuration {
-       choice df-flag {
-         default copy;
-         case set {
-           leaf set {
-             type empty;
-             description
-               "Set the df bit when encapsulate IPsec tunnel.";
-           }
-         }
-         case clear {
-           leaf clear {
-             type empty;
-             description
-               "Clear the df bit when encapsulate IPsec tunnel.";
-           }
-         }
-         case copy {
-           leaf copy {
-             type empty;
-             description
-               "Copy the inner IP header df bit.";
-           }
-         }
-         description
-           "It indicates how to process the df bit when encapsulate
-            IPsec tunnel.";
-       }
-       leaf stateful-frag-check {
-         type boolean;
-         default false;
-         description "Whether stateful fragment checking applies.";
-       }
-       leaf life-time-kb {
-         type uint32;
-         units "KB";
-         default 2000000;
-         description "IPsec SA Life time in KB.";
-       }
-       leaf life-time-second {
-         type uint32;
-         units "Second";
-         default 18400;
-         description "IPsec SA Life time in Seconds";
-       }
-       choice anti-replay {
-         default enable;
-         case enable {
-           leaf enable {
-             type empty;
-             description "Enable Anti-replay";
-           }
-           choice anti-replay-windows-size {
-             case size-32;
-             case size-64;
-             case size-128;
-             case size-256;
-             case size-512;
-             case size-1024;
-             default size-1024;
-             description "It indicate the size of anti-replay window";
-           }
-         }
-         case disable {
-           leaf disable {
-             type empty;
-             description "Disable Anti-replay";
-           }
-         }
-         description "Whether enable or disable anti-replay";
-       }
-       leaf inbound-dscp {
-         type uint16 {
-           range "0..63";
-         }
-         default 0;
-         description "Inbound DSCP value";
-       }
-       leaf outbound-dscp {
-         type uint16 {
-           range "0..63";
-         }
-         default 0;
-         description "Outbound DSCP value";
-       }
-       description "Common IPsec configurations";
-     }
-
-     /*--------------------*/
-     /* Configuration Data */
-     /*--------------------*/
-     container ikev1 {
-       if-feature ikev1;
-       description
-         "Configuration IPSec IKEv1";
-       /* The following is for <configure> */
-       list proposal {
-          key "name";
-          uses ike-proposal-grouping;
-          description
-            "Configure IKE proposal";
-       }
-       leaf keepalive {
-         type empty;
-         description
-           "Enables sending Dead Peer Detection (DPD) messages "+
-           "to Internet Key Exchange (IKE) peers.";
-       }
-       list policy {
-         key "name";
-         uses ike-policy-profile-grouping;
-         description
-           "Configure IKE Policy Profile.";
-       }
-     }
-
-     container ikev2 {
-       if-feature ikev2;
-       description
-         "Configuration IPSec IKEv2";
-       /* The following is for <configure> */
-       /* draft-wang-ipsecme-ike-yang-00 */
-       container ike-global-configuration {
-         if-feature ikev2-global;
-         description "Global IKE configurations";
-         uses ipsec-common-configuration;
-         leaf local-name {
-           type string;
-           description
-             "Global local name configuration, if it is not configed,
-              ip address will be used as default. If configing special
-              local name for special peer, it will overwrite the global
-              name configuration when negotion with that peer.";
-         }
-         leaf nat-keepalive-interval {
-           type uint16 {
-             range "5..300";
-           }
-           units "Seconds";
-           default 20;
-           description "Global nat keepalive interval";
-         }
-         leaf dpd-interval {
-           type uint16 {
-             range "10..3600";
-           }
-           units "Seconds";
-           default 30;
-           description "Global DPD interval";
-         }
-       }
-       container ike-peer {
-         if-feature ikev2-peer;
-         description "IKE peer information";
-         list ike-peer-entries {
-           key "peer-name";
-           description "IKE peer information";
-           leaf peer-name {
-             type string;
-             mandatory true;
-             description "Name of IKE peer";
-           }
-           leaf ike-proposal-number {
-             type ike-proposal-number-ref;
-             description "IKE proposal number referenced by IKE peer";
-           }
-           leaf PresharedKey {
-             type string;
-             description "Preshare key";
-           }
-           leaf nat-traversal {
-             type boolean;
-             default false;
-             description "Enable/Disable nat traversal";
-           }
-           choice local-id-type {
-             default ip;
-             case ip {
-               leaf ip {
-                 type empty;
-                 description "IP address";
-               }
-             }
-             case fqdn {
-               leaf fqdn {
-                 type empty;
-                 description "Fully Qualifed Domain name ";
-               }
-             }
-             case dn {
-               leaf dn {
-                 type empty;
-                 description "Domain name";
-               }
-             }
-             case user_fqdn {
-               leaf user_fqdn {
-                 type empty;
-                 description "User FQDN";
-               }
-             }
-             description "Local ID type";
-           }
-           leaf local-id {
-             type string;
-             description
-               "Local ID Name. When IP is used as local ID type,
-                it is ignored. If it is not configurated,
-                global local name will be used.";
-           }
-           leaf remote-id {
-             type "string";
-             description "ID of IKE peer";
-           }
-           leaf low-remote-address {
-             type inet:ip-address;
-             description "Low range of remote address";
-           }
-           leaf high-remote-address {
-             type inet:ip-address;
-             description "High range of remote address";
-           }
-           leaf certificate {
-             type string;
-             description "Certificate file name";
-           }
-           leaf auth-address-begin {
-             type inet:ip-address;
-             description
-               "The begin range of authenticated peer address";
-           }
-           leaf auth-address-end {
-             type inet:ip-address;
-             description
-               "The end range of authenticated peer address";
-           }
-         }
-       }//End of IKEPeerEntries
-
-
-       list proposal {
-          if-feature ikev2-proposal;
-          key "name";
-          uses ikev2-proposal-grouping;
-          description
-            "Configure IKEv2 proposal";
-       }
-       list policy {
-         if-feature ikev2-policy;
-         key "name";
-         uses ikev2-policy-profile-grouping;
-         description
-           "IKEv2 Policy Profile";
-       }
-     }
-
-     container ipsec {
-       if-feature ipsec;
-       description
-         "Configuration IPsec";
-       container sad {
-         if-feature ipsec-sad;
-         description
-           "Configure the IPSec Security Association Database (SAD)";
-         list sad-entries {
-           key "spi direction";
-           description
-             "Configure IPsec Security Association Database(SAD)";
-           uses ipsec-sa-grouping;
-         }
-       }
-       container proposal {
-         if-feature ipsec-proposal;
-         description
-           "IPSec Proposal Profile";
-         list ipsec-proposal {
-           key "name";
-           uses ipsec-proposal-grouping;
-           description
-             "Configure the IP Security (IPSec) proposal";
-         }
-       }
-       container spd {
-         if-feature ipsec-spd;
-         description
-           "Configure the Security Policy Database (SPD)";
-         list spd-entries {
-           key "name";
-           ordered-by user;
-           uses ipsec-policy-grouping;
-           description
-             "Specify an IPSec policy name";
-         }
-       }
-       container pad {
-         description
-           "Configure Peer Authorization Database (PAD)";
-         list pad-entries {
-           key "pad-type pad-id";
-           ordered-by user;
-           uses identity-grouping;
-           description
-             "Peer Authorization Database (PAD)";
-           leaf pad-id {
-             type uint32;
-              description
-                "PAD identity";
-           }
-           leaf pad-type {
-             type pad-type-t;
-             description
-               " PAD type";
-           }
-           leaf ike-peer-name {
-             type string;
-             description
-               "IKE Peer Name";
-           }
-           container peer-authentication {
-             description
-               "Specify IKE peer authentication configuration";
-             leaf algorithm {
-               type ike-integrity-algorithm-t;
-               description
-                 "Specify the authentication algorithm";
-             }
-             leaf preshared-key {
-               type empty;
-               description
-                 "Use pre-shared key based authentication";
-             }
-             leaf rsa-signature {
-               type empty;
-               description
-                 "Use signature based authentication by using
-                  PKI certificates";
-             }
-           }
-         }
-       }
-     }
-
-
-
-     /*--------------------------*/
-     /* Operational State Data   */
-     /*--------------------------*/
-     grouping ike-proposal-state-components {
-       description
-         "IKE Proposal operational state";
-       list proposal {
-         if-feature ike-proposal-state;
-         description
-           "Operational data for IKE Proposal";
-         leaf name {
-           type string {
-             length "1..50";
-           }
-           description
-             "Name of the IKE proposal.";
-         }
-         leaf lifetime {
-           type uint32;
-           units "seconds";
-           description
-             "lifetime";
-         }
-         leaf encryption {
-           type ike-encryption-algorithm-t;
-           description
-             "Encryption algorithm";
-         }
-         leaf dh-group {
-           type diffie-hellman-group-t;
-           description
-             "Diffie-Hellman group.";
-         }
-         leaf authentication {
-           type ike-integrity-algorithm-t;
-           description
-             "authentication";
-         }
-       }
-     }
-
-     grouping ike-policy-state-grouping {
-       description
-         "IKE Policy State.";
-       list policy {
-         if-feature ike-policy-state;
-         description
-           "Operational data for IKE policy";
-         leaf name {
-           type string {
-             length "1..50";
-           }
-           description
-             "Name of the IKE Policy.";
-         }
-         leaf description {
-           type string;
-           description
-             "Description for IKE Policy.";
-         }
-         leaf mode {
-           type enumeration {
-             enum aggressive {
-               description
-                 "Aggressive mode.";
-             }
-             enum main {
-               description
-                 "Main mode.";
-             }
-           }
-           description
-             "IKE policy mode.";
-         }
-         leaf connection-type {
-           type connection-type-t;
-           description
-             "IKE policy connection type.";
-         }
-         leaf local-identity {
-           type inet:ipv4-address-no-zone;
-           description
-             "IP address of the local identity.";
-         }
-         leaf remote-identity {
-           type inet:ipv4-address-no-zone;
-           description
-             "IP address of the remote identity.";
-         }
-         leaf pre-shared-key {
-           type string;
-           description
-             "Pre-shared key";
-         }
-         leaf seq {
-           type uint32;
-           description
-             "sequence number";
-         }
-         leaf proposal {
-           type string;
-           description
-             "proposal name";
-         }
-       }
-     }
-
-     grouping ikev2-proposal-state-components {
-       description
-         "IKEv2 Operational state";
-       list proposal {
-         if-feature ikev2-proposal-state;
-         description
-           "IKEv2 proposal operational data";
-         leaf name {
-           type string;
-           description
-             "Name of IKEv2 Proposal.";
-         }
-         leaf pseudo-random-function {
-           type pseudo-random-function-t;
-           description
-             "Pseudo Random Function for IKEv2.";
-         }
-         leaf authentication {
-           type ike-integrity-algorithm-t;
-           description
-             "authentication";
-         }
-         leaf encryption {
-           type ike-encryption-algorithm-t;
-           description
-             "Encryption algorithm";
-         }
-         leaf dh-group {
-           type diffie-hellman-group-t;
-           mandatory true;
-           description
-             "Diffie-Hellman group.";
-         }
-       }
-     }
-
-     grouping ipsec-policy-state-grouping {
-       description
-         "IPSec operational state";
-       list policy {
-         if-feature ipsec-policy-state;
-         description
-           "IPSec policy operational data";
-         leaf name {
-           type string;
-           description
-             "IPSec Policy name.";
-         }
-         leaf anti-replay-window {
-           type uint32;
-           description
-             "replay window size";
-         }
-         leaf perfect-forward-secrecy {
-           type diffie-hellman-group-t;
-           description
-             "Diffie-Hellman group for perfect-forward-secrecy";
-         }
-         list seq {
-           description
-             "Sequence number";
-           leaf seq-id {
-             type uint32;
-             description
-               "Sequence number";
-           }
-           leaf proposal-name {
-             type string;
-             description
-               "IPSec proposal name";
-           }
-         }
-       }
-     }
-     grouping ipsec-proposal-state-grouping {
-       description
-         "IPSec proposal operational data";
-       list proposal {
-         if-feature ipsec-proposal-state;
-         description
-           "IPSec proposal operational data";
-         leaf name {
-           type string;
-           description
-             "IPSec Proposal name";
-         }
-         leaf ah {
-           type ike-integrity-algorithm-t;
-           description
-             "Authentication Header (AH).";
-         }
-         container esp {
-           description
-             "Encapsulating Security Payload (ESP).";
-           leaf authentication {
-             type ike-integrity-algorithm-t;
-             description
-               "ESP authentication";
-           }
-           leaf encryption {
-             type ike-encryption-algorithm-t;
-             description
-               "ESP encryption";
-           }
-         }
-         leaf ip-comp{
-           type empty;
-           description
-             "IPSec proposal IP-COMP which uses the IP Payload "+
-             "compression protocol to compress IP Security (IPSec) "+
-             "packets before encryption";
-         }
-         container lifetime {
-           description
-             "lifetime for IPSEC SAs";
-           leaf kbytes {
-             type uint32;
-             description
-               "lifetime kbytes for IPSEC SAs";
-
-           }
-           leaf seconds {
-             type uint32;
-             description
-               "lifetime seconds for IPSEC SAs";
-           }
-         }
-       }
-     }
-
-     grouping ipsec-alarms-state-grouping {
-       description
-         "IPSec alarms operational data";
-       leaf hold-down {
-         if-feature ipsec-alarms-state;
-         type uint32;
-         description
-           "Hold-down value";
-       }
-     }
-
-     grouping ipsec-sa-ah-state-grouping {
-       description
-         "IPSec SA's AH operational data";
-
-       leaf spi {
-         if-feature ipsec-sa-ah-state;
-         type uint32;
-         description
-           "Security Parameter Index (SPI) value";
-       }
-       leaf description {
-         if-feature ipsec-sa-ah-state;
-         type string;
-         description
-           "the description.";
-       }
-       leaf authentication-algorithm {
-         if-feature ipsec-sa-ah-state;
-         type ike-integrity-algorithm-t;
-         description
-           "Authentication algorithm";
-       }
-       leaf encryption-algorithm {
-         if-feature ipsec-sa-ah-state;
-         type ike-encryption-algorithm-t;
-         description
-           "Encryption algorithm";
-       }
-     }
-
-     grouping ipsec-sa-state-grouping {
-       description
-         "IPSec Security Association Operational data";
-       list sa {
-         if-feature ipsec-sa-state;
-         description
-           "IPSec SA operational data";
-         leaf name {
-           type string;
-           description
-             "Specify IPSec Security Association (SA) name";
-         }
-         leaf anti-replay-window {
-           type uint16;
-           description
-             "replay window size";
-         }
-         leaf ip-comp {
-           type empty;
-           description
-             "Enables IPCOMP, which uses the IP payload compression
-              protocol to compress IP security (IPsec) packets before
-              encryption";
-         }
-         uses ipsec-sa-ah-state-grouping;
-       }
-     }
-
-     /* draft-wang-ipsecme-ipsec-yang-00 */
-     grouping ipsec-tunnel-mode-info {
-       description
-         "common infomations when using IPsec tunnel mode";
-       leaf local-address {
-         if-feature ipsec-tunnel;
-         type string;
-         description
-           "Local address of IPsec tunnel mode";
-       }
-       leaf remote-address {
-         if-feature ipsec-tunnel;
-         type string;
-         description
-           "Remote address of IPsec tunnel mode";
-       }
-       leaf bypass-df {
-         if-feature ipsec-tunnel;
-         type enumeration {
-           enum "set" {
-             description
-               "Set the df bit";
-           }
-           enum "clear" {
-             description
-               "Clear the df bit";
-           }
-           enum "copy" {
-             description
-               "Copy the df bit from inner header";
-           }
-         }
-         description
-           "This flag indicates how to process tunnel mode df flag";
-       }
-       leaf dscp-flag {
-         if-feature ipsec-tunnel;
-         type boolean;
-         description
-           "This flag indicate whether bypass DSCP or map to
-            unprotected DSCP values (array) if needed to
-            restrict bypass of DSCP values.";
-       }
-       leaf stateful-frag-check-flag {
-         if-feature ipsec-tunnel;
-         type boolean;
-         description
-           "This flag indicates whether stateful fragment checking
-            will be used.";
-       }
-     }
-     grouping traffic-selector {
-       description
-         "IPsec traffic selector information";
-       leaf local-address-low {
-         if-feature ipsec-local-address-range;
-         type inet:ip-address;
-         description
-           "Low range of local address";
-       }
-       leaf local-address-high {
-         if-feature ipsec-local-address-range;
-         type inet:ip-address;
-         description
-           "High range of local address";
-       }
-       leaf remote-address-low {
-         if-feature ipsec-remote-address-range;
-         type inet:ip-address;
-         description
-           "Low range of remote address";
-       }
-       leaf remote-address-high {
-         if-feature ipsec-remote-address-range;
-         type inet:ip-address;
-         description
-           "High range of remote address";
-       }
-       leaf next-protocol-low {
-         if-feature ipsec-next-protocol-range;
-         type uint16;
-         description
-           "Low range of next protocol";
-       }
-       leaf next-protocol-high {
-         if-feature ipsec-next-protocol-range;
-         type uint16;
-         description
-           "High range of next protocol";
-       }
-       leaf local-port-low {
-         if-feature ipsec-local-port-range;
-         type inet:port-number;
-         description
-           "Low range of local port";
-       }
-       leaf local-port-high {
-         if-feature ipsec-local-port-range;
-         type inet:port-number;
-         description
-           "High range of local port";
-       }
-       leaf remote-port-high {
-         if-feature ipsec-remote-port-range;
-         type inet:port-number;
-         description
-           "Low range of remote port";
-       }
-       leaf remote-port-low {
-         if-feature ipsec-remote-port-range;
-         type inet:port-number;
-         description
-           "High range of remote port";
-       }
-     }
-     grouping ipsec-algorithm-info {
-       description
-         "IPsec algorithm information used by SPD and SAD";
-       leaf ah-auth-algorithm {
-         if-feature ipsec-ah-authentication;
-         type ipsec-authentication-algorithm;
-         description
-           "Authentication algorithm used by AH";
-       }
-       leaf esp-integrity-algorithm {
-         if-feature ipsec-esp-integrity;
-         type ipsec-authentication-algorithm;
-         description
-           "Integrity algorithm used by ESP";
-       }
-       leaf esp-encrypt-algorithm {
-         if-feature ipsec-esp-encrypt;
-         type ipsec-encryption-algorithm;
-         description
-           "Encryption algorithm used by ESP";
-       }
-     }
-     grouping ipsec-stat {
-       leaf inbound-packets {
-         if-feature ipsec-stat;
-         type uint64;
-         config false;
-         description "Inbound Packet count";
-       }
-       leaf outbound-packets {
-         if-feature ipsec-stat;
-         type uint64;
-         config false;
-         description "Outbound Packet count";
-       }
-       leaf inbound-bytes {
-         if-feature ipsec-stat;
-         type uint64;
-         config false;
-         description "Inbound Packet bytes";
-       }
-       leaf outbound-bytes {
-         if-feature ipsec-stat;
-         type uint64;
-         config false;
-         description "Outbound Packet bytes";
-       }
-       leaf inbound-drop-packets {
-         if-feature ipsec-stat;
-         type uint64;
-         config false;
-         description "Inbound dropped packets count";
-       }
-       leaf outbound-drop-packets {
-         if-feature ipsec-stat;
-         type uint64;
-         config false;
-         description "Outbound dropped packets count";
-       }
-       container dropped-packet-detail {
-         if-feature ipsec-stat;
-         description "The detail information of dropped packets";
-         leaf sa-non-exist {
-           type uint64;
-           config false;
-           description
-             "The dropped packets counts caused by SA non-exist.";
-         }
-         leaf queue-full {
-           type uint64;
-           config false;
-           description
-             "The dropped packets counts caused by full processing
-              queue";
-         }
-         leaf auth-failure {
-           type uint64;
-           config false;
-           description
-             "The dropped packets counts caused by authentication
-              failure";
-         }
-         leaf malform {
-           type uint64;
-           config false;
-           description "The dropped packets counts of malform";
-         }
-         leaf replay {
-           type uint64;
-           config false;
-           description "The dropped packets counts of replay";
-         }
-         leaf large-packet {
-           type uint64;
-           config false;
-           description "The dropped packets counts of too large";
-         }
-         leaf invalid-sa {
-           type uint64;
-           config false;
-           description "The dropped packets counts of invalid SA";
-         }
-         leaf policy-deny {
-           type uint64;
-           config false;
-           description
-             "The dropped packets counts of denyed by policy";
-         }
-         leaf other-reason {
-           type uint64;
-           config false;
-           description
-             "The dropped packets counts of other reason";
-         }
-       }
-       description "IPsec statistics information";
-     }
-
-
-     container ike-state {
-       if-feature ikev1-state;
-       config "false";
-       uses ike-proposal-state-components;
-       uses ike-policy-state-grouping;
-       description
-         "Contain the operational data for IKE.";
-     }
-     container ikev2-state {
-       if-feature ikev2-state;
-       config "false";
-       uses ikev2-proposal-state-components;
-       uses ike-policy-state-grouping;
-       description
-         "Contain the operational data for IKEv2.";
-     }
-     container ipsec-state {
-       if-feature ipsec-state;
-       config "false";
-       uses ipsec-policy-state-grouping;
-       uses ipsec-proposal-state-grouping;
-       uses ipsec-alarms-state-grouping;
-       uses ipsec-sa-state-grouping;
-       container redundancy {
-         if-feature ipsec-redundancy;
-         description
-           "Configure redundancy for IPSec";
-         leaf inter-chassis {
-           type empty;
-           description
-             "Set redundancy at chassis level";
-         }
-       }
-
-       description
-         "Contain the operational data for IPSec.";
-     }
-
-     /* draft-wang-ipsecme-ipsec-yang-00 */
-     container sad {
-       if-feature sad;
-       config false;
-       description
-         "The IPsec SA database";
-       list sad-entries {
-         key "spi security-protocol direction";
-         description
-           "The SA entries information";
-         leaf spi {
-           type ipsec-spi;
-           description
-             "Security parameter index of SA entry.";
-         }
-         leaf security-protocol {
-           type ipsec-protocol;
-           description
-             "Security protocol of IPsec SA.";
-         }
-         leaf direction {
-           type ipsec-traffic-direction;
-           description
-             "It indicates whether the SA is inbound SA or
-              out bound SA.";
-         }
-         leaf sa-type {
-           type enumeration {
-             enum "manual" {
-               description
-                 "Manual IPsec SA";
-             }
-             enum "isakmp" {
-               description
-                 "ISAKMP IPsec SA";
-             }
-           }
-           description
-             "It indicates whether the SA is created by manual
-              or by dynamic protocol.";
-         }
-         leaf sequence-number {
-           type uint64;
-           description
-             "Current sequence number of IPsec packet.";
-         }
-         leaf sequence-number-overflow-flag {
-           type boolean;
-           description
-             "The flag indicating whether overflow of the sequence
-              number counter should prevent transmission of additional
-              packets on the SA, or whether rollover is permitted.";
-         }
-         leaf anti-replay-enable-flag {
-           type boolean;
-           description
-             "It indicates whether anti-replay is enable or disable.";
-         }
-         leaf anti-replay-window-size {
-           type uint64;
-           description
-             "The size of anti-replay window.";
-         }
-         uses ipsec-algorithm-info;
-         container life-time {
-           leaf life-time-in-seconds {
-             type uint32;
-             description
-               "SA life time in seconds";
-           }
-           leaf remain-life-time-in-seconds {
-             type uint32;
-             description
-               "Remain SA life time in seconds";
-           }
-           leaf life-time-in-byte {
-             type uint32;
-             description
-               "SA life time in bytes";
-           }
-           leaf remain-life-time-in-byte {
-             type uint32;
-             description
-               "Remain SA life time in bytes";
-           }
-           description
-             "SA life time information";
-         }
-         leaf protocol-mode {
-           type ipsec-mode;
-           description
-             "It indicates whether tunnel mode or transport mode
-              will be used.";
-         }
-         container tunnel-mode-process-info {
-           when "../protocol-mode = 'tunnel'" {
-             description
-               "External information of SA when SA works in
-                tunnel mode.";
-           }
-           uses ipsec-tunnel-mode-info;
-           description
-             "External information of SA when SA works in
-              tunnel mode.";
-         }
-         leaf-list dscp {
-           type uint8 {
-             range "0..63";
-           }
-           description
-             "When traffic matchs SPD, the DSCP values used to
-              filter traffic";
-         }
-         leaf path-mtu {
-           type uint16;
-           description
-             "Path MTU valie";
-         }
-         leaf nat-traversal-flag {
-           type boolean;
-           description
-             "Whether the SA is used to protect traffic that needs
-              nat traversal";
-         }
-       }
-     }
-     container spd {
-       if-feature spd;
-       config false;
-       description
-         "IPsec security policy database information";
-       list spd-entries {
-         description
-           "IPsec SPD entry information";
-         list name {
-           description
-             "SPD name information.";
-           leaf name-type {
-             type ipsec-spd-name;
-             description
-               "SPD name type.";
-           }
-           leaf name-string {
-             when "../name-type = 'id_rfc_822_addr' or ../name-type =
-                   'id_fqdn'" {
-               description
-                 "when name type is id_rfc_822_addr or id_fqdn, the
-                  name are saved in string";
-             }
-             type string;
-             description
-               "SPD name content";
-           }
-           leaf name-binary {
-             when "../name-type = 'id_der_asn1_dn' or ../name-type =
-                   'id_key'" {
-               description
-                 "when name type is id_der_asn1_dn or id_key, the name
-                  are saved in binary";
-             }
-             type binary;
-             description
-               "SPD name content";
-           }
-         }
-         leaf pfp-flag {
-           type boolean;
-           description
-             "populate from packet flag";
-         }
-         list traffic-selector {
-           min-elements 1;
-           uses traffic-selector;
-           description
-             "Traffic selectors of SAD entry";
-         }
-         leaf operation {
-           type ipsec-spd-operation;
-           description
-             "It indicates how to process the traffic when it matches
-              the security policy.";
-         }
-         container protect-operation {
-           when "../operation = 'protect'" {
-             description
-               "How to protect the traffic when the SPD operation
-                is protect";
-           }
-           leaf spd-ipsec-mode {
-             type ipsec-mode;
-             description
-               "It indicates which mode is chosen when the traffic need
-               be protected by IPsec.";
-           }
-           leaf esn-flag {
-             type boolean;
-             description
-               "It indicates whether ESN is used.";
-           }
-           leaf spd-ipsec-protocol {
-             type ipsec-protocol;
-             description
-               "It indicates which protocol (AH or ESP) is chosen.";
-           }
-           container tunnel-mode-additional {
-             when "../spd-ipsec-mode = 'tunnel'" {
-               description
-                 "Additional informations when choose tunnel mode";
-             }
-             uses ipsec-tunnel-mode-info;
-             description
-               "When use tunnel mode, the additional information of
-                SPD.";
-           }
-           list spd-algorithm {
-             min-elements 1;
-             uses ipsec-algorithm-info;
-             description
-               "Algorithms defined in SPD, ordered by decreasing
-                priority.";
-           }
-           description
-             "How to protect the traffic when the SPD operation is
-              protect";
-         }
-       }
-     }
-
-     container ipsec-global-statistics {
-       if-feature ipsec-global-stats;
-       config false;
-       description "IPsec global statistics";
-       container ipv4 {
-         description "IPsec statistics of IPv4";
-         uses ipsec-stat;
-       }
-       container ipv6 {
-         description "IPsec statistics of IPv6";
-         uses ipsec-stat;
-       }
-       container global {
-         description "IPsec statistics of global";
-         uses ipsec-stat;
-       }
-     }
-
-
-     /*--------------------*/
-     /* RPC                */
-     /*--------------------*/
-     rpc clear-ipsec-group {
-       if-feature clear-ipsec-group;
-       description
-         "RPC for clear ipsec states";
-       input {
-         leaf alarm-hold-down {
-           type uint8;
-           description
-             "IPSec alarm hold-down";
-         }
-         leaf ipsec-policy-name {
-           type leafref {
-             path "/eipsec:ipsec/eipsec:spd/"+
-                  "eipsec:spd-entries/eipsec:name";
-           }
-           description
-             "IPSec Policy name.";
-         }
-       }
-     }
-
-     rpc clear-ike-group {
-       if-feature clear-ike-group;
-       description
-         "RPC for clear IKE states";
-       input {
-         leaf proposal {
-           type leafref {
-             path "/eipsec:ikev1/eipsec:proposal/"+
-                  "eipsec:name";
-           }
-           description
-             "IPSec IKE Proposal name.";
-         }
-       }
-     }
-
-     rpc clear-ikev2-group {
-       if-feature clear-ikev2-group;
-       description
-         "RPC for clear IKEv2 states";
-       input {
-         leaf proposal {
-           type leafref {
-             path "/eipsec:ikev2/eipsec:proposal/"+
-                  "eipsec:name";
-           }
-           description
-             "IPSec IKEv2 Proposal name.";
-         }
-       }
-     }
-
-     /* draft-wang-ipsecme-ipsec-yang-00 */
-     rpc reset-ipv4 {
-       if-feature reset-ipv4;
-       description "Reset IPsec IPv4 statistics";
-       input {
-         leaf ipv4 {
-           type empty;
-           description "Reset IPsec IPv4 statistics";
-         }
-       }
-       output {
-         leaf status {
-           type string;
-           description "Operation status";
-         }
-       }
-     }
-     rpc reset-ipv6 {
-       if-feature reset-ipv6;
-       description "Reset IPsec IPv6 statistics";
-       input {
-         leaf ipv6 {
-           type empty;
-           description "Reset IPsec IPv6 statistics";
-         }
-       }
-       output {
-         leaf status {
-           type string;
-           description "Operation status";
-         }
-       }
-     }
-     rpc reset-global {
-       if-feature reset-global;
-       description "Reset IPsec global statistics";
-       input {
-         leaf ipv6 {
-           type empty;
-           description "Reset IPsec global statistics";
-         }
-       }
-       output {
-         leaf status {
-           type string;
-           description "Operation status";
-         }
-       }
-     }
-/*     notification dpd-failure {
-       description "IKE peer DPD detect failure";
-       leaf peer-id {
-         type string;
-         description "Peer ID";
-       }
-     }
-     notification peer-authentication-failure {
-       if-feature peer-authentication-failure;
-       description "Peer authentication fail when negotication";
-       leaf peer-id {
-         type string;
-         description "The ID of remote peer";
-       }
-     }
-     notification ike-reauth-failure {
-       if-feature ike-reauth-failure;
-       description "IKE peer reauthentication fail";
-       leaf peer-id {
-         type string;
-         description "The ID of remote peer";
-       }
-     }
-     notification ike-rekey-failure {
-       if-feature ike-rekey-failure;
-       description "IKE SA rekey failure";
-       leaf peer-id {
-         type string;
-         description "The ID of remote peer";
-       }
-       leaf old-i-spi {
-         type uint64;
-         description "old SPI";
-       }
-       leaf old-r-spi {
-         type uint64;
-         description "old SPI";
-       }
-     }
-     notification ipsec-rekey-failure {
-       if-feature ipsec-rekey-failure;
-       description "IPsec SA rekey failure";
-       leaf peer-id {
-         type string;
-         description "The ID of remote peer";
-       }
-       leaf old-inbound-spi {
-         type ipsec-spi;
-         description "old inbound SPI";
-       }
-       leaf old-outbound-spi {
-         type ipsec-spi;
-         description "old outbound SPI";
-       }
-     } */
-   } /* module ericsson-ipsec */
diff --git a/example/ietf-ipv4-unicast-routing@2014-10-26.yang b/example/ietf-ipv4-unicast-routing@2014-10-26.yang
deleted file mode 100644
index 5076bc60..00000000
--- a/example/ietf-ipv4-unicast-routing@2014-10-26.yang
+++ /dev/null
@@ -1,232 +0,0 @@
-   module ietf-ipv4-unicast-routing {
-
-     namespace "urn:ietf:params:xml:ns:yang:ietf-ipv4-unicast-routing";
-
-     prefix "v4ur";
-
-     import ietf-routing {
-       prefix "rt";
-       revision-date "2014-10-26";	
-     }
-
-     import ietf-inet-types {
-       prefix "inet";
-       revision-date "2013-07-15";
-     }
-
-     organization
-       "IETF NETMOD (NETCONF Data Modeling Language) Working Group";
-
-     contact
-       "WG Web:   <http://tools.ietf.org/wg/netmod/>
-        WG List:  <mailto:netmod@ietf.org>
-
-        WG Chair: Thomas Nadeau
-                  <mailto:tnadeau@lucidvision.com>
-
-        WG Chair: Juergen Schoenwaelder
-                  <mailto:j.schoenwaelder@jacobs-university.de>
-
-        Editor:   Ladislav Lhotka
-                  <mailto:lhotka@nic.cz>";
-
-     description
-       "This YANG module augments the 'ietf-routing' module with basic
-        configuration and operational state data for IPv4 unicast
-        routing.
-
-        Copyright (c) 2014 IETF Trust and the persons identified as
-        authors of the code. All rights reserved.
-
-        Redistribution and use in source and binary forms, with or
-        without modification, is permitted pursuant to, and subject to
-        the license terms contained in, the Simplified BSD License set
-        forth in Section 4.c of the IETF Trust's Legal Provisions
-        Relating to IETF Documents
-        (http://trustee.ietf.org/license-info).
-
-        This version of this YANG module is part of RFC XXXX; see the
-        RFC itself for full legal notices.";
-
-     revision 2014-10-26 {
-       description
-         "Initial revision.";
-       reference
-         "RFC XXXX: A YANG Data Model for Routing Management";
-     }
-
-     /* Identities */
-
-     identity ipv4-unicast {
-       base rt:ipv4;
-       description
-         "This identity represents the IPv4 unicast address family.";
-     }
-
-     /* Operational state data */
-
-     augment "/rt:routing-state/rt:ribs/rt:rib/rt:routes/rt:route" {
-       when "../../rt:address-family = 'v4ur:ipv4-unicast'" {
-         description
-           "This augment is valid only for IPv4 unicast.";
-       }
-       description
-         "This leaf augments an IPv4 unicast route.";
-       leaf destination-prefix {
-         type inet:ipv4-prefix;
-         description
-           "IPv4 destination prefix.";
-       }
-     }
-
-     augment "/rt:routing-state/rt:ribs/rt:rib/rt:routes/rt:route/"
-           + "rt:next-hop/rt:next-hop-options/rt:simple-next-hop" {
-       when "../../../rt:address-family = 'v4ur:ipv4-unicast'" {
-         description
-           "This augment is valid only for IPv4 unicast.";
-       }
-       description
-         "This leaf augments the 'simple-next-hop' case of IPv4 unicast
-          routes.";
-       leaf next-hop-address {
-         type inet:ipv4-address;
-         description
-           "IPv4 address of the next-hop.";
-       }
-     }
-
-     augment "/rt:routing-state/rt:next-hop-lists/rt:next-hop-list/"
-           + "rt:next-hop/rt:next-hop-options/rt:simple-next-hop" {
-       when "../rt:address-family = 'v4ur:ipv4-unicast'" {
-         description
-           "This augment is valid only for IPv4 unicast.";
-       }
-       description
-         "This leaf augments next-hop list with IPv4 next-hop address.
-          routes.";
-       leaf next-hop-address {
-         type inet:ipv4-address;
-         description
-           "IPv4 address of the next-hop.";
-       }
-     }
-
-     /* Configuration data */
-
-     augment "/rt:routing/rt:routing-instance/rt:routing-protocols/"
-           + "rt:routing-protocol/rt:static-routes" {
-       description
-         "This augment defines the configuration of the 'static'
-          pseudo-protocol with data specific to IPv4 unicast.";
-       container ipv4 {
-         description
-           "Configuration of a 'static' pseudo-protocol instance
-            consists of a list of routes.";
-         list route {
-           key "destination-prefix";
-           ordered-by "user";
-           description
-             "A user-ordered list of static routes.";
-           leaf destination-prefix {
-             type inet:ipv4-prefix;
-             mandatory "true";
-             description
-               "IPv4 destination prefix.";
-           }
-           leaf description {
-             type string;
-             description
-               "Textual description of the route.";
-           }
-           container next-hop {
-             description
-               "Configuration of next-hop.";
-             grouping next-hop-content {
-               description
-                 "Next-hop content for IPv4 unicast static routes.";
-               uses rt:next-hop-content {
-                 augment "next-hop-options" {
-                   description
-                     "Add next-hop address case.";
-                   leaf next-hop-address {
-                     type inet:ipv4-address;
-                     description
-                       "IPv4 address of the next-hop.";
-                   }
-                 }
-               }
-             }
-             choice simple-or-list {
-               description
-                 "Options for next-hops.";
-               list multipath-entry {
-                 if-feature rt:multipath-routes;
-                 key "name";
-                 description
-                   "List of alternative next-hops.";
-                 leaf name {
-                   type string;
-                   description
-                     "A unique identifier of the next-hop entry.";
-                 }
-                 uses next-hop-content;
-                 uses rt:next-hop-classifiers;
-               }
-               case simple-next-hop {
-                 uses next-hop-content;
-               }
-             }
-           }
-         }
-       }
-     }
-
-     /* RPC methods */
-
-     augment "/rt:fib-route/rt:input/rt:destination-address" {
-       when "rt:address-family='v4ur:ipv4-unicast'" {
-         description
-           "This augment is valid only for IPv4 unicast.";
-       }
-       description
-         "This leaf augments the 'rt:destination-address' parameter of
-          the 'rt:fib-route' operation.";
-       leaf address {
-         type inet:ipv4-address;
-         description
-           "IPv4 destination address.";
-       }
-     }
-
-     augment "/rt:fib-route/rt:output/rt:route" {
-       when "rt:address-family='v4ur:ipv4-unicast'" {
-         description
-           "This augment is valid only for IPv4 unicast.";
-       }
-       description
-         "This leaf augments the reply to the 'rt:fib-route'
-          operation.";
-       leaf destination-prefix {
-         type inet:ipv4-prefix;
-         description
-           "IPv4 destination prefix.";
-       }
-     }
-
-     augment "/rt:fib-route/rt:output/rt:route/rt:next-hop/"
-           + "rt:next-hop-options/rt:simple-next-hop" {
-       when "../rt:address-family='v4ur:ipv4-unicast'" {
-         description
-           "This augment is valid only for IPv4 unicast.";
-       }
-       description
-         "This leaf augments the 'simple-next-hop' case in the reply to
-          the 'rt:fib-route' operation.";
-       leaf next-hop-address {
-         type inet:ipv4-address;
-         description
-           "IPv4 address of the next-hop.";
-       }
-     }
-   }
-
diff --git a/example/ietf-ipv6-unicast-routing@2014-10-26.yang b/example/ietf-ipv6-unicast-routing@2014-10-26.yang
deleted file mode 100644
index c5377da6..00000000
--- a/example/ietf-ipv6-unicast-routing@2014-10-26.yang
+++ /dev/null
@@ -1,636 +0,0 @@
-
-   module ietf-ipv6-unicast-routing {
-
-     namespace "urn:ietf:params:xml:ns:yang:ietf-ipv6-unicast-routing";
-
-     prefix "v6ur";
-
-     import ietf-routing {
-       prefix "rt";
-       revision-date "2014-10-26";
-     }
-
-     import ietf-inet-types {
-       prefix "inet";
-       revision-date "2013-07-15";
-     }
-
-     import ietf-interfaces {
-       prefix "if";
-       revision-date "2013-07-15";
-     }
-
-     import ietf-ip {
-       prefix "ip";
-       revision-date "2014-06-16";
-     }
-
-     organization
-       "IETF NETMOD (NETCONF Data Modeling Language) Working Group";
-
-     contact
-       "WG Web:   <http://tools.ietf.org/wg/netmod/>
-        WG List:  <mailto:netmod@ietf.org>
-
-        WG Chair: Thomas Nadeau
-                  <mailto:tnadeau@lucidvision.com>
-
-        WG Chair: Juergen Schoenwaelder
-                  <mailto:j.schoenwaelder@jacobs-university.de>
-
-        Editor:   Ladislav Lhotka
-                  <mailto:lhotka@nic.cz>";
-
-     description
-       "This YANG module augments the 'ietf-routing' module with basic
-        configuration and operational state data for IPv6 unicast
-        routing.
-
-        Copyright (c) 2014 IETF Trust and the persons identified as
-        authors of the code. All rights reserved.
-
-        Redistribution and use in source and binary forms, with or
-        without modification, is permitted pursuant to, and subject to
-        the license terms contained in, the Simplified BSD License set
-        forth in Section 4.c of the IETF Trust's Legal Provisions
-        Relating to IETF Documents
-        (http://trustee.ietf.org/license-info).
-
-        This version of this YANG module is part of RFC XXXX; see the
-        RFC itself for full legal notices.";
-
-     revision 2014-10-26 {
-       description
-         "Initial revision.";
-       reference
-         "RFC XXXX: A YANG Data Model for Routing Management";
-     }
-
-     /* Identities */
-
-     identity ipv6-unicast {
-       base rt:ipv6;
-       description
-         "This identity represents the IPv6 unicast address family.";
-     }
-
-     /* Operational state data */
-
-     augment "/rt:routing-state/rt:routing-instance/rt:interfaces/"
-           + "rt:interface" {
-       description
-         "IPv6-specific parameters of router interfaces.";
-       container ipv6-router-advertisements {
-         description
-           "Parameters of IPv6 Router Advertisements.";
-         leaf send-advertisements {
-           type boolean;
-           description
-             "A flag indicating whether or not the router sends periodic
-              Router Advertisements and responds to Router
-              Solicitations.";
-         }
-         leaf max-rtr-adv-interval {
-           type uint16 {
-             range "4..1800";
-           }
-           units "seconds";
-           description
-             "The maximum time allowed between sending unsolicited
-              multicast Router Advertisements from the interface.";
-         }
-         leaf min-rtr-adv-interval {
-           type uint16 {
-             range "3..1350";
-           }
-           units "seconds";
-           description
-             "The minimum time allowed between sending unsolicited
-              multicast Router Advertisements from the interface.";
-         }
-         leaf managed-flag {
-           type boolean;
-           description
-             "The value that is placed in the 'Managed address
-              configuration' flag field in the Router Advertisement.";
-         }
-         leaf other-config-flag {
-           type boolean;
-           description
-             "The value that is placed in the 'Other configuration' flag
-              field in the Router Advertisement.";
-         }
-         leaf link-mtu {
-           type uint32;
-           description
-             "The value that is placed in MTU options sent by the
-              router. A value of zero indicates that no MTU options are
-              sent.";
-         }
-         leaf reachable-time {
-           type uint32 {
-             range "0..3600000";
-           }
-           units "milliseconds";
-           description
-             "The value that is placed in the Reachable Time field in
-              the Router Advertisement messages sent by the router. A
-              value of zero means unspecified (by this router).";
-         }
-         leaf retrans-timer {
-           type uint32;
-           units "milliseconds";
-           description
-             "The value that is placed in the Retrans Timer field in the
-              Router Advertisement messages sent by the router. A value
-              of zero means unspecified (by this router).";
-         }
-         leaf cur-hop-limit {
-           type uint8;
-           description
-             "The value that is placed in the Cur Hop Limit field in the
-              Router Advertisement messages sent by the router. A value
-              of zero means unspecified (by this router).";
-         }
-         leaf default-lifetime {
-           type uint16 {
-             range "0..9000";
-           }
-           units "seconds";
-           description
-             "The value that is placed in the Router Lifetime field of
-              Router Advertisements sent from the interface, in seconds.
-              A value of zero indicates that the router is not to be
-              used as a default router.";
-         }
-         container prefix-list {
-           description
-             "A list of prefixes that are placed in Prefix Information
-              options in Router Advertisement messages sent from the
-              interface.
-
-              By default, these are all prefixes that the router
-              advertises via routing protocols as being on-link for the
-              interface from which the advertisement is sent.";
-           list prefix {
-             key "prefix-spec";
-             description
-               "Advertised prefix entry and its parameters.";
-             leaf prefix-spec {
-               type inet:ipv6-prefix;
-               description
-                 "IPv6 address prefix.";
-             }
-             leaf valid-lifetime {
-               type uint32;
-               units "seconds";
-               description
-                 "The value that is placed in the Valid Lifetime in the
-                  Prefix Information option. The designated value of all
-                  1's (0xffffffff) represents infinity.";
-             }
-             leaf on-link-flag {
-               type boolean;
-               description
-                 "The value that is placed in the on-link flag ('L-bit')
-                  field in the Prefix Information option.";
-             }
-             leaf preferred-lifetime {
-               type uint32;
-               units "seconds";
-               description
-                 "The value that is placed in the Preferred Lifetime in
-                  the Prefix Information option, in seconds. The
-                  designated value of all 1's (0xffffffff) represents
-                  infinity.";
-             }
-             leaf autonomous-flag {
-               type boolean;
-               description
-                 "The value that is placed in the Autonomous Flag field
-                  in the Prefix Information option.";
-             }
-           }
-         }
-       }
-     }
-
-     augment "/rt:routing-state/rt:ribs/rt:rib/rt:routes/rt:route" {
-       when "../../rt:address-family = 'v6ur:ipv6-unicast'" {
-         description
-           "This augment is valid only for IPv6 unicast.";
-       }
-       description
-         "This leaf augments an IPv6 unicast route.";
-       leaf destination-prefix {
-         type inet:ipv6-prefix;
-         description
-           "IPv6 destination prefix.";
-       }
-     }
-
-     augment "/rt:routing-state/rt:ribs/rt:rib/rt:routes/rt:route/"
-           + "rt:next-hop/rt:next-hop-options/rt:simple-next-hop" {
-       when "../../../rt:address-family = 'v6ur:ipv6-unicast'" {
-         description
-           "This augment is valid only for IPv6 unicast.";
-       }
-       description
-         "This leaf augments the 'simple-next-hop' case of IPv6 unicast
-          routes.";
-       leaf next-hop {
-         type inet:ipv6-address;
-         description
-           "IPv6 address of the next-hop.";
-       }
-     }
-
-     augment "/rt:routing-state/rt:next-hop-lists/rt:next-hop-list/"
-           + "rt:next-hop/rt:next-hop-options/rt:simple-next-hop" {
-       when "../rt:address-family = 'v6ur:ipv6-unicast'" {
-         description
-           "This augment is valid only for IPv6 unicast.";
-       }
-       description
-         "This leaf augments next-hop list with IPv6 next-hop address.
-          routes.";
-       leaf next-hop-address {
-         type inet:ipv6-address;
-         description
-           "IPv6 address of the next-hop.";
-       }
-     }
-
-     /* Configuration data */
-
-     augment
-       "/rt:routing/rt:routing-instance/rt:interfaces/rt:interface" {
-       when "/if:interfaces/if:interface[if:name=current()/rt:name]/"
-          + "ip:ipv6/ip:enabled='true'" {
-         description
-           "This augment is only valid for router interfaces with
-            enabled IPv6.";
-       }
-       description
-         "Configuration of IPv6-specific parameters of router
-          interfaces.";
-       container ipv6-router-advertisements {
-         description
-           "Configuration of IPv6 Router Advertisements.";
-         leaf send-advertisements {
-           type boolean;
-           default "false";
-           description
-             "A flag indicating whether or not the router sends periodic
-              Router Advertisements and responds to Router
-              Solicitations.";
-           reference
-             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
-              AdvSendAdvertisements.";
-         }
-         leaf max-rtr-adv-interval {
-           type uint16 {
-             range "4..1800";
-           }
-           units "seconds";
-           default "600";
-           description
-             "The maximum time allowed between sending unsolicited
-              multicast Router Advertisements from the interface.";
-           reference
-             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
-              MaxRtrAdvInterval.";
-         }
-         leaf min-rtr-adv-interval {
-           type uint16 {
-             range "3..1350";
-           }
-           units "seconds";
-           must ". <= 0.75 * ../max-rtr-adv-interval" {
-             description
-               "The value MUST NOT be greater than 75 % of
-                'max-rtr-adv-interval'.";
-           }
-           description
-             "The minimum time allowed between sending unsolicited
-              multicast Router Advertisements from the interface.
-
-              The default value to be used operationally if this leaf is
-              not configured is determined as follows:
-
-              - if max-rtr-adv-interval >= 9 seconds, the default value
-                is 0.33 * max-rtr-adv-interval;
-
-              - otherwise it is 0.75 * max-rtr-adv-interval.";
-           reference
-             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
-              MinRtrAdvInterval.";
-         }
-         leaf managed-flag {
-           type boolean;
-           default "false";
-           description
-             "The value to be placed in the 'Managed address
-              configuration' flag field in the Router Advertisement.";
-           reference
-             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
-              AdvManagedFlag.";
-         }
-         leaf other-config-flag {
-           type boolean;
-           default "false";
-           description
-             "The value to be placed in the 'Other configuration' flag
-              field in the Router Advertisement.";
-           reference
-             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
-              AdvOtherConfigFlag.";
-         }
-         leaf link-mtu {
-           type uint32;
-           default "0";
-           description
-             "The value to be placed in MTU options sent by the router.
-              A value of zero indicates that no MTU options are sent.";
-           reference
-             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
-              AdvLinkMTU.";
-         }
-         leaf reachable-time {
-           type uint32 {
-             range "0..3600000";
-           }
-           units "milliseconds";
-           default "0";
-           description
-             "The value to be placed in the Reachable Time field in the
-              Router Advertisement messages sent by the router. A value
-              of zero means unspecified (by this router).";
-           reference
-             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
-              AdvReachableTime.";
-         }
-         leaf retrans-timer {
-           type uint32;
-           units "milliseconds";
-           default "0";
-           description
-             "The value to be placed in the Retrans Timer field in the
-              Router Advertisement messages sent by the router. A value
-              of zero means unspecified (by this router).";
-           reference
-             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
-              AdvRetransTimer.";
-         }
-         leaf cur-hop-limit {
-           type uint8;
-           description
-             "The value to be placed in the Cur Hop Limit field in the
-              Router Advertisement messages sent by the router. A value
-              of zero means unspecified (by this router).
-
-              If this parameter is not configured, the device SHOULD use
-              the value specified in IANA Assigned Numbers that was in
-              effect at the time of implementation.";
-           reference
-             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
-              AdvCurHopLimit.
-
-              IANA: IP Parameters,
-              http://www.iana.org/assignments/ip-parameters";
-         }
-         leaf default-lifetime {
-           type uint16 {
-             range "0..9000";
-           }
-           units "seconds";
-           description
-             "The value to be placed in the Router Lifetime field of
-              Router Advertisements sent from the interface, in seconds.
-              It MUST be either zero or between max-rtr-adv-interval and
-              9000 seconds. A value of zero indicates that the router is
-              not to be used as a default router. These limits may be
-              overridden by specific documents that describe how IPv6
-              operates over different link layers.
-
-              If this parameter is not configured, the device SHOULD use
-              a value of 3 * max-rtr-adv-interval.";
-           reference
-             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
-              AdvDefaultLifeTime.";
-         }
-         container prefix-list {
-           description
-             "Configuration of prefixes to be placed in Prefix
-              Information options in Router Advertisement messages sent
-              from the interface.
-
-              Prefixes that are advertised by default but do not have
-              their entries in the child 'prefix' list are advertised
-              with the default values of all parameters.
-
-              The link-local prefix SHOULD NOT be included in the list
-              of advertised prefixes.";
-           reference
-             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
-              AdvPrefixList.";
-           list prefix {
-             key "prefix-spec";
-             description
-               "Configuration of an advertised prefix entry.";
-             leaf prefix-spec {
-               type inet:ipv6-prefix;
-               description
-                 "IPv6 address prefix.";
-             }
-             choice control-adv-prefixes {
-               default "advertise";
-               description
-                 "The prefix either may be explicitly removed from the
-                  set of advertised prefixes, or parameters with which
-                  it is advertised may be specified (default case).";
-               leaf no-advertise {
-                 type empty;
-                 description
-                   "The prefix will not be advertised.
-
-                    This can be used for removing the prefix from the
-                    default set of advertised prefixes.";
-               }
-               case advertise {
-                 leaf valid-lifetime {
-                   type uint32;
-                   units "seconds";
-                   default "2592000";
-                   description
-                     "The value to be placed in the Valid Lifetime in
-                      the Prefix Information option. The designated
-                      value of all 1's (0xffffffff) represents
-                      infinity.";
-                   reference
-                     "RFC 4861: Neighbor Discovery for IP version 6
-                      (IPv6) - AdvValidLifetime.";
-                 }
-                 leaf on-link-flag {
-                   type boolean;
-                   default "true";
-                   description
-                     "The value to be placed in the on-link flag
-                      ('L-bit') field in the Prefix Information
-                      option.";
-                   reference
-                     "RFC 4861: Neighbor Discovery for IP version 6
-                      (IPv6) - AdvOnLinkFlag.";
-                 }
-                 leaf preferred-lifetime {
-                   type uint32;
-                   units "seconds";
-                   must ". <= ../valid-lifetime" {
-                     description
-                       "This value MUST NOT be greater than
-                        valid-lifetime.";
-                   }
-                   default "604800";
-                   description
-                     "The value to be placed in the Preferred Lifetime
-                      in the Prefix Information option. The designated
-                      value of all 1's (0xffffffff) represents
-                      infinity.";
-                   reference
-                     "RFC 4861: Neighbor Discovery for IP version 6
-                      (IPv6) - AdvPreferredLifetime.";
-                 }
-                 leaf autonomous-flag {
-                   type boolean;
-                   default "true";
-                   description
-                     "The value to be placed in the Autonomous Flag
-                      field in the Prefix Information option.";
-                   reference
-                     "RFC 4861: Neighbor Discovery for IP version 6
-                      (IPv6) - AdvAutonomousFlag.";
-                 }
-               }
-             }
-           }
-         }
-       }
-     }
-
-     augment "/rt:routing/rt:routing-instance/rt:routing-protocols/"
-           + "rt:routing-protocol/rt:static-routes" {
-       description
-         "This augment defines the configuration of the 'static'
-          pseudo-protocol with data specific to IPv6 unicast.";
-       container ipv6 {
-         description
-           "Configuration of a 'static' pseudo-protocol instance
-            consists of a list of routes.";
-         list route {
-           key "destination-prefix";
-           ordered-by "user";
-           description
-             "A user-ordered list of static routes.";
-           leaf destination-prefix {
-             type inet:ipv6-prefix;
-             mandatory "true";
-             description
-               "IPv6 destination prefix.";
-           }
-           leaf description {
-             type string;
-             description
-               "Textual description of the route.";
-           }
-           container next-hop {
-             description
-               "Configuration of next-hop.";
-             grouping next-hop-content {
-               description
-                 "Next-hop content for IPv6 unicast static routes.";
-               uses rt:next-hop-content {
-                 augment "next-hop-options" {
-                   description
-                     "Add next-hop address case.";
-                   leaf next-hop-address {
-                     type inet:ipv6-address;
-                     description
-                       "IPv6 address of the next-hop.";
-                   }
-                 }
-               }
-             }
-             choice simple-or-list {
-               description
-                 "Options for next-hops.";
-               list multipath-entry {
-                 if-feature rt:multipath-routes;
-                 key "name";
-                 description
-                   "List of alternative next-hops.";
-                 leaf name {
-                   type string;
-                   description
-                     "A unique identifier of the next-hop entry.";
-                 }
-                 uses next-hop-content;
-                 uses rt:next-hop-classifiers;
-               }
-               case simple-next-hop {
-                 uses next-hop-content;
-               }
-             }
-           }
-         }
-       }
-     }
-
-     /* RPC methods */
-
-     augment "/rt:fib-route/rt:input/rt:destination-address" {
-       when "rt:address-family='v6ur:ipv6-unicast'" {
-         description
-           "This augment is valid only for IPv6 unicast.";
-       }
-       description
-         "This leaf augments the 'rt:destination-address' parameter of
-          the 'rt:fib-route' operation.";
-       leaf address {
-         type inet:ipv6-address;
-         description
-           "IPv6 destination address.";
-       }
-     }
-
-     augment "/rt:fib-route/rt:output/rt:route" {
-       when "rt:address-family='v6ur:ipv6-unicast'" {
-         description
-           "This augment is valid only for IPv6 unicast.";
-       }
-       description
-         "This leaf augments the reply to the 'rt:fib-route'
-          operation.";
-       leaf destination-prefix {
-         type inet:ipv6-prefix;
-         description
-           "IPv6 destination prefix.";
-       }
-     }
-
-     augment "/rt:fib-route/rt:output/rt:route/rt:next-hop/"
-           + "rt:next-hop-options/rt:simple-next-hop" {
-       when "../rt:address-family='v4ur:ipv6-unicast'" {
-         description
-           "This augment is valid only for IPv6 unicast.";
-       }
-       description
-         "This leaf augments the 'simple-next-hop' case in the reply to
-          the 'rt:fib-route' operation.";
-       leaf next-hop-address {
-         type inet:ipv6-address;
-         description
-           "IPv6 address of the next-hop.";
-       }
-     }
-   }
-
diff --git a/example/ietf-routing@2014-10-26.yang b/example/ietf-routing@2014-10-26.yang
deleted file mode 100644
index 9c870419..00000000
--- a/example/ietf-routing@2014-10-26.yang
+++ /dev/null
@@ -1,1112 +0,0 @@
-   module ietf-routing {
-
-     namespace "urn:ietf:params:xml:ns:yang:ietf-routing";
-
-     prefix "rt";
-
-     import ietf-yang-types {
-       prefix "yang";
-       revision-date "2013-07-15";
-     }
-
-     import ietf-interfaces {
-       prefix "if";
-       revision-date "2014-05-08";
-     }
-
-     import ietf-inet-types {
-       prefix "inet";
-       revision-date "2013-07-15";
-     }
-
-     organization
-       "IETF NETMOD (NETCONF Data Modeling Language) Working Group";
-
-     contact
-       "WG Web:   <http://tools.ietf.org/wg/netmod/>
-        WG List:  <mailto:netmod@ietf.org>
-
-        WG Chair: Thomas Nadeau
-                  <mailto:tnadeau@lucidvision.com>
-
-        WG Chair: Juergen Schoenwaelder
-                  <mailto:j.schoenwaelder@jacobs-university.de>
-
-        Editor:   Ladislav Lhotka
-                  <mailto:lhotka@nic.cz>";
-
-     description
-       "This YANG module defines essential components for the management
-        of a routing subsystem.
-
-        Copyright (c) 2014 IETF Trust and the persons identified as
-        authors of the code. All rights reserved.
-
-        Redistribution and use in source and binary forms, with or
-        without modification, is permitted pursuant to, and subject to
-        the license terms contained in, the Simplified BSD License set
-        forth in Section 4.c of the IETF Trust's Legal Provisions
-        Relating to IETF Documents
-        (http://trustee.ietf.org/license-info).
-
-        This version of this YANG module is part of RFC XXXX; see the
-        RFC itself for full legal notices.";
-
-     revision 2014-10-26 {
-       description
-         "Initial revision.";
-       reference
-         "RFC XXXX: A YANG Data Model for Routing Management";
-     }
-
-     /* Features */
-
-     feature multiple-ribs {
-       description
-         "This feature indicates that the server supports user-defined
-          RIBS and the framework for passing routes between RIBs.
-
-          Servers that do not advertize this feature MUST provide
-          exactly one system-controlled RIB per supported address family
-          and make them also the default RIBs. These RIBs then appear as
-          entries of the list /routing-state/ribs/rib.";
-     }
-
-     feature multipath-routes {
-       description
-
-         "This feature indicates that the server supports multipath
-          routes that have a list of next-hops.";
-     }
-
-     feature router-id {
-       description
-         "This feature indicates that the server supports configuration
-          of an explicit 32-bit router ID that is used by some routing
-          protocols.
-
-          Servers that do not advertize this feature set a router ID
-          algorithmically, usually to one of configured IPv4 addresses.
-          However, this algorithm is implementation-specific.";
-     }
-
-     /* Identities */
-
-     identity address-family {
-       description
-         "Base identity from which identities describing address
-          families are derived.";
-     }
-
-     identity ipv4 {
-       base address-family;
-       description
-         "This identity represents IPv4 address family.";
-     }
-
-     identity ipv6 {
-       base address-family;
-       description
-         "This identity represents IPv6 address family.";
-     }
-
-     identity routing-instance {
-       description
-         "Base identity from which identities describing routing
-          instance types are derived.";
-     }
-
-     identity default-routing-instance {
-       base routing-instance;
-       description
-         "This identity represents either a default routing instance, or
-          the only routing instance on systems that do not support
-          multiple instances.";
-     }
-
-     identity routing-protocol {
-       description
-         "Base identity from which routing protocol identities are
-          derived.";
-     }
-
-     identity direct {
-       base routing-protocol;
-       description
-         "Routing pseudo-protocol which provides routes to directly
-          connected networks.";
-     }
-
-     identity static {
-       base routing-protocol;
-       description
-         "Static routing pseudo-protocol.";
-     }
-
-     identity route-filter {
-       description
-         "Base identity from which all route filters are derived.";
-     }
-
-     identity deny-all-route-filter {
-       base route-filter;
-       description
-         "Route filter that blocks all routes.";
-     }
-
-     identity allow-all-route-filter {
-       base route-filter;
-       description
-         "Route filter that permits all routes.";
-     }
-
-     /* Type Definitions */
-
-     typedef routing-instance-ref {
-       type leafref {
-         path "/rt:routing/rt:routing-instance/rt:name";
-       }
-       description
-         "This type is used for leafs that reference a routing instance
-          configuration.";
-     }
-
-     typedef routing-instance-state-ref {
-
-       type leafref {
-         path "/rt:routing-state/rt:routing-instance/rt:name";
-       }
-       description
-         "This type is used for leafs that reference state data of a
-          routing instance.";
-     }
-
-     typedef rib-ref {
-       type leafref {
-         path "/rt:routing/rt:ribs/rt:rib/rt:name";
-       }
-       description
-         "This type is used for leafs that reference a RIB
-          configuration.";
-     }
-
-     typedef rib-state-ref {
-       type leafref {
-         path "/rt:routing-state/rt:ribs/rt:rib/rt:name";
-       }
-       description
-         "This type is used for leafs that reference a RIB in state
-          data.";
-     }
-
-     typedef next-hop-list-ref {
-       type leafref {
-         path "/rt:routing-state/rt:next-hop-lists/rt:next-hop-list/"
-            + "rt:id";
-       }
-       description
-         "This type is used for leafs that reference a next-hop list (in
-          state data).";
-     }
-
-     typedef route-filter-ref {
-       type leafref {
-         path "/rt:routing/rt:route-filters/rt:route-filter/rt:name";
-       }
-       description
-         "This type is used for leafs that reference a route filter
-          configuration.";
-     }
-
-     typedef route-filter-state-ref {
-       type leafref {
-         path "/rt:routing-state/rt:route-filters/rt:route-filter/"
-            + "rt:name";
-       }
-       description
-         "This type is used for leafs that reference state data of a
-          route filter.";
-     }
-
-     typedef route-preference {
-       type uint32;
-       description
-         "This type is used for route preferences.";
-     }
-
-     /* Groupings */
-
-     grouping address-family {
-       description
-         "This grouping provides a leaf identifying an address
-          family.";
-       leaf address-family {
-         type identityref {
-           base address-family;
-         }
-         mandatory "true";
-         description
-           "Address family.";
-       }
-     }
-
-     grouping state-entry-id {
-       description
-         "This grouping provides a unique identifier for entries in
-          several operational state lists.";
-       leaf id {
-         type uint64;
-         description
-           "Unique numerical identifier of a list entry in operational
-            state. It may be used by protocols or tools that inspect
-            and/or manipulate operational state data and prefer
-            fixed-size integers as list entry handles.
-
-            These identifiers are always ephemeral, i.e., they may
-            change after a reboot.";
-       }
-     }
-
-     grouping router-id {
-       description
-         "This grouping provides router ID.";
-       leaf router-id {
-         type yang:dotted-quad;
-         description
-           "A 32-bit number in the form of a dotted quad that is used by
-            some routing protocols identifying a router.";
-         reference
-           "RFC 2328: OSPF Version 2.";
-       }
-     }
-
-     grouping next-hop-classifiers {
-       description
-         "This grouping provides two next-hop classifiers.";
-       leaf priority {
-         type enumeration {
-           enum primary {
-             value "1";
-             description
-               "Primary next-hop.";
-           }
-           enum backup {
-             value "2";
-             description
-               "Backup next-hop.";
-           }
-         }
-         description
-           "Simple priority for distinguishing between primary and
-            backup next-hops.
-
-            Backup next-hops are used if and only if no primary
-            next-hops are reachable.";
-       }
-       leaf weight {
-         type uint8;
-         must ". = 0 or not(../../next-hop/weight = 0)" {
-           error-message "Illegal combination of zero and non-zero "
-                       + "next-hop weights.";
-           description
-             "Next-hop weights must be either all zero (equal
-              load-balancing) or all non-zero.";
-         }
-         description
-           "This parameter specifies the weight of the next-hop for load
-            balancing. The number specifies the relative fraction of the
-            traffic that will use the corresponding next-hop.
-
-            A value of 0 represents equal load-balancing.
-
-            If both primary and backup next-hops are present, then the
-            weights for each priority level are used separately.";
-       }
-     }
-
-     grouping special-next-hop {
-       description
-         "This grouping provides a leaf with enumeration of special
-          next-hops.";
-       leaf special-next-hop {
-         type enumeration {
-           enum blackhole {
-             description
-               "Silently discard the packet.";
-           }
-           enum unreachable {
-             description
-               "Discard the packet and notify the sender with an error
-                message indicating that the destination host is
-                unreachable.";
-           }
-           enum prohibit {
-             description
-               "Discard the packet and notify the sender with an error
-                message indicating that the communication is
-                administratively prohibited.";
-           }
-           enum receive {
-             description
-               "The packet will be received by the local system.";
-           }
-         }
-         description
-           "Special next-hop options.";
-       }
-     }
-
-     grouping next-hop-content {
-       description
-         "Generic parameters of next-hops in static routes.";
-       choice next-hop-options {
-         mandatory "true";
-         description
-           "Options for next-hops in static routes.";
-         case simple-next-hop {
-           description
-
-             "Simple next-hop is specified as an outgoing interface,
-              next-hop address or both.
-
-              Address-family-specific modules are expected to provide
-              'next-hop-address' leaf via augmentation.";
-           leaf outgoing-interface {
-             type leafref {
-               path "/rt:routing/rt:routing-instance/rt:interfaces/"
-                  + "rt:interface/rt:name";
-             }
-             description
-               "Name of the outgoing interface.";
-           }
-         }
-         case special-next-hop {
-           uses special-next-hop;
-         }
-       }
-     }
-
-     grouping next-hop-state-content {
-       description
-         "Generic parameters of next-hops in state data.";
-       choice next-hop-options {
-         mandatory "true";
-         description
-           "Options for next-hops in state data.";
-         leaf next-hop-list {
-           type next-hop-list-ref;
-           description
-             "Reference to a next-hop list.";
-         }
-         leaf use-rib {
-           type rib-state-ref;
-           description
-             "Reference to a RIB in which a new look-up is to be
-              performed.";
-         }
-         case simple-next-hop {
-           description
-             "Simple next-hop is specified as an outgoing interface,
-              next-hop address or both.
-
-              Address-family-specific modules are expected to provide
-              'next-hop-address' leaf via augmentation.";
-           leaf outgoing-interface {
-             type leafref {
-               path "/rt:routing-state/rt:routing-instance/"
-                  + "rt:interfaces/rt:interface/rt:name";
-             }
-             description
-               "Name of the outgoing interface.";
-           }
-         }
-         case special-next-hop {
-           uses special-next-hop;
-         }
-       }
-     }
-
-     grouping route-metadata {
-       description
-         "Route metadata.";
-       leaf source-protocol {
-         type identityref {
-           base routing-protocol;
-         }
-         mandatory "true";
-         description
-           "Type of the routing protocol from which the route
-            originated.";
-       }
-       leaf active {
-         type empty;
-         description
-           "Presence of this leaf indicates that the route is preferred
-            among all routes in the same RIB that have the same
-            destination prefix.";
-       }
-       leaf last-updated {
-         type yang:date-and-time;
-         description
-           "Time stamp of the last modification of the route. If the
-            route was never modified, it is the time when the route was
-            inserted into the RIB.";
-       }
-     }
-
-     /* Operational state data */
-
-     container routing-state {
-       config "false";
-       description
-         "Operational state of the routing subsystem.";
-       list routing-instance {
-         key "name";
-         unique "id";
-         min-elements "1";
-         description
-           "Each list entry is a container for operational state data of
-            a routing instance.
-
-            An implementation MAY create one or more system-controlled
-            instances, other user-controlled instances MAY be created by
-            configuration.";
-         leaf name {
-           type string;
-           description
-             "The name of the routing instance.
-
-              For system-controlled instances the name is persistent,
-              i.e., it SHOULD NOT change across reboots.";
-         }
-         uses state-entry-id {
-           refine "id" {
-             mandatory "true";
-           }
-         }
-         leaf type {
-           type identityref {
-             base routing-instance;
-           }
-           description
-             "The routing instance type.";
-         }
-         container default-ribs {
-           description
-             "Default RIBs used by the routing instance.";
-           list default-rib {
-             key "address-family";
-             description
-               "Each list entry specifies the default RIB for one
-                address family.
-
-                The default RIB is operationally connected to all
-                routing protocols for which a connected RIB has not been
-                explicitly configured.
-
-                The 'direct' pseudo-protocol is always connected to the
-                default RIBs.";
-             uses address-family;
-             leaf rib-name {
-               type rib-state-ref;
-               mandatory "true";
-               description
-                 "Name of an existing RIB to be used as the default RIB
-                  for the given routing instance and address family.";
-             }
-           }
-         }
-         container interfaces {
-           description
-             "Network layer interfaces belonging to the routing
-              instance.";
-           list interface {
-             key "name";
-             description
-               "List of network layer interfaces assigned to the routing
-                instance.";
-             leaf name {
-               type if:interface-state-ref;
-               description
-                 "A reference to the name of a configured network layer
-                  interface.";
-             }
-           }
-         }
-         container routing-protocols {
-           description
-             "Container for the list of routing protocol instances.";
-           list routing-protocol {
-             key "type name";
-             description
-               "Operational state of a routing protocol instance.
-
-                An implementation MUST provide exactly one
-                system-controlled instance of the type 'direct'. Other
-                instances MAY be created by configuration.";
-             leaf type {
-               type identityref {
-                 base routing-protocol;
-               }
-               description
-                 "Type of the routing protocol.";
-             }
-             leaf name {
-               type string;
-               description
-                 "The name of the routing protocol instance.
-
-                  For system-controlled instances this name is
-                  persistent, i.e., it SHOULD NOT change across
-                  reboots.";
-             }
-             leaf route-preference {
-               type route-preference;
-               mandatory "true";
-               description
-                 "The value of route preference (administrative
-                  distance) assigned to all routes generated by the
-                  routing protocol instance. A lower value means a more
-                  preferred route.";
-             }
-             container connected-ribs {
-               description
-                 "Container for connected RIBs.";
-               list connected-rib {
-                 key "rib-name";
-                 description
-                   "List of RIBs to which the routing protocol instance
-                    is connected.
-
-                    By default, routes learned by the routing protocol
-                    instance are installed in all connected RIBs of the
-                    matching address family, and, conversely, all routes
-                    from connected RIBs are installed in the routing
-                    protocol instance. However, routing protocols may
-                    specify other rules.";
-                 leaf rib-name {
-                   type rib-state-ref;
-                   description
-                     "Name of an existing RIB.";
-                 }
-                 leaf import-filter {
-                   type route-filter-state-ref;
-                   description
-                     "Reference to a route filter that is used for
-                      filtering routes passed from this routing protocol
-                      instance to the RIB specified by the 'rib-name'
-                      sibling node.
-
-                      If this leaf is not present, the behavior is
-                      protocol-specific, but typically it means that all
-                      routes are accepted.";
-                 }
-                 leaf export-filter {
-                   type route-filter-state-ref;
-                   description
-                     "Reference to a route filter that is used for
-                      filtering routes passed from the RIB specified by
-                      the 'rib-name' sibling node to this routing
-                      protocol instance.
-
-                      If this leaf is not present, the behavior is
-                      protocol-specific - typically it means that all
-                      routes are accepted.
-
-                      The 'direct' and 'static' pseudo-protocols accept
-                      no routes from any RIB.";
-                 }
-               }
-             }
-           }
-         }
-       }
-       container next-hop-lists {
-         description
-           "Container for next-hop lists.";
-         list next-hop-list {
-           key "id";
-           description
-             "Next-hop list.";
-           uses state-entry-id;
-           uses address-family;
-           list next-hop {
-             description
-               "Entry in a next-hop list.";
-             uses next-hop-state-content;
-             uses next-hop-classifiers;
-           }
-         }
-       }
-       container ribs {
-         description
-           "Container for RIBs.";
-         list rib {
-           key "name";
-           unique "id";
-           description
-             "Each entry represents a RIB identified by the 'name' key.
-              All routes in a RIB MUST belong to the same address
-              family.
-
-              The server MUST provide a system-controlled default RIB
-              for each address family, and MAY provide other
-              system-controlled RIBs. Additional RIBs MAY be created in
-              the configuration.";
-           leaf name {
-             type string;
-             description
-               "The name of the RIB.";
-           }
-           uses state-entry-id {
-             refine "id" {
-               mandatory "true";
-             }
-           }
-           uses address-family;
-           container routes {
-             description
-               "Current content of the RIB.";
-             list route {
-               description
-                 "A RIB route entry. This data node MUST be augmented
-                  with information specific for routes of each address
-                  family.";
-               leaf route-preference {
-                 type route-preference;
-                 description
-                   "This route attribute, also known as administrative
-                    distance, allows for selecting the preferred route
-                    among routes with the same destination prefix. A
-                    smaller value means a more preferred route.";
-               }
-               container next-hop {
-                 description
-                   "Route's next-hop attribute.";
-                 uses next-hop-state-content;
-               }
-               uses route-metadata;
-             }
-           }
-           container recipient-ribs {
-             description
-               "Container for recipient RIBs.";
-             list recipient-rib {
-               key "rib-name";
-               description
-                 "List of RIBs that receive routes from this RIB.";
-               leaf rib-name {
-                 type rib-state-ref;
-                 description
-                   "The name of the recipient RIB.";
-               }
-               leaf filter {
-                 type route-filter-state-ref;
-                 description
-                   "A route filter which is applied to the routes passed
-                    to the recipient RIB.";
-               }
-             }
-           }
-         }
-       }
-       container route-filters {
-         description
-           "Container for route filters.";
-         list route-filter {
-           key "name";
-           description
-             "Route filters are used for filtering and/or manipulating
-              routes that are passed between a routing protocol and a
-              RIB and vice versa, or between two RIBs.
-
-              It is expected that other modules augment this list with
-              contents specific for a particular route filter type.";
-           leaf name {
-             type string;
-             description
-               "The name of the route filter.";
-           }
-           leaf type {
-             type identityref {
-               base route-filter;
-             }
-             mandatory "true";
-             description
-               "Type of the route-filter - an identity derived from the
-                'route-filter' base identity.";
-           }
-         }
-       }
-     }
-
-     /* Configuration Data */
-     container routing {
-       description
-         "Configuration parameters for the routing subsystem.";
-       list routing-instance {
-         key "name";
-         description
-           "Configuration of a routing instance.";
-         leaf name {
-           type string;
-           description
-             "The name of the routing instance.
-
-              For system-controlled entries, the value of this leaf must
-              be the same as the name of the corresponding entry in
-              state data.
-
-              For user-controlled entries, an arbitrary name can be
-              used.";
-         }
-         leaf type {
-           type identityref {
-             base routing-instance;
-           }
-           default "rt:default-routing-instance";
-           description
-             "The type of the routing instance.";
-         }
-         leaf enabled {
-           type boolean;
-           default "true";
-           description
-             "Enable/disable the routing instance.
-
-              If this parameter is false, the parent routing instance is
-              disabled and does not appear in operational state data,
-              despite any other configuration that might be present.";
-         }
-         uses router-id {
-           if-feature router-id;
-           description
-             "Configuration of the global router ID. Routing protocols
-              that use router ID can use this parameter or override it
-              with another value.";
-         }
-         leaf description {
-           type string;
-           description
-             "Textual description of the routing instance.";
-         }
-         container default-ribs {
-           if-feature multiple-ribs;
-           description
-             "Configuration of the default RIBs used by the routing
-              instance.
-
-              The default RIB for an addressed family if by default
-              connected to all routing protocol instances supporting
-              that address family, and always receives direct routes.";
-           list default-rib {
-             must "address-family=/routing/ribs/rib[name=current()/"
-                + "rib-name]/address-family" {
-               error-message "Address family mismatch.";
-               description
-                 "The entry's address family MUST match that of the
-                  referenced RIB.";
-             }
-             key "address-family";
-             description
-               "Each list entry configures the default RIB for one
-                address family.";
-             uses address-family;
-             leaf rib-name {
-               type string;
-               mandatory "true";
-               description
-                 "Name of an existing RIB to be used as the default RIB
-                  for the given routing instance and address family.";
-             }
-           }
-         }
-         container interfaces {
-           description
-             "Configuration of the routing instance's interfaces.";
-           list interface {
-             key "name";
-             description
-               "List of network layer interfaces assigned to the routing
-                instance.";
-             leaf name {
-               type if:interface-ref;
-               description
-                 "A reference to the name of a configured network layer
-                  interface.";
-             }
-           }
-         }
-         container routing-protocols {
-           description
-             "Configuration of routing protocol instances.";
-           list routing-protocol {
-             key "type name";
-             description
-               "Each entry contains configuration of a routing protocol
-                instance.";
-             leaf type {
-               type identityref {
-                 base routing-protocol;
-               }
-               description
-                 "Type of the routing protocol - an identity derived
-                  from the 'routing-protocol' base identity.";
-             }
-             leaf name {
-               type string;
-               description
-                 "An arbitrary name of the routing protocol instance.";
-             }
-             leaf description {
-               type string;
-               description
-                 "Textual description of the routing protocol
-                  instance.";
-             }
-             leaf enabled {
-               type boolean;
-               default "true";
-               description
-                 "Enable/disable the routing protocol instance.
-
-                  If this parameter is false, the parent routing
-                  protocol instance is disabled and does not appear in
-                  operational state data, despite any other
-                  configuration that might be present.";
-             }
-             leaf route-preference {
-               type route-preference;
-               description
-                 "The value of route preference (administrative
-                  distance).
-
-                  The default value depends on the routing protocol
-                  type, and may also be implementation-dependent.";
-             }
-             container connected-ribs {
-               description
-                 "Configuration of connected RIBs.";
-               list connected-rib {
-                 key "rib-name";
-                 description
-                   "Each entry configures a RIB to which the routing
-                    protocol instance is connected.
-                    If no connected RIB is configured for an address
-                    family, the routing protocol is connected to the
-                    default RIB for that address family.";
-                 leaf rib-name {
-                   type rib-ref;
-                   must "../../../type != 'rt:direct' or "
-                      + "../../../../../default-ribs/ "
-                      + "default-rib/rib-name=." {
-                     error-message "The 'direct' protocol can be "
-                                 + "connected only to a default RIB.";
-                     description
-                       "For the 'direct' pseudo-protocol, the connected
-                        RIB must always be a default RIB.";
-                   }
-                   description
-                     "Name of an existing RIB.";
-                 }
-                 leaf import-filter {
-                   type route-filter-ref;
-                   description
-                     "Configuration of import filter.";
-                 }
-                 leaf export-filter {
-                   type route-filter-ref;
-                   description
-                     "Configuration of export filter.";
-                 }
-               }
-             }
-             container static-routes {
-               when "../type='rt:static'" {
-                 description
-                   "This container is only valid for the 'static'
-                    routing protocol.";
-               }
-               description
-                 "Configuration of the 'static' pseudo-protocol.
-
-                  Address-family-specific modules augment this node with
-                  their lists of routes.";
-             }
-           }
-         }
-       }
-       container ribs {
-         description
-           "Configuration of RIBs.";
-         list rib {
-           key "name";
-           description
-             "Each entry represents a configured RIB identified by the
-              'name' key.
-
-              Entries having the same key as a system-controlled entry
-              of the list /routing-state/ribs/rib are used for
-              configuring parameters of that entry. Other entries define
-              additional user-controlled RIBs.";
-           leaf name {
-             type string;
-             description
-               "The name of the RIB.
-
-                For system-controlled entries, the value of this leaf
-                must be the same as the name of the corresponding entry
-                in state data.
-
-                For user-controlled entries, an arbitrary name can be
-                used.";
-           }
-           uses address-family;
-           leaf description {
-             type string;
-             description
-               "Textual description of the RIB.";
-           }
-           container recipient-ribs {
-             if-feature multiple-ribs;
-             description
-               "Configuration of recipient RIBs.";
-             list recipient-rib {
-               must "rib-name != ../../name" {
-                 error-message
-                   "Source and recipient RIBs are identical.";
-                 description
-                   "A RIB MUST NOT appear among its recipient RIBs.";
-               }
-               must "/routing/ribs/rib[name=current()/rib-name]/"
-                  + "address-family=../../address-family" {
-                 error-message "Address family mismatch.";
-                 description
-                   "Address family of the recipient RIB MUST match that
-                    of the source RIB.";
-               }
-               key "rib-name";
-               description
-                 "Each entry configures a recipient RIB.";
-               leaf rib-name {
-                 type rib-ref;
-                 description
-                   "The name of the recipient RIB.";
-               }
-               leaf filter {
-                 type route-filter-ref;
-                 description
-                   "A route filter which is applied to the routes passed
-                    to the recipient RIB.";
-               }
-             }
-           }
-         }
-       }
-       container route-filters {
-         description
-           "Configuration of route filters.";
-         list route-filter {
-           key "name";
-           description
-             "Each entry configures a named route filter.";
-           leaf name {
-             type string;
-             description
-               "The name of the route filter.";
-           }
-           leaf description {
-             type string;
-             description
-               "Textual description of the route filter.";
-           }
-           leaf type {
-             type identityref {
-               base route-filter;
-             }
-             mandatory "true";
-             description
-               "Type of the route filter..";
-           }
-         }
-       }
-     }
-
-     /* RPC methods */
-
-     rpc fib-route {
-       description
-         "Return the active FIB route that a routing-instance uses for
-          sending packets to a destination address.";
-       input {
-         leaf routing-instance-name {
-           type routing-instance-state-ref;
-           mandatory "true";
-           description
-             "Name of the routing instance whose forwarding information
-              base is being queried.
-
-              If the routing instance with name equal to the value of
-              this parameter doesn't exist, then this operation SHALL
-              fail with error-tag 'data-missing' and error-app-tag
-              'routing-instance-not-found'.";
-         }
-         container destination-address {
-           description
-             "Network layer destination address.
-
-              Address family specific modules MUST augment this
-              container with a leaf named 'address'.";
-           uses address-family;
-         }
-       }
-       output {
-         container route {
-           description
-             "The active route for the specified destination.
-
-              If the routing instance has no active route for the
-              destination address, no output is returned - the server
-              SHALL send an <rpc-reply> containing a single element
-              <ok>.
-
-              Address family specific modules MUST augment this list
-              with appropriate route contents.";
-           uses address-family;
-           container next-hop {
-             description
-               "Route's next-hop attribute.";
-             uses next-hop-state-content;
-           }
-           uses route-metadata;
-         }
-       }
-     }
-
-     rpc route-count {
-       description
-         "Return the current number of routes in a RIB.";
-       input {
-         leaf rib-name {
-           type rib-state-ref;
-           mandatory "true";
-           description
-             "Name of the RIB.
-
-              If the RIB with name equal to the value of this parameter
-              doesn't exist, then this operation SHALL fail with
-              error-tag 'data-missing' and error-app-tag
-              'rib-not-found'.";
-         }
-       }
-       output {
-         leaf number-of-routes {
-           type uint64;
-           mandatory "true";
-           description
-             "Number of routes in the RIB.";
-         }
-       }
-     }
-   }
-
diff --git a/lib/src/clixon_xml_map.c b/lib/src/clixon_xml_map.c
index 3a62a5f7..62608af5 100644
--- a/lib/src/clixon_xml_map.c
+++ b/lib/src/clixon_xml_map.c
@@ -1695,11 +1695,10 @@ xml_spec_populate_rpc(clicon_handle h,
 		      yang_spec    *yspec)
 {
     int        retval = -1;
-    yang_stmt *y=NULL;    /* yang node */
+    yang_stmt *yrpc = NULL;    /* yang node */
     yang_stmt *ymod=NULL; /* yang module */
     yang_stmt *yi = NULL; /* input */
     cxobj     *x;
-    //    int        i;
     
     if ((strcmp(xml_name(xrpc), "rpc"))!=0){
 	clicon_err(OE_UNIX, EINVAL, "RPC expected");
@@ -1710,18 +1709,18 @@ xml_spec_populate_rpc(clicon_handle h,
 	if (ys_module_by_xml(yspec, x, &ymod) < 0)
 	    goto done;
 	if (ymod != NULL)
-	    y = yang_find((yang_node*)ymod, Y_RPC, xml_name(x));
+	    yrpc = yang_find((yang_node*)ymod, Y_RPC, xml_name(x));
 	/* Non-strict semantics: loop through all modules to find the node 
 	 */
-	if (y == NULL &&
+	if (yrpc == NULL &&
 	    !clicon_option_bool(h, "CLICON_XML_NS_STRICT")){
-	    if (xml_yang_find_non_strict(x, yspec, &y) < 0) /* find rpc */
+	    if (xml_yang_find_non_strict(x, yspec, &yrpc) < 0) /* find rpc */
 		goto done;
 	}
-	if (y){
-	    xml_spec_set(x, y);
-	    if ((yi = yang_find((yang_node*)y, Y_INPUT, NULL)) != NULL){
-		/* kludge rpc -> input */
+	if (yrpc){
+	    xml_spec_set(x, yrpc);
+	    if ((yi = yang_find((yang_node*)yrpc, Y_INPUT, NULL)) != NULL){
+		/* kludge rpc -> input XXX THIS HIDES AN ERROR IN xml_spec_populate */
 		xml_spec_set(x, yi); 
 		if (xml_apply(x, CX_ELMNT, xml_spec_populate, yspec) < 0)
 		    goto done;
@@ -1751,16 +1750,16 @@ xml_spec_populate(cxobj  *x,
 {
     int        retval = -1;
     //    clicon_handle h = (clicon_handle)arg;
-    yang_spec *yspec=NULL; /* yang spec */
-    yang_stmt *y=NULL;  /* yang node */
-    yang_stmt *yparent; /* yang parent */
-    yang_stmt *ymod;    /* yang module */
-    cxobj     *xp;      /* xml parent */
+    yang_spec *yspec = NULL; /* yang spec */
+    yang_stmt *y = NULL;     /* yang node */
+    yang_stmt *yparent;      /* yang parent */
+    yang_stmt *ymod;         /* yang module */
+    cxobj     *xp = NULL;    /* xml parent */
     char      *name;
 
     yspec = (yang_spec*)arg;
     if (xml_spec(x))
-	goto ok;
+	;	//	goto ok;
     xp = xml_parent(x);
     name = xml_name(x);
     if (xp && (yparent = xml_spec(xp)) != NULL)
@@ -1785,7 +1784,7 @@ xml_spec_populate(cxobj  *x,
 	goto done;
     }
 #endif
-    ok:
+    //    ok:
     retval = 0;
  done:
     return retval;
diff --git a/lib/src/clixon_xpath.c b/lib/src/clixon_xpath.c
index b814ffc4..72b727b1 100644
--- a/lib/src/clixon_xpath.c
+++ b/lib/src/clixon_xpath.c
@@ -450,7 +450,6 @@ xp_eval_predicate(xp_ctx     *xc,
 	}
     retval = 0;
  done:
-    assert(retval==0);
     if (xr0)
 	ctx_free(xr0);
     if (xr1)
@@ -716,9 +715,17 @@ xp_relop(xp_ctx    *xc1,
 		s1 = xml_body(x);
 		switch(op){
 		case XO_EQ:
+		    if (s1==NULL || s2==NULL){
+			clicon_err(OE_XML, EINVAL, "Malformed xpath: empty string");
+			goto done;
+		    }
 		    xr->xc_bool = (strcmp(s1, s2)==0);
 		    break;
 		case XO_NE:
+		    if (s1==NULL || s2==NULL){
+			clicon_err(OE_XML, EINVAL, "Malformed xpath: empty string");
+			goto done;
+		    }
 		    xr->xc_bool = (strcmp(s1, s2));
 		    break;
 		default:
diff --git a/lib/src/clixon_yang.c b/lib/src/clixon_yang.c
index dc55bfee..ea4852dd 100644
--- a/lib/src/clixon_yang.c
+++ b/lib/src/clixon_yang.c
@@ -1641,7 +1641,7 @@ yang_augment_node(yang_stmt *ys,
     int        i;
     
     schema_nodeid = ys->ys_argument;
-    clicon_debug(1, "%s %s", __FUNCTION__, schema_nodeid);
+    clicon_debug(2, "%s %s", __FUNCTION__, schema_nodeid);
     /* Find the target */
     if (yang_abs_schema_nodeid(ysp, ys, schema_nodeid, -1, &yss) < 0)
 	goto done;
diff --git a/test/lib.sh b/test/lib.sh
index ce980ffa..c18e76fc 100755
--- a/test/lib.sh
+++ b/test/lib.sh
@@ -25,6 +25,9 @@ testname=
 # Parse yang openconfig models from https://github.com/openconfig/public
 : ${OPENCONFIG=$(pwd)/public}
 
+# Standard IETF RFC yang files. 
+: ${IETFRFC=$YANGMODELS/standard/ietf/RFC}
+
 # For memcheck
 #clixon_cli="valgrind --leak-check=full --show-leak-kinds=all clixon_cli"
 clixon_cli=clixon_cli
diff --git a/test/test_choice.sh b/test/test_choice.sh
index 1289a0f5..373bf835 100755
--- a/test/test_choice.sh
+++ b/test/test_choice.sh
@@ -17,8 +17,8 @@ cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_YANG_MODULE_MAIN>system</CLICON_YANG_MODULE_MAIN>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
diff --git a/test/test_cli.sh b/test/test_cli.sh
index 23fee546..b9ff9fc7 100755
--- a/test/test_cli.sh
+++ b/test/test_cli.sh
@@ -18,9 +18,9 @@ cfg=$dir/conf_yang.xml
 cat <<EOF > $cfg
 <config xmlns="urn:example:clixon">
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
-  <CLICON_YANG_MODULE_MAIN>$APPNAME</CLICON_YANG_MODULE_MAIN>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
+  <CLICON_YANG_MODULE_MAIN>clixon-example</CLICON_YANG_MODULE_MAIN>
   <CLICON_BACKEND_DIR>/usr/local/lib/$APPNAME/backend</CLICON_BACKEND_DIR>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
@@ -115,13 +115,7 @@ expectfn "$clixon_cli -1 -f $cfg -l o debug level 1" 0 "^$"
 expectfn "$clixon_cli -1 -f $cfg -l o debug level 0" 0 "^$"
 
 new "cli rpc"
-expectfn "$clixon_cli -1 -f $cfg -l o rpc ipv4" 0 'rpc-reply {
-    route {
-        address-family ipv4;
-        next-hop {
-            next-hop-list 2.3.4.5;
-        }
-        source-protocol static;'
+expectfn "$clixon_cli -1 -f $cfg -l o rpc ipv4" 0 '<rpc-reply><x xmlns="urn:example:clixon">ipv4</x><y xmlns="urn:example:clixon">42</y></rpc-reply>'
 
 if [ $BE -eq 0 ]; then
     exit # BE
diff --git a/test/test_compat.sh b/test/test_compat.sh
index 77875410..10579b6d 100755
--- a/test/test_compat.sh
+++ b/test/test_compat.sh
@@ -8,12 +8,14 @@ APPNAME=example
 . ./lib.sh
 cfg=$dir/conf_startup.xml
 
+# Use yang in example
+
 cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
-  <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
+  <CLICON_YANG_MODULE_MAIN>clixon-example</CLICON_YANG_MODULE_MAIN>
   <CLICON_CLI_MODE>$APPNAME</CLICON_CLI_MODE>
   <CLICON_BACKEND_DIR>/usr/local/lib/$APPNAME/backend</CLICON_BACKEND_DIR>
   <CLICON_NETCONF_DIR>/usr/local/lib/$APPNAME/netconf</CLICON_NETCONF_DIR>
diff --git a/test/test_feature.sh b/test/test_feature.sh
index 20adfa3f..3dd1e3d4 100755
--- a/test/test_feature.sh
+++ b/test/test_feature.sh
@@ -7,13 +7,14 @@ APPNAME=example
 cfg=$dir/conf_yang.xml
 fyang=$dir/test.yang
 
+# Note ietf-routing@2018-03-13 assumed
 cat <<EOF > $cfg
 <config>
   <CLICON_FEATURE>$APPNAME:A</CLICON_FEATURE>
   <CLICON_FEATURE>ietf-routing:router-id</CLICON_FEATURE>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_YANG_MODULE_MAIN>$APPNAME</CLICON_YANG_MODULE_MAIN>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
@@ -81,10 +82,10 @@ new "cli disabled feature"
 expectfn "$clixon_cli -1f $cfg -l o -y $fyang set y foo" 255 "CLI syntax error: \"set y foo\": Unknown command"
 
 new "cli enabled feature in other module"
-expectfn "$clixon_cli -1f $cfg -y $fyang set routing routing-instance A router-id 1.2.3.4" 0 ""
+expectfn "$clixon_cli -1f $cfg -y $fyang set routing router-id 1.2.3.4" 0 ""
 
 new "cli disabled feature in other module"
-expectfn "$clixon_cli -1f $cfg -l o -y $fyang set routing routing-instance A default-ribs" 255 "CLI syntax error: \"set routing routing-instance A default-ribs\": Unknown command"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set routing ribs rib default-rib false" 255 "CLI syntax error: \"set routing ribs rib default-rib\": Unknown command"
 
 new "netconf discard-changes"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
@@ -136,7 +137,7 @@ if [ -z "$match" ]; then
 fi
 
 new "netconf module ietf-interfaces"
-expect="<module><name>ietf-interfaces</name><revision>2014-05-08</revision><namespace>urn:ietf:params:xml:ns:yang:ietf-interfaces</namespace><conformance-type>implement</conformance-type></module>"
+expect="<module><name>ietf-interfaces</name><revision>2018-02-20</revision><namespace>urn:ietf:params:xml:ns:yang:ietf-interfaces</namespace><conformance-type>implement</conformance-type></module>"
 match=`echo "$ret" | grep -GZo "$expect"`
 if [ -z "$match" ]; then
       err "$expect" "$ret"
@@ -151,7 +152,7 @@ if [ -z "$match" ]; then
 fi
 
 new "netconf module ietf-routing"
-expect="<module><name>ietf-routing</name><revision>2014-10-26</revision><namespace>urn:ietf:params:xml:ns:yang:ietf-routing</namespace><feature>router-id</feature><conformance-type>implement</conformance-type></module>"
+expect="<module><name>ietf-routing</name><revision>2018-03-13</revision><namespace>urn:ietf:params:xml:ns:yang:ietf-routing</namespace><feature>router-id</feature><conformance-type>implement</conformance-type></module>"
 match=`echo "$ret" | grep -GZo "$expect"`
 if [ -z "$match" ]; then
       err "$expect" "$ret"
diff --git a/test/test_identity.sh b/test/test_identity.sh
index eeaa6198..862074ac 100755
--- a/test/test_identity.sh
+++ b/test/test_identity.sh
@@ -12,6 +12,7 @@ cat <<EOF > $cfg
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>$dir</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_BACKEND_DIR>/usr/local/lib/$APPNAME/backend</CLICON_BACKEND_DIR>
   <CLICON_BACKEND_REGEXP>example_backend.so$</CLICON_BACKEND_REGEXP>
diff --git a/test/test_leafref.sh b/test/test_leafref.sh
index 4bb83b5c..66692d54 100755
--- a/test/test_leafref.sh
+++ b/test/test_leafref.sh
@@ -9,9 +9,10 @@ fyang=$dir/leafref.yang
 cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
-  <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
+  <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_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
   <CLICON_CLI_MODE>$APPNAME</CLICON_CLI_MODE>
@@ -72,73 +73,73 @@ module example{
 }
 EOF
 
-new "test params: -f $cfg -y $fyang"
+new "test params: -f $cfg"
 
 if [ $BE -ne 0 ]; then
     new "kill old backend"
-    sudo clixon_backend -zf $cfg -y $fyang
+    sudo clixon_backend -zf $cfg
     if [ $? -ne 0 ]; then
 	err
     fi
-    new "start backend  -s init -f $cfg -y $fyang"
-    sudo $clixon_backend -s init -f $cfg -y $fyang -D $DBG
+    new "start backend  -s init -f $cfg"
+    sudo $clixon_backend -s init -f $cfg -D $DBG
     if [ $? -ne 0 ]; then
 	err
     fi
 fi
 
 new "leafref base config"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth0</name><type>ex:eth</type><ipv4><address><ip>192.0.2.1</ip><prefix-length>24</prefix-length></address><address><ip>192.0.2.2</ip><prefix-length>24</prefix-length></address></ipv4></interface><interface><name>lo</name><type>ex:lo</type><ipv4><address><ip>127.0.0.1</ip><prefix-length>32</prefix-length></address></ipv4></interface></interfaces></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth0</name><type>ex:eth</type><ipv4><address><ip>192.0.2.1</ip><prefix-length>24</prefix-length></address><address><ip>192.0.2.2</ip><prefix-length>24</prefix-length></address></ipv4></interface><interface><name>lo</name><type>ex:lo</type><ipv4><address><ip>127.0.0.1</ip><prefix-length>32</prefix-length></address></ipv4></interface></interfaces></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "leafref get config"
 expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth0</name>'
 
 new "leafref base commit"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "leafref get config"
 expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth0</name>'
 
 new "leafref add wrong ref"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><default-address xmlns="urn:example:clixon"><absname>eth3</absname><address>10.0.4.6</address></default-address></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><default-address xmlns="urn:example:clixon"><absname>eth3</absname><address>10.0.4.6</address></default-address></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "leafref validate"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>eth3</bad-element></error-info><error-severity>error</error-severity><error-message>Leafref validation failed: No such leaf</error-message></rpc-error></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>eth3</bad-element></error-info><error-severity>error</error-severity><error-message>Leafref validation failed: No such leaf</error-message></rpc-error></rpc-reply>]]>]]>$'
 
 new "leafref discard-changes"
 expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "leafref add correct absref"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><default-address xmlns="urn:example:clixon"><absname>eth0</absname></default-address></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><default-address xmlns="urn:example:clixon"><absname>eth0</absname></default-address></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "leafref add correct relref"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><default-address xmlns="urn:example:clixon"><relname>eth0</relname></default-address></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><default-address xmlns="urn:example:clixon"><relname>eth0</relname></default-address></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 # XXX add address
 
 new "leafref validate (ok)"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>"
 
 new "leafref delete leaf"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface operation="delete"><name>eth0</name></interface></interfaces></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface operation="delete"><name>eth0</name></interface></interfaces></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>'
 
 new "leafref validate (should fail)"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>"  '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>eth0</bad-element></error-info><error-severity>error</error-severity><error-message>Leafref validation failed: No such leaf</error-message></rpc-error></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>"  '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>eth0</bad-element></error-info><error-severity>error</error-severity><error-message>Leafref validation failed: No such leaf</error-message></rpc-error></rpc-reply>]]>]]>$'
 
 new "leafref discard-changes"
 expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "cli leafref lo"
-expectfn "$clixon_cli -1f $cfg -y $fyang -l o set default-address absname lo" 0 "^$"
+expectfn "$clixon_cli -1f $cfg -l o set default-address absname lo" 0 "^$"
 
 new "cli leafref validate"
-expectfn "$clixon_cli -1f $cfg -y $fyang -l o validate" 0 "^$"
+expectfn "$clixon_cli -1f $cfg -l o validate" 0 "^$"
 
 new "cli sender"
-expectfn "$clixon_cli -1f $cfg -y $fyang -l o set sender a" 0 "^$"
+expectfn "$clixon_cli -1f $cfg -l o set sender a" 0 "^$"
 
 new "cli sender template"
-expectfn "$clixon_cli -1f $cfg -y $fyang -l o set sender b template a" 0 "^$"
+expectfn "$clixon_cli -1f $cfg -l o set sender b template a" 0 "^$"
 
 if [ $BE -eq 0 ]; then
     exit # BE
diff --git a/test/test_list.sh b/test/test_list.sh
index 1b9bdc2e..b0e37eb6 100755
--- a/test/test_list.sh
+++ b/test/test_list.sh
@@ -11,9 +11,9 @@ fyang=$dir/test.yang
 cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
-  <CLICON_YANG_MODULE_MAIN>$APPNAME</CLICON_YANG_MODULE_MAIN>
+  <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_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
   <CLICON_CLI_MODE>$APPNAME</CLICON_CLI_MODE>
@@ -64,65 +64,65 @@ module $APPNAME{
 }
 EOF
 
-new "test params: -f $cfg -y $fyang"
+new "test params: -f $cfg"
 
 if [ $BE -ne 0 ]; then
     new "kill old backend"
-    sudo clixon_backend -zf $cfg -y $fyang
+    sudo clixon_backend -zf $cfg
     if [ $? -ne 0 ]; then
 	err
     fi
-    new "start backend -s init -f $cfg -y $fyang"
+    new "start backend -s init -f $cfg"
     # start new backend
-    sudo $clixon_backend -s init -f $cfg -y $fyang -D $DBG
+    sudo $clixon_backend -s init -f $cfg -D $DBG
     if [ $? -ne 0 ]; then
 	err
     fi
 fi
 
 new "minmax: minimal"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"><a1><k>0</k></a1><b1>0</b1></c></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"><a1><k>0</k></a1><b1>0</b1></c></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "minmax: minimal validate ok"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "minmax: maximal"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"><a0><k>0</k></a0><a0><k>1</k></a0><a0><k>unbounded</k></a0><a1><k>0</k></a1><a1><k>1</k></a1><b0>0</b0><b0>1</b0><b0>unbounded</b0><b1>0</b1><b0>1</b0></c></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"><a0><k>0</k></a0><a0><k>1</k></a0><a0><k>unbounded</k></a0><a1><k>0</k></a1><a1><k>1</k></a1><b0>0</b0><b0>1</b0><b0>unbounded</b0><b1>0</b1><b0>1</b0></c></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "minmax: validate ok"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "minmax: empty"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"/></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"/></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 # NYI
 if false; then 
 new "minmax: validate should fail"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error/></rpc-reply>]]>]]>$"
 
 new "minmax: no list"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"><b1>0</b1></c></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"><b1>0</b1></c></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "minmax: validate should fail"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error/></rpc-reply>]]>]]>$"
 
 new "minmax: no leaf-list"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"><a1><k>0</k></a1></c></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"><a1><k>0</k></a1></c></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "minmax: validate should fail"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error/></rpc-reply>]]>]]>$"
 
 new "minmax: Too large list"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"><a1><k>0</k></a1><a1><k>1</k></a1><a1><k>2</k></a1><b1>0</b1></c></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"><a1><k>0</k></a1><a1><k>1</k></a1><a1><k>2</k></a1><b1>0</b1></c></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "minmax: validate should fail"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error/></rpc-reply>]]>]]>$"
 
 new "minmax: Too large leaf-list"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"><a1><k>0</k></a1><b1>0</b1><b1>1</b1><b1>2</b1></c></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"><a1><k>0</k></a1><b1>0</b1><b1>1</b1><b1>2</b1></c></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "minmax: validate should fail"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error/></rpc-reply>]]>]]>$"
 fi # NYI
 
 if [ $BE -eq 0 ]; then
diff --git a/test/test_nacm.sh b/test/test_nacm.sh
index aac4be87..3eaf7a56 100755
--- a/test/test_nacm.sh
+++ b/test/test_nacm.sh
@@ -17,6 +17,7 @@ cat <<EOF > $cfg
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>/usr/local/share/clixon</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_RESTCONF_DIR>/usr/local/lib/$APPNAME/restconf</CLICON_RESTCONF_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
diff --git a/test/test_nacm_ext.sh b/test/test_nacm_ext.sh
index edbef77f..373b18de 100755
--- a/test/test_nacm_ext.sh
+++ b/test/test_nacm_ext.sh
@@ -20,6 +20,7 @@ cat <<EOF > $cfg
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>/usr/local/share/example/yang</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_BACKEND_DIR>/usr/local/lib/$APPNAME/backend</CLICON_BACKEND_DIR>
   <CLICON_BACKEND_REGEXP>example_backend.so$</CLICON_BACKEND_REGEXP>
@@ -40,13 +41,11 @@ EOF
 cat <<EOF > $fyang
 module $APPNAME{
   yang-version 1.1;
-  namespace "urn:example:clixon";
-
-  prefix ex;
-  import ietf-routing {
-        description "For fib-route";
-	prefix rt;
+  namespace "urn:example:my";
+  import clixon-example {
+	prefix ex;
   }
+  prefix my;
   container authentication {
 	description "Example code for enabling www basic auth and some example 
                      users";
@@ -72,13 +71,6 @@ module $APPNAME{
     type int32;
     description "something to edit";
   }
-    container state {
-       config false;
-       description "state data for example application";
-       leaf-list op {
-          type string;
-       }
-    }
 }
 EOF
 
@@ -163,7 +155,7 @@ new "restconf DELETE whole datastore"
 expecteq "$(curl -u andy:bar -sS -X DELETE http://localhost/restconf/data)" ""
 
 new2 "auth get"
-expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/example:state)" '{"example:state": {"op": "42"}}
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": "42"}}
 
'
 
 new "Set x to 0"
@@ -209,7 +201,7 @@ new "cli show conf as guest"
 expectfn "$clixon_cli -1 -U guest -l o -f $cfg -y $fyang show conf" 255 "protocol access-denied"
 
 new "cli rpc as admin"
-expectfn "$clixon_cli -1 -U andy -l o -f $cfg -y $fyang rpc ipv4" 0 "next-hop-list 2.3.4.5;"
+expectfn "$clixon_cli -1 -U andy -l o -f $cfg -y $fyang rpc ipv4" 0 '<x xmlns="urn:example:clixon">ipv4</x><y xmlns="urn:example:clixon">42</y>'
 
 new "cli rpc as limited"
 expectfn "$clixon_cli -1 -U wilma -l o -f $cfg -y $fyang rpc ipv4" 255 "protocol access-denied default deny"
diff --git a/test/test_nacm_protocol.sh b/test/test_nacm_protocol.sh
index 8a3c298e..fb579f21 100755
--- a/test/test_nacm_protocol.sh
+++ b/test/test_nacm_protocol.sh
@@ -37,6 +37,7 @@ cat <<EOF > $cfg
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>/usr/local/share/clixon</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_RESTCONF_DIR>/usr/local/lib/$APPNAME/restconf</CLICON_RESTCONF_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
diff --git a/test/test_netconf.sh b/test/test_netconf.sh
index ced3047d..60ce0214 100755
--- a/test/test_netconf.sh
+++ b/test/test_netconf.sh
@@ -5,15 +5,17 @@ APPNAME=example
 . ./lib.sh
 
 cfg=$dir/conf_yang.xml
-fyang=$dir/netconf.yang
 tmp=$dir/tmp.x
 
+# Use yang in example
+
 cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_MODULE_SET_ID>42</CLICON_MODULE_SET_ID>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
+  <CLICON_YANG_MODULE_MAIN>clixon-example</CLICON_YANG_MODULE_MAIN>
   <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>
@@ -29,65 +31,7 @@ cat <<EOF > $cfg
 </config>
 EOF
 
-cat <<EOF > $fyang
-module example{
-    yang-version 1.1;
-    namespace "urn:example:clixon";
-    prefix ex;
-    import ietf-interfaces {
-	prefix if;
-    }
-    import ietf-ip {
-      prefix ip;
-    }
-    import ietf-routing {
-      prefix rt;
-    }
-    import ietf-inet-types {
-       prefix "inet";
-       revision-date "2013-07-15";
-    }
-    rpc empty {
-    }
-    list server {
-       key name;
-       leaf name {
-         type string;
-       }
-       action reset {
-       }
-    }
-    identity eth {
-	 base if:interface-type;
-    }
-
-    rpc client-rpc {
-	description "Example local client-side RPC that is processed by the
-                     the netconf/restconf and not sent to the backend.
-                     This is a clixon implementation detail: some rpc:s
-                     are better processed by the client for API or perf reasons";
-	input {
-	    leaf request {
-		type string;
-	    }
-	}
-	output {
-	    leaf result{
-		type string;
-	    }
-	}
-    }
-    container state {
-       config false;
-       description "state data for example application";
-       leaf-list op {
-          type string;
-       }
-    }
-}
-EOF
-
-new "test params: -f $cfg -y $fyang"
+new "test params: -f $cfg"
 # Bring your own backend
 if [ $BE -ne 0 ]; then
     # kill old backend (if any)
@@ -96,31 +40,31 @@ if [ $BE -ne 0 ]; then
     if [ $? -ne 0 ]; then
 	err
     fi
-    new "start backend  -s init -f $cfg -y $fyang"
+    new "start backend  -s init -f $cfg"
     # start new backend
-    sudo $clixon_backend -s init -f $cfg -y $fyang -D $DBG
+    sudo $clixon_backend -s init -f $cfg -D $DBG
     if [ $? -ne 0 ]; then
 	err
     fi
 fi
 
 new "netconf hello"
-expecteof "$clixon_netconf -f $cfg -y $fyang" 0 '<rpc message-id="101"><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '^<hello xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><capabilities><capability>urn:ietf:params:netconf:base:1.0</capability><capability>urn:ietf:params:netconf:capability:yang-library:1.0?revision=2016-06-21&amp;module-set-id=42</capability><capability>urn:ietf:params:netconf:capability:candidate:1:0</capability><capability>urn:ietf:params:netconf:capability:validate:1.1</capability><capability>urn:ietf:params:netconf:capability:startup:1.0</capability><capability>urn:ietf:params:netconf:capability:xpath:1.0</capability><capability>urn:ietf:params:netconf:capability:notification:1.0</capability></capabilities><session-id>[0-9]*</session-id></hello>]]>]]><rpc-reply message-id="101"><data/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -f $cfg" 0 '<rpc message-id="101"><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '^<hello xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><capabilities><capability>urn:ietf:params:netconf:base:1.0</capability><capability>urn:ietf:params:netconf:capability:yang-library:1.0?revision=2016-06-21&amp;module-set-id=42</capability><capability>urn:ietf:params:netconf:capability:candidate:1:0</capability><capability>urn:ietf:params:netconf:capability:validate:1.1</capability><capability>urn:ietf:params:netconf:capability:startup:1.0</capability><capability>urn:ietf:params:netconf:capability:xpath:1.0</capability><capability>urn:ietf:params:netconf:capability:notification:1.0</capability></capabilities><session-id>[0-9]*</session-id></hello>]]>]]><rpc-reply message-id="101"><data/></rpc-reply>]]>]]>$'
 
 new "netconf get-config double quotes"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc message-id="101" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '^<rpc-reply message-id="101" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><data/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc message-id="101" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '^<rpc-reply message-id="101" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><data/></rpc-reply>]]>]]>$'
 
 new "netconf get-config single quotes"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc message-id='101' xmlns='urn:ietf:params:xml:ns:netconf:base:1.0'><get-config><source><candidate/></source></get-config></rpc>]]>]]>" '^<rpc-reply message-id="101" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><data/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc message-id='101' xmlns='urn:ietf:params:xml:ns:netconf:base:1.0'><get-config><source><candidate/></source></get-config></rpc>]]>]]>" '^<rpc-reply message-id="101" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><data/></rpc-reply>]]>]]>$'
 
 new "Add subtree eth/0/0 using none which should not change anything"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><default-operation>none</default-operation><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth/0/0</name></interface></interfaces></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><default-operation>none</default-operation><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth/0/0</name></interface></interfaces></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "Check nothing added"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc message-id="101"><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '^<rpc-reply message-id="101"><data/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc message-id="101"><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '^<rpc-reply message-id="101"><data/></rpc-reply>]]>]]>$'
 
 new "Add subtree eth/0/0 using none and create which should add eth/0/0"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface operation="create"><name>eth/0/0</name><type>ex:eth</type></interface></interfaces></config><default-operation>none</default-operation> </edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface operation="create"><name>eth/0/0</name><type>ex:eth</type></interface></interfaces></config><default-operation>none</default-operation> </edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 # Too many quotes, (single inside double inside single) need to fool bash
 cat <<EOF > $tmp # new
@@ -128,22 +72,22 @@ cat <<EOF > $tmp # new
 EOF
 
 new "Check eth/0/0 added using xpath"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "$(cat $tmp)" '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth/0/0</name><type>ex:eth</type><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 "$(cat $tmp)" '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth/0/0</name><type>ex:eth</type><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>$'
 
 new "Re-create same eth/0/0 which should generate error"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface operation="create"><name>eth/0/0</name><type>ex:eth</type></interface></interfaces></config><default-operation>none</default-operation> </edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error>'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface operation="create"><name>eth/0/0</name><type>ex:eth</type></interface></interfaces></config><default-operation>none</default-operation> </edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error>'
 
 new "Delete eth/0/0 using none config"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface operation="delete"><name>eth/0/0</name><type>ex:eth</type></interface></interfaces></config><default-operation>none</default-operation> </edit-config></rpc>]]>]]>'  '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface operation="delete"><name>eth/0/0</name><type>ex:eth</type></interface></interfaces></config><default-operation>none</default-operation> </edit-config></rpc>]]>]]>'  '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "Check deleted eth/0/0 (non-presence container)"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc message-id="101"><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '^<rpc-reply message-id="101"><data/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc message-id="101"><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '^<rpc-reply message-id="101"><data/></rpc-reply>]]>]]>$'
 
 new "Re-Delete eth/0/0 using none should generate error"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface operation="delete"><name>eth/0/0</name><type>ex:eth</type></interface></interfaces></config><default-operation>none</default-operation> </edit-config></rpc>]]>]]>'  '^<rpc-reply><rpc-error>'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface operation="delete"><name>eth/0/0</name><type>ex:eth</type></interface></interfaces></config><default-operation>none</default-operation> </edit-config></rpc>]]>]]>'  '^<rpc-reply><rpc-error>'
 
 new "netconf edit config"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth/0/0</name></interface><interface><name>eth1</name><enabled>true</enabled><ipv4><address><ip>9.2.3.4</ip><prefix-length>24</prefix-length></address></ipv4></interface></interfaces></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth/0/0</name></interface><interface><name>eth1</name><enabled>true</enabled><ipv4><address><ip>9.2.3.4</ip><prefix-length>24</prefix-length></address></ipv4></interface></interfaces></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 # Too many quotes
 cat <<EOF > $tmp # new
@@ -151,7 +95,7 @@ cat <<EOF > $tmp # new
 EOF
 
 new "netconf get config xpath"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "$(cat $tmp)" '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth1</name><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 "$(cat $tmp)" '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth1</name><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>$'
 
 # Too many quotes
 cat <<EOF > $tmp # new
@@ -159,99 +103,96 @@ cat <<EOF > $tmp # new
 EOF
 
 new "netconf get config xpath parent"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "$(cat $tmp)" '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth/0/0</name><enabled>true</enabled></interface><interface><name>eth1</name><enabled>true</enabled><ipv4><enabled>true</enabled><forwarding>false</forwarding><address><ip>9.2.3.4</ip><prefix-length>24</prefix-length></address></ipv4></interface></interfaces></data></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 "$(cat $tmp)" '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth/0/0</name><enabled>true</enabled></interface><interface><name>eth1</name><enabled>true</enabled><ipv4><enabled>true</enabled><forwarding>false</forwarding><address><ip>9.2.3.4</ip><prefix-length>24</prefix-length></address></ipv4></interface></interfaces></data></rpc-reply>]]>]]>$'
 
 new "netconf validate missing type"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error>"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error>"
 
 new "netconf discard-changes"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf get empty config2"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data/></rpc-reply>]]>]]>$"
 
 new "netconf edit extra xml"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><extra/></interfaces></config></edit-config></rpc>]]>]]>' "^<rpc-reply><rpc-error>"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><extra/></interfaces></config></edit-config></rpc>]]>]]>' "^<rpc-reply><rpc-error>"
 
 new "netconf discard-changes"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf edit config eth1"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth1</name><type>ex:eth</type></interface></interfaces></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth1</name><type>ex:eth</type></interface></interfaces></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf validate"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf commit"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf edit config merge"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth2</name><type>ex:eth</type></interface></interfaces></config><default-operation>merge</default-operation></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth2</name><type>ex:eth</type></interface></interfaces></config><default-operation>merge</default-operation></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf edit ampersand encoding(<&): name:'eth&' type:'t<>'"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth&amp;</name><type>t&lt;&gt;</type></interface></interfaces></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth&amp;</name><type>t&lt;&gt;</type></interface></interfaces></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "netconf get replaced config"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth&amp;</name><type>t&lt;&gt;</type><enabled>true</enabled></interface><interface><name>eth1</name><type>ex:eth</type><enabled>true</enabled></interface><interface><name>eth2</name><type>ex:eth</type><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth&amp;</name><type>t&lt;&gt;</type><enabled>true</enabled></interface><interface><name>eth1</name><type>ex:eth</type><enabled>true</enabled></interface><interface><name>eth2</name><type>ex:eth</type><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>$'
 
 new "cli show configuration eth& - encoding tests"
-expectfn "$clixon_cli -1 -f $cfg -y $fyang show conf cli" 0 "interfaces interface eth& type t<>
+expectfn "$clixon_cli -1 -f $cfg show conf cli" 0 "interfaces interface eth& type t<>
 interfaces interface eth& enabled true"
 
 new "netconf edit CDATA"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth/0/0</name><type>ex:eth</type><description><![CDATA[myeth&]]></description></interface></interfaces></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth/0/0</name><type>ex:eth</type><description><![CDATA[myeth&]]></description></interface></interfaces></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 #new "netconf get CDATA"
-#expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get-config><source><candidate/></source><filter type=\"xpath\" select=\"/interfaces/interface[name='eth/0/0']/description\" /></get-config></rpc>]]>]]>' '<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth/0/0</name><description><![CDATA[myeth&]]></description><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>'
+#expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><get-config><source><candidate/></source><filter type=\"xpath\" select=\"/interfaces/interface[name='eth/0/0']/description\" /></get-config></rpc>]]>]]>' '<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth/0/0</name><description><![CDATA[myeth&]]></description><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>'
 
 new "netconf discard-changes"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf edit state operation should fail"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><state xmlns="urn:example:clixon"><op>42</op></state></config></edit-config></rpc>]]>]]>' "^<rpc-reply><rpc-error><error-type>protocol</error-type><error-tag>invalid-value</error-tag>"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><state xmlns="urn:example:clixon"><op>42</op></state></config></edit-config></rpc>]]>]]>' "^<rpc-reply><rpc-error><error-type>protocol</error-type><error-tag>invalid-value</error-tag>"
 
 new "netconf get state operation"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get><filter type=\"xpath\" select=\"/state\"/></get></rpc>]]>]]>" '^<rpc-reply><data><state xmlns="urn:example:clixon"><op>42</op></state></data></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><get><filter type=\"xpath\" select=\"/state\"/></get></rpc>]]>]]>" '^<rpc-reply><data><state xmlns="urn:example:clixon"><op>42</op></state></data></rpc-reply>]]>]]>$'
 
 new "netconf lock/unlock"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><lock><target><candidate/></target></lock></rpc>]]>]]><rpc><unlock><target><candidate/></target></unlock></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]><rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><lock><target><candidate/></target></lock></rpc>]]>]]><rpc><unlock><target><candidate/></target></unlock></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]><rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf lock/lock"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><lock><target><candidate/></target></lock></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><lock><target><candidate/></target></lock></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf lock" 
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><lock><target><candidate/></target></lock></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><lock><target><candidate/></target></lock></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "close-session"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><close-session/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><close-session/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 # XXX NOTE that this does not actually kill a running session - and may even kill some random process,...
 new "kill-session"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><kill-session><session-id>44</session-id></kill-session></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><kill-session><session-id>44</session-id></kill-session></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "copy startup"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><copy-config><target><startup/></target><source><candidate/></source></copy-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><copy-config><target><startup/></target><source><candidate/></source></copy-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf get startup"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><startup/></source></get-config></rpc>]]>]]>" '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth1</name><type>ex:eth</type><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><get-config><source><startup/></source></get-config></rpc>]]>]]>" '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth1</name><type>ex:eth</type><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>$'
 
 new "netconf delete startup"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><delete-config><target><startup/></target></delete-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><delete-config><target><startup/></target></delete-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf check empty startup"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><startup/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><get-config><source><startup/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data/></rpc-reply>]]>]]>$"
 
-new "netconf rpc"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><fib-route xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"><routing-instance-name>ipv4</routing-instance-name><destination-address><address-family>ipv4</address-family></destination-address></fib-route></rpc>]]>]]>' '^<rpc-reply><route xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"><address-family>ipv4</address-family><next-hop><next-hop-list>'
-
-#new "netconf rpc without namespace (iterate kludge should work)"
-#expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><fib-route><routing-instance-name>ipv4</routing-instance-name><destination-address><address-family>ipv4</address-family></destination-address></fib-route></rpc>]]>]]>" "^<rpc-reply><route><address-family>ipv4</address-family><next-hop><next-hop-list>"
+new "netconf example rpc"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><example xmlns="urn:example:clixon"><x>42</x></example></rpc>]]>]]>' '^<rpc-reply><x xmlns="urn:example:clixon">42</x><y xmlns="urn:example:clixon">42</y></rpc-reply>]]>]]>$'
 
 new "netconf empty rpc"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><empty xmlns="urn:example:clixon"/></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><empty xmlns="urn:example:clixon"/></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf client-side rpc"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><client-rpc xmlns="urn:example:clixon"><request>example</request></client-rpc></rpc>]]>]]>' '^<rpc-reply><result xmlns="urn:example:clixon">ok</result></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><client-rpc xmlns="urn:example:clixon"><request>example</request></client-rpc></rpc>]]>]]>' '^<rpc-reply><result xmlns="urn:example:clixon">ok</result></rpc-reply>]]>]]>$'
 
 if [ $BE -eq 0 ]; then
     exit # BE
diff --git a/test/test_openconfig.sh b/test/test_openconfig.sh
index b9a4f680..b5e03e83 100755
--- a/test/test_openconfig.sh
+++ b/test/test_openconfig.sh
@@ -9,6 +9,7 @@
 APPNAME=example
 
 # include err() and new() functions and creates $dir
+. ./site.sh
 . ./lib.sh
 
 cfg=$dir/conf_yang.xml
@@ -61,9 +62,8 @@ cat <<EOF > $cfg
   <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/$APPNAME/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
-  <CLICON_YANG_MODULE_MAIN>$APPNAME</CLICON_YANG_MODULE_MAIN>
+  <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>
diff --git a/test/test_order.sh b/test/test_order.sh
index 4db73e9c..8f96c726 100755
--- a/test/test_order.sh
+++ b/test/test_order.sh
@@ -24,9 +24,8 @@ fi
 cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>/tmp/conf_yang.xml</CLICON_CONFIGFILE>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
-  <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
+  <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>
@@ -140,7 +139,7 @@ new "get each ordered-by user leaf-list"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><running/></source><filter type=\"xpath\" select=\"/y3[k='b']\"/></get-config></rpc>]]>]]>" '^<rpc-reply><data><y3 xmlns="urn:example:clixon"><k>b</k><a>bar</a></y3></data></rpc-reply>]]>]]>$'
 
 new "delete candidate"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><default-operation>none</default-operation><config operation="delete"/></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><default-operation>none</default-operation><config operation="delete"/></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 # LEAF_LISTS
 
diff --git a/test/test_perf.sh b/test/test_perf.sh
index eb1fe687..1d4c0cbf 100755
--- a/test/test_perf.sh
+++ b/test/test_perf.sh
@@ -49,6 +49,7 @@ cat <<EOF > $cfg
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_YANG_MODULE_MAIN>scaling</CLICON_YANG_MODULE_MAIN>
   <CLICON_SOCK>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
   <CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
diff --git a/test/test_restconf.sh b/test/test_restconf.sh
index 66710e91..d0aabca5 100755
--- a/test/test_restconf.sh
+++ b/test/test_restconf.sh
@@ -5,14 +5,15 @@ APPNAME=example
 # include err() and new() functions and creates $dir
 . ./lib.sh
 cfg=$dir/conf.xml
-fyang=$dir/restconf.yang
+
+# Use yang in example
 
 cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
-  <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
+  <CLICON_YANG_MODULE_MAIN>clixon-example</CLICON_YANG_MODULE_MAIN>
   <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>
@@ -30,63 +31,38 @@ cat <<EOF > $cfg
 EOF
 
 cat <<EOF > $fyang
-module example{
+module mymod{
     yang-version 1.1;
-    namespace "urn:example:clixon";
-    prefix ex;
+    namespace "urn:example:my";
+    prefix me;
+    import clixon-example {
+	prefix ex;
+    }
     import ietf-interfaces {
 	prefix if;
     }
     import ietf-ip {
       prefix ip;
     }
-    import ietf-routing {
-      prefix rt;
-    }
     import ietf-inet-types {
        prefix "inet";
        revision-date "2013-07-15";
     }
-    identity eth {
-	base if:interface-type;
-    }
-    rpc empty {
-    }
-    rpc client-rpc {
-       	description "Example local client-side rpc";
-	input {
-	    leaf request {
-		type string;
-	    }
-	}
-	output {
-	    leaf result{
-		type string;
-	    }
-	}
-    }
-    container state {
-       config false;
-       description "state data for example application";
-       leaf-list op {
-          type string;
-       }
-    }
 }
 EOF
 
 # This is a fixed 'state' implemented in routing_backend. It is assumed to be always there
-state='{"example:state": {"op": "42"}}'
+state='{"clixon-example:state": {"op": "42"}}'
 
-new "test params: -f $cfg -y $fyang"
+new "test params: -f $cfg"
 if [ $BE -ne 0 ]; then
     new "kill old backend"
     sudo clixon_backend -zf $cfg
     if [ $? -ne 0 ]; then
 	err
     fi
-    new "start backend -s init -f $cfg -y $fyang"
-    sudo $clixon_backend -s init -f $cfg -y $fyang -D $DBG
+    new "start backend -s init -f $cfg"
+    sudo $clixon_backend -s init -f $cfg -D $DBG
     if [ $? -ne 0 ]; then
 	err
     fi
@@ -96,7 +72,7 @@ new "kill old restconf daemon"
 sudo pkill -u www-data clixon_restconf
 
 new "start restconf daemon"
-sudo su -c "$clixon_restconf -f $cfg -y $fyang -D $DBG" -s /bin/sh www-data &
+sudo su -c "$clixon_restconf -f $cfg -D $DBG" -s /bin/sh www-data &
 
 sleep $RCWAIT
 
@@ -118,12 +94,12 @@ expecteq "$(curl -s -H 'Accept: application/yang-data+xml' -G http://localhost/r
 
 # Should be alphabetically ordered
 new2 "restconf get restconf/operations. RFC8040 3.3.2 (json)"
-expecteq "$(curl -sG http://localhost/restconf/operations)" '{"operations": {"example:empty": null,"example:client-rpc": null,"ietf-routing:fib-route": null,"ietf-routing:route-count": null,"clixon-lib:debug": null}
+expecteq "$(curl -sG http://localhost/restconf/operations)" '{"operations": {"clixon-example:client-rpc": null,"clixon-example:empty": null,"clixon-example:example": null,"clixon-lib:debug": null}
 
'
 
 new "restconf get restconf/operations. RFC8040 3.3.2 (xml)"
 ret=$(curl -s -H "Accept: application/yang-data+xml" -G http://localhost/restconf/operations)
-expect='<operations><empty xmlns="urn:example:clixon"/><client-rpc xmlns="urn:example:clixon"/><fib-route xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"/><route-count xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"/><debug xmlns="http://clicon.org/lib"/></operations>'
+expect='<operations><client-rpc xmlns="urn:example:clixon"/><empty xmlns="urn:example:clixon"/><example xmlns="urn:example:clixon"/><debug xmlns="http://clicon.org/lib"/></operations>'
 match=`echo $ret | grep -EZo "$expect"`
 if [ -z "$match" ]; then
     err "$expect" "$ret"
@@ -141,7 +117,7 @@ if [ -z "$match" ]; then
 fi
 
 new2 "restconf schema resource, RFC 8040 sec 3.7 according to RFC 7895 (explicit resource)"
-expecteq "$(curl -s -H 'Accept: application/yang-data+json' -G http://localhost/restconf/data/ietf-yang-library:modules-state/module=ietf-routing,2014-10-26/)" '{"ietf-yang-library:module": [{"name": "ietf-routing","revision": "2014-10-26","namespace": "urn:ietf:params:xml:ns:yang:ietf-routing","conformance-type": "implement"}]}
+expecteq "$(curl -s -H 'Accept: application/yang-data+json' -G http://localhost/restconf/data/ietf-yang-library:modules-state/module=ietf-interfaces,2018-02-20)" '{"ietf-yang-library:module": [{"name": "ietf-interfaces","revision": "2018-02-20","namespace": "urn:ietf:params:xml:ns:yang:ietf-interfaces","conformance-type": "implement"}]}
 
'
 
 new "restconf options. RFC 8040 4.1"
@@ -152,24 +128,24 @@ expectfn "curl -s -I http://localhost/restconf/data" 0 "HTTP/1.1 200 OK"
 #Content-Type: application/yang-data+json"
 
 new "restconf empty rpc"
-expecteq "$(curl -s -X POST -d {\"example:input\":null} http://localhost/restconf/operations/example:empty)" ""
+expecteq "$(curl -s -X POST -d {\"clixon-example:input\":null} http://localhost/restconf/operations/clixon-example:empty)" ""
 
 new2 "restconf empty rpc with extra args (should fail)"
-expecteq "$(curl -s -X POST -d {\"example:input\":{\"extra\":null}} http://localhost/restconf/operations/example:empty)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "extra"},"error-severity": "error"}}}
'
+expecteq "$(curl -s -X POST -d {\"clixon-example:input\":{\"extra\":null}} http://localhost/restconf/operations/clixon-example:empty)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "extra"},"error-severity": "error"}}}
'
 
 new2 "restconf get empty config + state json"
-expecteq "$(curl -sSG http://localhost/restconf/data/example:state)" '{"example:state": {"op": "42"}}
+expecteq "$(curl -sSG http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": "42"}}
 
'
 
 new2 "restconf get empty config + state json + module"
-expecteq "$(curl -sSG http://localhost/restconf/data/example:state)" '{"example:state": {"op": "42"}}
+expecteq "$(curl -sSG http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": "42"}}
 
'
 
 new2 "restconf get empty config + state json with wrong module name"
 expecteq "$(curl -sSG http://localhost/restconf/data/badmodule:state)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "No such yang module: badmodule"}}}
'
 
 new "restconf get empty config + state xml"
-ret=$(curl -s -H "Accept: application/yang-data+xml" -G http://localhost/restconf/data/example:state)
+ret=$(curl -s -H "Accept: application/yang-data+xml" -G http://localhost/restconf/data/clixon-example:state)
 expect='<state xmlns="urn:example:clixon"><op>42</op></state>'
 match=`echo $ret | grep -EZo "$expect"`
 if [ -z "$match" ]; then
@@ -177,12 +153,12 @@ if [ -z "$match" ]; then
 fi
 
 new2 "restconf get data/ json"
-expecteq "$(curl -s -G http://localhost/restconf/data/example:state/op=42)" '{"example:op": "42"}
+expecteq "$(curl -s -G http://localhost/restconf/data/clixon-example:state/op=42)" '{"clixon-example:op": "42"}
 
'
 
 new "restconf get state operation eth0 xml"
 # Cant get shell macros to work, inline matching from lib.sh
-ret=$(curl -s -H "Accept: application/yang-data+xml" -G http://localhost/restconf/data/example:state/op=42)
+ret=$(curl -s -H "Accept: application/yang-data+xml" -G http://localhost/restconf/data/clixon-example:state/op=42)
 expect='<op xmlns="urn:example:clixon">42</op>'
 match=`echo $ret | grep -EZo "$expect"`
 if [ -z "$match" ]; then
@@ -190,12 +166,12 @@ if [ -z "$match" ]; then
 fi
 
 new2 "restconf get state operation eth0 type json"
-expecteq "$(curl -s -G http://localhost/restconf/data/example:state/op=42)" '{"example:op": "42"}
+expecteq "$(curl -s -G http://localhost/restconf/data/clixon-example:state/op=42)" '{"clixon-example:op": "42"}
 
'
 
 new "restconf get state operation eth0 type xml"
 # Cant get shell macros to work, inline matching from lib.sh
-ret=$(curl -s -H "Accept: application/yang-data+xml" -G http://localhost/restconf/data/example:state/op=42)
+ret=$(curl -s -H "Accept: application/yang-data+xml" -G http://localhost/restconf/data/clixon-example:state/op=42)
 expect='<op xmlns="urn:example:clixon">42</op>'
 match=`echo $ret | grep -EZo "$expect"`
 if [ -z "$match" ]; then
@@ -203,7 +179,7 @@ if [ -z "$match" ]; then
 fi
 
 new2 "restconf GET datastore"
-expecteq "$(curl -s -X GET http://localhost/restconf/data/example:state)" '{"example:state": {"op": "42"}}
+expecteq "$(curl -s -X GET http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": "42"}}
 
'
 
 # Exact match
@@ -223,7 +199,7 @@ new "restconf delete interfaces"
 expecteq $(curl -s -X DELETE  http://localhost/restconf/data/ietf-interfaces:interfaces) ""
 
 new "restconf Check empty config"
-expectfn "curl -sG http://localhost/restconf/data/example:state" 0 "$state"
+expectfn "curl -sG http://localhost/restconf/data/clixon-example:state" 0 "$state"
 
 # XXX: gives  <interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
 #      <interface xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
@@ -237,7 +213,7 @@ expecteq "$(curl -s -G http://localhost/restconf/data/ietf-interfaces:interfaces
 
'
 
 new2 "restconf Check eth/0/0 added state"
-expecteq "$(curl -s -G http://localhost/restconf/data/example:state)" '{"example:state": {"op": "42"}}
+expecteq "$(curl -s -G http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": "42"}}
 
'
 
 new2 "restconf Re-post eth/0/0 which should generate error"
@@ -270,52 +246,42 @@ expecteq "$(curl -s -G http://localhost/restconf/data/ietf-interfaces:interfaces
 
'
 
 new2 "restconf rpc using POST json"
-expecteq "$(curl -s -X POST -d '{"ietf-routing:input":{"routing-instance-name":"ipv4","destination-address":{"address-family":"ipv6"}}}' http://localhost/restconf/operations/ietf-routing:fib-route)" '{"ietf-routing:output": {"route": {"address-family": "ipv4","next-hop": {"next-hop-list": "2.3.4.5"},"source-protocol": "static"}}}
+expecteq "$(curl -s -X POST -d '{"clixon-example:input":{"x":42}}' http://localhost/restconf/operations/clixon-example:example)" '{"clixon-example:output": {"x": "42","y": "42"}}
 
'
 
-# Cant get this to work due to quoting
-#new2 "restconf rpc using POST wrong JSON"
-#expecteq "$(curl -s -X POST -d '{"ietf-routing:input":{"routing-instance-name":ipv4}}' http://localhost/restconf/operations/ietf-routing:fib-route)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": " on line 1: syntax error at or before: i"}}}
'
-
-new2 "restconf rpc using POST json without mandatory element"
-expecteq "$(curl -s -X POST -d '{"ietf-routing:input":{"wrongelement":"ipv4"}}' http://localhost/restconf/operations/ietf-routing:fib-route)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "wrongelement"},"error-severity": "error"}}}
'
+expecteq "$(curl -s -X POST -d '{"clixon-example:input":{"wrongelement":"ipv4"}}' http://localhost/restconf/operations/clixon-example:example)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "wrongelement"},"error-severity": "error"}}}
'
 
 new2 "restconf rpc non-existing rpc without namespace"
 expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations/kalle)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "kalle"},"error-severity": "error","error-message": "RPC not defined"}}}
'
 
 new2 "restconf rpc non-existing rpc"
-expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations/example:kalle)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "kalle"},"error-severity": "error","error-message": "RPC not defined"}}}
'
+expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations/clixon-example:kalle)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "kalle"},"error-severity": "error","error-message": "RPC not defined"}}}
'
 
 new2 "restconf rpc missing name"
 expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "Operation name expected"}}}
'
 
 new2 "restconf rpc missing input"
-expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations/ietf-routing:fib-route)" '{"ietf-restconf:errors" : {"error": {"error-type": "rpc","error-tag": "malformed-message","error-severity": "error","error-message": "restconf RPC does not have input statement"}}}
'
+expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations/clixon-example:example)" '{"ietf-restconf:errors" : {"error": {"error-type": "rpc","error-tag": "malformed-message","error-severity": "error","error-message": "restconf RPC does not have input statement"}}}
'
 
 new "restconf rpc using POST xml"
-ret=$(curl -s -X POST -H "Accept: application/yang-data+xml" -d '{"ietf-routing:input":{"routing-instance-name":"ipv4","destination-address":{"address-family":"ipv4"}}}' http://localhost/restconf/operations/ietf-routing:fib-route)
-expect='<output xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"><route><address-family>ipv4</address-family><next-hop><next-hop-list>2.3.4.5</next-hop-list></next-hop><source-protocol>static</source-protocol></route></output>'
+ret=$(curl -s -X POST -H "Accept: application/yang-data+xml" -d '{"clixon-example:input":{"x":42}}' http://localhost/restconf/operations/clixon-example:example)
+expect='<output xmlns="urn:example:clixon"><x>42</x><y>42</y></output>'
 match=`echo $ret | grep -EZo "$expect"`
 if [ -z "$match" ]; then
     err "$expect" "$ret"
 fi
 
 new2 "restconf rpc using wrong prefix"
-expecteq "$(curl -s -X POST -d '{"wrong:input":{"routing-instance-name":"ipv4"}}' http://localhost/restconf/operations/wrong:fib-route)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "yang module not found"}}}
'
+expecteq "$(curl -s -X POST -d '{"wrong:input":{"routing-instance-name":"ipv4"}}' http://localhost/restconf/operations/wrong:example)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "yang module not found"}}}
'
 
 new "restconf local client rpc using POST xml"
-ret=$(curl -s -X POST -H "Accept: application/yang-data+xml" -d '{"example:input":{"request":"example"}}' http://localhost/restconf/operations/example:client-rpc)
+ret=$(curl -s -X POST -H "Accept: application/yang-data+xml" -d '{"clixon-example:input":{"request":"example"}}' http://localhost/restconf/operations/clixon-example:client-rpc)
 expect='<output xmlns="urn:example:clixon"><result>ok</result></output>'
 match=`echo $ret | grep -EZo "$expect"`
 if [ -z "$match" ]; then
     err "$expect" "$ret"
 fi
 
-# XXX cant get -H to work
-#expecteq 'curl -s -X POST -H "Accept: application/yang-data+xml" -d {"ietf-routing:input":{"routing-instance-name":"ipv4"}} http://localhost/restconf/operations/ietf-routing:fib-route' '<output><route><address-family>ipv4</address-family><next-hop><next-hop-list>2.3.4.5</next-hop-list></next-hop></route></output>'
-
-# Cant get shell macros to work, inline matching from lib.sh
-
 new "Kill restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"
 
diff --git a/test/test_restconf2.sh b/test/test_restconf2.sh
index 68677250..8010563f 100755
--- a/test/test_restconf2.sh
+++ b/test/test_restconf2.sh
@@ -13,6 +13,7 @@ cat <<EOF > $cfg
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>/usr/local/var</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_RESTCONF_PRETTY>false</CLICON_RESTCONF_PRETTY>
   <CLICON_SOCK>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
   <CLICON_BACKEND_PIDFILE>$dir/restconf.pidfile</CLICON_BACKEND_PIDFILE>
diff --git a/test/test_rpc.sh b/test/test_rpc.sh
index 27fb74c8..464a0fc5 100755
--- a/test/test_rpc.sh
+++ b/test/test_rpc.sh
@@ -12,9 +12,9 @@ cfg=$dir/conf.xml
 cat <<EOF > $cfg
 <config xmlns="urn:example:clixon">
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
-  <CLICON_YANG_MODULE_MAIN>$APPNAME</CLICON_YANG_MODULE_MAIN>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
+  <CLICON_YANG_MODULE_MAIN>clixon-example</CLICON_YANG_MODULE_MAIN>
   <CLICON_BACKEND_DIR>/usr/local/lib/$APPNAME/backend</CLICON_BACKEND_DIR>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
@@ -55,7 +55,7 @@ new "rpc tests"
 # 1.First some positive tests vary media types
 # extra complex because pattern matching on return haders
 new "restconf empty rpc"
-ret=$(curl -is -X POST http://localhost/restconf/operations/example:empty)
+ret=$(curl -is -X POST http://localhost/restconf/operations/clixon-example:empty)
 expect="204 No Content"
 match=`echo $ret | grep -EZo "$expect"`
 if [ -z "$match" ]; then
@@ -66,28 +66,28 @@ new "netconf empty rpc"
 expecteof "$clixon_netconf -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><empty xmlns="urn:example:clixon"/></rpc>]]>]]>' '^<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><ok/></rpc-reply>]]>]]>$'
 
 new2 "restconf example rpc json/json default - no http media headers"
-expecteq "$(curl -s -X POST -d '{"example:input":{"x":0}}' http://localhost/restconf/operations/example:example)" '{"example:output": {"x": "0","y": "42"}}
+expecteq "$(curl -s -X POST -d '{"clixon-example:input":{"x":0}}' http://localhost/restconf/operations/clixon-example:example)" '{"clixon-example:output": {"x": "0","y": "42"}}
 
'
 
 new2 "restconf example rpc json/json change y default"
-expecteq "$(curl -s -X POST -d '{"example:input":{"x":"0","y":"99"}}' http://localhost/restconf/operations/example:example)" '{"example:output": {"x": "0","y": "99"}}
+expecteq "$(curl -s -X POST -d '{"clixon-example:input":{"x":"0","y":"99"}}' http://localhost/restconf/operations/clixon-example:example)" '{"clixon-example:output": {"x": "0","y": "99"}}
 
'
 
 new2 "restconf example rpc json/json"
 # XXX example:input example:output
-expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+json' -H 'Content-Type: application/yang-data+json' -d '{"example:input":{"x":"0"}}' http://localhost/restconf/operations/example:example)" '{"example:output": {"x": "0","y": "42"}}
+expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+json' -H 'Content-Type: application/yang-data+json' -d '{"clixon-example:input":{"x":"0"}}' http://localhost/restconf/operations/clixon-example:example)" '{"clixon-example:output": {"x": "0","y": "42"}}
 
'
 
 new2 "restconf example rpc xml/json"
-expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+xml' -H 'Content-Type: application/yang-data+json' -d '<input xmlns="urn:example:clixon"><x>0</x></input>' http://localhost/restconf/operations/example:example)"  '{"example:output": {"x": "0","y": "42"}}
+expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+xml' -H 'Content-Type: application/yang-data+json' -d '<input xmlns="urn:example:clixon"><x>0</x></input>' http://localhost/restconf/operations/clixon-example:example)"  '{"clixon-example:output": {"x": "0","y": "42"}}
 
'
 
 new2 "restconf example rpc json/xml"
-expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+json' -H 'Accept: application/yang-data+xml' -d '{"example:input":{"x":"0"}}' http://localhost/restconf/operations/example:example)" '<output xmlns="urn:example:clixon"><x>0</x><y>42</y></output>
+expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+json' -H 'Accept: application/yang-data+xml' -d '{"clixon-example:input":{"x":"0"}}' http://localhost/restconf/operations/clixon-example:example)" '<output xmlns="urn:example:clixon"><x>0</x><y>42</y></output>
 
'
 
 new2 "restconf example rpc xml/xml"
-expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+xml' -H 'Accept: application/yang-data+xml' -d '<input xmlns="urn:example:clixon"><x>0</x></input>' http://localhost/restconf/operations/example:example)" '<output xmlns="urn:example:clixon"><x>0</x><y>42</y></output>
+expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+xml' -H 'Accept: application/yang-data+xml' -d '<input xmlns="urn:example:clixon"><x>0</x></input>' http://localhost/restconf/operations/clixon-example:example)" '<output xmlns="urn:example:clixon"><x>0</x><y>42</y></output>
 
'
 
 new "netconf example rpc"
@@ -96,7 +96,7 @@ expecteof "$clixon_netconf -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netco
 # 2. Then error cases
 #
 new "restconf empy rpc with null input"
-ret=$(curl -is -X POST -d '{"example:input":null}' http://localhost/restconf/operations/example:empty)
+ret=$(curl -is -X POST -d '{"clixon-example:input":null}' http://localhost/restconf/operations/clixon-example:empty)
 expect="204 No Content"
 match=`echo $ret | grep -EZo "$expect"`
 if [ -z "$match" ]; then
@@ -104,19 +104,19 @@ if [ -z "$match" ]; then
 fi
 
 new2 "restconf empy rpc with input x"
-expecteq "$(curl -s -X POST -d '{"example:input":{"x":0}}' http://localhost/restconf/operations/example:empty)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "x"},"error-severity": "error"}}}
'
+expecteq "$(curl -s -X POST -d '{"clixon-example:input":{"x":0}}' http://localhost/restconf/operations/clixon-example:empty)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "x"},"error-severity": "error"}}}
'
 
 new2 "restconf omit mandatory"
-expecteq "$(curl -s -X POST -d '{"example:input":null}' http://localhost/restconf/operations/example:example)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "x"},"error-severity": "error","error-message": "Mandatory variable"}}}
'
+expecteq "$(curl -s -X POST -d '{"clixon-example:input":null}' http://localhost/restconf/operations/clixon-example:example)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "x"},"error-severity": "error","error-message": "Mandatory variable"}}}
'
 
 new2 "restconf add extra"
-expecteq "$(curl -s -X POST -d '{"example:input":{"x":"0","extra":"0"}}' http://localhost/restconf/operations/example:example)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "extra"},"error-severity": "error"}}}
'
+expecteq "$(curl -s -X POST -d '{"clixon-example:input":{"x":"0","extra":"0"}}' http://localhost/restconf/operations/clixon-example:example)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "extra"},"error-severity": "error"}}}
'
 
 new2 "restconf wrong method"
-expecteq "$(curl -s -X POST -d '{"example:input":{"x":"0"}}' http://localhost/restconf/operations/example:wrong)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "wrong"},"error-severity": "error","error-message": "RPC not defined"}}}
'
+expecteq "$(curl -s -X POST -d '{"clixon-example:input":{"x":"0"}}' http://localhost/restconf/operations/clixon-example:wrong)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "wrong"},"error-severity": "error","error-message": "RPC not defined"}}}
'
 
 new2 "restconf example missing input"
-expecteq "$(curl -s -X POST -d '{"example:input":null}' http://localhost/restconf/operations/ietf-netconf:edit-config)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "yang module not found"}}}
'
+expecteq "$(curl -s -X POST -d '{"clixon-example:input":null}' http://localhost/restconf/operations/ietf-netconf:edit-config)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "yang module not found"}}}
'
 
 
 new "netconf kill-session missing session-id mandatory"
diff --git a/test/test_startup.sh b/test/test_startup.sh
index ab0acb0f..fb9b0102 100755
--- a/test/test_startup.sh
+++ b/test/test_startup.sh
@@ -13,9 +13,9 @@ cfg=$dir/conf_startup.xml
 cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
-  <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
+  <CLICON_YANG_MODULE_MAIN>clixon-example</CLICON_YANG_MODULE_MAIN>
   <CLICON_CLI_MODE>$APPNAME</CLICON_CLI_MODE>
   <CLICON_BACKEND_DIR>/usr/local/lib/$APPNAME/backend</CLICON_BACKEND_DIR>
   <CLICON_NETCONF_DIR>/usr/local/lib/$APPNAME/netconf</CLICON_NETCONF_DIR>
diff --git a/test/test_stream.sh b/test/test_stream.sh
index 75c7e613..3f166fc5 100755
--- a/test/test_stream.sh
+++ b/test/test_stream.sh
@@ -39,6 +39,7 @@ cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_RESTCONF_PRETTY>false</CLICON_RESTCONF_PRETTY>
   <CLICON_SOCK>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
   <CLICON_BACKEND_DIR>/usr/local/lib/$APPNAME/backend</CLICON_BACKEND_DIR>
diff --git a/test/test_type.sh b/test/test_type.sh
index 188107a6..3ac7e157 100755
--- a/test/test_type.sh
+++ b/test/test_type.sh
@@ -16,9 +16,8 @@ cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
-  <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
+  <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>
diff --git a/test/test_union.sh b/test/test_union.sh
index c583593a..b11e95e6 100755
--- a/test/test_union.sh
+++ b/test/test_union.sh
@@ -14,9 +14,8 @@ cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
-  <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
+  <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>
diff --git a/test/test_when_must.sh b/test/test_when_must.sh
index 82fc5647..9c963d43 100755
--- a/test/test_when_must.sh
+++ b/test/test_when_must.sh
@@ -12,9 +12,8 @@ fyang=$dir/test.yang
 cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
-  <CLICON_YANG_MODULE_MAIN>$APPNAME</CLICON_YANG_MODULE_MAIN>
+  <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>
diff --git a/test/test_yang.sh b/test/test_yang.sh
index 46eb6234..e6131381 100755
--- a/test/test_yang.sh
+++ b/test/test_yang.sh
@@ -9,13 +9,12 @@ fyang=$dir/$APPNAME.yang
 fsubmod=$dir/example-types.yang
 fyangerr=$dir/err.yang
 
-#  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
 cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
-  <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
-  <CLICON_YANG_MODULE_MAIN>$APPNAME</CLICON_YANG_MODULE_MAIN>
+  <CLICON_YANG_DIR>$dir</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>
diff --git a/test/test_yang_load.sh b/test/test_yang_load.sh
index 4f168fca..a54bac5e 100755
--- a/test/test_yang_load.sh
+++ b/test/test_yang_load.sh
@@ -13,11 +13,9 @@ fyang1=$dir/$APPNAME@2018-12-02.yang
 fyang2=$dir/$APPNAME@2018-01-01.yang
 fyang3=$dir/other.yang
 
-#  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
-
 # 1st variant of the example module
 cat <<EOF > $fyang1
-module $APPNAME{
+module example{
   prefix ex;
   revision 2018-12-02;
   namespace "urn:example:clixon";
@@ -29,7 +27,7 @@ EOF
 
 # 2nd variant of the same example module
 cat <<EOF > $fyang2
-module $APPNAME{
+module example{
   prefix ex;
   revision 2018-01-01;
   namespace "urn:example:clixon";
@@ -58,6 +56,7 @@ cat <<EOF > $cfg
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_YANG_MAIN_FILE>$fyang1</CLICON_YANG_MAIN_FILE>
   <CLICON_SOCK>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
   <CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
@@ -117,6 +116,7 @@ cat <<EOF > $cfg
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_YANG_MAIN_FILE>$fyang2</CLICON_YANG_MAIN_FILE>
   <CLICON_SOCK>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
   <CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
@@ -165,6 +165,7 @@ cat <<EOF > $cfg
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
   <CLICON_SOCK>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
   <CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
@@ -209,6 +210,7 @@ cat <<EOF > $cfg
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
   <CLICON_YANG_MODULE_REVISION>2018-01-01</CLICON_YANG_MODULE_REVISION>
   <CLICON_SOCK>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
@@ -254,6 +256,7 @@ cat <<EOF > $cfg
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_YANG_MAIN_DIR>$dir</CLICON_YANG_MAIN_DIR>
   <CLICON_SOCK>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
   <CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
@@ -298,6 +301,7 @@ cat <<EOF > $cfg
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_YANG_MAIN_DIR>$dir</CLICON_YANG_MAIN_DIR>
   <CLICON_YANG_MAIN_FILE>$fyang2</CLICON_YANG_MAIN_FILE>
   <CLICON_SOCK>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
@@ -344,6 +348,7 @@ cat <<EOF > $cfg
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_YANG_MAIN_DIR>$dir</CLICON_YANG_MAIN_DIR>
   <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
   <CLICON_YANG_MODULE_REVISION>2018-01-01</CLICON_YANG_MODULE_REVISION>
@@ -390,6 +395,7 @@ cat <<EOF > $cfg
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_YANG_MAIN_FILE>$fyang2</CLICON_YANG_MAIN_FILE>
   <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
   <CLICON_YANG_MODULE_REVISION>2018-12-02</CLICON_YANG_MODULE_REVISION>
diff --git a/test/test_yang_namespace.sh b/test/test_yang_namespace.sh
index 43fb2893..f674b61b 100755
--- a/test/test_yang_namespace.sh
+++ b/test/test_yang_namespace.sh
@@ -12,13 +12,12 @@ cfg=$dir/conf_yang.xml
 fyang1=$dir/example1.yang
 fyang2=$dir/example2.yang
 
-#  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
 cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_MAIN_DIR>$dir</CLICON_YANG_MAIN_DIR>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</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>
@@ -39,10 +38,6 @@ module example1{
    yang-version 1.1;
    prefix ex1;
    namespace "urn:example:clixon1";
-   import ietf-routing {
-        description "defines fib-route";
-	prefix rt;
-   }
    leaf x{
      type int32;
    }
diff --git a/test/test_yang_parse.sh b/test/test_yang_parse.sh
deleted file mode 100755
index 3790645f..00000000
--- a/test/test_yang_parse.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-# Test: YANG parser tests
-#PROG="valgrind --leak-check=full --show-leak-kinds=all ../util/clixon_util_yang"
-PROG=../util/clixon_util_yang
-
-# include err() and new() functions and creates $dir
-. ./lib.sh
-
-rm -rf $dir
-
-
diff --git a/test/test_yangmodels.sh b/test/test_yangmodels.sh
index 92cc45a0..02c30ba8 100755
--- a/test/test_yangmodels.sh
+++ b/test/test_yangmodels.sh
@@ -20,6 +20,7 @@
 APPNAME=example
 
 # include err() and new() functions and creates $dir
+. ./site.sh
 . ./lib.sh
 
 cfg=$dir/conf_yang.xml
@@ -52,7 +53,7 @@ EOF
 new "yangmodels parse: -f $cfg"
 
 new "yangmodel Experimental IEEE 802.1: $YANGMODELS/experimental/ieee/802.1"
-expectfn "$clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/experimental/ieee/802.1 -o CLICON_YANG_DIR=$YANGMODELS/experimental/ieee/1588 show version" 0 "3."
+expectfn "$clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/experimental/ieee/802.1 -p $YANGMODELS/experimental/ieee/1588 show version" 0 "3."
 
 # experimental 802.3 dir is empty
 #new "yangmodel Experimental IEEE 802.3: $YANGMODELS/experimental/ieee/802.3"
@@ -85,7 +86,24 @@ expectfn "$clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/vendo
 
 new "yangmodel vendor cisco xr 651: $YANGMODELS/vendor/cisco/xr/651"
 expectfn "$clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/vendor/cisco/xr/651 show version" 0 "3."
-fi
+fi ### cisco
+
+# vendor/junos
+#junos           : M/MX, T/TX, Some EX platforms, ACX
+#junos-es        : SRX, Jseries, LN-*
+#junos-ex        : EX series
+#junos-qfx       : QFX series
+#junos-nfx       : NFX series
+
+new "yangmodel vendor junos: $YANGMODELS/vendor/juniper/18.2/18.2R1/junos/conf/"
+expectfn "$clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_FILE=$YANGMODELS/vendor/juniper/18.2/18.2R1/junos/conf/junos-conf-interfaces@2018-01-01.yang -p $YANGMODELS/vendor/juniper/18.2/18.2R1/junos/conf -p $YANGMODELS/vendor/juniper/18.2/18.2R1/common show version" 0 "3."
+
+# breaks memory and cpu limits,...
+#new "yangmodel vendor junos: $YANGMODELS/vendor/juniper/18.2/18.2R1/junos/conf"
+#expectfn "$clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/vendor/juniper/18.2/18.2R1/junos/conf -p $YANGMODELS/vendor/juniper/18.2/18.2R1/common show version" 0 "3."
+
+#new "yangmodel vendor junos: $YANGMODELS/vendor/juniper/18.2/18.2R1/junos/rpc"
+#expectfn "$clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/vendor/juniper/18.2/18.2R1/junos/rpc -p $YANGMODELS/vendor/juniper/18.2/18.2R1/common show version" 0 "3."
 
 rm -rf $dir
 
diff --git a/yang/Makefile.in b/yang/Makefile.in
index 3d8e38dd..aa7ceb39 100644
--- a/yang/Makefile.in
+++ b/yang/Makefile.in
@@ -37,40 +37,48 @@ prefix 		= @prefix@
 bindir 		= @bindir@
 includedir	= @includedir@
 datarootdir     = @datarootdir@
+enable_stdyangs	= @enable_stdyangs@
 
 CLIXON_DATADIR   = @CLIXON_DATADIR@
 
-YANGSPECS	 = clixon-config@2018-10-21.yang
-YANGSPECS	+= clixon-lib@2019-01-02.yang
-YANGSPECS	+= ietf-netconf@2011-06-01.yang
-YANGSPECS	+= ietf-netconf-acm@2018-02-14.yang
-YANGSPECS	+= ietf-inet-types@2013-07-15.yang
-YANGSPECS	+= ietf-yang-types@2013-07-15.yang
-YANGSPECS	+= ietf-restconf@2017-01-26.yang
-YANGSPECS	+= ietf-restconf-monitoring@2017-01-26.yang
-YANGSPECS	+= clixon-rfc5277@2008-07-01.yang
-YANGSPECS	+= ietf-yang-library@2016-06-21.yang
+SUBDIRS  = clixon
+# See configure.ac
+ifeq ($(enable_stdyangs),yes)
+SUBDIRS += standard
+endif
 
-APPNAME	        = clixon  # subdir ehere these files are installed
+.PHONY: all clean depend install $(SUBDIRS)
 
-all:	
+all:	$(SUBDIRS)
+
+depend:
+	for i in $(SUBDIRS); \
+	do (cd $$i; $(MAKE) $(MFLAGS) $@); done
+
+$(SUBDIRS):
+	(cd $@; $(MAKE) $(MFLAGS) all)
+
+install-include:
+	for i in $(SUBDIRS); \
+	do (cd $$i && $(MAKE) $(MFLAGS) $@||exit 1); done; 
+
+install:
+	for i in $(SUBDIRS); \
+	do (cd $$i && $(MAKE) $(MFLAGS) $@)||exit 1; done
+
+uninstall:
+	for i in $(SUBDIRS); \
+	do (cd $$i; $(MAKE) $(MFLAGS) $@)||exit 1; done
 
 clean:
+	for i in $(SUBDIRS); \
+	do (cd $$i; $(MAKE) $(MFLAGS) $@); done
 
 distclean: clean
 	rm -f Makefile *~ .depend
+	for i in $(SUBDIRS); \
+	do (cd $$i; $(MAKE) $(MFLAGS) $@); done
 
-install: $(YANGSPECS) 
-	install -d -m 0755 $(DESTDIR)$(CLIXON_DATADIR)
-	install -m 0644 $(YANGSPECS) $(DESTDIR)$(CLIXON_DATADIR)
-
-uninstall:
-	(cd $(DESTDIR)$(CLIXON_DATADIR); rm -rf *.yang)
-
-install-include:	
-
-depend:
-
-
-#include .depend
+TAGS:
+	find $(srcdir) -name '*.[chyl]' -print | etags -
 
diff --git a/yang/clixon-config@2017-07-02.yang b/yang/clixon-config@2017-07-02.yang
deleted file mode 100644
index cbc6e86c..00000000
--- a/yang/clixon-config@2017-07-02.yang
+++ /dev/null
@@ -1,220 +0,0 @@
- module clixon-config {
-
-    prefix cc;
-
-    organization
-      "Clicon / Clixon";
-
-    contact
-      "Olof Hagsand <olof@hagsand.se>";
-
-    description
-      "Clixon configuration file
-       ***** BEGIN LICENSE BLOCK *****
-       Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren
-       
-       This file is part of CLIXON
-
-       Licensed under the Apache License, Version 2.0 (the \"License\");
-       you may not use this file except in compliance with the License.
-       You may obtain a copy of the License at
-          http://www.apache.org/licenses/LICENSE-2.0
-        Unless required by applicable law or agreed to in writing, software
-       distributed under the License is distributed on an \"AS IS\" BASIS,
-       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-       See the License for the specific language governing permissions and
-       limitations under the License.
-
-       Alternatively, the contents of this file may be used under the terms of
-       the GNU General Public License Version 3 or later (the \"GPL\"),
-       in which case the provisions of the GPL are applicable instead
-       of those above. If you wish to allow use of your version of this file only
-       under the terms of the GPL, and not to allow others to
-       use your version of this file under the terms of Apache License version 2, 
-       indicate your decision by deleting the provisions above and replace them with
-       the notice and other provisions required by the GPL. If you do not delete
-       the provisions above, a recipient may use your version of this file under
-       the terms of any one of the Apache License version 2 or the GPL.
-
-       ***** END LICENSE BLOCK *****";
-
-    revision 2017-07-02 {
-      description
-        "Added startup config";
-    }
-    typedef startup_mode{
-	description "Which method to boot/start clicon backend.
-                     The methods differ in how they reach a running state
-                     Which source database to commit from, if any.";
-	type enumeration{
-	    enum none{
-		description "Do not touch running state
-                     Typically after crash when running state and db are synched";
-	    }
-	    enum init{
-		description "Initialize running state.
-                             Start with a completely clean running state";
-	    }
-	    enum running{
-		description "Commit running db configuration into running state
-                             After reboot if a persistent running db exists";
-	    }
-	    enum startup{
-		description "Commit startup configuration into running state
-                             After reboot when no persistent running db exists";
-	    }
-	}
-    }
-    container config {
-    leaf CLICON_CONFIGFILE{
-    	 type string;
-	 description  "Location of configuration-file for default values (this file)";
-    }
-    leaf CLICON_YANG_DIR {
-       type string;
-       mandatory true;
-       description "Location of YANG module and submodule files. Only if CLICON_DBSPEC_TYPE is YANG";
-    }
-    leaf CLICON_YANG_MODULE_MAIN {
-       type string;
-       default "clicon";
-       description "Option used to construct initial yang file:
-                    <module>[@<revision>]
-		    This option is only relevant if CLICON_DBSPEC_TYPE is YANG";
-    }
-    leaf CLICON_YANG_MODULE_REVISION {
-       type string;
-       description "Option used to construct initial yang file:
-                    <module>[@<revision>]";
-    }
-    leaf CLICON_BACKEND_DIR {
-       type string;
-       description "Location of backend .so plugins. Load all .so 
-                    plugins in this dir as backend plugins";
-    }
-    leaf CLICON_NETCONF_DIR {
-       type string;
-       description "Location of netconf (frontend) .so plugins";
-    }
-    leaf CLICON_RESTCONF_DIR {
-       type string;
-       description "Location of restconf (frontend) .so plugins. Load all .so
-                    plugins in this dir as restconf code plugins";
-    }
-    leaf CLICON_RESTCONF_PATH {
-       type string;
-       default "/www-data/fastcgi_restconf.sock";
-       description "FastCGI unix socket. Should be specified in webserver
-                    Eg in nginx: fastcgi_pass unix:/www-data/clicon_restconf.sock";
-    }
-    leaf CLICON_CLI_DIR {
-       type string;
-       description "Location of cli frontend .so plugins. Load all .so 
-                    plugins in this dir as CLI object plugins";
-    }
-    leaf CLICON_CLISPEC_DIR {
-       type string;
-       description "Location of frontend .cli cligen spec files. Load all .cli 
-                    files in this dir as CLI specification files";
-    }
-    leaf CLICON_CLISPEC_FILE {
-       type string;
-       description "Specific frontend .cli cligen spec file.";
-    }
-    leaf CLICON_CLI_MODE {
-       type string;
-       default "base";
-       description "Startup CLI mode. This should match a CLICON_MODE set in
-                    one of the clispec files";
-    }
-    leaf CLICON_CLI_GENMODEL {
-       type int32;
-       default 1;
-       description "Generate code for CLI completion of existing db symbols. 
-                    Example: Add name=\"myspec\" in datamodel spec and reference
-		    as @myspec";
-    }
-    leaf CLICON_CLI_GENMODEL_COMPLETION {
-       type int32;
-       default 1;
-       description "Generate code for CLI completion of existing db symbols";
-    }
-    leaf CLICON_CLI_GENMODEL_TYPE {
-       type string;
-       default "VARS";
-       description "How to generate and show CLI syntax: VARS|ALL";
-    }
-    leaf CLICON_CLI_VARONLY {
-       type int32;
-       default 1;
-       description "Dont include keys in cvec in cli vars callbacks, ie a & k in 'a <b> k <c>' ignored";
-    }
-    leaf CLICON_CLI_LINESCROLLING {
-      type int32;
-      default 1;
-      description "Set to 0 if you want CLI to wrap to next line.
-                   Set to 1 if you  want CLI to scroll sideways when approaching right margin";
-    }
-
-    leaf CLICON_SOCK_FAMILY {
-       type string;
-       default "UNIX";
-       description "Address family for communicating with clixon_backend (UNIX|IPv4|IPv6)";
-    }
-    leaf CLICON_SOCK {
-       type string;
-       mandatory true;
-       description "If family above is AF_UNIX: Unix socket for communicating 
-       		    with clixon_backend. If family is AF_INET: IPv4 address";
-    }
-    leaf CLICON_SOCK_PORT {
-       type int32;
-       default 4535;
-       description "Inet socket port for communicating with clixon_backend (only IPv4|IPv6)";
-    }
-    leaf CLICON_SOCK_GROUP {
-       type string;
-       default "clicon";
-       description "Group membership to access clixon_backend unix socket";
-    }
-    leaf CLICON_BACKEND_PIDFILE {
-       type string;
-       mandatory true;
-       description "Process-id file";
-    }
-    leaf CLICON_AUTOCOMMIT {
-       type int32;
-       default 0;
-       description "Set if all configuration changes are committed directly, 
-                    commit command unnecessary";
-    }
-    leaf CLICON_MASTER_PLUGIN {
-       type string;
-       default "master";
-       description "Name of master plugin (both frontend and backend). 
-                    Master plugin has special callbacks for frontends. 
-		    See clicon user manual for more info. (Obsolete)";
-    }
-    leaf CLICON_XMLDB_DIR {
-       type string;
-       mandatory true;
-       description "Directory where \"running\", \"candidate\" and \"startup\" are placed";
-    }
-    leaf CLICON_USE_STARTUP_CONFIG {
-       type int32;
-       default 0;
-       description "Enabled uses \"startup\" configuration on boot. It is called
-                    startup_db and exists in XMLDB_DIR. NOTE: Obsolete with CLICON_STARTUP_MODE";
-    }
-    leaf CLICON_XMLDB_PLUGIN {
-       type string;
-       mandatory true;
-       description "XMLDB datastore plugin filename (see datastore/ and clixon_xml_db.[ch])";
-    }
-    leaf CLICON_STARTUP_MODE {
-	type startup_mode;
-	description "Which method to boot/start clicon backend";
-    }
-
-  }
-}
diff --git a/yang/clixon-config@2017-12-03.yang b/yang/clixon-config@2017-12-03.yang
deleted file mode 100644
index 5ffa1a5c..00000000
--- a/yang/clixon-config@2017-12-03.yang
+++ /dev/null
@@ -1,256 +0,0 @@
-module clixon-config {
-
-    prefix cc;
-
-    organization
-	"Clicon / Clixon";
-
-    contact
-	"Olof Hagsand <olof@hagsand.se>";
-
-    description
-      "Clixon configuration file
-       ***** BEGIN LICENSE BLOCK *****
-       Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren
-       
-       This file is part of CLIXON
-
-       Licensed under the Apache License, Version 2.0 (the \"License\");
-       you may not use this file except in compliance with the License.
-       You may obtain a copy of the License at
-            http://www.apache.org/licenses/LICENSE-2.0
-       Unless required by applicable law or agreed to in writing, software
-       distributed under the License is distributed on an \"AS IS\" BASIS,
-       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-       See the License for the specific language governing permissions and
-       limitations under the License.
-
-       Alternatively, the contents of this file may be used under the terms of
-       the GNU General Public License Version 3 or later (the \"GPL\"),
-       in which case the provisions of the GPL are applicable instead
-       of those above. If you wish to allow use of your version of this file only
-       under the terms of the GPL, and not to allow others to
-       use your version of this file under the terms of Apache License version 2, 
-       indicate your decision by deleting the provisions above and replace them with
-       the notice and other provisions required by the GPL. If you do not delete
-       the provisions above, a recipient may use your version of this file under
-       the terms of any one of the Apache License version 2 or the GPL.
-
-       ***** END LICENSE BLOCK *****";
-
-    revision 2017-12-03 {
-	description
-	    "Added startup config for Clixon 1.3.3 and xmldb_cache in 1.4.0";
-    }
-    typedef startup_mode{
-	description
-	    "Which method to boot/start clicon backend.
-             The methods differ in how they reach a running state
-             Which source database to commit from, if any.";
-	type enumeration{
-	    enum none{
-		description
-		"Do not touch running state
-                 Typically after crash when running state and db are synched";
-	    }
-	    enum init{
-		description
-		"Initialize running state.
-                 Start with a completely clean running state";
-	    }
-	    enum running{
-		description
-		"Commit running db configuration into running state
-                 After reboot if a persistent running db exists";
-	    }
-	    enum startup{
-		description
-		"Commit startup configuration into running state
-                 After reboot when no persistent running db exists";
-	    }
-	}
-    }
-    container config {
-	leaf CLICON_CONFIGFILE{
-	    type string;
-	    description
-		"Location of configuration-file for default values (this file)";
-	}
-	leaf CLICON_YANG_DIR {
-	    type string;
-	    mandatory true;
-	    description
-		"Location of YANG module and submodule files.";
-	}
-	leaf CLICON_YANG_MODULE_MAIN {
-	    type string;
-            default "clicon";
-	    description
-		"Option used to construct initial yang file: 
-                 <module>[@<revision>]";
-	}
-	leaf CLICON_YANG_MODULE_REVISION {
-	    type string;
-	    description
-		"Option used to construct initial yang file: 
-                 <module>[@<revision>]";
-	}
-	leaf CLICON_BACKEND_DIR {
-	    type string;
-	    description
-		"Location of backend .so plugins. Load all .so 
-       	         plugins in this dir as backend plugins";
-	}
-	leaf CLICON_NETCONF_DIR {
-	    type string;
-	    description "Location of netconf (frontend) .so plugins";
-	}
-	leaf CLICON_RESTCONF_DIR {
-	    type string;
-	    description
-		"Location of restconf (frontend) .so plugins. Load all .so
-       	         plugins in this dir as restconf code plugins";
-	}
-	leaf CLICON_RESTCONF_PATH {
-	    type string;
-	    default "/www-data/fastcgi_restconf.sock";
-	    description
-		"FastCGI unix socket. Should be specified in webserver
-         	 Eg in nginx: fastcgi_pass unix:/www-data/clicon_restconf.sock";
-	}
-	leaf CLICON_CLI_DIR {
-	    type string;
-	    description
-		"Location of cli frontend .so plugins. Load all .so 
-                 plugins in this dir as CLI object plugins";
-	}
-	leaf CLICON_CLISPEC_DIR {
-	    type string;
-	    description
-		"Location of frontend .cli cligen spec files. Load all .cli 
-       	         files in this dir as CLI specification files";
-	}
-	leaf CLICON_CLISPEC_FILE {
-	    type string;
-	    description "Specific frontend .cli cligen spec file.";
-	}
-	leaf CLICON_CLI_MODE {
-	    type string;
-	    default "base";
-	    description
-		"Startup CLI mode. This should match a CLICON_MODE set in
-                 one of the clispec files";
-	}
-	leaf CLICON_CLI_GENMODEL {
-	    type int32;
-	    default 1;
-	    description
-		"Generate code for CLI completion of existing db symbols. 
-      	         Example: Add name=\"myspec\" in datamodel spec and reference
-	         as @myspec";
-	}
-	leaf CLICON_CLI_GENMODEL_COMPLETION {
-	    type int32;
-	    default 1;
-	    description "Generate code for CLI completion of existing db symbols";
-	}
-	leaf CLICON_CLI_GENMODEL_TYPE {
-	    type string;
-	    default "VARS";
-	    description "How to generate and show CLI syntax: VARS|ALL";
-	}
-	leaf CLICON_CLI_VARONLY {
-	    type int32;
-	    default 1;
-	    description
-		"Dont include keys in cvec in cli vars callbacks, 
-          	 ie a & k in 'a <b> k <c>' ignored";
-	}
-	leaf CLICON_CLI_LINESCROLLING {
-	    type int32;
-	    default 1;
-	    description
-		"Set to 0 if you want CLI to wrap to next line.
-                 Set to 1 if you  want CLI to scroll sideways when approaching 
-                      right margin";
-	}
-	leaf CLICON_SOCK_FAMILY {
-	    type string;
-	    default "UNIX";
-	    description
-		"Address family for communicating with clixon_backend 
-                 (UNIX|IPv4|IPv6)";
-	}
-	leaf CLICON_SOCK {
-	    type string;
-	    mandatory true;
-	    description
-		"If family above is AF_UNIX: Unix socket for communicating 
-       	         with clixon_backend. If family is AF_INET: IPv4 address";
-	}
-	leaf CLICON_SOCK_PORT {
-	    type int32;
-	    default 4535;
-	    description
-		"Inet socket port for communicating with clixon_backend 
-                 (only IPv4|IPv6)";
-	}
-	leaf CLICON_SOCK_GROUP {
-	    type string;
-	    default "clicon";
-	    description "Group membership to access clixon_backend unix socket";
-	}
-	leaf CLICON_BACKEND_PIDFILE {
-	    type string;
-	    mandatory true;
-	    description "Process-id file of backend daemon";
-	}
-	leaf CLICON_AUTOCOMMIT {
-	    type int32;
-	    default 0;
-	    description
-		"Set if all configuration changes are committed automatically 
-                 on every edit change. Explicit commit commands unnecessary";
-	}
-	leaf CLICON_MASTER_PLUGIN {
-	    type string;
-	    default "master";
-	    description
-		"Name of master plugin (both frontend and backend). 
-                 Master plugin has special callbacks for frontends. 
-	         See clicon user manual for more info. (Obsolete?)";
-	}
-	leaf CLICON_XMLDB_DIR {
-	    type string;
-	    mandatory true;
-	    description
-		"Directory where \"running\", \"candidate\" and \"startup\" are placed";
-	}
-	leaf CLICON_XMLDB_PLUGIN {
-	    type string;
-	    mandatory true;
-	    description
-		"XMLDB datastore plugin filename 
-	         (see datastore/ and clixon_xml_db.[ch])";
-	}
-	leaf CLICON_XMLDB_CACHE {
-	    type boolean;
-	    default true;
-	    description
-		"XMLDB datastore cache. 
-                 If set, XML parsed tree is stored in memory";
-	}
-	leaf CLICON_USE_STARTUP_CONFIG {
-	    type int32;
-	    default 0;
-	    description
-		"Enabled uses \"startup\" configuration on boot. It is called
-                 startup_db and exists in XMLDB_DIR. 
-	         NOTE: Obsolete with 1.3.3 and CLICON_STARTUP_MODE";
-	}
-	leaf CLICON_STARTUP_MODE {
-	    type startup_mode;
-	    description "Which method to boot/start clicon backend";
-	}
-    }
-}
diff --git a/yang/clixon-config@2017-12-27.yang b/yang/clixon-config@2017-12-27.yang
deleted file mode 100644
index 1bbc1dcb..00000000
--- a/yang/clixon-config@2017-12-27.yang
+++ /dev/null
@@ -1,291 +0,0 @@
-module clixon-config {
-
-    prefix cc;
-
-    organization
-	"Clicon / Clixon";
-
-    contact
-	"Olof Hagsand <olof@hagsand.se>";
-
-    description
-      "Clixon configuration file
-       ***** BEGIN LICENSE BLOCK *****
-       Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren
-       
-       This file is part of CLIXON
-
-       Licensed under the Apache License, Version 2.0 (the \"License\");
-       you may not use this file except in compliance with the License.
-       You may obtain a copy of the License at
-            http://www.apache.org/licenses/LICENSE-2.0
-       Unless required by applicable law or agreed to in writing, software
-       distributed under the License is distributed on an \"AS IS\" BASIS,
-       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-       See the License for the specific language governing permissions and
-       limitations under the License.
-
-       Alternatively, the contents of this file may be used under the terms of
-       the GNU General Public License Version 3 or later (the \"GPL\"),
-       in which case the provisions of the GPL are applicable instead
-       of those above. If you wish to allow use of your version of this file only
-       under the terms of the GPL, and not to allow others to
-       use your version of this file under the terms of Apache License version 2, 
-       indicate your decision by deleting the provisions above and replace them with
-       the notice and other provisions required by the GPL. If you do not delete
-       the provisions above, a recipient may use your version of this file under
-       the terms of any one of the Apache License version 2 or the GPL.
-
-       ***** END LICENSE BLOCK *****";
-
-    revision 2017-12-27 {
-	description
-	    "Added xml sort option for 1.4.0";
-    }
-    typedef startup_mode{
-	description
-	    "Which method to boot/start clicon backend.
-             The methods differ in how they reach a running state
-             Which source database to commit from, if any.";
-	type enumeration{
-	    enum none{
-		description
-		"Do not touch running state
-                 Typically after crash when running state and db are synched";
-	    }
-	    enum init{
-		description
-		"Initialize running state.
-                 Start with a completely clean running state";
-	    }
-	    enum running{
-		description
-		"Commit running db configuration into running state
-                 After reboot if a persistent running db exists";
-	    }
-	    enum startup{
-		description
-		"Commit startup configuration into running state
-                 After reboot when no persistent running db exists";
-	    }
-	}
-    }
-    typedef xmldb_format{
-	description
-	    "Format of TEXT xml database format.";
-	type enumeration{
-	    enum xml{
-		description "Save and load xmldb as XML";
-	    }
-	    enum json{
-		description "Save and load xmldb as JSON";
-	    }
-	}
-    }
-    container config {
-	leaf CLICON_CONFIGFILE{
-	    type string;
-	    description
-		"Location of configuration-file for default values (this file)";
-	}
-	leaf CLICON_YANG_DIR {
-	    type string;
-	    mandatory true;
-	    description
-		"Location of YANG module and submodule files.";
-	}
-	leaf CLICON_YANG_MODULE_MAIN {
-	    type string;
-            default "clicon";
-	    description
-		"Option used to construct initial yang file: 
-                 <module>[@<revision>]";
-	}
-	leaf CLICON_YANG_MODULE_REVISION {
-	    type string;
-	    description
-		"Option used to construct initial yang file: 
-                 <module>[@<revision>]";
-	}
-	leaf CLICON_BACKEND_DIR {
-	    type string;
-	    description
-		"Location of backend .so plugins. Load all .so 
-       	         plugins in this dir as backend plugins";
-	}
-	leaf CLICON_NETCONF_DIR {
-	    type string;
-	    description "Location of netconf (frontend) .so plugins";
-	}
-	leaf CLICON_RESTCONF_DIR {
-	    type string;
-	    description
-		"Location of restconf (frontend) .so plugins. Load all .so
-       	         plugins in this dir as restconf code plugins";
-	}
-	leaf CLICON_RESTCONF_PATH {
-	    type string;
-	    default "/www-data/fastcgi_restconf.sock";
-	    description
-		"FastCGI unix socket. Should be specified in webserver
-         	 Eg in nginx: fastcgi_pass unix:/www-data/clicon_restconf.sock";
-	}
-	leaf CLICON_CLI_DIR {
-	    type string;
-	    description
-		"Location of cli frontend .so plugins. Load all .so 
-                 plugins in this dir as CLI object plugins";
-	}
-	leaf CLICON_CLISPEC_DIR {
-	    type string;
-	    description
-		"Location of frontend .cli cligen spec files. Load all .cli 
-       	         files in this dir as CLI specification files";
-	}
-	leaf CLICON_CLISPEC_FILE {
-	    type string;
-	    description "Specific frontend .cli cligen spec file.";
-	}
-	leaf CLICON_CLI_MODE {
-	    type string;
-	    default "base";
-	    description
-		"Startup CLI mode. This should match a CLICON_MODE set in
-                 one of the clispec files";
-	}
-	leaf CLICON_CLI_GENMODEL {
-	    type int32;
-	    default 1;
-	    description
-		"Generate code for CLI completion of existing db symbols. 
-      	         Example: Add name=\"myspec\" in datamodel spec and reference
-	         as @myspec";
-	}
-	leaf CLICON_CLI_GENMODEL_COMPLETION {
-	    type int32;
-	    default 1;
-	    description "Generate code for CLI completion of existing db symbols";
-	}
-	leaf CLICON_CLI_GENMODEL_TYPE {
-	    type string;
-	    default "VARS";
-	    description "How to generate and show CLI syntax: VARS|ALL";
-	}
-	leaf CLICON_CLI_VARONLY {
-	    type int32;
-	    default 1;
-	    description
-		"Dont include keys in cvec in cli vars callbacks, 
-          	 ie a & k in 'a <b> k <c>' ignored";
-	}
-	leaf CLICON_CLI_LINESCROLLING {
-	    type int32;
-	    default 1;
-	    description
-		"Set to 0 if you want CLI to wrap to next line.
-                 Set to 1 if you  want CLI to scroll sideways when approaching 
-                      right margin";
-	}
-	leaf CLICON_SOCK_FAMILY {
-	    type string;
-	    default "UNIX";
-	    description
-		"Address family for communicating with clixon_backend 
-                 (UNIX|IPv4|IPv6)";
-	}
-	leaf CLICON_SOCK {
-	    type string;
-	    mandatory true;
-	    description
-		"If family above is AF_UNIX: Unix socket for communicating 
-       	         with clixon_backend. If family is AF_INET: IPv4 address";
-	}
-	leaf CLICON_SOCK_PORT {
-	    type int32;
-	    default 4535;
-	    description
-		"Inet socket port for communicating with clixon_backend 
-                 (only IPv4|IPv6)";
-	}
-	leaf CLICON_SOCK_GROUP {
-	    type string;
-	    default "clicon";
-	    description "Group membership to access clixon_backend unix socket";
-	}
-	leaf CLICON_BACKEND_PIDFILE {
-	    type string;
-	    mandatory true;
-	    description "Process-id file of backend daemon";
-	}
-	leaf CLICON_AUTOCOMMIT {
-	    type int32;
-	    default 0;
-	    description
-		"Set if all configuration changes are committed automatically 
-                 on every edit change. Explicit commit commands unnecessary";
-	}
-	leaf CLICON_MASTER_PLUGIN {
-	    type string;
-	    default "master";
-	    description
-		"Name of master plugin (both frontend and backend). 
-                 Master plugin has special callbacks for frontends. 
-	         See clicon user manual for more info. (Obsolete?)";
-	}
-	leaf CLICON_XMLDB_DIR {
-	    type string;
-	    mandatory true;
-	    description
-		"Directory where \"running\", \"candidate\" and \"startup\" are placed";
-	}
-	leaf CLICON_XMLDB_PLUGIN {
-	    type string;
-	    mandatory true;
-	    description
-		"XMLDB datastore plugin filename 
-	         (see datastore/ and clixon_xml_db.[ch])";
-	}
-	leaf CLICON_XMLDB_CACHE {
-	    type boolean;
-	    default true;
-	    description
-		"XMLDB datastore cache. 
-                 If set, XML candidate/running parsed tree is stored in memory
-                 If not set, candidate/running is always accessed via disk.";
-	}
-	leaf CLICON_XMLDB_FORMAT {
-	    type xmldb_format;
-	    default xml;
-	    description	"XMLDB datastore format.";
-	}
-	leaf CLICON_XMLDB_PRETTY {
-	    type boolean;
-	    default true;
-	    description
-		"XMLDB datastore pretty print. 
-                 If set, insert spaces and line-feeds making the XML/JSON human
-                 readable. If not set, make the XML/JSON more compact.";
-	}
-	leaf CLICON_XML_SORT {
-	    type boolean;
-	    default true;
-	    description
-		"If set, sort XML lists and leaf-lists alphabetically and uses binary
-                 search. Unless ordered-by user is used. 
-                 Only works for Yang specified XML.
-                 If not set, all lists accessed via linear search.";
-	}
-	leaf CLICON_USE_STARTUP_CONFIG {
-	    type int32;
-	    default 0;
-	    description
-		"Enabled uses \"startup\" configuration on boot. It is called
-                 startup_db and exists in XMLDB_DIR. 
-	         NOTE: Obsolete with 1.3.3 and CLICON_STARTUP_MODE";
-	}
-	leaf CLICON_STARTUP_MODE {
-	    type startup_mode;
-	    description "Which method to boot/start clicon backend";
-	}
-    }
-}
diff --git a/yang/clixon-config@2018-02-12.yang b/yang/clixon-config@2018-02-12.yang
deleted file mode 100644
index 883a002f..00000000
--- a/yang/clixon-config@2018-02-12.yang
+++ /dev/null
@@ -1,304 +0,0 @@
-module clixon-config {
-
-    prefix cc;
-
-    organization
-	"Clicon / Clixon";
-
-    contact
-	"Olof Hagsand <olof@hagsand.se>";
-
-    description
-      "Clixon configuration file
-       ***** BEGIN LICENSE BLOCK *****
-       Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
-       
-       This file is part of CLIXON
-
-       Licensed under the Apache License, Version 2.0 (the \"License\");
-       you may not use this file except in compliance with the License.
-       You may obtain a copy of the License at
-            http://www.apache.org/licenses/LICENSE-2.0
-       Unless required by applicable law or agreed to in writing, software
-       distributed under the License is distributed on an \"AS IS\" BASIS,
-       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-       See the License for the specific language governing permissions and
-       limitations under the License.
-
-       Alternatively, the contents of this file may be used under the terms of
-       the GNU General Public License Version 3 or later (the \"GPL\"),
-       in which case the provisions of the GPL are applicable instead
-       of those above. If you wish to allow use of your version of this file only
-       under the terms of the GPL, and not to allow others to
-       use your version of this file under the terms of Apache License version 2, 
-       indicate your decision by deleting the provisions above and replace them with
-       the notice and other provisions required by the GPL. If you do not delete
-       the provisions above, a recipient may use your version of this file under
-       the terms of any one of the Apache License version 2 or the GPL.
-
-       ***** END LICENSE BLOCK *****";
-
-    revision 2018-02-12 {
-	description
-	    "Added pretty print for datastore";
-    }
-    typedef startup_mode{
-	description
-	    "Which method to boot/start clicon backend.
-             The methods differ in how they reach a running state
-             Which source database to commit from, if any.";
-	type enumeration{
-	    enum none{
-		description
-		"Do not touch running state
-                 Typically after crash when running state and db are synched";
-	    }
-	    enum init{
-		description
-		"Initialize running state.
-                 Start with a completely clean running state";
-	    }
-	    enum running{
-		description
-		"Commit running db configuration into running state
-                 After reboot if a persistent running db exists";
-	    }
-	    enum startup{
-		description
-		"Commit startup configuration into running state
-                 After reboot when no persistent running db exists";
-	    }
-	}
-    }
-    typedef xmldb_format{
-	description
-	    "Format of TEXT xml database format.";
-	type enumeration{
-	    enum xml{
-		description "Save and load xmldb as XML";
-	    }
-	    enum json{
-		description "Save and load xmldb as JSON";
-	    }
-	}
-    }
-    container config {
-	leaf CLICON_CONFIGFILE{
-	    type string;
-	    description
-		"Location of configuration-file for default values (this file)";
-	}
-	leaf CLICON_YANG_DIR {
-	    type string;
-	    mandatory true;
-	    description
-		"Location of YANG module and submodule files.";
-	}
-	leaf CLICON_YANG_MODULE_MAIN {
-	    type string;
-            default "clicon";
-	    description
-		"Option used to construct initial yang file: 
-                 <module>[@<revision>]";
-	}
-	leaf CLICON_YANG_MODULE_REVISION {
-	    type string;
-	    description
-		"Option used to construct initial yang file: 
-                 <module>[@<revision>]";
-	}
-	leaf CLICON_BACKEND_DIR {
-	    type string;
-	    description
-		"Location of backend .so plugins. Load all .so 
-       	         plugins in this dir as backend plugins";
-	}
-	leaf CLICON_NETCONF_DIR {
-	    type string;
-	    description "Location of netconf (frontend) .so plugins";
-	}
-	leaf CLICON_RESTCONF_DIR {
-	    type string;
-	    description
-		"Location of restconf (frontend) .so plugins. Load all .so
-       	         plugins in this dir as restconf code plugins";
-	}
-	leaf CLICON_RESTCONF_PATH {
-	    type string;
-	    default "/www-data/fastcgi_restconf.sock";
-	    description
-		"FastCGI unix socket. Should be specified in webserver
-         	 Eg in nginx: fastcgi_pass unix:/www-data/clicon_restconf.sock";
-	}
-	leaf CLICON_RESTCONF_PRETTY {
-	    type boolean;
-	    default true;
-	    description
-		"Restconf return value pretty print. 
-                 Restconf clients may add HTTP header:
-                      Accept: application/yang-data+json, or
-                      Accept: application/yang-data+xml
-                 to get return value in XML or JSON. 
-                 RFC 8040 examples print XML and JSON in pretty-printed form.
-                 Setting this value to false makes restconf return not pretty-printed
-                 which may be desirable for performance or tests";
-	}
-	leaf CLICON_CLI_DIR {
-	    type string;
-	    description
-		"Location of cli frontend .so plugins. Load all .so 
-                 plugins in this dir as CLI object plugins";
-	}
-	leaf CLICON_CLISPEC_DIR {
-	    type string;
-	    description
-		"Location of frontend .cli cligen spec files. Load all .cli 
-       	         files in this dir as CLI specification files";
-	}
-	leaf CLICON_CLISPEC_FILE {
-	    type string;
-	    description "Specific frontend .cli cligen spec file.";
-	}
-	leaf CLICON_CLI_MODE {
-	    type string;
-	    default "base";
-	    description
-		"Startup CLI mode. This should match a CLICON_MODE set in
-                 one of the clispec files";
-	}
-	leaf CLICON_CLI_GENMODEL {
-	    type int32;
-	    default 1;
-	    description
-		"Generate code for CLI completion of existing db symbols. 
-      	         Example: Add name=\"myspec\" in datamodel spec and reference
-	         as @myspec";
-	}
-	leaf CLICON_CLI_GENMODEL_COMPLETION {
-	    type int32;
-	    default 1;
-	    description "Generate code for CLI completion of existing db symbols";
-	}
-	leaf CLICON_CLI_GENMODEL_TYPE {
-	    type string;
-	    default "VARS";
-	    description "How to generate and show CLI syntax: VARS|ALL";
-	}
-	leaf CLICON_CLI_VARONLY {
-	    type int32;
-	    default 1;
-	    description
-		"Dont include keys in cvec in cli vars callbacks, 
-          	 ie a & k in 'a <b> k <c>' ignored";
-	}
-	leaf CLICON_CLI_LINESCROLLING {
-	    type int32;
-	    default 1;
-	    description
-		"Set to 0 if you want CLI to wrap to next line.
-                 Set to 1 if you  want CLI to scroll sideways when approaching 
-                      right margin";
-	}
-	leaf CLICON_SOCK_FAMILY {
-	    type string;
-	    default "UNIX";
-	    description
-		"Address family for communicating with clixon_backend 
-                 (UNIX|IPv4|IPv6)";
-	}
-	leaf CLICON_SOCK {
-	    type string;
-	    mandatory true;
-	    description
-		"If family above is AF_UNIX: Unix socket for communicating 
-       	         with clixon_backend. If family is AF_INET: IPv4 address";
-	}
-	leaf CLICON_SOCK_PORT {
-	    type int32;
-	    default 4535;
-	    description
-		"Inet socket port for communicating with clixon_backend 
-                 (only IPv4|IPv6)";
-	}
-	leaf CLICON_SOCK_GROUP {
-	    type string;
-	    default "clicon";
-	    description "Group membership to access clixon_backend unix socket";
-	}
-	leaf CLICON_BACKEND_PIDFILE {
-	    type string;
-	    mandatory true;
-	    description "Process-id file of backend daemon";
-	}
-	leaf CLICON_AUTOCOMMIT {
-	    type int32;
-	    default 0;
-	    description
-		"Set if all configuration changes are committed automatically 
-                 on every edit change. Explicit commit commands unnecessary";
-	}
-	leaf CLICON_MASTER_PLUGIN {
-	    type string;
-	    default "master";
-	    description
-		"Name of master plugin (both frontend and backend). 
-                 Master plugin has special callbacks for frontends. 
-	         See clicon user manual for more info. (Obsolete?)";
-	}
-	leaf CLICON_XMLDB_DIR {
-	    type string;
-	    mandatory true;
-	    description
-		"Directory where \"running\", \"candidate\" and \"startup\" are placed";
-	}
-	leaf CLICON_XMLDB_PLUGIN {
-	    type string;
-	    mandatory true;
-	    description
-		"XMLDB datastore plugin filename 
-	         (see datastore/ and clixon_xml_db.[ch])";
-	}
-	leaf CLICON_XMLDB_CACHE {
-	    type boolean;
-	    default true;
-	    description
-		"XMLDB datastore cache. 
-                 If set, XML candidate/running parsed tree is stored in memory
-                 If not set, candidate/running is always accessed via disk.";
-	}
-	leaf CLICON_XMLDB_FORMAT {
-	    type xmldb_format;
-	    default xml;
-	    description	"XMLDB datastore format.";
-	}
-	leaf CLICON_XMLDB_PRETTY {
-	    type boolean;
-	    default true;
-	    description
-		"XMLDB datastore pretty print. 
-                 If set, insert spaces and line-feeds making the XML/JSON human
-                 readable. If not set, make the XML/JSON more compact.";
-	}
-	leaf CLICON_XML_SORT {
-	    type boolean;
-	    default true;
-	    description
-		"If set, sort XML lists and leaf-lists alphabetically and uses binary
-                 search. Unless ordered-by user is used. 
-                 Only works for Yang specified XML.
-                 If not set, all lists accessed via linear search.";
-	}
-	leaf CLICON_USE_STARTUP_CONFIG {
-	    type int32;
-	    default 0;
-	    description
-		"Enabled uses \"startup\" configuration on boot. It is called
-                 startup_db and exists in XMLDB_DIR. 
-	         NOTE: Obsolete with 1.3.3 and CLICON_STARTUP_MODE";
-	}
-	leaf CLICON_STARTUP_MODE {
-	    type startup_mode;
-	    description "Which method to boot/start clicon backend";
-	}
-    }
-}
diff --git a/yang/clixon-config@2018-04-30.yang b/yang/clixon-config@2018-04-30.yang
deleted file mode 100644
index d395e543..00000000
--- a/yang/clixon-config@2018-04-30.yang
+++ /dev/null
@@ -1,353 +0,0 @@
-module clixon-config {
-
-    prefix cc;
-
-    organization
-	"Clicon / Clixon";
-
-    contact
-	"Olof Hagsand <olof@hagsand.se>";
-
-    description
-      "Clixon configuration file
-       ***** BEGIN LICENSE BLOCK *****
-       Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
-       
-       This file is part of CLIXON
-
-       Licensed under the Apache License, Version 2.0 (the \"License\");
-       you may not use this file except in compliance with the License.
-       You may obtain a copy of the License at
-            http://www.apache.org/licenses/LICENSE-2.0
-       Unless required by applicable law or agreed to in writing, software
-       distributed under the License is distributed on an \"AS IS\" BASIS,
-       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-       See the License for the specific language governing permissions and
-       limitations under the License.
-
-       Alternatively, the contents of this file may be used under the terms of
-       the GNU General Public License Version 3 or later (the \"GPL\"),
-       in which case the provisions of the GPL are applicable instead
-       of those above. If you wish to allow use of your version of this file only
-       under the terms of the GPL, and not to allow others to
-       use your version of this file under the terms of Apache License version 2, 
-       indicate your decision by deleting the provisions above and replace them with
-       the notice and other provisions required by the GPL. If you do not delete
-       the provisions above, a recipient may use your version of this file under
-       the terms of any one of the Apache License version 2 or the GPL.
-
-       ***** END LICENSE BLOCK *****";
-
-    revision 2018-04-30 {
-	description
-	    "Released with Clixon 3.6";
-    }
-    typedef startup_mode{
-	description
-	    "Which method to boot/start clicon backend.
-             The methods differ in how they reach a running state
-             Which source database to commit from, if any.";
-	type enumeration{
-	    enum none{
-		description
-		"Do not touch running state
-                 Typically after crash when running state and db are synched";
-	    }
-	    enum init{
-		description
-		"Initialize running state.
-                 Start with a completely clean running state";
-	    }
-	    enum running{
-		description
-		"Commit running db configuration into running state
-                 After reboot if a persistent running db exists";
-	    }
-	    enum startup{
-		description
-		"Commit startup configuration into running state
-                 After reboot when no persistent running db exists";
-	    }
-	}
-    }
-    typedef xmldb_format{
-	description
-	    "Format of TEXT xml database format.";
-	type enumeration{
-	    enum xml{
-		description "Save and load xmldb as XML";
-	    }
-	    enum json{
-		description "Save and load xmldb as JSON";
-	    }
-	}
-    }
-    typedef cli_genmodel_type{
-	description
-	    "How to generate CLI from YANG model, 
-             eg list a{ key x; leaf x; leaf y;}";
-	type enumeration{
-	    enum NONE{
-		description "No extra keywords: a <x> <y>";
-	    }
-	    enum VARS{
-		description "Keywords on non-key variables: a <x> y <y>";
-	    }
-	    enum ALL{
-		description "Keywords on all variables: a x <x> y <y>";
-	    }
-	}
-    }
-    typedef nacm_mode{
-	description
-	    "Mode of RFC8341 Network Configuration Access Control Model.
-             It is unclear from the RFC whether NACM rules are internal
-             in a configuration (ie embedded in regular config) or external/OOB
-             in s separate, specific NACM-config";
-	type enumeration{
-	    enum disabled{
-		description "NACM is disabled";
-	    }
-	    enum internal{
-		description "NACM is enabled and available in the regular config";
-	    }
-	    enum external{
-		description "NACM is enabled and available in a separate config";
-	    }
-	}
-    }
-    container config {
-	leaf CLICON_CONFIGFILE{
-	    type string;
-	    description
-		"Location of configuration-file for default values (this file)";
-	}
-	leaf CLICON_YANG_DIR {
-	    type string;
-	    mandatory true;
-	    description
-		"Location of YANG module and submodule files.";
-	}
-	leaf CLICON_YANG_MODULE_MAIN {
-	    type string;
-            default "clicon";
-	    description
-		"Option used to construct initial yang file: 
-                 <module>[@<revision>]";
-	}
-	leaf CLICON_YANG_MODULE_REVISION {
-	    type string;
-	    description
-		"Option used to construct initial yang file: 
-                 <module>[@<revision>]";
-	}
-	leaf CLICON_BACKEND_DIR {
-	    type string;
-	    description
-		"Location of backend .so plugins. Load all .so 
-       	         plugins in this dir as backend plugins";
-	}
-	leaf CLICON_BACKEND_REGEXP {
-	    type string;
-	    description
-		"Regexp of matching backend plugins in CLICON_BACKEND_DIR";
-	    default "(.so)$";
-	}
-	leaf CLICON_NETCONF_DIR {
-	    type string;
-	    description "Location of netconf (frontend) .so plugins";
-	}
-	leaf CLICON_RESTCONF_DIR {
-	    type string;
-	    description
-		"Location of restconf (frontend) .so plugins. Load all .so
-       	         plugins in this dir as restconf code plugins";
-	}
-	leaf CLICON_RESTCONF_PATH {
-	    type string;
-	    default "/www-data/fastcgi_restconf.sock";
-	    description
-		"FastCGI unix socket. Should be specified in webserver
-         	 Eg in nginx: fastcgi_pass unix:/www-data/clicon_restconf.sock";
-	}
-	leaf CLICON_RESTCONF_PRETTY {
-	    type boolean;
-	    default true;
-	    description
-		"Restconf return value pretty print. 
-                 Restconf clients may add HTTP header:
-                      Accept: application/yang-data+json, or
-                      Accept: application/yang-data+xml
-                 to get return value in XML or JSON. 
-                 RFC 8040 examples print XML and JSON in pretty-printed form.
-                 Setting this value to false makes restconf return not pretty-printed
-                 which may be desirable for performance or tests";
-	}
-	leaf CLICON_CLI_DIR {
-	    type string;
-	    description
-		"Location of cli frontend .so plugins. Load all .so 
-                 plugins in this dir as CLI object plugins";
-	}
-	leaf CLICON_CLISPEC_DIR {
-	    type string;
-	    description
-		"Location of frontend .cli cligen spec files. Load all .cli 
-       	         files in this dir as CLI specification files";
-	}
-	leaf CLICON_CLISPEC_FILE {
-	    type string;
-	    description "Specific frontend .cli cligen spec file.";
-	}
-	leaf CLICON_CLI_MODE {
-	    type string;
-	    default "base";
-	    description
-		"Startup CLI mode. This should match a CLICON_MODE set in
-                 one of the clispec files";
-	}
-	leaf CLICON_CLI_GENMODEL {
-	    type int32;
-	    default 1;
-	    description
-		"Generate code for CLI completion of existing db symbols. 
-      	         Example: Add name=\"myspec\" in datamodel spec and reference
-	         as @myspec";
-	}
-	leaf CLICON_CLI_GENMODEL_COMPLETION {
-	    type int32;
-	    default 1;
-	    description "Generate code for CLI completion of existing db symbols";
-	}
-	leaf CLICON_CLI_GENMODEL_TYPE {
-	    type cli_genmodel_type;
-	    default "VARS";
-	    description "How to generate and show CLI syntax: VARS|ALL";
-	}
-	leaf CLICON_CLI_VARONLY {
-	    type int32;
-	    default 1;
-	    description
-		"Dont include keys in cvec in cli vars callbacks, 
-          	 ie a & k in 'a <b> k <c>' ignored";
-	}
-	leaf CLICON_CLI_LINESCROLLING {
-	    type int32;
-	    default 1;
-	    description
-		"Set to 0 if you want CLI to wrap to next line.
-                 Set to 1 if you  want CLI to scroll sideways when approaching 
-                      right margin";
-	}
-	leaf CLICON_SOCK_FAMILY {
-	    type string;
-	    default "UNIX";
-	    description
-		"Address family for communicating with clixon_backend 
-                 (UNIX|IPv4|IPv6)";
-	}
-	leaf CLICON_SOCK {
-	    type string;
-	    mandatory true;
-	    description
-		"If family above is AF_UNIX: Unix socket for communicating 
-       	         with clixon_backend. If family is AF_INET: IPv4 address";
-	}
-	leaf CLICON_SOCK_PORT {
-	    type int32;
-	    default 4535;
-	    description
-		"Inet socket port for communicating with clixon_backend 
-                 (only IPv4|IPv6)";
-	}
-	leaf CLICON_SOCK_GROUP {
-	    type string;
-	    default "clicon";
-	    description "Group membership to access clixon_backend unix socket";
-	}
-	leaf CLICON_BACKEND_PIDFILE {
-	    type string;
-	    mandatory true;
-	    description "Process-id file of backend daemon";
-	}
-	leaf CLICON_AUTOCOMMIT {
-	    type int32;
-	    default 0;
-	    description
-		"Set if all configuration changes are committed automatically 
-                 on every edit change. Explicit commit commands unnecessary";
-	}
-	leaf CLICON_XMLDB_DIR {
-	    type string;
-	    mandatory true;
-	    description
-		"Directory where \"running\", \"candidate\" and \"startup\" are placed";
-	}
-	leaf CLICON_XMLDB_PLUGIN {
-	    type string;
-	    mandatory true;
-	    description
-		"XMLDB datastore plugin filename 
-	         (see datastore/ and clixon_xml_db.[ch])";
-	}
-	leaf CLICON_XMLDB_CACHE {
-	    type boolean;
-	    default true;
-	    description
-		"XMLDB datastore cache. 
-                 If set, XML candidate/running parsed tree is stored in memory
-                 If not set, candidate/running is always accessed via disk.";
-	}
-	leaf CLICON_XMLDB_FORMAT {
-	    type xmldb_format;
-	    default xml;
-	    description	"XMLDB datastore format.";
-	}
-	leaf CLICON_XMLDB_PRETTY {
-	    type boolean;
-	    default true;
-	    description
-		"XMLDB datastore pretty print. 
-                 If set, insert spaces and line-feeds making the XML/JSON human
-                 readable. If not set, make the XML/JSON more compact.";
-	}
-	leaf CLICON_XML_SORT {
-	    type boolean;
-	    default true;
-	    description
-		"If set, sort XML lists and leaf-lists alphabetically and uses binary
-                 search. Unless ordered-by user is used. 
-                 Only works for Yang specified XML.
-                 If not set, all lists accessed via linear search.";
-	}
-	leaf CLICON_USE_STARTUP_CONFIG {
-	    type int32;
-	    default 0;
-	    description
-		"Enabled uses \"startup\" configuration on boot. It is called
-                 startup_db and exists in XMLDB_DIR. 
-	         NOTE: Obsolete with 1.3.3 and CLICON_STARTUP_MODE";
-	}
-	leaf CLICON_STARTUP_MODE {
-	    type startup_mode;
-	    description "Which method to boot/start clicon backend";
-	}
-	leaf CLICON_TRANSACTION_MOD {
-	    type boolean;
-	    default false;
-	    description "If set, modifications in validation and commit 
-                         callbacks are written back into the datastore";
-	}
-	leaf CLICON_NACM_MODE {
-	    type nacm_mode;
-	    default disabled;
-	    description "RFC8341 network access configuration control model 
-                         (NACM) mode: disabled, in regular (internal) config
-                         or separate external file given by CLICON_NACM_FILE";
-	}
-	leaf CLICON_NACM_FILE {
-	    type string;
-	    description "RFC8341 NACM external configuration file";
-	}
-    }
-}
diff --git a/yang/clixon/Makefile.in b/yang/clixon/Makefile.in
new file mode 100644
index 00000000..1f9c99a2
--- /dev/null
+++ b/yang/clixon/Makefile.in
@@ -0,0 +1,69 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
+# 
+# Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
+#
+# This file is part of CLIXON
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# the GNU General Public License Version 3 or later (the "GPL"),
+# in which case the provisions of the GPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of the GPL, and not to allow others to
+# use your version of this file under the terms of Apache License version 2, 
+# indicate your decision by deleting the provisions above and replace them with
+# the notice and other provisions required by the GPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the Apache License version 2 or the GPL.
+#
+# ***** END LICENSE BLOCK *****
+#
+VPATH       	= @srcdir@
+srcdir  	= @srcdir@
+top_srcdir  	= @top_srcdir@
+prefix 		= @prefix@
+bindir 		= @bindir@
+includedir	= @includedir@
+datarootdir     = @datarootdir@
+
+CLIXON_DATADIR   = @CLIXON_DATADIR@
+
+YANGSPECS	 = clixon-config@2018-10-21.yang
+YANGSPECS	+= clixon-lib@2019-01-02.yang
+YANGSPECS	+= clixon-rfc5277@2008-07-01.yang
+
+APPNAME	        = clixon  # subdir ehere these files are installed
+
+all:	
+
+clean:
+
+distclean: clean
+	rm -f Makefile *~ .depend
+
+install: $(YANGSPECS) 
+	install -d -m 0755 $(DESTDIR)$(CLIXON_DATADIR)
+	install -m 0644 $(YANGSPECS) $(DESTDIR)$(CLIXON_DATADIR)
+
+uninstall:
+	(cd $(DESTDIR)$(CLIXON_DATADIR); rm -rf *.yang)
+
+install-include:	
+
+depend:
+
+
+#include .depend
+
diff --git a/yang/clixon-config@2018-10-21.yang b/yang/clixon/clixon-config@2018-10-21.yang
similarity index 99%
rename from yang/clixon-config@2018-10-21.yang
rename to yang/clixon/clixon-config@2018-10-21.yang
index a9ad7414..5b9e3f20 100644
--- a/yang/clixon-config@2018-10-21.yang
+++ b/yang/clixon/clixon-config@2018-10-21.yang
@@ -134,6 +134,7 @@ module clixon-config {
 		"Location of configuration-file for default values (this file)";
 	}
 	leaf-list CLICON_YANG_DIR {
+	    ordered-by user;
 	    type string;
 	    description
 		"Yang directory path for finding module and submodule files. 
diff --git a/yang/clixon-lib@2019-01-02.yang b/yang/clixon/clixon-lib@2019-01-02.yang
similarity index 100%
rename from yang/clixon-lib@2019-01-02.yang
rename to yang/clixon/clixon-lib@2019-01-02.yang
diff --git a/yang/clixon-rfc5277@2008-07-01.yang b/yang/clixon/clixon-rfc5277@2008-07-01.yang
similarity index 100%
rename from yang/clixon-rfc5277@2008-07-01.yang
rename to yang/clixon/clixon-rfc5277@2008-07-01.yang
diff --git a/yang/ietf-inet-types@2013-07-15.yang b/yang/ietf-inet-types@2013-07-15.yang
deleted file mode 100644
index ef3b9d47..00000000
--- a/yang/ietf-inet-types@2013-07-15.yang
+++ /dev/null
@@ -1,457 +0,0 @@
-   module ietf-inet-types {
-
-     namespace "urn:ietf:params:xml:ns:yang:ietf-inet-types";
-     prefix "inet";
-
-     organization
-      "IETF NETMOD (NETCONF Data Modeling Language) Working Group";
-
-     contact
-      "WG Web:   <http://tools.ietf.org/wg/netmod/>
-       WG List:  <mailto:netmod@ietf.org>
-
-       WG Chair: David Kessens
-                 <mailto:david.kessens@nsn.com>
-
-       WG Chair: Juergen Schoenwaelder
-                 <mailto:j.schoenwaelder@jacobs-university.de>
-
-       Editor:   Juergen Schoenwaelder
-                 <mailto:j.schoenwaelder@jacobs-university.de>";
-
-     description
-      "This module contains a collection of generally useful derived
-       YANG data types for Internet addresses and related things.
-
-       Copyright (c) 2013 IETF Trust and the persons identified as
-       authors of the code.  All rights reserved.
-
-       Redistribution and use in source and binary forms, with or
-       without modification, is permitted pursuant to, and subject
-       to the license terms contained in, the Simplified BSD License
-       set forth in Section 4.c of the IETF Trust's Legal Provisions
-       Relating to IETF Documents
-       (http://trustee.ietf.org/license-info).
-
-       This version of this YANG module is part of RFC 6991; see
-       the RFC itself for full legal notices.";
-
-     revision 2013-07-15 {
-       description
-        "This revision adds the following new data types:
-         - ip-address-no-zone
-         - ipv4-address-no-zone
-         - ipv6-address-no-zone";
-       reference
-        "RFC 6991: Common YANG Data Types";
-     }
-
-     revision 2010-09-24 {
-       description
-        "Initial revision.";
-       reference
-        "RFC 6021: Common YANG Data Types";
-     }
-
-     /*** collection of types related to protocol fields ***/
-
-     typedef ip-version {
-       type enumeration {
-         enum unknown {
-           value "0";
-           description
-            "An unknown or unspecified version of the Internet
-             protocol.";
-         }
-         enum ipv4 {
-           value "1";
-           description
-            "The IPv4 protocol as defined in RFC 791.";
-         }
-         enum ipv6 {
-           value "2";
-           description
-            "The IPv6 protocol as defined in RFC 2460.";
-         }
-       }
-       description
-        "This value represents the version of the IP protocol.
-
-         In the value set and its semantics, this type is equivalent
-         to the InetVersion textual convention of the SMIv2.";
-       reference
-        "RFC  791: Internet Protocol
-         RFC 2460: Internet Protocol, Version 6 (IPv6) Specification
-         RFC 4001: Textual Conventions for Internet Network Addresses";
-     }
-
-     typedef dscp {
-       type uint8 {
-         range "0..63";
-       }
-       description
-        "The dscp type represents a Differentiated Services Code Point
-         that may be used for marking packets in a traffic stream.
-         In the value set and its semantics, this type is equivalent
-         to the Dscp textual convention of the SMIv2.";
-       reference
-        "RFC 3289: Management Information Base for the Differentiated
-                   Services Architecture
-         RFC 2474: Definition of the Differentiated Services Field
-                   (DS Field) in the IPv4 and IPv6 Headers
-         RFC 2780: IANA Allocation Guidelines For Values In
-                   the Internet Protocol and Related Headers";
-     }
-
-     typedef ipv6-flow-label {
-       type uint32 {
-         range "0..1048575";
-       }
-       description
-        "The ipv6-flow-label type represents the flow identifier or Flow
-         Label in an IPv6 packet header that may be used to
-         discriminate traffic flows.
-
-         In the value set and its semantics, this type is equivalent
-         to the IPv6FlowLabel textual convention of the SMIv2.";
-       reference
-        "RFC 3595: Textual Conventions for IPv6 Flow Label
-         RFC 2460: Internet Protocol, Version 6 (IPv6) Specification";
-     }
-
-     typedef port-number {
-       type uint16 {
-         range "0..65535";
-       }
-       description
-        "The port-number type represents a 16-bit port number of an
-         Internet transport-layer protocol such as UDP, TCP, DCCP, or
-         SCTP.  Port numbers are assigned by IANA.  A current list of
-         all assignments is available from <http://www.iana.org/>.
-
-         Note that the port number value zero is reserved by IANA.  In
-         situations where the value zero does not make sense, it can
-         be excluded by subtyping the port-number type.
-         In the value set and its semantics, this type is equivalent
-         to the InetPortNumber textual convention of the SMIv2.";
-       reference
-        "RFC  768: User Datagram Protocol
-         RFC  793: Transmission Control Protocol
-         RFC 4960: Stream Control Transmission Protocol
-         RFC 4340: Datagram Congestion Control Protocol (DCCP)
-         RFC 4001: Textual Conventions for Internet Network Addresses";
-     }
-
-     /*** collection of types related to autonomous systems ***/
-
-     typedef as-number {
-       type uint32;
-       description
-        "The as-number type represents autonomous system numbers
-         which identify an Autonomous System (AS).  An AS is a set
-         of routers under a single technical administration, using
-         an interior gateway protocol and common metrics to route
-         packets within the AS, and using an exterior gateway
-         protocol to route packets to other ASes.  IANA maintains
-         the AS number space and has delegated large parts to the
-         regional registries.
-
-         Autonomous system numbers were originally limited to 16
-         bits.  BGP extensions have enlarged the autonomous system
-         number space to 32 bits.  This type therefore uses an uint32
-         base type without a range restriction in order to support
-         a larger autonomous system number space.
-
-         In the value set and its semantics, this type is equivalent
-         to the InetAutonomousSystemNumber textual convention of
-         the SMIv2.";
-       reference
-        "RFC 1930: Guidelines for creation, selection, and registration
-                   of an Autonomous System (AS)
-         RFC 4271: A Border Gateway Protocol 4 (BGP-4)
-         RFC 4001: Textual Conventions for Internet Network Addresses
-         RFC 6793: BGP Support for Four-Octet Autonomous System (AS)
-                   Number Space";
-     }
-
-     /*** collection of types related to IP addresses and hostnames ***/
-
-     typedef ip-address {
-       type union {
-         type inet:ipv4-address;
-         type inet:ipv6-address;
-       }
-       description
-        "The ip-address type represents an IP address and is IP
-         version neutral.  The format of the textual representation
-         implies the IP version.  This type supports scoped addresses
-         by allowing zone identifiers in the address format.";
-       reference
-        "RFC 4007: IPv6 Scoped Address Architecture";
-     }
-
-     typedef ipv4-address {
-       type string {
-         pattern
-           '(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}'
-         +  '([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])'
-         + '(%[\p{N}\p{L}]+)?';
-       }
-       description
-         "The ipv4-address type represents an IPv4 address in
-          dotted-quad notation.  The IPv4 address may include a zone
-          index, separated by a % sign.
-
-          The zone index is used to disambiguate identical address
-          values.  For link-local addresses, the zone index will
-          typically be the interface index number or the name of an
-          interface.  If the zone index is not present, the default
-          zone of the device will be used.
-
-          The canonical format for the zone index is the numerical
-          format";
-     }
-
-     typedef ipv6-address {
-       type string {
-         pattern '((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}'
-               + '((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|'
-               + '(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\.){3}'
-               + '(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))'
-               + '(%[\p{N}\p{L}]+)?';
-         pattern '(([^:]+:){6}(([^:]+:[^:]+)|(.*\..*)))|'
-               + '((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?)'
-               + '(%.+)?';
-       }
-       description
-        "The ipv6-address type represents an IPv6 address in full,
-         mixed, shortened, and shortened-mixed notation.  The IPv6
-         address may include a zone index, separated by a % sign.
-
-         The zone index is used to disambiguate identical address
-         values.  For link-local addresses, the zone index will
-         typically be the interface index number or the name of an
-         interface.  If the zone index is not present, the default
-         zone of the device will be used.
-
-         The canonical format of IPv6 addresses uses the textual
-         representation defined in Section 4 of RFC 5952.  The
-         canonical format for the zone index is the numerical
-         format as described in Section 11.2 of RFC 4007.";
-       reference
-        "RFC 4291: IP Version 6 Addressing Architecture
-         RFC 4007: IPv6 Scoped Address Architecture
-         RFC 5952: A Recommendation for IPv6 Address Text
-                   Representation";
-     }
-
-     typedef ip-address-no-zone {
-       type union {
-         type inet:ipv4-address-no-zone;
-         type inet:ipv6-address-no-zone;
-       }
-       description
-        "The ip-address-no-zone type represents an IP address and is
-         IP version neutral.  The format of the textual representation
-         implies the IP version.  This type does not support scoped
-         addresses since it does not allow zone identifiers in the
-         address format.";
-       reference
-        "RFC 4007: IPv6 Scoped Address Architecture";
-     }
-
-     typedef ipv4-address-no-zone {
-       type inet:ipv4-address {
-         pattern '[0-9\.]*';
-       }
-       description
-         "An IPv4 address without a zone index.  This type, derived from
-          ipv4-address, may be used in situations where the zone is
-          known from the context and hence no zone index is needed.";
-     }
-
-     typedef ipv6-address-no-zone {
-       type inet:ipv6-address {
-         pattern '[0-9a-fA-F:\.]*';
-       }
-       description
-         "An IPv6 address without a zone index.  This type, derived from
-          ipv6-address, may be used in situations where the zone is
-          known from the context and hence no zone index is needed.";
-       reference
-        "RFC 4291: IP Version 6 Addressing Architecture
-         RFC 4007: IPv6 Scoped Address Architecture
-         RFC 5952: A Recommendation for IPv6 Address Text
-                   Representation";
-     }
-
-     typedef ip-prefix {
-       type union {
-         type inet:ipv4-prefix;
-         type inet:ipv6-prefix;
-       }
-       description
-        "The ip-prefix type represents an IP prefix and is IP
-         version neutral.  The format of the textual representations
-         implies the IP version.";
-     }
-
-     typedef ipv4-prefix {
-       type string {
-         pattern
-            '(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}'
-          +  '([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])'
-          + '/(([0-9])|([1-2][0-9])|(3[0-2]))';
-       }
-       description
-        "The ipv4-prefix type represents an IPv4 address prefix.
-         The prefix length is given by the number following the
-         slash character and must be less than or equal to 32.
-
-         A prefix length value of n corresponds to an IP address
-         mask that has n contiguous 1-bits from the most
-         significant bit (MSB) and all other bits set to 0.
-
-         The canonical format of an IPv4 prefix has all bits of
-         the IPv4 address set to zero that are not part of the
-         IPv4 prefix.";
-     }
-
-     typedef ipv6-prefix {
-       type string {
-         pattern '((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}'
-               + '((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|'
-               + '(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\.){3}'
-               + '(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))'
-               + '(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))';
-         pattern '(([^:]+:){6}(([^:]+:[^:]+)|(.*\..*)))|'
-               + '((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?)'
-               + '(/.+)';
-       }
-       description
-        "The ipv6-prefix type represents an IPv6 address prefix.
-         The prefix length is given by the number following the
-         slash character and must be less than or equal to 128.
-
-         A prefix length value of n corresponds to an IP address
-         mask that has n contiguous 1-bits from the most
-         significant bit (MSB) and all other bits set to 0.
-
-         The IPv6 address should have all bits that do not belong
-         to the prefix set to zero.
-
-         The canonical format of an IPv6 prefix has all bits of
-         the IPv6 address set to zero that are not part of the
-         IPv6 prefix.  Furthermore, the IPv6 address is represented
-         as defined in Section 4 of RFC 5952.";
-       reference
-        "RFC 5952: A Recommendation for IPv6 Address Text
-                   Representation";
-     }
-
-     /*** collection of domain name and URI types ***/
-
-     typedef domain-name {
-       type string {
-         pattern
-           '((([a-zA-Z0-9_]([a-zA-Z0-9\-_]){0,61})?[a-zA-Z0-9]\.)*'
-         + '([a-zA-Z0-9_]([a-zA-Z0-9\-_]){0,61})?[a-zA-Z0-9]\.?)'
-         + '|\.';
-         length "1..253";
-       }
-       description
-        "The domain-name type represents a DNS domain name.  The
-         name SHOULD be fully qualified whenever possible.
-
-         Internet domain names are only loosely specified.  Section
-         3.5 of RFC 1034 recommends a syntax (modified in Section
-         2.1 of RFC 1123).  The pattern above is intended to allow
-         for current practice in domain name use, and some possible
-         future expansion.  It is designed to hold various types of
-         domain names, including names used for A or AAAA records
-         (host names) and other records, such as SRV records.  Note
-         that Internet host names have a stricter syntax (described
-         in RFC 952) than the DNS recommendations in RFCs 1034 and
-         1123, and that systems that want to store host names in
-         schema nodes using the domain-name type are recommended to
-         adhere to this stricter standard to ensure interoperability.
-
-         The encoding of DNS names in the DNS protocol is limited
-         to 255 characters.  Since the encoding consists of labels
-         prefixed by a length bytes and there is a trailing NULL
-         byte, only 253 characters can appear in the textual dotted
-         notation.
-
-         The description clause of schema nodes using the domain-name
-         type MUST describe when and how these names are resolved to
-         IP addresses.  Note that the resolution of a domain-name value
-         may require to query multiple DNS records (e.g., A for IPv4
-         and AAAA for IPv6).  The order of the resolution process and
-         which DNS record takes precedence can either be defined
-         explicitly or may depend on the configuration of the
-         resolver.
-
-         Domain-name values use the US-ASCII encoding.  Their canonical
-         format uses lowercase US-ASCII characters.  Internationalized
-         domain names MUST be A-labels as per RFC 5890.";
-       reference
-        "RFC  952: DoD Internet Host Table Specification
-         RFC 1034: Domain Names - Concepts and Facilities
-         RFC 1123: Requirements for Internet Hosts -- Application
-                   and Support
-         RFC 2782: A DNS RR for specifying the location of services
-                   (DNS SRV)
-         RFC 5890: Internationalized Domain Names in Applications
-                   (IDNA): Definitions and Document Framework";
-     }
-
-     typedef host {
-       type union {
-         type inet:ip-address;
-         type inet:domain-name;
-       }
-       description
-        "The host type represents either an IP address or a DNS
-         domain name.";
-     }
-
-     typedef uri {
-       type string;
-       description
-        "The uri type represents a Uniform Resource Identifier
-         (URI) as defined by STD 66.
-
-         Objects using the uri type MUST be in US-ASCII encoding,
-         and MUST be normalized as described by RFC 3986 Sections
-         6.2.1, 6.2.2.1, and 6.2.2.2.  All unnecessary
-         percent-encoding is removed, and all case-insensitive
-         characters are set to lowercase except for hexadecimal
-         digits, which are normalized to uppercase as described in
-         Section 6.2.2.1.
-
-         The purpose of this normalization is to help provide
-         unique URIs.  Note that this normalization is not
-         sufficient to provide uniqueness.  Two URIs that are
-         textually distinct after this normalization may still be
-         equivalent.
-
-         Objects using the uri type may restrict the schemes that
-         they permit.  For example, 'data:' and 'urn:' schemes
-         might not be appropriate.
-
-         A zero-length URI is not a valid URI.  This can be used to
-         express 'URI absent' where required.
-
-         In the value set and its semantics, this type is equivalent
-         to the Uri SMIv2 textual convention defined in RFC 5017.";
-       reference
-        "RFC 3986: Uniform Resource Identifier (URI): Generic Syntax
-         RFC 3305: Report from the Joint W3C/IETF URI Planning Interest
-                   Group: Uniform Resource Identifiers (URIs), URLs,
-                   and Uniform Resource Names (URNs): Clarifications
-                   and Recommendations
-         RFC 5017: MIB Textual Conventions for Uniform Resource
-                   Identifiers (URIs)";
-     }
-
-   }
diff --git a/yang/ietf-restconf@2017-01-26.yang b/yang/ietf-restconf@2017-01-26.yang
deleted file mode 100644
index 249006af..00000000
--- a/yang/ietf-restconf@2017-01-26.yang
+++ /dev/null
@@ -1,279 +0,0 @@
-module ietf-restconf {
-    yang-version 1.1;
-    namespace "urn:ietf:params:xml:ns:yang:ietf-restconf";
-    prefix "rc";
-
-    organization
-	"IETF NETCONF (Network Configuration) Working Group";
-
-    contact
-	"WG Web:   <https://datatracker.ietf.org/wg/netconf/>
-        WG List:  <mailto:netconf@ietf.org>
-
-        Author:   Andy Bierman
-                  <mailto:andy@yumaworks.com>
-
-        Author:   Martin Bjorklund
-                  <mailto:mbj@tail-f.com>
-
-        Author:   Kent Watsen
-                  <mailto:kwatsen@juniper.net>";
-
-    description
-	"This module contains conceptual YANG specifications
-        for basic RESTCONF media type definitions used in
-        RESTCONF protocol messages.
-
-        Note that the YANG definitions within this module do not
-        represent configuration data of any kind.
-        The 'restconf-media-type' YANG extension statement
-        provides a normative syntax for XML and JSON
-        message-encoding purposes.
-
-        Copyright (c) 2017 IETF Trust and the persons identified as
-        authors of the code.  All rights reserved.
-
-        Redistribution and use in source and binary forms, with or
-        without modification, is permitted pursuant to, and subject
-        to the license terms contained in, the Simplified BSD License
-        set forth in Section 4.c of the IETF Trust's Legal Provisions
-        Relating to IETF Documents
-        (http://trustee.ietf.org/license-info).
-
-        This version of this YANG module is part of RFC 8040; see
-        the RFC itself for full legal notices.";
-
-    revision 2017-01-26 {
-	description
-	    "Initial revision.";
-	reference
-	    "RFC 8040: RESTCONF Protocol.";
-    }
-
-    extension yang-data {
-	argument name {
-	    yin-element true;
-	}
-	description
-	    "This extension is used to specify a YANG data template that
-          represents conceptual data defined in YANG.  It is
-          intended to describe hierarchical data independent of
-          protocol context or specific message-encoding format.
-          Data definition statements within a yang-data extension
-          specify the generic syntax for the specific YANG data
-          template, whose name is the argument of the 'yang-data'
-          extension statement.
-
-          Note that this extension does not define a media type.
-          A specification using this extension MUST specify the
-          message-encoding rules, including the content media type.
-
-          The mandatory 'name' parameter value identifies the YANG
-          data template that is being defined.  It contains the
-          template name.
-
-          This extension is ignored unless it appears as a top-level
-          statement.  It MUST contain data definition statements
-          that result in exactly one container data node definition.
-          An instance of a YANG data template can thus be translated
-          into an XML instance document, whose top-level element
-          corresponds to the top-level container.
-
-          The module name and namespace values for the YANG module using
-          the extension statement are assigned to instance document data
-          conforming to the data definition statements within
-          this extension.
-
-          The substatements of this extension MUST follow the
-          'data-def-stmt' rule in the YANG ABNF.
-
-          The XPath document root is the extension statement itself,
-          such that the child nodes of the document root are
-          represented by the data-def-stmt substatements within
-          this extension.  This conceptual document is the context
-          for the following YANG statements:
-
-            - must-stmt
-            - when-stmt
-            - path-stmt
-            - min-elements-stmt
-            - max-elements-stmt
-            - mandatory-stmt
-            - unique-stmt
-            - ordered-by
-            - instance-identifier data type
-
-          The following data-def-stmt substatements are constrained
-          when used within a 'yang-data' extension statement.
-
-            - The list-stmt is not required to have a key-stmt defined.
-            - The if-feature-stmt is ignored if present.
-            - The config-stmt is ignored if present.
-            - The available identity values for any 'identityref'
-              leaf or leaf-list nodes are limited to the module
-              containing this extension statement and the modules
-              imported into that module.
-         ";
-    }
-
-    rc:yang-data yang-errors {
-	uses errors;
-    }
-
-    rc:yang-data yang-api {
-	uses restconf;
-    }
-
-    grouping errors {
-	description
-	    "A grouping that contains a YANG container
-          representing the syntax and semantics of a
-          YANG Patch error report within a response message.";
-
-	container errors {
-	    description
-		"Represents an error report returned by the server if
-            a request results in an error.";
-
-	    list error {
-		description
-		    "An entry containing information about one
-              specific error that occurred while processing
-              a RESTCONF request.";
-		reference
-		    "RFC 6241, Section 4.3.";
-
-		leaf error-type {
-		    type enumeration {
-			enum transport {
-			    description
-			    "The transport layer.";
-			}
-			enum rpc {
-			    description
-				"The rpc or notification layer.";
-			}
-			enum protocol {
-			    description
-			    "The protocol operation layer.";
-			}
-			enum application {
-			    description
-			    "The server application layer.";
-			}
-		    }
-		    mandatory true;
-		    description
-			"The protocol layer where the error occurred.";
-		}
-
-		leaf error-tag {
-		    type string;
-		    mandatory true;
-		    description
-			"The enumerated error-tag.";
-		}
-
-		leaf error-app-tag {
-		    type string;
-		    description
-			"The application-specific error-tag.";
-		}
-
-		leaf error-path {
-		    type instance-identifier;
-		    description
-			"The YANG instance identifier associated
-                with the error node.";
-		}
-
-		leaf error-message {
-		    type string;
-		    description
-			"A message describing the error.";
-		}
-
-		anydata error-info {
-		    description
-			"This anydata value MUST represent a container with
-                 zero or more data nodes representing additional
-                 error information.";
-		}
-	    }
-	}
-    }
-
-    grouping restconf {
-	description
-	    "Conceptual grouping representing the RESTCONF
-          root resource.";
-
-	container restconf {
-	    description
-		"Conceptual container representing the RESTCONF
-            root resource.";
-	    container data {
-		description
-		    "Container representing the datastore resource.
-              Represents the conceptual root of all state data
-              and configuration data supported by the server.
-              The child nodes of this container can be any data
-              resources that are defined as top-level data nodes
-              from the YANG modules advertised by the server in
-              the 'ietf-yang-library' module.";
-	    }
-
-	    container operations {
-		description
-		    "Container for all operation resources.
-
-              Each resource is represented as an empty leaf with the
-              name of the RPC operation from the YANG 'rpc' statement.
-
-              For example, the 'system-restart' RPC operation defined
-              in the 'ietf-system' module would be represented as
-              an empty leaf in the 'ietf-system' namespace.  This is
-              a conceptual leaf and will not actually be found in
-              the module:
-
-                 module ietf-system {
-                   leaf system-reset {
-                     type empty;
-                   }
-                 }
-
-              To invoke the 'system-restart' RPC operation:
-
-                 POST /restconf/operations/ietf-system:system-restart
-
-              To discover the RPC operations supported by the server:
-
-                 GET /restconf/operations
-
-              In XML, the YANG module namespace identifies the module:
-
-                <system-restart
-                   xmlns='urn:ietf:params:xml:ns:yang:ietf-system'/>
-
-              In JSON, the YANG module name identifies the module:
-
-                { 'ietf-system:system-restart' : [null] }
-             ";
-	    }
-	    
-	    leaf yang-library-version {
-		type string {
-		    pattern '\d{4}-\d{2}-\d{2}';
-		}
-		config false;
-		mandatory true;
-		description
-		    "Identifies the revision date of the 'ietf-yang-library'
-              module that is implemented by this RESTCONF server.
-              Indicates the year, month, and day in YYYY-MM-DD
-              numeric format.";
-	    }
-	}
-    }
-
-}
diff --git a/yang/ietf-yang-types@2013-07-15.yang b/yang/ietf-yang-types@2013-07-15.yang
deleted file mode 100644
index 07834130..00000000
--- a/yang/ietf-yang-types@2013-07-15.yang
+++ /dev/null
@@ -1,481 +0,0 @@
-   module ietf-yang-types {
-
-     namespace "urn:ietf:params:xml:ns:yang:ietf-yang-types";
-     prefix "yang";
-
-     organization
-      "IETF NETMOD (NETCONF Data Modeling Language) Working Group";
-
-     contact
-      "WG Web:   <http://tools.ietf.org/wg/netmod/>
-       WG List:  <mailto:netmod@ietf.org>
-
-       WG Chair: David Kessens
-                 <mailto:david.kessens@nsn.com>
-
-       WG Chair: Juergen Schoenwaelder
-                 <mailto:j.schoenwaelder@jacobs-university.de>
-
-       Editor:   Juergen Schoenwaelder
-                 <mailto:j.schoenwaelder@jacobs-university.de>";
-
-     description
-      "This module contains a collection of generally useful derived
-       YANG data types.
-
-       Copyright (c) 2013 IETF Trust and the persons identified as
-       authors of the code.  All rights reserved.
-
-       Redistribution and use in source and binary forms, with or
-       without modification, is permitted pursuant to, and subject
-       to the license terms contained in, the Simplified BSD License
-       set forth in Section 4.c of the IETF Trust's Legal Provisions
-       Relating to IETF Documents
-       (http://trustee.ietf.org/license-info).
-
-       This version of this YANG module is part of RFC 6991; see
-       the RFC itself for full legal notices.";
-
-     revision 2013-07-15 {
-       description
-        "This revision adds the following new data types:
-         - yang-identifier
-         - hex-string
-         - uuid
-         - dotted-quad";
-       reference
-        "RFC 6991: Common YANG Data Types";
-     }
-
-     revision 2010-09-24 {
-       description
-        "Initial revision.";
-       reference
-        "RFC 6021: Common YANG Data Types";
-     }
-
-     /*** collection of counter and gauge types ***/
-
-     typedef counter32 {
-       type uint32;
-       description
-        "The counter32 type represents a non-negative integer
-         that monotonically increases until it reaches a
-         maximum value of 2^32-1 (4294967295 decimal), when it
-         wraps around and starts increasing again from zero.
-
-         Counters have no defined 'initial' value, and thus, a
-         single value of a counter has (in general) no information
-         content.  Discontinuities in the monotonically increasing
-         value normally occur at re-initialization of the
-         management system, and at other times as specified in the
-         description of a schema node using this type.  If such
-         other times can occur, for example, the creation of
-         a schema node of type counter32 at times other than
-         re-initialization, then a corresponding schema node
-         should be defined, with an appropriate type, to indicate
-         the last discontinuity.
-
-         The counter32 type should not be used for configuration
-         schema nodes.  A default statement SHOULD NOT be used in
-         combination with the type counter32.
-
-         In the value set and its semantics, this type is equivalent
-         to the Counter32 type of the SMIv2.";
-       reference
-        "RFC 2578: Structure of Management Information Version 2
-                   (SMIv2)";
-     }
-
-     typedef zero-based-counter32 {
-       type yang:counter32;
-       default "0";
-       description
-        "The zero-based-counter32 type represents a counter32
-         that has the defined 'initial' value zero.
-
-         A schema node of this type will be set to zero (0) on creation
-         and will thereafter increase monotonically until it reaches
-         a maximum value of 2^32-1 (4294967295 decimal), when it
-         wraps around and starts increasing again from zero.
-
-         Provided that an application discovers a new schema node
-         of this type within the minimum time to wrap, it can use the
-         'initial' value as a delta.  It is important for a management
-         station to be aware of this minimum time and the actual time
-         between polls, and to discard data if the actual time is too
-         long or there is no defined minimum time.
-
-         In the value set and its semantics, this type is equivalent
-         to the ZeroBasedCounter32 textual convention of the SMIv2.";
-       reference
-         "RFC 4502: Remote Network Monitoring Management Information
-                    Base Version 2";
-     }
-
-     typedef counter64 {
-       type uint64;
-       description
-        "The counter64 type represents a non-negative integer
-         that monotonically increases until it reaches a
-         maximum value of 2^64-1 (18446744073709551615 decimal),
-         when it wraps around and starts increasing again from zero.
-
-         Counters have no defined 'initial' value, and thus, a
-         single value of a counter has (in general) no information
-         content.  Discontinuities in the monotonically increasing
-         value normally occur at re-initialization of the
-         management system, and at other times as specified in the
-         description of a schema node using this type.  If such
-         other times can occur, for example, the creation of
-         a schema node of type counter64 at times other than
-         re-initialization, then a corresponding schema node
-         should be defined, with an appropriate type, to indicate
-         the last discontinuity.
-
-         The counter64 type should not be used for configuration
-         schema nodes.  A default statement SHOULD NOT be used in
-         combination with the type counter64.
-
-         In the value set and its semantics, this type is equivalent
-         to the Counter64 type of the SMIv2.";
-       reference
-        "RFC 2578: Structure of Management Information Version 2
-                   (SMIv2)";
-     }
-
-     typedef zero-based-counter64 {
-       type yang:counter64;
-       default "0";
-       description
-        "The zero-based-counter64 type represents a counter64 that
-         has the defined 'initial' value zero.
-
-
-
-
-         A schema node of this type will be set to zero (0) on creation
-         and will thereafter increase monotonically until it reaches
-         a maximum value of 2^64-1 (18446744073709551615 decimal),
-         when it wraps around and starts increasing again from zero.
-
-         Provided that an application discovers a new schema node
-         of this type within the minimum time to wrap, it can use the
-         'initial' value as a delta.  It is important for a management
-         station to be aware of this minimum time and the actual time
-         between polls, and to discard data if the actual time is too
-         long or there is no defined minimum time.
-
-         In the value set and its semantics, this type is equivalent
-         to the ZeroBasedCounter64 textual convention of the SMIv2.";
-       reference
-        "RFC 2856: Textual Conventions for Additional High Capacity
-                   Data Types";
-     }
-
-     typedef gauge32 {
-       type uint32;
-       description
-        "The gauge32 type represents a non-negative integer, which
-         may increase or decrease, but shall never exceed a maximum
-         value, nor fall below a minimum value.  The maximum value
-         cannot be greater than 2^32-1 (4294967295 decimal), and
-         the minimum value cannot be smaller than 0.  The value of
-         a gauge32 has its maximum value whenever the information
-         being modeled is greater than or equal to its maximum
-         value, and has its minimum value whenever the information
-         being modeled is smaller than or equal to its minimum value.
-         If the information being modeled subsequently decreases
-         below (increases above) the maximum (minimum) value, the
-         gauge32 also decreases (increases).
-
-         In the value set and its semantics, this type is equivalent
-         to the Gauge32 type of the SMIv2.";
-       reference
-        "RFC 2578: Structure of Management Information Version 2
-                   (SMIv2)";
-     }
-
-     typedef gauge64 {
-       type uint64;
-       description
-        "The gauge64 type represents a non-negative integer, which
-         may increase or decrease, but shall never exceed a maximum
-         value, nor fall below a minimum value.  The maximum value
-         cannot be greater than 2^64-1 (18446744073709551615), and
-         the minimum value cannot be smaller than 0.  The value of
-         a gauge64 has its maximum value whenever the information
-         being modeled is greater than or equal to its maximum
-         value, and has its minimum value whenever the information
-         being modeled is smaller than or equal to its minimum value.
-         If the information being modeled subsequently decreases
-         below (increases above) the maximum (minimum) value, the
-         gauge64 also decreases (increases).
-
-         In the value set and its semantics, this type is equivalent
-         to the CounterBasedGauge64 SMIv2 textual convention defined
-         in RFC 2856";
-       reference
-        "RFC 2856: Textual Conventions for Additional High Capacity
-                   Data Types";
-     }
-
-     /*** collection of identifier-related types ***/
-
-     typedef object-identifier {
-       type string {
-         pattern '(([0-1](\.[1-3]?[0-9]))|(2\.(0|([1-9]\d*))))'
-               + '(\.(0|([1-9]\d*)))*';
-       }
-       description
-        "The object-identifier type represents administratively
-         assigned names in a registration-hierarchical-name tree.
-
-         Values of this type are denoted as a sequence of numerical
-         non-negative sub-identifier values.  Each sub-identifier
-         value MUST NOT exceed 2^32-1 (4294967295).  Sub-identifiers
-         are separated by single dots and without any intermediate
-         whitespace.
-
-         The ASN.1 standard restricts the value space of the first
-         sub-identifier to 0, 1, or 2.  Furthermore, the value space
-         of the second sub-identifier is restricted to the range
-         0 to 39 if the first sub-identifier is 0 or 1.  Finally,
-         the ASN.1 standard requires that an object identifier
-         has always at least two sub-identifiers.  The pattern
-         captures these restrictions.
-
-         Although the number of sub-identifiers is not limited,
-         module designers should realize that there may be
-         implementations that stick with the SMIv2 limit of 128
-         sub-identifiers.
-
-         This type is a superset of the SMIv2 OBJECT IDENTIFIER type
-         since it is not restricted to 128 sub-identifiers.  Hence,
-         this type SHOULD NOT be used to represent the SMIv2 OBJECT
-         IDENTIFIER type; the object-identifier-128 type SHOULD be
-         used instead.";
-       reference
-        "ISO9834-1: Information technology -- Open Systems
-         Interconnection -- Procedures for the operation of OSI
-         Registration Authorities: General procedures and top
-         arcs of the ASN.1 Object Identifier tree";
-     }
-
-     typedef object-identifier-128 {
-       type object-identifier {
-         pattern '\d*(\.\d*){1,127}';
-       }
-       description
-        "This type represents object-identifiers restricted to 128
-         sub-identifiers.
-
-         In the value set and its semantics, this type is equivalent
-         to the OBJECT IDENTIFIER type of the SMIv2.";
-       reference
-        "RFC 2578: Structure of Management Information Version 2
-                   (SMIv2)";
-     }
-
-     typedef yang-identifier {
-       type string {
-         length "1..max";
-         pattern '[a-zA-Z_][a-zA-Z0-9\-_.]*';
-         pattern '.|..|[^xX].*|.[^mM].*|..[^lL].*';
-       }
-       description
-         "A YANG identifier string as defined by the 'identifier'
-          rule in Section 12 of RFC 6020.  An identifier must
-          start with an alphabetic character or an underscore
-          followed by an arbitrary sequence of alphabetic or
-          numeric characters, underscores, hyphens, or dots.
-
-          A YANG identifier MUST NOT start with any possible
-          combination of the lowercase or uppercase character
-          sequence 'xml'.";
-       reference
-         "RFC 6020: YANG - A Data Modeling Language for the Network
-                    Configuration Protocol (NETCONF)";
-     }
-
-     /*** collection of types related to date and time***/
-
-     typedef date-and-time {
-       type string {
-         pattern '\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?'
-               + '(Z|[\+\-]\d{2}:\d{2})';
-       }
-       description
-        "The date-and-time type is a profile of the ISO 8601
-         standard for representation of dates and times using the
-         Gregorian calendar.  The profile is defined by the
-         date-time production in Section 5.6 of RFC 3339.
-
-         The date-and-time type is compatible with the dateTime XML
-         schema type with the following notable exceptions:
-
-         (a) The date-and-time type does not allow negative years.
-
-         (b) The date-and-time time-offset -00:00 indicates an unknown
-             time zone (see RFC 3339) while -00:00 and +00:00 and Z
-             all represent the same time zone in dateTime.
-
-         (c) The canonical format (see below) of data-and-time values
-             differs from the canonical format used by the dateTime XML
-             schema type, which requires all times to be in UTC using
-             the time-offset 'Z'.
-
-         This type is not equivalent to the DateAndTime textual
-         convention of the SMIv2 since RFC 3339 uses a different
-         separator between full-date and full-time and provides
-         higher resolution of time-secfrac.
-
-         The canonical format for date-and-time values with a known time
-         zone uses a numeric time zone offset that is calculated using
-         the device's configured known offset to UTC time.  A change of
-         the device's offset to UTC time will cause date-and-time values
-         to change accordingly.  Such changes might happen periodically
-         in case a server follows automatically daylight saving time
-         (DST) time zone offset changes.  The canonical format for
-         date-and-time values with an unknown time zone (usually
-         referring to the notion of local time) uses the time-offset
-         -00:00.";
-       reference
-        "RFC 3339: Date and Time on the Internet: Timestamps
-         RFC 2579: Textual Conventions for SMIv2
-         XSD-TYPES: XML Schema Part 2: Datatypes Second Edition";
-     }
-
-     typedef timeticks {
-       type uint32;
-       description
-        "The timeticks type represents a non-negative integer that
-         represents the time, modulo 2^32 (4294967296 decimal), in
-         hundredths of a second between two epochs.  When a schema
-         node is defined that uses this type, the description of
-         the schema node identifies both of the reference epochs.
-
-         In the value set and its semantics, this type is equivalent
-         to the TimeTicks type of the SMIv2.";
-       reference
-        "RFC 2578: Structure of Management Information Version 2
-                   (SMIv2)";
-     }
-
-     typedef timestamp {
-       type yang:timeticks;
-       description
-        "The timestamp type represents the value of an associated
-         timeticks schema node at which a specific occurrence
-         happened.  The specific occurrence must be defined in the
-         description of any schema node defined using this type.  When
-         the specific occurrence occurred prior to the last time the
-         associated timeticks attribute was zero, then the timestamp
-         value is zero.  Note that this requires all timestamp values
-         to be reset to zero when the value of the associated timeticks
-         attribute reaches 497+ days and wraps around to zero.
-
-         The associated timeticks schema node must be specified
-         in the description of any schema node using this type.
-
-         In the value set and its semantics, this type is equivalent
-         to the TimeStamp textual convention of the SMIv2.";
-       reference
-        "RFC 2579: Textual Conventions for SMIv2";
-     }
-
-     /*** collection of generic address types ***/
-
-     typedef phys-address {
-       type string {
-         pattern '([0-9a-fA-F]{2}(:[0-9a-fA-F]{2})*)?';
-       }
-
-
-
-
-       description
-        "Represents media- or physical-level addresses represented
-         as a sequence octets, each octet represented by two hexadecimal
-         numbers.  Octets are separated by colons.  The canonical
-         representation uses lowercase characters.
-
-         In the value set and its semantics, this type is equivalent
-         to the PhysAddress textual convention of the SMIv2.";
-       reference
-        "RFC 2579: Textual Conventions for SMIv2";
-     }
-
-     typedef mac-address {
-       type string {
-         pattern '[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}';
-       }
-       description
-        "The mac-address type represents an IEEE 802 MAC address.
-         The canonical representation uses lowercase characters.
-
-         In the value set and its semantics, this type is equivalent
-         to the MacAddress textual convention of the SMIv2.";
-       reference
-        "IEEE 802: IEEE Standard for Local and Metropolitan Area
-                   Networks: Overview and Architecture
-         RFC 2579: Textual Conventions for SMIv2";
-     }
-
-     /*** collection of XML-specific types ***/
-
-     typedef xpath1.0 {
-       type string;
-       description
-        "This type represents an XPATH 1.0 expression.
-
-         When a schema node is defined that uses this type, the
-         description of the schema node MUST specify the XPath
-         context in which the XPath expression is evaluated.";
-       reference
-        "XPATH: XML Path Language (XPath) Version 1.0";
-     }
-
-     /*** collection of string types ***/
-
-     typedef hex-string {
-       type string {
-         pattern '([0-9a-fA-F]{2}(:[0-9a-fA-F]{2})*)?';
-       }
-       description
-        "A hexadecimal string with octets represented as hex digits
-         separated by colons.  The canonical representation uses
-         lowercase characters.";
-     }
-
-     typedef uuid {
-       type string {
-         pattern '[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-'
-               + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12}';
-       }
-       description
-        "A Universally Unique IDentifier in the string representation
-         defined in RFC 4122.  The canonical representation uses
-         lowercase characters.
-
-         The following is an example of a UUID in string representation:
-         f81d4fae-7dec-11d0-a765-00a0c91e6bf6
-         ";
-       reference
-        "RFC 4122: A Universally Unique IDentifier (UUID) URN
-                   Namespace";
-     }
-
-     typedef dotted-quad {
-       type string {
-         pattern
-           '(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}'
-         + '([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])';
-       }
-       description
-         "An unsigned 32-bit number expressed in the dotted-quad
-          notation, i.e., four octets written as decimal numbers
-          and separated with the '.' (full stop) character.";
-     }
-   }
-
diff --git a/yang/standard/Makefile.in b/yang/standard/Makefile.in
new file mode 100644
index 00000000..6da576ae
--- /dev/null
+++ b/yang/standard/Makefile.in
@@ -0,0 +1,76 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
+# 
+# Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
+#
+# This file is part of CLIXON
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# the GNU General Public License Version 3 or later (the "GPL"),
+# in which case the provisions of the GPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of the GPL, and not to allow others to
+# use your version of this file under the terms of Apache License version 2, 
+# indicate your decision by deleting the provisions above and replace them with
+# the notice and other provisions required by the GPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the Apache License version 2 or the GPL.
+#
+# ***** END LICENSE BLOCK *****
+#
+VPATH       	= @srcdir@
+srcdir  	= @srcdir@
+top_srcdir  	= @top_srcdir@
+prefix 		= @prefix@
+bindir 		= @bindir@
+includedir	= @includedir@
+datarootdir     = @datarootdir@
+
+# Could place them in separate standards dir?
+CLIXON_DATADIR   = @CLIXON_DATADIR@
+
+YANGSPECS  = iana-if-type@2014-05-08.yang
+YANGSPECS += ietf-interfaces@2018-02-20.yang
+YANGSPECS += ietf-yang-types@2013-07-15.yang
+YANGSPECS += ietf-ip@2014-06-16.yang
+YANGSPECS += ietf-inet-types@2013-07-15.yang
+YANGSPECS += ietf-routing@2018-03-13.yang
+YANGSPECS += ietf-yang-library@2016-06-21.yang
+YANGSPECS += ietf-netconf@2011-06-01.yang
+YANGSPECS += ietf-netconf-acm@2018-02-14.yang
+YANGSPECS += ietf-restconf-monitoring@2017-01-26.yang
+YANGSPECS += ietf-netconf-monitoring@2010-10-04.yang
+
+all:	
+
+clean:
+
+distclean: clean
+	rm -f Makefile *~ .depend
+
+install: $(YANGSPECS) 
+	install -d -m 0755 $(DESTDIR)$(CLIXON_DATADIR)
+	install -m 0644 $(YANGSPECS) $(DESTDIR)$(CLIXON_DATADIR)
+
+uninstall:
+	(cd $(DESTDIR)$(CLIXON_DATADIR); rm -rf *.yang)
+
+install-include:	
+
+depend:
+
+
+#include .depend
+
diff --git a/example/iana-if-type@2014-05-08.yang b/yang/standard/iana-if-type@2014-05-08.yang
similarity index 100%
rename from example/iana-if-type@2014-05-08.yang
rename to yang/standard/iana-if-type@2014-05-08.yang
diff --git a/example/ietf-inet-types@2013-07-15.yang b/yang/standard/ietf-inet-types@2013-07-15.yang
similarity index 100%
rename from example/ietf-inet-types@2013-07-15.yang
rename to yang/standard/ietf-inet-types@2013-07-15.yang
diff --git a/yang/standard/ietf-interfaces@2018-02-20.yang b/yang/standard/ietf-interfaces@2018-02-20.yang
new file mode 100644
index 00000000..f66c205c
--- /dev/null
+++ b/yang/standard/ietf-interfaces@2018-02-20.yang
@@ -0,0 +1,1123 @@
+module ietf-interfaces {
+  yang-version 1.1;
+  namespace "urn:ietf:params:xml:ns:yang:ietf-interfaces";
+  prefix if;
+
+  import ietf-yang-types {
+    prefix yang;
+  }
+
+  organization
+    "IETF NETMOD (Network Modeling) Working Group";
+
+  contact
+    "WG Web:   <https://datatracker.ietf.org/wg/netmod/>
+     WG List:  <mailto:netmod@ietf.org>
+
+     Editor:   Martin Bjorklund
+               <mailto:mbj@tail-f.com>";
+
+  description
+    "This module contains a collection of YANG definitions for
+     managing network interfaces.
+
+     Copyright (c) 2018 IETF Trust and the persons identified as
+     authors of the code.  All rights reserved.
+
+     Redistribution and use in source and binary forms, with or
+     without modification, is permitted pursuant to, and subject
+     to the license terms contained in, the Simplified BSD License
+     set forth in Section 4.c of the IETF Trust's Legal Provisions
+     Relating to IETF Documents
+     (https://trustee.ietf.org/license-info).
+
+     This version of this YANG module is part of RFC 8343; see
+     the RFC itself for full legal notices.";
+
+  revision 2018-02-20 {
+    description
+      "Updated to support NMDA.";
+    reference
+      "RFC 8343: A YANG Data Model for Interface Management";
+  }
+
+  revision 2014-05-08 {
+    description
+      "Initial revision.";
+    reference
+      "RFC 7223: A YANG Data Model for Interface Management";
+  }
+
+  /*
+   * Typedefs
+   */
+
+  typedef interface-ref {
+    type leafref {
+      path "/if:interfaces/if:interface/if:name";
+    }
+    description
+      "This type is used by data models that need to reference
+       interfaces.";
+  }
+
+  /*
+   * Identities
+   */
+
+  identity interface-type {
+    description
+      "Base identity from which specific interface types are
+       derived.";
+  }
+
+  /*
+   * Features
+   */
+
+  feature arbitrary-names {
+    description
+      "This feature indicates that the device allows user-controlled
+       interfaces to be named arbitrarily.";
+  }
+  feature pre-provisioning {
+    description
+      "This feature indicates that the device supports
+       pre-provisioning of interface configuration, i.e., it is
+       possible to configure an interface whose physical interface
+       hardware is not present on the device.";
+  }
+  feature if-mib {
+    description
+      "This feature indicates that the device implements
+       the IF-MIB.";
+    reference
+      "RFC 2863: The Interfaces Group MIB";
+  }
+
+  /*
+   * Data nodes
+   */
+
+  container interfaces {
+    description
+      "Interface parameters.";
+
+    list interface {
+      key "name";
+
+      description
+        "The list of interfaces on the device.
+
+         The status of an interface is available in this list in the
+         operational state.  If the configuration of a
+         system-controlled interface cannot be used by the system
+         (e.g., the interface hardware present does not match the
+         interface type), then the configuration is not applied to
+         the system-controlled interface shown in the operational
+         state.  If the configuration of a user-controlled interface
+         cannot be used by the system, the configured interface is
+         not instantiated in the operational state.
+
+         System-controlled interfaces created by the system are
+         always present in this list in the operational state,
+         whether or not they are configured.";
+
+     leaf name {
+        type string;
+        description
+          "The name of the interface.
+
+           A device MAY restrict the allowed values for this leaf,
+           possibly depending on the type of the interface.
+           For system-controlled interfaces, this leaf is the
+           device-specific name of the interface.
+
+           If a client tries to create configuration for a
+           system-controlled interface that is not present in the
+           operational state, the server MAY reject the request if
+           the implementation does not support pre-provisioning of
+           interfaces or if the name refers to an interface that can
+           never exist in the system.  A Network Configuration
+           Protocol (NETCONF) server MUST reply with an rpc-error
+           with the error-tag 'invalid-value' in this case.
+
+           If the device supports pre-provisioning of interface
+           configuration, the 'pre-provisioning' feature is
+           advertised.
+
+           If the device allows arbitrarily named user-controlled
+           interfaces, the 'arbitrary-names' feature is advertised.
+
+           When a configured user-controlled interface is created by
+           the system, it is instantiated with the same name in the
+           operational state.
+
+           A server implementation MAY map this leaf to the ifName
+           MIB object.  Such an implementation needs to use some
+           mechanism to handle the differences in size and characters
+           allowed between this leaf and ifName.  The definition of
+           such a mechanism is outside the scope of this document.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifName";
+      }
+
+      leaf description {
+        type string;
+        description
+          "A textual description of the interface.
+
+           A server implementation MAY map this leaf to the ifAlias
+           MIB object.  Such an implementation needs to use some
+           mechanism to handle the differences in size and characters
+           allowed between this leaf and ifAlias.  The definition of
+           such a mechanism is outside the scope of this document.
+
+           Since ifAlias is defined to be stored in non-volatile
+           storage, the MIB implementation MUST map ifAlias to the
+           value of 'description' in the persistently stored
+           configuration.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifAlias";
+      }
+
+      leaf type {
+        type identityref {
+          base interface-type;
+        }
+        mandatory true;
+        description
+          "The type of the interface.
+
+           When an interface entry is created, a server MAY
+           initialize the type leaf with a valid value, e.g., if it
+           is possible to derive the type from the name of the
+           interface.
+
+           If a client tries to set the type of an interface to a
+           value that can never be used by the system, e.g., if the
+           type is not supported or if the type does not match the
+           name of the interface, the server MUST reject the request.
+           A NETCONF server MUST reply with an rpc-error with the
+           error-tag 'invalid-value' in this case.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifType";
+      }
+
+      leaf enabled {
+        type boolean;
+        default "true";
+        description
+          "This leaf contains the configured, desired state of the
+           interface.
+
+           Systems that implement the IF-MIB use the value of this
+           leaf in the intended configuration to set
+           IF-MIB.ifAdminStatus to 'up' or 'down' after an ifEntry
+           has been initialized, as described in RFC 2863.
+
+           Changes in this leaf in the intended configuration are
+           reflected in ifAdminStatus.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifAdminStatus";
+      }
+
+      leaf link-up-down-trap-enable {
+        if-feature if-mib;
+        type enumeration {
+          enum enabled {
+            value 1;
+            description
+              "The device will generate linkUp/linkDown SNMP
+               notifications for this interface.";
+          }
+          enum disabled {
+            value 2;
+            description
+              "The device will not generate linkUp/linkDown SNMP
+               notifications for this interface.";
+          }
+        }
+        description
+          "Controls whether linkUp/linkDown SNMP notifications
+           should be generated for this interface.
+
+           If this node is not configured, the value 'enabled' is
+           operationally used by the server for interfaces that do
+           not operate on top of any other interface (i.e., there are
+           no 'lower-layer-if' entries), and 'disabled' otherwise.";
+        reference
+          "RFC 2863: The Interfaces Group MIB -
+                     ifLinkUpDownTrapEnable";
+      }
+
+      leaf admin-status {
+        if-feature if-mib;
+        type enumeration {
+          enum up {
+            value 1;
+            description
+              "Ready to pass packets.";
+          }
+          enum down {
+            value 2;
+            description
+              "Not ready to pass packets and not in some test mode.";
+          }
+          enum testing {
+            value 3;
+            description
+              "In some test mode.";
+          }
+        }
+        config false;
+        mandatory true;
+        description
+          "The desired state of the interface.
+
+           This leaf has the same read semantics as ifAdminStatus.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifAdminStatus";
+      }
+
+      leaf oper-status {
+        type enumeration {
+          enum up {
+            value 1;
+            description
+              "Ready to pass packets.";
+          }
+          enum down {
+            value 2;
+
+            description
+              "The interface does not pass any packets.";
+          }
+          enum testing {
+            value 3;
+            description
+              "In some test mode.  No operational packets can
+               be passed.";
+          }
+          enum unknown {
+            value 4;
+            description
+              "Status cannot be determined for some reason.";
+          }
+          enum dormant {
+            value 5;
+            description
+              "Waiting for some external event.";
+          }
+          enum not-present {
+            value 6;
+            description
+              "Some component (typically hardware) is missing.";
+          }
+          enum lower-layer-down {
+            value 7;
+            description
+              "Down due to state of lower-layer interface(s).";
+          }
+        }
+        config false;
+        mandatory true;
+        description
+          "The current operational state of the interface.
+
+           This leaf has the same semantics as ifOperStatus.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifOperStatus";
+      }
+
+      leaf last-change {
+        type yang:date-and-time;
+        config false;
+        description
+          "The time the interface entered its current operational
+           state.  If the current state was entered prior to the
+           last re-initialization of the local network management
+           subsystem, then this node is not present.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifLastChange";
+      }
+
+      leaf if-index {
+        if-feature if-mib;
+        type int32 {
+          range "1..2147483647";
+        }
+        config false;
+        mandatory true;
+        description
+          "The ifIndex value for the ifEntry represented by this
+           interface.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifIndex";
+      }
+
+      leaf phys-address {
+        type yang:phys-address;
+        config false;
+        description
+          "The interface's address at its protocol sub-layer.  For
+           example, for an 802.x interface, this object normally
+           contains a Media Access Control (MAC) address.  The
+           interface's media-specific modules must define the bit
+           and byte ordering and the format of the value of this
+           object.  For interfaces that do not have such an address
+           (e.g., a serial line), this node is not present.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifPhysAddress";
+      }
+
+      leaf-list higher-layer-if {
+        type interface-ref;
+        config false;
+        description
+          "A list of references to interfaces layered on top of this
+           interface.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifStackTable";
+      }
+
+      leaf-list lower-layer-if {
+        type interface-ref;
+        config false;
+
+        description
+          "A list of references to interfaces layered underneath this
+           interface.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifStackTable";
+      }
+
+      leaf speed {
+        type yang:gauge64;
+        units "bits/second";
+        config false;
+        description
+            "An estimate of the interface's current bandwidth in bits
+             per second.  For interfaces that do not vary in
+             bandwidth or for those where no accurate estimation can
+             be made, this node should contain the nominal bandwidth.
+             For interfaces that have no concept of bandwidth, this
+             node is not present.";
+        reference
+          "RFC 2863: The Interfaces Group MIB -
+                     ifSpeed, ifHighSpeed";
+      }
+
+      container statistics {
+        config false;
+        description
+          "A collection of interface-related statistics objects.";
+
+        leaf discontinuity-time {
+          type yang:date-and-time;
+          mandatory true;
+          description
+            "The time on the most recent occasion at which any one or
+             more of this interface's counters suffered a
+             discontinuity.  If no such discontinuities have occurred
+             since the last re-initialization of the local management
+             subsystem, then this node contains the time the local
+             management subsystem re-initialized itself.";
+        }
+
+        leaf in-octets {
+          type yang:counter64;
+          description
+            "The total number of octets received on the interface,
+             including framing characters.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifHCInOctets";
+        }
+
+        leaf in-unicast-pkts {
+          type yang:counter64;
+          description
+            "The number of packets, delivered by this sub-layer to a
+             higher (sub-)layer, that were not addressed to a
+             multicast or broadcast address at this sub-layer.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifHCInUcastPkts";
+        }
+
+        leaf in-broadcast-pkts {
+          type yang:counter64;
+          description
+            "The number of packets, delivered by this sub-layer to a
+             higher (sub-)layer, that were addressed to a broadcast
+             address at this sub-layer.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB -
+                       ifHCInBroadcastPkts";
+        }
+
+        leaf in-multicast-pkts {
+          type yang:counter64;
+          description
+            "The number of packets, delivered by this sub-layer to a
+             higher (sub-)layer, that were addressed to a multicast
+             address at this sub-layer.  For a MAC-layer protocol,
+             this includes both Group and Functional addresses.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB -
+                       ifHCInMulticastPkts";
+        }
+
+        leaf in-discards {
+          type yang:counter32;
+          description
+            "The number of inbound packets that were chosen to be
+             discarded even though no errors had been detected to
+             prevent their being deliverable to a higher-layer
+             protocol.  One possible reason for discarding such a
+             packet could be to free up buffer space.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifInDiscards";
+        }
+
+        leaf in-errors {
+          type yang:counter32;
+          description
+            "For packet-oriented interfaces, the number of inbound
+             packets that contained errors preventing them from being
+             deliverable to a higher-layer protocol.  For character-
+             oriented or fixed-length interfaces, the number of
+             inbound transmission units that contained errors
+             preventing them from being deliverable to a higher-layer
+             protocol.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifInErrors";
+        }
+
+        leaf in-unknown-protos {
+          type yang:counter32;
+
+          description
+            "For packet-oriented interfaces, the number of packets
+             received via the interface that were discarded because
+             of an unknown or unsupported protocol.  For
+             character-oriented or fixed-length interfaces that
+             support protocol multiplexing, the number of
+             transmission units received via the interface that were
+             discarded because of an unknown or unsupported protocol.
+             For any interface that does not support protocol
+             multiplexing, this counter is not present.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifInUnknownProtos";
+        }
+
+        leaf out-octets {
+          type yang:counter64;
+          description
+            "The total number of octets transmitted out of the
+             interface, including framing characters.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifHCOutOctets";
+        }
+
+        leaf out-unicast-pkts {
+          type yang:counter64;
+          description
+            "The total number of packets that higher-level protocols
+             requested be transmitted and that were not addressed
+             to a multicast or broadcast address at this sub-layer,
+             including those that were discarded or not sent.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifHCOutUcastPkts";
+        }
+
+        leaf out-broadcast-pkts {
+          type yang:counter64;
+          description
+            "The total number of packets that higher-level protocols
+             requested be transmitted and that were addressed to a
+             broadcast address at this sub-layer, including those
+             that were discarded or not sent.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB -
+                       ifHCOutBroadcastPkts";
+        }
+
+        leaf out-multicast-pkts {
+          type yang:counter64;
+          description
+            "The total number of packets that higher-level protocols
+             requested be transmitted and that were addressed to a
+             multicast address at this sub-layer, including those
+             that were discarded or not sent.  For a MAC-layer
+             protocol, this includes both Group and Functional
+             addresses.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB -
+                       ifHCOutMulticastPkts";
+        }
+
+        leaf out-discards {
+          type yang:counter32;
+          description
+            "The number of outbound packets that were chosen to be
+             discarded even though no errors had been detected to
+             prevent their being transmitted.  One possible reason
+             for discarding such a packet could be to free up buffer
+             space.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifOutDiscards";
+        }
+
+        leaf out-errors {
+          type yang:counter32;
+          description
+            "For packet-oriented interfaces, the number of outbound
+             packets that could not be transmitted because of errors.
+             For character-oriented or fixed-length interfaces, the
+             number of outbound transmission units that could not be
+             transmitted because of errors.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifOutErrors";
+        }
+      }
+
+    }
+  }
+
+  /*
+   * Legacy typedefs
+   */
+
+  typedef interface-state-ref {
+    type leafref {
+      path "/if:interfaces-state/if:interface/if:name";
+    }
+    status deprecated;
+    description
+      "This type is used by data models that need to reference
+       the operationally present interfaces.";
+  }
+
+  /*
+   * Legacy operational state data nodes
+   */
+
+  container interfaces-state {
+    config false;
+    status deprecated;
+    description
+      "Data nodes for the operational state of interfaces.";
+
+    list interface {
+      key "name";
+      status deprecated;
+
+      description
+        "The list of interfaces on the device.
+
+         System-controlled interfaces created by the system are
+         always present in this list, whether or not they are
+         configured.";
+
+      leaf name {
+        type string;
+        status deprecated;
+        description
+          "The name of the interface.
+
+           A server implementation MAY map this leaf to the ifName
+           MIB object.  Such an implementation needs to use some
+           mechanism to handle the differences in size and characters
+           allowed between this leaf and ifName.  The definition of
+           such a mechanism is outside the scope of this document.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifName";
+      }
+
+      leaf type {
+        type identityref {
+          base interface-type;
+        }
+        mandatory true;
+        status deprecated;
+        description
+          "The type of the interface.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifType";
+      }
+
+      leaf admin-status {
+        if-feature if-mib;
+        type enumeration {
+          enum up {
+            value 1;
+            description
+              "Ready to pass packets.";
+          }
+          enum down {
+            value 2;
+            description
+              "Not ready to pass packets and not in some test mode.";
+          }
+          enum testing {
+            value 3;
+            description
+              "In some test mode.";
+          }
+        }
+        mandatory true;
+        status deprecated;
+        description
+          "The desired state of the interface.
+
+           This leaf has the same read semantics as ifAdminStatus.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifAdminStatus";
+      }
+
+      leaf oper-status {
+        type enumeration {
+          enum up {
+            value 1;
+            description
+              "Ready to pass packets.";
+          }
+          enum down {
+            value 2;
+            description
+              "The interface does not pass any packets.";
+          }
+          enum testing {
+            value 3;
+            description
+              "In some test mode.  No operational packets can
+               be passed.";
+          }
+          enum unknown {
+            value 4;
+            description
+              "Status cannot be determined for some reason.";
+          }
+          enum dormant {
+            value 5;
+            description
+              "Waiting for some external event.";
+          }
+          enum not-present {
+            value 6;
+            description
+              "Some component (typically hardware) is missing.";
+          }
+          enum lower-layer-down {
+            value 7;
+            description
+              "Down due to state of lower-layer interface(s).";
+          }
+        }
+        mandatory true;
+        status deprecated;
+        description
+          "The current operational state of the interface.
+
+           This leaf has the same semantics as ifOperStatus.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifOperStatus";
+      }
+
+      leaf last-change {
+        type yang:date-and-time;
+        status deprecated;
+        description
+          "The time the interface entered its current operational
+           state.  If the current state was entered prior to the
+           last re-initialization of the local network management
+           subsystem, then this node is not present.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifLastChange";
+      }
+
+      leaf if-index {
+        if-feature if-mib;
+        type int32 {
+          range "1..2147483647";
+        }
+        mandatory true;
+        status deprecated;
+        description
+          "The ifIndex value for the ifEntry represented by this
+           interface.";
+
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifIndex";
+      }
+
+      leaf phys-address {
+        type yang:phys-address;
+        status deprecated;
+        description
+          "The interface's address at its protocol sub-layer.  For
+           example, for an 802.x interface, this object normally
+           contains a Media Access Control (MAC) address.  The
+           interface's media-specific modules must define the bit
+           and byte ordering and the format of the value of this
+           object.  For interfaces that do not have such an address
+           (e.g., a serial line), this node is not present.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifPhysAddress";
+      }
+
+      leaf-list higher-layer-if {
+        type interface-state-ref;
+        status deprecated;
+        description
+          "A list of references to interfaces layered on top of this
+           interface.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifStackTable";
+      }
+
+      leaf-list lower-layer-if {
+        type interface-state-ref;
+        status deprecated;
+        description
+          "A list of references to interfaces layered underneath this
+           interface.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifStackTable";
+      }
+
+      leaf speed {
+        type yang:gauge64;
+        units "bits/second";
+        status deprecated;
+        description
+            "An estimate of the interface's current bandwidth in bits
+             per second.  For interfaces that do not vary in
+             bandwidth or for those where no accurate estimation can
+
+             be made, this node should contain the nominal bandwidth.
+             For interfaces that have no concept of bandwidth, this
+             node is not present.";
+        reference
+          "RFC 2863: The Interfaces Group MIB -
+                     ifSpeed, ifHighSpeed";
+      }
+
+      container statistics {
+        status deprecated;
+        description
+          "A collection of interface-related statistics objects.";
+
+        leaf discontinuity-time {
+          type yang:date-and-time;
+          mandatory true;
+          status deprecated;
+          description
+            "The time on the most recent occasion at which any one or
+             more of this interface's counters suffered a
+             discontinuity.  If no such discontinuities have occurred
+             since the last re-initialization of the local management
+             subsystem, then this node contains the time the local
+             management subsystem re-initialized itself.";
+        }
+
+        leaf in-octets {
+          type yang:counter64;
+          status deprecated;
+          description
+            "The total number of octets received on the interface,
+             including framing characters.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifHCInOctets";
+        }
+
+        leaf in-unicast-pkts {
+          type yang:counter64;
+          status deprecated;
+          description
+            "The number of packets, delivered by this sub-layer to a
+             higher (sub-)layer, that were not addressed to a
+             multicast or broadcast address at this sub-layer.
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifHCInUcastPkts";
+        }
+
+        leaf in-broadcast-pkts {
+          type yang:counter64;
+          status deprecated;
+          description
+            "The number of packets, delivered by this sub-layer to a
+             higher (sub-)layer, that were addressed to a broadcast
+             address at this sub-layer.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB -
+                       ifHCInBroadcastPkts";
+        }
+
+        leaf in-multicast-pkts {
+          type yang:counter64;
+          status deprecated;
+          description
+            "The number of packets, delivered by this sub-layer to a
+             higher (sub-)layer, that were addressed to a multicast
+             address at this sub-layer.  For a MAC-layer protocol,
+             this includes both Group and Functional addresses.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB -
+                       ifHCInMulticastPkts";
+        }
+
+        leaf in-discards {
+          type yang:counter32;
+          status deprecated;
+
+          description
+            "The number of inbound packets that were chosen to be
+             discarded even though no errors had been detected to
+             prevent their being deliverable to a higher-layer
+             protocol.  One possible reason for discarding such a
+             packet could be to free up buffer space.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifInDiscards";
+        }
+
+        leaf in-errors {
+          type yang:counter32;
+          status deprecated;
+          description
+            "For packet-oriented interfaces, the number of inbound
+             packets that contained errors preventing them from being
+             deliverable to a higher-layer protocol.  For character-
+             oriented or fixed-length interfaces, the number of
+             inbound transmission units that contained errors
+             preventing them from being deliverable to a higher-layer
+             protocol.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifInErrors";
+        }
+
+        leaf in-unknown-protos {
+          type yang:counter32;
+          status deprecated;
+          description
+            "For packet-oriented interfaces, the number of packets
+             received via the interface that were discarded because
+             of an unknown or unsupported protocol.  For
+             character-oriented or fixed-length interfaces that
+             support protocol multiplexing, the number of
+             transmission units received via the interface that were
+             discarded because of an unknown or unsupported protocol.
+             For any interface that does not support protocol
+             multiplexing, this counter is not present.
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifInUnknownProtos";
+        }
+
+        leaf out-octets {
+          type yang:counter64;
+          status deprecated;
+          description
+            "The total number of octets transmitted out of the
+             interface, including framing characters.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifHCOutOctets";
+        }
+
+        leaf out-unicast-pkts {
+          type yang:counter64;
+          status deprecated;
+          description
+            "The total number of packets that higher-level protocols
+             requested be transmitted and that were not addressed
+             to a multicast or broadcast address at this sub-layer,
+             including those that were discarded or not sent.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifHCOutUcastPkts";
+        }
+
+        leaf out-broadcast-pkts {
+          type yang:counter64;
+          status deprecated;
+
+          description
+            "The total number of packets that higher-level protocols
+             requested be transmitted and that were addressed to a
+             broadcast address at this sub-layer, including those
+             that were discarded or not sent.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB -
+                       ifHCOutBroadcastPkts";
+        }
+
+        leaf out-multicast-pkts {
+          type yang:counter64;
+          status deprecated;
+          description
+            "The total number of packets that higher-level protocols
+             requested be transmitted and that were addressed to a
+             multicast address at this sub-layer, including those
+             that were discarded or not sent.  For a MAC-layer
+             protocol, this includes both Group and Functional
+             addresses.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB -
+                       ifHCOutMulticastPkts";
+        }
+
+        leaf out-discards {
+          type yang:counter32;
+          status deprecated;
+          description
+            "The number of outbound packets that were chosen to be
+             discarded even though no errors had been detected to
+             prevent their being transmitted.  One possible reason
+             for discarding such a packet could be to free up buffer
+             space.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifOutDiscards";
+        }
+
+        leaf out-errors {
+          type yang:counter32;
+          status deprecated;
+          description
+            "For packet-oriented interfaces, the number of outbound
+             packets that could not be transmitted because of errors.
+             For character-oriented or fixed-length interfaces, the
+             number of outbound transmission units that could not be
+             transmitted because of errors.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifOutErrors";
+        }
+      }
+    }
+  }
+}
diff --git a/example/ietf-ip@2014-06-16.yang b/yang/standard/ietf-ip@2014-06-16.yang
similarity index 100%
rename from example/ietf-ip@2014-06-16.yang
rename to yang/standard/ietf-ip@2014-06-16.yang
diff --git a/yang/ietf-netconf-acm@2018-02-14.yang b/yang/standard/ietf-netconf-acm@2018-02-14.yang
similarity index 100%
rename from yang/ietf-netconf-acm@2018-02-14.yang
rename to yang/standard/ietf-netconf-acm@2018-02-14.yang
diff --git a/yang/ietf-netconf-monitoring@2010-10-04.yang b/yang/standard/ietf-netconf-monitoring@2010-10-04.yang
similarity index 100%
rename from yang/ietf-netconf-monitoring@2010-10-04.yang
rename to yang/standard/ietf-netconf-monitoring@2010-10-04.yang
diff --git a/yang/ietf-netconf@2011-06-01.yang b/yang/standard/ietf-netconf@2011-06-01.yang
similarity index 100%
rename from yang/ietf-netconf@2011-06-01.yang
rename to yang/standard/ietf-netconf@2011-06-01.yang
diff --git a/yang/ietf-restconf-monitoring@2017-01-26.yang b/yang/standard/ietf-restconf-monitoring@2017-01-26.yang
similarity index 100%
rename from yang/ietf-restconf-monitoring@2017-01-26.yang
rename to yang/standard/ietf-restconf-monitoring@2017-01-26.yang
diff --git a/yang/standard/ietf-routing@2018-03-13.yang b/yang/standard/ietf-routing@2018-03-13.yang
new file mode 100644
index 00000000..9e259f0e
--- /dev/null
+++ b/yang/standard/ietf-routing@2018-03-13.yang
@@ -0,0 +1,684 @@
+module ietf-routing {
+  yang-version "1.1";
+  namespace "urn:ietf:params:xml:ns:yang:ietf-routing";
+  prefix "rt";
+
+  import ietf-yang-types {
+    prefix "yang";
+  }
+
+  import ietf-interfaces {
+    prefix "if";
+    description
+      "An 'ietf-interfaces' module version that is compatible with
+       the Network Management Datastore Architecture (NMDA)
+       is required.";
+  }
+
+  organization
+    "IETF NETMOD (Network Modeling) Working Group";
+  contact
+    "WG Web:   <https://datatracker.ietf.org/wg/netmod/>
+     WG List:  <mailto:rtgwg@ietf.org>
+
+     Editor:   Ladislav Lhotka
+               <mailto:lhotka@nic.cz>
+               Acee Lindem
+               <mailto:acee@cisco.com>
+               Yingzhen Qu
+               <mailto:yingzhen.qu@huawei.com>";
+
+  description
+    "This YANG module defines essential components for the management
+     of a routing subsystem.  The model fully conforms to the Network
+     Management Datastore Architecture (NMDA).
+
+     Copyright (c) 2018 IETF Trust and the persons
+     identified as authors of the code.  All rights reserved.
+
+     Redistribution and use in source and binary forms, with or
+     without modification, is permitted pursuant to, and subject
+     to the license terms contained in, the Simplified BSD License
+     set forth in Section 4.c of the IETF Trust's Legal Provisions
+     Relating to IETF Documents
+     (https://trustee.ietf.org/license-info).
+     This version of this YANG module is part of RFC 8349; see
+     the RFC itself for full legal notices.";
+
+  revision 2018-03-13 {
+    description
+      "Network Management Datastore Architecture (NMDA) revision.";
+    reference
+      "RFC 8349: A YANG Data Model for Routing Management
+                 (NMDA Version)";
+  }
+
+  revision 2016-11-04 {
+       description
+         "Initial revision.";
+       reference
+         "RFC 8022: A YANG Data Model for Routing Management";
+  }
+
+  /* Features */
+  feature multiple-ribs {
+    description
+      "This feature indicates that the server supports
+       user-defined RIBs.
+
+       Servers that do not advertise this feature SHOULD provide
+       exactly one system-controlled RIB per supported address family
+       and also make it the default RIB.  This RIB then appears as an
+       entry in the list '/routing/ribs/rib'.";
+  }
+
+  feature router-id {
+    description
+      "This feature indicates that the server supports an explicit
+       32-bit router ID that is used by some routing protocols.
+
+       Servers that do not advertise this feature set a router ID
+       algorithmically, usually to one of the configured IPv4
+       addresses.  However, this algorithm is implementation
+       specific.";
+  }
+
+  /* Identities */
+
+  identity address-family {
+    description
+      "Base identity from which identities describing address
+       families are derived.";
+  }
+  identity ipv4 {
+    base address-family;
+    description
+      "This identity represents an IPv4 address family.";
+  }
+
+  identity ipv6 {
+    base address-family;
+    description
+      "This identity represents an IPv6 address family.";
+  }
+
+  identity control-plane-protocol {
+    description
+      "Base identity from which control-plane protocol identities are
+       derived.";
+  }
+
+  identity routing-protocol {
+    base control-plane-protocol;
+    description
+      "Identity from which Layer 3 routing protocol identities are
+       derived.";
+  }
+
+  identity direct {
+    base routing-protocol;
+    description
+      "Routing pseudo-protocol that provides routes to directly
+       connected networks.";
+  }
+
+  identity static {
+    base routing-protocol;
+    description
+      "'Static' routing pseudo-protocol.";
+  }
+
+  /* Type Definitions */
+
+  typedef route-preference {
+    type uint32;
+    description
+      "This type is used for route preferences.";
+  }
+
+  /* Groupings */
+
+  grouping address-family {
+    description
+      "This grouping provides a leaf identifying an address
+       family.";
+    leaf address-family {
+      type identityref {
+        base address-family;
+      }
+      mandatory true;
+      description
+        "Address family.";
+    }
+  }
+
+  grouping router-id {
+    description
+      "This grouping provides a router ID.";
+    leaf router-id {
+      type yang:dotted-quad;
+      description
+        "A 32-bit number in the form of a dotted quad that is used by
+         some routing protocols identifying a router.";
+      reference
+        "RFC 2328: OSPF Version 2";
+    }
+  }
+
+  grouping special-next-hop {
+    description
+      "This grouping provides a leaf with an enumeration of special
+       next hops.";
+    leaf special-next-hop {
+      type enumeration {
+        enum blackhole {
+          description
+            "Silently discard the packet.";
+        }
+        enum unreachable {
+          description
+            "Discard the packet and notify the sender with an error
+             message indicating that the destination host is
+             unreachable.";
+        }
+        enum prohibit {
+          description
+            "Discard the packet and notify the sender with an error
+             message indicating that the communication is
+             administratively prohibited.";
+        }
+        enum receive {
+          description
+            "The packet will be received by the local system.";
+        }
+      }
+      description
+        "Options for special next hops.";
+    }
+  }
+
+  grouping next-hop-content {
+    description
+      "Generic parameters of next hops in static routes.";
+    choice next-hop-options {
+      mandatory true;
+      description
+        "Options for next hops in static routes.
+
+         It is expected that further cases will be added through
+         augments from other modules.";
+      case simple-next-hop {
+        description
+          "This case represents a simple next hop consisting of the
+           next-hop address and/or outgoing interface.
+
+           Modules for address families MUST augment this case with a
+           leaf containing a next-hop address of that address
+           family.";
+        leaf outgoing-interface {
+          type if:interface-ref;
+          description
+            "Name of the outgoing interface.";
+        }
+      }
+      case special-next-hop {
+        uses special-next-hop;
+      }
+      case next-hop-list {
+        container next-hop-list {
+          description
+            "Container for multiple next hops.";
+          list next-hop {
+            key "index";
+            description
+              "An entry in a next-hop list.
+
+               Modules for address families MUST augment this list
+               with a leaf containing a next-hop address of that
+               address family.";
+            leaf index {
+              type string;
+              description
+                "A user-specified identifier utilized to uniquely
+                 reference the next-hop entry in the next-hop list.
+                 The value of this index has no semantic meaning
+                 other than for referencing the entry.";
+            }
+            leaf outgoing-interface {
+              type if:interface-ref;
+              description
+                "Name of the outgoing interface.";
+            }
+          }
+        }
+      }
+    }
+  }
+
+  grouping next-hop-state-content {
+    description
+      "Generic state parameters of next hops.";
+    choice next-hop-options {
+      mandatory true;
+      description
+        "Options for next hops.
+
+         It is expected that further cases will be added through
+         augments from other modules, e.g., for recursive
+         next hops.";
+      case simple-next-hop {
+        description
+          "This case represents a simple next hop consisting of the
+           next-hop address and/or outgoing interface.
+
+           Modules for address families MUST augment this case with a
+           leaf containing a next-hop address of that address
+           family.";
+        leaf outgoing-interface {
+          type if:interface-ref;
+          description
+            "Name of the outgoing interface.";
+        }
+      }
+      case special-next-hop {
+        uses special-next-hop;
+      }
+      case next-hop-list {
+        container next-hop-list {
+          description
+            "Container for multiple next hops.";
+          list next-hop {
+            description
+              "An entry in a next-hop list.
+
+               Modules for address families MUST augment this list
+               with a leaf containing a next-hop address of that
+               address family.";
+            leaf outgoing-interface {
+              type if:interface-ref;
+              description
+                "Name of the outgoing interface.";
+            }
+          }
+        }
+      }
+    }
+  }
+
+  grouping route-metadata {
+    description
+      "Common route metadata.";
+    leaf source-protocol {
+      type identityref {
+        base routing-protocol;
+      }
+      mandatory true;
+      description
+        "Type of the routing protocol from which the route
+         originated.";
+    }
+    leaf active {
+      type empty;
+      description
+        "The presence of this leaf indicates that the route is
+         preferred among all routes in the same RIB that have the
+         same destination prefix.";
+    }
+    leaf last-updated {
+      type yang:date-and-time;
+      description
+        "Timestamp of the last modification of the route.  If the
+         route was never modified, it is the time when the route was
+         inserted into the RIB.";
+    }
+  }
+
+  /* Data nodes */
+
+  container routing {
+    description
+      "Configuration parameters for the routing subsystem.";
+    uses router-id {
+      if-feature "router-id";
+      description
+        "Support for the global router ID.  Routing protocols
+         that use a router ID can use this parameter or override it
+         with another value.";
+    }
+    container interfaces {
+      config false;
+      description
+        "Network-layer interfaces used for routing.";
+      leaf-list interface {
+        type if:interface-ref;
+        description
+          "Each entry is a reference to the name of a configured
+           network-layer interface.";
+      }
+    }
+    container control-plane-protocols {
+      description
+        "Support for control-plane protocol instances.";
+      list control-plane-protocol {
+        key "type name";
+        description
+          "Each entry contains a control-plane protocol instance.";
+        leaf type {
+          type identityref {
+            base control-plane-protocol;
+          }
+          description
+            "Type of the control-plane protocol -- an identity
+             derived from the 'control-plane-protocol'
+             base identity.";
+        }
+        leaf name {
+          type string;
+          description
+            "An arbitrary name of the control-plane protocol
+             instance.";
+        }
+        leaf description {
+          type string;
+          description
+            "Textual description of the control-plane protocol
+             instance.";
+        }
+        container static-routes {
+          when "derived-from-or-self(../type, 'rt:static')" {
+            description
+              "This container is only valid for the 'static' routing
+               protocol.";
+          }
+          description
+            "Support for the 'static' pseudo-protocol.
+
+             Address-family-specific modules augment this node with
+             their lists of routes.";
+        }
+      }
+    }
+    container ribs {
+      description
+        "Support for RIBs.";
+      list rib {
+        key "name";
+        description
+          "Each entry contains a configuration for a RIB identified
+           by the 'name' key.
+
+           Entries having the same key as a system-controlled entry
+           in the list '/routing/ribs/rib' are used for
+           configuring parameters of that entry.  Other entries
+           define additional user-controlled RIBs.";
+        leaf name {
+          type string;
+          description
+            "The name of the RIB.
+
+             For system-controlled entries, the value of this leaf
+             must be the same as the name of the corresponding entry
+             in the operational state.
+
+             For user-controlled entries, an arbitrary name can be
+             used.";
+        }
+        uses address-family {
+          description
+            "The address family of the system-controlled RIB.";
+        }
+
+        leaf default-rib {
+          if-feature "multiple-ribs";
+          type boolean;
+          default "true";
+          config false;
+          description
+            "This flag has the value of 'true' if and only if the RIB
+             is the default RIB for the given address family.
+
+             By default, control-plane protocols place their routes
+             in the default RIBs.";
+        }
+        container routes {
+          config false;
+          description
+            "Current contents of the RIB.";
+          list route {
+            description
+              "A RIB route entry.  This data node MUST be augmented
+               with information specific to routes of each address
+               family.";
+            leaf route-preference {
+              type route-preference;
+              description
+                "This route attribute, also known as 'administrative
+                 distance', allows for selecting the preferred route
+                 among routes with the same destination prefix.  A
+                 smaller value indicates a route that is
+                 more preferred.";
+            }
+            container next-hop {
+              description
+                "Route's next-hop attribute.";
+              uses next-hop-state-content;
+            }
+            uses route-metadata;
+          }
+        }
+        action active-route {
+          description
+            "Return the active RIB route that is used for the
+             destination address.
+
+             Address-family-specific modules MUST augment input
+             parameters with a leaf named 'destination-address'.";
+          output {
+            container route {
+              description
+                "The active RIB route for the specified destination.
+
+                 If no route exists in the RIB for the destination
+                 address, no output is returned.
+
+                 Address-family-specific modules MUST augment this
+                 container with appropriate route contents.";
+              container next-hop {
+                description
+                  "Route's next-hop attribute.";
+                uses next-hop-state-content;
+              }
+              uses route-metadata;
+            }
+          }
+        }
+        leaf description {
+          type string;
+          description
+            "Textual description of the RIB.";
+        }
+      }
+    }
+  }
+
+  /*
+   * The subsequent data nodes are obviated and obsoleted
+   * by the Network Management Datastore Architecture
+   * as described in RFC 8342.
+   */
+  container routing-state {
+    config false;
+    status obsolete;
+    description
+      "State data of the routing subsystem.";
+    uses router-id {
+      status obsolete;
+      description
+        "Global router ID.
+
+         It may be either configured or assigned algorithmically by
+         the implementation.";
+    }
+    container interfaces {
+      status obsolete;
+      description
+        "Network-layer interfaces used for routing.";
+      leaf-list interface {
+        type if:interface-state-ref;
+        status obsolete;
+        description
+          "Each entry is a reference to the name of a configured
+           network-layer interface.";
+      }
+    }
+    container control-plane-protocols {
+      status obsolete;
+      description
+        "Container for the list of routing protocol instances.";
+      list control-plane-protocol {
+        key "type name";
+        status obsolete;
+        description
+          "State data of a control-plane protocol instance.
+
+           An implementation MUST provide exactly one
+           system-controlled instance of the 'direct'
+           pseudo-protocol.  Instances of other control-plane
+           protocols MAY be created by configuration.";
+        leaf type {
+          type identityref {
+            base control-plane-protocol;
+          }
+          status obsolete;
+          description
+            "Type of the control-plane protocol.";
+        }
+        leaf name {
+          type string;
+          status obsolete;
+          description
+            "The name of the control-plane protocol instance.
+
+             For system-controlled instances, this name is
+             persistent, i.e., it SHOULD NOT change across
+             reboots.";
+        }
+      }
+    }
+    container ribs {
+      status obsolete;
+      description
+        "Container for RIBs.";
+      list rib {
+        key "name";
+        min-elements 1;
+        status obsolete;
+        description
+          "Each entry represents a RIB identified by the 'name'
+           key.  All routes in a RIB MUST belong to the same address
+           family.
+
+           An implementation SHOULD provide one system-controlled
+           default RIB for each supported address family.";
+        leaf name {
+          type string;
+          status obsolete;
+          description
+            "The name of the RIB.";
+        }
+        uses address-family {
+          status obsolete;
+          description
+            "The address family of the RIB.";
+        }
+        leaf default-rib {
+          if-feature "multiple-ribs";
+          type boolean;
+          default "true";
+          status obsolete;
+          description
+            "This flag has the value of 'true' if and only if the
+             RIB is the default RIB for the given address family.
+
+             By default, control-plane protocols place their routes
+             in the default RIBs.";
+        }
+        container routes {
+          status obsolete;
+          description
+            "Current contents of the RIB.";
+          list route {
+            status obsolete;
+            description
+              "A RIB route entry.  This data node MUST be augmented
+               with information specific to routes of each address
+               family.";
+            leaf route-preference {
+              type route-preference;
+              status obsolete;
+              description
+                "This route attribute, also known as 'administrative
+                 distance', allows for selecting the preferred route
+                 among routes with the same destination prefix.  A
+                 smaller value indicates a route that is
+                 more preferred.";
+            }
+            container next-hop {
+              status obsolete;
+              description
+                "Route's next-hop attribute.";
+              uses next-hop-state-content {
+                status obsolete;
+                description
+                  "Route's next-hop attribute operational state.";
+              }
+            }
+            uses route-metadata {
+              status obsolete;
+              description
+                "Route metadata.";
+            }
+          }
+        }
+        action active-route {
+          status obsolete;
+          description
+            "Return the active RIB route that is used for the
+             destination address.
+
+             Address-family-specific modules MUST augment input
+             parameters with a leaf named 'destination-address'.";
+          output {
+            container route {
+              status obsolete;
+              description
+                "The active RIB route for the specified
+                 destination.
+
+                 If no route exists in the RIB for the destination
+                 address, no output is returned.
+
+                 Address-family-specific modules MUST augment this
+                 container with appropriate route contents.";
+              container next-hop {
+                status obsolete;
+                description
+                  "Route's next-hop attribute.";
+                uses next-hop-state-content {
+                  status obsolete;
+                  description
+                    "Active route state data.";
+                }
+              }
+              uses route-metadata {
+                status obsolete;
+                description
+                  "Active route metadata.";
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/yang/ietf-yang-library@2016-06-21.yang b/yang/standard/ietf-yang-library@2016-06-21.yang
similarity index 100%
rename from yang/ietf-yang-library@2016-06-21.yang
rename to yang/standard/ietf-yang-library@2016-06-21.yang
diff --git a/example/ietf-yang-types@2013-07-15.yang b/yang/standard/ietf-yang-types@2013-07-15.yang
similarity index 100%
rename from example/ietf-yang-types@2013-07-15.yang
rename to yang/standard/ietf-yang-types@2013-07-15.yang

From 795240368e46e485e6db5680e136fb528afe6eb5 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sun, 13 Jan 2019 23:22:25 +0100
Subject: [PATCH 33/72] improved previous Changelog

---
 CHANGELOG.md | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a2802e3..42c81c43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -83,10 +83,12 @@
   * Example user changed adm1 to andy to comply with RFC8341 example
 	
 ### API changes on existing features (you may need to change your code)
-* Moved and updated all standard ietf and iana yang files from example and yang/ to `yang/standard`.
-  * To turn off install of standard yang file: `./configure --disable-stdyangs`
-  * This is to make it easier to use standard IETF/IANA yang files
-* Renamed example yang from example.yang -> clixon-example.yang
+* Rearranged yang files
+  * Moved and updated all standard ietf and iana yang files from example and yang/ to `yang/standard`.
+  * Moved clixon yang files from yang to `yang/clixon`
+  * New configure option to disable standard yang files: `./configure --disable-stdyangs`
+    * This is to make it easier to use standard IETF/IANA yang files in separate directory
+  * Renamed example yang from example.yang -> clixon-example.yang
 * clixon_cli -p (printspec) changed semantics to add new yang path dir (see minor changes).
 * Date-and-time type now properly uses ISO 8601 UTC timezone designators.
   * Eg 2008-09-21T18:57:21.003456 is changed to 2008-09-21T18:57:21.003456Z

From 15cb2385d437795bb3efac29a95ca54131bb793b Mon Sep 17 00:00:00 2001
From: Jon Loeliger <jdl@netgate.com>
Date: Mon, 14 Jan 2019 13:32:16 -0600
Subject: [PATCH 34/72] JSON: Fix JSON formatting in the presence of
 namespaces.

- Fix array_eval() to allow sequential nodes that do not have
  namepace nodes set as well as those that do.

- Fix comma placement in an array list where it was being dropped
  between penultimate and last array elements.

Signed-off-by: Jon Loeliger <jdl@netgate.com>
---
 lib/src/clixon_json.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/lib/src/clixon_json.c b/lib/src/clixon_json.c
index f6f8ff23..785c47b4 100644
--- a/lib/src/clixon_json.c
+++ b/lib/src/clixon_json.c
@@ -189,16 +189,18 @@ array_eval(cxobj *xprev,
     if (xnext && 
 	xml_type(xnext)==CX_ELMNT &&
 	strcmp(xml_name(x),xml_name(xnext))==0){
-        ns2 = xml_find_type_value(xnext, NULL, "xmlns", CX_ATTR);
-	if (nsx && ns2 && strcmp(nsx,ns2)==0)
-	    eqnext++;
+	    ns2 = xml_find_type_value(xnext, NULL, "xmlns", CX_ATTR);
+	    if ((!nsx && !ns2)
+		|| (nsx && ns2 && strcmp(nsx,ns2)==0))
+		    eqnext++;
     }
     if (xprev &&
 	xml_type(xprev)==CX_ELMNT &&
 	strcmp(xml_name(x),xml_name(xprev))==0){
-	ns2 = xml_find_type_value(xprev, NULL, "xmlns", CX_ATTR);
-	if (nsx && ns2 && strcmp(nsx,ns2)==0)
-	    eqprev++;
+	    ns2 = xml_find_type_value(xprev, NULL, "xmlns", CX_ATTR);
+	    if ((!nsx && !ns2)
+		|| (nsx && ns2 && strcmp(nsx,ns2)==0))
+		    eqprev++;
     }
     if (eqprev && eqnext)
 	array = MIDDLE_ARRAY;
@@ -432,6 +434,8 @@ xml2json1_cbuf(cbuf                   *cb,
 	    break;
 	}
 
+    int na = xml_child_nr_notype(x, CX_ATTR);
+    int commas = na - 1;
     for (i=0; i<xml_child_nr(x); i++){
 	xc = xml_child_i(x, i);
 	if (xml_type(xc) == CX_ATTR)
@@ -444,8 +448,10 @@ xml2json1_cbuf(cbuf                   *cb,
 			   xc_arraytype,
 			   level+1, pretty, 0, bodystr0) < 0)
 	    goto done;
-	if (i<xml_child_nr_notype(x, CX_ATTR)-1)
+	if (commas > 0) {
 	    cprintf(cb, ",%s", pretty?"\n":"");
+	    --commas;
+	}
     }
     switch (arraytype){
     case BODY_ARRAY:

From 43b89af7f47755950cbec9a5d06d38fd55730003 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Mon, 14 Jan 2019 21:24:03 +0100
Subject: [PATCH 35/72] formatting

---
 lib/src/clixon_json.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/src/clixon_json.c b/lib/src/clixon_json.c
index 785c47b4..731d90de 100644
--- a/lib/src/clixon_json.c
+++ b/lib/src/clixon_json.c
@@ -189,18 +189,18 @@ array_eval(cxobj *xprev,
     if (xnext && 
 	xml_type(xnext)==CX_ELMNT &&
 	strcmp(xml_name(x),xml_name(xnext))==0){
-	    ns2 = xml_find_type_value(xnext, NULL, "xmlns", CX_ATTR);
-	    if ((!nsx && !ns2)
-		|| (nsx && ns2 && strcmp(nsx,ns2)==0))
-		    eqnext++;
+        ns2 = xml_find_type_value(xnext, NULL, "xmlns", CX_ATTR);
+	if ((!nsx && !ns2)
+	    || (nsx && ns2 && strcmp(nsx,ns2)==0))
+	    eqnext++;
     }
     if (xprev &&
 	xml_type(xprev)==CX_ELMNT &&
 	strcmp(xml_name(x),xml_name(xprev))==0){
-	    ns2 = xml_find_type_value(xprev, NULL, "xmlns", CX_ATTR);
-	    if ((!nsx && !ns2)
-		|| (nsx && ns2 && strcmp(nsx,ns2)==0))
-		    eqprev++;
+	ns2 = xml_find_type_value(xprev, NULL, "xmlns", CX_ATTR);
+	if ((!nsx && !ns2)
+	    || (nsx && ns2 && strcmp(nsx,ns2)==0))
+	    eqprev++;
     }
     if (eqprev && eqnext)
 	array = MIDDLE_ARRAY;

From 03ac48ab2bf48e7897e02e47db7805d3ee402ee3 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Wed, 16 Jan 2019 23:17:07 +0100
Subject: [PATCH 36/72] Removing newlines from XML data
 [https://github.com/clicon/clixon/issues/65]

---
 CHANGELOG.md               |  1 +
 lib/src/clixon_xml.c       |  5 ++++-
 lib/src/clixon_xml_parse.l |  8 ++++++--
 lib/src/clixon_xml_parse.y | 11 +++++++----
 test/test_xml.sh           | 17 ++++++++++++++++-
 util/clixon_util_xml.c     | 12 ++++++++++--
 6 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42c81c43..f190402e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -134,6 +134,7 @@
   * <!DOCTYPE (ie DTD) is not supported.
 
 ### Corrected Bugs
+* Removing newlines from XML data [https://github.com/clicon/clixon/issues/65]
 * [ietf-netconf-notification@2008-07-01.yang validation problem #62](https://github.com/clicon/clixon/issues/62)
 * Ignore CR(\r) in yang files for DOS files
 * Keyword "min" (not only "max") can be used in built-in types "range" and "length" statements.
diff --git a/lib/src/clixon_xml.c b/lib/src/clixon_xml.c
index d4f15a13..17b1845c 100644
--- a/lib/src/clixon_xml.c
+++ b/lib/src/clixon_xml.c
@@ -1483,7 +1483,7 @@ _xml_parse(const char  *str,
 {
     int                       retval = -1;
     struct xml_parse_yacc_arg ya = {0,};
-
+    cxobj                    *x;
     if (strlen(str) == 0)
 	return 0; /* OK */
     if (xt == NULL){
@@ -1501,6 +1501,9 @@ _xml_parse(const char  *str,
 	goto done;    
     if (clixon_xml_parseparse(&ya) != 0)  /* yacc returns 1 on error */
 	goto done;
+    x = NULL;
+    while ((x = xml_find_type(xt, NULL, "body", CX_BODY)) != NULL)
+	xml_purge(x);
     /* Verify namespaces after parsing */
     if (xml_apply0(xt, CX_ELMNT, xml_localname_check, NULL) < 0)
     	goto done;
diff --git a/lib/src/clixon_xml_parse.l b/lib/src/clixon_xml_parse.l
index c0f0a104..12d8fceb 100644
--- a/lib/src/clixon_xml_parse.l
+++ b/lib/src/clixon_xml_parse.l
@@ -105,8 +105,8 @@ ncname     {namestart}{namechar}*
 %%
 
 <START,TEXTDECL>[ \t]   ;
-<START,STATEA,CMNT,TEXTDECL>\n   { _YA->ya_linenum++; }
-<START,STATEA,CMNT,TEXTDECL>\r
+<START,CMNT,TEXTDECL>\n   { _YA->ya_linenum++; }
+<START,CMNT,TEXTDECL>\r
 
 <START>{ncname}        { clixon_xml_parselval.string = strdup(yytext);
                             return NAME; /* rather be catch-all */
@@ -133,6 +133,10 @@ ncname     {namestart}{namechar}*
 <STATEA>"<?"          { BEGIN(PIDECL); return BQMARK; }
 <STATEA>\<            { BEGIN(START); return *clixon_xml_parsetext; }
 <STATEA>&             { _YA->ya_lex_state =STATEA;BEGIN(AMPERSAND);}
+<STATEA>[ \t]         { clixon_xml_parselval.string = yytext;return WHITESPACE; }
+<STATEA>\r\n          { clixon_xml_parselval.string = "\n";return WHITESPACE; }
+<STATEA>\r            { clixon_xml_parselval.string = "\n";return WHITESPACE; }
+<STATEA>\n            { clixon_xml_parselval.string = yytext; _YA->ya_linenum++;return WHITESPACE; }
 <STATEA>.             { clixon_xml_parselval.string = yytext; return CHARDATA; }
 
 	/* @see xml_chardata_encode */
diff --git a/lib/src/clixon_xml_parse.y b/lib/src/clixon_xml_parse.y
index 9e2eafaa..f9f26126 100644
--- a/lib/src/clixon_xml_parse.y
+++ b/lib/src/clixon_xml_parse.y
@@ -41,7 +41,7 @@
 
 %start document
 
-%token <string> NAME CHARDATA STRING
+%token <string> NAME CHARDATA WHITESPACE STRING
 %token MY_EOF
 %token VER ENC SD
 %token BSLASH ESLASH
@@ -357,12 +357,13 @@ prolog      : xmldcl misclist
             ;
 
 misclist    : misclist misc { clicon_debug(2, "misclist->misclist misc"); }
-            |      { clicon_debug(2, "misclist->"); }
+            |     { clicon_debug(2, "misclist->"); }
             ;
 
 /* [27]	Misc ::=  Comment | PI | S */
-misc        : comment { clicon_debug(2, "misc->comment"); }
-	    | pi      { clicon_debug(2, "misc->pi"); }
+misc        : comment    { clicon_debug(2, "misc->comment"); }
+	    | pi         { clicon_debug(2, "misc->pi"); }
+            | WHITESPACE { clicon_debug(2, "misc->white space"); }
 	    ;
 
 xmldcl      : BXMLDCL verinfo encodingdecl sddecl EQMARK
@@ -424,6 +425,8 @@ content     : element      { clicon_debug(2, "content -> element"); }
             | pi           { clicon_debug(2, "content -> pi"); }
             | CHARDATA     { if (xml_parse_content(_YA, $1) < 0) YYABORT;  
                              clicon_debug(2, "content -> CHARDATA %s", $1); }
+            | WHITESPACE   { if (xml_parse_content(_YA, $1) < 0) YYABORT;  
+                             clicon_debug(2, "content -> WHITESPACE %s", $1); }
             |              { clicon_debug(2, "content -> "); }
             ;
 
diff --git a/test/test_xml.sh b/test/test_xml.sh
index 6416e29f..170c4d92 100755
--- a/test/test_xml.sh
+++ b/test/test_xml.sh
@@ -3,14 +3,20 @@
 #  @see https://www.w3.org/TR/2008/REC-xml-20081126
 #       https://www.w3.org/TR/2009/REC-xml-names-20091208
 #PROG="valgrind --leak-check=full --show-leak-kinds=all ../util/clixon_util_xml"
-PROG=../util/clixon_util_xml
+
 
 # include err() and new() functions and creates $dir
 . ./lib.sh
 
+
+PROG="../util/clixon_util_xml -D $DBG"
+
 new "xml parse"
 expecteof "$PROG" 0 "<a><b/></a>" "^<a><b/></a>$"
 
+new "xml parse to json"
+expecteof "$PROG -j" 0 "<a><b/></a>" '^{"a": {"b": null}}$'
+
 new "xml parse strange names"
 expecteof "$PROG" 0 "<_-><b0.><c-.-._/></b0.></_->" "^<_-><b0.><c-.-._/></b0.></_->$"
 
@@ -23,6 +29,14 @@ expecteof "$PROG" 255 "<9/>" ""
 new "xml parse name errors"
 expecteof "$PROG" 255 "<a%/>" ""
 
+LF='
+'
+new "xml parse content with CR LF -> LF, CR->LF (see https://www.w3.org/TR/REC-xml/#sec-line-ends)"
+ret=$(echo "<x>a
b${LF}c
${LF}d</x>" | $PROG)
+if [ "$ret" != "<x>a${LF}b${LF}c${LF}d</x>" ]; then
+     err '<x>a$LFb$LFc</x>' "$ret"
+fi
+
 XML=$(cat <<EOF
 <a><description>An example of escaped CENDs</description>
 <sometext>
@@ -38,6 +52,7 @@ XML=$(cat <<EOF
 </a>
 EOF
 )
+
 new "xml CDATA"
 expecteof "$PROG" 0 "$XML" "^<a><description>An example of escaped CENDs</description><sometext>
 <![CDATA[ They're saying \"x < y\" & that \"z > y\" so I guess that means that z > x ]]>
diff --git a/util/clixon_util_xml.c b/util/clixon_util_xml.c
index 8b3e3fa6..c21091c4 100644
--- a/util/clixon_util_xml.c
+++ b/util/clixon_util_xml.c
@@ -72,6 +72,7 @@ usage(char *argv0)
 	    "where options are\n"
             "\t-h \t\tHelp\n"
     	    "\t-D <level> \tDebug\n"
+	    "\t-j \tOutput as JSON\n"
 	    "\t-l <s|e|o> \tLog on (s)yslog, std(e)rr, std(o)ut (stderr is default)\n",
 	    argv0);
     exit(0);
@@ -87,10 +88,11 @@ main(int    argc,
     int   retval = -1;
     int   c;
     int   logdst = CLICON_LOG_STDERR;
+    int   json = 0;
 
     optind = 1;
     opterr = 0;
-    while ((c = getopt(argc, argv, "hD:l:")) != -1)
+    while ((c = getopt(argc, argv, "hD:jl:")) != -1)
 	switch (c) {
 	case 'h':
 	    usage(argv[0]);
@@ -99,6 +101,9 @@ main(int    argc,
 	    if (sscanf(optarg, "%d", &debug) != 1)
 		usage(argv[0]);
 	    break;
+	case 'j':
+	    json++;
+	    break;
 	case 'l': /* Log destination: s|e|o|f */
 	    if ((logdst = clicon_log_opt(optarg[0])) < 0)
 		usage(argv[0]);
@@ -114,7 +119,10 @@ main(int    argc,
     }
     xc = NULL;
     while ((xc = xml_child_each(xt, xc, -1)) != NULL) 
-	clicon_xml2cbuf(cb, xc, 0, 0); /* print xml */
+	if (json)
+	    xml2json_cbuf(cb, xc, 0); /* print xml */
+	else
+	    clicon_xml2cbuf(cb, xc, 0, 0); /* print xml */
     fprintf(stdout, "%s", cbuf_get(cb));
     fflush(stdout);
 #if 0

From 66f80e9304d98879464349179797b9eda9a55495 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Thu, 17 Jan 2019 16:13:34 +0100
Subject: [PATCH 37/72] * xsd regular expression support for character classes
 [https://github.com/clicon/clixon/issues/68]   * added support for \c, \d,
 \w, \W, \s, \S

---
 CHANGELOG.md            |  2 ++
 lib/src/clixon_string.c | 65 +++++++++++++++++++++++++++++------------
 test/test_type.sh       | 35 ++++++++++++++++++++++
 3 files changed, 83 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f190402e..124fd3a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -134,6 +134,8 @@
   * <!DOCTYPE (ie DTD) is not supported.
 
 ### Corrected Bugs
+* xsd regular expression support for character classes [https://github.com/clicon/clixon/issues/68]
+  * added support for \c, \d, \w, \W, \s, \S.
 * Removing newlines from XML data [https://github.com/clicon/clixon/issues/65]
 * [ietf-netconf-notification@2008-07-01.yang validation problem #62](https://github.com/clicon/clixon/issues/62)
 * Ignore CR(\r) in yang files for DOS files
diff --git a/lib/src/clixon_string.c b/lib/src/clixon_string.c
index f0dc1c24..29e71a91 100644
--- a/lib/src/clixon_string.c
+++ b/lib/src/clixon_string.c
@@ -641,41 +641,68 @@ clixon_trim(char *str)
  * POSIX ERE regexps according to man regex(3).
  * @param[in]  xsd    Input regex string according XSD
  * @param[out] posix  Output (malloced) string according to POSIX ERE
- * @see http://www.w3.org/TR/2004/REC-xmlschema-2-20041028
- * @note that the translation is ad-hoc, may need more translations
+ * @see https://www.w3.org/TR/2004/REC-xmlschema-2-20041028/#regexs
+ * @see https://www.regular-expressions.info/posixbrackets.html#class translation
+ * Translation is not complete but covers some character sequences:
+ * \d decimal digit
+ * \w alphanum + underscore
  */
 int
 regexp_xsd2posix(char  *xsd,
 		 char **posix)
 {
     int   retval = -1;
-    char *x;
-    char *p = NULL;
+    cbuf *cb = NULL;
+    char  x;
     int   i;
-    int   len;
+    int   esc;
 
-    len = strlen(xsd);
-    x = xsd;
-    while ((x = strstr(x, "\\d")) != NULL){
-	len += 3; /* \d --> [0-9] */
-	x += 2;
-    }
-    if ((p = malloc(len+1)) == NULL){
-	clicon_err(OE_UNIX, errno, "malloc");
+    if ((cb = cbuf_new()) == NULL){
+	clicon_err(OE_UNIX, errno, "cbuf_new");
 	goto done;
     }
-    memset(p, 0, len+1);
-    *posix = p;
+    esc=0;
     for (i=0; i<strlen(xsd); i++){
-	if (strncmp(&xsd[i], "\\d", 2) == 0){
-	    strcpy(p, "[0-9]");
-	    p += 5; i++;
+	x = xsd[i];
+	if (esc){
+	    esc = 0;
+	    switch (x){
+	    case 'c': /* xml namechar */
+		cprintf(cb, "[0-9a-zA-Z\\\\.\\\\-_:]");
+		break;
+	    case 'd':
+		cprintf(cb, "[0-9]");
+		break;
+	    case 'w':
+		cprintf(cb, "[0-9a-zA-Z_\\\\-]");
+		break;
+	    case 'W':
+		cprintf(cb, "[^0-9a-zA-Z_\\\\-]");
+		break;
+	    case 's':
+		cprintf(cb, "[ \t\r\n]");
+		break;
+	    case 'S':
+		cprintf(cb, "[^ \t\r\n]");
+		break;
+	    default:
+		cprintf(cb, "\\%c", x);
+		break;
+	    }
 	}
+	else if (x == '\\')
+	    esc++;
 	else
-	    *p++ = xsd[i];
+	    cprintf(cb, "%c", x);
+    }
+    if ((*posix = strdup(cbuf_get(cb))) == NULL){
+	clicon_err(OE_UNIX, errno, "strdup");
+	goto done;
     }
     retval = 0;
  done:
+    if (cb)
+	cbuf_free(cb);
     return retval;
 }
 
diff --git a/test/test_type.sh b/test/test_type.sh
index 3ac7e157..4f887a55 100755
--- a/test/test_type.sh
+++ b/test/test_type.sh
@@ -180,6 +180,16 @@ module example{
     description "transitive type- exists in ex3";
     uses ex2:gr2;
   }
+  leaf digit4{
+     type string {
+         pattern '\d{4}';
+       }
+  }
+  leaf word4{
+     type string {
+         pattern '\w{4}';
+       }
+  }
 }
 EOF
 
@@ -358,6 +368,31 @@ expectfn "$clixon_cli -1f $cfg -l o -y $fyang set len2 ab" 255 "^$"
 new "cli range test len3 42 ok"
 expectfn "$clixon_cli -1f $cfg -l o -y $fyang set len3 hsakjdhkjsahdkjsahdksahdksajdhsakjhd" 0 "^$"
 
+# XSD schema -> POSIX ECE translation
+new "cli yang pattern \d ok"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set digit4 0123" 0 "^$"
+
+new "cli yang pattern \d error"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set digit4 01b2" 255 "^$"
+
+new "cli yang pattern \w ok"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set word4 a2-_" 0 "^$"
+
+new "cli yang pattern \w error"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set word4 ab%d3" 255 "^$"
+
+new "netconf pattern \w"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><word4 xmlns="urn:example:clixon">a-_9</word4></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "netconf pattern \w valid"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "netconf pattern \w error"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><word4 xmlns="urn:example:clixon">ab%d3</word4></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "netconf pattern \w valid"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>word4</bad-element></error-info><error-severity>error</error-severity><error-message>regexp match fail: "ab%d3" does not match \\w{4}</error-message></rpc-error></rpc-reply>]]>]]>$'
+
 if [ $BE -eq 0 ]; then
     exit # BE
 fi

From 906b93cae0a5c340fc0385dbaccd4c12831f07d5 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Fri, 18 Jan 2019 20:55:30 +0100
Subject: [PATCH 38/72]  Restconf returns error when RPC generates "ok" reply
 [https://github.com/clicon/clixon/issues/69]

---
 CHANGELOG.md                     |  1 +
 apps/netconf/netconf_rpc.c       |  8 +++++++-
 apps/restconf/restconf_methods.c | 11 +++++++++--
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 124fd3a1..9b2b756a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -134,6 +134,7 @@
   * <!DOCTYPE (ie DTD) is not supported.
 
 ### Corrected Bugs
+* Restconf returns error when RPC generates "ok" reply [https://github.com/clicon/clixon/issues/69]
 * xsd regular expression support for character classes [https://github.com/clicon/clixon/issues/68]
   * added support for \c, \d, \w, \W, \s, \S.
 * Removing newlines from XML data [https://github.com/clicon/clixon/issues/65]
diff --git a/apps/netconf/netconf_rpc.c b/apps/netconf/netconf_rpc.c
index ba41648a..fc034abf 100644
--- a/apps/netconf/netconf_rpc.c
+++ b/apps/netconf/netconf_rpc.c
@@ -614,12 +614,18 @@ netconf_application_rpc(clicon_handle h,
 	else /* Send to backend */
 	    if (clicon_rpc_netconf_xml(h, xml_parent(xn), xret, NULL) < 0)
 		goto done;
-	/* Sanity check of outgoing XML */
+	/* Sanity check of outgoing XML 
+	 * For now, skip outgoing checks.
+	 * (1) Does not handle <ok/> properly
+	 * (2) Uncertain how validation errors should be logged/handled
+	 */
+	if (0)
 	if ((youtput = yang_find((yang_node*)yrpc, Y_OUTPUT, NULL)) != NULL){
 	    xoutput=xpath_first(*xret, "/");
 	    xml_spec_set(xoutput, youtput); /* needed for xml_spec_populate */
 	    if (xml_apply(xoutput, CX_ELMNT, xml_spec_populate, yspec) < 0)
 		goto done;
+
 	    if ((ret = xml_yang_validate_all_top(xoutput, cbret)) < 0)
 		goto done;
 	    if (ret == 0){
diff --git a/apps/restconf/restconf_methods.c b/apps/restconf/restconf_methods.c
index 754592c9..2ab68aee 100644
--- a/apps/restconf/restconf_methods.c
+++ b/apps/restconf/restconf_methods.c
@@ -1390,7 +1390,7 @@ api_operations_post_output(clicon_handle h,
     }
 #endif
     /* Validate output (in case handlers are wrong) */
-    if (youtput==NULL){ 
+    if (youtput==NULL){
 	/* Special case, no yang output
 	 * RFC 7950 7.14.4
 	 * If the RPC operation invocation succeeded and no output parameters
@@ -1428,10 +1428,17 @@ api_operations_post_output(clicon_handle h,
     }
     else{
 	xml_spec_set(xoutput, youtput); /* needed for xml_spec_populate */
+	if (0){
+	/* Sanity check of outgoing XML 
+	 * For now, skip outgoing checks.
+	 * (1) Does not handle <ok/> properly
+	 * (2) Uncertain how validation errors should be logged/handled
+	 */
 	if (xml_apply(xoutput, CX_ELMNT, xml_spec_populate, yspec) < 0)
 	    goto done;
 	if ((ret = xml_yang_validate_all(xoutput, cbret)) < 0)
 	    goto done;
+
 	if (ret == 1 &&
 	    (ret = xml_yang_validate_add(xoutput, cbret)) < 0)
 	    goto done;
@@ -1446,7 +1453,7 @@ api_operations_post_output(clicon_handle h,
 		goto done;
 	    goto fail;
 	}
-    
+	}
 	/* Clear namespace of parameters */
 	x = NULL;
 	while ((x = xml_child_each(xoutput, x, CX_ELMNT)) != NULL) {

From 19f26e6838f455b074d8cb2a22c4d13574198250 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sat, 19 Jan 2019 21:39:19 +0100
Subject: [PATCH 39/72] * XML<>JSON conversion problems
 [https://github.com/clicon/clixon/issues/66]   * CDATA sections stripped from
 XML when converted to JSON

---
 CHANGELOG.md          |  2 ++
 lib/src/clixon_json.c | 78 ++++++++++++++++++++++++++-----------------
 test/lib.sh           | 59 ++++++++++++++++++++++++++++++--
 test/test_xml.sh      | 61 +++++++++++++++++++++++----------
 4 files changed, 149 insertions(+), 51 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b2b756a..088d8a70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -134,6 +134,8 @@
   * <!DOCTYPE (ie DTD) is not supported.
 
 ### Corrected Bugs
+* XML<>JSON conversion problems [https://github.com/clicon/clixon/issues/66]
+  * CDATA sections stripped from XML when converted to JSON
 * Restconf returns error when RPC generates "ok" reply [https://github.com/clicon/clixon/issues/69]
 * xsd regular expression support for character classes [https://github.com/clicon/clixon/issues/68]
   * added support for \c, \d, \w, \W, \s, \S.
diff --git a/lib/src/clixon_json.c b/lib/src/clixon_json.c
index 731d90de..4b412e20 100644
--- a/lib/src/clixon_json.c
+++ b/lib/src/clixon_json.c
@@ -216,42 +216,58 @@ array_eval(cxobj *xprev,
     return array;
 }
 
-/*! Escape a json string
+/*! Escape a json string as well as decode xml cdata
+ * And a
  */
-static char *
-json_str_escape(char *str)
+static int
+json_str_escape_cdata(cbuf *cb,
+		      char *str)
 {
-    int   i, j;
-    char *snew;
+    int   retval = -1;
+    char *snew = NULL;
+    int   i;
+    int   esc = 0; /* cdata escape */
 
-    j = 0;
     for (i=0;i<strlen(str);i++)
 	switch (str[i]){
 	case '\n':
-	case '\"':
-	case '\\':
-	    j++;
-	    break;
-	}
-    if ((snew = malloc(strlen(str)+1+j))==NULL){
-	clicon_err(OE_XML, errno, "malloc");
-	return NULL;
-    }
-    j = 0;
-    for (i=0;i<strlen(str);i++)
-	switch (str[i]){
-	case '\n':
-	    snew[j++]='\\';
-	    snew[j++]='n';
+	    cprintf(cb, "\\n");
 	    break;
 	case '\"':
+	    cprintf(cb, "\\\"");
+	    break;
 	case '\\':
-	    snew[j++]='\\';
+	    cprintf(cb, "\\\\");
+	    break;
+	case '<':
+	    if (!esc &&
+		strncmp(&str[i], "<![CDATA[", strlen("<![CDATA[")) == 0){
+		esc=1;
+		i += strlen("<![CDATA[")-1;
+	    }
+	    else
+		cprintf(cb, "%c", str[i]);
+	    break;
+	case ']':
+	    if (esc &&
+		strncmp(&str[i], "]]>", strlen("]]>")) == 0){
+		esc=0;
+		i += strlen("]]>")-1;
+	    }
+	    else
+		cprintf(cb, "%c", str[i]);
+	    break;
 	default: /* fall thru */
-	    snew[j++]=str[i];
+	    cprintf(cb, "%c", str[i]);
+	    break;
 	}
-    snew[j++]='\0';
-    return snew;
+    if ((snew = strdup(cbuf_get(cb))) ==NULL){
+	clicon_err(OE_XML, errno, "strdup");
+	goto done;
+    }
+    retval = 0;
+ done:
+    return retval;
 }
 
 /*! Do the actual work of translating XML to JSON 
@@ -309,10 +325,10 @@ xml2json1_cbuf(cbuf                   *cb,
     yang_stmt       *ymod; /* yang module */
     yang_spec       *yspec = NULL; /* yang spec */
     int              bodystr0=1;
-    char            *str;
     char            *prefix=NULL;    /* prefix / local namespace name */
     char            *namespace=NULL; /* namespace uri */
     char            *modname=NULL;   /* Module name */
+    int              commas;
 
     /* If x is labelled with a default namespace, it should be translated
      * to a module name. 
@@ -337,10 +353,11 @@ xml2json1_cbuf(cbuf                   *cb,
     switch(arraytype){
     case BODY_ARRAY:{
 	if (bodystr){
-	    if ((str = json_str_escape(xml_value(x))) == NULL)
+	    /* XXX String if right type */
+	    cprintf(cb, "\"");
+	    if (json_str_escape_cdata(cb, xml_value(x)) < 0)
 		goto done;
-	    cprintf(cb, "\"%s\"", str);
-	    free(str);
+	    cprintf(cb, "\"");
 	}
 	else
 	    cprintf(cb, "%s", xml_value(x));
@@ -434,8 +451,7 @@ xml2json1_cbuf(cbuf                   *cb,
 	    break;
 	}
 
-    int na = xml_child_nr_notype(x, CX_ATTR);
-    int commas = na - 1;
+    commas = xml_child_nr_notype(x, CX_ATTR) - 1;
     for (i=0; i<xml_child_nr(x); i++){
 	xc = xml_child_i(x, i);
 	if (xml_type(xc) == CX_ATTR)
diff --git a/test/lib.sh b/test/lib.sh
index c18e76fc..0c0d47dc 100755
--- a/test/lib.sh
+++ b/test/lib.sh
@@ -1,6 +1,14 @@
 #!/bin/bash
 # Define test functions.
 # Create working dir as variable "dir"
+# The functions are somewhat wildgrown, a little too many:
+# - expectfn
+# - expecteq
+# - expecteof
+# - expecteofx
+# - expecteof_file
+# - expectwait
+# - expectmatch
 
 #set -e
 
@@ -160,11 +168,53 @@ expecteq(){
 # - expected command return value (0 if OK)
 # - stdin input
 # - expected stdout outcome
+# Use this if you want regex eg  ^foo$
 expecteof(){
   cmd=$1
   retval=$2
   input=$3
   expect=$4
+# Do while read stuff
+ret=$($cmd<<EOF 
+$input
+EOF
+)
+  r=$? 
+  if [ $r != $retval ]; then
+      echo -e "\e[31m\nError ($r != $retval) in Test$testnr [$testname]:"
+      echo -e "\e[0m:"
+      exit -1
+  fi
+  # If error dont match output strings (why not?)
+#  if [ $r != 0 ]; then
+#      return
+#  fi
+  # Match if both are empty string
+  if [ -z "$ret" -a -z "$expect" ]; then
+      return
+  fi
+  # -E for regexp (eg ^$). -Z for nul character, -x for implicit ^$ -q for quiet
+  # -o only matching
+  # Two variants: -EZo and -Fxq
+  #  match=`echo "$ret" | grep -FZo "$expect"`
+  r=$(echo "$ret" | grep -GZo "$expect")
+  match=$?
+#  echo "r:\"$r\""
+#  echo "ret:\"$ret\""
+#  echo "expect:\"$expect\""
+#  echo "match:\"$match\""
+  if [ $match -ne 0 ]; then
+      err "$expect" "$ret"
+  fi
+}
+
+# Like expecteof but with grep -Fxq instead of -EZq. Ie implicit ^$
+# Use this for fixed all line, ie must match exact.
+expecteofx(){
+  cmd=$1
+  retval=$2
+  input=$3
+  expect=$4
 
 # Do while read stuff
 ret=$($cmd<<EOF 
@@ -185,11 +235,16 @@ EOF
   if [ -z "$ret" -a -z "$expect" ]; then
       return
   fi
-  match=`echo "$ret" | grep -GZo "$expect"`
+  # -E for regexp (eg ^$). -Z for nul character, -x for implicit ^$ -q for quiet
+  # -o only matching
+  # Two variants: -EZo and -Fxq
+  #  match=`echo "$ret" | grep -FZo "$expect"`
+  r=$(echo "$ret" | grep -Fxq "$expect")
+  match=$?
 #  echo "ret:\"$ret\""
 #  echo "expect:\"$expect\""
 #  echo "match:\"$match\""
-  if [ -z "$match" ]; then
+  if [ $match -ne 0 ]; then
       err "$expect" "$ret"
   fi
 }
diff --git a/test/test_xml.sh b/test/test_xml.sh
index 170c4d92..10267443 100755
--- a/test/test_xml.sh
+++ b/test/test_xml.sh
@@ -1,24 +1,22 @@
 #!/bin/bash
-# Test: XML parser tests
+# Test: XML parser tests and JSON translation
 #  @see https://www.w3.org/TR/2008/REC-xml-20081126
 #       https://www.w3.org/TR/2009/REC-xml-names-20091208
 #PROG="valgrind --leak-check=full --show-leak-kinds=all ../util/clixon_util_xml"
 
-
 # include err() and new() functions and creates $dir
 . ./lib.sh
 
-
 PROG="../util/clixon_util_xml -D $DBG"
 
 new "xml parse"
 expecteof "$PROG" 0 "<a><b/></a>" "^<a><b/></a>$"
 
 new "xml parse to json"
-expecteof "$PROG -j" 0 "<a><b/></a>" '^{"a": {"b": null}}$'
+expecteof "$PROG -j" 0 "<a><b/></a>" '{"a": {"b": null}}'
 
 new "xml parse strange names"
-expecteof "$PROG" 0 "<_-><b0.><c-.-._/></b0.></_->" "^<_-><b0.><c-.-._/></b0.></_->$"
+expecteof "$PROG" 0 "<_-><b0.><c-.-._/></b0.></_->" "<_-><b0.><c-.-._/></b0.></_->"
 
 new "xml parse name errors"
 expecteof "$PROG" 255 "<-a/>" ""
@@ -37,11 +35,16 @@ if [ "$ret" != "<x>a${LF}b${LF}c${LF}d</x>" ]; then
      err '<x>a$LFb$LFc</x>' "$ret"
 fi
 
+new "xml simple CDATA"
+expecteofx "$PROG" 0 '<a><![CDATA[a text]]></a>' '<a><![CDATA[a text]]></a>'
+
+new "xml simple CDATA to json"
+expecteofx "$PROG -j" 0 '<a><![CDATA[a text]]></a>' '{"a": "a text"}' 
+
+new "xml complex CDATA"
 XML=$(cat <<EOF
 <a><description>An example of escaped CENDs</description>
-<sometext>
-<![CDATA[ They're saying "x < y" & that "z > y" so I guess that means that z > x ]]>
-</sometext>
+<sometext><![CDATA[ They're saying "x < y" & that "z > y" so I guess that means that z > x ]]></sometext>
 <!-- This text contains a CEND ]]> -->
 <!-- In this first case we put the ]] at the end of the first CDATA block
      and the > in the second CDATA block -->
@@ -53,33 +56,55 @@ XML=$(cat <<EOF
 EOF
 )
 
-new "xml CDATA"
 expecteof "$PROG" 0 "$XML" "^<a><description>An example of escaped CENDs</description><sometext>
 <![CDATA[ They're saying \"x < y\" & that \"z > y\" so I guess that means that z > x ]]>
 </sometext><data><![CDATA[This text contains a CEND ]]]]><![CDATA[>]]></data><alternative><![CDATA[This text contains a CEND ]]]><![CDATA[]>]]></alternative></a>$"
 
+JSON=$(cat <<EOF
+{"a": {"description": "An example of escaped CENDs","sometext": " They're saying \"x < y\" & that \"z > y\" so I guess that means that z > x ","data": "This text contains a CEND ]]>","alternative": "This text contains a CEND ]]>"}}
+EOF
+)       
+new "xml complex CDATA to json"
+expecteofx "$PROG -j" 0 "$XML" "$JSON"
+
 XML=$(cat <<EOF
 <message>Less than: &lt; , greater than: &gt; ampersand: &amp; </message>
 EOF
 )
 new "xml encode <>&"
-expecteof "$PROG" 0 "$XML" "^$XML$"
+expecteof "$PROG" 0 "$XML" "$XML"
+
+new "xml encode <>& to json"
+expecteof "$PROG -j" 0 "$XML" '{"message": "Less than: < , greater than: > ampersand: & "}'
 
 XML=$(cat <<EOF
-<message>To allow attribute values to contain both single and double quotes, the apostrophe or single-quote character ' may be represented as &apos; and the double-quote character as &quot;</message>
+<message>single-quote character ' represented as &apos; and double-quote character as &quot;</message>
 EOF
 )
-new "xml optional encode single and double quote"
-expecteof "$PROG" 0 "$XML" "^<message>To allow attribute values to contain both single and double quotes, the apostrophe or single-quote character ' may be represented as ' and the double-quote character as \"</message>$"
+new "xml single and double quote"
+expecteof "$PROG" 0 "$XML" "<message>single-quote character ' represented as ' and double-quote character as \"</message>"
+
+JSON=$(cat <<EOF
+{"message": "single-quote character ' represented as ' and double-quote character as \""}
+EOF
+)
+new "xml single and double quotes to json"
+expecteofx "$PROG -j" 0 "$XML" "$JSON"
+
+new "xml backspace"
+expecteofx "$PROG" 0 "<a>a\b</a>" "<a>a\b</a>"
+
+new "xml backspace to json"
+expecteofx "$PROG -j" 0 "<a>a\b</a>" '{"a": "a\\b"}'
 
 new "Double quotes for attributes"
-expecteof "$PROG" 0 '<x a="t"/>' '^<x a="t"/>$'
+expecteof "$PROG" 0 '<x a="t"/>' '<x a="t"/>'
 
 new "Single quotes for attributes (returns double quotes but at least parses right)"
-expecteof "$PROG" 0 "<x a='t'/>" '^<x a="t"/>$'
+expecteof "$PROG" 0 "<x a='t'/>" '<x a="t"/>'
 
 new "Mixed quotes"
-expecteof "$PROG" 0 "<x a='t' b=\"q\"/>" '^<x a="t" b="q"/>$'
+expecteof "$PROG" 0 "<x a='t' b=\"q\"/>" '<x a="t" b="q"/>'
 
 new "XMLdecl version"
 expecteof "$PROG" 0 '<?xml version="1.0"?><a/>' '<a/>'
@@ -94,7 +119,7 @@ new "XMLdecl no version"
 expecteof "$PROG" 255 '<?xml ?><a/>' ''
 
 new "XMLdecl misspelled version"
-expecteof "$PROG -l o" 255 '<?xml verion="1.0"?><a/>' 'yntax error: at or before: v'
+expecteof "$PROG -l o" 255 '<?xml verion="1.0"?><a/>' ''
 
 new "XMLdecl version + encoding"
 expecteof "$PROG" 0 '<?xml version="1.0" encoding="UTF-16"?><a/>' '<a/>'
@@ -119,7 +144,7 @@ expecteof "$PROG" 0 '<?foo something ?><a/><?bar more stuff ?><!-- a comment-->'
 #expecteof "$PROG" 255 '<a/><b/>' ''
 
 new "namespace: DefaultAttName"
-expecteof "$PROG" 0 '<x xmlns="n1">hello</x>' '^<x xmlns="n1">hello</x>$'
+expecteof "$PROG" 0 '<x xmlns="n1">hello</x>' '<x xmlns="n1">hello</x>'
 
 new "namespace: PrefixedAttName"
 expecteof "$PROG" 0 '<x xmlns:n2="urn:example:des"><n2:y>hello</n2:y></x>' '^<x xmlns:n2="urn:example:des"><n2:y>hello</n2:y></x>$'

From 34d7f60ca46687669679b1866505ba44061e3800 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sun, 20 Jan 2019 19:13:40 +0100
Subject: [PATCH 40/72] JSON updates

---
 apps/restconf/restconf_methods.c |  1 -
 test/lib.sh                      |  3 +-
 test/test_json.sh                | 15 +++++++---
 test/test_restconf2.sh           | 24 ++++++++++++++++
 util/clixon_util_json.c          | 49 ++++++++++++++++++++++++++------
 util/clixon_util_xml.c           |  6 ++--
 6 files changed, 81 insertions(+), 17 deletions(-)

diff --git a/apps/restconf/restconf_methods.c b/apps/restconf/restconf_methods.c
index 2ab68aee..46708588 100644
--- a/apps/restconf/restconf_methods.c
+++ b/apps/restconf/restconf_methods.c
@@ -311,7 +311,6 @@ api_data_get2(clicon_handle h,
     FCGX_FPrintF(r->out, "\r\n");
     FCGX_FPrintF(r->out, "%s", cbx?cbuf_get(cbx):"");
     FCGX_FPrintF(r->out, "\r\n\r\n");
-    clicon_debug(1, "%s Z", __FUNCTION__);
  ok:
     retval = 0;
  done:
diff --git a/test/lib.sh b/test/lib.sh
index 0c0d47dc..bb28e4ca 100755
--- a/test/lib.sh
+++ b/test/lib.sh
@@ -193,7 +193,8 @@ EOF
   if [ -z "$ret" -a -z "$expect" ]; then
       return
   fi
-  # -E for regexp (eg ^$). -Z for nul character, -x for implicit ^$ -q for quiet
+  # -G for basic regexp (eg ^$). -E for extended regular expression - differs in \
+  # -Z for nul character, -x for implicit ^$ -q for quiet
   # -o only matching
   # Two variants: -EZo and -Fxq
   #  match=`echo "$ret" | grep -FZo "$expect"`
diff --git a/test/test_json.sh b/test/test_json.sh
index b3f9e4d6..c20b3d6b 100755
--- a/test/test_json.sh
+++ b/test/test_json.sh
@@ -1,15 +1,22 @@
 #!/bin/bash
 # Test: JSON parser tests
+# Note that nmbers shouldnot be quoted. See test_restconf2.sh for typed
 #PROG="valgrind --leak-check=full --show-leak-kinds=all ../util/clixon_util_json"
 PROG=../util/clixon_util_json
 
 # include err() and new() functions and creates $dir
 . ./lib.sh
 
-new "json parse"
-expecteof "$PROG" 0 '{"foo": -23}' "^<foo>-23</foo>$"
+new "json parse to xml"
+expecteofx "$PROG" 0 '{"foo": -23}' "<foo>-23</foo>"
 
-new "json parse list"
-expecteof "$PROG" 0 '{"a":[0,1,2,3]}' "^<a>0</a><a>1</a><a>2</a><a>3</a>$"
+new "json parse to json" # should be {"foo": -23}
+expecteofx "$PROG -j" 0 '{"foo": -23}' '{"foo": "-23"}'
+
+new "json parse list xml"
+expecteofx "$PROG" 0 '{"a":[0,1,2,3]}' "<a>0</a><a>1</a><a>2</a><a>3</a>"
+
+new "json parse list json" # should be {"a":[0,1,2,3]}
+expecteofx "$PROG -j" 0 '{"a":[0,1,2,3]}' '{"a": "0"}{"a": "1"}{"a": "2"}{"a": "3"}'
 
 rm -rf $dir
diff --git a/test/test_restconf2.sh b/test/test_restconf2.sh
index 8010563f..31582531 100755
--- a/test/test_restconf2.sh
+++ b/test/test_restconf2.sh
@@ -44,6 +44,23 @@ module example{
          type string;
       }
    }
+   container types{
+     /* A couple of types to test quoting */
+     leaf tint {
+       type int32;
+     }
+     leaf tdec64 {
+       type decimal64{
+         fraction-digits 3;
+       }
+     }
+     leaf tbool {
+       type boolean;
+     }
+     leaf tstr {
+       type string;
+     }
+   }
 }
 EOF
 
@@ -150,6 +167,13 @@ expectfn 'curl -s -X PUT -d {"interface":{"name":"TEST","type":"eth0"}} http://l
 new "restconf PUT change key error"
 expectfn 'curl -is -X PUT -d {"interface":{"name":"ALPHA","type":"eth0"}} http://localhost/restconf/data/example:cont1/interface=TEST' 0 '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "api-path keys do not match data keys"}}}'
 
+#--------------- json type tests
+new "restconf POST type x3"
+expectfn 'curl -s -X POST -d {"example:types":{"tint":42,"tdec64":42.123,"tbool":false,"tstr":"str"}} http://localhost/restconf/data' 0 ''
+
+new "restconf POST type x3"
+expectfn 'curl -s -X GET http://localhost/restconf/data/example:types' 0 '{"example:types": {"tint": 42,"tdec64": 42.123,"tbool": false,"tstr": "str"}}'
+
 new "Kill restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"
 
diff --git a/util/clixon_util_json.c b/util/clixon_util_json.c
index b60e2299..ac60ae20 100644
--- a/util/clixon_util_json.c
+++ b/util/clixon_util_json.c
@@ -70,7 +70,13 @@
 static int
 usage(char *argv0)
 {
-    fprintf(stderr, "usage:%s.\n\tInput on stdin\n", argv0);
+    fprintf(stderr, "usage:%s [options]\n"
+	    "where options are\n"
+            "\t-h \t\tHelp\n"
+    	    "\t-D <level> \tDebug\n"
+	    "\t-j \t\tOutput as JSON\n"
+	    "\t-l <s|e|o> \tLog on (s)yslog, std(e)rr, std(o)ut (stderr is default)\n",
+	    argv0);
     exit(0);
 }
 
@@ -78,25 +84,52 @@ int
 main(int    argc,
      char **argv)
 {
+    int   retval = -1;
     cxobj *xt = NULL;
     cxobj *xc;
     cbuf  *cb = cbuf_new();
+    int   c;
+    int   logdst = CLICON_LOG_STDERR;
+    int   json = 0;
     
-    if (argc != 1){
-	usage(argv[0]);
-	return 0;
-    }
-    clicon_log_init(__FILE__, LOG_INFO, CLICON_LOG_STDERR); 
+    optind = 1;
+    opterr = 0;
+    while ((c = getopt(argc, argv, "hD:jl:")) != -1)
+	switch (c) {
+	case 'h':
+	    usage(argv[0]);
+	    break;
+    	case 'D':
+	    if (sscanf(optarg, "%d", &debug) != 1)
+		usage(argv[0]);
+	    break;
+	case 'j':
+	    json++;
+	    break;
+	case 'l': /* Log destination: s|e|o|f */
+	    if ((logdst = clicon_log_opt(optarg[0])) < 0)
+		usage(argv[0]);
+	    break;
+	default:
+	    usage(argv[0]);
+	    break;
+	}
+    clicon_log_init(__FILE__, debug?LOG_DEBUG:LOG_INFO, logdst);
     if (json_parse_file(0, NULL, &xt) < 0)
 	goto done;
     xc = NULL;
     while ((xc = xml_child_each(xt, xc, -1)) != NULL) 
-	clicon_xml2cbuf(cb, xc, 0, 0); /* print xml */
+	if (json)
+	    xml2json_cbuf(cb, xc, 0); /* print xml */
+	else
+	    clicon_xml2cbuf(cb, xc, 0, 0); /* print xml */
     fprintf(stdout, "%s", cbuf_get(cb));
+    fflush(stdout);
+    retval = 0;
  done:
     if (xt)
 	xml_free(xt);
     if (cb)
 	cbuf_free(cb);
-    return 0;
+    return retval;
 }
diff --git a/util/clixon_util_xml.c b/util/clixon_util_xml.c
index c21091c4..1e7120f0 100644
--- a/util/clixon_util_xml.c
+++ b/util/clixon_util_xml.c
@@ -72,7 +72,7 @@ usage(char *argv0)
 	    "where options are\n"
             "\t-h \t\tHelp\n"
     	    "\t-D <level> \tDebug\n"
-	    "\t-j \tOutput as JSON\n"
+	    "\t-j \t\tOutput as JSON\n"
 	    "\t-l <s|e|o> \tLog on (s)yslog, std(e)rr, std(o)ut (stderr is default)\n",
 	    argv0);
     exit(0);
@@ -82,10 +82,10 @@ int
 main(int    argc,
      char **argv)
 {
+    int   retval = -1;
     cxobj *xt = NULL;
     cxobj *xc;
     cbuf  *cb = cbuf_new();
-    int   retval = -1;
     int   c;
     int   logdst = CLICON_LOG_STDERR;
     int   json = 0;
@@ -112,7 +112,7 @@ main(int    argc,
 	    usage(argv[0]);
 	    break;
 	}
-    clicon_log_init("clixon_util_xml", debug?LOG_DEBUG:LOG_INFO, logdst);
+    clicon_log_init(__FILE__, debug?LOG_DEBUG:LOG_INFO, logdst);
     if (xml_parse_file(0, "</config>", NULL, &xt) < 0){
 	fprintf(stderr, "xml parse error %s\n", clicon_err_reason);
 	goto done;

From 0e09996073c91a471d90277df3758518d22fff99 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Mon, 21 Jan 2019 14:28:44 +0100
Subject: [PATCH 41/72] verify empty body and/or empty yang input/output

---
 apps/restconf/restconf_methods.c       | 108 +++++++++++--------------
 example/clixon-example@2019-01-13.yang |  15 +++-
 example/example_backend.c              |  22 +++--
 test/test_restconf.sh                  |  27 +------
 test/test_rpc.sh                       |  17 +++-
 5 files changed, 91 insertions(+), 98 deletions(-)

diff --git a/apps/restconf/restconf_methods.c b/apps/restconf/restconf_methods.c
index 46708588..84289dd4 100644
--- a/apps/restconf/restconf_methods.c
+++ b/apps/restconf/restconf_methods.c
@@ -1269,9 +1269,8 @@ api_operations_post_input(clicon_handle h,
     xml_name_set(xdata, "data");
     /* Here xdata is: 
      * <data><input xmlns="urn:example:clixon">...</input></data>
-     * Validate that exactly only <input> tag 
      */
-#if 0
+#if 1
     if (debug){
 	cbuf *ccc=cbuf_new();
 	if (clicon_xml2cbuf(ccc, xdata, 0, 0) < 0)
@@ -1279,6 +1278,7 @@ api_operations_post_input(clicon_handle h,
 	clicon_debug(1, "%s DATA:%s", __FUNCTION__, cbuf_get(ccc));
     }
 #endif
+    /* Validate that exactly only <input> tag */
     if ((xinput = xml_child_i_type(xdata, 0, CX_ELMNT)) == NULL ||
 	strcmp(xml_name(xinput),"input") != 0 ||
 	xml_child_nr_type(xdata, CX_ELMNT) != 1){
@@ -1356,8 +1356,9 @@ api_operations_post_output(clicon_handle h,
     cxobj     *x;
     cxobj     *xok;
     cbuf      *cbret = NULL;
-    int        ret;
-
+    int        isempty;
+    
+    //    clicon_debug(1, "%s", __FUNCTION__);
     if ((cbret = cbuf_new()) == NULL){
 	clicon_err(OE_UNIX, 0, "cbuf_new");
 	goto done;
@@ -1380,7 +1381,7 @@ api_operations_post_output(clicon_handle h,
     /* 9. Translate to restconf RPC data */
     xml_name_set(xoutput, "output");
     /* xoutput should now look: <output><x xmlns="uri">0</x></output> */
-#if 0
+#if 1
     if (debug){
 	cbuf *ccc=cbuf_new();
 	if (clicon_xml2cbuf(ccc, xoutput, 0, 0) < 0)
@@ -1388,56 +1389,19 @@ api_operations_post_output(clicon_handle h,
 	clicon_debug(1, "%s XOUTPUT:%s", __FUNCTION__, cbuf_get(ccc));
     }
 #endif
-    /* Validate output (in case handlers are wrong) */
-    if (youtput==NULL){
-	/* Special case, no yang output
-	 * RFC 7950 7.14.4
-	 * If the RPC operation invocation succeeded and no output parameters
-	 * are returned, the <rpc-reply> contains a single <ok/> element
-	 * RFC 8040 3.6.2
-	 * If the "rpc" statement has no "output" section, the response message
-	 * MUST NOT include a message-body and MUST send a "204 No Content"
-	 * status-line instead.
-	 */
-	if ((xok = xml_child_i_type(xoutput, 0, CX_ELMNT)) == NULL ||
-	    strcmp(xml_name(xok),"ok") != 0 ||
-	    xml_child_nr_type(xoutput, CX_ELMNT) != 1){
-	    /* Internal error - invalid output from rpc handler */
-	    if (xok){
-		if (netconf_operation_failed_xml(&xerr, "application",
-					"Internal error: Empty RPC reply is not ok") < 0)
-		    goto done;
-	    }
-	    else
-		if (netconf_operation_failed_xml(&xerr, "application",
-						"Internal error: Empty RPC reply should have OK") < 0)
-		    goto done;
-	    if ((xe = xpath_first(xerr, "rpc-error")) == NULL){
-		clicon_err(OE_XML, EINVAL, "rpc-error not found (internal error)");
-		goto done;
-	    }
-	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
-		goto done;
-	    goto fail;
-	}
-	FCGX_SetExitStatus(204, r->out); /* OK */
-	FCGX_FPrintF(r->out, "Status: 204 No Content\r\n");
-	FCGX_FPrintF(r->out, "\r\n");
-	goto fail;
-    }
-    else{
+
+    /* Sanity check of outgoing XML 
+     * For now, skip outgoing checks.
+     * (1) Does not handle <ok/> properly
+     * (2) Uncertain how validation errors should be logged/handled
+     */
+    if (youtput!=NULL){
 	xml_spec_set(xoutput, youtput); /* needed for xml_spec_populate */
-	if (0){
-	/* Sanity check of outgoing XML 
-	 * For now, skip outgoing checks.
-	 * (1) Does not handle <ok/> properly
-	 * (2) Uncertain how validation errors should be logged/handled
-	 */
+#if 0
 	if (xml_apply(xoutput, CX_ELMNT, xml_spec_populate, yspec) < 0)
 	    goto done;
 	if ((ret = xml_yang_validate_all(xoutput, cbret)) < 0)
 	    goto done;
-
 	if (ret == 1 &&
 	    (ret = xml_yang_validate_add(xoutput, cbret)) < 0)
 	    goto done;
@@ -1452,14 +1416,34 @@ api_operations_post_output(clicon_handle h,
 		goto done;
 	    goto fail;
 	}
-	}
-	/* Clear namespace of parameters */
-	x = NULL;
-	while ((x = xml_child_each(xoutput, x, CX_ELMNT)) != NULL) {
-	    if ((xa = xml_find_type(x, NULL, "xmlns", CX_ATTR)) != NULL)
-		if (xml_purge(xa) < 0)
-		    goto done;
-	}
+#endif
+    }
+    /* Special case, no yang output (single <ok/> - or empty body?)
+     * RFC 7950 7.14.4
+     * If the RPC operation invocation succeeded and no output parameters
+     * are returned, the <rpc-reply> contains a single <ok/> element
+     * RFC 8040 3.6.2
+     * If the "rpc" statement has no "output" section, the response message
+     * MUST NOT include a message-body and MUST send a "204 No Content"
+     * status-line instead.
+     */
+    isempty = xml_child_nr_type(xoutput, CX_ELMNT) == 0 ||
+	(xml_child_nr_type(xoutput, CX_ELMNT) == 1 &&
+	 (xok = xml_child_i_type(xoutput, 0, CX_ELMNT)) != NULL &&
+	 strcmp(xml_name(xok),"ok")==0);
+    if (isempty) {
+	/* Internal error - invalid output from rpc handler */
+	FCGX_SetExitStatus(204, r->out); /* OK */
+	FCGX_FPrintF(r->out, "Status: 204 No Content\r\n");
+	FCGX_FPrintF(r->out, "\r\n");
+	goto fail;
+    }
+    /* Clear namespace of parameters */
+    x = NULL;
+    while ((x = xml_child_each(xoutput, x, CX_ELMNT)) != NULL) {
+	if ((xa = xml_find_type(x, NULL, "xmlns", CX_ATTR)) != NULL)
+	    if (xml_purge(xa) < 0)
+		goto done;
     }
     /* Set namespace on output */
     if (xmlns_set(xoutput, NULL, namespace) < 0)
@@ -1643,7 +1627,7 @@ api_operations_post(clicon_handle h,
     }
     /* Here xtop is: 
       <rpc username="foo"><myfn xmlns="uri"><x>42</x></myfn></rpc> */
-#if 0
+#if 1
     if (debug){
 	cbuf *ccc=cbuf_new();
 	if (clicon_xml2cbuf(ccc, xtop, 0, 0) < 0)
@@ -1652,8 +1636,8 @@ api_operations_post(clicon_handle h,
 		     __FUNCTION__, cbuf_get(ccc));
     }
 #endif
-    /* 6. Validate outgoing RPC and fill in defaults */
-    if (xml_spec_populate_rpc(h, xtop, yspec) < 0)
+    /* 6. Validate incoming RPC and fill in defaults */
+    if (xml_spec_populate_rpc(h, xtop, yspec) < 0) /*  */
 	goto done;
     if ((ret = xml_yang_validate_rpc(xtop, cbret)) < 0)
 	goto done;
@@ -1710,7 +1694,7 @@ api_operations_post(clicon_handle h,
     /* 8. Receive reply from local/backend handler as Netconf RPC
      *       <rpc-reply><x xmlns="uri">0</x></rpc-reply>
      */
-#if 0
+#if 1
     if (debug){
 	cbuf *ccc=cbuf_new();
 	if (clicon_xml2cbuf(ccc, xret, 0, 0) < 0)
diff --git a/example/clixon-example@2019-01-13.yang b/example/clixon-example@2019-01-13.yang
index 40e53cc6..c664a0ab 100644
--- a/example/clixon-example@2019-01-13.yang
+++ b/example/clixon-example@2019-01-13.yang
@@ -76,7 +76,20 @@ module clixon-example {
 	}
     }
     rpc empty {
-	description "Smallest possible RPC with no input or output";
+	description "Smallest possible RPC with no input or output sections";
+    }
+    rpc optional {
+	description "Small RPC with optional input and output";
+	input {
+	    leaf x {
+		type string;
+	    }
+	}
+	output {
+	    leaf x {
+		type string;
+	    }
+	}
     }
     rpc example {
 	description "Some example input/output for testing RFC7950 7.14.
diff --git a/example/example_backend.c b/example/example_backend.c
index 615d7937..e0adc3ff 100644
--- a/example/example_backend.c
+++ b/example/example_backend.c
@@ -156,19 +156,20 @@ example_rpc(clicon_handle h,            /* Clicon handle */
 	goto done;
     }
     cprintf(cbret, "<rpc-reply>");
-    while ((x = xml_child_each(xe, x, CX_ELMNT)) != NULL) {
-	if (xmlns_set(x, NULL, namespace) < 0)
-	    goto done;
-	if (clicon_xml2cbuf(cbret, x, 0, 0) < 0)
-	    goto done;
-    }
+    if (!xml_child_nr_type(xe, CX_ELMNT))
+	cprintf(cbret, "<ok/>");
+    else while ((x = xml_child_each(xe, x, CX_ELMNT)) != NULL) {
+	    if (xmlns_set(x, NULL, namespace) < 0)
+		goto done;
+	    if (clicon_xml2cbuf(cbret, x, 0, 0) < 0)
+		goto done;
+	}
     cprintf(cbret, "</rpc-reply>");
     retval = 0;
  done:
     return retval;
 }
 
-
 /*! Called to get state data from plugin
  * @param[in]    h      Clicon handle
  * @param[in]    xpath  String with XPATH syntax. or NULL for all
@@ -338,6 +339,12 @@ clixon_plugin_init(clicon_handle h)
 			      "empty"/* Xml tag when callback is made */
 			      ) < 0)
 	goto done;
+    /* Same as example but with optional input/output */
+    if (rpc_callback_register(h, example_rpc, 
+			      NULL, 
+			      "optional"/* Xml tag when callback is made */
+			      ) < 0)
+	goto done;
     if (rpc_callback_register(h, example_rpc, 
 			      NULL, 
 			      "example"/* Xml tag when callback is made */
@@ -349,4 +356,3 @@ clixon_plugin_init(clicon_handle h)
  done:
     return NULL;
 }
-
diff --git a/test/test_restconf.sh b/test/test_restconf.sh
index d0aabca5..6f41f6f7 100755
--- a/test/test_restconf.sh
+++ b/test/test_restconf.sh
@@ -30,27 +30,6 @@ cat <<EOF > $cfg
 </config>
 EOF
 
-cat <<EOF > $fyang
-module mymod{
-    yang-version 1.1;
-    namespace "urn:example:my";
-    prefix me;
-    import clixon-example {
-	prefix ex;
-    }
-    import ietf-interfaces {
-	prefix if;
-    }
-    import ietf-ip {
-      prefix ip;
-    }
-    import ietf-inet-types {
-       prefix "inet";
-       revision-date "2013-07-15";
-    }
-}
-EOF
-
 # This is a fixed 'state' implemented in routing_backend. It is assumed to be always there
 state='{"clixon-example:state": {"op": "42"}}'
 
@@ -94,12 +73,12 @@ expecteq "$(curl -s -H 'Accept: application/yang-data+xml' -G http://localhost/r
 
 # Should be alphabetically ordered
 new2 "restconf get restconf/operations. RFC8040 3.3.2 (json)"
-expecteq "$(curl -sG http://localhost/restconf/operations)" '{"operations": {"clixon-example:client-rpc": null,"clixon-example:empty": null,"clixon-example:example": null,"clixon-lib:debug": null}
+expecteq "$(curl -sG http://localhost/restconf/operations)" '{"operations": {"clixon-example:client-rpc": null,"clixon-example:empty": null,"clixon-example:optional": null,"clixon-example:example": null,"clixon-lib:debug": null}
 
'
 
 new "restconf get restconf/operations. RFC8040 3.3.2 (xml)"
 ret=$(curl -s -H "Accept: application/yang-data+xml" -G http://localhost/restconf/operations)
-expect='<operations><client-rpc xmlns="urn:example:clixon"/><empty xmlns="urn:example:clixon"/><example xmlns="urn:example:clixon"/><debug xmlns="http://clicon.org/lib"/></operations>'
+expect='<operations><client-rpc xmlns="urn:example:clixon"/><empty xmlns="urn:example:clixon"/><optional xmlns="urn:example:clixon"/><example xmlns="urn:example:clixon"/><debug xmlns="http://clicon.org/lib"/></operations>'
 match=`echo $ret | grep -EZo "$expect"`
 if [ -z "$match" ]; then
     err "$expect" "$ret"
@@ -275,7 +254,7 @@ new2 "restconf rpc using wrong prefix"
 expecteq "$(curl -s -X POST -d '{"wrong:input":{"routing-instance-name":"ipv4"}}' http://localhost/restconf/operations/wrong:example)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "yang module not found"}}}
'
 
 new "restconf local client rpc using POST xml"
-ret=$(curl -s -X POST -H "Accept: application/yang-data+xml" -d '{"clixon-example:input":{"request":"example"}}' http://localhost/restconf/operations/clixon-example:client-rpc)
+ret=$(curl -s -i -X POST -H "Accept: application/yang-data+xml" -d '{"clixon-example:input":{"request":"example"}}' http://localhost/restconf/operations/clixon-example:client-rpc)
 expect='<output xmlns="urn:example:clixon"><result>ok</result></output>'
 match=`echo $ret | grep -EZo "$expect"`
 if [ -z "$match" ]; then
diff --git a/test/test_rpc.sh b/test/test_rpc.sh
index 464a0fc5..076ced83 100755
--- a/test/test_rpc.sh
+++ b/test/test_rpc.sh
@@ -2,6 +2,9 @@
 # RPC tests
 # Validate parameters in restconf and netconf, check namespaces, etc
 # See rfc8040 3.6
+# Use the example application that has one mandatory input arg,
+# At the end is an alternative Yang without mandatory arg for
+# valid empty input and output.
 APPNAME=example
 
 # include err() and new() functions and creates $dir
@@ -95,7 +98,7 @@ expecteof "$clixon_netconf -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netco
 
 # 2. Then error cases
 #
-new "restconf empy rpc with null input"
+new "restconf empty rpc with null input"
 ret=$(curl -is -X POST -d '{"clixon-example:input":null}' http://localhost/restconf/operations/clixon-example:empty)
 expect="204 No Content"
 match=`echo $ret | grep -EZo "$expect"`
@@ -103,9 +106,18 @@ if [ -z "$match" ]; then
     err "$expect" "$ret"
 fi
 
-new2 "restconf empy rpc with input x"
+new2 "restconf empty rpc with input x"
 expecteq "$(curl -s -X POST -d '{"clixon-example:input":{"x":0}}' http://localhost/restconf/operations/clixon-example:empty)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "x"},"error-severity": "error"}}}
'
 
+# cornercase: optional has yang input/output sections but test without body
+new "restconf optional rpc with null input and output"
+ret=$(curl -is -X POST -d '{"clixon-example:input":null}' http://localhost/restconf/operations/clixon-example:optional)
+expect="204 No Content"
+match=`echo $ret | grep -EZo "$expect"`
+if [ -z "$match" ]; then
+    err "$expect" "$ret"
+fi
+
 new2 "restconf omit mandatory"
 expecteq "$(curl -s -X POST -d '{"clixon-example:input":null}' http://localhost/restconf/operations/clixon-example:example)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "x"},"error-severity": "error","error-message": "Mandatory variable"}}}
'
 
@@ -118,7 +130,6 @@ expecteq "$(curl -s -X POST -d '{"clixon-example:input":{"x":"0"}}' http://local
 new2 "restconf example missing input"
 expecteq "$(curl -s -X POST -d '{"clixon-example:input":null}' http://localhost/restconf/operations/ietf-netconf:edit-config)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "yang module not found"}}}
'
 
-
 new "netconf kill-session missing session-id mandatory"
 expecteof "$clixon_netconf -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><kill-session/></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>missing-element</error-tag><error-info><bad-element>session-id</bad-element></error-info><error-severity>error</error-severity><error-message>Mandatory variable</error-message></rpc-error></rpc-reply>]]>]]>$'
 

From 04bb05c83f8fea91462776eb2ad2f3010b644462 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Tue, 22 Jan 2019 13:41:03 +0100
Subject: [PATCH 42/72] Upgrade testcases for nacm

---
 apps/restconf/restconf_methods.c |  4 +-
 example/example_backend_nacm.c   |  2 +-
 test/test_nacm.sh                | 31 ++++++------
 test/test_nacm_datanode.sh       | 40 ++++++++-------
 test/test_nacm_ext.sh            | 26 +++++-----
 test/test_nacm_module.sh         | 85 +++++++++++++++++++-------------
 test/test_nacm_protocol.sh       | 23 +++++----
 7 files changed, 121 insertions(+), 90 deletions(-)

diff --git a/apps/restconf/restconf_methods.c b/apps/restconf/restconf_methods.c
index 84289dd4..27512442 100644
--- a/apps/restconf/restconf_methods.c
+++ b/apps/restconf/restconf_methods.c
@@ -1676,7 +1676,7 @@ api_operations_post(clicon_handle h,
 	if (xml_parse_string(cbuf_get(cbret), NULL, &xret) < 0)
 	    goto done;
 	/* Local error: return it and quit */
-	if ((xe = xpath_first(xret, "//rpc-error")) != NULL){
+	if ((xe = xpath_first(xret, "rpc-reply/rpc-error")) != NULL){
 	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
 		goto done;
 	    goto ok;
@@ -1685,7 +1685,7 @@ api_operations_post(clicon_handle h,
     else {    /* Send to backend */
 	if (clicon_rpc_netconf_xml(h, xtop, &xret, NULL) < 0)
 	    goto done;
-	if ((xe = xpath_first(xret, "rpc-error")) != NULL){
+	if ((xe = xpath_first(xret, "rpc-reply/rpc-error")) != NULL){
 	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
 		goto done;
 	    goto ok;
diff --git a/example/example_backend_nacm.c b/example/example_backend_nacm.c
index 608916a8..eae31132 100644
--- a/example/example_backend_nacm.c
+++ b/example/example_backend_nacm.c
@@ -75,7 +75,7 @@ nacm_statedata(clicon_handle h,
     cxobj **xvec = NULL;
 
     /* Example of (static) statedata, real code would poll state */
-    if (xml_parse_string("<nacm>"
+    if (xml_parse_string("<nacm xmlns=\"urn:ietf:params:xml:ns:yang:ietf-netconf-acm\">"
 			 "<denied-data-writes>0</denied-data-writes>"
 			 "<denied-operations>0</denied-operations>"
 			 "<denied-notifications>0</denied-notifications>"
diff --git a/test/test_nacm.sh b/test/test_nacm.sh
index b8ed20cb..460fec59 100755
--- a/test/test_nacm.sh
+++ b/test/test_nacm.sh
@@ -9,8 +9,7 @@ APPNAME=example
 . ./nacm.sh
 
 cfg=$dir/conf_yang.xml
-fyang=$dir/test.yang
-fyangerr=$dir/err.yang
+fyang=$dir/nacm-example.yang
 
 cat <<EOF > $cfg
 <config>
@@ -23,6 +22,7 @@ cat <<EOF > $cfg
   <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_DIR>/usr/local/lib/$APPNAME/backend</CLICON_BACKEND_DIR>
   <CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
   <CLICON_CLI_GENMODEL_COMPLETION>1</CLICON_CLI_GENMODEL_COMPLETION>
   <CLICON_XMLDB_DIR>/usr/local/var/$APPNAME</CLICON_XMLDB_DIR>
@@ -33,10 +33,13 @@ cat <<EOF > $cfg
 EOF
 
 cat <<EOF > $fyang
-module $APPNAME{
+module nacm-example{
   yang-version 1.1;
-  namespace "urn:example:clixon";
-  prefix ex;
+  namespace "urn:example:nacm";
+  prefix nacm;
+  import clixon-example {
+	prefix ex;
+  }
   import ietf-netconf-acm {
 	prefix nacm;
   }
@@ -100,7 +103,7 @@ RULES=$(cat <<EOF
      $NADMIN
 
    </nacm>
-   <x xmlns="urn:example:clixon">0</x>
+   <x xmlns="urn:example:nacm">0</x>
 EOF
 )
 
@@ -132,7 +135,7 @@ new "restconf DELETE whole datastore"
 expecteq "$(curl -u andy:bar -sS -X DELETE http://localhost/restconf/data)" ""
 
 new2 "auth get"
-expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/example:x)" 'null
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" 'null
 
'
 
 new "auth set authentication config"
@@ -148,7 +151,7 @@ new2 "auth get (wrong passwd: access denied)"
 expecteq "$(curl -u andy:foo -sS -X GET http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
 
 new2 "auth get (access)"
-expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"example:x": 0}
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"nacm-example:x": 0}
 
'
 
 #----------------Enable NACM
@@ -157,24 +160,24 @@ new "enable nacm"
 expecteq "$(curl -u andy:bar -sS -X PUT -d '{"ietf-netconf-acm:enable-nacm": true}' http://localhost/restconf/data/ietf-netconf-acm:nacm/enable-nacm)" ""
 
 new2 "admin get nacm"
-expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"example:x": 0}
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"nacm-example:x": 0}
 
'
 
 new2 "limited get nacm"
-expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"example:x": 0}
+expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"nacm-example:x": 0}
 
'
 
 new2 "guest get nacm"
-expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
+expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
 
 new "admin edit nacm"
-expecteq "$(curl -u andy:bar -sS -X PUT -d '{"example:x": 1}' http://localhost/restconf/data/example:x)" ""
+expecteq "$(curl -u andy:bar -sS -X PUT -d '{"nacm-example:x": 1}' http://localhost/restconf/data/nacm-example:x)" ""
 
 new2 "limited edit nacm"
-expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"example:x": 2}' http://localhost/restconf/data/example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"nacm-example:x": 2}' http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
 new2 "guest edit nacm"
-expecteq "$(curl -u guest:bar -sS -X PUT -d '{"example:x": 3}' http://localhost/restconf/data/example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
+expecteq "$(curl -u guest:bar -sS -X PUT -d '{"nacm-example:x": 3}' http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
 
 new "Kill restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"
diff --git a/test/test_nacm_datanode.sh b/test/test_nacm_datanode.sh
index cd53c4dd..f6aa50b4 100755
--- a/test/test_nacm_datanode.sh
+++ b/test/test_nacm_datanode.sh
@@ -21,7 +21,6 @@ APPNAME=example
 
 cfg=$dir/conf_yang.xml
 fyang=$dir/test.yang
-fyangerr=$dir/err.yang
 
 cat <<EOF > $cfg
 <config>
@@ -34,6 +33,7 @@ cat <<EOF > $cfg
   <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_DIR>/usr/local/lib/$APPNAME/backend</CLICON_BACKEND_DIR>
   <CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
   <CLICON_CLI_GENMODEL_COMPLETION>1</CLICON_CLI_GENMODEL_COMPLETION>
   <CLICON_XMLDB_DIR>/usr/local/var/$APPNAME</CLICON_XMLDB_DIR>
@@ -44,10 +44,13 @@ cat <<EOF > $cfg
 EOF
 
 cat <<EOF > $fyang
-module $APPNAME{
+module nacm-example{
   yang-version 1.1;
-  namespace "urn:example:clixon";
-  prefix ex;
+  namespace "urn:example:nacm";
+  prefix nacm;
+  import clixon-example {
+	prefix ex;
+  }
   import ietf-netconf-acm {
 	prefix nacm;
   }
@@ -146,21 +149,20 @@ RULES=$(cat <<EOF
    <x xmlns="urn:example:clixon">0</x>
 EOF
 )
-
 exit # XXX
+new "test params: -f $cfg"
 
-# kill old backend (if any)
-new "kill old backend"
-sudo clixon_backend -zf $cfg
-if [ $? -ne 0 ]; then
-    err
-fi
-
-new "start backend -s init -f $cfg"
-# start new backend
-sudo $clixon_backend -s init -f $cfg
-if [ $? -ne 0 ]; then
-    err
+if [ $BE -ne 0 ]; then
+    new "kill old backend"
+    sudo clixon_backend -zf $cfg
+    if [ $? -ne 0 ]; then
+	err
+    fi
+    new "start backend -s init -f $cfg"
+    sudo $clixon_backend -s init -f $cfg -D $DBG
+    if [ $? -ne 0 ]; then
+	err
+    fi
 fi
 
 new "kill old restconf daemon"
@@ -218,6 +220,10 @@ expecteq "$(curl -u guest:bar -sS -X PUT -d '{"x": 3}' http://localhost/restconf
 new "Kill restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"
 
+if [ $BE -eq 0 ]; then
+    exit # BE
+fi
+
 new "Kill backend"
 # Check if premature kill
 pid=`pgrep -u root -f clixon_backend`
diff --git a/test/test_nacm_ext.sh b/test/test_nacm_ext.sh
index 2689c8e4..f0fdf0a5 100755
--- a/test/test_nacm_ext.sh
+++ b/test/test_nacm_ext.sh
@@ -10,8 +10,7 @@ APPNAME=example
 . ./nacm.sh
 
 cfg=$dir/conf_yang.xml
-fyang=$dir/test.yang
-fyangerr=$dir/err.yang
+fyang=$dir/nacm-example.yang
 nacmfile=$dir/nacmfile
 
 # Note filter out example_backend_nacm.so in CLICON_BACKEND_REGEXP below
@@ -39,13 +38,13 @@ cat <<EOF > $cfg
 EOF
 
 cat <<EOF > $fyang
-module $APPNAME{
+module nacm-example{
   yang-version 1.1;
-  namespace "urn:example:my";
+  namespace "urn:example:nacm";
   import clixon-example {
 	prefix ex;
   }
-  prefix my;
+  prefix nacm;
   container authentication {
 	description "Example code for enabling www basic auth and some example 
                      users";
@@ -124,6 +123,7 @@ cat <<EOF > $nacmfile
      $NADMIN
 
    </nacm>
+   <x xmlns="urn:example:nacm">0</x>
 EOF
 
 new "test params: -f $cfg"
@@ -159,7 +159,7 @@ expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/clixon-ex
 
'
 
 new "Set x to 0"
-expecteq "$(curl -u andy:bar -sS -X PUT -d '{"example:x": 0}' http://localhost/restconf/data/example:x)" ""
+expecteq "$(curl -u andy:bar -sS -X PUT -d '{"nacm-example:x": 0}' http://localhost/restconf/data/nacm-example:x)" ""
 
 new2 "auth get (no user: access denied)"
 expecteq "$(curl -sS -X GET -H \"Accept:\ application/yang-data+json\" http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
@@ -168,28 +168,28 @@ new2 "auth get (wrong passwd: access denied)"
 expecteq "$(curl -u andy:foo -sS -X GET http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
 
 new2 "auth get (access)"
-expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"example:x": 0}
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"nacm-example:x": 0}
 
'
 
 new2 "admin get nacm"
-expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"example:x": 0}
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"nacm-example:x": 0}
 
'
 
 new2 "limited get nacm"
-expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"example:x": 0}
+expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"nacm-example:x": 0}
 
'
 
 new2 "guest get nacm"
-expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
+expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
 
 new "admin edit nacm"
-expecteq "$(curl -u andy:bar -sS -X PUT -d '{"example:x": 1}' http://localhost/restconf/data/example:x)" ""
+expecteq "$(curl -u andy:bar -sS -X PUT -d '{"nacm-example:x": 1}' http://localhost/restconf/data/nacm-example:x)" ""
 
 new2 "limited edit nacm"
-expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"x": 2}' http://localhost/restconf/data/example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"x": 2}' http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
 new2 "guest edit nacm"
-expecteq "$(curl -u guest:bar -sS -X PUT -d '{"x": 3}' http://localhost/restconf/data/example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
+expecteq "$(curl -u guest:bar -sS -X PUT -d '{"x": 3}' http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
 
 new "cli show conf as admin"
 expectfn "$clixon_cli -1 -U andy -l o -f $cfg show conf" 0 "^x 1;$"
diff --git a/test/test_nacm_module.sh b/test/test_nacm_module.sh
index a991e7c9..0ac5f9d5 100755
--- a/test/test_nacm_module.sh
+++ b/test/test_nacm_module.sh
@@ -3,7 +3,9 @@
 # NACM module rules
 # @see test_nacm.sh is slightly modified - this follows the RFC more closely
 # See RFC 8341 A.1 and A.2
-# Tests for:
+# Note: use clixon-example instead of ietf-netconf-monitoring since the latter is
+# not yet implemented
+# Tests for 
 # deny-ncm:  This rule prevents the "guest" group from reading any
 #     monitoring information in the "ietf-netconf-monitoring" YANG
 #     module.
@@ -21,10 +23,7 @@ APPNAME=example
 . ./nacm.sh
 
 cfg=$dir/conf_yang.xml
-fyang=$dir/test.yang
-fyangerr=$dir/err.yang
-
-exit # XXX
+fyang=$dir/nacm-example.yang
 
 cat <<EOF > $cfg
 <config>
@@ -37,6 +36,7 @@ cat <<EOF > $cfg
   <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_DIR>/usr/local/lib/$APPNAME/backend</CLICON_BACKEND_DIR>
   <CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
   <CLICON_CLI_GENMODEL_COMPLETION>1</CLICON_CLI_GENMODEL_COMPLETION>
   <CLICON_XMLDB_DIR>/usr/local/var/$APPNAME</CLICON_XMLDB_DIR>
@@ -47,10 +47,13 @@ cat <<EOF > $cfg
 EOF
 
 cat <<EOF > $fyang
-module $APPNAME{
+module nacm-example{
   yang-version 1.1;
-  namespace "urn:example:clixon";
-  prefix ex;
+  namespace "urn:example:nacm";
+  prefix nacm;
+  import clixon-example {
+	prefix ex;
+  }
   import ietf-netconf-acm {
 	prefix nacm;
   }
@@ -72,6 +75,7 @@ RULES=$(cat <<EOF
 
      $NGROUPS
 
+
      <rule-list>
        <name>guest-acl</name>
        <group>guest</group>
@@ -113,22 +117,24 @@ RULES=$(cat <<EOF
      $NADMIN
 
    </nacm>
-   <x xmlns="urn:example:clixon">0</x>
+   <x xmlns="urn:example:nacm">42</x>
+   <translate xmlns="urn:example:clixon"><k>key42</k><value>val42</value></translate>
 EOF
 )
 
-# kill old backend (if any)
-new "kill old backend"
-sudo clixon_backend -zf $cfg
-if [ $? -ne 0 ]; then
-    err
-fi
+new "test params: -f $cfg"
 
-new "start backend -s init -f $cfg"
-# start new backend
-sudo $clixon_backend -s init -f $cfg
-if [ $? -ne 0 ]; then
-    err
+if [ $BE -ne 0 ]; then
+    new "kill old backend"
+    sudo clixon_backend -zf $cfg
+    if [ $? -ne 0 ]; then
+	err
+    fi
+    new "start backend -s init -f $cfg"
+    sudo $clixon_backend -s init -f $cfg -D $DBG
+    if [ $? -ne 0 ]; then
+	err
+    fi
 fi
 
 new "kill old restconf daemon"
@@ -151,30 +157,43 @@ expecteq "$(curl -u andy:bar -sS -X PUT -d '{"enable-nacm": true}' http://localh
 
 #--------------- nacm enabled
 
-# Read monitoring information from ietf-netconf-monitoring
-new2 "admin get nacm"
-expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"example:x": 0}
+# Read monitoring information from example - (ietf-netconf-monitoring)
+new2 "admin read ok"
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/clixon-example:translate)" '{"clixon-example:translate": [{"k": "key42","value": "val42"}]}
 
'
 
-new2 "limited get nacm"
-expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"example:x": 0}
+new2 "limit read ok"
+expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/clixon-example:translate)" '{"clixon-example:translate": [{"k": "key42","value": "val42"}]}
 
'
 
-new2 "guest get nacm"
-expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+new2 "guest read fail"
+expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/clixon-example:translate)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
-new "admin edit nacm"
-expecteq "$(curl -u andy:bar -sS -X PUT -d '{"example:x": 1}' http://localhost/restconf/data/example:x)" ""
+new2 "guest read other module"
+expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
-new2 "limited edit nacm"
-expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"example:x": 2}' http://localhost/restconf/data/example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+new2 "admin read other module OK"
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"nacm-example:x": 42}
+
'
 
-new2 "guest edit nacm"
-expecteq "$(curl -u guest:bar -sS -X PUT -d '{"example:x": 3}' http://localhost/restconf/data/example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+new2 "admin rpc ok"
+expecteq "$(curl -u andy:bar -s -X POST  -d '{"clixon-example:input":{"x":42}}' http://localhost/restconf/operations/clixon-example:example)" '{"clixon-example:output": {"x": "42","y": "42"}}
+
'
+
+new2 "limit rpc ok"
+expecteq "$(curl -u wilma:bar -s -X POST http://localhost/restconf/operations/clixon-example:example -d '{"clixon-example:input":{"x":42}}' )" '{"clixon-example:output": {"x": "42","y": "42"}}
+
'
+
+new2 "guest rpc fail"
+expecteq "$(curl -u guest:bar -s -X POST http://localhost/restconf/operations/clixon-example:example -d '{"clixon-example:input":{"x":42}}' )" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
 new "Kill restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"
 
+if [ $BE -eq 0 ]; then
+    exit # BE
+fi
+
 new "Kill backend"
 # Check if premature kill
 pid=`pgrep -u root -f clixon_backend`
diff --git a/test/test_nacm_protocol.sh b/test/test_nacm_protocol.sh
index 31e60073..41dfdefb 100755
--- a/test/test_nacm_protocol.sh
+++ b/test/test_nacm_protocol.sh
@@ -29,8 +29,7 @@ APPNAME=example
 . ./nacm.sh
 
 cfg=$dir/conf_yang.xml
-fyang=$dir/test.yang
-fyangerr=$dir/err.yang
+fyang=$dir/nacm-example.yang
 
 cat <<EOF > $cfg
 <config>
@@ -43,6 +42,7 @@ cat <<EOF > $cfg
   <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_DIR>/usr/local/lib/$APPNAME/backend</CLICON_BACKEND_DIR>
   <CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
   <CLICON_CLI_GENMODEL_COMPLETION>1</CLICON_CLI_GENMODEL_COMPLETION>
   <CLICON_XMLDB_DIR>/usr/local/var/$APPNAME</CLICON_XMLDB_DIR>
@@ -53,10 +53,13 @@ cat <<EOF > $cfg
 EOF
 
 cat <<EOF > $fyang
-module $APPNAME{
+module nacm-example{
   yang-version 1.1;
-  namespace "urn:example:clixon";
-  prefix ex;
+  namespace "urn:example:nacm";
+  prefix nacm;
+  import clixon-example {
+	prefix ex;
+  }
   import ietf-netconf-acm {
 	prefix nacm;
   }
@@ -122,7 +125,7 @@ RULES=$(cat <<EOF
      $NADMIN
 
    </nacm>
-   <x xmlns="urn:example:clixon">0</x>
+   <x xmlns="urn:example:nacm">0</x>
 EOF
 )
 
@@ -163,7 +166,7 @@ expecteq "$(curl -u andy:bar -sS -X PUT -d '{"enable-nacm": true}' http://localh
 #--------------- nacm enabled
 
 new2 "admin get nacm"
-expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"example:x": 0}
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"nacm-example:x": 0}
 
'
 
 # Rule 1: deny-kill-session
@@ -188,7 +191,7 @@ new "deny-delete-config: limited fail (restconf) ok"
 expecteq "$(curl -u wilma:bar -sS -X DELETE http://localhost/restconf/data)" ''
 
 new2 "admin get nacm (should be null)"
-expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/example:x)" 'null
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" 'null
 
'
 
 new "deny-delete-config: admin ok (restconf)"
@@ -206,10 +209,10 @@ expecteq "$(curl -u andy:bar -sS -X PUT -d '{"ietf-netconf-acm:enable-nacm": tru
 
 # Rule 3: permit-edit-config
 new "permit-edit-config: limited ok restconf"
-expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"example:x": 2}' http://localhost/restconf/data/example:x)" ''
+expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"nacm-example:x": 2}' http://localhost/restconf/data/nacm-example:x)" ''
 
 new2 "permit-edit-config: guest fail restconf"
-expecteq "$(curl -u guest:bar -sS -X PUT -d '{"example:x": 2}' http://localhost/restconf/data/example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+expecteq "$(curl -u guest:bar -sS -X PUT -d '{"nacm-example:x": 2}' http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
 new "Kill restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"

From 7113026e1715b2db28012194ac9b613343b18f61 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Tue, 22 Jan 2019 18:37:21 +0100
Subject: [PATCH 43/72] example client-rpc similar to other example rpc:s

---
 apps/restconf/restconf_methods.c       |  4 ++--
 example/clixon-example@2019-01-13.yang |  4 ++--
 example/example_netconf.c              | 27 ++++++++++++++++++++++---
 example/example_restconf.c             | 28 +++++++++++++++++++++-----
 test/test_netconf.sh                   |  2 +-
 test/test_restconf.sh                  |  5 +++--
 6 files changed, 55 insertions(+), 15 deletions(-)

diff --git a/apps/restconf/restconf_methods.c b/apps/restconf/restconf_methods.c
index 84289dd4..27512442 100644
--- a/apps/restconf/restconf_methods.c
+++ b/apps/restconf/restconf_methods.c
@@ -1676,7 +1676,7 @@ api_operations_post(clicon_handle h,
 	if (xml_parse_string(cbuf_get(cbret), NULL, &xret) < 0)
 	    goto done;
 	/* Local error: return it and quit */
-	if ((xe = xpath_first(xret, "//rpc-error")) != NULL){
+	if ((xe = xpath_first(xret, "rpc-reply/rpc-error")) != NULL){
 	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
 		goto done;
 	    goto ok;
@@ -1685,7 +1685,7 @@ api_operations_post(clicon_handle h,
     else {    /* Send to backend */
 	if (clicon_rpc_netconf_xml(h, xtop, &xret, NULL) < 0)
 	    goto done;
-	if ((xe = xpath_first(xret, "rpc-error")) != NULL){
+	if ((xe = xpath_first(xret, "rpc-reply/rpc-error")) != NULL){
 	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
 		goto done;
 	    goto ok;
diff --git a/example/clixon-example@2019-01-13.yang b/example/clixon-example@2019-01-13.yang
index c664a0ab..da038f31 100644
--- a/example/clixon-example@2019-01-13.yang
+++ b/example/clixon-example@2019-01-13.yang
@@ -65,12 +65,12 @@ module clixon-example {
                      This is a clixon implementation detail: some rpc:s
                      are better processed by the client for API or perf reasons";
 	input {
-	    leaf request {
+	    leaf x {
 		type string;
 	    }
 	}
 	output {
-	    leaf result{
+	    leaf x {
 		type string;
 	    }
 	}
diff --git a/example/example_netconf.c b/example/example_netconf.c
index 742b1d98..5a5710f0 100644
--- a/example/example_netconf.c
+++ b/example/example_netconf.c
@@ -65,13 +65,34 @@ plugin_exit(clicon_handle h)
 /*! Local example netconf rpc callback 
  */
 int netconf_client_rpc(clicon_handle h, 
-		       cxobj        *xn,      
+		       cxobj        *xe,      
 		       cbuf         *cbret,    
 		       void         *arg,
 		       void         *regarg)
 {
-    clicon_debug(1, "%s restconf", __FUNCTION__);
-    cprintf(cbret, "<rpc-reply><result xmlns=\"urn:example:clixon\">ok</result></rpc-reply>");
+    int    retval = -1;
+    cxobj *x = NULL;
+    char  *namespace;
+
+    /* get namespace from rpc name, return back in each output parameter */
+    if ((namespace = xml_find_type_value(xe, NULL, "xmlns", CX_ATTR)) == NULL){
+	clicon_err(OE_XML, ENOENT, "No namespace given in rpc %s", xml_name(xe));
+	goto done;
+    }
+    cprintf(cbret, "<rpc-reply>");
+    if (!xml_child_nr_type(xe, CX_ELMNT))
+	cprintf(cbret, "<ok/>");
+    else while ((x = xml_child_each(xe, x, CX_ELMNT)) != NULL) {
+	    if (xmlns_set(x, NULL, namespace) < 0)
+		goto done;
+	    if (clicon_xml2cbuf(cbret, x, 0, 0) < 0)
+		goto done;
+	}
+    cprintf(cbret, "</rpc-reply>");
+    retval = 0;
+ done:
+    return retval;
+
     return 0;
 }
 
diff --git a/example/example_restconf.c b/example/example_restconf.c
index e49a48f4..e6e395c5 100644
--- a/example/example_restconf.c
+++ b/example/example_restconf.c
@@ -268,15 +268,33 @@ example_restconf_credentials(clicon_handle h,
  */
 int
 restconf_client_rpc(clicon_handle h, 
-		    cxobj        *xn,      
+		    cxobj        *xe,      
 		    cbuf         *cbret,    
 		    void         *arg,
 		    void         *regarg)
 {
-    //    FCGX_Request *r = (FCGX_Request *)arg;
-    clicon_debug(1, "%s", __FUNCTION__);
-    cprintf(cbret, "<rpc-reply><result xmlns=\"urn:example:clixon\">ok</result></rpc-reply>");
-    return 0;
+    int    retval = -1;
+    cxobj *x = NULL;
+    char  *namespace;
+
+    /* get namespace from rpc name, return back in each output parameter */
+    if ((namespace = xml_find_type_value(xe, NULL, "xmlns", CX_ATTR)) == NULL){
+	clicon_err(OE_XML, ENOENT, "No namespace given in rpc %s", xml_name(xe));
+	goto done;
+    }
+    cprintf(cbret, "<rpc-reply>");
+    if (!xml_child_nr_type(xe, CX_ELMNT))
+	cprintf(cbret, "<ok/>");
+    else while ((x = xml_child_each(xe, x, CX_ELMNT)) != NULL) {
+	    if (xmlns_set(x, NULL, namespace) < 0)
+		goto done;
+	    if (clicon_xml2cbuf(cbret, x, 0, 0) < 0)
+		goto done;
+	}
+    cprintf(cbret, "</rpc-reply>");
+    retval = 0;
+ done:
+    return retval;
 }
 
 /*! Start example restonf plugin. Set authentication method
diff --git a/test/test_netconf.sh b/test/test_netconf.sh
index 60ce0214..eb3c0ed6 100755
--- a/test/test_netconf.sh
+++ b/test/test_netconf.sh
@@ -192,7 +192,7 @@ new "netconf empty rpc"
 expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><empty xmlns="urn:example:clixon"/></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf client-side rpc"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><client-rpc xmlns="urn:example:clixon"><request>example</request></client-rpc></rpc>]]>]]>' '^<rpc-reply><result xmlns="urn:example:clixon">ok</result></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><client-rpc xmlns="urn:example:clixon"><x>val42</x></client-rpc></rpc>]]>]]>' '^<rpc-reply><x xmlns="urn:example:clixon">val42</x></rpc-reply>]]>]]>$'
 
 if [ $BE -eq 0 ]; then
     exit # BE
diff --git a/test/test_restconf.sh b/test/test_restconf.sh
index 6f41f6f7..462ac83f 100755
--- a/test/test_restconf.sh
+++ b/test/test_restconf.sh
@@ -228,6 +228,7 @@ new2 "restconf rpc using POST json"
 expecteq "$(curl -s -X POST -d '{"clixon-example:input":{"x":42}}' http://localhost/restconf/operations/clixon-example:example)" '{"clixon-example:output": {"x": "42","y": "42"}}
 
'
 
+new2 "restconf rpc using POST json wrong"
 expecteq "$(curl -s -X POST -d '{"clixon-example:input":{"wrongelement":"ipv4"}}' http://localhost/restconf/operations/clixon-example:example)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "wrongelement"},"error-severity": "error"}}}
'
 
 new2 "restconf rpc non-existing rpc without namespace"
@@ -254,8 +255,8 @@ new2 "restconf rpc using wrong prefix"
 expecteq "$(curl -s -X POST -d '{"wrong:input":{"routing-instance-name":"ipv4"}}' http://localhost/restconf/operations/wrong:example)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "yang module not found"}}}
'
 
 new "restconf local client rpc using POST xml"
-ret=$(curl -s -i -X POST -H "Accept: application/yang-data+xml" -d '{"clixon-example:input":{"request":"example"}}' http://localhost/restconf/operations/clixon-example:client-rpc)
-expect='<output xmlns="urn:example:clixon"><result>ok</result></output>'
+ret=$(curl -s -i -X POST -H "Accept: application/yang-data+xml" -d '{"clixon-example:input":{"x":"example"}}' http://localhost/restconf/operations/clixon-example:client-rpc)
+expect='<output xmlns="urn:example:clixon"><x>example</x></output>'
 match=`echo $ret | grep -EZo "$expect"`
 if [ -z "$match" ]; then
     err "$expect" "$ret"

From c156832234c75a9db1907ed997ccb3d0e32035b8 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sat, 26 Jan 2019 18:48:56 +0100
Subject: [PATCH 44/72] fixed segv with unmatched restconf keys in uri

---
 apps/restconf/restconf_methods.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/restconf/restconf_methods.c b/apps/restconf/restconf_methods.c
index 27512442..5795ee07 100644
--- a/apps/restconf/restconf_methods.c
+++ b/apps/restconf/restconf_methods.c
@@ -643,18 +643,19 @@ match_list_keys(yang_stmt *y,
     char      *keyd;
 
     if (y->ys_keyword != Y_LIST &&y->ys_keyword != Y_LEAF_LIST)
-	return -1;
+	goto done;
     cvk = y->ys_cvec; /* Use Y_LIST cache, see ys_populate_list() */
     cvi = NULL;
     while ((cvi = cvec_each(cvk, cvi)) != NULL) {
 	keyname = cv_string_get(cvi);	    
 	if ((xkeya = xml_find(xapipath, keyname)) == NULL)
 	    goto done; /* No key in api-path */
-	    
-	keya = xml_body(xkeya);
+	if ((keya = xml_body(xkeya)) == NULL)
+	    goto done;
 	if ((xkeyd = xml_find(xdata, keyname)) == NULL)
 	    goto done; /* No key in data */
-	keyd = xml_body(xkeyd);
+	if ((keyd = xml_body(xkeyd)) == NULL)
+	    goto done;
 	if (strcmp(keya, keyd) != 0)
 	    goto done; /* keys dont match */
     }

From ffecebf32ad5c2883b8d49daf254544a28069f69 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sun, 27 Jan 2019 13:26:15 +0100
Subject: [PATCH 45/72] * NACM Data node READ access module support (RFC8341
 3.4.5)    * Access control points added for `get` and `get-config` in
 addition to incoming rpc.    * RFC 8341 Example A.2 implemented, see:
 [test/test_nacm_module.sh] * Added `username` argument on `xmldb_put()`
 datastore function for NACM data-node write checks * Added
 `xml_rootchild_node()` lib function as variant of `xml_rootchild()`

---
 CHANGELOG.md                       |  10 +-
 apps/backend/backend_client.c      |  87 ++++--
 apps/backend/backend_commit.c      |   6 +-
 apps/backend/backend_main.c        |   9 +-
 apps/restconf/restconf_methods.c   |  14 +-
 datastore/datastore_client.c       |   2 +-
 datastore/text/clixon_xmldb_text.c |  63 ++++-
 datastore/text/clixon_xmldb_text.h |   2 +-
 example/example_backend.c          |   2 +-
 lib/clixon/clixon_nacm.h           |   5 +-
 lib/clixon/clixon_xml.h            |   1 +
 lib/clixon/clixon_xml_db.h         |   4 +-
 lib/src/clixon_nacm.c              | 419 ++++++++++++++++++++++++-----
 lib/src/clixon_xml.c               |  41 ++-
 lib/src/clixon_xml_db.c            |   6 +-
 lib/src/clixon_xml_map.c           |   2 +-
 test/lib.sh                        |   5 +-
 test/test_nacm.sh                  |   2 +-
 test/test_nacm_ext.sh              |   2 +-
 test/test_nacm_module.sh           | 119 ++++++--
 20 files changed, 656 insertions(+), 145 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 088d8a70..8f5079e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -77,12 +77,17 @@
     * CLICON_YANG_MAIN_FILE Provides a filename with a single module filename.
     * CLICON_YANG_MAIN_DIR Provides a directory where all yang modules should be loaded.
 * NACM extension (RFC8341)
-  * NACM module support (RFC8341 A1+A2)
+  * NACM Data node READ access module support (RFC8341 3.4.5)
+    * Access control points added for `get` and `get-config` in addition to incoming rpc.
+    * RFC 8341 Example A.2 implemented, see: [test/test_nacm_module.sh]
+  * Remaining work:
+    * data-node module write/create/delete/update
+    * data-node path 
   * Recovery user "_nacm_recovery" added.
     * Example use is restconf PUT when NACM edit-config is permitted, then automatic commit and discard are permitted using recovery user.
-  * Example user changed adm1 to andy to comply with RFC8341 example
 	
 ### API changes on existing features (you may need to change your code)
+* Added `username` argument on `xmldb_put()` datastore function for NACM data-node write checks
 * Rearranged yang files
   * Moved and updated all standard ietf and iana yang files from example and yang/ to `yang/standard`.
   * Moved clixon yang files from yang to `yang/clixon`
@@ -112,6 +117,7 @@
   * For backward compatibility, define CLICON_CLI_MODEL_TREENAME_PATCH in clixon_custom.h
 
 ### Minor changes
+* Added `xml_rootchild_node()` lib function as variant of `xml_rootchild()`
 * Added -o "<option>=<value>" command-line option to all programs: backend, cli, netconf, restconf.
   * Any config option from file can be overrided by giving them on command-line.
 * Added -p <dir> command-line option to all programs: backend, cli, netconf, restconf.
diff --git a/apps/backend/backend_client.c b/apps/backend/backend_client.c
index f8766206..c9efa40a 100644
--- a/apps/backend/backend_client.c
+++ b/apps/backend/backend_client.c
@@ -177,14 +177,19 @@ netconf_db_find(cxobj *xn,
 static int
 from_client_get_config(clicon_handle h,
 		       cxobj        *xe,
+		       char         *username,
 		       cbuf         *cbret)
 {
-    int    retval = -1;
-    char  *db;
-    cxobj *xfilter;
-    char  *selector = "/";
-    cxobj *xret = NULL;
-    cbuf  *cbx = NULL; /* Assist cbuf */
+    int     retval = -1;
+    char   *db;
+    cxobj  *xfilter;
+    char   *xpath = "/";
+    cxobj  *xret = NULL;
+    cbuf   *cbx = NULL; /* Assist cbuf */
+    cxobj  *xnacm = NULL;
+    cxobj **xvec = NULL;
+    size_t  xlen;    
+    int     ret;
     
     if ((db = netconf_db_find(xe, "source")) == NULL){
 	clicon_err(OE_XML, 0, "db not found");
@@ -201,13 +206,23 @@ from_client_get_config(clicon_handle h,
 	goto ok;
     }
     if ((xfilter = xml_find(xe, "filter")) != NULL)
-	if ((selector = xml_find_value(xfilter, "select"))==NULL)
-	    selector="/";
-    if (xmldb_get(h, db, selector, 1, &xret) < 0){
+	if ((xpath = xml_find_value(xfilter, "select"))==NULL)
+	    xpath="/";
+    if (xmldb_get(h, db, xpath, 1, &xret) < 0){
 	if (netconf_operation_failed(cbret, "application", "read registry")< 0)
 	    goto done;
 	goto ok;
     }
+    /* Pre-NACM access step */
+    if ((ret = nacm_access(h, username, &xnacm)) < 0)
+	goto done;
+    if (ret == 0){ /* Do NACM validation */
+	if (xpath_vec(xret, "%s", &xvec, &xlen, xpath?xpath:"/") < 0)
+	    goto done;
+	/* NACM datanode/module read validation */
+	if (nacm_datanode_read(xret, xvec, xlen, username, xnacm) < 0) 
+	    goto done;
+    }
     cprintf(cbret, "<rpc-reply>");
     if (xret==NULL)
 	cprintf(cbret, "<data/>");
@@ -221,6 +236,10 @@ from_client_get_config(clicon_handle h,
  ok:
     retval = 0;
  done:
+    if (xnacm)
+	xml_free(xnacm);
+    if (xvec)
+	free(xvec);
     if (cbx)
 	cbuf_free(cbx);
     if (xret)
@@ -356,6 +375,7 @@ client_statedata(clicon_handle h,
 static int
 from_client_get(clicon_handle h,
 		cxobj        *xe,
+		char         *username,
 		cbuf         *cbret)
 {
     int     retval = -1;
@@ -363,7 +383,10 @@ from_client_get(clicon_handle h,
     char   *xpath = "/";
     cxobj  *xret = NULL;
     int     ret;
-    
+    cxobj **xvec = NULL;
+    size_t  xlen;    
+    cxobj  *xnacm = NULL;
+
     if ((xfilter = xml_find(xe, "filter")) != NULL)
 	if ((xpath = xml_find_value(xfilter, "select"))==NULL)
 	    xpath="/";
@@ -383,6 +406,16 @@ from_client_get(clicon_handle h,
 	    goto done;
 	goto ok;
     }
+    /* Pre-NACM access step */
+    if ((ret = nacm_access(h, username, &xnacm)) < 0)
+	goto done;
+    if (ret == 0){ /* Do NACM validation */
+	if (xpath_vec(xret, "%s", &xvec, &xlen, xpath?xpath:"/") < 0)
+	    goto done;
+	/* NACM datanode/module read validation */
+	if (nacm_datanode_read(xret, xvec, xlen, username, xnacm) < 0) 
+	    goto done;
+    }
     cprintf(cbret, "<rpc-reply>");     /* OK */
     if (xret==NULL)
 	cprintf(cbret, "<data/>");
@@ -396,6 +429,10 @@ from_client_get(clicon_handle h,
  ok:
     retval = 0;
  done:
+    if (xnacm)
+	xml_free(xnacm);
+    if (xvec)
+	free(xvec);
     if (xret)
 	xml_free(xret);
     return retval;
@@ -412,6 +449,7 @@ static int
 from_client_edit_config(clicon_handle h,
 			cxobj        *xn,
 			int           mypid,
+			char         *username,
 			cbuf         *cbret)
 {
     int                 retval = -1;
@@ -485,7 +523,7 @@ from_client_edit_config(clicon_handle h,
 	 */
 	if (xml_apply0(xc, CX_ELMNT, xml_sort, NULL) < 0)
 	    goto done;
-	if ((ret = xmldb_put(h, target, operation, xc, cbret)) < 0){
+	if ((ret = xmldb_put(h, target, operation, xc, username, cbret)) < 0){
 	    clicon_debug(1, "%s ERROR PUT", __FUNCTION__);	
 	    if (netconf_operation_failed(cbret, "protocol", clicon_err_reason)< 0)
 		goto done;
@@ -963,7 +1001,8 @@ from_client_msg(clicon_handle        h,
     yang_spec           *yspec;
     yang_stmt           *ye;
     yang_stmt           *ymod;
-
+    cxobj               *xnacm = NULL;
+    
     clicon_debug(1, "%s", __FUNCTION__);
     pid = ce->ce_pid;
     yspec = clicon_dbspec_yang(h); 
@@ -996,6 +1035,8 @@ from_client_msg(clicon_handle        h,
 	goto reply;
     xe = NULL;
     username = xml_find_value(x, "username");
+    /* May be used by callbacks, etc */
+    clicon_username_set(h, username);
     while ((xe = xml_child_each(x, xe, CX_ELMNT)) != NULL) {
 	rpc = xml_name(xe);
 	if ((ye = xml_spec(xe)) == NULL){
@@ -1009,17 +1050,25 @@ from_client_msg(clicon_handle        h,
 	}
 	module = ymod->ys_argument;
 	clicon_debug(1, "%s module:%s rpc:%s", __FUNCTION__, module, rpc);
-	/* Make NACM access control if enabled as "internal"*/
-	if ((ret = nacm_access(h, rpc, module, username, cbret)) < 0)
+	/* Pre-NACM access step */
+	xnacm = NULL;
+	if ((ret = nacm_access(h, username, &xnacm)) < 0)
 	    goto done;
-	if (ret == 0)
-	    goto reply;
+	if (ret == 0){ /* Do NACM validation */
+	    /* NACM rpc operation exec validation */
+	    if ((ret = nacm_rpc(rpc, module, username, xnacm, cbret)) < 0)
+		goto done;
+	    if (xnacm)
+		xml_free(xnacm);
+	    if (ret == 0) /* Not permitted and cbret set */
+		goto reply;
+	}
 	if (strcmp(rpc, "get-config") == 0){
-	    if (from_client_get_config(h, xe, cbret) <0)
+	    if (from_client_get_config(h, xe, username, cbret) <0)
 		goto done;
 	}
 	else if (strcmp(rpc, "edit-config") == 0){
-	    if (from_client_edit_config(h, xe, pid, cbret) <0)
+	    if (from_client_edit_config(h, xe, pid, username, cbret) <0)
 		goto done;
 	}
 	else if (strcmp(rpc, "copy-config") == 0){
@@ -1039,7 +1088,7 @@ from_client_msg(clicon_handle        h,
 		goto done;
 	}
 	else if (strcmp(rpc, "get") == 0){
-	    if (from_client_get(h, xe, cbret) < 0)
+	    if (from_client_get(h, xe, username, cbret) < 0)
 		goto done;
 	}
 	else if (strcmp(rpc, "close-session") == 0){
diff --git a/apps/backend/backend_commit.c b/apps/backend/backend_commit.c
index 8c406d69..19cc96d3 100644
--- a/apps/backend/backend_commit.c
+++ b/apps/backend/backend_commit.c
@@ -285,7 +285,8 @@ candidate_commit(clicon_handle h,
 
      /* Optionally write (potentially modified) tree back to candidate */
      if (clicon_option_bool(h, "CLICON_TRANSACTION_MOD")){
-	 if ((ret = xmldb_put(h, candidate, OP_REPLACE, td->td_target, cbret)) < 0)
+	 if ((ret = xmldb_put(h, candidate, OP_REPLACE, td->td_target,
+			      clicon_username_get(h), cbret)) < 0)
 	     goto done;
 	 if (ret == 0)
 	     goto fail;
@@ -440,7 +441,8 @@ from_client_validate(clicon_handle h,
     }
     /* Optionally write (potentially modified) tree back to candidate */
     if (clicon_option_bool(h, "CLICON_TRANSACTION_MOD")){
-	if ((ret = xmldb_put(h, "candidate", OP_REPLACE, td->td_target, cbret)) < 0)
+	if ((ret = xmldb_put(h, "candidate", OP_REPLACE, td->td_target,
+			     clicon_username_get(h), cbret)) < 0)
 	    goto done;
 	goto ok;
     }
diff --git a/apps/backend/backend_main.c b/apps/backend/backend_main.c
index c6a835fe..93e25bed 100644
--- a/apps/backend/backend_main.c
+++ b/apps/backend/backend_main.c
@@ -195,7 +195,7 @@ db_merge(clicon_handle h,
     if (xmldb_get(h, (char*)db1, NULL, 1, &xt) < 0)
 	goto done;
     /* Merge xml into db2. Without commit */
-    retval = xmldb_put(h, (char*)db2, OP_MERGE, xt, cbret);
+    retval = xmldb_put(h, (char*)db2, OP_MERGE, xt, clicon_username_get(h), cbret);
  done:
     if (xt)
 	xml_free(xt);
@@ -318,7 +318,7 @@ load_extraxml(clicon_handle h,
     if (xml_rootchild(xt, 0, &xt) < 0)
 	goto done;
     /* Merge user reset state */
-    retval = xmldb_put(h, (char*)db, OP_MERGE, xt, cbret);
+    retval = xmldb_put(h, (char*)db, OP_MERGE, xt, clicon_username_get(h), cbret);
  done:
     if (fd != -1)
 	close(fd);
@@ -857,6 +857,10 @@ main(int    argc,
 	    goto done;
     if (xmldb_setopt(h, "pretty", (void*)(intptr_t)clicon_option_bool(h, "CLICON_XMLDB_PRETTY")) < 0)
 	goto done;
+    if (xmldb_setopt(h, "nacm_mode", (void*)nacm_mode) < 0)
+	goto done;
+    if (xmldb_setopt(h, "nacm_xtree", (void*)clicon_nacm_ext(h)) < 0)
+	goto done;
     /* Startup mode needs to be defined,  */
     startup_mode = clicon_startup_mode(h);
     if (startup_mode == -1){ 	
@@ -906,7 +910,6 @@ main(int    argc,
 	}
     }
     /* Write pid-file */
-
     if ((pid = pidfile_write(pidfile)) <  0)
 	goto done;
 
diff --git a/apps/restconf/restconf_methods.c b/apps/restconf/restconf_methods.c
index 27512442..fcc266a9 100644
--- a/apps/restconf/restconf_methods.c
+++ b/apps/restconf/restconf_methods.c
@@ -643,18 +643,19 @@ match_list_keys(yang_stmt *y,
     char      *keyd;
 
     if (y->ys_keyword != Y_LIST &&y->ys_keyword != Y_LEAF_LIST)
-	return -1;
+	goto done;
     cvk = y->ys_cvec; /* Use Y_LIST cache, see ys_populate_list() */
     cvi = NULL;
     while ((cvi = cvec_each(cvk, cvi)) != NULL) {
 	keyname = cv_string_get(cvi);	    
 	if ((xkeya = xml_find(xapipath, keyname)) == NULL)
 	    goto done; /* No key in api-path */
-	    
-	keya = xml_body(xkeya);
+	if ((keya = xml_body(xkeya)) == NULL)
+	    goto done;
 	if ((xkeyd = xml_find(xdata, keyname)) == NULL)
 	    goto done; /* No key in data */
-	keyd = xml_body(xkeyd);
+	if ((keyd = xml_body(xkeyd)) == NULL)
+	    goto done;
 	if (strcmp(keya, keyd) != 0)
 	    goto done; /* keys dont match */
     }
@@ -778,7 +779,7 @@ api_data_put(clicon_handle h,
 		goto done;
 	    goto ok;
 	}
-    }      
+    }
     /* The message-body MUST contain exactly one instance of the
      * expected data resource. 
      */
@@ -807,6 +808,7 @@ api_data_put(clicon_handle h,
 	    goto ok;
 	}
     }
+    
     /* Add operation (create/replace) as attribute */
     if ((xa = xml_new("operation", x, NULL)) == NULL)
 	goto done;
@@ -831,6 +833,7 @@ api_data_put(clicon_handle h,
 	xml_name_set(xtop, "config");
     }
     else {
+	clicon_debug(1, "%s x:%s xbot:%s",__FUNCTION__, xml_name(x), xml_name(xbot));
 	/* Check same symbol in api-path as data */	    
 	if (strcmp(xml_name(x), xml_name(xbot))){
 	    if (netconf_operation_failed_xml(&xerr, "protocol", "Not same symbol in api-path as data") < 0)
@@ -896,7 +899,6 @@ api_data_put(clicon_handle h,
      by NACM */
     cprintf(cbx, "<rpc username=\"%s\">", NACM_RECOVERY_USER);
     cprintf(cbx, "<commit/></rpc>");
-    
     if (clicon_rpc_netconf(h, cbuf_get(cbx), &xretcom, NULL) < 0)
 	goto done;
     if ((xe = xpath_first(xretcom, "//rpc-error")) != NULL){
diff --git a/datastore/datastore_client.c b/datastore/datastore_client.c
index a5b6ab1e..b2a0a2a8 100644
--- a/datastore/datastore_client.c
+++ b/datastore/datastore_client.c
@@ -248,7 +248,7 @@ main(int argc, char **argv)
 	    clicon_err(OE_UNIX, errno, "cbuf_new");
 	    goto done;
 	}
-	if (xmldb_put(h, db, op, xt, cbret) < 1)
+	if (xmldb_put(h, db, op, xt, NULL, cbret) < 1)
 	    goto done;
 	    
     }
diff --git a/datastore/text/clixon_xmldb_text.c b/datastore/text/clixon_xmldb_text.c
index e7a6999e..8c64616f 100644
--- a/datastore/text/clixon_xmldb_text.c
+++ b/datastore/text/clixon_xmldb_text.c
@@ -88,6 +88,8 @@ struct text_handle {
 				   Assumes single backend*/
     char          *th_format;   /* Datastroe format: xml / json */
     int            th_pretty;   /* Store xml/json pretty-printed. */
+    char          *th_nacm_mode;
+    cxobj         *th_nacm_xtree;
 };
 
 /* Struct per database in hash */
@@ -207,6 +209,8 @@ text_disconnect(xmldb_handle xh)
 	    }
 	    hash_free(th->th_dbs);
 	}
+	if (th->th_nacm_mode)
+	    free(th->th_nacm_mode);
 	free(th);
     }
     retval = 0;
@@ -239,6 +243,10 @@ text_getopt(xmldb_handle xh,
 	*value = th->th_format;
     else if (strcmp(optname, "pretty") == 0)
 	*value = &th->th_pretty;
+    else if (strcmp(optname, "nacm_mode") == 0)
+	*value = &th->th_nacm_mode;
+    else if (strcmp(optname, "nacm_xtree") == 0)
+	*value = th->th_nacm_xtree;
     else{
 	clicon_err(OE_PLUGIN, 0, "Option %s not implemented by plugin", optname);
 	goto done;
@@ -288,6 +296,15 @@ text_setopt(xmldb_handle xh,
     else if (strcmp(optname, "pretty") == 0){
 	th->th_pretty = (intptr_t)value;
     }
+    else if (strcmp(optname, "nacm_mode") == 0){
+	if (value && (th->th_nacm_mode = strdup((char*)value)) == NULL){
+	    clicon_err(OE_UNIX, 0, "strdup");
+	    goto done;
+	}
+    }
+    else if (strcmp(optname, "nacm_xtree") == 0){
+	th->th_nacm_xtree = (cxobj*)value;
+    }
     else{
 	clicon_err(OE_PLUGIN, 0, "Option %s not implemented by plugin", optname);
 	goto done;
@@ -421,10 +438,17 @@ xml_copy_marked(cxobj *x0,
  * The function returns a minimal tree that includes all sub-trees that match
  * xpath.
  * This is a clixon datastore plugin of the the xmldb api
- * @see xmldb_get
+ * @param[in]  h      Clicon handle
+ * @param[in]  dbname Name of database to search in (filename including dir path
+ * @param[in]  xpath  String with XPATH syntax. or NULL for all
+ * @param[in]  config If set only configuration data, else also state
+ * @param[out] xret   Single return XML tree. Free with xml_free()
+ * @retval     0      OK
+ * @retval     -1     Error
+ * @see xmldb_get  the generic API function
  */
 int
-text_get(xmldb_handle xh,
+text_get(xmldb_handle  xh,
 	 const char   *db, 
 	 char         *xpath,
 	 int           config,
@@ -434,6 +458,7 @@ text_get(xmldb_handle xh,
     char           *dbfile = NULL;
     yang_spec      *yspec;
     cxobj          *xt = NULL;
+    cxobj          *x;
     int             fd = -1;
     cxobj         **xvec = NULL;
     size_t          xlen;
@@ -486,7 +511,6 @@ text_get(xmldb_handle xh,
 	 */
     } /* xt == NULL */
     /* Here xt looks like: <config>...</config> */
-
     if (xpath_vec(xt, "%s", &xvec, &xlen, xpath?xpath:"/") < 0)
 	goto done;
 
@@ -496,11 +520,13 @@ text_get(xmldb_handle xh,
      */
     if (xvec != NULL)
 	for (i=0; i<xlen; i++){
-	    xml_flag_set(xvec[i], XML_FLAG_MARK);
-	    if (th->th_cache)
-		xml_apply_ancestor(xvec[i], (xml_applyfn_t*)xml_flag_set, (void*)XML_FLAG_CHANGE);
+	    x = xvec[i];
+	    xml_flag_set(x, XML_FLAG_MARK);
+	    if (1 || th->th_cache)
+		xml_apply_ancestor(x, (xml_applyfn_t*)xml_flag_set, (void*)XML_FLAG_CHANGE);
 	}
 
+    
     if (th->th_cache){
 	/* Copy the matching parts of the (relevant) XML tree.
 	 * If cache was NULL, also write to datastore cache
@@ -534,13 +560,16 @@ text_get(xmldb_handle xh,
     /* reset flag */
     if (xml_apply(xt, CX_ELMNT, (xml_applyfn_t*)xml_flag_reset, (void*)XML_FLAG_MARK) < 0)
 	goto done;
+
     /* filter out state (operations) data if config not set. Mark all nodes
      that are not config data */
-    if (config && xml_apply(xt, CX_ELMNT, xml_non_config_data, NULL) < 0)
-	goto done;
-    /* Remove (prune) nodes that are marked (that does not pass test) */
-    if (xml_tree_prune_flagged(xt, XML_FLAG_MARK, 1) < 0)
-	goto done;
+    if (config){
+	if (xml_apply(xt, CX_ELMNT, xml_non_config_data, NULL) < 0)
+	    goto done;
+	/* Remove (prune) nodes that are marked (that does not pass test) */
+	if (xml_tree_prune_flagged(xt, XML_FLAG_MARK, 1) < 0)
+	    goto done;
+    }
     /* Add default values (if not set) */
     if (xml_apply(xt, CX_ELMNT, xml_default, NULL) < 0)
 	goto done;
@@ -939,13 +968,23 @@ xml_container_presence(cxobj  *x,
 
 /*! Modify database provided an xml tree and an operation
  * This is a clixon datastore plugin of the the xmldb api
- * @see xmldb_put
+ * @param[in]  h      CLICON handle
+ * @param[in]  db     running or candidate
+ * @param[in]  op     Top-level operation, can be superceded by other op in tree
+ * @param[in]  x1     xml-tree. Top-level symbol is dummy
+ * @param[in]  username User name for nacm
+ * @param[out] cbret  Initialized cligen buffer. On exit contains XML if retval == 0
+ * @retval     1      OK
+ * @retval     0      Failed, cbret contains error xml message
+ * @retval     -1     Error
+ * @see xmldb_put  the generic API function
  */
 int
 text_put(xmldb_handle        xh,
 	 const char         *db, 
 	 enum operation_type op,
 	 cxobj              *x1,
+	 char               *username,
     	 cbuf               *cbret)
 {
     int                 retval = -1;
diff --git a/datastore/text/clixon_xmldb_text.h b/datastore/text/clixon_xmldb_text.h
index 9bb46e42..ed365634 100644
--- a/datastore/text/clixon_xmldb_text.h
+++ b/datastore/text/clixon_xmldb_text.h
@@ -40,7 +40,7 @@
  * Prototypes
  */
 int text_get(xmldb_handle h, const char *db, char *xpath, int config, cxobj **xtop);
-int text_put(xmldb_handle h, const char *db, enum operation_type op, cxobj *xt, cbuf *cbret);
+int text_put(xmldb_handle h, const char *db, enum operation_type op, cxobj *xt, char *username, cbuf *cbret);
 int text_dump(FILE *f, char *dbfilename, char *rxkey);
 int text_copy(xmldb_handle h, const char *from, const char *to);
 int text_lock(xmldb_handle h, const char *db, int pid);
diff --git a/example/example_backend.c b/example/example_backend.c
index e0adc3ff..2c366a14 100644
--- a/example/example_backend.c
+++ b/example/example_backend.c
@@ -243,7 +243,7 @@ example_reset(clicon_handle h,
 	goto done;
     }
     /* Merge user reset state */
-    if ((ret = xmldb_put(h, (char*)db, OP_MERGE, xt, cbret)) < 0)
+    if ((ret = xmldb_put(h, (char*)db, OP_MERGE, xt, clicon_username_get(h), cbret)) < 0)
 	goto done;
     if (ret == 0){
 	clicon_err(OE_XML, 0, "Error when writing to XML database: %s",
diff --git a/lib/clixon/clixon_nacm.h b/lib/clixon/clixon_nacm.h
index cdae13bb..670e7eec 100644
--- a/lib/clixon/clixon_nacm.h
+++ b/lib/clixon/clixon_nacm.h
@@ -48,7 +48,8 @@
 /*
  * Prototypes
  */
-int nacm_access(clicon_handle h, char *rpc, char *module,
-		char *username, cbuf *cbret);
+int nacm_rpc(char *rpc, char *module, char *username, cxobj *xnacm, cbuf *cbret);
+int nacm_datanode_read(cxobj *xt, cxobj **xvec, size_t xlen, char *username, cxobj *nacm_xtree);
+int nacm_access(clicon_handle h, char *username, cxobj **xnacmp);
 
 #endif /* _CLIXON_NACM_H */
diff --git a/lib/clixon/clixon_xml.h b/lib/clixon/clixon_xml.h
index be3e2352..5a4b13b5 100644
--- a/lib/clixon/clixon_xml.h
+++ b/lib/clixon/clixon_xml.h
@@ -138,6 +138,7 @@ int       xml_purge(cxobj *xc);
 int       xml_child_rm(cxobj *xp, int i);
 int       xml_rm(cxobj *xc);
 int       xml_rootchild(cxobj  *xp, int i, cxobj **xcp);
+int       xml_rootchild_node(cxobj  *xp, cxobj *xc);
 
 char     *xml_body(cxobj *xn);
 cxobj    *xml_body_get(cxobj *xn);
diff --git a/lib/clixon/clixon_xml_db.h b/lib/clixon/clixon_xml_db.h
index a79349d1..042d414f 100644
--- a/lib/clixon/clixon_xml_db.h
+++ b/lib/clixon/clixon_xml_db.h
@@ -78,7 +78,7 @@ typedef int (xmldb_setopt_t)(xmldb_handle xh, char *optname, void *value);
 typedef int (xmldb_get_t)(xmldb_handle xh, const char *db, char *xpath, int config, cxobj **xtop);
 
 /* Type of xmldb put function */
-typedef int (xmldb_put_t)(xmldb_handle xh, const char *db, enum operation_type op, cxobj *xt, cbuf *cbret);
+typedef int (xmldb_put_t)(xmldb_handle xh, const char *db, enum operation_type op, cxobj *xt, char *username, cbuf *cbret);
 
 /* Type of xmldb copy function */
 typedef int (xmldb_copy_t)(xmldb_handle xh, const char *from, const char *to);
@@ -139,7 +139,7 @@ int xmldb_disconnect(clicon_handle h);
 int xmldb_getopt(clicon_handle h, char *optname, void **value);
 int xmldb_setopt(clicon_handle h, char *optname, void *value);
 int xmldb_get(clicon_handle h, const char *db, char *xpath, int config, cxobj **xtop);
-int xmldb_put(clicon_handle h, const char *db, enum operation_type op, cxobj *xt, cbuf *cbret);
+int xmldb_put(clicon_handle h, const char *db, enum operation_type op, cxobj *xt, char *username, cbuf *cbret);
 int xmldb_copy(clicon_handle h, const char *from, const char *to);
 int xmldb_lock(clicon_handle h, const char *db, int pid);
 int xmldb_unlock(clicon_handle h, const char *db);
diff --git a/lib/src/clixon_nacm.c b/lib/src/clixon_nacm.c
index 8efa4421..5a5ed3da 100644
--- a/lib/src/clixon_nacm.c
+++ b/lib/src/clixon_nacm.c
@@ -90,8 +90,8 @@ nacm_match_access(char *access_operations,
 }
 
 /*! Match nacm single rule. Either match with access or deny. Or not match.
- * @param[in]  h      Clicon handle
- * @param[in]  name  rpc name
+ * @param[in]  rpc    rpc name
+ * @param[in]  module Yang module name
  * @param[in]  xrule  NACM rule XML tree
  * @param[out] cbret  Cligen buffer result. Set to an error msg if retval=0.
  * @retval -1  Error
@@ -126,11 +126,10 @@ nacm_match_access(char *access_operations,
            has the special value "*".
  */
 static int
-nacm_match_rule(clicon_handle h,
-		char         *name,
-		char         *module,
-		cxobj        *xrule,
-		cbuf         *cbret)
+nacm_rule_rpc(char         *rpc,
+	      char         *module,
+	      cxobj        *xrule,
+	      cbuf         *cbret)
 {
     int    retval = -1;
     char  *module_rule; /* rule module name */
@@ -149,7 +148,7 @@ nacm_match_rule(clicon_handle h,
 	(strcmp(module_rule,"*")==0 || strcmp(module_rule,module)==0)){
 	if (nacm_match_access(access_operations, "exec")){
 	    if (rpc_rule==NULL ||
-		strcmp(rpc_rule, "*")==0 || strcmp(rpc_rule, name)==0){
+		strcmp(rpc_rule, "*")==0 || strcmp(rpc_rule, rpc)==0){
 		/* Here is a matching rule */
 		if (action && strcmp(action, "permit")==0){
 		    retval = 1;
@@ -169,31 +168,26 @@ nacm_match_rule(clicon_handle h,
     return retval;
 }
 
-/*! Process a nacm message control
- * @param[in]  h     Clicon handle
- * @param[in]  mode  NACMmode, internal or external
- * @param[in]  name  rpc name
- * @param[in]  username
- * @param[in]  xtop
+/*! Process nacm incoming RPC message validation steps
+ * @param[in]  module   Yang module name
+ * @param[in]  rpc      rpc name
+ * @param[in]  username User name making access
+ * @param[in]  xnacm    NACM xml tree
  * @param[out] cbret Cligen buffer result. Set to an error msg if retval=0.
  * @retval -1  Error
  * @retval  0  Not access and cbret set
  * @retval  1  Access
  * @see RFC8341 3.4.4.  Incoming RPC Message Validation
  */
-static int
-nacm_rpc_validation(clicon_handle h,
-		    char         *name,
-		    char         *module,
-		    char         *username,
-		    cxobj        *xtop,
-		    cbuf         *cbret)
+int
+nacm_rpc(char         *rpc,
+	 char         *module,
+	 char         *username,
+	 cxobj        *xnacm,
+	 cbuf         *cbret)
 {
     int     retval = -1;
-    cxobj  *xacm;
-    cxobj  *x;
     cxobj  *xrule;
-    char   *enabled = NULL;
     cxobj **gvec = NULL; /* groups */
     size_t  glen;
     cxobj  *xrlist;
@@ -205,26 +199,10 @@ nacm_rpc_validation(clicon_handle h,
     int     i, j;
     char   *exec_default = NULL;
     
-    /* 1.   If the "enable-nacm" leaf is set to "false", then the protocol
-       operation is permitted. (or config does not exist) */
-    if ((xacm = xpath_first(xtop, "nacm")) == NULL)
-	goto permit;
-    exec_default = xml_find_body(xacm, "exec-default");
-    if ((x = xpath_first(xacm, "enable-nacm")) == NULL)
-	goto permit;
-    enabled = xml_body(x);
-    if (strcmp(enabled, "true") != 0)
-	goto permit;
-
-    /* 2.   If the requesting session is identified as a recovery session,
-       then the protocol operation is permitted. NYI */
-    if (strcmp(username, NACM_RECOVERY_USER) == 0)
-	goto permit;
-    
     /* 3.   If the requested operation is the NETCONF <close-session>
        protocol operation, then the protocol operation is permitted.
     */
-    if (strcmp(name, "close-session") == 0)
+    if (strcmp(rpc, "close-session") == 0)
 	goto permit;
     /* 4.   Check all the "group" entries to see if any of them contain a
        "user-name" entry that equals the username for the session
@@ -234,7 +212,7 @@ nacm_rpc_validation(clicon_handle h,
     if (username == NULL)
 	goto step10;
     /* User's group */
-    if (xpath_vec(xacm, "groups/group[user-name='%s']", &gvec, &glen, username) < 0)
+    if (xpath_vec(xnacm, "groups/group[user-name='%s']", &gvec, &glen, username) < 0)
 	goto done;
     /* 5. If no groups are found, continue with step 10. */
     if (glen == 0)
@@ -243,7 +221,7 @@ nacm_rpc_validation(clicon_handle h,
         configuration.  If a rule-list's "group" leaf-list does not
         match any of the user's groups, proceed to the next rule-list
         entry. */
-    if (xpath_vec(xacm, "rule-list", &rlistvec, &rlistlen) < 0)
+    if (xpath_vec(xnacm, "rule-list", &rlistvec, &rlistlen) < 0)
 	goto done;
     for (i=0; i<rlistlen; i++){
 	xrlist = rlistvec[i];
@@ -265,7 +243,7 @@ nacm_rpc_validation(clicon_handle h,
 	for (j=0; j<rlen; j++){
 	    xrule = rvec[j];
 	    /* -1 error, 0 deny, 1 permit, 2 continue */
-	    if ((ret = nacm_match_rule(h, name, module, xrule, cbret)) < 0)
+	    if ((ret = nacm_rule_rpc(rpc, module, xrule, cbret)) < 0)
 		goto done;
 	    switch(ret){
 	    case 0: /* deny */
@@ -287,13 +265,14 @@ nacm_rpc_validation(clicon_handle h,
     /* 11.  If the requested protocol operation is the NETCONF
         <kill-session> or <delete-config>, then the protocol operation
         is denied. */
-    if (strcmp(name, "kill-session")==0 || strcmp(name, "delete-config")==0){
+    if (strcmp(rpc, "kill-session")==0 || strcmp(rpc, "delete-config")==0){
 	if (netconf_access_denied(cbret, "protocol", "default deny") < 0)
 	    goto done;
 	goto deny;
     }
     /*   12.  If the "exec-default" leaf is set to "permit", then permit the
 	 protocol operation; otherwise, deny the request. */
+    exec_default = xml_find_body(xnacm, "exec-default");
     if (exec_default ==NULL || strcmp(exec_default, "permit")==0)
 	goto permit;
     if (netconf_access_denied(cbret, "protocol", "default deny") < 0)
@@ -316,56 +295,358 @@ nacm_rpc_validation(clicon_handle h,
     goto done;
 }
 
-/*! Make nacm access control 
- * @param[in]  h     Clicon handle
- * @param[in]  name  rpc name
- * @param[in]  username
- * @param[out] cbret Cligen buffer result. Set to an error msg if retval=0.
+/*---------------------------------------------------------------
+ * Datanode read
+ */
+
+/*! We have a rule matching user group. Now match proper read operation and module
+ * @see RFC8341 3.4.5.  Data Node Access Validation point (6)
+ * 
+ */
+static int
+rule_datanode_read(cxobj  *xrule,
+		   cxobj  *xr,
+		   cxobj  *xt,
+		   int    *match)
+{
+    int        retval = -1;
+    cxobj     *xp; /* parent */
+    char      *access_operations;
+    char      *module_rule; /* rule module name */
+    yang_stmt *ys;
+    yang_stmt *ymod;
+    char      *module;
+    char      *path;
+    cxobj     *xpath; /* xpath match */
+
+    *match = 0;
+    /*  6b) Either (1) the rule does not have a "rule-type" defined or
+	(2) the "rule-type" is "data-node" and the "path" matches the
+	requested data node, action node, or notification node.  A
+	path is considered to match if the requested node is the node
+	specified by the path or is a descendant node of the path.*/    
+    if ((path = xml_find_body(xrule, "path")) == NULL){
+	if (xml_find_body(xrule, "rpc-name") ||xml_find_body(xrule, "notification-name"))
+	    goto nomatch;
+    }
+    /* 6c) For a "read" access operation, the rule's "access-operations"
+	leaf has the "read" bit set or has the special value "*" */
+    access_operations = xml_find_body(xrule, "access-operations");
+    if (!nacm_match_access(access_operations, "read"))
+	goto nomatch;
+    /* 6a) The rule's "module-name" leaf is "*" or equals the name of
+     * the YANG module where the requested data node is defined. */
+    if ((module_rule = xml_find_body(xrule, "module-name")) == NULL)
+	goto nomatch;
+    if (strcmp(module_rule,"*")!=0){
+	if ((ys = xml_spec(xr)) == NULL)
+	    goto nomatch;
+	ymod = ys_module(ys);
+	module = ymod->ys_argument;
+	if (strcmp(module, module_rule) != 0)
+	    goto nomatch;
+    }
+    /* Here module is matched, now check for path if any */
+    if (path){ 
+	if ((xpath = xpath_first(xt, "%s", path)) == NULL)
+	    goto nomatch;
+	/* The requested node xr is the node specified by the path or is a 
+	 * descendant node of the path:
+	 * xmatch is one of xvec[] or an ancestor of the xvec[] nodes.
+	 */
+	xp = xr;
+	do {
+	    if (xpath == xp)
+		goto match;
+	} while ((xp = xml_parent(xp)) != NULL);
+    }
+ match:
+    *match = 1;
+ nomatch:
+    retval = 0;
+    // done:
+    return retval;
+}
+
+/*! Make nacm datanode and module rule read access validation
+ * Just purge nodes that fail validation (dont send netconf error message)
+ * @param[in]  xt       XML root tree with "config" label 
+ * @param[in]  xrvec    Vector of requested nodes (sub-part of xt)
+ * @param[in]  xrlen    Length of requsted node vector
+ * @param[in]  username 
+ * @param[in]  xaxm     NACM xml tree
  * @retval -1  Error
  * @retval  0  Not access and cbret set
  * @retval  1  Access
- * @see RFC8341 3.4.4.  Incoming RPC Message Validation
+ * @see RFC8341 3.4.5.  Data Node Access Validation
+ * 3.2.4: <get> and <get-config> Operations
+ * Data nodes to which the client does not have read access are silently
+ * omitted, along with any descendants, from the <rpc-reply> message.
+ * For NETCONF filtering purposes, the selection criteria are applied to the
+ * subset of nodes that the user is authorized to read, not the entire datastore.
+ * @note assume mode is internal or external, not disabled
+ * @node There is unclarity on what "a data node" means wrt a read operation.
+ * Suppose a tree is accessed. Is "the data node" just the top of the tree?
+ * (1) Or is it all nodes, recursively, in the data-tree?
+ * (2) Or is the datanode only the requested tree, NOT the whole datatree?
+ * Example: 
+ * - r0 default permit/deny *
+ * - rule r1 to permit/deny /a
+ * - rule r2 to permit/deny /a/b
+ * - rule r3 to permit/deny /a/b/c
+ * - rule r4 to permit/deny /d
+
+ * - read access on /a/b which returns <a><b><c/><d/></b></a>?
+ * permit - t; deny - f
+ *    r1  |  r2  |  r3  | result (r0 and r4 are dont cares - dont match)
+ *  ------+------+------+---------
+ *    t   |  t   |  t   | <a><b><c/><d/></b></a>  
+ *    t   |  t   |  f   | <a><b><d/></b></a>
+ *    t   |  f   |  t   | <a/>       
+ *    t   |  f   |  f   | <a/>     
+ *    f   |  t   |  t   | 
+ *    f   |  t   |  f   | 
+ *    f   |  f   |  t   | 
+ *    f   |  f   |  f   | 
+ *
+ * - read access on / which returns <d/><e/>?
+ * permit - t; deny - f
+ *    r0  |  r4  | result
+ *  ------+------+---------
+ *    t   |  t   | <d/><e/>
+ *    t   |  f   | <e/>
+ *    f   |  t   | <d/>
+ *    f   |  f   | 
+ * Algorithm 1, based on an xml tree XT:
+ * The special variable ACTION can have values: 
+ *      permit/deny/default
+ * 1. Traverse through all nodes x in xt. Set ACTION to default
+ *   - Find first exact matching rule r of non-default rules r1-rn on x
+ *     - if found set ACTION to r->action (permit/deny).
+ *   - if ACTION is deny purge x and all descendants
+ *   - if ACTION is permit, mark x as PERMIT
+ *   - continue traverse
+ * 2. If default action is 
+ * 2. Traverse through all nodes x in xt. Set ACTION to default r0->action
+ *   - if x is marked as PERMIT
+ *   - if ACTION is deny deny purge x and all descendants
+ *
+ * Algorithm 2 (based on requested node set XRS which are sub-trees in XT).
+ * For each XR in XRS, check match with rule r1-rn, r0.
+ * 1. XR is PERMIT 
+ *     - Recursively match subtree to find reject sub-trees and purge.
+ * 2. XR is REJECT. Purge XR.
+ * Module-rule w no path is implicit rule on top node.
+ *
+ * A module rule has the "module-name" leaf set but no nodes from the
+ * "rule-type" choice set.
  */
 int
-nacm_access(clicon_handle h,
-	    char         *rpc,
-	    char         *module,
-	    char         *username,
-	    cbuf         *cbret)
+nacm_datanode_read(cxobj  *xt,
+		   cxobj **xrvec,
+		   size_t  xrlen,    
+		   char   *username,
+		   cxobj  *xnacm)
 {
     int     retval = -1;
-    cxobj  *xtop = NULL;
-    char   *mode;
+    cxobj **gvec = NULL; /* groups */
+    cxobj  *xr;
+    size_t  glen;
+    cxobj  *xrlist;
+    cxobj **rlistvec = NULL; /* rule-list */
+    size_t  rlistlen;
+    cxobj **rvec = NULL; /* rules */
+    size_t  rlen;
+    int     i, j, k;
+    char   *read_default = NULL;
+    char   *gname;
+    int     match;
+    cxobj  *xrule;
+    char   *action;
 
+
+    
+    /* 3.   Check all the "group" entries to see if any of them contain a
+       "user-name" entry that equals the username for the session
+       making the request.  (If the "enable-external-groups" leaf is
+       "true", add to these groups the set of groups provided by the
+       transport layer.)	       */
+    if (username == NULL)
+	goto step9;
+    /* User's group */
+    if (xpath_vec(xnacm, "groups/group[user-name='%s']", &gvec, &glen, username) < 0)
+	goto done;
+    /* 4. If no groups are found, continue with step 9. */
+    if (glen == 0)
+	goto step9;
+    /* 5. Process all rule-list entries, in the order they appear in the
+        configuration.  If a rule-list's "group" leaf-list does not
+        match any of the user's groups, proceed to the next rule-list
+        entry. */
+    if (xpath_vec(xnacm, "rule-list", &rlistvec, &rlistlen) < 0)
+	goto done;
+    for (k=0; k<xrlen; k++){     /* Loop through requested nodes */
+	xr = xrvec[k]; /* requested node XR */
+	match = 0; /* Go thru steps 5,6,7, if no match do 8-13 */ 
+	for (i=0; i<rlistlen; i++){ 	/* Loop through rule list */
+	    xrlist = rlistvec[i];
+	    /* Loop through user's group to find match in this rule-list */
+	    for (j=0; j<glen; j++){
+		gname = xml_find_body(gvec[j], "name");
+		if (xpath_first(xrlist, ".[group='%s']", gname)!=NULL)
+		    break; /* found */
+	    }
+	    if (j==glen) /* not found */
+		continue;
+	    /* 6. For each rule-list entry found, process all rules, in order,
+	       until a rule that matches the requested access operation is
+	       found. (see 6 sub rules in nacm_match_rule2)
+	    */
+	    if (xpath_vec(xrlist, "rule", &rvec, &rlen) < 0)
+		goto done;
+	    for (j=0; j<rlen; j++){ /* Loop through rules */
+		xrule = rvec[j];
+		if (rule_datanode_read(xrule, xr, xt, &match) < 0)
+		    goto done;
+		if (match) /* xrule match */
+		    break;
+	    }
+	    if (match) /* xrule match */
+		break;
+	}
+	if (match){ /* xrule match requested node xr */
+	    if ((action = xml_find_body(xrule, "action")) == NULL)
+		continue;
+	    if (strcmp(action, "deny")==0){
+		if (xml_purge(xr) < 0)
+		    goto done;
+	    }
+	    else if (strcmp(action, "permit")==0)
+		;/* XXX recursively find denies in xr and purge them 
+		  * ie go back to the k-loop with all sub-items?
+		  */
+	}
+	else{ /* no rule matching xr, apply default */
+    /*11.  For a "read" access operation, if the "read-default" leaf is set
+        to "permit", then include the requested data node in the reply;
+        otherwise, do not include the requested data node or any of its
+        descendants in the reply.*/
+	    read_default = xml_find_body(xnacm, "read-default");
+	    if (read_default == NULL || strcmp(read_default, "deny")==0)
+		if (xml_purge(xr) < 0)
+		    goto done;
+	}
+    } /* xr */
+    goto ok;
+    /* 8.   At this point, no matching rule was found in any rule-list
+       entry. */
+ step9:
+    /*    9.   For a "read" access operation, if the requested data node is
+        defined in a YANG module advertised in the server capabilities
+        and the data definition statement contains a
+        "nacm:default-deny-all" statement, then the requested data node
+        and all its descendants are not included in the reply.
+    */
+    for (k=0; k<xrlen; k++)     /* Loop through requested nodes */
+	if (xml_purge(xrvec[k]) < 0)
+	    goto done;
+ ok:
+    retval = 0;
+ done:
+    clicon_debug(1, "%s retval:%d", __FUNCTION__, retval);
+    if (gvec)
+	free(gvec);
+    if (rlistvec)
+	free(rlistvec);
+    if (rvec)
+	free(rvec);
+    return retval;
+}
+
+/*! NACM intial pre- access control enforcements 
+ * Initial NACM steps and common to all NACM access validation.
+ * If retval=0 continue with next NACM step, eg rpc, module, 
+ * etc. If retval = 1 access is OK and skip next NACM step.
+ * @param[in]  h        Clicon handle
+ * @param[in]  username
+ * @param[out] xncam    NACM XML tree, set if retval=0. Free after use
+ * @retval -1  Error
+ * @retval  0  OK not yet permit/. continue with next NACM step using xnacm
+ * @retval  1  OK permitted. dont do next NACM step
+ * @code
+ *   cxobj *xnacm = NULL;
+ *   if ((ret = nacm_access(h, username, &xnacm)) < 0)
+ *     err;
+ *   if (ret == 0){
+ *      // Next step NACM processing
+ *      xml_free(xnacm);
+ *   }
+ * @endcode
+ * @see RFC8341 3.4 Access Control Enforcement Procedures
+ */
+int
+nacm_access(clicon_handle  h,
+	    char          *username,
+	    cxobj        **xnacmp)
+{
+    int     retval = -1;
+    cxobj  *xnacm0 = NULL;
+    cxobj  *xnacm;
+    char   *mode;
+    char   *enabled;
+    cxobj  *x;
+    
     clicon_debug(1, "%s", __FUNCTION__);
     mode = clicon_option_str(h, "CLICON_NACM_MODE");
-    if (mode == NULL || strcmp(mode, "disabled") == 0){
-	retval = 1;
-	goto done;
-    }
-
+    if (mode == NULL || strcmp(mode, "disabled") == 0)
+	goto permit;
     /* 0. If nacm-mode is external, get NACM defintion from separet tree,
        otherwise get it from internal configuration */
     if (strcmp(mode, "external")==0){
-	if ((xtop = clicon_nacm_ext(h)) == NULL){
+	cxobj *xne;
+	if ((xne = clicon_nacm_ext(h)) == NULL){
 	    clicon_err(OE_XML, 0, "No nacm external tree");
 	    goto done;
 	}
+	if ((xnacm0 = xml_dup(xne)) == NULL)
+	    goto done;
     }
     else if (strcmp(mode, "internal")==0){
-	if (xmldb_get(h, "running", "nacm", 0, &xtop) < 0)
+	if (xmldb_get(h, "running", "nacm", 0, &xnacm0) < 0)
 	    goto done;	
     }
     else{
 	clicon_err(OE_UNIX, 0, "Invalid NACM mode: %s", mode);
 	goto done;
     }
-    /* Do the real nacm processing */
-    if ((retval = nacm_rpc_validation(h, rpc, module, username, xtop, cbret)) < 0)
+    /* If config does not exist, then the operation is permitted. (?) */
+    if ((xnacm = xpath_first(xnacm0, "nacm")) == NULL)
+	goto permit;
+    if (xml_rootchild_node(xnacm0, xnacm) < 0)
 	goto done;
+    xnacm0 = NULL;
+    *xnacmp = xnacm;
+    /* Do initial nacm processing common to all access validation in
+     * RFC8341 3.4 */
+    /* 1.   If the "enable-nacm" leaf is set to "false", then the protocol
+       operation is permitted. */
+    if ((x = xpath_first(xnacm, "enable-nacm")) == NULL)
+	goto permit;
+    enabled = xml_body(x);
+    if (strcmp(enabled, "true") != 0)
+	goto permit;
+    /* 2.   If the requesting session is identified as a recovery session,
+       then the protocol operation is permitted. NYI */
+    if (username && strcmp(username, NACM_RECOVERY_USER) == 0)
+	goto permit;
+
+    retval = 0; /* not permitted yet. continue with next NACM step */
  done:
+    if (retval != 0 && xnacm0)
+	xml_free(xnacm0);
     clicon_debug(1, "%s retval:%d (0:deny 1:permit)", __FUNCTION__, retval);
-    if (strcmp(mode, "internal")==0 && xtop)
-	xml_free(xtop);
     return retval;
+ permit:
+    retval = 1;
+    goto done;
 }
diff --git a/lib/src/clixon_xml.c b/lib/src/clixon_xml.c
index 17b1845c..1d4f2741 100644
--- a/lib/src/clixon_xml.c
+++ b/lib/src/clixon_xml.c
@@ -640,7 +640,7 @@ xml_child_each(cxobj           *xparent,
 	       cxobj           *xprev, 
 	       enum cxobj_type  type)
 {
-    int i;
+    int    i;
     cxobj *xn = NULL; 
 
     for (i=xprev?xprev->_x_vector_i+1:0; i<xparent->x_childvec_len; i++){
@@ -957,6 +957,7 @@ xml_rm(cxobj *xc)
  *  # Here xt will be: <a>2</a>
  * @endcode
  * @see xml_child_rm
+ * @see xml_child_rootchild_node  where xc is explicitly given
  */
 int
 xml_rootchild(cxobj  *xp, 
@@ -984,6 +985,44 @@ xml_rootchild(cxobj  *xp,
     return retval;
 }
 
+/*! Return a child sub-tree, while removing parent and all other children
+ * Given a root xml node, remove the child from its parent
+ * , remove the parent and all other children.
+ * Before: xp-->[..xc..]
+ * After: xc
+ * @param[in]  xp   xml parent node. Must be root. Will be deleted
+ * @param[in]  xc   xml child node. Must be a child of xp
+ * @retval     0    OK
+ * @retval    -1    Error
+ * @see xml_child_rootchild  where an index is used to find xc
+ */
+int
+xml_rootchild_node(cxobj  *xp, 
+		   cxobj  *xc)
+{
+    int    retval = -1;
+    cxobj *x;
+    int    i;
+
+    if (xml_parent(xp) != NULL){
+	clicon_err(OE_XML, 0, "Parent is not root");
+	goto done;
+    }
+    x = NULL; i = 0;
+    while ((x = xml_child_each(xp, x, -1)) != NULL) {
+	if (x == xc)
+	    break;
+	i++;
+    }
+    if (xml_child_rm(xp, i) < 0)
+	goto done;
+    if (xml_free(xp) < 0)
+	goto done;
+    retval = 0;
+ done:
+    return retval;
+}
+
 /*! Get the first sub-node which is an XML body.
  * @param[in]   xn          xml tree node
  * @retval  The returned body as a pointer to the name string
diff --git a/lib/src/clixon_xml_db.c b/lib/src/clixon_xml_db.c
index 73959bf7..e68f8258 100644
--- a/lib/src/clixon_xml_db.c
+++ b/lib/src/clixon_xml_db.c
@@ -379,6 +379,7 @@ xmldb_get(clicon_handle h,
  * @param[in]  db     running or candidate
  * @param[in]  op     Top-level operation, can be superceded by other op in tree
  * @param[in]  xt     xml-tree. Top-level symbol is dummy
+ * @param[in]  username User name for nacm
  * @param[out] cbret  Initialized cligen buffer. On exit contains XML if retval == 0
  * @retval     1      OK
  * @retval     0      Failed, cbret contains error xml message
@@ -389,7 +390,7 @@ xmldb_get(clicon_handle h,
  *   cxobj     *xret = NULL;
  *   if (xml_parse_string("<a>17</a>", yspec, &xt) < 0)
  *     err;
- *   if ((ret = xmldb_put(xh, "running", OP_MERGE, xt, cbret)) < 0)
+ *   if ((ret = xmldb_put(xh, "running", OP_MERGE, xt, username, cbret)) < 0)
  *     err;
  *   if (ret==0)
  *     cbret contains netconf error message
@@ -404,6 +405,7 @@ xmldb_put(clicon_handle       h,
 	  const char         *db, 
 	  enum operation_type op, 
 	  cxobj              *xt,
+	  char               *username,
 	  cbuf               *cbret)
 {
     int               retval = -1;
@@ -434,7 +436,7 @@ xmldb_put(clicon_handle       h,
 	cbuf_free(cb);
     }
 #endif
-    retval = xa->xa_put_fn(xh, db, op, xt, cbret);
+    retval = xa->xa_put_fn(xh, db, op, xt, username, cbret);
  done:
     return retval;
 }
diff --git a/lib/src/clixon_xml_map.c b/lib/src/clixon_xml_map.c
index 62608af5..c0babd4f 100644
--- a/lib/src/clixon_xml_map.c
+++ b/lib/src/clixon_xml_map.c
@@ -2117,7 +2117,7 @@ api_path2xml(char       *api_path,
     int    nvec;
     cxobj *xroot;
 
-    clicon_debug(1, "%s", __FUNCTION__);
+    clicon_debug(1, "%s api_path:%s", __FUNCTION__, api_path);
     if (*api_path!='/'){
 	clicon_err(OE_XML, EINVAL, "Invalid api-path: %s (must start with '/')",
 		   api_path);
diff --git a/test/lib.sh b/test/lib.sh
index bb28e4ca..feac39c1 100755
--- a/test/lib.sh
+++ b/test/lib.sh
@@ -149,14 +149,17 @@ expectfn(){
   fi
 }
 
+# 
 expecteq(){
   ret=$1
   expect=$2
+#  echo "ret:$ret"
+#  echo "expect:$expect"
   if [ -z "$ret" -a -z "$expect" ]; then
       return
   fi
   if [[ "$ret" = "$expect" ]]; then
-      echo
+      echo 
   else
       err "$expect" "$ret"
   fi
diff --git a/test/test_nacm.sh b/test/test_nacm.sh
index 460fec59..528eabcc 100755
--- a/test/test_nacm.sh
+++ b/test/test_nacm.sh
@@ -55,7 +55,7 @@ EOF
 RULES=$(cat <<EOF
    <nacm xmlns="urn:ietf:params:xml:ns:yang:ietf-netconf-acm">
      <enable-nacm>false</enable-nacm>
-     <read-default>deny</read-default>
+     <read-default>permit</read-default>
      <write-default>deny</write-default>
      <exec-default>deny</exec-default>
 
diff --git a/test/test_nacm_ext.sh b/test/test_nacm_ext.sh
index f0fdf0a5..bb9302bc 100755
--- a/test/test_nacm_ext.sh
+++ b/test/test_nacm_ext.sh
@@ -76,7 +76,7 @@ EOF
 cat <<EOF > $nacmfile
    <nacm>
      <enable-nacm>true</enable-nacm>
-     <read-default>deny</read-default>
+     <read-default>permit</read-default>
      <write-default>deny</write-default>
      <exec-default>deny</exec-default>
 
diff --git a/test/test_nacm_module.sh b/test/test_nacm_module.sh
index 0ac5f9d5..d8427f5a 100755
--- a/test/test_nacm_module.sh
+++ b/test/test_nacm_module.sh
@@ -1,16 +1,17 @@
 #!/bin/bash
 # Authentication and authorization and IETF NACM
 # NACM module rules
+# A module rule has the "module-name" leaf set but no nodes from the
+# "rule-type" choice set.
 # @see test_nacm.sh is slightly modified - this follows the RFC more closely
 # See RFC 8341 A.1 and A.2
 # Note: use clixon-example instead of ietf-netconf-monitoring since the latter is
-# not yet implemented
 # Tests for 
 # deny-ncm:  This rule prevents the "guest" group from reading any
-#     monitoring information in the "ietf-netconf-monitoring" YANG
+#     monitoring information in the "clixon-example" YANG
 #     module.
 # permit-ncm:  This rule allows the "limited" group to read the
-#     "ietf-netconf-monitoring" YANG module.
+#     "clixon-example" YANG module.
 # permit-exec:  This rule allows the "limited" group to invoke any
 #     protocol operation supported by the server.
 # permit-all:  This rule allows the "admin" group complete access to
@@ -75,13 +76,12 @@ RULES=$(cat <<EOF
 
      $NGROUPS
 
-
      <rule-list>
        <name>guest-acl</name>
        <group>guest</group>
        <rule>
          <name>deny-ncm</name>
-         <module-name>ietf-netconf-monitoring</module-name>
+         <module-name>clixon-example</module-name>
          <access-operations>*</access-operations>
          <action>deny</action>
          <comment>
@@ -95,8 +95,7 @@ RULES=$(cat <<EOF
        <group>limited</group>
        <rule>
          <name>permit-ncm</name>
-         <rpc-name>get</rpc-name>
-         <module-name>ietf-netconf-monitoring</module-name>
+         <module-name>clixon-example</module-name>
          <access-operations>read</access-operations>
          <action>permit</action>
          <comment>
@@ -119,6 +118,7 @@ RULES=$(cat <<EOF
    </nacm>
    <x xmlns="urn:example:nacm">42</x>
    <translate xmlns="urn:example:clixon"><k>key42</k><value>val42</value></translate>
+   <translate xmlns="urn:example:clixon"><k>key43</k><value>val43</value></translate>
 EOF
 )
 
@@ -157,35 +157,118 @@ expecteq "$(curl -u andy:bar -sS -X PUT -d '{"enable-nacm": true}' http://localh
 
 #--------------- nacm enabled
 
-# Read monitoring information from example - (ietf-netconf-monitoring)
+#----READ monitoring information from example - (ietf-netconf-monitoring)
+#user:admin
 new2 "admin read ok"
-expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/clixon-example:translate)" '{"clixon-example:translate": [{"k": "key42","value": "val42"}]}
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/clixon-example:translate)" '{"clixon-example:translate": [{"k": "key42","value": "val42"},{ "k": "key43","value": "val43"}]}
 
'
 
-new2 "limit read ok"
-expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/clixon-example:translate)" '{"clixon-example:translate": [{"k": "key42","value": "val42"}]}
+new2 "admin read netconf ok"
+expecteof "$clixon_netconf -U andy -qf $cfg" 0 '<rpc><get-config><source><candidate/></source><filter type="xpath" select="/translate"/></get-config></rpc>]]>]]>' '^<rpc-reply><data><translate xmlns="urn:example:clixon"><k>key42</k><value>val42</value></translate><translate xmlns="urn:example:clixon"><k>key43</k><value>val43</value></translate></data></rpc-reply>]]>]]>$'
+
+new2 "admin read element ok"
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/clixon-example:translate=key42/value)" '{"clixon-example:value": "val42"}
 
'
 
-new2 "guest read fail"
-expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/clixon-example:translate)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
-
-new2 "guest read other module"
-expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
-
 new2 "admin read other module OK"
 expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"nacm-example:x": 42}
 
'
 
+new2 "admin read state OK"
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": "42"}}
+
'
+
+new "admin read top ok (all)"
+ret=$(curl -u andy:bar -sS -X GET http://localhost/restconf/data)
+expect='{"data": {"nacm-example:x": 42,"clixon-example:translate":'
+match=`echo $ret | grep -EZo "$expect"`
+if [ -z "$match" ]; then
+    err "$expect" "$ret"
+fi
+
+#user:limit
+
+new2 "limit read ok"
+expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/clixon-example:translate)" '{"clixon-example:translate": [{"k": "key42","value": "val42"},{ "k": "key43","value": "val43"}]}
+
'
+
+new2 "limit read netconf ok"
+expecteof "$clixon_netconf -U wilma -qf $cfg" 0 '<rpc><get-config><source><candidate/></source><filter type="xpath" select="/translate"/></get-config></rpc>]]>]]>' '^<rpc-reply><data><translate xmlns="urn:example:clixon"><k>key42</k><value>val42</value></translate><translate xmlns="urn:example:clixon"><k>key43</k><value>val43</value></translate></data></rpc-reply>]]>]]>$'
+
+new2 "limit read element ok"
+expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/clixon-example:translate=key42/value)" '{"clixon-example:value": "val42"}
+
'
+
+new2 "limit read other module fail"
+expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" 'null
+
'
+
+new2 "limit read state OK"
+expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": "42"}}
+
'
+
+new2 "limit read top ok (part)"
+expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data)" '{"data": {"clixon-example:translate": [{"k": "key42","value": "val42"},{ "k": "key43","value": "val43"}],"clixon-example:state": {"op": "42"}}}
+
'
+
+#user:guest
+
+new2 "guest read fail"
+expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/clixon-example:translate)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+
+new2 "guest read netconf fail"
+expecteof "$clixon_netconf -U guest -qf $cfg" 0 '<rpc><get-config><source><candidate/></source><filter type="xpath" select="/translate"/></get-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>protocol</error-type><error-tag>access-denied</error-tag><error-severity>error</error-severity><error-message>default deny</error-message></rpc-error></rpc-reply>]]>]]>$'
+
+new2 "guest read element fail"
+expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/clixon-example:translate=key42/value)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+
+new2 "guest read other module fail"
+expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+
+new2 "guest read state fail"
+expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/clixon-example:state)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+
+new2 "guest read top ok (part)"
+expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+
+#------- RPC operation
+
 new2 "admin rpc ok"
 expecteq "$(curl -u andy:bar -s -X POST  -d '{"clixon-example:input":{"x":42}}' http://localhost/restconf/operations/clixon-example:example)" '{"clixon-example:output": {"x": "42","y": "42"}}
 
'
 
+new "admin rpc netconf ok"
+expecteof "$clixon_netconf -U andy -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><example xmlns="urn:example:clixon"><x>0</x></example></rpc>]]>]]>' '^<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><x xmlns="urn:example:clixon">0</x><y xmlns="urn:example:clixon">42</y></rpc-reply>]]>]]>$'
+
 new2 "limit rpc ok"
 expecteq "$(curl -u wilma:bar -s -X POST http://localhost/restconf/operations/clixon-example:example -d '{"clixon-example:input":{"x":42}}' )" '{"clixon-example:output": {"x": "42","y": "42"}}
 
'
 
+new "limit rpc netconf ok"
+expecteof "$clixon_netconf -U wilma -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><example xmlns="urn:example:clixon"><x>0</x></example></rpc>]]>]]>' '^<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><x xmlns="urn:example:clixon">0</x><y xmlns="urn:example:clixon">42</y></rpc-reply>]]>]]>$'
+
 new2 "guest rpc fail"
-expecteq "$(curl -u guest:bar -s -X POST http://localhost/restconf/operations/clixon-example:example -d '{"clixon-example:input":{"x":42}}' )" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+expecteq "$(curl -u guest:bar -s -X POST http://localhost/restconf/operations/clixon-example:example -d '{"clixon-example:input":{"x":42}}' )" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
+
+new "guest rpc netconf fail"
+expecteof "$clixon_netconf -U guest -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><example xmlns="urn:example:clixon"><x>0</x></example></rpc>]]>]]>' '^<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><rpc-error><error-type>protocol</error-type><error-tag>access-denied</error-tag><error-severity>error</error-severity><error-message>access denied</error-message></rpc-error></rpc-reply>]]>]]>$'
+
+#------------------ Set read-default permit
+
+new "admin set read-default permit"
+expecteq "$(curl -u andy:bar -sS -X PUT -d '{"read-default": "permit"}' http://localhost/restconf/data/ietf-netconf-acm:nacm/read-default)" ""
+
+new2 "limit read ok"
+expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/clixon-example:translate)" '{"clixon-example:translate": [{"k": "key42","value": "val42"},{ "k": "key43","value": "val43"}]}
+
'
+
+new2 "limit read other module ok"
+expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"nacm-example:x": 42}
+
'
+
+new2 "guest read state fail"
+expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/clixon-example:state)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+
 
 new "Kill restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"

From 342b94fb769d292c61adf90c35ccbeba191dfc20 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sun, 27 Jan 2019 14:45:39 +0100
Subject: [PATCH 46/72] nacm refactoring

---
 lib/src/clixon_nacm.c | 124 ++++++++++++++++++++++++++++--------------
 1 file changed, 83 insertions(+), 41 deletions(-)

diff --git a/lib/src/clixon_nacm.c b/lib/src/clixon_nacm.c
index 5a5ed3da..a29fe485 100644
--- a/lib/src/clixon_nacm.c
+++ b/lib/src/clixon_nacm.c
@@ -368,6 +368,75 @@ rule_datanode_read(cxobj  *xrule,
     return retval;
 }
 
+/*! Go through all rules for a requested node
+ * @param[in]  xt       XML root tree with "config" label 
+ * @param[in]  xr       Requested node (node in xt)
+ * @param[in]  gvec     NACM groups where user is member
+ * @param[in]  glen     Length of gvec
+ * @param[in]  rlistvec NACM rule-list entries
+ * @param[in]  rlistlen Length of rlistvec
+ * @param[out] xrulep  If set, then points to matching rule
+ */
+static int
+nacm_datanode_read_xr(cxobj  *xt,
+		      cxobj  *xr,
+		      cxobj **gvec,
+		      size_t  glen,
+		      cxobj **rlistvec,
+		      size_t  rlistlen,
+		      cxobj **xrulep
+		      )
+{
+    int retval = -1;
+    int i, j;
+    cxobj  *xrlist;
+    char   *gname;
+    cxobj **rvec = NULL; /* rules */
+    size_t  rlen;
+    cxobj  *xrule = NULL;
+    int     match = 0;
+
+    for (i=0; i<rlistlen; i++){ 	/* Loop through rule list */
+	xrlist = rlistvec[i];
+	/* Loop through user's group to find match in this rule-list */
+	for (j=0; j<glen; j++){
+	    gname = xml_find_body(gvec[j], "name");
+	    if (xpath_first(xrlist, ".[group='%s']", gname)!=NULL)
+		break; /* found */
+	}
+	if (j==glen) /* not found */
+	    continue;
+	/* 6. For each rule-list entry found, process all rules, in order,
+	   until a rule that matches the requested access operation is
+	   found. (see 6 sub rules in nacm_match_rule2)
+	*/
+	if (xpath_vec(xrlist, "rule", &rvec, &rlen) < 0)
+	    goto done;
+	for (j=0; j<rlen; j++){ /* Loop through rules */
+	    xrule = rvec[j];
+	    if (rule_datanode_read(xrule, xr, xt, &match) < 0)
+		goto done;
+	    if (match) /* xrule match */
+		break;
+	}
+	if (rvec){
+	    free(rvec);
+	    rvec=NULL;
+	}
+	if (match) /* xrule match */
+	    break;
+    }
+    if (match)
+	*xrulep = xrule;
+    else
+	*xrulep = NULL;
+    retval = 0;
+ done:
+    if (rvec)
+	free(rvec);
+    return retval;
+}
+
 /*! Make nacm datanode and module rule read access validation
  * Just purge nodes that fail validation (dont send netconf error message)
  * @param[in]  xt       XML root tree with "config" label 
@@ -450,21 +519,15 @@ nacm_datanode_read(cxobj  *xt,
 {
     int     retval = -1;
     cxobj **gvec = NULL; /* groups */
-    cxobj  *xr;
     size_t  glen;
-    cxobj  *xrlist;
+    cxobj  *xr;
     cxobj **rlistvec = NULL; /* rule-list */
     size_t  rlistlen;
     cxobj **rvec = NULL; /* rules */
-    size_t  rlen;
-    int     i, j, k;
+    int     i;
     char   *read_default = NULL;
-    char   *gname;
-    int     match;
     cxobj  *xrule;
     char   *action;
-
-
     
     /* 3.   Check all the "group" entries to see if any of them contain a
        "user-name" entry that equals the username for the session
@@ -485,36 +548,15 @@ nacm_datanode_read(cxobj  *xt,
         entry. */
     if (xpath_vec(xnacm, "rule-list", &rlistvec, &rlistlen) < 0)
 	goto done;
-    for (k=0; k<xrlen; k++){     /* Loop through requested nodes */
-	xr = xrvec[k]; /* requested node XR */
-	match = 0; /* Go thru steps 5,6,7, if no match do 8-13 */ 
-	for (i=0; i<rlistlen; i++){ 	/* Loop through rule list */
-	    xrlist = rlistvec[i];
-	    /* Loop through user's group to find match in this rule-list */
-	    for (j=0; j<glen; j++){
-		gname = xml_find_body(gvec[j], "name");
-		if (xpath_first(xrlist, ".[group='%s']", gname)!=NULL)
-		    break; /* found */
-	    }
-	    if (j==glen) /* not found */
-		continue;
-	    /* 6. For each rule-list entry found, process all rules, in order,
-	       until a rule that matches the requested access operation is
-	       found. (see 6 sub rules in nacm_match_rule2)
-	    */
-	    if (xpath_vec(xrlist, "rule", &rvec, &rlen) < 0)
-		goto done;
-	    for (j=0; j<rlen; j++){ /* Loop through rules */
-		xrule = rvec[j];
-		if (rule_datanode_read(xrule, xr, xt, &match) < 0)
-		    goto done;
-		if (match) /* xrule match */
-		    break;
-	    }
-	    if (match) /* xrule match */
-		break;
-	}
-	if (match){ /* xrule match requested node xr */
+    for (i=0; i<xrlen; i++){     /* Loop through requested nodes */
+	xr = xrvec[i]; /* requested node XR */
+	/* Loop through rule-list (steps 5,6,7) to find match of requested node
+	 */
+	xrule = NULL;
+	if (nacm_datanode_read_xr(xt, xr, gvec, glen, rlistvec, rlistlen,
+				  &xrule) < 0) 
+	    goto done;
+	if (xrule){ /* xrule match requested node xr */
 	    if ((action = xml_find_body(xrule, "action")) == NULL)
 		continue;
 	    if (strcmp(action, "deny")==0){
@@ -523,7 +565,7 @@ nacm_datanode_read(cxobj  *xt,
 	    }
 	    else if (strcmp(action, "permit")==0)
 		;/* XXX recursively find denies in xr and purge them 
-		  * ie go back to the k-loop with all sub-items?
+		  * ie call nacm_datanode_read_xr recursively?
 		  */
 	}
 	else{ /* no rule matching xr, apply default */
@@ -547,8 +589,8 @@ nacm_datanode_read(cxobj  *xt,
         "nacm:default-deny-all" statement, then the requested data node
         and all its descendants are not included in the reply.
     */
-    for (k=0; k<xrlen; k++)     /* Loop through requested nodes */
-	if (xml_purge(xrvec[k]) < 0)
+    for (i=0; i<xrlen; i++)     /* Loop through requested nodes */
+	if (xml_purge(xrvec[i]) < 0)
 	    goto done;
  ok:
     retval = 0;

From ef86cda2fea2466a5a39352e2f7a01b9f3086ac4 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Wed, 30 Jan 2019 10:02:17 +0100
Subject: [PATCH 47/72] NACM Data node WRITE access module support (RFC8341
 3.4.5)

---
 CHANGELOG.md                       |   6 +-
 apps/backend/backend_client.c      |   6 +-
 apps/cli/cli_generate.c            |   1 +
 datastore/text/clixon_xmldb_text.c |  65 ++++-
 lib/clixon/clixon_nacm.h           |  20 +-
 lib/src/clixon_nacm.c              | 444 ++++++++++++++++++++++++-----
 lib/src/clixon_yang.c              |   1 +
 lib/src/clixon_yang_type.c         |   2 +
 test/test_nacm_module.sh           |   4 +-
 test/test_nacm_module_write.sh     | 224 +++++++++++++++
 test/test_nacm_protocol.sh         |   2 +-
 11 files changed, 687 insertions(+), 88 deletions(-)
 create mode 100755 test/test_nacm_module_write.sh

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f5079e3..ec014366 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -77,12 +77,10 @@
     * CLICON_YANG_MAIN_FILE Provides a filename with a single module filename.
     * CLICON_YANG_MAIN_DIR Provides a directory where all yang modules should be loaded.
 * NACM extension (RFC8341)
-  * NACM Data node READ access module support (RFC8341 3.4.5)
+  * NACM Data node READ and WRITE access module support (RFC8341 3.4.5)
     * Access control points added for `get` and `get-config` in addition to incoming rpc.
     * RFC 8341 Example A.2 implemented, see: [test/test_nacm_module.sh]
-  * Remaining work:
-    * data-node module write/create/delete/update
-    * data-node path 
+  * Remaining work: data-node PATH  
   * Recovery user "_nacm_recovery" added.
     * Example use is restconf PUT when NACM edit-config is permitted, then automatic commit and discard are permitted using recovery user.
 	
diff --git a/apps/backend/backend_client.c b/apps/backend/backend_client.c
index c9efa40a..936f03f1 100644
--- a/apps/backend/backend_client.c
+++ b/apps/backend/backend_client.c
@@ -214,7 +214,7 @@ from_client_get_config(clicon_handle h,
 	goto ok;
     }
     /* Pre-NACM access step */
-    if ((ret = nacm_access(h, username, &xnacm)) < 0)
+    if ((ret = nacm_access_h(h, username, &xnacm)) < 0)
 	goto done;
     if (ret == 0){ /* Do NACM validation */
 	if (xpath_vec(xret, "%s", &xvec, &xlen, xpath?xpath:"/") < 0)
@@ -407,7 +407,7 @@ from_client_get(clicon_handle h,
 	goto ok;
     }
     /* Pre-NACM access step */
-    if ((ret = nacm_access(h, username, &xnacm)) < 0)
+    if ((ret = nacm_access_h(h, username, &xnacm)) < 0)
 	goto done;
     if (ret == 0){ /* Do NACM validation */
 	if (xpath_vec(xret, "%s", &xvec, &xlen, xpath?xpath:"/") < 0)
@@ -1052,7 +1052,7 @@ from_client_msg(clicon_handle        h,
 	clicon_debug(1, "%s module:%s rpc:%s", __FUNCTION__, module, rpc);
 	/* Pre-NACM access step */
 	xnacm = NULL;
-	if ((ret = nacm_access(h, username, &xnacm)) < 0)
+	if ((ret = nacm_access_h(h, username, &xnacm)) < 0)
 	    goto done;
 	if (ret == 0){ /* Do NACM validation */
 	    /* NACM rpc operation exec validation */
diff --git a/apps/cli/cli_generate.c b/apps/cli/cli_generate.c
index 70c126bd..62ed1e49 100644
--- a/apps/cli/cli_generate.c
+++ b/apps/cli/cli_generate.c
@@ -212,6 +212,7 @@ yang2cli_var_sub(clicon_handle h,
 	if (strcmp(type, "enumeration") == 0 || strcmp(type, "bits") == 0){
 	    cprintf(cb, " choice:"); 
 	    i = 0;
+	    yi = NULL;
 	    while ((yi = yn_each((yang_node*)ytype, yi)) != NULL){
 		if (yi->ys_keyword != Y_ENUM && yi->ys_keyword != Y_BIT)
 		    continue;
diff --git a/datastore/text/clixon_xmldb_text.c b/datastore/text/clixon_xmldb_text.c
index 8c64616f..2e5ad5ea 100644
--- a/datastore/text/clixon_xmldb_text.c
+++ b/datastore/text/clixon_xmldb_text.c
@@ -615,6 +615,8 @@ text_modify(struct text_handle *th,
 	    cxobj              *x0p,
 	    cxobj              *x1,
 	    enum operation_type op,
+	    char               *username,
+	    cxobj              *xnacm,
 	    cbuf               *cbret)
 {
     int        retval = -1;
@@ -626,6 +628,7 @@ text_modify(struct text_handle *th,
     cxobj     *x0c; /* base child */
     cxobj     *x0b; /* base body */
     cxobj     *x1c; /* mod child */
+    char      *x0bstr; /* mod body string */
     char      *x1bstr; /* mod body string */
     yang_stmt *yc;  /* yang child */
     cxobj    **x0vec = NULL;
@@ -679,12 +682,33 @@ text_modify(struct text_handle *th,
 	    }
 	    if (x1bstr){
 		if ((x0b = xml_body_get(x0)) == NULL){
+		    if (xnacm){
+			if ((ret = nacm_datanode_write(NULL, x0, NACM_CREATE, username, xnacm, cbret)) < 0) 
+			    goto done;
+			if (ret == 0)
+			    goto fail;
+		    }
 		    if ((x0b = xml_new("body", x0, NULL)) == NULL)
 			goto done; 
 		    xml_type_set(x0b, CX_BODY);
+
+		    if (xml_value_set(x0b, x1bstr) < 0)
+			goto done;
 		}
-		if (xml_value_set(x0b, x1bstr) < 0)
-		    goto done;
+		else{
+		    x0bstr = xml_value(x0b);
+		    if (x0bstr==NULL || strcmp(x0bstr, x1bstr)){
+			if (xnacm){
+			    if ((ret = nacm_datanode_write(NULL, x0, NACM_UPDATE, username, xnacm, cbret)) < 0)
+				goto done;
+			    if (ret == 0)
+				goto fail;
+			}
+			if (xml_value_set(x0b, x1bstr) < 0)
+			    goto done;
+		    }
+		}
+
 	    }
 	    break;
 	case OP_DELETE:
@@ -784,7 +808,8 @@ text_modify(struct text_handle *th,
 		x1cname = xml_name(x1c);
 		x0c = x0vec[i++];
 		yc = yang_find_datanode(y0, x1cname);
-		if ((ret = text_modify(th, x0c, (yang_node*)yc, x0, x1c, op, cbret)) < 0)
+		if ((ret = text_modify(th, x0c, (yang_node*)yc, x0, x1c, op,
+				       username, xnacm, cbret)) < 0)
 		    goto done;
 		/* If xml return - ie netconf error xml tree, then stop and return OK */
 		if (ret == 0)
@@ -834,6 +859,8 @@ text_modify_top(struct text_handle *th,
 		cxobj              *x1,
 		yang_spec          *yspec,
 		enum operation_type op,
+		char               *username,
+		cxobj              *xnacm,
 		cbuf               *cbret)
 {
     int        retval = -1;
@@ -860,6 +887,10 @@ text_modify_top(struct text_handle *th,
 	    case OP_DELETE:
 	    case OP_REMOVE:
 	    case OP_REPLACE:
+		if ((ret = nacm_datanode_write(NULL, x0, NACM_DELETE, username, xnacm, cbret)) < 0) /* XXX */
+		    goto done;
+		if (ret == 0)
+		    goto fail;
 		x0c = NULL;
 		while ((x0c = xml_child_each(x0, x0c, CX_ELMNT)) != NULL) 
 		    xml_purge(x0c);
@@ -914,7 +945,8 @@ text_modify_top(struct text_handle *th,
 	    x0c = NULL;
 	}
 #endif
-	if ((ret = text_modify(th, x0c, (yang_node*)yc, x0, x1c, op, cbret)) < 0)
+	if ((ret = text_modify(th, x0c, (yang_node*)yc, x0, x1c, op,
+			       username,xnacm, cbret)) < 0)
 	    goto done;
 	/* If xml return - ie netconf error xml tree, then stop and return OK */
 	if (ret == 0)
@@ -997,6 +1029,7 @@ text_put(xmldb_handle        xh,
     cxobj              *x0 = NULL;
     struct db_element  *de = NULL;
     int                 ret;
+    cxobj              *xnacm = NULL; 
     
     if (cbret == NULL){
 	clicon_err(OE_XML, EINVAL, "cbret is NULL");
@@ -1056,12 +1089,34 @@ text_put(xmldb_handle        xh,
 #if 0 /* debug */
     if (xml_apply0(x1, -1, xml_sort_verify, NULL) < 0)
 	clicon_log(LOG_NOTICE, "%s: verify failed #1", __FUNCTION__);
+#endif
+#if 1
+    {
+	char  *mode;
+	cxobj *xnacm0 = NULL;
+	
+	mode = th->th_nacm_mode;
+	if (mode){
+	    if (strcmp(mode, "external")==0)
+		xnacm0 = th->th_nacm_xtree;
+	    else if (strcmp(mode, "internal")==0)
+		xnacm0 = x0;
+	}
+	if (xnacm0 != NULL &&
+	    (xnacm = xpath_first(xnacm0, "nacm")) != NULL){
+	    /* Pre-NACM access step */
+	    if ((ret = nacm_access(mode, xnacm, username)) < 0)
+		goto done;
+	}
+	/* Here assume if xnacm is set (actually may be ret==0?) do NACM */
+    }
+
 #endif
     /* 
      * Modify base tree x with modification x1. This is where the
      * new tree is made.
      */
-    if ((ret = text_modify_top(th, x0, x1, yspec, op, cbret)) < 0)
+    if ((ret = text_modify_top(th, x0, x1, yspec, op, username, xnacm, cbret)) < 0)
 	goto done;
     /* If xml return - ie netconf error xml tree, then stop and return OK */
     if (ret == 0)
diff --git a/lib/clixon/clixon_nacm.h b/lib/clixon/clixon_nacm.h
index 670e7eec..f7a57318 100644
--- a/lib/clixon/clixon_nacm.h
+++ b/lib/clixon/clixon_nacm.h
@@ -45,11 +45,29 @@
  */
 #define NACM_RECOVERY_USER "_nacm_recovery"
 
+/*
+ * Types
+ */
+/* NACM access rights, 
+ * Note that these are not the same as netconf operations
+ * @see rfc8341 3.2.2
+ * @see enum operation_type  Netconf operations
+ */
+enum nacm_access{
+    NACM_CREATE,
+    NACM_READ,
+    NACM_UPDATE,
+    NACM_DELETE,
+    NACM_EXEC
+};
 /*
  * Prototypes
  */
 int nacm_rpc(char *rpc, char *module, char *username, cxobj *xnacm, cbuf *cbret);
 int nacm_datanode_read(cxobj *xt, cxobj **xvec, size_t xlen, char *username, cxobj *nacm_xtree);
-int nacm_access(clicon_handle h, char *username, cxobj **xnacmp);
+int nacm_datanode_write(cxobj *xt, cxobj *xr, enum nacm_access access,
+			char *username, cxobj *xnacm, cbuf *cbret);
+int nacm_access_h(clicon_handle h, char *username, cxobj **xnacmp);
+int nacm_access(char *mode, cxobj *xnacmin, char *username);
 
 #endif /* _CLIXON_NACM_H */
diff --git a/lib/src/clixon_nacm.c b/lib/src/clixon_nacm.c
index a29fe485..f24a429c 100644
--- a/lib/src/clixon_nacm.c
+++ b/lib/src/clixon_nacm.c
@@ -72,13 +72,16 @@
  * Incoming RPC Message Validation Step 7 (c)
  *  The rule's "access-operations" leaf has the "exec" bit set or
  *  has the special value "*".
+ * @param[in] mode  Primary mode, eg read, create, update, delete, exec
+ * @param[in] mode2 Secondary mode, eg "write"
  * @retval 0  No match
  * @retval 1  Match
  * @note access_operations is bit-fields
  */
 static int
-nacm_match_access(char *access_operations,
-		  char *mode)
+match_access(char *access_operations,
+	     char *mode,
+	     char *mode2)
 {
     if (access_operations==NULL)
 	return 0;
@@ -86,6 +89,8 @@ nacm_match_access(char *access_operations,
 	return 1;
     if (strstr(access_operations, mode)!=NULL)
 	return 1;
+    if (mode2 && strstr(access_operations, mode2)!=NULL)
+	return 1;
     return 0;
 }
 
@@ -146,7 +151,7 @@ nacm_rule_rpc(char         *rpc,
 	       module_rule, rpc_rule, access_operations, action);
     if (module_rule &&
 	(strcmp(module_rule,"*")==0 || strcmp(module_rule,module)==0)){
-	if (nacm_match_access(access_operations, "exec")){
+	if (match_access(access_operations, "exec", NULL)){
 	    if (rpc_rule==NULL ||
 		strcmp(rpc_rule, "*")==0 || strcmp(rpc_rule, rpc)==0){
 		/* Here is a matching rule */
@@ -171,13 +176,15 @@ nacm_rule_rpc(char         *rpc,
 /*! Process nacm incoming RPC message validation steps
  * @param[in]  module   Yang module name
  * @param[in]  rpc      rpc name
- * @param[in]  username User name making access
+ * @param[in]  username User name of requestor
  * @param[in]  xnacm    NACM xml tree
  * @param[out] cbret Cligen buffer result. Set to an error msg if retval=0.
  * @retval -1  Error
  * @retval  0  Not access and cbret set
  * @retval  1  Access
  * @see RFC8341 3.4.4.  Incoming RPC Message Validation
+ * @see nacm_datanode_write
+ * @see nacm_datanode_read
  */
 int
 nacm_rpc(char         *rpc,
@@ -190,7 +197,7 @@ nacm_rpc(char         *rpc,
     cxobj  *xrule;
     cxobj **gvec = NULL; /* groups */
     size_t  glen;
-    cxobj  *xrlist;
+    cxobj  *rlist;
     cxobj **rlistvec = NULL; /* rule-list */
     size_t  rlistlen;
     cxobj **rvec = NULL; /* rules */
@@ -198,6 +205,7 @@ nacm_rpc(char         *rpc,
     int     ret;
     int     i, j;
     char   *exec_default = NULL;
+    char   *gname;
     
     /* 3.   If the requested operation is the NETCONF <close-session>
        protocol operation, then the protocol operation is permitted.
@@ -224,12 +232,11 @@ nacm_rpc(char         *rpc,
     if (xpath_vec(xnacm, "rule-list", &rlistvec, &rlistlen) < 0)
 	goto done;
     for (i=0; i<rlistlen; i++){
-	xrlist = rlistvec[i];
+	rlist = rlistvec[i];
 	/* Loop through user's group to find match in this rule-list */
 	for (j=0; j<glen; j++){
-	    char *gname;
 	    gname = xml_find_body(gvec[j], "name");
-	    if (xpath_first(xrlist, ".[group='%s']", gname)!=NULL)
+	    if (xpath_first(rlist, ".[group='%s']", gname)!=NULL)
 		break; /* found */
 	}
 	if (j==glen) /* not found */
@@ -238,7 +245,7 @@ nacm_rpc(char         *rpc,
 	   until a rule that matches the requested access operation is
 	   found. 
 	*/
-	if (xpath_vec(xrlist, "rule", &rvec, &rlen) < 0)
+	if (xpath_vec(rlist, "rule", &rvec, &rlen) < 0)
 	    goto done;
 	for (j=0; j<rlen; j++){
 	    xrule = rvec[j];
@@ -256,6 +263,10 @@ nacm_rpc(char         *rpc,
 		break;
 	    }
 	}
+	if (rvec){
+	    free(rvec);
+	    rvec=NULL;
+	}
     }
  step10:
     /*   10.  If the requested protocol operation is defined in a YANG module
@@ -296,18 +307,20 @@ nacm_rpc(char         *rpc,
 }
 
 /*---------------------------------------------------------------
- * Datanode read
+ * Datanode/module read
  */
 
 /*! We have a rule matching user group. Now match proper read operation and module
  * @see RFC8341 3.4.5.  Data Node Access Validation point (6)
- * 
+ * @retval -1 Error
+ * @retval  0 No Match
+ * @retval  1 Match
+ * @see rule_data_write
  */
 static int
-rule_datanode_read(cxobj  *xrule,
-		   cxobj  *xr,
-		   cxobj  *xt,
-		   int    *match)
+rule_data_read(cxobj  *xrule,
+	       cxobj  *xr,
+	       cxobj  *xt)
 {
     int        retval = -1;
     cxobj     *xp; /* parent */
@@ -319,7 +332,6 @@ rule_datanode_read(cxobj  *xrule,
     char      *path;
     cxobj     *xpath; /* xpath match */
 
-    *match = 0;
     /*  6b) Either (1) the rule does not have a "rule-type" defined or
 	(2) the "rule-type" is "data-node" and the "path" matches the
 	requested data node, action node, or notification node.  A
@@ -332,7 +344,7 @@ rule_datanode_read(cxobj  *xrule,
     /* 6c) For a "read" access operation, the rule's "access-operations"
 	leaf has the "read" bit set or has the special value "*" */
     access_operations = xml_find_body(xrule, "access-operations");
-    if (!nacm_match_access(access_operations, "read"))
+    if (!match_access(access_operations, "read", NULL))
 	goto nomatch;
     /* 6a) The rule's "module-name" leaf is "*" or equals the name of
      * the YANG module where the requested data node is defined. */
@@ -361,11 +373,12 @@ rule_datanode_read(cxobj  *xrule,
 	} while ((xp = xml_parent(xp)) != NULL);
     }
  match:
-    *match = 1;
+    retval = 1;
+ done:
+    return retval;
  nomatch:
     retval = 0;
-    // done:
-    return retval;
+    goto done;
 }
 
 /*! Go through all rules for a requested node
@@ -378,18 +391,17 @@ rule_datanode_read(cxobj  *xrule,
  * @param[out] xrulep  If set, then points to matching rule
  */
 static int
-nacm_datanode_read_xr(cxobj  *xt,
-		      cxobj  *xr,
-		      cxobj **gvec,
-		      size_t  glen,
-		      cxobj **rlistvec,
-		      size_t  rlistlen,
-		      cxobj **xrulep
-		      )
+nacm_data_read_xr(cxobj  *xt,
+		  cxobj  *xr,
+		  cxobj **gvec,
+		  size_t  glen,
+		  cxobj **rlistvec,
+		  size_t  rlistlen,
+		  cxobj **xrulep)
 {
     int retval = -1;
     int i, j;
-    cxobj  *xrlist;
+    cxobj  *rlist;
     char   *gname;
     cxobj **rvec = NULL; /* rules */
     size_t  rlen;
@@ -397,24 +409,24 @@ nacm_datanode_read_xr(cxobj  *xt,
     int     match = 0;
 
     for (i=0; i<rlistlen; i++){ 	/* Loop through rule list */
-	xrlist = rlistvec[i];
+	rlist = rlistvec[i];
 	/* Loop through user's group to find match in this rule-list */
 	for (j=0; j<glen; j++){
 	    gname = xml_find_body(gvec[j], "name");
-	    if (xpath_first(xrlist, ".[group='%s']", gname)!=NULL)
+	    if (xpath_first(rlist, ".[group='%s']", gname)!=NULL)
 		break; /* found */
 	}
 	if (j==glen) /* not found */
 	    continue;
 	/* 6. For each rule-list entry found, process all rules, in order,
 	   until a rule that matches the requested access operation is
-	   found. (see 6 sub rules in nacm_match_rule2)
+	   found. (see 6 sub rules in rule_data_read)
 	*/
-	if (xpath_vec(xrlist, "rule", &rvec, &rlen) < 0)
+	if (xpath_vec(rlist, "rule", &rvec, &rlen) < 0)
 	    goto done;
 	for (j=0; j<rlen; j++){ /* Loop through rules */
 	    xrule = rvec[j];
-	    if (rule_datanode_read(xrule, xr, xt, &match) < 0)
+	    if ((match = rule_data_read(xrule, xr, xt)) < 0)
 		goto done;
 	    if (match) /* xrule match */
 		break;
@@ -443,11 +455,10 @@ nacm_datanode_read_xr(cxobj  *xt,
  * @param[in]  xrvec    Vector of requested nodes (sub-part of xt)
  * @param[in]  xrlen    Length of requsted node vector
  * @param[in]  username 
- * @param[in]  xaxm     NACM xml tree
+ * @param[in]  xnacm     NACM xml tree
  * @retval -1  Error
  * @retval  0  Not access and cbret set
  * @retval  1  Access
- * @see RFC8341 3.4.5.  Data Node Access Validation
  * 3.2.4: <get> and <get-config> Operations
  * Data nodes to which the client does not have read access are silently
  * omitted, along with any descendants, from the <rpc-reply> message.
@@ -509,6 +520,9 @@ nacm_datanode_read_xr(cxobj  *xt,
  *
  * A module rule has the "module-name" leaf set but no nodes from the
  * "rule-type" choice set.
+ * @see RFC8341 3.4.5.  Data Node Access Validation
+ * @see nacm_datanode_write
+ * @see nacm_rpc
  */
 int
 nacm_datanode_read(cxobj  *xt,
@@ -523,7 +537,6 @@ nacm_datanode_read(cxobj  *xt,
     cxobj  *xr;
     cxobj **rlistvec = NULL; /* rule-list */
     size_t  rlistlen;
-    cxobj **rvec = NULL; /* rules */
     int     i;
     char   *read_default = NULL;
     cxobj  *xrule;
@@ -553,8 +566,8 @@ nacm_datanode_read(cxobj  *xt,
 	/* Loop through rule-list (steps 5,6,7) to find match of requested node
 	 */
 	xrule = NULL;
-	if (nacm_datanode_read_xr(xt, xr, gvec, glen, rlistvec, rlistlen,
-				  &xrule) < 0) 
+	if (nacm_data_read_xr(xt, xr, gvec, glen, rlistvec, rlistlen,
+			      &xrule) < 0) 
 	    goto done;
 	if (xrule){ /* xrule match requested node xr */
 	    if ((action = xml_find_body(xrule, "action")) == NULL)
@@ -565,7 +578,7 @@ nacm_datanode_read(cxobj  *xt,
 	    }
 	    else if (strcmp(action, "permit")==0)
 		;/* XXX recursively find denies in xr and purge them 
-		  * ie call nacm_datanode_read_xr recursively?
+		  * ie call nacm_data_read_xr recursively?
 		  */
 	}
 	else{ /* no rule matching xr, apply default */
@@ -596,6 +609,235 @@ nacm_datanode_read(cxobj  *xt,
     retval = 0;
  done:
     clicon_debug(1, "%s retval:%d", __FUNCTION__, retval);
+    if (gvec)
+	free(gvec);
+    if (rlistvec)
+	free(rlistvec);
+    return retval;
+}
+
+/*---------------------------------------------------------------
+ * Datanode/module write (=create, delete, update)
+ */
+
+/*! We have a rule matching user group. Now match proper write operation and module
+ * @retval -1 Error
+ * @retval  0 No Match
+ * @retval  1 Match
+ * @see RFC8341 3.4.5.  Data Node Access Validation point (6)
+ * @see rule_data_read
+ */
+static int
+rule_data_write(cxobj           *xt,
+		cxobj           *xr,
+		cxobj           *xrule,
+		enum nacm_access access)
+{
+    int        retval = -1;
+    char      *path;
+    char      *access_operations;
+    char      *module_rule; /* rule module name */
+    yang_stmt *ys;
+    yang_stmt *ymod;
+    char      *module;
+    cxobj     *xpath; /* xpath match */
+    cxobj     *xp; /* parent */
+   
+    /*  6b) Either (1) the rule does not have a "rule-type" defined or
+	(2) the "rule-type" is "data-node" and the "path" matches the
+	requested data node, action node, or notification node.  A
+	path is considered to match if the requested node is the node
+	specified by the path or is a descendant node of the path.*/    
+    if ((path = xml_find_body(xrule, "path")) == NULL){
+	if (xml_find_body(xrule, "rpc-name") ||xml_find_body(xrule, "notification-name"))
+	    goto nomatch;
+    }
+    /* 6c) For a "read" access operation, the rule's "access-operations"
+	leaf has the "read" bit set or has the special value "*" */
+
+    /*  6d) For a "create" access operation, the rule's
+           "access-operations" leaf has the "create" bit set or has the
+           special value "*".
+        6e) For a "delete" access operation, the rule's
+           "access-operations" leaf has the "delete" bit set or has the
+           special value "*".
+        6f) For an "update" access operation, the rule's
+           "access-operations" leaf has the "update" bit set or has the
+           special value "*". */
+    access_operations = xml_find_body(xrule, "access-operations");
+    switch (access){
+    case NACM_CREATE:
+	if (!match_access(access_operations, "create", "write"))
+	    goto nomatch;
+	break;
+    case NACM_UPDATE:
+	if (!match_access(access_operations, "update", "write"))
+	    goto nomatch;
+	break;
+    case NACM_DELETE:
+	if (!match_access(access_operations, "delete", "write"))
+	    goto nomatch;
+	break;
+    default:
+	break;
+    }
+        /* 6a) The rule's "module-name" leaf is "*" or equals the name of
+     * the YANG module where the requested data node is defined. */
+    if ((module_rule = xml_find_body(xrule, "module-name")) == NULL)
+	goto nomatch;
+    if (strcmp(module_rule,"*")!=0){
+	if ((ys = xml_spec(xr)) == NULL)
+	    goto nomatch;
+	ymod = ys_module(ys);
+	module = ymod->ys_argument;
+	if (strcmp(module, module_rule) != 0)
+	    goto nomatch;
+    }
+    /* Here module is matched, now check for path if any */
+    if (path){ 
+	if ((xpath = xpath_first(xt, "%s", path)) == NULL)
+	    goto nomatch;
+	/* The requested node xr is the node specified by the path or is a 
+	 * descendant node of the path:
+	 * xmatch is one of xvec[] or an ancestor of the xvec[] nodes.
+	 */
+	xp = xr;
+	do {
+	    if (xpath == xp)
+		goto match;
+	} while ((xp = xml_parent(xp)) != NULL);
+    }
+ match:
+    retval = 1;
+ done:
+    return retval;
+ nomatch:
+    retval = 0;
+    goto done;
+}
+	      
+/*! Make nacm datanode and module rule write access validation
+ * The operations of NACM are: create, read, update, delete, exec
+ *  where write is short-hand for create+delete+update
+ * @param[in]  xt       XML root tree with "config" label. XXX?
+ * @param[in]  xr       XML requestor node (part of xt)
+ * @param[in]  op       NACM access of xr
+ * @param[in]  username User making access
+ * @param[in]  xnacm    NACM xml tree
+ * @param[out] cbret Cligen buffer result. Set to an error msg if retval=0.
+ * @retval -1  Error
+ * @retval  0  Not access and cbret set
+ * @retval  1  Access
+ * @see RFC8341 3.4.5.  Data Node Access Validation
+ * @see nacm_datanode_read
+ * @see nacm_rpc
+ */
+int
+nacm_datanode_write(cxobj           *xt,
+		    cxobj           *xr,
+		    enum nacm_access access,
+		    char            *username,
+		    cxobj           *xnacm,
+		    cbuf            *cbret)
+{
+    int retval = -1;
+    cxobj **gvec = NULL; /* groups */
+    size_t  glen;
+    cxobj **rlistvec = NULL; /* rule-list */
+    size_t  rlistlen;
+    cxobj  *rlist;
+    cxobj **rvec = NULL; /* rules */
+    size_t  rlen;
+    int     i, j;
+    char   *gname;
+    cxobj  *xrule;
+    int     match = 0;
+    char   *action;
+    char   *write_default;
+    
+    if (xnacm == NULL)
+	goto permit;
+    /* 3.   Check all the "group" entries to see if any of them contain a
+       "user-name" entry that equals the username for the session
+       making the request.  (If the "enable-external-groups" leaf is
+       "true", add to these groups the set of groups provided by the
+       transport layer.)	       */
+    if (username == NULL)
+	goto step9;
+    /* User's group */
+    if (xpath_vec(xnacm, "groups/group[user-name='%s']", &gvec, &glen, username) < 0)
+	goto done;
+    /* 4. If no groups are found, continue with step 9. */
+    if (glen == 0)
+	goto step9;
+    /* 5. Process all rule-list entries, in the order they appear in the
+        configuration.  If a rule-list's "group" leaf-list does not
+        match any of the user's groups, proceed to the next rule-list
+        entry. */
+    if (xpath_vec(xnacm, "rule-list", &rlistvec, &rlistlen) < 0)
+	goto done;
+    for (i=0; i<rlistlen; i++){
+	rlist = rlistvec[i];
+    	/* Loop through user's group to find match in this rule-list */
+	for (j=0; j<glen; j++){
+	    gname = xml_find_body(gvec[j], "name");
+	    if (xpath_first(rlist, ".[group='%s']", gname)!=NULL)
+		break; /* found */
+	}
+	if (j==glen) /* not found */
+	    continue;
+	if (xpath_vec(rlist, "rule", &rvec, &rlen) < 0)
+	    goto done;
+	/* 6. For each rule-list entry found, process all rules, in order,
+	   until a rule that matches the requested access operation is
+	   found. (see 6 sub rules in nacm_match_rule2)
+	*/
+	for (j=0; j<rlen; j++){ /* Loop through rules */
+	    xrule = rvec[j];
+	    if ((match = rule_data_write(xt, xr, xrule, access)) < 0)
+		goto done;
+	    if (match) /* match */
+		break;
+	}
+	if (match)
+	    break;
+    }
+    if (match){
+	if ((action = xml_find_body(xrule, "action")) == NULL)
+	    goto step9;
+	if (strcmp(action, "deny")==0){
+	    if (netconf_access_denied(cbret, "application", "access denied") < 0)
+		goto done;
+	    goto deny;
+	}
+	else if (strcmp(action, "permit")==0)
+	    goto permit;
+
+    }
+    /*  8.   At this point, no matching rule was found in any rule-list
+	entry. */
+ step9:   
+    /* 10.  For a "write" access operation, if the requested data node is
+        defined in a YANG module advertised in the server capabilities
+        and the data definition statement contains a
+        "nacm:default-deny-write" or a "nacm:default-deny-all"
+        statement, then the access request is denied for the data node
+        and all its descendants.
+	XXX
+    */
+    /*12.  For a "write" access operation, if the "write-default" leaf is
+        set to "permit", then permit the data node access request;
+        otherwise, deny the request.*/
+    write_default = xml_find_body(xnacm, "write-default");
+    if (write_default == NULL  || strcmp(write_default, "permit") != 0){
+	if (netconf_access_denied(cbret, "application", "default deny") < 0)
+	    goto done;
+	goto deny;
+    }
+ permit:
+    retval = 1;
+ done:
+    clicon_debug(1, "%s retval:%d (0:deny 1:permit)", __FUNCTION__, retval);
     if (gvec)
 	free(gvec);
     if (rlistvec)
@@ -603,21 +845,28 @@ nacm_datanode_read(cxobj  *xt,
     if (rvec)
 	free(rvec);
     return retval;
+ deny: /* Here, cbret must contain a netconf error msg */
+    assert(cbuf_len(cbret));
+    retval = 0;
+    goto done;
 }
 
+/*---------------------------------------------------------------
+ * NACM pre-procesing
+ */
+
 /*! NACM intial pre- access control enforcements 
  * Initial NACM steps and common to all NACM access validation.
  * If retval=0 continue with next NACM step, eg rpc, module, 
  * etc. If retval = 1 access is OK and skip next NACM step.
  * @param[in]  h        Clicon handle
- * @param[in]  username
- * @param[out] xncam    NACM XML tree, set if retval=0. Free after use
+ * @param[in]  xnacm    NACM XML tree, root should be "nacm"
+ * @param[in]  username User name of requestor
  * @retval -1  Error
- * @retval  0  OK not yet permit/. continue with next NACM step using xnacm
- * @retval  1  OK permitted. dont do next NACM step
+ * @retval  0  OK but not validated. Need to do NACM step using xnacm
+ * @retval  1  OK permitted. You do not need to do next NACM step
  * @code
- *   cxobj *xnacm = NULL;
- *   if ((ret = nacm_access(h, username, &xnacm)) < 0)
+ *   if ((ret = nacm_access(mode, xnacm, username)) < 0)
  *     err;
  *   if (ret == 0){
  *      // Next step NACM processing
@@ -627,47 +876,27 @@ nacm_datanode_read(cxobj  *xt,
  * @see RFC8341 3.4 Access Control Enforcement Procedures
  */
 int
-nacm_access(clicon_handle  h,
-	    char          *username,
-	    cxobj        **xnacmp)
+nacm_access(char          *mode,
+	    cxobj         *xnacm,
+	    char          *username)
 {
     int     retval = -1;
     cxobj  *xnacm0 = NULL;
-    cxobj  *xnacm;
-    char   *mode;
     char   *enabled;
     cxobj  *x;
     
     clicon_debug(1, "%s", __FUNCTION__);
-    mode = clicon_option_str(h, "CLICON_NACM_MODE");
     if (mode == NULL || strcmp(mode, "disabled") == 0)
 	goto permit;
     /* 0. If nacm-mode is external, get NACM defintion from separet tree,
        otherwise get it from internal configuration */
-    if (strcmp(mode, "external")==0){
-	cxobj *xne;
-	if ((xne = clicon_nacm_ext(h)) == NULL){
-	    clicon_err(OE_XML, 0, "No nacm external tree");
-	    goto done;
-	}
-	if ((xnacm0 = xml_dup(xne)) == NULL)
-	    goto done;
-    }
-    else if (strcmp(mode, "internal")==0){
-	if (xmldb_get(h, "running", "nacm", 0, &xnacm0) < 0)
-	    goto done;	
-    }
-    else{
-	clicon_err(OE_UNIX, 0, "Invalid NACM mode: %s", mode);
+    if (strcmp(mode, "external") && strcmp(mode, "internal")){
+	clicon_err(OE_XML, 0, "Invalid NACM mode: %s", mode);
 	goto done;
     }
     /* If config does not exist, then the operation is permitted. (?) */
-    if ((xnacm = xpath_first(xnacm0, "nacm")) == NULL)
+    if (xnacm == NULL)
 	goto permit;
-    if (xml_rootchild_node(xnacm0, xnacm) < 0)
-	goto done;
-    xnacm0 = NULL;
-    *xnacmp = xnacm;
     /* Do initial nacm processing common to all access validation in
      * RFC8341 3.4 */
     /* 1.   If the "enable-nacm" leaf is set to "false", then the protocol
@@ -692,3 +921,74 @@ nacm_access(clicon_handle  h,
     retval = 1;
     goto done;
 }
+
+/*! NACM intial pre- access control enforcements 
+ * Initial NACM steps and common to all NACM access validation.
+ * If retval=0 continue with next NACM step, eg rpc, module, 
+ * etc. If retval = 1 access is OK and skip next NACM step.
+ * @param[in]  h        Clicon handle
+ * @param[in]  username User name of requestor
+ * @param[out] xncam    NACM XML tree, set if retval=0. Free after use
+ * @retval -1  Error
+ * @retval  0  OK but not validated. Need to do NACM step using xnacm
+ * @retval  1  OK permitted. You do not need to do next NACM step
+ * @code
+ *   cxobj *xnacm = NULL;
+ *   if ((ret = nacm_access_h(h, username, &xnacm)) < 0)
+ *     err;
+ *   if (ret == 0){
+ *      // Next step NACM processing
+ *      xml_free(xnacm);
+ *   }
+ * @endcode
+ * @see RFC8341 3.4 Access Control Enforcement Procedures
+ */
+
+int
+nacm_access_h(clicon_handle  h,
+	      char          *username,
+	      cxobj        **xnacmp)
+{
+    int    retval = -1;
+    char  *mode;
+    cxobj *x;
+    cxobj *xnacm0 = NULL;
+    cxobj *xnacm = NULL;
+    
+    if ((mode = clicon_option_str(h, "CLICON_NACM_MODE")) != NULL){
+	if (strcmp(mode, "external")==0){
+	    if ((x = clicon_nacm_ext(h)))
+		if ((xnacm0 = xml_dup(x)) == NULL)
+		    goto done;
+	}
+	else if (strcmp(mode, "internal")==0){
+	    if (xmldb_get(h, "running", "nacm", 0, &xnacm0) < 0)
+		goto done;
+	}
+    }
+    /* If config does not exist then the operation is permitted(?) */
+    if (xnacm0 == NULL)
+	goto permit;
+    /* If config does not exist then the operation is permitted(?) */
+    if ((xnacm = xpath_first(xnacm0, "nacm")) == NULL)
+	goto permit;
+    if (xml_rootchild_node(xnacm0, xnacm) < 0)
+	goto done;
+    xnacm0 = NULL;
+    if ((retval = nacm_access(mode, xnacm, username)) < 0)
+	goto done;
+    if (retval == 0){ /* if retval == 0 then return an xml nacm tree */
+	*xnacmp = xnacm;
+	xnacm = NULL;
+    }
+ done:
+    if (xnacm0)
+	xml_free(xnacm0);
+    else if (xnacm)
+	xml_free(xnacm);
+    return retval;
+ permit:
+    retval = 1;
+    goto done;
+}
+
diff --git a/lib/src/clixon_yang.c b/lib/src/clixon_yang.c
index ea4852dd..bd6b2a68 100644
--- a/lib/src/clixon_yang.c
+++ b/lib/src/clixon_yang.c
@@ -1389,6 +1389,7 @@ ys_populate_identity(yang_stmt *ys,
     /* Iterate through all base statements and check the base identity exists 
      * AND populate the base identity recursively
      */
+    yc = NULL;
     while ((yc = yn_each((yang_node*)ys, yc)) != NULL) {
 	if (yc->ys_keyword != Y_BASE)
 	    continue;
diff --git a/lib/src/clixon_yang_type.c b/lib/src/clixon_yang_type.c
index ce43aec3..1ea116b7 100644
--- a/lib/src/clixon_yang_type.c
+++ b/lib/src/clixon_yang_type.c
@@ -475,6 +475,7 @@ cv_validate1(cg_var      *cv,
 	if (restype){
 	    if (strcmp(restype, "enumeration") == 0){
 		found = 0;
+		yi = NULL;
 		while ((yi = yn_each((yang_node*)yrestype, yi)) != NULL){
 		    if (yi->ys_keyword != Y_ENUM)
 			continue;
@@ -500,6 +501,7 @@ cv_validate1(cg_var      *cv,
 		    if ((v = vec[i]) == NULL || !strlen(v))
 			continue;
 		    found = 0;
+		    yi = NULL;
 		    while ((yi = yn_each((yang_node*)yrestype, yi)) != NULL){
 			if (yi->ys_keyword != Y_BIT)
 			    continue;
diff --git a/test/test_nacm_module.sh b/test/test_nacm_module.sh
index d8427f5a..34356ba2 100755
--- a/test/test_nacm_module.sh
+++ b/test/test_nacm_module.sh
@@ -80,7 +80,7 @@ RULES=$(cat <<EOF
        <name>guest-acl</name>
        <group>guest</group>
        <rule>
-         <name>deny-ncm</name>
+         <name>permit-read</name>
          <module-name>clixon-example</module-name>
          <access-operations>*</access-operations>
          <action>deny</action>
@@ -157,7 +157,7 @@ expecteq "$(curl -u andy:bar -sS -X PUT -d '{"enable-nacm": true}' http://localh
 
 #--------------- nacm enabled
 
-#----READ monitoring information from example - (ietf-netconf-monitoring)
+#----READ access
 #user:admin
 new2 "admin read ok"
 expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/clixon-example:translate)" '{"clixon-example:translate": [{"k": "key42","value": "val42"},{ "k": "key43","value": "val43"}]}
diff --git a/test/test_nacm_module_write.sh b/test/test_nacm_module_write.sh
new file mode 100755
index 00000000..5351ab33
--- /dev/null
+++ b/test/test_nacm_module_write.sh
@@ -0,0 +1,224 @@
+#!/bin/bash
+# Authentication and authorization and IETF NACM
+# NACM module rules
+# A module rule has the "module-name" leaf set but no nodes from the
+# "rule-type" choice set.
+# @see test_nacm.sh is slightly modified - this follows the RFC more closely
+# See RFC 8341 A.1 and A.2
+# Note: use clixon-example instead of ietf-netconf-monitoring since the latter is
+# Tests for 
+# deny-ncm:  This rule prevents the "guest" group from reading any
+#     monitoring information in the "clixon-example" YANG
+#     module.
+# permit-ncm:  This rule allows the "limited" group to read the
+#     "clixon-example" YANG module.
+# permit-exec:  This rule allows the "limited" group to invoke any
+#     protocol operation supported by the server.
+# permit-all:  This rule allows the "admin" group complete access to
+#     all content in the server.  No subsequent rule will match for the
+#     "admin" group because of this module rule
+
+APPNAME=example
+# include err() and new() functions and creates $dir
+. ./lib.sh
+. ./nacm.sh
+
+cfg=$dir/conf_yang.xml
+fyang=$dir/nacm-example.yang
+
+cat <<EOF > $cfg
+<config>
+  <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
+  <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_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>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
+  <CLICON_BACKEND_DIR>/usr/local/lib/$APPNAME/backend</CLICON_BACKEND_DIR>
+  <CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
+  <CLICON_CLI_GENMODEL_COMPLETION>1</CLICON_CLI_GENMODEL_COMPLETION>
+  <CLICON_XMLDB_DIR>/usr/local/var/$APPNAME</CLICON_XMLDB_DIR>
+  <CLICON_XMLDB_PLUGIN>/usr/local/lib/xmldb/text.so</CLICON_XMLDB_PLUGIN>
+  <CLICON_RESTCONF_PRETTY>false</CLICON_RESTCONF_PRETTY>
+  <CLICON_NACM_MODE>internal</CLICON_NACM_MODE>
+</config>
+EOF
+
+cat <<EOF > $fyang
+module nacm-example{
+  yang-version 1.1;
+  namespace "urn:example:nacm";
+  prefix nacm;
+  import clixon-example {
+	prefix ex;
+  }
+  import ietf-netconf-acm {
+	prefix nacm;
+  }
+  leaf x{
+    type int32;
+    description "something to edit";
+  }
+}
+EOF
+
+# The groups are slightly modified from RFC8341 A.1 ($USER added in admin group)
+# The rule-list is from A.2 
+RULES=$(cat <<EOF
+   <nacm xmlns="urn:ietf:params:xml:ns:yang:ietf-netconf-acm">
+     <enable-nacm>false</enable-nacm>
+     <read-default>deny</read-default>
+     <write-default>deny</write-default>
+     <exec-default>deny</exec-default>
+
+     $NGROUPS
+
+     <rule-list>
+       <name>guest-acl</name>
+       <group>guest</group>
+       <rule>
+         <name>permit-get</name>
+         <module-name>ietf-netconf</module-name>
+         <rpc-name>*</rpc-name>
+         <access-operations>exec</access-operations>
+         <action>permit</action>
+         <comment>
+             Allow invocation of get rpc
+         </comment>
+       </rule>
+       <rule>
+         <name>permit-read</name>
+         <module-name>clixon-example</module-name>
+         <access-operations>read</access-operations>
+         <action>permit</action>
+         <comment>
+             Do not allow guests any access to the NETCONF
+             monitoring information.
+         </comment>
+       </rule>
+       <rule>
+         <name>deny-write</name>
+         <module-name>clixon-example</module-name>
+         <access-operations>*</access-operations>
+         <action>deny</action>
+         <comment>
+             Do not allow guests any access to the NETCONF
+             monitoring information.
+         </comment>
+       </rule>
+
+     </rule-list>
+     <rule-list>
+       <name>limited-acl</name>
+       <group>limited</group>
+       <rule>
+         <name>permit-ncm</name>
+         <module-name>clixon-example</module-name>
+         <access-operations>read create update delete</access-operations>
+         <action>permit</action>
+         <comment>
+             Allow write access to the NETCONF monitoring information.
+         </comment>
+       </rule>
+       <rule>
+         <name>permit-exec</name>
+         <module-name>*</module-name>
+         <access-operations>exec</access-operations>
+         <action>permit</action>
+         <comment>
+             Allow invocation of the supported server operations.
+         </comment>
+       </rule>
+     </rule-list>
+
+     $NADMIN
+
+   </nacm>
+   <x xmlns="urn:example:nacm">42</x>
+   <translate xmlns="urn:example:clixon"><k>key42</k><value>val42</value></translate>
+   <translate xmlns="urn:example:clixon"><k>key43</k><value>val43</value></translate>
+EOF
+)
+
+new "test params: -f $cfg"
+
+if [ $BE -ne 0 ]; then
+    new "kill old backend"
+    sudo clixon_backend -zf $cfg
+    if [ $? -ne 0 ]; then
+	err
+    fi
+    new "start backend -s init -f $cfg"
+    sudo $clixon_backend -s init -f $cfg -D $DBG
+    if [ $? -ne 0 ]; then
+	err
+    fi
+fi
+
+new "kill old restconf daemon"
+sudo pkill -u www-data -f "/www-data/clixon_restconf"
+
+sleep 1
+new "start restconf daemon (-a is enable basic authentication)"
+sudo su -c "$clixon_restconf -f $cfg -D $DBG -- -a" -s /bin/sh www-data &
+
+sleep $RCWAIT
+
+new "auth set authentication config"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><edit-config><target><candidate/></target><config>$RULES</config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "commit it"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "enable nacm"
+expecteq "$(curl -u andy:bar -sS -X PUT -d '{"enable-nacm": true}' http://localhost/restconf/data/ietf-netconf-acm:nacm/enable-nacm)" ""
+
+#--------------- nacm enabled
+#----WRITE access
+#user:admin
+new2 "admin read element ok"
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/clixon-example:translate=key42/value)" '{"clixon-example:value": "val42"}
+
'
+
+new "admin write element ok"
+expecteq "$(curl -u andy:bar -sS -X PUT http://localhost/restconf/data/clixon-example:translate=key42/value -d '{"clixon-example:value": "val99"}')"
+
+#user:limit
+new2 "limit read element ok"
+expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/clixon-example:translate=key42/value)" '{"clixon-example:value": "val99"}
+
'
+
+new "limit write element ok"
+expecteq "$(curl -u wilma:bar -sS -X PUT http://localhost/restconf/data/clixon-example:translate=key42/value -d '{"clixon-example:value": "val55"}')"
+
+#user:guest
+new2 "guest read element ok"
+expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/clixon-example:translate=key42/value)" '{"clixon-example:value": "val55"}
+
'
+
+new2 "guest write element ok"
+expecteq "$(curl -u guest:bar -sS -X PUT http://localhost/restconf/data/clixon-example:translate=key42/value -d '{"clixon-example:value": "val99"}')" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
+
+new "Kill restconf daemon"
+sudo pkill -u www-data -f "/www-data/clixon_restconf"
+
+if [ $BE -eq 0 ]; then
+    exit # BE
+fi
+
+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
+sudo clixon_backend -z -f $cfg
+if [ $? -ne 0 ]; then
+    err "kill backend"
+fi
+
+rm -rf $dir
diff --git a/test/test_nacm_protocol.sh b/test/test_nacm_protocol.sh
index 41dfdefb..211ccad6 100755
--- a/test/test_nacm_protocol.sh
+++ b/test/test_nacm_protocol.sh
@@ -75,7 +75,7 @@ RULES=$(cat <<EOF
    <nacm xmlns="urn:ietf:params:xml:ns:yang:ietf-netconf-acm">
      <enable-nacm>false</enable-nacm>
      <read-default>deny</read-default>
-     <write-default>deny</write-default>
+     <write-default>permit</write-default>
      <exec-default>deny</exec-default>
 
      $NGROUPS

From 8bf5cb0de549833a3c219c1232fcfa72de46645b Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Fri, 1 Feb 2019 14:56:45 +0100
Subject: [PATCH 48/72] NACM module access control point for edit-config

---
 CHANGELOG.md                                  |   4 +-
 datastore/text/clixon_xmldb_text.c            | 130 +++++++---
 test/test_list.sh                             |   2 +-
 test/test_nacm.sh                             |   3 -
 test/test_nacm_datanode.sh                    | 239 ------------------
 test/test_nacm_ext.sh                         |   3 -
 ...acm_module.sh => test_nacm_module_read.sh} |   0
 test/test_nacm_module_write.sh                | 222 +++++++++-------
 test/test_order.sh                            |   8 +-
 9 files changed, 237 insertions(+), 374 deletions(-)
 delete mode 100755 test/test_nacm_datanode.sh
 rename test/{test_nacm_module.sh => test_nacm_module_read.sh} (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec014366..cb4278be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -78,9 +78,9 @@
     * CLICON_YANG_MAIN_DIR Provides a directory where all yang modules should be loaded.
 * NACM extension (RFC8341)
   * NACM Data node READ and WRITE access module support (RFC8341 3.4.5)
-    * Access control points added for `get` and `get-config` in addition to incoming rpc.
+    * Access control points added for `get`, `get-config`, `edit-config` in addition to incoming rpc.
     * RFC 8341 Example A.2 implemented, see: [test/test_nacm_module.sh]
-  * Remaining work: data-node PATH  
+  * Remaining work: data-node PATH 
   * Recovery user "_nacm_recovery" added.
     * Example use is restconf PUT when NACM edit-config is permitted, then automatic commit and discard are permitted using recovery user.
 	
diff --git a/datastore/text/clixon_xmldb_text.c b/datastore/text/clixon_xmldb_text.c
index 2e5ad5ea..277e0373 100644
--- a/datastore/text/clixon_xmldb_text.c
+++ b/datastore/text/clixon_xmldb_text.c
@@ -601,6 +601,9 @@ text_get(xmldb_handle  xh,
  * @param[in]  x0p Parent of x0
  * @param[in]  x1  xml tree which modifies base
  * @param[in]  op  OP_MERGE, OP_REPLACE, OP_REMOVE, etc 
+ * @param[in]  username User name of requestor for nacm
+ * @param[in]  xnacm NACM XML tree 
+ * @param[in]  permit If set, NACM has permitted this tree on an upper level
  * @param[out] cbret  Initialized cligen buffer. Contains return XML if retval is 0.
  * @retval    -1     Error
  * @retval     0     Failed (cbret set)
@@ -617,6 +620,7 @@ text_modify(struct text_handle *th,
 	    enum operation_type op,
 	    char               *username,
 	    cxobj              *xnacm,
+	    int                 permit,
 	    cbuf               *cbret)
 {
     int        retval = -1;
@@ -655,6 +659,13 @@ text_modify(struct text_handle *th,
 	case OP_MERGE:
 	case OP_REPLACE:
 	    if (x0==NULL){
+		if ((op != OP_NONE) && !permit && xnacm){
+		    if ((ret = nacm_datanode_write(NULL, x1, NACM_CREATE, username, xnacm, cbret)) < 0) 
+			goto done;
+		    if (ret == 0)
+			goto fail;
+		    permit = 1;
+		}
 		//		int iamkey=0;
 		if ((x0 = xml_new(x1name, x0p, (yang_stmt*)y0)) == NULL)
 		    goto done;
@@ -681,25 +692,13 @@ text_modify(struct text_handle *th,
 		}
 	    }
 	    if (x1bstr){
-		if ((x0b = xml_body_get(x0)) == NULL){
-		    if (xnacm){
-			if ((ret = nacm_datanode_write(NULL, x0, NACM_CREATE, username, xnacm, cbret)) < 0) 
-			    goto done;
-			if (ret == 0)
-			    goto fail;
-		    }
-		    if ((x0b = xml_new("body", x0, NULL)) == NULL)
-			goto done; 
-		    xml_type_set(x0b, CX_BODY);
-
-		    if (xml_value_set(x0b, x1bstr) < 0)
-			goto done;
-		}
-		else{
+		if ((x0b = xml_body_get(x0)) != NULL){
 		    x0bstr = xml_value(x0b);
 		    if (x0bstr==NULL || strcmp(x0bstr, x1bstr)){
-			if (xnacm){
-			    if ((ret = nacm_datanode_write(NULL, x0, NACM_UPDATE, username, xnacm, cbret)) < 0)
+			if ((op != OP_NONE) && !permit && xnacm){
+			    if ((ret = nacm_datanode_write(NULL, x1,
+							   x0bstr==NULL?NACM_CREATE:NACM_UPDATE,
+							   username, xnacm, cbret)) < 0)
 				goto done;
 			    if (ret == 0)
 				goto fail;
@@ -708,7 +707,6 @@ text_modify(struct text_handle *th,
 			    goto done;
 		    }
 		}
-
 	    }
 	    break;
 	case OP_DELETE:
@@ -719,7 +717,14 @@ text_modify(struct text_handle *th,
 	    }
 	case OP_REMOVE: /* fall thru */
 	    if (x0){
-		xml_purge(x0);
+		if ((op != OP_NONE) && !permit && xnacm){
+		    if ((ret = nacm_datanode_write(NULL, x0, NACM_DELETE, username, xnacm, cbret)) < 0)
+			goto done;
+		    if (ret == 0)
+			goto fail;
+		}
+		if (xml_purge(x0) < 0)
+		    goto done;
 	    }
 	    break;
 	default:
@@ -735,6 +740,13 @@ text_modify(struct text_handle *th,
 		goto fail;
 	    }
 	case OP_REPLACE: /* fall thru */
+	    if (xnacm && !permit){
+		if ((ret = nacm_datanode_write(NULL, x1, x0?NACM_UPDATE:NACM_CREATE, username, xnacm, cbret)) < 0) 
+		    goto done;
+		if (ret == 0)
+		    goto fail;
+		permit = 1;
+	    }
 	    if (x0){
 		xml_purge(x0);
 		x0 = NULL;
@@ -742,10 +754,21 @@ text_modify(struct text_handle *th,
 	case OP_MERGE:  /* fall thru */
 	case OP_NONE: 
 	    /* Special case: anyxml, just replace tree, 
-	       See 7.10.3 of RFC6020bis */
+	       See rfc6020 7.10.3:n
+	       An anyxml node is treated as an opaque chunk of data.  This data
+	       can be modified in its entirety only.
+	       Any "operation" attributes present on subelements of an anyxml 
+	       node are ignored by the NETCONF server.*/
 	    if (y0->yn_keyword == Y_ANYXML){
 		if (op == OP_NONE)
 		    break;
+		if (xnacm && op==OP_MERGE && !permit){
+		    if ((ret = nacm_datanode_write(NULL, x0, x0?NACM_UPDATE:NACM_CREATE, username, xnacm, cbret)) < 0) 
+			goto done;
+		    if (ret == 0)
+			goto fail;
+		    permit = 1;
+		}
 		if (x0){
 		    xml_purge(x0);
 		}
@@ -756,6 +779,13 @@ text_modify(struct text_handle *th,
 		break;
 	    }
 	    if (x0==NULL){
+		if (xnacm && op==OP_MERGE && !permit){
+		    if ((ret = nacm_datanode_write(NULL, x0, x0?NACM_UPDATE:NACM_CREATE, username, xnacm, cbret)) < 0) 
+			goto done;
+		    if (ret == 0)
+			goto fail;
+		    permit = 1;
+		}
 		if ((x0 = xml_new(x1name, x0p, (yang_stmt*)y0)) == NULL)
 		    goto done;
 		/* Copy xmlns attributes */
@@ -809,7 +839,7 @@ text_modify(struct text_handle *th,
 		x0c = x0vec[i++];
 		yc = yang_find_datanode(y0, x1cname);
 		if ((ret = text_modify(th, x0c, (yang_node*)yc, x0, x1c, op,
-				       username, xnacm, cbret)) < 0)
+				       username, xnacm, permit, cbret)) < 0)
 		    goto done;
 		/* If xml return - ie netconf error xml tree, then stop and return OK */
 		if (ret == 0)
@@ -823,8 +853,16 @@ text_modify(struct text_handle *th,
 		goto fail;
 	    }
 	case OP_REMOVE: /* fall thru */
-	    if (x0)
-		xml_purge(x0);
+	    if (x0){
+		if (xnacm){
+		    if ((ret = nacm_datanode_write(NULL, x0, NACM_DELETE, username, xnacm, cbret)) < 0) 
+			goto done;
+		    if (ret == 0)
+			goto fail;
+		}
+		if (xml_purge(x0) < 0)
+		    goto done;
+	    }
 	    break;
 	default:
 	    break;
@@ -847,6 +885,8 @@ text_modify(struct text_handle *th,
  * @param[in]  x1    xml tree which modifies base
  * @param[in]  yspec Top-level yang spec (if y is NULL)
  * @param[in]  op    OP_MERGE, OP_REPLACE, OP_REMOVE, etc 
+ * @param[in]  username User name of requestor for nacm
+ * @param[in]  xnacm NACM XML tree 
  * @param[out] cbret  Initialized cligen buffer. Contains return XML if retval is 0.
  * @retval    -1     Error
  * @retval     0     Failed (cbret set)
@@ -871,6 +911,7 @@ text_modify_top(struct text_handle *th,
     yang_stmt *ymod;/* yang module */
     char      *opstr;
     int        ret;
+    int        permit = 0;
 
     /* Assure top-levels are 'config' */
     assert(x0 && strcmp(xml_name(x0),"config")==0);
@@ -881,39 +922,56 @@ text_modify_top(struct text_handle *th,
 	if (xml_operation(opstr, &op) < 0)
 	    goto done;
     /* Special case if x1 is empty, top-level only <config/> */
-    if (xml_child_nr(x1) == 0){ 
-	if (xml_child_nr(x0)) /* base tree not empty */
+    if (xml_child_nr_type(x1, CX_ELMNT) == 0){ 
+	if (xml_child_nr_type(x0, CX_ELMNT)){ /* base tree not empty */
 	    switch(op){ 
 	    case OP_DELETE:
 	    case OP_REMOVE:
 	    case OP_REPLACE:
-		if ((ret = nacm_datanode_write(NULL, x0, NACM_DELETE, username, xnacm, cbret)) < 0) /* XXX */
-		    goto done;
-		if (ret == 0)
-		    goto fail;
-		x0c = NULL;
-		while ((x0c = xml_child_each(x0, x0c, CX_ELMNT)) != NULL) 
-		    xml_purge(x0c);
+		if (xnacm){
+		    if ((ret = nacm_datanode_write(NULL, x0, NACM_DELETE, username, xnacm, cbret)) < 0)
+			goto done;
+		    if (ret == 0)
+			goto fail;
+		    permit = 1;
+		}
+		while ((x0c = xml_child_i(x0, 0)) != 0)
+		    if (xml_purge(x0c) < 0)
+			goto done;
 		break;
 	    default:
 		break;
 	    }
+	}
 	else /* base tree empty */
 	    switch(op){ 
+#if 0 /* According to RFC6020 7.5.8 you cant delete a non-existing object.
+	 On the other hand, the top-level cannot be removed anyway.
+	 Additionally, I think this is irritating so I disable it.
+	 I.e., curl -u andy:bar -sS -X DELETE http://localhost/restconf/data
+      */
 	    case OP_DELETE:
 		if (netconf_data_missing(cbret, "Data does not exist; cannot delete resource") < 0)
 		    goto done;
 		goto fail;
 		break;
+#endif
 	    default:
 		break;
 	    }
     }
     /* Special case top-level replace */
-    if (op == OP_REPLACE || op == OP_DELETE){
-	x0c = NULL;
+    else if (op == OP_REPLACE || op == OP_DELETE){
+	if (xnacm && !permit){
+	    if ((ret = nacm_datanode_write(NULL, x1, NACM_UPDATE, username, xnacm, cbret)) < 0) 
+		goto done;
+	    if (ret == 0)
+		goto fail;
+	    permit = 1;
+	}
 	while ((x0c = xml_child_i(x0, 0)) != 0)
-	    xml_purge(x0c);
+	    if (xml_purge(x0c) < 0)
+		goto done;
     }
     /* Loop through children of the modification tree */
     x1c = NULL;
@@ -946,7 +1004,7 @@ text_modify_top(struct text_handle *th,
 	}
 #endif
 	if ((ret = text_modify(th, x0c, (yang_node*)yc, x0, x1c, op,
-			       username,xnacm, cbret)) < 0)
+			       username, xnacm, permit, cbret)) < 0)
 	    goto done;
 	/* If xml return - ie netconf error xml tree, then stop and return OK */
 	if (ret == 0)
diff --git a/test/test_list.sh b/test/test_list.sh
index b0e37eb6..2b3ef573 100755
--- a/test/test_list.sh
+++ b/test/test_list.sh
@@ -96,7 +96,7 @@ new "minmax: empty"
 expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"/></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 # NYI
-if false; then 
+if false; then # nyi
 new "minmax: validate should fail"
 expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error/></rpc-reply>]]>]]>$"
 
diff --git a/test/test_nacm.sh b/test/test_nacm.sh
index 528eabcc..ba3fae4d 100755
--- a/test/test_nacm.sh
+++ b/test/test_nacm.sh
@@ -131,9 +131,6 @@ sudo su -c "$clixon_restconf -f $cfg -D $DBG -- -a" -s /bin/sh www-data &
 
 sleep $RCWAIT
 
-new "restconf DELETE whole datastore"
-expecteq "$(curl -u andy:bar -sS -X DELETE http://localhost/restconf/data)" ""
-
 new2 "auth get"
 expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" 'null
 
'
diff --git a/test/test_nacm_datanode.sh b/test/test_nacm_datanode.sh
deleted file mode 100755
index f6aa50b4..00000000
--- a/test/test_nacm_datanode.sh
+++ /dev/null
@@ -1,239 +0,0 @@
-#!/bin/bash
-# Authentication and authorization and IETF NACM
-# NACM data node rule
-# @see RFC 8341 A.1 and A.4 (and permit-all from A.2)
-# Tests for:
-# deny-nacm:  This rule denies the "guest" group any access to the
-#     /nacm subtree.
-# permit-acme-config:  This rule gives the "limited" group read-write
-#    access to the acme <config-parameters>.
-# permit-dummy-interface:  This rule gives the "limited" and "guest"
-#     groups read-update access to the acme <interface> entry named
-#     "dummy".  This entry cannot be created or deleted by these groups;
-#     it can only be altered.
-# permit-interface:  This rule gives the "admin" group read-write
-#     access to all acme <interface> entries.
-
-APPNAME=example
-# include err() and new() functions and creates $dir
-. ./lib.sh
-. ./nacm.sh
-
-cfg=$dir/conf_yang.xml
-fyang=$dir/test.yang
-
-cat <<EOF > $cfg
-<config>
-  <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
-  <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_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>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
-  <CLICON_BACKEND_DIR>/usr/local/lib/$APPNAME/backend</CLICON_BACKEND_DIR>
-  <CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
-  <CLICON_CLI_GENMODEL_COMPLETION>1</CLICON_CLI_GENMODEL_COMPLETION>
-  <CLICON_XMLDB_DIR>/usr/local/var/$APPNAME</CLICON_XMLDB_DIR>
-  <CLICON_XMLDB_PLUGIN>/usr/local/lib/xmldb/text.so</CLICON_XMLDB_PLUGIN>
-  <CLICON_RESTCONF_PRETTY>false</CLICON_RESTCONF_PRETTY>
-  <CLICON_NACM_MODE>internal</CLICON_NACM_MODE>
-</config>
-EOF
-
-cat <<EOF > $fyang
-module nacm-example{
-  yang-version 1.1;
-  namespace "urn:example:nacm";
-  prefix nacm;
-  import clixon-example {
-	prefix ex;
-  }
-  import ietf-netconf-acm {
-	prefix nacm;
-  }
-  leaf x{
-    type int32;
-    description "something to edit";
-  }
-}
-EOF
-
-# The groups are slightly modified from RFC8341 A.1
-# The rule-list is from A.2
-RULES=$(cat <<EOF
-   <nacm xmlns="urn:ietf:params:xml:ns:yang:ietf-netconf-acm">
-     <enable-nacm>false</enable-nacm>
-     <read-default>deny</read-default>
-     <write-default>deny</write-default>
-     <exec-default>deny</exec-default>
-
-     $NGROUPS
-
-     <rule-list>
-       <name>guest-acl</name>
-       <group>guest</group>
-
-       <rule>
-         <name>deny-nacm</name>
-         <path xmlns:n="urn:ietf:params:xml:ns:yang:ietf-netconf-acm">
-           /n:nacm
-         </path>
-         <access-operations>*</access-operations>
-         <action>deny</action>
-         <comment>
-           Deny the 'guest' group any access to the /nacm data.
-         </comment>
-       </rule>
-     </rule-list>
-
-     <rule-list>
-       <name>limited-acl</name>
-       <group>limited</group>
-
-       <rule>
-         <name>permit-acme-config</name>
-         <path xmlns:acme="http://example.com/ns/netconf">
-           /acme:acme-netconf/acme:config-parameters
-         </path>
-         <access-operations>
-           read create update delete
-         </access-operations>
-         <action>permit</action>
-         <comment>
-           Allow the 'limited' group complete access to the acme
-           NETCONF configuration parameters.  Showing long form
-           of 'access-operations' instead of shorthand.
-         </comment>
-       </rule>
-     </rule-list>
-     <rule-list>
-       <name>guest-limited-acl</name>
-       <group>guest</group>
-       <group>limited</group>
-
-       <rule>
-         <name>permit-dummy-interface</name>
-         <path xmlns:acme="http://example.com/ns/itf">
-           /acme:interfaces/acme:interface[acme:name='dummy']
-         </path>
-         <access-operations>read update</access-operations>
-         <action>permit</action>
-         <comment>
-           Allow the 'limited' and 'guest' groups read
-           and update access to the dummy interface.
-         </comment>
-       </rule>
-     </rule-list>
-     <rule-list>
-       <name>admin-acl</name>
-       <group>admin</group>
-       <rule>
-         <name>permit-interface</name>
-         <path xmlns:acme="http://example.com/ns/itf">
-           /acme:interfaces/acme:interface
-         </path>
-         <access-operations>*</access-operations>
-         <action>permit</action>
-         <comment>
-           Allow the 'admin' group full access to all acme interfaces.
-         </comment>
-       </rule>
-     </rule-list>
-
-     $NADMIN
-
-   </nacm>
-   <x xmlns="urn:example:clixon">0</x>
-EOF
-)
-exit # XXX
-new "test params: -f $cfg"
-
-if [ $BE -ne 0 ]; then
-    new "kill old backend"
-    sudo clixon_backend -zf $cfg
-    if [ $? -ne 0 ]; then
-	err
-    fi
-    new "start backend -s init -f $cfg"
-    sudo $clixon_backend -s init -f $cfg -D $DBG
-    if [ $? -ne 0 ]; then
-	err
-    fi
-fi
-
-new "kill old restconf daemon"
-sudo pkill -u www-data -f "/www-data/clixon_restconf"
-
-sleep 1
-new "start restconf daemon (-a is enable basic authentication)"
-sudo su -c "$clixon_restconf -f $cfg -D $DBG -- -a" -s /bin/sh www-data &
-
-sleep $RCWAIT
-
-new "auth set authentication config"
-expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><edit-config><target><candidate/></target><config>$RULES</config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
-
-new "commit it"
-expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
-
-new "enable nacm"
-expecteq "$(curl -u andy:bar -sS -X PUT -d '{"enable-nacm": true}' http://localhost/restconf/data/ietf-netconf-acm:nacm/enable-nacm)" ""
-
-#--------------- nacm enabled
-
-new2 "auth get (wrong passwd: access denied)"
-expecteq "$(curl -u andy:foo -sS -X GET http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
-
-new2 "auth get (access)"
-expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"example:x": 0}
-
'
-
-#----------------Enable NACM
-
-new "enable nacm"
-expecteq "$(curl -u andy:bar -sS -X PUT -d '{"enable-nacm": true}' http://localhost/restconf/data/ietf-netconf-acm:nacm/enable-nacm)" ""
-
-new2 "admin get nacm"
-expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"example:x": 0}
-
'
-
-new2 "limited get nacm"
-expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"example:x": 0}
-
'
-
-new2 "guest get nacm"
-expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
-
-new "admin edit nacm"
-expecteq "$(curl -u andy:bar -sS -X PUT -d '{"x": 1}' http://localhost/restconf/data/example:x)" ""
-
-new2 "limited edit nacm"
-expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"x": 2}' http://localhost/restconf/data/example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
-
-new2 "guest edit nacm"
-expecteq "$(curl -u guest:bar -sS -X PUT -d '{"x": 3}' http://localhost/restconf/data/example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
-
-new "Kill restconf daemon"
-sudo pkill -u www-data -f "/www-data/clixon_restconf"
-
-if [ $BE -eq 0 ]; then
-    exit # BE
-fi
-
-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
-sudo clixon_backend -z -f $cfg
-if [ $? -ne 0 ]; then
-    err "kill backend"
-fi
-
-rm -rf $dir
diff --git a/test/test_nacm_ext.sh b/test/test_nacm_ext.sh
index bb9302bc..f4587c71 100755
--- a/test/test_nacm_ext.sh
+++ b/test/test_nacm_ext.sh
@@ -151,9 +151,6 @@ sudo su -c "$clixon_restconf -f $cfg -D $DBG -- -a" -s /bin/sh www-data &
 
 sleep $RCWAIT
 
-new "restconf DELETE whole datastore"
-expecteq "$(curl -u andy:bar -sS -X DELETE http://localhost/restconf/data)" ""
-
 new2 "auth get"
 expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": "42"}}
 
'
diff --git a/test/test_nacm_module.sh b/test/test_nacm_module_read.sh
similarity index 100%
rename from test/test_nacm_module.sh
rename to test/test_nacm_module_read.sh
diff --git a/test/test_nacm_module_write.sh b/test/test_nacm_module_write.sh
index 5351ab33..49f708e7 100755
--- a/test/test_nacm_module_write.sh
+++ b/test/test_nacm_module_write.sh
@@ -6,17 +6,19 @@
 # @see test_nacm.sh is slightly modified - this follows the RFC more closely
 # See RFC 8341 A.1 and A.2
 # Note: use clixon-example instead of ietf-netconf-monitoring since the latter is
-# Tests for 
-# deny-ncm:  This rule prevents the "guest" group from reading any
-#     monitoring information in the "clixon-example" YANG
-#     module.
-# permit-ncm:  This rule allows the "limited" group to read the
-#     "clixon-example" YANG module.
-# permit-exec:  This rule allows the "limited" group to invoke any
-#     protocol operation supported by the server.
-# permit-all:  This rule allows the "admin" group complete access to
-#     all content in the server.  No subsequent rule will match for the
-#     "admin" group because of this module rule
+# A) Three tracks in the code for leaf/leaf-list, container/lists, and root
+# B) Three operations: create, update, delete (write)
+# C) Two access operations: permit, deny  (also default deny/permit)
+# This gives 18 testcases
+# Set group access:
+# - Admin: permit: create, update, delete
+# - Limit: permit: create, delete; deny: update
+# - Guest: permit: update; deny: create delete
+# ops\track:|  root  |  leaf  | list
+#-----------+--------+--------+----------
+# create    |  na    |  p/d   | p/d
+# update    |  p/d   |  p/d   | p/d
+# delete    |  p/d   |  p/d   | p/d
 
 APPNAME=example
 # include err() and new() functions and creates $dir
@@ -62,6 +64,17 @@ module nacm-example{
     type int32;
     description "something to edit";
   }
+  list a{
+    key k;
+    leaf k{
+      type string;
+    }
+    container b{
+      leaf c{
+        type string;
+      }
+    }
+  }
 }
 EOF
 
@@ -69,77 +82,51 @@ EOF
 # The rule-list is from A.2 
 RULES=$(cat <<EOF
    <nacm xmlns="urn:ietf:params:xml:ns:yang:ietf-netconf-acm">
-     <enable-nacm>false</enable-nacm>
+     <enable-nacm>true</enable-nacm>
      <read-default>deny</read-default>
      <write-default>deny</write-default>
-     <exec-default>deny</exec-default>
+     <exec-default>permit</exec-default>
 
      $NGROUPS
 
+     <rule-list>
+       <name>limited-acl</name>
+       <group>limited</group>
+       <rule>
+         <name>permit-create-delete</name>
+         <module-name>nacm-example</module-name>
+         <access-operations>read create delete</access-operations>
+         <action>permit</action>
+       </rule>
+       <rule>
+         <name>deny-update</name>
+         <module-name>nacm-example</module-name>
+         <access-operations>read update</access-operations>
+         <action>deny</action>
+       </rule>
+     </rule-list>
+
      <rule-list>
        <name>guest-acl</name>
        <group>guest</group>
        <rule>
-         <name>permit-get</name>
-         <module-name>ietf-netconf</module-name>
-         <rpc-name>*</rpc-name>
-         <access-operations>exec</access-operations>
+         <name>permit-update</name>
+         <module-name>nacm-example</module-name>
+         <access-operations>read update</access-operations>
          <action>permit</action>
-         <comment>
-             Allow invocation of get rpc
-         </comment>
        </rule>
        <rule>
-         <name>permit-read</name>
-         <module-name>clixon-example</module-name>
-         <access-operations>read</access-operations>
-         <action>permit</action>
-         <comment>
-             Do not allow guests any access to the NETCONF
-             monitoring information.
-         </comment>
-       </rule>
-       <rule>
-         <name>deny-write</name>
-         <module-name>clixon-example</module-name>
-         <access-operations>*</access-operations>
+         <name>deny-create-delete</name>
+         <module-name>nacm-example</module-name>
+         <access-operations>read create delete</access-operations>
          <action>deny</action>
-         <comment>
-             Do not allow guests any access to the NETCONF
-             monitoring information.
-         </comment>
        </rule>
 
      </rule-list>
-     <rule-list>
-       <name>limited-acl</name>
-       <group>limited</group>
-       <rule>
-         <name>permit-ncm</name>
-         <module-name>clixon-example</module-name>
-         <access-operations>read create update delete</access-operations>
-         <action>permit</action>
-         <comment>
-             Allow write access to the NETCONF monitoring information.
-         </comment>
-       </rule>
-       <rule>
-         <name>permit-exec</name>
-         <module-name>*</module-name>
-         <access-operations>exec</access-operations>
-         <action>permit</action>
-         <comment>
-             Allow invocation of the supported server operations.
-         </comment>
-       </rule>
-     </rule-list>
 
      $NADMIN
 
    </nacm>
-   <x xmlns="urn:example:nacm">42</x>
-   <translate xmlns="urn:example:clixon"><k>key42</k><value>val42</value></translate>
-   <translate xmlns="urn:example:clixon"><k>key43</k><value>val43</value></translate>
 EOF
 )
 
@@ -167,40 +154,103 @@ sudo su -c "$clixon_restconf -f $cfg -D $DBG -- -a" -s /bin/sh www-data &
 
 sleep $RCWAIT
 
-new "auth set authentication config"
-expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><edit-config><target><candidate/></target><config>$RULES</config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+# Set nacm from scratch
+nacm(){
+    new "auth set authentication config"
+    expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><edit-config><target><candidate/></target><config operation='replace'>$RULES</config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
-new "commit it"
-expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+    new "commit it"
+    expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
-new "enable nacm"
-expecteq "$(curl -u andy:bar -sS -X PUT -d '{"enable-nacm": true}' http://localhost/restconf/data/ietf-netconf-acm:nacm/enable-nacm)" ""
+    new "enable nacm"
+    expecteq "$(curl -u andy:bar -sS -X PUT -d '{"enable-nacm": true}' http://localhost/restconf/data/ietf-netconf-acm:nacm/enable-nacm)" ""
+}
 
-#--------------- nacm enabled
-#----WRITE access
-#user:admin
-new2 "admin read element ok"
-expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/clixon-example:translate=key42/value)" '{"clixon-example:value": "val42"}
+#--------------- enable nacm
+nacm
+
+# ops\track:|  root  |  leaf  | list
+#-----------+--------+--------+----------
+# create    |  n/a   | xp/dx  |  p/d
+# update    |  p/d   | xp/dx  |  p/d
+# delete    |  p/d   | xp/dx  |  p/d
+
+#----------root
+new2 "update root list default deny"
+expecteq "$(curl -u wilma:bar -sS -H 'Content-Type: application/yang-data+xml' -X PUT http://localhost/restconf/data -d '<data><x xmlns="urn:example:nacm">42</x>$RULES</data>')" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+
+# replace all, then must include NACM rules as well
+MSG="<data>$RULES</data>"
+new "update root list permit"
+expecteq "$(curl -u andy:bar -sS -H 'Content-Type: application/yang-data+xml' -X PUT http://localhost/restconf/data -d "$MSG")" ''
+
+new "delete root list deny"
+expecteq "$(curl -u wilma:bar -sS -X DELETE http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+
+new "delete root permit"
+expecteq "$(curl -u andy:bar -sS -X DELETE http://localhost/restconf/data)" ''
+
+#--------------- re-enable nacm
+nacm
+
+#----------leaf
+new2 "create leaf deny"
+expecteq "$(curl -u guest:bar -sS -H 'Content-Type: application/yang-data+xml' -X PUT http://localhost/restconf/data/nacm-example:x -d '<x xmlns="urn:example:nacm">42</x>')" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
+
+new "create leaf permit"
+expecteq "$(curl -u wilma:bar -sS -H 'Content-Type: application/yang-data+xml' -X PUT http://localhost/restconf/data/nacm-example:x -d '<x xmlns="urn:example:nacm">42</x>')" ''
+
+new2 "update leaf deny"
+expecteq "$(curl -u wilma:bar -sS -H 'Content-Type: application/yang-data+xml' -X PUT http://localhost/restconf/data/nacm-example:x -d '<x xmlns="urn:example:nacm">99</x>')" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
+
+new "update leaf permit"
+expecteq "$(curl -u guest:bar -sS -H 'Content-Type: application/yang-data+xml' -X PUT http://localhost/restconf/data/nacm-example:x -d '<x xmlns="urn:example:nacm">99</x>')" ''
+
+new2 "read leaf check"
+expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"nacm-example:x": 99}
 
'
 
-new "admin write element ok"
-expecteq "$(curl -u andy:bar -sS -X PUT http://localhost/restconf/data/clixon-example:translate=key42/value -d '{"clixon-example:value": "val99"}')"
+new2 "delete leaf deny"
+expecteq "$(curl -u guest:bar -sS -X DELETE http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
 
-#user:limit
-new2 "limit read element ok"
-expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/clixon-example:translate=key42/value)" '{"clixon-example:value": "val99"}
+new "delete leaf permit"
+expecteq "$(curl -u wilma:bar -sS -X DELETE http://localhost/restconf/data/nacm-example:x)" ''
+
+#-----  list/container
+new2 "create list deny"
+expecteq "$(curl -u guest:bar -sS -H 'Content-Type: application/yang-data+xml' -X PUT http://localhost/restconf/data/nacm-example:a=key42 -d '<a xmlns="urn:example:nacm"><k>key42</k><b><c>str</c></b></a>')" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
+
+new "create list permit"
+expecteq "$(curl -u wilma:bar -sS -H 'Content-Type: application/yang-data+xml' -X PUT http://localhost/restconf/data/nacm-example:a=key42 -d '<a xmlns="urn:example:nacm"><k>key42</k><b><c>str</c></b></a>')" ''
+
+new2 "update list deny"
+expecteq "$(curl -u wilma:bar -sS -H 'Content-Type: application/yang-data+xml' -X PUT http://localhost/restconf/data/nacm-example:a=key42 -d '<a xmlns="urn:example:nacm"><k>key42</k><b><c>update</c></b></a>')" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
+
+new "update list permit"
+expecteq "$(curl -u guest:bar -sS -H 'Content-Type: application/yang-data+xml' -X PUT http://localhost/restconf/data/nacm-example:a=key42 -d '<a xmlns="urn:example:nacm"><k>key42</k><b><c>update</c></b></a>')" ''
+
+new2 "read list check"
+expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/nacm-example:a)" '{"nacm-example:a": [{"k": "key42","b": {"c": "update"}}]}
 
'
 
-new "limit write element ok"
-expecteq "$(curl -u wilma:bar -sS -X PUT http://localhost/restconf/data/clixon-example:translate=key42/value -d '{"clixon-example:value": "val55"}')"
+new2 "delete list deny"
+expecteq "$(curl -u guest:bar -sS -X DELETE http://localhost/restconf/data/nacm-example:a=key42)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
 
-#user:guest
-new2 "guest read element ok"
-expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/clixon-example:translate=key42/value)" '{"clixon-example:value": "val55"}
-
'
+new "delete list permit"
+expecteq "$(curl -u wilma:bar -sS -X DELETE http://localhost/restconf/data/nacm-example:a=key42)" ''
 
-new2 "guest write element ok"
-expecteq "$(curl -u guest:bar -sS -X PUT http://localhost/restconf/data/clixon-example:translate=key42/value -d '{"clixon-example:value": "val99"}')" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
+#----- default deny (clixon-example limit and guest have default access)
+new2 "default create list deny"
+expecteq "$(curl -u wilma:bar -sS -X PUT http://localhost/restconf/data/clixon-example:translate=key42 -d '{"clixon-example:translate": [{"k": "key42","value": "val42"}]}')" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+
+new2 "create list permit"
+expecteq "$(curl -u andy:bar -sS -X PUT http://localhost/restconf/data/clixon-example:translate=key42 -d '{"clixon-example:translate": [{"k": "key42","value": "val42"}]}')" ''
+
+new2 "default update list deny"
+expecteq "$(curl -u wilma:bar -sS -X PUT http://localhost/restconf/data/clixon-example:translate=key42 -d '{"clixon-example:translate": [{"k": "key42","value": "val99"}]}')" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+
+new2 "default delete list deny"
+expecteq "$(curl -u wilma:bar -sS -X DELETE http://localhost/restconf/data/clixon-example:translate=key42)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
 new "Kill restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"
diff --git a/test/test_order.sh b/test/test_order.sh
index 8f96c726..a1f646db 100755
--- a/test/test_order.sh
+++ b/test/test_order.sh
@@ -143,22 +143,22 @@ expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><can
 
 # LEAF_LISTS
 
-new "add two entries to leaf-list user order"
+new "add two entries (c,b) to leaf-list user order"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><y0 xmlns="urn:example:clixon">c</y0><y0 xmlns="urn:example:clixon">b</y0></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
-new "add one entry to leaf-list user order"
+new "add one entry (a) to leaf-list user order"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><y0 xmlns="urn:example:clixon">a</y0></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf commit"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
-new "add one entry to leaf-list user order after commit"
+new "add one entry (0) to leaf-list user order after commit"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><y0 xmlns="urn:example:clixon">0</y0></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf commit"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
-new "verify leaf-list user order in running (as entered)"
+new "verify leaf-list user order in running (as entered: c,b,a,0)"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get-config><source><running/></source><filter type="xpath" select="/y0"/></get-config></rpc>]]>]]>' '^<rpc-reply><data><y0 xmlns="urn:example:clixon">c</y0><y0 xmlns="urn:example:clixon">b</y0><y0 xmlns="urn:example:clixon">a</y0><y0 xmlns="urn:example:clixon">0</y0></data></rpc-reply>]]>]]>$'
 
 # LISTS

From 1e4022e73c59f2a116d3a6543bfbebaccc1d9470 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sat, 2 Feb 2019 11:35:50 +0100
Subject: [PATCH 49/72] NACM cleanup, uniform rule function, change of function
 names, etc.

---
 CHANGELOG.md                   |  15 +-
 README.md                      |  39 ++---
 apps/backend/backend_client.c  |  10 +-
 apps/backend/backend_commit.c  |   5 +
 doc/FAQ.md                     |   9 +
 lib/clixon/clixon_nacm.h       |   2 +-
 lib/src/clixon_nacm.c          | 302 ++++++++++++---------------------
 test/README.md                 |   3 +
 test/test_nacm.sh              |   6 +-
 test/test_nacm_ext.sh          |   6 +-
 test/test_nacm_module_read.sh  |  18 +-
 test/test_nacm_module_write.sh |   2 +-
 test/test_nacm_protocol.sh     |  10 +-
 13 files changed, 180 insertions(+), 247 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb4278be..925c295d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -76,13 +76,16 @@
       * Note CLIXON_DATADIR (=/usr/local/share/clixon) need to be in the list
     * CLICON_YANG_MAIN_FILE Provides a filename with a single module filename.
     * CLICON_YANG_MAIN_DIR Provides a directory where all yang modules should be loaded.
-* NACM extension (RFC8341)
-  * NACM Data node READ and WRITE access module support (RFC8341 3.4.5)
-    * Access control points added for `get`, `get-config`, `edit-config` in addition to incoming rpc.
-    * RFC 8341 Example A.2 implemented, see: [test/test_nacm_module.sh]
-  * Remaining work: data-node PATH 
+* NACM (RFC8341) experimental
+  * Incoming RPC Message validation is supported (3.4.4)
+  * Data Node Access validation is supported (3.4.5), except:
+    * rule-type data-node path is not supported
+  * Outgoing noitification aithorization is _not_ supported (3.4.6)
+  * RPC:s are supported _except_:
+    * `copy-config`for other src/target combinations than running/startup (3.2.6)
+    * `commit` - NACM is applied to candidate and running operations only (3.2.8)
+  * Client-side RPC:s are _not_ supported.
   * Recovery user "_nacm_recovery" added.
-    * Example use is restconf PUT when NACM edit-config is permitted, then automatic commit and discard are permitted using recovery user.
 	
 ### API changes on existing features (you may need to change your code)
 * Added `username` argument on `xmldb_put()` datastore function for NACM data-node write checks
diff --git a/README.md b/README.md
index 215ac2ea..a56aecc9 100644
--- a/README.md
+++ b/README.md
@@ -220,35 +220,28 @@ so the clients can in principle fake a username.
 
 NACM
 ====
-Clixon includes an experimental Network Configuration Access Control Model (NACM) according to [RFC8341(NACM)](https://tools.ietf.org/html/rfc8341). It has limited functionality.
+Clixon includes an experimental Network Configuration Access Control Model (NACM) according to [RFC8341(NACM)](https://tools.ietf.org/html/rfc8341).
 
-The support is as follows:
+To enable NACM:
 
-* There is a yang config variable `CLICON_NACM_MODE` to set whether NACM is disabled, uses internal(embedded) NACM configuration, or external configuration. (See yang/clixon-config.yang)
-* If the mode is internal, NACM configurations is expected to be in the regular configuration, managed by regular candidate/runing/commit procedures. This mode may have some problems with bootstrapping.
+* The `CLICON_NACM_MODE` config variable is by default `disabled`.
+* If the mode is internal`, NACM configurations are expected to be in the regular configuration, managed by regular candidate/runing/commit procedures. This mode may have some problems with bootstrapping.
 * If the mode is `external`, the `CLICON_NACM_FILE` yang config variable contains the name of a separate configuration file containing the NACM configurations. After changes in this file, the backend needs to be restarted.
-* The [example](example/README.md) contains a http basic auth and a NACM backend callback for mandatory state variables.
-* There are two [tests](test/README.md) using internal and external NACM config
-* The backend provides a limited NACM support (when enabled) described below
 
-NACM is implemented in the backend and a single access check is made
-in `from_client_msg()` when an internal netconf RPC has
-just been received and decoded. The code is in `nacm_access()`.
+The [example](example/README.md) contains a http basic auth and a NACM backend callback for mandatory state variables.
 
-The functionality is as follows:
-* Notification is not supported
-* Groups are supported
-* Rule-lists are supported
-* Rules are supported as follows
-  * module-name: fully supported
-  * access-operations: only '*' and 'exec' supported
-  * rpc-name: fully supported (eg edit-config/get-config, etc)
-  * action: fully supported (permit/deny)
+NACM is implemented in the backend with incoming RPC and data node access control points.
 
-The tests outlines an example of three groups (taken from the RFC): admin, limited and guest:
-* admin: Full access
-* limited: Read access (get and get-config)
-* guest: No access
+The functionality is as follows (references to sections in [RFC8341](https://tools.ietf.org/html/rfc8341)):
+* Access control point support:
+  * Incoming RPC Message validation is supported (3.4.4)
+  * Data Node Access validation is supported (3.4.5), except:
+    * rule-type data-node path is not supported
+  * Outgoing noitification aithorization is _not_ supported (3.4.6)
+* RPC:s are supported _except_:
+  * `copy-config`for other src/target combinations than running/startup (3.2.6)
+  * `commit` - NACM is applied to candidate and running operations only (3.2.8)
+* Client-side RPC:s are _not_ supported.
 
 Runtime
 =======
diff --git a/apps/backend/backend_client.c b/apps/backend/backend_client.c
index 936f03f1..c2c370fe 100644
--- a/apps/backend/backend_client.c
+++ b/apps/backend/backend_client.c
@@ -214,7 +214,7 @@ from_client_get_config(clicon_handle h,
 	goto ok;
     }
     /* Pre-NACM access step */
-    if ((ret = nacm_access_h(h, username, &xnacm)) < 0)
+    if ((ret = nacm_access_pre(h, username, &xnacm)) < 0)
 	goto done;
     if (ret == 0){ /* Do NACM validation */
 	if (xpath_vec(xret, "%s", &xvec, &xlen, xpath?xpath:"/") < 0)
@@ -407,7 +407,7 @@ from_client_get(clicon_handle h,
 	goto ok;
     }
     /* Pre-NACM access step */
-    if ((ret = nacm_access_h(h, username, &xnacm)) < 0)
+    if ((ret = nacm_access_pre(h, username, &xnacm)) < 0)
 	goto done;
     if (ret == 0){ /* Do NACM validation */
 	if (xpath_vec(xret, "%s", &xvec, &xlen, xpath?xpath:"/") < 0)
@@ -728,6 +728,10 @@ from_client_kill_session(clicon_handle h,
  * @param[out]  cbret  Return xml value cligen buffer
  * @retval      0      OK
  * @retval      -1     Error. Send error message back to client.
+ * NACM: If source running and target startup --> only exec permission
+ * else: 
+ * - omit data nodes to which the client does not have read access
+ * - access denied if user lacks create/delete/update
  */
 static int
 from_client_copy_config(clicon_handle h,
@@ -1052,7 +1056,7 @@ from_client_msg(clicon_handle        h,
 	clicon_debug(1, "%s module:%s rpc:%s", __FUNCTION__, module, rpc);
 	/* Pre-NACM access step */
 	xnacm = NULL;
-	if ((ret = nacm_access_h(h, username, &xnacm)) < 0)
+	if ((ret = nacm_access_pre(h, username, &xnacm)) < 0)
 	    goto done;
 	if (ret == 0){ /* Do NACM validation */
 	    /* NACM rpc operation exec validation */
diff --git a/apps/backend/backend_commit.c b/apps/backend/backend_commit.c
index 19cc96d3..453e3e6c 100644
--- a/apps/backend/backend_commit.c
+++ b/apps/backend/backend_commit.c
@@ -323,6 +323,10 @@ candidate_commit(clicon_handle h,
  * @param[out] cbret Return xml value cligen buffer
  * @retval  0   OK. This may indicate both ok and err msg back to client
  * @retval  -1  (Local) Error
+ * NACM:    The server MUST determine the exact nodes in the running
+ *  configuration datastore that are actually different and only check
+ *  "create", "update", and "delete" access permissions for this set of
+ *  nodes, which could be empty.
  */
 int
 from_client_commit(clicon_handle h,
@@ -368,6 +372,7 @@ from_client_commit(clicon_handle h,
  * @param[out] cbret Return xml value cligen buffer
  * @retval  0  OK. This may indicate both ok and err msg back to client
  * @retval  -1 (Local) Error
+ * NACM: No datastore permissions are needed.
  */
 int
 from_client_discard_changes(clicon_handle h,
diff --git a/doc/FAQ.md b/doc/FAQ.md
index 1677ad7b..ff0ed3a1 100644
--- a/doc/FAQ.md
+++ b/doc/FAQ.md
@@ -306,6 +306,7 @@ You may also add a default method in the configuration file:
 Yes. Systemd example files are provide for the backend and the
 restconf daemon as part of the [example](../example/systemd).
 
+
 ## How can I add extra XML?
 
 There are two ways to add extra XML to running database  after start. Note that this XML is not "committed" into running.
@@ -474,6 +475,14 @@ To authenticate, the callback needs to return the value 1 and supply a username.
 See [../apps/example/example_restconf.c] example_restconf_credentials() for
 an example of HTTP basic auth.
 
+## What about access control?
+
+Clixon has experimental support of the Network Configuration Access
+Control Model defined in [RFC8341](https://tools.ietf.org/html/rfc8341)
+
+Incoming RPC and data node access points are supported with some
+limitations. See the (README)(../README.md) for more information.
+
 ## How do I write a CLI translator function?
 
 The CLI can perform variable translation. This is useful if you want to
diff --git a/lib/clixon/clixon_nacm.h b/lib/clixon/clixon_nacm.h
index f7a57318..4b016dd5 100644
--- a/lib/clixon/clixon_nacm.h
+++ b/lib/clixon/clixon_nacm.h
@@ -67,7 +67,7 @@ int nacm_rpc(char *rpc, char *module, char *username, cxobj *xnacm, cbuf *cbret)
 int nacm_datanode_read(cxobj *xt, cxobj **xvec, size_t xlen, char *username, cxobj *nacm_xtree);
 int nacm_datanode_write(cxobj *xt, cxobj *xr, enum nacm_access access,
 			char *username, cxobj *xnacm, cbuf *cbret);
-int nacm_access_h(clicon_handle h, char *username, cxobj **xnacmp);
+int nacm_access_pre(clicon_handle h, char *username, cxobj **xnacmp);
 int nacm_access(char *mode, cxobj *xnacmin, char *username);
 
 #endif /* _CLIXON_NACM_H */
diff --git a/lib/src/clixon_nacm.c b/lib/src/clixon_nacm.c
index f24a429c..60fa115b 100644
--- a/lib/src/clixon_nacm.c
+++ b/lib/src/clixon_nacm.c
@@ -101,23 +101,9 @@ match_access(char *access_operations,
  * @param[out] cbret  Cligen buffer result. Set to an error msg if retval=0.
  * @retval -1  Error
  * @retval  0  Matching rule AND Not access and cbret set
- * @retval  1  Matchung rule AND Access
+ * @retval  1  Matching rule AND Access
  * @retval  2  No matching rule Goto step 10
- * From RFC8341 3.4.4.  Incoming RPC Message Validation
-   +---------+-----------------+---------------------+-----------------+
-   | Method  | Resource class  | NETCONF operation   | Access          |
-   |         |                 |                     | operation       |
-   +---------+-----------------+---------------------+-----------------+
-   | OPTIONS | all             | none                | none            |
-   | HEAD    | all             | <get>, <get-config> | read            |
-   | GET     | all             | <get>, <get-config> | read            |
-   | POST    | datastore, data | <edit-config>       | create          |
-   | POST    | operation       | specified operation | execute         |
-   | PUT     | data            | <edit-config>       | create, update  |
-   | PUT     | datastore       | <copy-config>       | update          |
-   | PATCH   | data, datastore | <edit-config>       | update          |
-   | DELETE  | data            | <edit-config>       | delete          |
-
+ * @see RFC8341 3.4.4.  Incoming RPC Message Validation
  7.(cont) A rule matches if all of the following criteria are met: 
         *  The rule's "module-name" leaf is "*" or equals the name of
            the YANG module where the protocol operation is defined.
@@ -133,44 +119,40 @@ match_access(char *access_operations,
 static int
 nacm_rule_rpc(char         *rpc,
 	      char         *module,
-	      cxobj        *xrule,
-	      cbuf         *cbret)
+	      cxobj        *xrule)
 {
     int    retval = -1;
     char  *module_rule; /* rule module name */
     char  *rpc_rule;
     char  *access_operations;
-    char  *action;
     
-    module_rule = xml_find_body(xrule, "module-name");
-    rpc_rule = xml_find_body(xrule, "rpc-name");
-    /* XXX access_operations can be a set of bits */
-    access_operations = xml_find_body(xrule, "access-operations");
-    action = xml_find_body(xrule, "action");
-    clicon_debug(1, "%s: %s %s %s %s", __FUNCTION__,
-	       module_rule, rpc_rule, access_operations, action);
-    if (module_rule &&
-	(strcmp(module_rule,"*")==0 || strcmp(module_rule,module)==0)){
-	if (match_access(access_operations, "exec", NULL)){
-	    if (rpc_rule==NULL ||
-		strcmp(rpc_rule, "*")==0 || strcmp(rpc_rule, rpc)==0){
-		/* Here is a matching rule */
-		if (action && strcmp(action, "permit")==0){
-		    retval = 1;
-		    goto done;
-		}
-		else{
-		    if (netconf_access_denied(cbret, "protocol", "access denied") < 0)
-			goto done;
-		    retval = 0;
-		    goto done;
-		}
-	    }
-	}
+    /*  7a) The rule's "module-name" leaf is "*" or equals the name of
+	the YANG module where the protocol operation is defined. */
+    if ((module_rule = xml_find_body(xrule, "module-name")) == NULL)
+	goto nomatch;
+    if (strcmp(module_rule,"*") && strcmp(module_rule,module))
+	goto nomatch;
+    /*  7b) Either (1) the rule does not have a "rule-type" defined or
+	(2) the "rule-type" is "protocol-operation" and the
+	"rpc-name" is "*" or equals the name of the requested
+	protocol operation. */
+    if ((rpc_rule = xml_find_body(xrule, "rpc-name")) == NULL){
+	if (xml_find_body(xrule, "path") || xml_find_body(xrule, "notification-name"))
+	    goto nomatch;
     }
-    retval = 2; /* no matching rule */
+    if (rpc_rule && (strcmp(rpc_rule, "*") && strcmp(rpc_rule, rpc)))
+	goto nomatch;
+    /* 7c) The rule's "access-operations" leaf has the "exec" bit set or
+	has the special value "*". */
+    access_operations = xml_find_body(xrule, "access-operations");
+    if (!match_access(access_operations, "exec", NULL))
+	goto nomatch;
+    retval = 1;
  done:
     return retval;
+ nomatch:
+    retval = 0;
+    goto done;
 }
 
 /*! Process nacm incoming RPC message validation steps
@@ -202,10 +184,11 @@ nacm_rpc(char         *rpc,
     size_t  rlistlen;
     cxobj **rvec = NULL; /* rules */
     size_t  rlen;
-    int     ret;
     int     i, j;
     char   *exec_default = NULL;
     char   *gname;
+    char   *action;
+    int     match= 0;
     
     /* 3.   If the requested operation is the NETCONF <close-session>
        protocol operation, then the protocol operation is permitted.
@@ -249,25 +232,30 @@ nacm_rpc(char         *rpc,
 	    goto done;
 	for (j=0; j<rlen; j++){
 	    xrule = rvec[j];
-	    /* -1 error, 0 deny, 1 permit, 2 continue */
-	    if ((ret = nacm_rule_rpc(rpc, module, xrule, cbret)) < 0)
+	    if ((match = nacm_rule_rpc(rpc, module, xrule)) < 0)
 		goto done;
-	    switch(ret){
-	    case 0: /* deny */
-		goto deny;
+	    if (match)
 		break;
-	    case 1: /* permit */
-		goto permit;
-		break;
-	    case 2: /* no match, continue */
-		break;
-	    }
 	}
+	if (match)
+	    break;
 	if (rvec){
 	    free(rvec);
 	    rvec=NULL;
 	}
     }
+    if (match){
+	if ((action = xml_find_body(xrule, "action")) == NULL)
+	    goto step10;
+	if (strcmp(action, "deny")==0){
+	    if (netconf_access_denied(cbret, "application", "access denied") < 0)
+		goto done;
+	    goto deny;
+	}
+	else if (strcmp(action, "permit")==0)
+	    goto permit;
+
+    }
  step10:
     /*   10.  If the requested protocol operation is defined in a YANG module
         advertised in the server capabilities and the "rpc" statement
@@ -277,7 +265,7 @@ nacm_rpc(char         *rpc,
         <kill-session> or <delete-config>, then the protocol operation
         is denied. */
     if (strcmp(rpc, "kill-session")==0 || strcmp(rpc, "delete-config")==0){
-	if (netconf_access_denied(cbret, "protocol", "default deny") < 0)
+	if (netconf_access_denied(cbret, "application", "default deny") < 0)
 	    goto done;
 	goto deny;
     }
@@ -286,7 +274,7 @@ nacm_rpc(char         *rpc,
     exec_default = xml_find_body(xnacm, "exec-default");
     if (exec_default ==NULL || strcmp(exec_default, "permit")==0)
 	goto permit;
-    if (netconf_access_denied(cbret, "protocol", "default deny") < 0)
+    if (netconf_access_denied(cbret, "application", "default deny") < 0)
 	goto done;
     goto deny;
  permit:
@@ -307,45 +295,31 @@ nacm_rpc(char         *rpc,
 }
 
 /*---------------------------------------------------------------
- * Datanode/module read
+ * Datanode/module read and write
  */
 
-/*! We have a rule matching user group. Now match proper read operation and module
- * @see RFC8341 3.4.5.  Data Node Access Validation point (6)
+/*! We have a rule matching user group. Now match proper write operation and module
  * @retval -1 Error
  * @retval  0 No Match
  * @retval  1 Match
- * @see rule_data_write
+ * @see RFC8341 3.4.5.  Data Node Access Validation point (6)
  */
 static int
-rule_data_read(cxobj  *xrule,
-	       cxobj  *xr,
-	       cxobj  *xt)
+nacm_rule_datanode(cxobj           *xt,
+		   cxobj           *xr,
+		   cxobj           *xrule,
+		   enum nacm_access access)
 {
     int        retval = -1;
-    cxobj     *xp; /* parent */
+    char      *path;
     char      *access_operations;
     char      *module_rule; /* rule module name */
     yang_stmt *ys;
     yang_stmt *ymod;
     char      *module;
-    char      *path;
     cxobj     *xpath; /* xpath match */
-
-    /*  6b) Either (1) the rule does not have a "rule-type" defined or
-	(2) the "rule-type" is "data-node" and the "path" matches the
-	requested data node, action node, or notification node.  A
-	path is considered to match if the requested node is the node
-	specified by the path or is a descendant node of the path.*/    
-    if ((path = xml_find_body(xrule, "path")) == NULL){
-	if (xml_find_body(xrule, "rpc-name") ||xml_find_body(xrule, "notification-name"))
-	    goto nomatch;
-    }
-    /* 6c) For a "read" access operation, the rule's "access-operations"
-	leaf has the "read" bit set or has the special value "*" */
-    access_operations = xml_find_body(xrule, "access-operations");
-    if (!match_access(access_operations, "read", NULL))
-	goto nomatch;
+    cxobj     *xp; /* parent */
+   
     /* 6a) The rule's "module-name" leaf is "*" or equals the name of
      * the YANG module where the requested data node is defined. */
     if ((module_rule = xml_find_body(xrule, "module-name")) == NULL)
@@ -358,7 +332,46 @@ rule_data_read(cxobj  *xrule,
 	if (strcmp(module, module_rule) != 0)
 	    goto nomatch;
     }
-    /* Here module is matched, now check for path if any */
+
+    /*  6b) Either (1) the rule does not have a "rule-type" defined or
+	(2) the "rule-type" is "data-node" and the "path" matches the
+	requested data node, action node, or notification node.  A
+	path is considered to match if the requested node is the node
+	specified by the path or is a descendant node of the path.*/    
+    if ((path = xml_find_body(xrule, "path")) == NULL){
+	if (xml_find_body(xrule, "rpc-name") ||xml_find_body(xrule, "notification-name"))
+	    goto nomatch;
+    }
+    access_operations = xml_find_body(xrule, "access-operations");
+    switch (access){
+    case NACM_READ:
+	/* 6c) For a "read" access operation, the rule's "access-operations"
+	   leaf has the "read" bit set or has the special value "*" */
+	if (!match_access(access_operations, "read", NULL))
+	    goto nomatch;
+	break;
+    case NACM_CREATE:
+	/* 6d) For a "create" access operation, the rule's "access-operations" 
+	   leaf has the "create" bit set or has the special value "*". */
+	if (!match_access(access_operations, "create", "write"))
+	    goto nomatch;
+	break;
+    case NACM_DELETE:
+        /* 6e) For a "delete" access operation, the rule's "access-operations" 
+	   leaf has the "delete" bit set or has the  special value "*". */
+	if (!match_access(access_operations, "delete", "write"))
+	    goto nomatch;
+	break;
+    case NACM_UPDATE:
+        /* 6f) For an "update" access operation, the rule's "access-operations"
+	   leaf has the "update" bit set or has the special value "*". */ 
+	if (!match_access(access_operations, "update", "write"))
+	    goto nomatch;
+	break;
+    default:
+	break;
+    }
+    /* Here module is matched, now check for path if any NYI */
     if (path){ 
 	if ((xpath = xpath_first(xt, "%s", path)) == NULL)
 	    goto nomatch;
@@ -420,13 +433,13 @@ nacm_data_read_xr(cxobj  *xt,
 	    continue;
 	/* 6. For each rule-list entry found, process all rules, in order,
 	   until a rule that matches the requested access operation is
-	   found. (see 6 sub rules in rule_data_read)
+	   found. (see 6 sub rules in nacm_rule_datanode
 	*/
 	if (xpath_vec(rlist, "rule", &rvec, &rlen) < 0)
 	    goto done;
 	for (j=0; j<rlen; j++){ /* Loop through rules */
 	    xrule = rvec[j];
-	    if ((match = rule_data_read(xrule, xr, xt)) < 0)
+	    if ((match = nacm_rule_datanode(xt, xr, xrule, NACM_READ)) < 0)
 		goto done;
 	    if (match) /* xrule match */
 		break;
@@ -615,106 +628,6 @@ nacm_datanode_read(cxobj  *xt,
 	free(rlistvec);
     return retval;
 }
-
-/*---------------------------------------------------------------
- * Datanode/module write (=create, delete, update)
- */
-
-/*! We have a rule matching user group. Now match proper write operation and module
- * @retval -1 Error
- * @retval  0 No Match
- * @retval  1 Match
- * @see RFC8341 3.4.5.  Data Node Access Validation point (6)
- * @see rule_data_read
- */
-static int
-rule_data_write(cxobj           *xt,
-		cxobj           *xr,
-		cxobj           *xrule,
-		enum nacm_access access)
-{
-    int        retval = -1;
-    char      *path;
-    char      *access_operations;
-    char      *module_rule; /* rule module name */
-    yang_stmt *ys;
-    yang_stmt *ymod;
-    char      *module;
-    cxobj     *xpath; /* xpath match */
-    cxobj     *xp; /* parent */
-   
-    /*  6b) Either (1) the rule does not have a "rule-type" defined or
-	(2) the "rule-type" is "data-node" and the "path" matches the
-	requested data node, action node, or notification node.  A
-	path is considered to match if the requested node is the node
-	specified by the path or is a descendant node of the path.*/    
-    if ((path = xml_find_body(xrule, "path")) == NULL){
-	if (xml_find_body(xrule, "rpc-name") ||xml_find_body(xrule, "notification-name"))
-	    goto nomatch;
-    }
-    /* 6c) For a "read" access operation, the rule's "access-operations"
-	leaf has the "read" bit set or has the special value "*" */
-
-    /*  6d) For a "create" access operation, the rule's
-           "access-operations" leaf has the "create" bit set or has the
-           special value "*".
-        6e) For a "delete" access operation, the rule's
-           "access-operations" leaf has the "delete" bit set or has the
-           special value "*".
-        6f) For an "update" access operation, the rule's
-           "access-operations" leaf has the "update" bit set or has the
-           special value "*". */
-    access_operations = xml_find_body(xrule, "access-operations");
-    switch (access){
-    case NACM_CREATE:
-	if (!match_access(access_operations, "create", "write"))
-	    goto nomatch;
-	break;
-    case NACM_UPDATE:
-	if (!match_access(access_operations, "update", "write"))
-	    goto nomatch;
-	break;
-    case NACM_DELETE:
-	if (!match_access(access_operations, "delete", "write"))
-	    goto nomatch;
-	break;
-    default:
-	break;
-    }
-        /* 6a) The rule's "module-name" leaf is "*" or equals the name of
-     * the YANG module where the requested data node is defined. */
-    if ((module_rule = xml_find_body(xrule, "module-name")) == NULL)
-	goto nomatch;
-    if (strcmp(module_rule,"*")!=0){
-	if ((ys = xml_spec(xr)) == NULL)
-	    goto nomatch;
-	ymod = ys_module(ys);
-	module = ymod->ys_argument;
-	if (strcmp(module, module_rule) != 0)
-	    goto nomatch;
-    }
-    /* Here module is matched, now check for path if any */
-    if (path){ 
-	if ((xpath = xpath_first(xt, "%s", path)) == NULL)
-	    goto nomatch;
-	/* The requested node xr is the node specified by the path or is a 
-	 * descendant node of the path:
-	 * xmatch is one of xvec[] or an ancestor of the xvec[] nodes.
-	 */
-	xp = xr;
-	do {
-	    if (xpath == xp)
-		goto match;
-	} while ((xp = xml_parent(xp)) != NULL);
-    }
- match:
-    retval = 1;
- done:
-    return retval;
- nomatch:
-    retval = 0;
-    goto done;
-}
 	      
 /*! Make nacm datanode and module rule write access validation
  * The operations of NACM are: create, read, update, delete, exec
@@ -790,17 +703,21 @@ nacm_datanode_write(cxobj           *xt,
 	    goto done;
 	/* 6. For each rule-list entry found, process all rules, in order,
 	   until a rule that matches the requested access operation is
-	   found. (see 6 sub rules in nacm_match_rule2)
+	   found. (see 6 sub rules in nacm_rule_data_write)
 	*/
 	for (j=0; j<rlen; j++){ /* Loop through rules */
 	    xrule = rvec[j];
-	    if ((match = rule_data_write(xt, xr, xrule, access)) < 0)
+	    if ((match = nacm_rule_datanode(xt, xr, xrule, access)) < 0)
 		goto done;
 	    if (match) /* match */
 		break;
 	}
 	if (match)
 	    break;
+	if (rvec){
+	    free(rvec);
+	    rvec = NULL;
+	}
     }
     if (match){
 	if ((action = xml_find_body(xrule, "action")) == NULL)
@@ -934,7 +851,7 @@ nacm_access(char          *mode,
  * @retval  1  OK permitted. You do not need to do next NACM step
  * @code
  *   cxobj *xnacm = NULL;
- *   if ((ret = nacm_access_h(h, username, &xnacm)) < 0)
+ *   if ((ret = nacm_access_pre(h, username, &xnacm)) < 0)
  *     err;
  *   if (ret == 0){
  *      // Next step NACM processing
@@ -943,11 +860,10 @@ nacm_access(char          *mode,
  * @endcode
  * @see RFC8341 3.4 Access Control Enforcement Procedures
  */
-
 int
-nacm_access_h(clicon_handle  h,
-	      char          *username,
-	      cxobj        **xnacmp)
+nacm_access_pre(clicon_handle  h,
+		char          *username,
+		cxobj        **xnacmp)
 {
     int    retval = -1;
     char  *mode;
diff --git a/test/README.md b/test/README.md
index 1326365e..0c278c9d 100644
--- a/test/README.md
+++ b/test/README.md
@@ -7,6 +7,9 @@ application. Assumes setup of http daemon as describe under apps/restonf
 - site.sh           Add your site-specific modifications here
 - test_nacm.sh      Auth tests using internal NACM
 - test_nacm_ext.sh  Auth tests using external NACM (separate file)
+- test_nacm_protocol.sh  Auth tests for incoming RPC:s
+- test_nacm_module_read.sh  Auth tests for data node read operations
+- test_nacm_module_write.sh  Auth tests for data node write operations
 - test_cli.sh       CLI tests
 - test_netconf.sh   Netconf tests
 - test_restconf.sh  Restconf tests
diff --git a/test/test_nacm.sh b/test/test_nacm.sh
index ba3fae4d..dd0bab2e 100755
--- a/test/test_nacm.sh
+++ b/test/test_nacm.sh
@@ -165,16 +165,16 @@ expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/nacm-exa
 
'
 
 new2 "guest get nacm"
-expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
+expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
 
 new "admin edit nacm"
 expecteq "$(curl -u andy:bar -sS -X PUT -d '{"nacm-example:x": 1}' http://localhost/restconf/data/nacm-example:x)" ""
 
 new2 "limited edit nacm"
-expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"nacm-example:x": 2}' http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"nacm-example:x": 2}' http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
 new2 "guest edit nacm"
-expecteq "$(curl -u guest:bar -sS -X PUT -d '{"nacm-example:x": 3}' http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
+expecteq "$(curl -u guest:bar -sS -X PUT -d '{"nacm-example:x": 3}' http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
 
 new "Kill restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"
diff --git a/test/test_nacm_ext.sh b/test/test_nacm_ext.sh
index f4587c71..ce337a0c 100755
--- a/test/test_nacm_ext.sh
+++ b/test/test_nacm_ext.sh
@@ -177,16 +177,16 @@ expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/nacm-exa
 
'
 
 new2 "guest get nacm"
-expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
+expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
 
 new "admin edit nacm"
 expecteq "$(curl -u andy:bar -sS -X PUT -d '{"nacm-example:x": 1}' http://localhost/restconf/data/nacm-example:x)" ""
 
 new2 "limited edit nacm"
-expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"x": 2}' http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"x": 2}' http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
 new2 "guest edit nacm"
-expecteq "$(curl -u guest:bar -sS -X PUT -d '{"x": 3}' http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
+expecteq "$(curl -u guest:bar -sS -X PUT -d '{"x": 3}' http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
 
 new "cli show conf as admin"
 expectfn "$clixon_cli -1 -U andy -l o -f $cfg show conf" 0 "^x 1;$"
diff --git a/test/test_nacm_module_read.sh b/test/test_nacm_module_read.sh
index 34356ba2..6dfc74c5 100755
--- a/test/test_nacm_module_read.sh
+++ b/test/test_nacm_module_read.sh
@@ -214,22 +214,22 @@ expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data)" '{"dat
 #user:guest
 
 new2 "guest read fail"
-expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/clixon-example:translate)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/clixon-example:translate)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
 new2 "guest read netconf fail"
-expecteof "$clixon_netconf -U guest -qf $cfg" 0 '<rpc><get-config><source><candidate/></source><filter type="xpath" select="/translate"/></get-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>protocol</error-type><error-tag>access-denied</error-tag><error-severity>error</error-severity><error-message>default deny</error-message></rpc-error></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -U guest -qf $cfg" 0 '<rpc><get-config><source><candidate/></source><filter type="xpath" select="/translate"/></get-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>access-denied</error-tag><error-severity>error</error-severity><error-message>default deny</error-message></rpc-error></rpc-reply>]]>]]>$'
 
 new2 "guest read element fail"
-expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/clixon-example:translate=key42/value)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/clixon-example:translate=key42/value)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
 new2 "guest read other module fail"
-expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
 new2 "guest read state fail"
-expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/clixon-example:state)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/clixon-example:state)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
 new2 "guest read top ok (part)"
-expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
 #------- RPC operation
 
@@ -248,10 +248,10 @@ new "limit rpc netconf ok"
 expecteof "$clixon_netconf -U wilma -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><example xmlns="urn:example:clixon"><x>0</x></example></rpc>]]>]]>' '^<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><x xmlns="urn:example:clixon">0</x><y xmlns="urn:example:clixon">42</y></rpc-reply>]]>]]>$'
 
 new2 "guest rpc fail"
-expecteq "$(curl -u guest:bar -s -X POST http://localhost/restconf/operations/clixon-example:example -d '{"clixon-example:input":{"x":42}}' )" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
+expecteq "$(curl -u guest:bar -s -X POST http://localhost/restconf/operations/clixon-example:example -d '{"clixon-example:input":{"x":42}}' )" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
 
 new "guest rpc netconf fail"
-expecteof "$clixon_netconf -U guest -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><example xmlns="urn:example:clixon"><x>0</x></example></rpc>]]>]]>' '^<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><rpc-error><error-type>protocol</error-type><error-tag>access-denied</error-tag><error-severity>error</error-severity><error-message>access denied</error-message></rpc-error></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -U guest -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><example xmlns="urn:example:clixon"><x>0</x></example></rpc>]]>]]>' '^<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><rpc-error><error-type>application</error-type><error-tag>access-denied</error-tag><error-severity>error</error-severity><error-message>access denied</error-message></rpc-error></rpc-reply>]]>]]>$'
 
 #------------------ Set read-default permit
 
@@ -267,7 +267,7 @@ expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/nacm-exa
 
'
 
 new2 "guest read state fail"
-expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/clixon-example:state)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/clixon-example:state)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
 
 new "Kill restconf daemon"
diff --git a/test/test_nacm_module_write.sh b/test/test_nacm_module_write.sh
index 49f708e7..20ea209c 100755
--- a/test/test_nacm_module_write.sh
+++ b/test/test_nacm_module_write.sh
@@ -184,7 +184,7 @@ MSG="<data>$RULES</data>"
 new "update root list permit"
 expecteq "$(curl -u andy:bar -sS -H 'Content-Type: application/yang-data+xml' -X PUT http://localhost/restconf/data -d "$MSG")" ''
 
-new "delete root list deny"
+new2 "delete root list deny"
 expecteq "$(curl -u wilma:bar -sS -X DELETE http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
 new "delete root permit"
diff --git a/test/test_nacm_protocol.sh b/test/test_nacm_protocol.sh
index 211ccad6..14f6ed61 100755
--- a/test/test_nacm_protocol.sh
+++ b/test/test_nacm_protocol.sh
@@ -171,20 +171,20 @@ expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/nacm-exam
 
 # Rule 1: deny-kill-session
 new "deny-kill-session: limited fail (netconf)"
-expecteof "$clixon_netconf -qf $cfg -U wilma" 0 "<rpc><kill-session><session-id>44</session-id></kill-session></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-type>protocol</error-type><error-tag>access-denied</error-tag><error-severity>error</error-severity><error-message>access denied</error-message></rpc-error></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -U wilma" 0 "<rpc><kill-session><session-id>44</session-id></kill-session></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>access-denied</error-tag><error-severity>error</error-severity><error-message>access denied</error-message></rpc-error></rpc-reply>]]>]]>$"
 
 new "deny-kill-session: guest fail (netconf)"
-expecteof "$clixon_netconf -qf $cfg -U guest" 0 "<rpc><kill-session><session-id>44</session-id></kill-session></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-type>protocol</error-type><error-tag>access-denied</error-tag><error-severity>error</error-severity><error-message>access denied</error-message></rpc-error></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -U guest" 0 "<rpc><kill-session><session-id>44</session-id></kill-session></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>access-denied</error-tag><error-severity>error</error-severity><error-message>access denied</error-message></rpc-error></rpc-reply>]]>]]>$"
 
 new "deny-kill-session: admin ok (netconf)"
 expecteof "$clixon_netconf -qf $cfg -U andy" 0 "<rpc><kill-session><session-id>44</session-id></kill-session></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 # Rule 2: deny-delete-config
 new "deny-delete-config: limited fail (netconf)"
-expecteof "$clixon_netconf -qf $cfg -U wilma" 0 "<rpc><delete-config><target><startup/></target></delete-config></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-type>protocol</error-type><error-tag>access-denied</error-tag><error-severity>error</error-severity><error-message>access denied</error-message></rpc-error></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -U wilma" 0 "<rpc><delete-config><target><startup/></target></delete-config></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>access-denied</error-tag><error-severity>error</error-severity><error-message>access denied</error-message></rpc-error></rpc-reply>]]>]]>$"
 
 new2 "deny-delete-config: guest fail (restconf)"
-expecteq "$(curl -u guest:bar -sS -X DELETE http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+expecteq "$(curl -u guest:bar -sS -X DELETE http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
 # In restconf delete-config is translated to edit-config which is permitted
 new "deny-delete-config: limited fail (restconf) ok"
@@ -212,7 +212,7 @@ new "permit-edit-config: limited ok restconf"
 expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"nacm-example:x": 2}' http://localhost/restconf/data/nacm-example:x)" ''
 
 new2 "permit-edit-config: guest fail restconf"
-expecteq "$(curl -u guest:bar -sS -X PUT -d '{"nacm-example:x": 2}' http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
+expecteq "$(curl -u guest:bar -sS -X PUT -d '{"nacm-example:x": 2}' http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
 new "Kill restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"

From 936ae389e8d18a7b2c2989a6b17345d95744922b Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sat, 2 Feb 2019 12:20:47 +0100
Subject: [PATCH 50/72] Test script change: merged new2+new functions

---
 doc/FAQ.md                     |  2 +-
 test/lib.sh                    | 10 +------
 test/test_choice.sh            |  2 +-
 test/test_nacm.sh              | 18 ++++++------
 test/test_nacm_ext.sh          | 18 ++++++------
 test/test_nacm_module_read.sh  | 46 +++++++++++++++---------------
 test/test_nacm_module_write.sh | 28 +++++++++---------
 test/test_nacm_protocol.sh     |  8 +++---
 test/test_restconf.sh          | 52 +++++++++++++++++-----------------
 test/test_restconf2.sh         |  4 +--
 test/test_rpc.sh               | 22 +++++++-------
 test/test_yang_namespace.sh    |  2 +-
 12 files changed, 102 insertions(+), 110 deletions(-)

diff --git a/doc/FAQ.md b/doc/FAQ.md
index ff0ed3a1..f15ee42c 100644
--- a/doc/FAQ.md
+++ b/doc/FAQ.md
@@ -486,7 +486,7 @@ limitations. See the (README)(../README.md) for more information.
 ## How do I write a CLI translator function?
 
 The CLI can perform variable translation. This is useful if you want to
-prcess the input, such as hashing, encrypting or in other way
+process the input, such as hashing, encrypting or in other way
 translate the input.
 
 Yang example:
diff --git a/test/lib.sh b/test/lib.sh
index feac39c1..1f0a8107 100755
--- a/test/lib.sh
+++ b/test/lib.sh
@@ -87,12 +87,6 @@ new(){
     testname=$1
     >&2 echo "Test$testnr [$1]"
 }
-# No CR
-new2(){
-    testnr=`expr $testnr + 1`
-    testname=$1
-    >&2 echo -n "Test$testnr [$1]"
-}
 
 # clixon command tester.
 # Arguments:
@@ -158,9 +152,7 @@ expecteq(){
   if [ -z "$ret" -a -z "$expect" ]; then
       return
   fi
-  if [[ "$ret" = "$expect" ]]; then
-      echo 
-  else
+  if [[ "$ret" != "$expect" ]]; then
       err "$expect" "$ret"
   fi
 }
diff --git a/test/test_choice.sh b/test/test_choice.sh
index 373bf835..e1ca5ff9 100755
--- a/test/test_choice.sh
+++ b/test/test_choice.sh
@@ -139,7 +139,7 @@ expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^
 new "restconf set protocol tcp"
 expecteq "$(curl -s -X PUT http://localhost/restconf/data/system:system/protocol -d {\"system:protocol\":{\"tcp\":null}})" ""
 
-new2 "restconf get protocol tcp"
+new "restconf get protocol tcp"
 expecteq "$(curl -s -X GET http://localhost/restconf/data/system:system)" '{"system:system": {"protocol": {"tcp": null}}}
 
'
 
diff --git a/test/test_nacm.sh b/test/test_nacm.sh
index dd0bab2e..cc968e82 100755
--- a/test/test_nacm.sh
+++ b/test/test_nacm.sh
@@ -131,7 +131,7 @@ sudo su -c "$clixon_restconf -f $cfg -D $DBG -- -a" -s /bin/sh www-data &
 
 sleep $RCWAIT
 
-new2 "auth get"
+new "auth get"
 expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" 'null
 
'
 
@@ -141,13 +141,13 @@ expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><edit-config><target><candidate/></
 new "commit it"
 expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
-new2 "auth get (no user: access denied)"
+new "auth get (no user: access denied)"
 expecteq "$(curl -sS -X GET -H \"Accept:\ application/yang-data+json\" http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
 
-new2 "auth get (wrong passwd: access denied)"
+new "auth get (wrong passwd: access denied)"
 expecteq "$(curl -u andy:foo -sS -X GET http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
 
-new2 "auth get (access)"
+new "auth get (access)"
 expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"nacm-example:x": 0}
 
'
 
@@ -156,24 +156,24 @@ expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/nacm-exam
 new "enable nacm"
 expecteq "$(curl -u andy:bar -sS -X PUT -d '{"ietf-netconf-acm:enable-nacm": true}' http://localhost/restconf/data/ietf-netconf-acm:nacm/enable-nacm)" ""
 
-new2 "admin get nacm"
+new "admin get nacm"
 expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"nacm-example:x": 0}
 
'
 
-new2 "limited get nacm"
+new "limited get nacm"
 expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"nacm-example:x": 0}
 
'
 
-new2 "guest get nacm"
+new "guest get nacm"
 expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
 
 new "admin edit nacm"
 expecteq "$(curl -u andy:bar -sS -X PUT -d '{"nacm-example:x": 1}' http://localhost/restconf/data/nacm-example:x)" ""
 
-new2 "limited edit nacm"
+new "limited edit nacm"
 expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"nacm-example:x": 2}' http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
-new2 "guest edit nacm"
+new "guest edit nacm"
 expecteq "$(curl -u guest:bar -sS -X PUT -d '{"nacm-example:x": 3}' http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
 
 new "Kill restconf daemon"
diff --git a/test/test_nacm_ext.sh b/test/test_nacm_ext.sh
index ce337a0c..abc5f410 100755
--- a/test/test_nacm_ext.sh
+++ b/test/test_nacm_ext.sh
@@ -151,41 +151,41 @@ sudo su -c "$clixon_restconf -f $cfg -D $DBG -- -a" -s /bin/sh www-data &
 
 sleep $RCWAIT
 
-new2 "auth get"
+new "auth get"
 expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": "42"}}
 
'
 
 new "Set x to 0"
 expecteq "$(curl -u andy:bar -sS -X PUT -d '{"nacm-example:x": 0}' http://localhost/restconf/data/nacm-example:x)" ""
 
-new2 "auth get (no user: access denied)"
+new "auth get (no user: access denied)"
 expecteq "$(curl -sS -X GET -H \"Accept:\ application/yang-data+json\" http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
 
-new2 "auth get (wrong passwd: access denied)"
+new "auth get (wrong passwd: access denied)"
 expecteq "$(curl -u andy:foo -sS -X GET http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "access-denied","error-severity": "error","error-message": "The requested URL was unauthorized"}}}
'
 
-new2 "auth get (access)"
+new "auth get (access)"
 expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"nacm-example:x": 0}
 
'
 
-new2 "admin get nacm"
+new "admin get nacm"
 expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"nacm-example:x": 0}
 
'
 
-new2 "limited get nacm"
+new "limited get nacm"
 expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"nacm-example:x": 0}
 
'
 
-new2 "guest get nacm"
+new "guest get nacm"
 expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
 
 new "admin edit nacm"
 expecteq "$(curl -u andy:bar -sS -X PUT -d '{"nacm-example:x": 1}' http://localhost/restconf/data/nacm-example:x)" ""
 
-new2 "limited edit nacm"
+new "limited edit nacm"
 expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"x": 2}' http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
-new2 "guest edit nacm"
+new "guest edit nacm"
 expecteq "$(curl -u guest:bar -sS -X PUT -d '{"x": 3}' http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
 
 new "cli show conf as admin"
diff --git a/test/test_nacm_module_read.sh b/test/test_nacm_module_read.sh
index 6dfc74c5..252bfd31 100755
--- a/test/test_nacm_module_read.sh
+++ b/test/test_nacm_module_read.sh
@@ -159,22 +159,22 @@ expecteq "$(curl -u andy:bar -sS -X PUT -d '{"enable-nacm": true}' http://localh
 
 #----READ access
 #user:admin
-new2 "admin read ok"
+new "admin read ok"
 expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/clixon-example:translate)" '{"clixon-example:translate": [{"k": "key42","value": "val42"},{ "k": "key43","value": "val43"}]}
 
'
 
-new2 "admin read netconf ok"
+new "admin read netconf ok"
 expecteof "$clixon_netconf -U andy -qf $cfg" 0 '<rpc><get-config><source><candidate/></source><filter type="xpath" select="/translate"/></get-config></rpc>]]>]]>' '^<rpc-reply><data><translate xmlns="urn:example:clixon"><k>key42</k><value>val42</value></translate><translate xmlns="urn:example:clixon"><k>key43</k><value>val43</value></translate></data></rpc-reply>]]>]]>$'
 
-new2 "admin read element ok"
+new "admin read element ok"
 expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/clixon-example:translate=key42/value)" '{"clixon-example:value": "val42"}
 
'
 
-new2 "admin read other module OK"
+new "admin read other module OK"
 expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"nacm-example:x": 42}
 
'
 
-new2 "admin read state OK"
+new "admin read state OK"
 expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": "42"}}
 
'
 
@@ -188,66 +188,66 @@ fi
 
 #user:limit
 
-new2 "limit read ok"
+new "limit read ok"
 expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/clixon-example:translate)" '{"clixon-example:translate": [{"k": "key42","value": "val42"},{ "k": "key43","value": "val43"}]}
 
'
 
-new2 "limit read netconf ok"
+new "limit read netconf ok"
 expecteof "$clixon_netconf -U wilma -qf $cfg" 0 '<rpc><get-config><source><candidate/></source><filter type="xpath" select="/translate"/></get-config></rpc>]]>]]>' '^<rpc-reply><data><translate xmlns="urn:example:clixon"><k>key42</k><value>val42</value></translate><translate xmlns="urn:example:clixon"><k>key43</k><value>val43</value></translate></data></rpc-reply>]]>]]>$'
 
-new2 "limit read element ok"
+new "limit read element ok"
 expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/clixon-example:translate=key42/value)" '{"clixon-example:value": "val42"}
 
'
 
-new2 "limit read other module fail"
+new "limit read other module fail"
 expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" 'null
 
'
 
-new2 "limit read state OK"
+new "limit read state OK"
 expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": "42"}}
 
'
 
-new2 "limit read top ok (part)"
+new "limit read top ok (part)"
 expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data)" '{"data": {"clixon-example:translate": [{"k": "key42","value": "val42"},{ "k": "key43","value": "val43"}],"clixon-example:state": {"op": "42"}}}
 
'
 
 #user:guest
 
-new2 "guest read fail"
+new "guest read fail"
 expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/clixon-example:translate)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
-new2 "guest read netconf fail"
+new "guest read netconf fail"
 expecteof "$clixon_netconf -U guest -qf $cfg" 0 '<rpc><get-config><source><candidate/></source><filter type="xpath" select="/translate"/></get-config></rpc>]]>]]>' '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>access-denied</error-tag><error-severity>error</error-severity><error-message>default deny</error-message></rpc-error></rpc-reply>]]>]]>$'
 
-new2 "guest read element fail"
+new "guest read element fail"
 expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/clixon-example:translate=key42/value)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
-new2 "guest read other module fail"
+new "guest read other module fail"
 expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
-new2 "guest read state fail"
+new "guest read state fail"
 expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/clixon-example:state)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
-new2 "guest read top ok (part)"
+new "guest read top ok (part)"
 expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
 #------- RPC operation
 
-new2 "admin rpc ok"
+new "admin rpc ok"
 expecteq "$(curl -u andy:bar -s -X POST  -d '{"clixon-example:input":{"x":42}}' http://localhost/restconf/operations/clixon-example:example)" '{"clixon-example:output": {"x": "42","y": "42"}}
 
'
 
 new "admin rpc netconf ok"
 expecteof "$clixon_netconf -U andy -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><example xmlns="urn:example:clixon"><x>0</x></example></rpc>]]>]]>' '^<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><x xmlns="urn:example:clixon">0</x><y xmlns="urn:example:clixon">42</y></rpc-reply>]]>]]>$'
 
-new2 "limit rpc ok"
+new "limit rpc ok"
 expecteq "$(curl -u wilma:bar -s -X POST http://localhost/restconf/operations/clixon-example:example -d '{"clixon-example:input":{"x":42}}' )" '{"clixon-example:output": {"x": "42","y": "42"}}
 
'
 
 new "limit rpc netconf ok"
 expecteof "$clixon_netconf -U wilma -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><example xmlns="urn:example:clixon"><x>0</x></example></rpc>]]>]]>' '^<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><x xmlns="urn:example:clixon">0</x><y xmlns="urn:example:clixon">42</y></rpc-reply>]]>]]>$'
 
-new2 "guest rpc fail"
+new "guest rpc fail"
 expecteq "$(curl -u guest:bar -s -X POST http://localhost/restconf/operations/clixon-example:example -d '{"clixon-example:input":{"x":42}}' )" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
 
 new "guest rpc netconf fail"
@@ -258,15 +258,15 @@ expecteof "$clixon_netconf -U guest -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml
 new "admin set read-default permit"
 expecteq "$(curl -u andy:bar -sS -X PUT -d '{"read-default": "permit"}' http://localhost/restconf/data/ietf-netconf-acm:nacm/read-default)" ""
 
-new2 "limit read ok"
+new "limit read ok"
 expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/clixon-example:translate)" '{"clixon-example:translate": [{"k": "key42","value": "val42"},{ "k": "key43","value": "val43"}]}
 
'
 
-new2 "limit read other module ok"
+new "limit read other module ok"
 expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"nacm-example:x": 42}
 
'
 
-new2 "guest read state fail"
+new "guest read state fail"
 expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/clixon-example:state)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
 
diff --git a/test/test_nacm_module_write.sh b/test/test_nacm_module_write.sh
index 20ea209c..76c5f971 100755
--- a/test/test_nacm_module_write.sh
+++ b/test/test_nacm_module_write.sh
@@ -176,7 +176,7 @@ nacm
 # delete    |  p/d   | xp/dx  |  p/d
 
 #----------root
-new2 "update root list default deny"
+new "update root list default deny"
 expecteq "$(curl -u wilma:bar -sS -H 'Content-Type: application/yang-data+xml' -X PUT http://localhost/restconf/data -d '<data><x xmlns="urn:example:nacm">42</x>$RULES</data>')" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
 # replace all, then must include NACM rules as well
@@ -184,7 +184,7 @@ MSG="<data>$RULES</data>"
 new "update root list permit"
 expecteq "$(curl -u andy:bar -sS -H 'Content-Type: application/yang-data+xml' -X PUT http://localhost/restconf/data -d "$MSG")" ''
 
-new2 "delete root list deny"
+new "delete root list deny"
 expecteq "$(curl -u wilma:bar -sS -X DELETE http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
 new "delete root permit"
@@ -194,62 +194,62 @@ expecteq "$(curl -u andy:bar -sS -X DELETE http://localhost/restconf/data)" ''
 nacm
 
 #----------leaf
-new2 "create leaf deny"
+new "create leaf deny"
 expecteq "$(curl -u guest:bar -sS -H 'Content-Type: application/yang-data+xml' -X PUT http://localhost/restconf/data/nacm-example:x -d '<x xmlns="urn:example:nacm">42</x>')" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
 
 new "create leaf permit"
 expecteq "$(curl -u wilma:bar -sS -H 'Content-Type: application/yang-data+xml' -X PUT http://localhost/restconf/data/nacm-example:x -d '<x xmlns="urn:example:nacm">42</x>')" ''
 
-new2 "update leaf deny"
+new "update leaf deny"
 expecteq "$(curl -u wilma:bar -sS -H 'Content-Type: application/yang-data+xml' -X PUT http://localhost/restconf/data/nacm-example:x -d '<x xmlns="urn:example:nacm">99</x>')" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
 
 new "update leaf permit"
 expecteq "$(curl -u guest:bar -sS -H 'Content-Type: application/yang-data+xml' -X PUT http://localhost/restconf/data/nacm-example:x -d '<x xmlns="urn:example:nacm">99</x>')" ''
 
-new2 "read leaf check"
+new "read leaf check"
 expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"nacm-example:x": 99}
 
'
 
-new2 "delete leaf deny"
+new "delete leaf deny"
 expecteq "$(curl -u guest:bar -sS -X DELETE http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
 
 new "delete leaf permit"
 expecteq "$(curl -u wilma:bar -sS -X DELETE http://localhost/restconf/data/nacm-example:x)" ''
 
 #-----  list/container
-new2 "create list deny"
+new "create list deny"
 expecteq "$(curl -u guest:bar -sS -H 'Content-Type: application/yang-data+xml' -X PUT http://localhost/restconf/data/nacm-example:a=key42 -d '<a xmlns="urn:example:nacm"><k>key42</k><b><c>str</c></b></a>')" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
 
 new "create list permit"
 expecteq "$(curl -u wilma:bar -sS -H 'Content-Type: application/yang-data+xml' -X PUT http://localhost/restconf/data/nacm-example:a=key42 -d '<a xmlns="urn:example:nacm"><k>key42</k><b><c>str</c></b></a>')" ''
 
-new2 "update list deny"
+new "update list deny"
 expecteq "$(curl -u wilma:bar -sS -H 'Content-Type: application/yang-data+xml' -X PUT http://localhost/restconf/data/nacm-example:a=key42 -d '<a xmlns="urn:example:nacm"><k>key42</k><b><c>update</c></b></a>')" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
 
 new "update list permit"
 expecteq "$(curl -u guest:bar -sS -H 'Content-Type: application/yang-data+xml' -X PUT http://localhost/restconf/data/nacm-example:a=key42 -d '<a xmlns="urn:example:nacm"><k>key42</k><b><c>update</c></b></a>')" ''
 
-new2 "read list check"
+new "read list check"
 expecteq "$(curl -u guest:bar -sS -X GET http://localhost/restconf/data/nacm-example:a)" '{"nacm-example:a": [{"k": "key42","b": {"c": "update"}}]}
 
'
 
-new2 "delete list deny"
+new "delete list deny"
 expecteq "$(curl -u guest:bar -sS -X DELETE http://localhost/restconf/data/nacm-example:a=key42)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "access denied"}}}
'
 
 new "delete list permit"
 expecteq "$(curl -u wilma:bar -sS -X DELETE http://localhost/restconf/data/nacm-example:a=key42)" ''
 
 #----- default deny (clixon-example limit and guest have default access)
-new2 "default create list deny"
+new "default create list deny"
 expecteq "$(curl -u wilma:bar -sS -X PUT http://localhost/restconf/data/clixon-example:translate=key42 -d '{"clixon-example:translate": [{"k": "key42","value": "val42"}]}')" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
-new2 "create list permit"
+new "create list permit"
 expecteq "$(curl -u andy:bar -sS -X PUT http://localhost/restconf/data/clixon-example:translate=key42 -d '{"clixon-example:translate": [{"k": "key42","value": "val42"}]}')" ''
 
-new2 "default update list deny"
+new "default update list deny"
 expecteq "$(curl -u wilma:bar -sS -X PUT http://localhost/restconf/data/clixon-example:translate=key42 -d '{"clixon-example:translate": [{"k": "key42","value": "val99"}]}')" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
-new2 "default delete list deny"
+new "default delete list deny"
 expecteq "$(curl -u wilma:bar -sS -X DELETE http://localhost/restconf/data/clixon-example:translate=key42)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
 new "Kill restconf daemon"
diff --git a/test/test_nacm_protocol.sh b/test/test_nacm_protocol.sh
index 14f6ed61..515eb8f7 100755
--- a/test/test_nacm_protocol.sh
+++ b/test/test_nacm_protocol.sh
@@ -165,7 +165,7 @@ expecteq "$(curl -u andy:bar -sS -X PUT -d '{"enable-nacm": true}' http://localh
 
 #--------------- nacm enabled
 
-new2 "admin get nacm"
+new "admin get nacm"
 expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" '{"nacm-example:x": 0}
 
'
 
@@ -183,14 +183,14 @@ expecteof "$clixon_netconf -qf $cfg -U andy" 0 "<rpc><kill-session><session-id>4
 new "deny-delete-config: limited fail (netconf)"
 expecteof "$clixon_netconf -qf $cfg -U wilma" 0 "<rpc><delete-config><target><startup/></target></delete-config></rpc>]]>]]>" "^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>access-denied</error-tag><error-severity>error</error-severity><error-message>access denied</error-message></rpc-error></rpc-reply>]]>]]>$"
 
-new2 "deny-delete-config: guest fail (restconf)"
+new "deny-delete-config: guest fail (restconf)"
 expecteq "$(curl -u guest:bar -sS -X DELETE http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
 # In restconf delete-config is translated to edit-config which is permitted
 new "deny-delete-config: limited fail (restconf) ok"
 expecteq "$(curl -u wilma:bar -sS -X DELETE http://localhost/restconf/data)" ''
 
-new2 "admin get nacm (should be null)"
+new "admin get nacm (should be null)"
 expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/nacm-example:x)" 'null
 
'
 
@@ -211,7 +211,7 @@ expecteq "$(curl -u andy:bar -sS -X PUT -d '{"ietf-netconf-acm:enable-nacm": tru
 new "permit-edit-config: limited ok restconf"
 expecteq "$(curl -u wilma:bar -sS -X PUT -d '{"nacm-example:x": 2}' http://localhost/restconf/data/nacm-example:x)" ''
 
-new2 "permit-edit-config: guest fail restconf"
+new "permit-edit-config: guest fail restconf"
 expecteq "$(curl -u guest:bar -sS -X PUT -d '{"nacm-example:x": 2}' http://localhost/restconf/data/nacm-example:x)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "access-denied","error-severity": "error","error-message": "default deny"}}}
'
 
 new "Kill restconf daemon"
diff --git a/test/test_restconf.sh b/test/test_restconf.sh
index 462ac83f..78f074a8 100755
--- a/test/test_restconf.sh
+++ b/test/test_restconf.sh
@@ -57,22 +57,22 @@ sleep $RCWAIT
 
 new "restconf tests"
 
-new2 "restconf root discovery. RFC 8040 3.1 (xml+xrd)"
+new "restconf root discovery. RFC 8040 3.1 (xml+xrd)"
 expecteq "$(curl  -s -X GET http://localhost/.well-known/host-meta)" "<XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'>
    <Link rel='restconf' href='/restconf'/>
 </XRD>
"
 
-new2 "restconf get restconf resource. RFC 8040 3.3 (json)"
+new "restconf get restconf resource. RFC 8040 3.3 (json)"
 expecteq "$(curl -sG http://localhost/restconf)" '{"restconf": {"data": null,"operations": null,"yang-library-version": "2016-06-21"}}
 
'
 
-new2 "restconf get restconf resource. RFC 8040 3.3 (xml)"
+new "restconf get restconf resource. RFC 8040 3.3 (xml)"
 # Get XML instead of JSON?
 expecteq "$(curl -s -H 'Accept: application/yang-data+xml' -G http://localhost/restconf)" '<restconf><data/><operations/><yang-library-version>2016-06-21</yang-library-version></restconf>
 
'
 
 # Should be alphabetically ordered
-new2 "restconf get restconf/operations. RFC8040 3.3.2 (json)"
+new "restconf get restconf/operations. RFC8040 3.3.2 (json)"
 expecteq "$(curl -sG http://localhost/restconf/operations)" '{"operations": {"clixon-example:client-rpc": null,"clixon-example:empty": null,"clixon-example:optional": null,"clixon-example:example": null,"clixon-lib:debug": null}
 
'
 
@@ -84,7 +84,7 @@ if [ -z "$match" ]; then
     err "$expect" "$ret"
 fi
 
-new2 "restconf get restconf/yang-library-version. RFC8040 3.3.3"
+new "restconf get restconf/yang-library-version. RFC8040 3.3.3"
 expecteq "$(curl -sG http://localhost/restconf/yang-library-version)" '{"yang-library-version": "2016-06-21"}'
 
 new "restconf get restconf/yang-library-version. RFC8040 3.3.3 (xml)"
@@ -95,7 +95,7 @@ if [ -z "$match" ]; then
     err "$expect" "$ret"
 fi
 
-new2 "restconf schema resource, RFC 8040 sec 3.7 according to RFC 7895 (explicit resource)"
+new "restconf schema resource, RFC 8040 sec 3.7 according to RFC 7895 (explicit resource)"
 expecteq "$(curl -s -H 'Accept: application/yang-data+json' -G http://localhost/restconf/data/ietf-yang-library:modules-state/module=ietf-interfaces,2018-02-20)" '{"ietf-yang-library:module": [{"name": "ietf-interfaces","revision": "2018-02-20","namespace": "urn:ietf:params:xml:ns:yang:ietf-interfaces","conformance-type": "implement"}]}
 
'
 
@@ -109,18 +109,18 @@ expectfn "curl -s -I http://localhost/restconf/data" 0 "HTTP/1.1 200 OK"
 new "restconf empty rpc"
 expecteq "$(curl -s -X POST -d {\"clixon-example:input\":null} http://localhost/restconf/operations/clixon-example:empty)" ""
 
-new2 "restconf empty rpc with extra args (should fail)"
+new "restconf empty rpc with extra args (should fail)"
 expecteq "$(curl -s -X POST -d {\"clixon-example:input\":{\"extra\":null}} http://localhost/restconf/operations/clixon-example:empty)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "extra"},"error-severity": "error"}}}
'
 
-new2 "restconf get empty config + state json"
+new "restconf get empty config + state json"
 expecteq "$(curl -sSG http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": "42"}}
 
'
 
-new2 "restconf get empty config + state json + module"
+new "restconf get empty config + state json + module"
 expecteq "$(curl -sSG http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": "42"}}
 
'
 
-new2 "restconf get empty config + state json with wrong module name"
+new "restconf get empty config + state json with wrong module name"
 expecteq "$(curl -sSG http://localhost/restconf/data/badmodule:state)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "No such yang module: badmodule"}}}
'
 
 new "restconf get empty config + state xml"
@@ -131,7 +131,7 @@ if [ -z "$match" ]; then
     err "$expect" "$ret"
 fi
 
-new2 "restconf get data/ json"
+new "restconf get data/ json"
 expecteq "$(curl -s -G http://localhost/restconf/data/clixon-example:state/op=42)" '{"clixon-example:op": "42"}
 
'
 
@@ -144,7 +144,7 @@ if [ -z "$match" ]; then
     err "$expect" "$ret"
 fi
 
-new2 "restconf get state operation eth0 type json"
+new "restconf get state operation eth0 type json"
 expecteq "$(curl -s -G http://localhost/restconf/data/clixon-example:state/op=42)" '{"clixon-example:op": "42"}
 
'
 
@@ -157,7 +157,7 @@ if [ -z "$match" ]; then
     err "$expect" "$ret"
 fi
 
-new2 "restconf GET datastore"
+new "restconf GET datastore"
 expecteq "$(curl -s -X GET http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": "42"}}
 
'
 
@@ -187,15 +187,15 @@ expectfn 'curl -s -X POST -d {"ietf-interfaces:interface":{"name":"eth/0/0","typ
 # XXX cant get this to work
 #expecteq "$(curl -s -X POST -d '{"interface":{"name":"eth/0/0","type\":"ex:eth","enabled":true}}' http://localhost/restconf/data/interfaces)" ""
 
-new2 "restconf Check eth/0/0 added config"
+new "restconf Check eth/0/0 added config"
 expecteq "$(curl -s -G http://localhost/restconf/data/ietf-interfaces:interfaces)" '{"ietf-interfaces:interfaces": {"interface": [{"name": "eth/0/0","type": "ex:eth","enabled": true}]}}
 
'
 
-new2 "restconf Check eth/0/0 added state"
+new "restconf Check eth/0/0 added state"
 expecteq "$(curl -s -G http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": "42"}}
 
'
 
-new2 "restconf Re-post eth/0/0 which should generate error"
+new "restconf Re-post eth/0/0 which should generate error"
 expecteq "$(curl -s -X POST -d '{"ietf-interfaces:interface":{"name":"eth/0/0","type":"ex:eth","enabled":true}}' http://localhost/restconf/data/ietf-interfaces:interfaces)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "data-exists","error-severity": "error","error-message": "Data already exists; cannot create new resource"}}}
'
 
 new "Add leaf description using POST"
@@ -204,7 +204,7 @@ expecteq "$(curl -s -X POST -d '{"ietf-interfaces:description":"The-first-interf
 new "Add nothing using POST"
 expectfn 'curl -s -X POST http://localhost/restconf/data/ietf-interfaces:interfaces/interface=eth%2f0%2f0' 0 '"ietf-restconf:errors" : {"error": {"error-type": "rpc","error-tag": "malformed-message","error-severity": "error","error-message": " on line 1: syntax error at or before:'
 
-new2 "restconf Check description added"
+new "restconf Check description added"
 expecteq "$(curl -s -G http://localhost/restconf/data/ietf-interfaces:interfaces)" '{"ietf-interfaces:interfaces": {"interface": [{"name": "eth/0/0","description": "The-first-interface","type": "ex:eth","enabled": true}]}}
 
'
 
@@ -214,33 +214,33 @@ expecteq "$(curl -s -X DELETE  http://localhost/restconf/data/ietf-interfaces:in
 new "Check deleted eth/0/0"
 expectfn 'curl -s -G http://localhost/restconf/data' 0 $state
 
-new2 "restconf Re-Delete eth/0/0 using none should generate error"
+new "restconf Re-Delete eth/0/0 using none should generate error"
 expecteq "$(curl -s -X DELETE  http://localhost/restconf/data/ietf-interfaces:interfaces/interface=eth%2f0%2f0)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "data-missing","error-severity": "error","error-message": "Data does not exist; cannot delete resource"}}}
'
 
 new "restconf Add subtree eth/0/0 using PUT"
 expecteq "$(curl -s -X PUT -d '{"ietf-interfaces:interface":{"name":"eth/0/0","type":"ex:eth","enabled":true}}' http://localhost/restconf/data/ietf-interfaces:interfaces/interface=eth%2f0%2f0)" ""
 
-new2 "restconf get subtree"
+new "restconf get subtree"
 expecteq "$(curl -s -G http://localhost/restconf/data/ietf-interfaces:interfaces)" '{"ietf-interfaces:interfaces": {"interface": [{"name": "eth/0/0","type": "ex:eth","enabled": true}]}}
 
'
 
-new2 "restconf rpc using POST json"
+new "restconf rpc using POST json"
 expecteq "$(curl -s -X POST -d '{"clixon-example:input":{"x":42}}' http://localhost/restconf/operations/clixon-example:example)" '{"clixon-example:output": {"x": "42","y": "42"}}
 
'
 
-new2 "restconf rpc using POST json wrong"
+new "restconf rpc using POST json wrong"
 expecteq "$(curl -s -X POST -d '{"clixon-example:input":{"wrongelement":"ipv4"}}' http://localhost/restconf/operations/clixon-example:example)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "wrongelement"},"error-severity": "error"}}}
'
 
-new2 "restconf rpc non-existing rpc without namespace"
+new "restconf rpc non-existing rpc without namespace"
 expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations/kalle)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "kalle"},"error-severity": "error","error-message": "RPC not defined"}}}
'
 
-new2 "restconf rpc non-existing rpc"
+new "restconf rpc non-existing rpc"
 expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations/clixon-example:kalle)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "kalle"},"error-severity": "error","error-message": "RPC not defined"}}}
'
 
-new2 "restconf rpc missing name"
+new "restconf rpc missing name"
 expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "Operation name expected"}}}
'
 
-new2 "restconf rpc missing input"
+new "restconf rpc missing input"
 expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations/clixon-example:example)" '{"ietf-restconf:errors" : {"error": {"error-type": "rpc","error-tag": "malformed-message","error-severity": "error","error-message": "restconf RPC does not have input statement"}}}
'
 
 new "restconf rpc using POST xml"
@@ -251,7 +251,7 @@ if [ -z "$match" ]; then
     err "$expect" "$ret"
 fi
 
-new2 "restconf rpc using wrong prefix"
+new "restconf rpc using wrong prefix"
 expecteq "$(curl -s -X POST -d '{"wrong:input":{"routing-instance-name":"ipv4"}}' http://localhost/restconf/operations/wrong:example)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "yang module not found"}}}
'
 
 new "restconf local client rpc using POST xml"
diff --git a/test/test_restconf2.sh b/test/test_restconf2.sh
index 31582531..59d78abb 100755
--- a/test/test_restconf2.sh
+++ b/test/test_restconf2.sh
@@ -116,10 +116,10 @@ new "restconf POST interface"
 expectfn 'curl -s -X POST -d {"example:interface":{"name":"TEST","type":"eth0"}} http://localhost/restconf/data/example:cont1' 0 ""
 
 # XXX should it be example:interface?
-new2 "restconf POST again"
+new "restconf POST again"
 expecteq "$(curl -s -X POST -d '{"interface":{"name":"TEST","type":"eth0"}}' http://localhost/restconf/data/example:cont1)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "data-exists","error-severity": "error","error-message": "Data already exists; cannot create new resource"}}}
'
 
-new2 "restconf POST from top"
+new "restconf POST from top"
 expecteq "$(curl -s -X POST -d '{"example:cont1":{"interface":{"name":"TEST","type":"eth0"}}}' http://localhost/restconf/data)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "data-exists","error-severity": "error","error-message": "Data already exists; cannot create new resource"}}}
'
 
 new "restconf DELETE"
diff --git a/test/test_rpc.sh b/test/test_rpc.sh
index 076ced83..9598ff91 100755
--- a/test/test_rpc.sh
+++ b/test/test_rpc.sh
@@ -68,28 +68,28 @@ fi
 new "netconf empty rpc"
 expecteof "$clixon_netconf -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><empty xmlns="urn:example:clixon"/></rpc>]]>]]>' '^<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><ok/></rpc-reply>]]>]]>$'
 
-new2 "restconf example rpc json/json default - no http media headers"
+new "restconf example rpc json/json default - no http media headers"
 expecteq "$(curl -s -X POST -d '{"clixon-example:input":{"x":0}}' http://localhost/restconf/operations/clixon-example:example)" '{"clixon-example:output": {"x": "0","y": "42"}}
 
'
 
-new2 "restconf example rpc json/json change y default"
+new "restconf example rpc json/json change y default"
 expecteq "$(curl -s -X POST -d '{"clixon-example:input":{"x":"0","y":"99"}}' http://localhost/restconf/operations/clixon-example:example)" '{"clixon-example:output": {"x": "0","y": "99"}}
 
'
 
-new2 "restconf example rpc json/json"
+new "restconf example rpc json/json"
 # XXX example:input example:output
 expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+json' -H 'Content-Type: application/yang-data+json' -d '{"clixon-example:input":{"x":"0"}}' http://localhost/restconf/operations/clixon-example:example)" '{"clixon-example:output": {"x": "0","y": "42"}}
 
'
 
-new2 "restconf example rpc xml/json"
+new "restconf example rpc xml/json"
 expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+xml' -H 'Content-Type: application/yang-data+json' -d '<input xmlns="urn:example:clixon"><x>0</x></input>' http://localhost/restconf/operations/clixon-example:example)"  '{"clixon-example:output": {"x": "0","y": "42"}}
 
'
 
-new2 "restconf example rpc json/xml"
+new "restconf example rpc json/xml"
 expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+json' -H 'Accept: application/yang-data+xml' -d '{"clixon-example:input":{"x":"0"}}' http://localhost/restconf/operations/clixon-example:example)" '<output xmlns="urn:example:clixon"><x>0</x><y>42</y></output>
 
'
 
-new2 "restconf example rpc xml/xml"
+new "restconf example rpc xml/xml"
 expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+xml' -H 'Accept: application/yang-data+xml' -d '<input xmlns="urn:example:clixon"><x>0</x></input>' http://localhost/restconf/operations/clixon-example:example)" '<output xmlns="urn:example:clixon"><x>0</x><y>42</y></output>
 
'
 
@@ -106,7 +106,7 @@ if [ -z "$match" ]; then
     err "$expect" "$ret"
 fi
 
-new2 "restconf empty rpc with input x"
+new "restconf empty rpc with input x"
 expecteq "$(curl -s -X POST -d '{"clixon-example:input":{"x":0}}' http://localhost/restconf/operations/clixon-example:empty)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "x"},"error-severity": "error"}}}
'
 
 # cornercase: optional has yang input/output sections but test without body
@@ -118,16 +118,16 @@ if [ -z "$match" ]; then
     err "$expect" "$ret"
 fi
 
-new2 "restconf omit mandatory"
+new "restconf omit mandatory"
 expecteq "$(curl -s -X POST -d '{"clixon-example:input":null}' http://localhost/restconf/operations/clixon-example:example)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "x"},"error-severity": "error","error-message": "Mandatory variable"}}}
'
 
-new2 "restconf add extra"
+new "restconf add extra"
 expecteq "$(curl -s -X POST -d '{"clixon-example:input":{"x":"0","extra":"0"}}' http://localhost/restconf/operations/clixon-example:example)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "extra"},"error-severity": "error"}}}
'
 
-new2 "restconf wrong method"
+new "restconf wrong method"
 expecteq "$(curl -s -X POST -d '{"clixon-example:input":{"x":"0"}}' http://localhost/restconf/operations/clixon-example:wrong)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "wrong"},"error-severity": "error","error-message": "RPC not defined"}}}
'
 
-new2 "restconf example missing input"
+new "restconf example missing input"
 expecteq "$(curl -s -X POST -d '{"clixon-example:input":null}' http://localhost/restconf/operations/ietf-netconf:edit-config)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "yang module not found"}}}
'
 
 new "netconf kill-session missing session-id mandatory"
diff --git a/test/test_yang_namespace.sh b/test/test_yang_namespace.sh
index f674b61b..ae1f7cba 100755
--- a/test/test_yang_namespace.sh
+++ b/test/test_yang_namespace.sh
@@ -101,7 +101,7 @@ expecteof "$clixon_netconf -qf $cfg -y $fyang1" 0 "<rpc><discard-changes/></rpc>
 new "restconf set x in example1"
 expecteq "$(curl -s -X POST -d '{"example1:x":42}' http://localhost/restconf/data)" ''
 
-new2 "restconf get config example1"
+new "restconf get config example1"
 expecteq "$(curl -s -X GET http://localhost/restconf/data/example1:x)" '{"example1:x": 42}
 
'
 

From 376b75328c762c2b0ddbb718977edb44629d82eb Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sat, 2 Feb 2019 13:19:49 +0100
Subject: [PATCH 51/72] test scripts: added sum.sh

---
 CHANGELOG.md   |  3 ++-
 test/README.md | 24 ++++++++++++++++--------
 test/all.sh    | 20 ++++----------------
 test/sum.sh    | 31 +++++++++++++++++++++++++++++++
 4 files changed, 53 insertions(+), 25 deletions(-)
 create mode 100755 test/sum.sh

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 925c295d..adc11905 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -76,7 +76,8 @@
       * Note CLIXON_DATADIR (=/usr/local/share/clixon) need to be in the list
     * CLICON_YANG_MAIN_FILE Provides a filename with a single module filename.
     * CLICON_YANG_MAIN_DIR Provides a directory where all yang modules should be loaded.
-* NACM (RFC8341) experimental
+* NACM (RFC8341)
+  * Experimental support, no performance enhancements and need further testing
   * Incoming RPC Message validation is supported (3.4.4)
   * Data Node Access validation is supported (3.4.5), except:
     * rule-type data-node path is not supported
diff --git a/test/README.md b/test/README.md
index 0c278c9d..31a55880 100644
--- a/test/README.md
+++ b/test/README.md
@@ -3,7 +3,9 @@
 This directory contains testing code for clixon and the example
 application. Assumes setup of http daemon as describe under apps/restonf
 - Jenkinsfile       Makefile for Jenkins tests. Build clixon and run tests.
-- all.sh            Run through all tests named 'test*.sh' in this directory. Therefore, if you place a test in this directory matching 'test*.sh' it will be run automatically. By default the script will exit on first error. Run as `all.sh summary` to continue and print a summary on all tests.
+- all.sh            Run through all tests with detailed output, and stop on first error.
+- sum.sh            Run though all tests and print summary
+- mem.sh            Make valgrind 
 - site.sh           Add your site-specific modifications here
 - test_nacm.sh      Auth tests using internal NACM
 - test_nacm_ext.sh  Auth tests using external NACM (separate file)
@@ -18,14 +20,20 @@ application. Assumes setup of http daemon as describe under apps/restonf
 - test_datastore.sh Datastore tests
 - and many more...
 
-Example runs:
-```
-> run.sh
-# Runs through all tests matching 'test_*.sh' in the directory. Prints test output
-# and stops on first error
+Tests called 'test*.sh' and placed in this directory will be automatically run as part of the all.sh, sum.sh tests etc. 
 
-> run.sh summary
-# Same as above but continues after errors and does not print test output.
+You can prefix a test with `BE=0` if you want to run your own backend.
+
+To run with debug flags, use the `DBG=<number>` environment variable.
+
+You can run an individual test by itself, or run through all tests matching 'test_*.sh' in the directory. Prints test output and stops on first error:
+```
+  all.sh
+```
+
+Run all tests but continue after errors and only print a summary test output identifying which tests succeeded and which failed:
+```
+  all.sh summary
 ```
 
 
diff --git a/test/all.sh b/test/all.sh
index 1e036ab1..23d5424f 100755
--- a/test/all.sh
+++ b/test/all.sh
@@ -1,14 +1,9 @@
 #!/bin/bash
 # Run, eg as:
 # ./all.sh 2>&1 | tee test.log # break on first test
-# ./all.sh summary # to run all tests and print 
 
-summary=0
 if [ $# -gt 0 ]; then 
-    summary=1
-fi
-if [ $# -gt 1 ]; then 
-    echo "usage: $0 [summary] # pipe to dev/null and continue on error"
+    echo "usage: $0 # detailed logs and stopon first error"
     exit -1
 fi
 
@@ -17,20 +12,13 @@ fi
 err=0
 for test in test*.sh; do
     echo "Running $test"
-    if [ $summary -ne 0 ]; then
-	./$test  > /dev/null 2>&1
-	errcode=$?
-    else
-	./$test 
-	errcode=$?
-    fi
+    ./$test 
+    errcode=$?
     if [ $errcode -ne 0 ]; then
 	err=1
 	echo -e "\e[31mError in $test errcode=$errcode"
 	echo -ne "\e[0m"
-	if [ $summary -eq 0 ]; then
-	    exit $errcode
-	fi
+	exit $errcode
     fi
 done
 if [ $err -eq 0 ]; then 
diff --git a/test/sum.sh b/test/sum.sh
new file mode 100755
index 00000000..257c2bff
--- /dev/null
+++ b/test/sum.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+# Run, eg as:
+# ./sum.sh # to run all tests and print 
+
+if [ $# -gt 0 ]; then 
+    echo "usage: $0 # pipe to dev/null and continue on error"
+    exit -1
+fi
+
+# include err() and new() functions
+. ./lib.sh
+err=0
+for test in test*.sh; do
+    echo "Running $test"
+    ./$test  > /dev/null 2>&1
+    errcode=$?
+    if [ $errcode -ne 0 ]; then
+	err=1
+	echo -e "\e[31mError in $test errcode=$errcode"
+	echo -ne "\e[0m"
+    fi
+done
+if [ $err -eq 0 ]; then 
+    echo OK
+else
+    echo -e "\e[31mError"
+    echo -ne "\e[0m"
+    exit -1
+fi
+
+

From 02d725b2c02f3e7873bafb0b190b8fe5b029a5a4 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sun, 3 Feb 2019 16:19:33 +0100
Subject: [PATCH 52/72] * xml_cmp() respects 'ordered-by user' for state nodes,
 which violates RFC 7950 [https://github.com/clicon/clixon/issues/63. (Thanks
 JDL)

---
 CHANGELOG.md                  |  1 +
 example/example_backend.c     |  2 +
 lib/clixon/clixon_xml_sort.h  |  1 -
 lib/src/clixon_xml_sort.c     | 27 ++++++++++---
 test/test_feature.sh          |  2 +-
 test/test_nacm_ext.sh         |  2 +-
 test/test_nacm_module_read.sh |  6 +--
 test/test_netconf.sh          |  2 +-
 test/test_order.sh            | 76 ++++++++++++++++++++---------------
 test/test_restconf.sh         | 19 ++++-----
 10 files changed, 85 insertions(+), 53 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index adc11905..80474fd1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -142,6 +142,7 @@
   * <!DOCTYPE (ie DTD) is not supported.
 
 ### Corrected Bugs
+* xml_cmp() respects 'ordered-by user' for state nodes, which violates RFC 7950 [https://github.com/clicon/clixon/issues/63. (Thanks JDL)
 * XML<>JSON conversion problems [https://github.com/clicon/clixon/issues/66]
   * CDATA sections stripped from XML when converted to JSON
 * Restconf returns error when RPC generates "ok" reply [https://github.com/clicon/clixon/issues/69]
diff --git a/example/example_backend.c b/example/example_backend.c
index 2c366a14..2e074064 100644
--- a/example/example_backend.c
+++ b/example/example_backend.c
@@ -201,6 +201,8 @@ example_statedata(clicon_handle h,
      */
     if (xml_parse_string("<state xmlns=\"urn:example:clixon\">"
 			 "<op>42</op>"
+			 "<op>41</op>"
+			 "<op>43</op>" /* should not be ordered */
 			 "</state>", NULL, &xstate) < 0)
 	goto done;
     retval = 0;
diff --git a/lib/clixon/clixon_xml_sort.h b/lib/clixon/clixon_xml_sort.h
index 8b1e6f82..d38b91cf 100644
--- a/lib/clixon/clixon_xml_sort.h
+++ b/lib/clixon/clixon_xml_sort.h
@@ -40,7 +40,6 @@
  * Prototypes
  */
 int xml_child_spec(cxobj *x, cxobj *xp, yang_spec *yspec, yang_stmt **yp);
-int xml_cmp(const void* arg1, const void* arg2);
 int xml_sort(cxobj *x0, void *arg);
 cxobj *xml_search(cxobj *x, char *name, int yangi, enum rfc_6020 keyword, int keynr, char **keyvec, char **keyval);
 int    xml_insert_pos(cxobj *x0, char *name, int yangi, enum rfc_6020 keyword,
diff --git a/lib/src/clixon_xml_sort.c b/lib/src/clixon_xml_sort.c
index fb5e412b..162735f7 100644
--- a/lib/src/clixon_xml_sort.c
+++ b/lib/src/clixon_xml_sort.c
@@ -134,7 +134,7 @@ xml_child_spec(cxobj      *x,
  * @see xml_cmp1   Similar, but for one object
  * @note empty value/NULL is smallest value
  */
-int
+static int
 xml_cmp(const void* arg1, 
 	const void* arg2)
 {
@@ -162,11 +162,13 @@ xml_cmp(const void* arg1,
 	if ((equal = yi1-yi2) != 0)
 	    return equal;
     }
-    /* Now y1=y2, same Yang spec, can only be list or leaf-list,
-     * sort according to key
+    /* Now y1==y2, same Yang spec, can only be list or leaf-list,
+     * But first check exceptions, eg config false or ordered-by user
+     * otherwuse sort according to key
      */
-    if (yang_find((yang_node*)y1, Y_ORDERED_BY, "user") != NULL)
-	return 0; /* Ordered by user: maintain existing order */
+    if (yang_config(y1)==0 ||
+	yang_find((yang_node*)y1, Y_ORDERED_BY, "user") != NULL)
+	return 0; /* Ordered by user or state data : maintain existing order */
     switch (y1->ys_keyword){
     case Y_LEAF_LIST: /* Match with name and value */
 	if ((b1 = xml_body(x1)) == NULL)
@@ -262,11 +264,20 @@ xml_cmp1(cxobj        *x,
  * Assume populated by yang spec.
  * @param[in] x0   XML node
  * @param[in] arg  Dummy so it can be called by xml_apply()
+ * @retval    -1    Error, aborted at first error encounter
+ * @retval     0    OK, all nodes traversed (subparts may have been skipped)
+ * @retval     1    OK, aborted on first fn returned 1
+ * @see xml_apply  - typically called by recursive apply function
  */
 int
 xml_sort(cxobj *x,
 	 void  *arg)
 {
+    yang_stmt *ys;
+
+    /* Abort sort if non-config (=state) data */
+    if ((ys = xml_spec(x)) != 0 && yang_config(ys)==0)
+	return 1;
     qsort(xml_childvec_get(x), xml_child_nr(x), sizeof(cxobj *), xml_cmp);
     return 0;
 }
@@ -543,7 +554,13 @@ xml_sort_verify(cxobj *x0,
     int    retval = -1;
     cxobj *x = NULL;
     cxobj *xprev = NULL;
+    yang_stmt *ys;
 
+    /* Abort sort if non-config (=state) data */
+    if ((ys = xml_spec(x0)) != 0 && yang_config(ys)==0){
+	retval = 1;
+	goto done;
+    }
     while ((x = xml_child_each(x0, x, -1)) != NULL) {
 	if (xprev != NULL){ /* Check xprev <= x */
 	    if (xml_cmp(&xprev, &x) > 0)
diff --git a/test/test_feature.sh b/test/test_feature.sh
index 3dd1e3d4..dabc8a3c 100755
--- a/test/test_feature.sh
+++ b/test/test_feature.sh
@@ -145,7 +145,7 @@ fi
 
 # Note order of features in ietf-netconf yang is alphabetically: candidate, startup, validate, xpath
 new "netconf module ietf-netconf"
-expect="<module><name>ietf-netconf</name><revision>2011-06-01</revision><namespace>urn:ietf:params:xml:ns:netconf:base:1.0</namespace><feature>candidate</feature><feature>startup</feature><feature>validate</feature><feature>xpath</feature><conformance-type>implement</conformance-type></module>"
+expect="<module><name>ietf-netconf</name><revision>2011-06-01</revision><namespace>urn:ietf:params:xml:ns:netconf:base:1.0</namespace><feature>candidate</feature><feature>validate</feature><feature>startup</feature><feature>xpath</feature><conformance-type>implement</conformance-type></module>"
 match=`echo "$ret" | grep -GZo "$expect"`
 if [ -z "$match" ]; then
       err "$expect" "$ret"
diff --git a/test/test_nacm_ext.sh b/test/test_nacm_ext.sh
index abc5f410..f9ed5fe1 100755
--- a/test/test_nacm_ext.sh
+++ b/test/test_nacm_ext.sh
@@ -152,7 +152,7 @@ sudo su -c "$clixon_restconf -f $cfg -D $DBG -- -a" -s /bin/sh www-data &
 sleep $RCWAIT
 
 new "auth get"
-expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": "42"}}
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": ["42","41","43"]}}
 
'
 
 new "Set x to 0"
diff --git a/test/test_nacm_module_read.sh b/test/test_nacm_module_read.sh
index 252bfd31..47d70163 100755
--- a/test/test_nacm_module_read.sh
+++ b/test/test_nacm_module_read.sh
@@ -175,7 +175,7 @@ expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/nacm-exam
 
'
 
 new "admin read state OK"
-expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": "42"}}
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": ["42","41","43"]}}
 
'
 
 new "admin read top ok (all)"
@@ -204,11 +204,11 @@ expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/nacm-exa
 
'
 
 new "limit read state OK"
-expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": "42"}}
+expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": ["42","41","43"]}}
 
'
 
 new "limit read top ok (part)"
-expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data)" '{"data": {"clixon-example:translate": [{"k": "key42","value": "val42"},{ "k": "key43","value": "val43"}],"clixon-example:state": {"op": "42"}}}
+expecteq "$(curl -u wilma:bar -sS -X GET http://localhost/restconf/data)" '{"data": {"clixon-example:translate": [{"k": "key42","value": "val42"},{ "k": "key43","value": "val43"}],"clixon-example:state": {"op": ["42","41","43"]}}}
 
'
 
 #user:guest
diff --git a/test/test_netconf.sh b/test/test_netconf.sh
index eb3c0ed6..d1f76ab0 100755
--- a/test/test_netconf.sh
+++ b/test/test_netconf.sh
@@ -155,7 +155,7 @@ new "netconf edit state operation should fail"
 expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><state xmlns="urn:example:clixon"><op>42</op></state></config></edit-config></rpc>]]>]]>' "^<rpc-reply><rpc-error><error-type>protocol</error-type><error-tag>invalid-value</error-tag>"
 
 new "netconf get state operation"
-expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><get><filter type=\"xpath\" select=\"/state\"/></get></rpc>]]>]]>" '^<rpc-reply><data><state xmlns="urn:example:clixon"><op>42</op></state></data></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><get><filter type=\"xpath\" select=\"/state\"/></get></rpc>]]>]]>" '^<rpc-reply><data><state xmlns="urn:example:clixon"><op>42</op><op>41</op><op>43</op></state></data></rpc-reply>]]>]]>$'
 
 new "netconf lock/unlock"
 expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><lock><target><candidate/></target></lock></rpc>]]>]]><rpc><unlock><target><candidate/></target></unlock></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]><rpc-reply><ok/></rpc-reply>]]>]]>$"
diff --git a/test/test_order.sh b/test/test_order.sh
index a1f646db..1f6d0c47 100755
--- a/test/test_order.sh
+++ b/test/test_order.sh
@@ -10,6 +10,7 @@ APPNAME=example
 . ./lib.sh
 cfg=$dir/conf_yang.xml
 fyang=$dir/order.yang
+tmp=$dir/tmp.x
 
 # For memcheck
 # clixon_netconf="valgrind --leak-check=full --show-leak-kinds=all clixon_netconf"
@@ -30,6 +31,7 @@ cat <<EOF > $cfg
   <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_DIR>/usr/local/lib/example/backend</CLICON_BACKEND_DIR>
   <CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
   <CLICON_CLI_GENMODEL_COMPLETION>1</CLICON_CLI_GENMODEL_COMPLETION>
   <CLICON_XMLDB_DIR>$dbdir</CLICON_XMLDB_DIR>
@@ -39,10 +41,13 @@ cat <<EOF > $cfg
 EOF
 
 cat <<EOF > $fyang
-module example{
+module order-example{
     yang-version 1.1;
-    namespace "urn:example:clixon";
+    namespace "urn:example:order";
     prefix ex;
+    import clixon-example { /* for state callback */
+	prefix ex;
+    }
     container c{
       leaf d{
          type string;
@@ -86,24 +91,24 @@ rm -f $dbdir/candidate_db
 # alt
 cat <<EOF > $dbdir/running_db
 <config>
-  <y0 xmlns="urn:example:clixon">d</y0>
-  <y1 xmlns="urn:example:clixon">d</y1>
-  <y2 xmlns="urn:example:clixon"><k>d</k><a>bar</a></y2>
-  <y3 xmlns="urn:example:clixon"><k>d</k><a>bar</a></y3>
-  <y0 xmlns="urn:example:clixon">b</y0>
-  <y1 xmlns="urn:example:clixon">b</y1>
-  <c xmlns="urn:example:clixon"><d>hej</d></c>
-  <y0 xmlns="urn:example:clixon">c</y0>
-  <y1 xmlns="urn:example:clixon">c</y1>
-  <y2 xmlns="urn:example:clixon"><k>a</k><a>bar</a></y2>
-  <y3 xmlns="urn:example:clixon"><k>a</k><a>bar</a></y3>
-  <l xmlns="urn:example:clixon">hopp</l>
-  <y0 xmlns="urn:example:clixon">a</y0>
-  <y1 xmlns="urn:example:clixon">a</y1>
-  <y2 xmlns="urn:example:clixon"><k>c</k><a>bar</a></y2>
-  <y3 xmlns="urn:example:clixon"><k>c</k><a>bar</a></y3>
-  <y2 xmlns="urn:example:clixon"><k>b</k><a>bar</a></y2>
-  <y3 xmlns="urn:example:clixon"><k>b</k><a>bar</a></y3>
+  <y0 xmlns="urn:example:order">d</y0>
+  <y1 xmlns="urn:example:order">d</y1>
+  <y2 xmlns="urn:example:order"><k>d</k><a>bar</a></y2>
+  <y3 xmlns="urn:example:order"><k>d</k><a>bar</a></y3>
+  <y0 xmlns="urn:example:order">b</y0>
+  <y1 xmlns="urn:example:order">b</y1>
+  <c xmlns="urn:example:order"><d>hej</d></c>
+  <y0 xmlns="urn:example:order">c</y0>
+  <y1 xmlns="urn:example:order">c</y1>
+  <y2 xmlns="urn:example:order"><k>a</k><a>bar</a></y2>
+  <y3 xmlns="urn:example:order"><k>a</k><a>bar</a></y3>
+  <l xmlns="urn:example:order">hopp</l>
+  <y0 xmlns="urn:example:order">a</y0>
+  <y1 xmlns="urn:example:order">a</y1>
+  <y2 xmlns="urn:example:order"><k>c</k><a>bar</a></y2>
+  <y3 xmlns="urn:example:order"><k>c</k><a>bar</a></y3>
+  <y2 xmlns="urn:example:order"><k>b</k><a>bar</a></y2>
+  <y3 xmlns="urn:example:order"><k>b</k><a>bar</a></y3>
 </config>
 EOF
 
@@ -122,21 +127,28 @@ if [ $BE -ne 0 ]; then
     fi
 fi
 
+# STATE (should not be ordered)
+new "state data (should be unordered: 42,41,43)"
+cat <<EOF > $tmp
+<rpc><get><filter type="xpath" select="state"/></get></rpc>]]>]]>
+EOF
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "$(cat $tmp)" '<rpc-reply><data><state xmlns="urn:example:clixon"><op>42</op><op>41</op><op>43</op></state></data></rpc-reply>]]>]]>'
+
 # Check as file
 new "verify running from start, should be: c,l,y0,y1,y2,y3; y1 and y3 sorted. Note this fails if CLICON_XML_SORT set to false"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get-config><source><running/></source></get-config></rpc>]]>]]>' '^<rpc-reply><data><c xmlns="urn:example:clixon"><d>hej</d></c><l xmlns="urn:example:clixon">hopp</l><y0 xmlns="urn:example:clixon">d</y0><y0 xmlns="urn:example:clixon">b</y0><y0 xmlns="urn:example:clixon">c</y0><y0 xmlns="urn:example:clixon">a</y0><y1 xmlns="urn:example:clixon">a</y1><y1 xmlns="urn:example:clixon">b</y1><y1 xmlns="urn:example:clixon">c</y1><y1 xmlns="urn:example:clixon">d</y1><y2 xmlns="urn:example:clixon"><k>d</k><a>bar</a></y2><y2 xmlns="urn:example:clixon"><k>a</k><a>bar</a></y2><y2 xmlns="urn:example:clixon"><k>c</k><a>bar</a></y2><y2 xmlns="urn:example:clixon"><k>b</k><a>bar</a></y2><y3 xmlns="urn:example:clixon"><k>a</k><a>bar</a></y3><y3 xmlns="urn:example:clixon"><k>b</k><a>bar</a></y3><y3 xmlns="urn:example:clixon"><k>c</k><a>bar</a></y3><y3 xmlns="urn:example:clixon"><k>d</k><a>bar</a></y3></data></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get-config><source><running/></source></get-config></rpc>]]>]]>' '^<rpc-reply><data><c xmlns="urn:example:order"><d>hej</d></c><l xmlns="urn:example:order">hopp</l><y0 xmlns="urn:example:order">d</y0><y0 xmlns="urn:example:order">b</y0><y0 xmlns="urn:example:order">c</y0><y0 xmlns="urn:example:order">a</y0><y1 xmlns="urn:example:order">a</y1><y1 xmlns="urn:example:order">b</y1><y1 xmlns="urn:example:order">c</y1><y1 xmlns="urn:example:order">d</y1><y2 xmlns="urn:example:order"><k>d</k><a>bar</a></y2><y2 xmlns="urn:example:order"><k>a</k><a>bar</a></y2><y2 xmlns="urn:example:order"><k>c</k><a>bar</a></y2><y2 xmlns="urn:example:order"><k>b</k><a>bar</a></y2><y3 xmlns="urn:example:order"><k>a</k><a>bar</a></y3><y3 xmlns="urn:example:order"><k>b</k><a>bar</a></y3><y3 xmlns="urn:example:order"><k>c</k><a>bar</a></y3><y3 xmlns="urn:example:order"><k>d</k><a>bar</a></y3><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>lo</name><type>ex:loopback</type><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>$'
 
 new "get each ordered-by user leaf-list"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><running/></source><filter type=\"xpath\" select=\"/y2[k='a']\"/></get-config></rpc>]]>]]>" '^<rpc-reply><data><y2 xmlns="urn:example:clixon"><k>a</k><a>bar</a></y2></data></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><running/></source><filter type=\"xpath\" select=\"/y2[k='a']\"/></get-config></rpc>]]>]]>" '^<rpc-reply><data><y2 xmlns="urn:example:order"><k>a</k><a>bar</a></y2></data></rpc-reply>]]>]]>$'
 
 new "get each ordered-by user leaf-list"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><running/></source><filter type=\"xpath\" select=\"/y3[k='a']\"/></get-config></rpc>]]>]]>" '^<rpc-reply><data><y3 xmlns="urn:example:clixon"><k>a</k><a>bar</a></y3></data></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><running/></source><filter type=\"xpath\" select=\"/y3[k='a']\"/></get-config></rpc>]]>]]>" '^<rpc-reply><data><y3 xmlns="urn:example:order"><k>a</k><a>bar</a></y3></data></rpc-reply>]]>]]>$'
 
 new "get each ordered-by user leaf-list"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><running/></source><filter type=\"xpath\" select=\"/y2[k='b']\"/></get-config></rpc>]]>]]>" '^<rpc-reply><data><y2 xmlns="urn:example:clixon"><k>b</k><a>bar</a></y2></data></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><running/></source><filter type=\"xpath\" select=\"/y2[k='b']\"/></get-config></rpc>]]>]]>" '^<rpc-reply><data><y2 xmlns="urn:example:order"><k>b</k><a>bar</a></y2></data></rpc-reply>]]>]]>$'
 
 new "get each ordered-by user leaf-list"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><running/></source><filter type=\"xpath\" select=\"/y3[k='b']\"/></get-config></rpc>]]>]]>" '^<rpc-reply><data><y3 xmlns="urn:example:clixon"><k>b</k><a>bar</a></y3></data></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><running/></source><filter type=\"xpath\" select=\"/y3[k='b']\"/></get-config></rpc>]]>]]>" '^<rpc-reply><data><y3 xmlns="urn:example:order"><k>b</k><a>bar</a></y3></data></rpc-reply>]]>]]>$'
 
 new "delete candidate"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><default-operation>none</default-operation><config operation="delete"/></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
@@ -144,33 +156,33 @@ expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><can
 # LEAF_LISTS
 
 new "add two entries (c,b) to leaf-list user order"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><y0 xmlns="urn:example:clixon">c</y0><y0 xmlns="urn:example:clixon">b</y0></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><y0 xmlns="urn:example:order">c</y0><y0 xmlns="urn:example:order">b</y0></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "add one entry (a) to leaf-list user order"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><y0 xmlns="urn:example:clixon">a</y0></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><y0 xmlns="urn:example:order">a</y0></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf commit"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "add one entry (0) to leaf-list user order after commit"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><y0 xmlns="urn:example:clixon">0</y0></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><y0 xmlns="urn:example:order">0</y0></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf commit"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "verify leaf-list user order in running (as entered: c,b,a,0)"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get-config><source><running/></source><filter type="xpath" select="/y0"/></get-config></rpc>]]>]]>' '^<rpc-reply><data><y0 xmlns="urn:example:clixon">c</y0><y0 xmlns="urn:example:clixon">b</y0><y0 xmlns="urn:example:clixon">a</y0><y0 xmlns="urn:example:clixon">0</y0></data></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get-config><source><running/></source><filter type="xpath" select="/y0"/></get-config></rpc>]]>]]>' '^<rpc-reply><data><y0 xmlns="urn:example:order">c</y0><y0 xmlns="urn:example:order">b</y0><y0 xmlns="urn:example:order">a</y0><y0 xmlns="urn:example:order">0</y0></data></rpc-reply>]]>]]>$'
 
 # LISTS
 
 new "add two entries to list user order"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><y2 xmlns="urn:example:clixon"><k>c</k><a>bar</a></y2><y2 xmlns="urn:example:clixon"><k>b</k><a>foo</a></y2></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><y2 xmlns="urn:example:order"><k>c</k><a>bar</a></y2><y2 xmlns="urn:example:order"><k>b</k><a>foo</a></y2></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "add one entry to list user order"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><y2 xmlns="urn:example:clixon"><k>a</k><a>fie</a></y2></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><y2 xmlns="urn:example:order"><k>a</k><a>fie</a></y2></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "verify list user order (as entered)"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get-config><source><candidate/></source><filter type="xpath" select="/y2"/></get-config></rpc>]]>]]>' '^<rpc-reply><data><y2 xmlns="urn:example:clixon"><k>c</k><a>bar</a></y2><y2 xmlns="urn:example:clixon"><k>b</k><a>foo</a></y2><y2 xmlns="urn:example:clixon"><k>a</k><a>fie</a></y2></data></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get-config><source><candidate/></source><filter type="xpath" select="/y2"/></get-config></rpc>]]>]]>' '^<rpc-reply><data><y2 xmlns="urn:example:order"><k>c</k><a>bar</a></y2><y2 xmlns="urn:example:order"><k>b</k><a>foo</a></y2><y2 xmlns="urn:example:order"><k>a</k><a>fie</a></y2></data></rpc-reply>]]>]]>$'
 
 if [ $BE -eq 0 ]; then
     exit # BE
diff --git a/test/test_restconf.sh b/test/test_restconf.sh
index 78f074a8..14c3dbc8 100755
--- a/test/test_restconf.sh
+++ b/test/test_restconf.sh
@@ -31,7 +31,7 @@ cat <<EOF > $cfg
 EOF
 
 # This is a fixed 'state' implemented in routing_backend. It is assumed to be always there
-state='{"clixon-example:state": {"op": "42"}}'
+state='{"clixon-example:state": {"op": ["42","41","43"]}}
'
 
 new "test params: -f $cfg"
 if [ $BE -ne 0 ]; then
@@ -113,11 +113,11 @@ new "restconf empty rpc with extra args (should fail)"
 expecteq "$(curl -s -X POST -d {\"clixon-example:input\":{\"extra\":null}} http://localhost/restconf/operations/clixon-example:empty)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "extra"},"error-severity": "error"}}}
'
 
 new "restconf get empty config + state json"
-expecteq "$(curl -sSG http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": "42"}}
+expecteq "$(curl -sSG http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": ["42","41","43"]}}
 
'
 
 new "restconf get empty config + state json + module"
-expecteq "$(curl -sSG http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": "42"}}
+expecteq "$(curl -sSG http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": ["42","41","43"]}}
 
'
 
 new "restconf get empty config + state json with wrong module name"
@@ -125,14 +125,14 @@ expecteq "$(curl -sSG http://localhost/restconf/data/badmodule:state)" '{"ietf-r
 
 new "restconf get empty config + state xml"
 ret=$(curl -s -H "Accept: application/yang-data+xml" -G http://localhost/restconf/data/clixon-example:state)
-expect='<state xmlns="urn:example:clixon"><op>42</op></state>'
+expect='<state xmlns="urn:example:clixon"><op>42</op><op>41</op><op>43</op></state>'
 match=`echo $ret | grep -EZo "$expect"`
 if [ -z "$match" ]; then
     err "$expect" "$ret"
 fi
 
 new "restconf get data/ json"
-expecteq "$(curl -s -G http://localhost/restconf/data/clixon-example:state/op=42)" '{"clixon-example:op": "42"}
+expecteq "$(curl -s -G http://localhost/restconf/data/clixon-example:state/op=42)" '{"clixon-example:op": ["42","41","43"]}
 
'
 
 new "restconf get state operation eth0 xml"
@@ -145,7 +145,7 @@ if [ -z "$match" ]; then
 fi
 
 new "restconf get state operation eth0 type json"
-expecteq "$(curl -s -G http://localhost/restconf/data/clixon-example:state/op=42)" '{"clixon-example:op": "42"}
+expecteq "$(curl -s -G http://localhost/restconf/data/clixon-example:state/op=42)" '{"clixon-example:op": ["42","41","43"]}
 
'
 
 new "restconf get state operation eth0 type xml"
@@ -158,7 +158,7 @@ if [ -z "$match" ]; then
 fi
 
 new "restconf GET datastore"
-expecteq "$(curl -s -X GET http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": "42"}}
+expecteq "$(curl -s -X GET http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": ["42","41","43"]}}
 
'
 
 # Exact match
@@ -178,7 +178,8 @@ new "restconf delete interfaces"
 expecteq $(curl -s -X DELETE  http://localhost/restconf/data/ietf-interfaces:interfaces) ""
 
 new "restconf Check empty config"
-expectfn "curl -sG http://localhost/restconf/data/clixon-example:state" 0 "$state"
+expectfn "curl -sG http://localhost/restconf/data/clixon-example:state" 0 "$state
+
"
 
 # XXX: gives  <interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
 #      <interface xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
@@ -192,7 +193,7 @@ expecteq "$(curl -s -G http://localhost/restconf/data/ietf-interfaces:interfaces
 
'
 
 new "restconf Check eth/0/0 added state"
-expecteq "$(curl -s -G http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": "42"}}
+expecteq "$(curl -s -G http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": ["42","41","43"]}}
 
'
 
 new "restconf Re-post eth/0/0 which should generate error"

From 4f0e8dc9164f3f794fcc1f3b0f2d5f9be40cc022 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sun, 3 Feb 2019 19:26:21 +0100
Subject: [PATCH 53/72] Travis yanl file

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..e196c5cc
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1 @@
+language: c
\ No newline at end of file

From 14343810ca56b290f0a46cf2f915c810642c0601 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Mon, 4 Feb 2019 11:49:53 +0100
Subject: [PATCH 54/72] xml_cmp() compares numeric nodes based on string value
 [https://github.com/clicon/clixon/issues/64]

---
 CHANGELOG.md              |   3 +-
 lib/clixon/clixon_xml.h   |   2 +
 lib/src/clixon_xml.c      |  32 ++++++++++++
 lib/src/clixon_xml_sort.c | 102 ++++++++++++++++++++++++++++++++------
 test/test_order.sh        |  34 ++++++++++++-
 5 files changed, 156 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80474fd1..da943f33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -142,7 +142,8 @@
   * <!DOCTYPE (ie DTD) is not supported.
 
 ### Corrected Bugs
-* xml_cmp() respects 'ordered-by user' for state nodes, which violates RFC 7950 [https://github.com/clicon/clixon/issues/63. (Thanks JDL)
+* xml_cmp() compares numeric nodes based on string value [https://github.com/clicon/clixon/issues/64]
+* xml_cmp() respects 'ordered-by user' for state nodes, which violates RFC 7950 [https://github.com/clicon/clixon/issues/63]. (Thanks JDL)
 * XML<>JSON conversion problems [https://github.com/clicon/clixon/issues/66]
   * CDATA sections stripped from XML when converted to JSON
 * Restconf returns error when RPC generates "ok" reply [https://github.com/clicon/clixon/issues/69]
diff --git a/lib/clixon/clixon_xml.h b/lib/clixon/clixon_xml.h
index 5a4b13b5..da732586 100644
--- a/lib/clixon/clixon_xml.h
+++ b/lib/clixon/clixon_xml.h
@@ -130,6 +130,8 @@ int       xml_childvec_set(cxobj *x, int len);
 cxobj    *xml_new(char *name, cxobj *xn_parent, yang_stmt *spec);
 yang_stmt *xml_spec(cxobj *x);
 int       xml_spec_set(cxobj *x, yang_stmt *spec);
+cg_var   *xml_cv(cxobj *x);
+int       xml_cv_set(cxobj *x, cg_var *cv);
 cxobj    *xml_find(cxobj *xn_parent, char *name);
 
 int       xml_addsub(cxobj *xp, cxobj *xc);
diff --git a/lib/src/clixon_xml.c b/lib/src/clixon_xml.c
index 1d4f2741..f236c5f0 100644
--- a/lib/src/clixon_xml.c
+++ b/lib/src/clixon_xml.c
@@ -126,6 +126,8 @@ struct xml{
     int               x_flags;      /* Flags according to XML_FLAG_* */
     yang_stmt        *x_spec;       /* Pointer to specification, eg yang, by 
 				       reference, dont free */
+    cg_var           *x_cv;         /* Cached value as cligen variable 
+                                       (eg xml_cmp) */
 };
 
 /*
@@ -758,6 +760,34 @@ xml_spec_set(cxobj     *x,
     return 0;
 }
 
+/*! Return (cached)  cligen variable value of xml node
+ * @param[in]  x    XML node (body and leaf/leaf-list)
+ * @retval     cv   CLIgen variable containing value of x body
+ * @retval     NULL
+ * @note only applicable if x is body and has yang-spec and is leaf or leaf-list
+ */
+cg_var *
+xml_cv(cxobj *x)
+{
+    return x->x_cv;
+}
+
+/*! Return (cached) cligen variable value of xml node
+ * @param[in]  x   XML node (body and leaf/leaf-list)
+ * @param[in]  cv  CLIgen variable containing value of x body
+ * @retval     0   OK
+ * @note only applicable if x is body and has yang-spec and is leaf or leaf-list
+ */
+int
+xml_cv_set(cxobj  *x, 
+	   cg_var *cv)
+{
+    if (x->x_cv)
+	cv_free(x->x_cv);
+    x->x_cv = cv;
+    return 0;
+}
+
 /*! Find an XML node matching name among a parent's children.
  *
  * Get first XML node directly under x_up in the xml hierarchy with
@@ -1229,6 +1259,8 @@ xml_free(cxobj *x)
     }
     if (x->x_childvec)
 	free(x->x_childvec);
+    if (x->x_cv)
+	cv_free(x->x_cv);
     free(x);
     return 0;
 }
diff --git a/lib/src/clixon_xml_sort.c b/lib/src/clixon_xml_sort.c
index 162735f7..ce9c9916 100644
--- a/lib/src/clixon_xml_sort.c
+++ b/lib/src/clixon_xml_sort.c
@@ -60,14 +60,75 @@
 #include "clixon_hash.h"
 #include "clixon_handle.h"
 #include "clixon_yang.h"
+#include "clixon_yang_type.h"
 #include "clixon_xml.h"
 #include "clixon_options.h"
 #include "clixon_xml_map.h"
 #include "clixon_xml_sort.h"
 
-/*
- * Variables
+/*! Get xml body value as cligen variable
+ * @param[in]  x   XML node (body and leaf/leaf-list)
+ * @param[out] cvp Pointer to cligen variable containing value of x body
+ * @retval     0   OK, cvp contains cv or NULL
+ * @retval    -1   Error
+ * @note only applicable if x is body and has yang-spec and is leaf or leaf-list
+ * Move to clixon_xml.c?
  */
+static int
+xml_cv_cache(cxobj   *x,
+	     char    *body,
+	     cg_var **cvp)
+{
+    int          retval = -1;
+    cg_var      *cv = NULL;
+    yang_stmt   *y;
+    yang_stmt   *yrestype;
+    enum cv_type cvtype;
+    int          ret;
+    char        *reason=NULL;
+    int          options = 0;
+    uint8_t      fraction = 0;
+	    
+    if ((cv = xml_cv(x)) != NULL)
+	goto ok;
+    if ((y = xml_spec(x)) == NULL)
+	goto done;
+    if (yang_type_get(y, NULL, &yrestype, &options, NULL, NULL, &fraction) < 0)
+	goto done;
+    yang2cv_type(yrestype->ys_argument, &cvtype);
+    if (cvtype==CGV_ERR){
+	clicon_err(OE_YANG, errno, "yang->cligen type %s mapping failed",
+		   yrestype->ys_argument);
+	goto done;
+    }
+    if ((cv = cv_new(cvtype)) == NULL){
+	clicon_err(OE_YANG, errno, "cv_new");
+	goto done;
+    }
+    if (cvtype == CGV_DEC64)
+	cv_dec64_n_set(cv, fraction);
+	
+    if ((ret = cv_parse1(body, cv, &reason)) < 0){
+	clicon_err(OE_YANG, errno, "cv_parse1");
+	goto done;
+    }
+    if (ret == 0){
+	clicon_err(OE_YANG, EINVAL, "cv parse error: %s\n", reason);
+	goto done;
+    }
+    if (xml_cv_set(x, cv) < 0)
+	goto done;
+ ok:
+    *cvp = cv;
+    cv = NULL;
+    retval = 0;
+ done:
+    if (reason)
+	free(reason);
+    if (cv)
+	cv_free(cv);
+    return retval;
+}
 
 /*! Given a child name and an XML object, return yang stmt of child
  * If no xml parent, find root yang stmt matching name
@@ -150,7 +211,9 @@ xml_cmp(const void* arg1,
     char       *b1;
     char       *b2;
     char       *keyname;
-    
+    cg_var     *cv1; 
+    cg_var     *cv2;
+
     assert(x1&&x2);
     y1 = xml_spec(x1);
     y2 = xml_spec(x2);
@@ -164,7 +227,7 @@ xml_cmp(const void* arg1,
     }
     /* Now y1==y2, same Yang spec, can only be list or leaf-list,
      * But first check exceptions, eg config false or ordered-by user
-     * otherwuse sort according to key
+     * otherwise sort according to key
      */
     if (yang_config(y1)==0 ||
 	yang_find((yang_node*)y1, Y_ORDERED_BY, "user") != NULL)
@@ -175,8 +238,13 @@ xml_cmp(const void* arg1,
 	    equal = -1;
 	else if ((b2 = xml_body(x2)) == NULL)
 	    equal = 1;
-	else
-	    equal = strcmp(b1, b2);
+	else{
+	    if (xml_cv_cache(x1, b1, &cv1) < 0)
+		goto done;
+	    if (xml_cv_cache(x2, b2, &cv2) < 0)
+		goto done;
+	    equal = cv_cmp(cv1, cv2);
+	}
 	break;
     case Y_LIST: /* Match with key values 
 		  * Use Y_LIST cache (see struct yang_stmt)
@@ -200,7 +268,10 @@ xml_cmp(const void* arg1,
 }
 
 /*! Compare xml object
- * @param[in]  yangi    Yang order
+ * @param[in]  x        XML node to compare with
+ * @param[in]  y        The yang spec of x
+ * @param[in]  name     Name to compare with x
+ * @param[in]  keyword  Yang keyword (stmt type) to compare w x/y
  * @param[in]  keynr    Length of keyvec/keyval vector when applicable
  * @param[in]  keyvec   Array of of yang key identifiers
  * @param[in]  keyval   Array of of yang key values
@@ -209,6 +280,7 @@ xml_cmp(const void* arg1,
  * @retval <0  if arg1 is less than arg2
  * @retval >0  if arg1 is greater than arg2
  * @see xml_cmp   Similar, but for two objects
+ * @note Does not care about y type of value as xml_cmp
  */
 static int
 xml_cmp1(cxobj        *x,
@@ -220,12 +292,15 @@ xml_cmp1(cxobj        *x,
 	 char        **keyval,
 	 int          *userorder)
 {
-    char *b;
-    int   i;
-    char *keyname;
-    char *key;
-    int   match = 0;
+    char      *b;
+    int        i;
+    char      *keyname;
+    char      *key;
+    int        match = 0;
 
+    /* state data = userorder */
+    if (userorder && yang_config(y)==0)
+	*userorder=1;
     /* Check if same yang spec (order in yang stmt list) */
     switch (keyword){
     case Y_CONTAINER: /* Match with name */
@@ -257,6 +332,7 @@ xml_cmp1(cxobj        *x,
     default:
 	break;
     }
+    // done:
     return match; /* should not reach here */
 }
 
@@ -603,7 +679,6 @@ match_base_child(cxobj      *x0,
     yang_node *yp; /* yang parent */
     
     *x0cp = NULL; /* init return value */
-#if 1
     /* Special case is if yc parent (yp) is choice/case
      * then find x0 child with same yc even though it does not match lexically
      * However this will give another y0c != yc
@@ -619,7 +694,6 @@ match_base_child(cxobj      *x0,
 	*x0cp = x0c;
 	goto ok; /* What to do if not found? */
     }
-#endif
     switch (yc->ys_keyword){
     case Y_CONTAINER: 	/* Equal regardless */
     case Y_LEAF: 	/* Equal regardless */
diff --git a/test/test_order.sh b/test/test_order.sh
index 1f6d0c47..ad002d27 100755
--- a/test/test_order.sh
+++ b/test/test_order.sh
@@ -46,7 +46,7 @@ module order-example{
     namespace "urn:example:order";
     prefix ex;
     import clixon-example { /* for state callback */
-	prefix ex;
+       prefix ex;
     }
     container c{
       leaf d{
@@ -82,7 +82,24 @@ module order-example{
       }
       leaf a {
         type string;
-      }   
+      } 
+    }
+    container types{
+      description "For testing ordering using other types than strings";
+      leaf-list strings{
+        type string;
+        ordered-by system;
+      }
+      leaf-list ints{
+        type int32;
+        ordered-by system;
+      }
+      leaf-list decs{
+        type decimal64{
+           fraction-digits 3;
+        }
+        ordered-by system;
+      }
     }
 }
 EOF
@@ -184,6 +201,19 @@ expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><can
 new "verify list user order (as entered)"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get-config><source><candidate/></source><filter type="xpath" select="/y2"/></get-config></rpc>]]>]]>' '^<rpc-reply><data><y2 xmlns="urn:example:order"><k>c</k><a>bar</a></y2><y2 xmlns="urn:example:order"><k>b</k><a>foo</a></y2><y2 xmlns="urn:example:order"><k>a</k><a>fie</a></y2></data></rpc-reply>]]>]]>$'
 
+#-- order by type rather than strings.
+# there are three lists: strings, ints, and decimal64
+# the strings is there for comparison
+new "add type ordered entries"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><types xmlns="urn:example:order">
+<ints>10</ints><ints>2</ints><ints>1</ints>
+<strings>10</strings><strings>2</strings><strings>1</strings>
+<decs>10.0</decs><decs>2.0</decs><decs>1.0</decs>
+</types></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "get type ordered entries"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get-config><source><candidate/></source><filter type="xpath" select="/types"/></get-config></rpc>]]>]]>' '^<rpc-reply><data><types xmlns="urn:example:order"><strings>1</strings><strings>10</strings><strings>2</strings><ints>1</ints><ints>2</ints><ints>10</ints><decs>1.0</decs><decs>2.0</decs><decs>10.0</decs></types></data></rpc-reply>]]>]]>$'
+
 if [ $BE -eq 0 ]; then
     exit # BE
 fi

From 10d841f4be22eb279b596601a3bb34fd34d89daf Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Mon, 4 Feb 2019 14:13:20 +0100
Subject: [PATCH 55/72] Added make test and travis experiment

---
 .gitignore                     |  1 +
 .travis.yml                    | 10 +++++++++-
 CHANGELOG.md                   |  1 +
 Makefile.in                    |  5 ++++-
 configure                      |  3 ++-
 configure.ac                   |  1 +
 test/{ => jenkins}/Jenkinsfile |  0
 test/travis/before_script.sh   |  3 +++
 8 files changed, 21 insertions(+), 3 deletions(-)
 rename test/{ => jenkins}/Jenkinsfile (100%)
 create mode 100644 test/travis/before_script.sh

diff --git a/.gitignore b/.gitignore
index 5d501780..9aaadb67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ etc/Makefile
 example/Makefile
 lib/Makefile
 lib/*/Makefile
+test/Makefile
 yang/Makefile
 yang/*/Makefile
 autom4te.cache/
diff --git a/.travis.yml b/.travis.yml
index e196c5cc..33c8297c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1 +1,9 @@
-language: c
\ No newline at end of file
+language: c
+# safelist
+branches:
+  only:
+  - master
+  - develop
+before_script:
+  - ./test/travis/before_script.sh
+ 
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index da943f33..ead8194c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -119,6 +119,7 @@
   * For backward compatibility, define CLICON_CLI_MODEL_TREENAME_PATCH in clixon_custom.h
 
 ### Minor changes
+* Added make test from top-level
 * Added `xml_rootchild_node()` lib function as variant of `xml_rootchild()`
 * Added -o "<option>=<value>" command-line option to all programs: backend, cli, netconf, restconf.
   * Any config option from file can be overrided by giving them on command-line.
diff --git a/Makefile.in b/Makefile.in
index a1a9f1f0..0c8c8203 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -54,7 +54,7 @@ SHELL		= /bin/sh
 
 SUBDIRS = lib apps include etc datastore util yang
 
-.PHONY:	doc all clean depend $(SUBDIRS) install loc TAGS .config.status docker
+.PHONY:	doc all clean depend $(SUBDIRS) install loc TAGS .config.status docker test
 
 all:	$(SUBDIRS)
 
@@ -138,6 +138,9 @@ pkg-rpm: dist
 pkg-srpm: dist
 	make -C extras/rpm srpm
 
+test:	install-include
+	(cd $@ && $(MAKE) $(MFLAGS) all)
+
 docker:
 	for i in docker; \
 		do (cd $$i && $(MAKE) $(MFLAGS) $@); done
diff --git a/configure b/configure
index a5767406..08476986 100755
--- a/configure
+++ b/configure
@@ -4433,7 +4433,7 @@ _ACEOF
 
 
 
-ac_config_files="$ac_config_files Makefile lib/Makefile lib/src/Makefile lib/clixon/Makefile apps/Makefile apps/cli/Makefile apps/backend/Makefile apps/netconf/Makefile apps/restconf/Makefile include/Makefile etc/Makefile etc/clixonrc example/Makefile extras/rpm/Makefile docker/Makefile datastore/Makefile datastore/text/Makefile util/Makefile yang/Makefile yang/clixon/Makefile yang/standard/Makefile doc/Makefile"
+ac_config_files="$ac_config_files Makefile lib/Makefile lib/src/Makefile lib/clixon/Makefile apps/Makefile apps/cli/Makefile apps/backend/Makefile apps/netconf/Makefile apps/restconf/Makefile include/Makefile etc/Makefile etc/clixonrc example/Makefile extras/rpm/Makefile docker/Makefile datastore/Makefile datastore/text/Makefile util/Makefile yang/Makefile yang/clixon/Makefile yang/standard/Makefile doc/Makefile test/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -5149,6 +5149,7 @@ do
     "yang/clixon/Makefile") CONFIG_FILES="$CONFIG_FILES yang/clixon/Makefile" ;;
     "yang/standard/Makefile") CONFIG_FILES="$CONFIG_FILES yang/standard/Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+    "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff --git a/configure.ac b/configure.ac
index f6aa83e7..13cd7712 100644
--- a/configure.ac
+++ b/configure.ac
@@ -249,5 +249,6 @@ AC_OUTPUT(Makefile
   	  yang/clixon/Makefile
   	  yang/standard/Makefile
 	  doc/Makefile
+	  test/Makefile	
 )
 
diff --git a/test/Jenkinsfile b/test/jenkins/Jenkinsfile
similarity index 100%
rename from test/Jenkinsfile
rename to test/jenkins/Jenkinsfile
diff --git a/test/travis/before_script.sh b/test/travis/before_script.sh
new file mode 100644
index 00000000..9cc6f7a3
--- /dev/null
+++ b/test/travis/before_script.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+git clone https://github.com/olofhagsand/cligen.git
+(cd cligen && ./configure && make && sudo make install)

From a13c8abd5fa92328e8963fa7dd9ceb6016083cdd Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Mon, 4 Feb 2019 14:27:34 +0100
Subject: [PATCH 56/72] travis x mode

---
 test/travis/before_script.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 test/travis/before_script.sh

diff --git a/test/travis/before_script.sh b/test/travis/before_script.sh
old mode 100644
new mode 100755

From 2a2785090bc33fbf904e552c348ed01934cd1deb Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Mon, 4 Feb 2019 14:31:46 +0100
Subject: [PATCH 57/72] travis libfcgi-dev

---
 test/travis/before_script.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/travis/before_script.sh b/test/travis/before_script.sh
index 9cc6f7a3..101ae202 100755
--- a/test/travis/before_script.sh
+++ b/test/travis/before_script.sh
@@ -1,3 +1,7 @@
 #!/bin/sh
+# Run this as before_script in the travis file
+apt-get update && apt-get install -y \
+  libfcgi-dev 
+
 git clone https://github.com/olofhagsand/cligen.git
 (cd cligen && ./configure && make && sudo make install)

From c81419e5e9c5a220605c3ff267dcd82cd73effa6 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Mon, 4 Feb 2019 14:38:41 +0100
Subject: [PATCH 58/72] travis apt-get install

---
 .travis.yml                  | 2 ++
 test/travis/before_script.sh | 6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 33c8297c..b8c1a54e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,5 +5,7 @@ branches:
   - master
   - develop
 before_script:
+  - sudo apt-get install -y libfcgi-dev
   - ./test/travis/before_script.sh
+
  
\ No newline at end of file
diff --git a/test/travis/before_script.sh b/test/travis/before_script.sh
index 101ae202..606d519d 100755
--- a/test/travis/before_script.sh
+++ b/test/travis/before_script.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
-# Run this as before_script in the travis file
-apt-get update && apt-get install -y \
-  libfcgi-dev 
-
+# Travis pre-config script.
+# Clone and install CLIgen
 git clone https://github.com/olofhagsand/cligen.git
 (cd cligen && ./configure && make && sudo make install)

From 30f322648d087a7dd5444ffe209a3396d7ce7f36 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Mon, 4 Feb 2019 14:42:18 +0100
Subject: [PATCH 59/72] added test/Makefile.in

---
 test/Makefile.in | 60 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 test/Makefile.in

diff --git a/test/Makefile.in b/test/Makefile.in
new file mode 100644
index 00000000..e8e9b60e
--- /dev/null
+++ b/test/Makefile.in
@@ -0,0 +1,60 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
+# 
+# Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
+#
+# This file is part of CLIXON
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# the GNU General Public License Version 3 or later (the "GPL"),
+# in which case the provisions of the GPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of the GPL, and not to allow others to
+# use your version of this file under the terms of Apache License version 2, 
+# indicate your decision by deleting the provisions above and replace them with
+# the notice and other provisions required by the GPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the Apache License version 2 or the GPL.
+#
+# ***** END LICENSE BLOCK *****
+#
+VPATH       	= @srcdir@
+srcdir  	= @srcdir@
+top_srcdir  	= @top_srcdir@
+CC		= @CC@
+CFLAGS  	= @CFLAGS@ 
+LDFLAGS 	= @LDFLAGS@
+LIBS    	= @LIBS@
+
+SHELL	= /bin/sh
+
+.PHONY: all clean distclean depend install uninstall
+
+all:	
+	./all.sh
+
+clean:
+
+distclean: clean
+	rm -f Makefile *~ .depend
+
+depend:
+
+install-include:
+
+install:
+
+uninstall:
+

From 27e6511f35e03a4df497fb4ea00cff98ce34f752 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Mon, 4 Feb 2019 14:59:07 +0100
Subject: [PATCH 60/72] travis build example

---
 Makefile.in      | 7 +++++--
 test/Makefile.in | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 0c8c8203..21305ee1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -54,7 +54,7 @@ SHELL		= /bin/sh
 
 SUBDIRS = lib apps include etc datastore util yang
 
-.PHONY:	doc all clean depend $(SUBDIRS) install loc TAGS .config.status docker test
+.PHONY:	doc example all clean depend $(SUBDIRS) install loc TAGS .config.status docker test
 
 all:	$(SUBDIRS)
 
@@ -138,7 +138,10 @@ pkg-rpm: dist
 pkg-srpm: dist
 	make -C extras/rpm srpm
 
-test:	install-include
+example:	
+	(cd $@ && $(MAKE) $(MFLAGS) all)
+
+test: example	
 	(cd $@ && $(MAKE) $(MFLAGS) all)
 
 docker:
diff --git a/test/Makefile.in b/test/Makefile.in
index e8e9b60e..8be570f3 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -43,7 +43,8 @@ SHELL	= /bin/sh
 .PHONY: all clean distclean depend install uninstall
 
 all:	
-	./all.sh
+	./test_choice.sh
+#	./all.sh
 
 clean:
 

From 89059b00000ddb5d4d07143a1474fbdef62eb4b8 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Mon, 4 Feb 2019 15:07:00 +0100
Subject: [PATCH 61/72] travis no example

---
 Makefile.in      | 2 +-
 test/Makefile.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 21305ee1..b5a833b1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -141,7 +141,7 @@ pkg-srpm: dist
 example:	
 	(cd $@ && $(MAKE) $(MFLAGS) all)
 
-test: example	
+test: #example	
 	(cd $@ && $(MAKE) $(MFLAGS) all)
 
 docker:
diff --git a/test/Makefile.in b/test/Makefile.in
index 8be570f3..acb0d930 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -43,7 +43,7 @@ SHELL	= /bin/sh
 .PHONY: all clean distclean depend install uninstall
 
 all:	
-	./test_choice.sh
+	./test_xml.sh
 #	./all.sh
 
 clean:

From 2e46062c295eff458c0bdda4b2c91a542ccf1cc6 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Mon, 4 Feb 2019 15:35:29 +0100
Subject: [PATCH 62/72] travis experiments

---
 test/travis/before_script.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/travis/before_script.sh b/test/travis/before_script.sh
index 606d519d..83506b30 100755
--- a/test/travis/before_script.sh
+++ b/test/travis/before_script.sh
@@ -3,3 +3,4 @@
 # Clone and install CLIgen
 git clone https://github.com/olofhagsand/cligen.git
 (cd cligen && ./configure && make && sudo make install)
+(./configure && make && sudo make install)

From ec39b43748f04cc791d75c763dbe423829d4d20e Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Mon, 4 Feb 2019 15:44:54 +0100
Subject: [PATCH 63/72] ldconfig

---
 test/travis/before_script.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/travis/before_script.sh b/test/travis/before_script.sh
index 83506b30..b4cf90a0 100755
--- a/test/travis/before_script.sh
+++ b/test/travis/before_script.sh
@@ -4,3 +4,4 @@
 git clone https://github.com/olofhagsand/cligen.git
 (cd cligen && ./configure && make && sudo make install)
 (./configure && make && sudo make install)
+/sbin/ldconfig

From 6ff422064b7963962f2d6da7499faeba3d9762c3 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Mon, 4 Feb 2019 16:00:06 +0100
Subject: [PATCH 64/72] install-include#2

---
 test/travis/before_script.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/travis/before_script.sh b/test/travis/before_script.sh
index b4cf90a0..a74689f4 100755
--- a/test/travis/before_script.sh
+++ b/test/travis/before_script.sh
@@ -3,5 +3,6 @@
 # Clone and install CLIgen
 git clone https://github.com/olofhagsand/cligen.git
 (cd cligen && ./configure && make && sudo make install)
-(./configure && make && sudo make install)
-/sbin/ldconfig
+./configure && make && sudo make install
+sudo /sbin/ldconfig
+sudo make install-include

From d0182e98ca6baf2e5fc7dfddeff81bc8db864284 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Mon, 4 Feb 2019 16:44:15 +0100
Subject: [PATCH 65/72] Travis test scripts

---
 README.md                    |  2 ++
 test/Makefile.in             | 16 ++++++++++++++++
 test/travis/before_script.sh |  2 ++
 3 files changed, 20 insertions(+)

diff --git a/README.md b/README.md
index a56aecc9..77ff632f 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/clicon/clixon.png)](https://travis-ci.org/clicon/clixon)
+
 # Clixon
 
 Clixon is a YANG-based configuration manager, with interactive CLI,
diff --git a/test/Makefile.in b/test/Makefile.in
index acb0d930..26445dc7 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -44,6 +44,22 @@ SHELL	= /bin/sh
 
 all:	
 	./test_xml.sh
+	./test_netconf.sh
+	./test_cli.sh
+	./test_datastore.sh
+	./test_feature.sh
+	./test_install.sh
+	./test_leafref.sh
+	./test_list.sh
+	./test_order.sh
+	./test_type.sh
+	./test_union.sh
+	./test_when_must.sh
+	./test_xml.sh
+	./test_xpath.sh
+	./test_yang_load.sh
+	./test_yang.sh
+
 #	./all.sh
 
 clean:
diff --git a/test/travis/before_script.sh b/test/travis/before_script.sh
index a74689f4..fbbb6f42 100755
--- a/test/travis/before_script.sh
+++ b/test/travis/before_script.sh
@@ -6,3 +6,5 @@ git clone https://github.com/olofhagsand/cligen.git
 ./configure && make && sudo make install
 sudo /sbin/ldconfig
 sudo make install-include
+(cd example && make && sudo make install)
+

From 9eeafbc2ac980cec087441fb22b8d3b19231bc0e Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Mon, 4 Feb 2019 16:49:28 +0100
Subject: [PATCH 66/72] groupadd

---
 test/travis/before_script.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/travis/before_script.sh b/test/travis/before_script.sh
index fbbb6f42..ff951282 100755
--- a/test/travis/before_script.sh
+++ b/test/travis/before_script.sh
@@ -7,4 +7,5 @@ git clone https://github.com/olofhagsand/cligen.git
 sudo /sbin/ldconfig
 sudo make install-include
 (cd example && make && sudo make install)
-
+sudo groupadd clicon
+sudo usermod -a -G clicon user

From b01f2011a397bb5e3a41d7790a273ee095413459 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Mon, 4 Feb 2019 17:15:59 +0100
Subject: [PATCH 67/72] travis whoami

---
 test/travis/before_script.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/travis/before_script.sh b/test/travis/before_script.sh
index ff951282..b89f3641 100755
--- a/test/travis/before_script.sh
+++ b/test/travis/before_script.sh
@@ -8,4 +8,4 @@ sudo /sbin/ldconfig
 sudo make install-include
 (cd example && make && sudo make install)
 sudo groupadd clicon
-sudo usermod -a -G clicon user
+sudo usermod -a -G clicon $(whoami)

From 1a2041d45140052b4ddc6de7df247428ab57d8b1 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Mon, 4 Feb 2019 17:26:09 +0100
Subject: [PATCH 68/72] clicon group

---
 test/travis/before_script.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/travis/before_script.sh b/test/travis/before_script.sh
index b89f3641..a3911582 100755
--- a/test/travis/before_script.sh
+++ b/test/travis/before_script.sh
@@ -9,3 +9,6 @@ sudo make install-include
 (cd example && make && sudo make install)
 sudo groupadd clicon
 sudo usermod -a -G clicon $(whoami)
+sudo usermod -a -G clicon root
+echo "whoami:$(whoami)"
+

From ba70aee2d9aed89474bdc2c13af948bece86843a Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Mon, 4 Feb 2019 17:35:18 +0100
Subject: [PATCH 69/72] groupadd socket

---
 test/test_netconf.sh         | 2 +-
 test/travis/before_script.sh | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/test_netconf.sh b/test/test_netconf.sh
index d1f76ab0..616f9a96 100755
--- a/test/test_netconf.sh
+++ b/test/test_netconf.sh
@@ -23,7 +23,7 @@ cat <<EOF > $cfg
   <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>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
+  <CLICON_SOCK>$dir/$APPNAME.sock</CLICON_SOCK>
   <CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
   <CLICON_CLI_GENMODEL_COMPLETION>1</CLICON_CLI_GENMODEL_COMPLETION>
   <CLICON_XMLDB_DIR>/usr/local/var/$APPNAME</CLICON_XMLDB_DIR>
diff --git a/test/travis/before_script.sh b/test/travis/before_script.sh
index a3911582..2c67dd25 100755
--- a/test/travis/before_script.sh
+++ b/test/travis/before_script.sh
@@ -8,7 +8,11 @@ sudo /sbin/ldconfig
 sudo make install-include
 (cd example && make && sudo make install)
 sudo groupadd clicon
-sudo usermod -a -G clicon $(whoami)
+sudo usermod -a -G clicon travis
 sudo usermod -a -G clicon root
+sudo usermod -a -G clicon www-data
+sudo cat /etc/group |grep clicon
+cat /etc/group
+
 echo "whoami:$(whoami)"
 

From f718c716b6d42468a24efbc27748831372b3080d Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Mon, 4 Feb 2019 17:40:50 +0100
Subject: [PATCH 70/72] revert tests

---
 test/Makefile.in             | 16 ----------------
 test/travis/before_script.sh |  7 +------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/test/Makefile.in b/test/Makefile.in
index 26445dc7..acb0d930 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -44,22 +44,6 @@ SHELL	= /bin/sh
 
 all:	
 	./test_xml.sh
-	./test_netconf.sh
-	./test_cli.sh
-	./test_datastore.sh
-	./test_feature.sh
-	./test_install.sh
-	./test_leafref.sh
-	./test_list.sh
-	./test_order.sh
-	./test_type.sh
-	./test_union.sh
-	./test_when_must.sh
-	./test_xml.sh
-	./test_xpath.sh
-	./test_yang_load.sh
-	./test_yang.sh
-
 #	./all.sh
 
 clean:
diff --git a/test/travis/before_script.sh b/test/travis/before_script.sh
index 2c67dd25..72a79e3b 100755
--- a/test/travis/before_script.sh
+++ b/test/travis/before_script.sh
@@ -8,11 +8,6 @@ sudo /sbin/ldconfig
 sudo make install-include
 (cd example && make && sudo make install)
 sudo groupadd clicon
-sudo usermod -a -G clicon travis
+sudo usermod -a -G clicon $(whoami)
 sudo usermod -a -G clicon root
 sudo usermod -a -G clicon www-data
-sudo cat /etc/group |grep clicon
-cat /etc/group
-
-echo "whoami:$(whoami)"
-

From 19343c2b2180714bc46d3a80940d41e49cec048d Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Tue, 5 Feb 2019 14:03:58 +0100
Subject: [PATCH 71/72] * Partially corrected: [yang type range statement does
 not support multiple values](https://github.com/clicon/clixon/issues/59).   *
 Should work for netconf and restconf, but not for CLI. * Fixed again: [Range
 parsing is not RFC 7950
 compliant](https://github.com/clicon/clixon/issues/71)

---
 CHANGELOG.md               |   3 +
 apps/cli/cli_generate.c    | 150 ++++++++++++++++++++++------------
 lib/src/clixon_string.c    |   9 +-
 lib/src/clixon_yang.c      |  92 ++++++++++-----------
 lib/src/clixon_yang_type.c | 163 ++++++++++++++++++-------------------
 test/test_type.sh          | 114 +++++++++++++++++++++++---
 6 files changed, 329 insertions(+), 202 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ead8194c..d05c962d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -143,6 +143,9 @@
   * <!DOCTYPE (ie DTD) is not supported.
 
 ### Corrected Bugs
+* Partially corrected: [yang type range statement does not support multiple values](https://github.com/clicon/clixon/issues/59).
+  * Should work for netconf and restconf, but not for CLI.
+* Fixed again: [Range parsing is not RFC 7950 compliant](https://github.com/clicon/clixon/issues/71)
 * xml_cmp() compares numeric nodes based on string value [https://github.com/clicon/clixon/issues/64]
 * xml_cmp() respects 'ordered-by user' for state nodes, which violates RFC 7950 [https://github.com/clicon/clixon/issues/63]. (Thanks JDL)
 * XML<>JSON conversion problems [https://github.com/clicon/clixon/issues/66]
diff --git a/apps/cli/cli_generate.c b/apps/cli/cli_generate.c
index 62ed1e49..d2c5c39c 100644
--- a/apps/cli/cli_generate.c
+++ b/apps/cli/cli_generate.c
@@ -50,6 +50,7 @@
 #include <errno.h>
 #include <assert.h>
 #include <fcntl.h>
+#include <syslog.h>
 #include <sys/param.h>
 #include <math.h> /* For pow() kludge in cvtype_max2str_dup2 */
 
@@ -162,6 +163,98 @@ cli_callback_generate(clicon_handle h,
     return retval;
 }
 
+
+/*! Generate identityref statements for CLI variables
+ * @param[in]  ys        Yang statement
+ * @param[in]  ytype     Yang union type being resolved
+ * @param[in]  helptext  CLI help text
+ * @param[out] cb        Buffer where cligen code is written
+ * @see yang2cli_var_sub  Its sub-function
+ */
+static int
+yang2cli_var_identityref(yang_stmt *ys,
+			 yang_stmt *ytype,
+			 char      *cvtypestr,
+			 char      *helptext,
+			 cbuf      *cb)
+{
+    int     retval = -1;
+    yang_stmt *ybaseref;
+    yang_stmt *ybaseid;
+    cg_var    *cv = NULL;
+    char      *name;
+    char      *id;
+    int        i;
+    
+    /* Add a wildchar string first -let validate take it for default prefix */
+    cprintf(cb, ">");
+    if (helptext)
+	cprintf(cb, "(\"%s\")", helptext);
+    if ((ybaseref = yang_find((yang_node*)ytype, Y_BASE, NULL)) != NULL &&
+	(ybaseid = yang_find_identity(ys, ybaseref->ys_argument)) != NULL){
+	if (cvec_len(ybaseid->ys_cvec) > 0){
+	    cprintf(cb, "|<%s:%s choice:", ys->ys_argument, cvtypestr);
+	    i = 0;
+	    while ((cv = cvec_each(ybaseid->ys_cvec, cv)) != NULL){
+		if (i++)
+		    cprintf(cb, "|"); 
+		name = strdup(cv_name_get(cv));
+		if ((id=strchr(name, ':')) != NULL)
+		    *id = '\0';
+		cprintf(cb, "%s:%s", name, id+1);
+		if (name)
+		    free(name);
+	    }
+	}
+    }
+    retval = 0;
+    // done:
+    return retval;
+}
+    
+/*! Generate range check statements for CLI variables
+ * @param[out] cb    Buffer where cligen code is written
+ * @see yang2cli_var_sub  Its sub-function
+ */
+static int
+yang2cli_var_range(yang_stmt *ys,
+		   cvec      *cvv,
+		   int        options,
+		   cbuf      *cb)
+{
+    int     retval = -1;
+    int     i;
+    cg_var *cv;
+    
+    /* Loop through range_min and range_min..range_max */
+    i = 0;
+    while (i<cvec_len(cvv)){
+	if (i){
+	    //	    clicon_log(LOG_NOTICE, "%s: Warning %s has more ranges, ignoring", __FUNCTION__, ys->ys_argument);
+	    break;
+	}
+	cv = cvec_i(cvv, i++);
+	if (strcmp(cv_name_get(cv),"range_min") == 0){
+	    cprintf(cb, " %s[", (options&YANG_OPTIONS_RANGE)?"range":"length");
+	    cv2cbuf(cv, cb);
+	    cprintf(cb,":");
+	    /* probe next */
+	    if (i<cvec_len(cvv) &&
+		(cv = cvec_i(cvv, i)) != NULL &&
+		strcmp(cv_name_get(cv),"range_max") == 0){
+		i++;
+		cv2cbuf(cv, cb);
+	    }
+	    else /* If not, it is a single number range [x:x]*/
+		cv2cbuf(cv, cb);
+	    cprintf(cb,"]");
+	}
+    }
+    retval = 0;
+    // done:
+    return retval;
+}
+
 /* Forward */
 static int yang2cli_stmt(clicon_handle h, yang_stmt *ys, cbuf *cb,    
 			 enum genmodel_type gt, int level);
@@ -175,7 +268,7 @@ static int yang2cli_var_union(clicon_handle h, yang_stmt *ys, char *origtype,
  * @param[in]  h     Clixon handle
  * @param[in]  ys    Yang statement
  * @param[in]  ytype Yang union type being resolved
- * @param[in]  cb    Buffer where cligen code is written
+ * @param[out] cb    Buffer where cligen code is written
  * @param[in]  helptext  CLI help text
  */
 static int
@@ -196,7 +289,6 @@ yang2cli_var_sub(clicon_handle h,
     yang_stmt    *yi = NULL;
     int           i = 0;
     char         *cvtypestr;
-    cg_var       *cv;
 
     if (cvtype == CGV_VOID){
 	retval = 0;
@@ -223,61 +315,16 @@ yang2cli_var_sub(clicon_handle h,
 	    }
 	}
 	else if (strcmp(type, "identityref") == 0){
-	    yang_stmt *ybaseref;
-	    yang_stmt *ybaseid;
-	    cg_var    *cv = NULL;
-	    char      *name;
-	    char      *id;
-	    /* Add a wildchar string first -let validate take it for default prefix */
-	    cprintf(cb, ">");
-	    if (helptext)
-		cprintf(cb, "(\"%s\")", helptext);
-	    if ((ybaseref = yang_find((yang_node*)ytype, Y_BASE, NULL)) != NULL &&
-		(ybaseid = yang_find_identity(ys, ybaseref->ys_argument)) != NULL){
-		if (cvec_len(ybaseid->ys_cvec) > 0){
-		    cprintf(cb, "|<%s:%s choice:", ys->ys_argument, cvtypestr);
-		    i = 0;
-		    while ((cv = cvec_each(ybaseid->ys_cvec, cv)) != NULL){
-			if (i++)
-			    cprintf(cb, "|"); 
-			name = strdup(cv_name_get(cv));
-			if ((id=strchr(name, ':')) != NULL)
-			    *id = '\0';
-			cprintf(cb, "%s:%s", name, id+1);
-			if (name)
-			    free(name);
-		    }
-		}
-	    }
+	    if (yang2cli_var_identityref(ys, ytype, cvtypestr, helptext, cb) < 0)
+		goto done;
 	}
     }
-
     if (options & YANG_OPTIONS_FRACTION_DIGITS)
 	cprintf(cb, " fraction-digits:%u", fraction_digits);
 
     if (options & (YANG_OPTIONS_RANGE|YANG_OPTIONS_LENGTH)){
-	/* Loop through range_min and range_min..rang_max */
-	i = 0;
-	while (i<cvec_len(cvv)){
-	    //	    if (i)
-	    //		clicon_log(LOG_NOTICE, "%s: Warning %s has more ranges, ignoring", __FUNCTION__, ys->ys_argument);
-	    cv = cvec_i(cvv, i++);
-	    if (strcmp(cv_name_get(cv),"range_min") == 0){
-		cprintf(cb, " %s[", (options&YANG_OPTIONS_RANGE)?"range":"length");
-		cv2cbuf(cv, cb);
-		cprintf(cb,":");
-		/* probe next */
-		if (i<cvec_len(cvv) &&
-		    (cv = cvec_i(cvv, i)) != NULL &&
-		    strcmp(cv_name_get(cv),"range_max") == 0){
-		    i++;
-		    cv2cbuf(cv, cb);
-		}
-		else /* If not, it is a single number range [x:x]*/
-		    cv2cbuf(cv, cb);
-		cprintf(cb,"]");
-	    }
-	}
+	if (yang2cli_var_range(ys, cvv, options, cb) < 0)
+	    goto done;
     }
     if (options & YANG_OPTIONS_PATTERN){
 	char *posix = NULL;
@@ -292,7 +339,6 @@ yang2cli_var_sub(clicon_handle h,
 	cprintf(cb, "(\"%s\")", helptext);
     if (type && strcmp(type, "identityref") == 0)
 	cprintf(cb, ")");
-
     retval = 0;
   done:
     return retval;
diff --git a/lib/src/clixon_string.c b/lib/src/clixon_string.c
index 29e71a91..5a8a2851 100644
--- a/lib/src/clixon_string.c
+++ b/lib/src/clixon_string.c
@@ -624,13 +624,14 @@ clixon_trim(char *str)
     char *s = str;
     int   i;
 
-    while (strlen(s) && isblank(s[0]))
+    while (strlen(s) && isblank(s[0])) /* trim from front */
 	s++;
-    for (i=0; i<strlen(s); i++)
-	if (isblank(s[i])){
+    for (i=strlen(s)-1; i>=0; i--){ /* trim from rear */
+	if (isblank(s[i]))
 	    s[i] = '\0';
+	else
 	    break;
-	}
+    }
     return s;
 }
 
diff --git a/lib/src/clixon_yang.c b/lib/src/clixon_yang.c
index bd6b2a68..3dc5dc89 100644
--- a/lib/src/clixon_yang.c
+++ b/lib/src/clixon_yang.c
@@ -1152,9 +1152,7 @@ bound_add(yang_stmt   *ys,
 	  enum cv_type cvtype,
 	  char        *name,
 	  char        *val,
-	  int          options,
-	  uint8_t      fraction_digits
-	  )
+	  uint8_t      fraction_digits)
 {
     int     retval = -1;
     cg_var *cv;
@@ -1169,7 +1167,7 @@ bound_add(yang_stmt   *ys,
 	clicon_err(OE_YANG, errno, "cv_name_set(%s)", name);
 	goto done;
     }
-    if (options & YANG_OPTIONS_FRACTION_DIGITS && cvtype == CGV_DEC64)
+    if (cvtype == CGV_DEC64)
 	cv_dec64_n_set(cv, fraction_digits);
     if (strcmp(val, "min") == 0)
 	cv_min_set(cv);
@@ -1189,6 +1187,43 @@ bound_add(yang_stmt   *ys,
     return retval;
 }
 
+/*! Common range length parsing of "x .. y | z..w " statements
+ */
+static int
+range_parse(yang_stmt   *ys,
+	    enum cv_type cvtype,
+	    uint8_t      fraction_digits)
+{
+    int    retval = -1;
+    char **vec = NULL;
+    int    nvec;
+    int    i;
+    char  *v;
+    char  *v2;
+
+    if ((vec = clicon_strsep(ys->ys_argument, "|", &nvec)) == NULL)
+	goto done;
+    for (i=0; i<nvec; i++){
+	v = vec[i];
+	if ((v2 = strstr(v, "..")) != NULL){
+	    *v2 = '\0';
+	    v2 += 2;
+	    v2 = clixon_trim(v2); 	    /* trim blanks */
+	}
+	v = clixon_trim(v); 	/* trim blanks */
+	if (bound_add(ys, cvtype, "range_min", v, fraction_digits) < 0)
+	    goto done;
+	if (v2)
+	    if (bound_add(ys, cvtype, "range_max", v2, fraction_digits) < 0)
+		goto done;
+    }
+    retval = 0;
+  done:
+    if (vec)
+	free(vec);
+    return retval;
+}
+
 /*! Populate string built-in range statement
  *
  * Create cvec variables "range_min" and "range_max". Assume parent is type.
@@ -1213,11 +1248,6 @@ ys_populate_range(yang_stmt *ys,
     int             options = 0x0;
     uint8_t         fraction_digits;
     enum cv_type    cvtype = CGV_ERR;
-    char          **vec = NULL;
-    char           *v;
-    char           *v2;
-    int             nvec;
-    int             i;
 
     yparent = ys->ys_parent;     /* Find parent: type */
     if (yparent->yn_keyword != Y_TYPE){
@@ -1232,28 +1262,10 @@ ys_populate_range(yang_stmt *ys,
     /* This handles non-resolved also */
     if (clicon_type2cv(origtype, restype, ys, &cvtype) < 0) 
 	goto done;
-    if ((vec = clicon_strsep(ys->ys_argument, "|", &nvec)) == NULL)
+    if (range_parse(ys, cvtype, fraction_digits) < 0)
 	goto done;
-    for (i=0; i<nvec; i++){
-	v = vec[i++];
-	v = clixon_trim(v); 	/* trim blanks */
-	if ((v2 = strstr(v, "..")) != NULL){
-	    *v2 = '\0';
-	    v2 += 2;
-	    v2 = clixon_trim(v2); 	    /* trim blanks */
-	}
-	if (bound_add(ys, cvtype, "range_min", v,
-		      options, fraction_digits) < 0)
-	    goto done;
-	if (v2)
-	    if (bound_add(ys, cvtype, "range_max",v2,
-			  options, fraction_digits) < 0)
-		goto done;
-    }
     retval = 0;
   done:
-    if (vec)
-	free(vec);
     return retval;
 }
 
@@ -1276,11 +1288,6 @@ ys_populate_length(yang_stmt *ys,
     int             retval = -1;
     yang_node      *yparent;        /* type */
     enum cv_type    cvtype = CGV_ERR;
-    char          **vec = NULL;
-    char           *v;
-    int             nvec;
-    int             i;
-    char           *v2;
 
     yparent = ys->ys_parent;     /* Find parent: type */
     if (yparent->yn_keyword != Y_TYPE){
@@ -1288,27 +1295,10 @@ ys_populate_length(yang_stmt *ys,
 	goto done;
     }
     cvtype = CGV_UINT64;
-    if ((vec = clicon_strsep(ys->ys_argument, "|", &nvec)) == NULL)
+    if (range_parse(ys, cvtype, 0) < 0)
 	goto done;
-    for (i=0; i<nvec; i++){
-
-	v = vec[i++];
-	v = clixon_trim(v); 	/* trim blanks */
-	if ((v2 = strstr(v, "..")) != NULL){
-	    *v2 = '\0';
-	    v2 += 2;
-	    v2 = clixon_trim(v2); 	    /* trim blanks */
-	}
-	if (bound_add(ys, cvtype, "range_min", v, 0, 0) < 0)
-	    goto done;
-	if (v2)
-	    if (bound_add(ys, cvtype, "range_max",v2, 0, 0) < 0)
-		goto done;
-    }
     retval = 0;
   done:
-    if (vec)
-	free(vec);
     return retval;
 }
 
diff --git a/lib/src/clixon_yang_type.c b/lib/src/clixon_yang_type.c
index 1ea116b7..2cbdf95d 100644
--- a/lib/src/clixon_yang_type.c
+++ b/lib/src/clixon_yang_type.c
@@ -373,7 +373,9 @@ cv_validate1(cg_var      *cv,
     uint64_t        uu = 0;
     int64_t         ii = 0;
     int             i;
-    int             ret;
+    int             reti; /* must keep signed, unsigned and string retval */
+    int             retu; /* separated due to different error handling */
+    int             rets;
 
     if (reason && *reason){
 	free(*reason);
@@ -384,89 +386,86 @@ cv_validate1(cg_var      *cv,
 	(options & YANG_OPTIONS_LENGTH) != 0){
 	i = 0;
 	while (i<cvec_len(cvv)){
-	    cv1 = cvec_i(cvv, i++);
-	    if (strcmp(cv_name_get(cv1),"range_min") == 0){
-		if (i<cvec_len(cvv) &&
-		    (cv2 = cvec_i(cvv, i)) != NULL &&
-		    strcmp(cv_name_get(cv2),"range_max") == 0){
-		    i++;
-		}
-		else
-		    cv2 = cv1;
-		ret = 0;
-		switch (cvtype){
-		case CGV_INT8:
-		    ii =  cv_int8_get(cv);
-		    ret = range_check(ii, cv1, cv2, int8);
-		    break;
-		case CGV_INT16:
-		    ii =  cv_int16_get(cv);
-		    ret = range_check(ii, cv1, cv2, int16);
-		    break;
-		case CGV_INT32:
-		    ii =  cv_int32_get(cv);
-		    ret = range_check(ii, cv1, cv2, int32);
-		    break;
-		case CGV_DEC64: /* XXX look at fraction-digit? */
-		case CGV_INT64:
-		    ii =  cv_int64_get(cv);
-		    ret = range_check(ii, cv1, cv2, int64);
-		    break;
-		default:
-		    break;
-		}
-		if (ret){
-		    if (reason)
-			*reason = cligen_reason("Number out of range: %" PRId64, ii);
-		    goto fail;
-		    break;
-		}
-		ret = 0;
-		switch (cvtype){
-		case CGV_UINT8:
-		    uu =  cv_uint8_get(cv);
-		    ret = range_check(uu, cv1, cv2, uint8);
-		    break;
-		case CGV_UINT16:
-		    uu =  cv_uint16_get(cv);
-		    ret = range_check(uu, cv1, cv2, uint16);
-		    break;
-		case CGV_UINT32:
-		    uu =  cv_uint32_get(cv);
-		    ret = range_check(uu, cv1, cv2, uint32);
-		    break;
-		case CGV_UINT64:
-		    uu =  cv_uint32_get(cv);
-		    ret = range_check(uu, cv1, cv2, uint64);
-		    break;
-		default:
-		    break;
-		}
-		if (ret){
-		    if (reason)
-			*reason = cligen_reason("Number out of range: %" PRIu64, uu);
-		    goto fail;
-		    break;
-		}
-		ret = 0;
-		switch (cvtype){
-		case CGV_STRING:
-		case CGV_REST:
-		    if ((str = cv_string_get(cv)) == NULL)
-			break;
-		    uu = strlen(str);
-		    if (range_check(uu, cv1, cv2, uint64)){
-			if (reason)
-			    *reason = cligen_reason("string length out of range: %" PRIu64, uu);
-			goto fail;
-		    }
-		    break;
-		default:
-		    break;
-		}
+	    cv1 = cvec_i(cvv, i++); /* Increment to check for max pair */
+	    if (strcmp(cv_name_get(cv1),"range_min") != 0){
+		clicon_err(OE_YANG, EINVAL, "Internal error, expected range_min");
+		goto done;
 	    }
-	}
+	    if (i<cvec_len(cvv) &&
+		(cv2 = cvec_i(cvv, i)) != NULL &&
+		strcmp(cv_name_get(cv2),"range_max") == 0){
+		i++;
+	    }
+	    else
+		cv2 = cv1;
+	    reti = 0; retu = 0; rets = 0;
+	    switch (cvtype){ 
+	    case CGV_INT8:
+		ii =  cv_int8_get(cv);
+		reti = range_check(ii, cv1, cv2, int8);
+		break;
+	    case CGV_INT16:
+		ii =  cv_int16_get(cv);
+		reti = range_check(ii, cv1, cv2, int16);
+		break;
+	    case CGV_INT32:
+		ii =  cv_int32_get(cv);
+		reti = range_check(ii, cv1, cv2, int32);
+		break;
+	    case CGV_DEC64: /* XXX look at fraction-digit? */
+	    case CGV_INT64:
+		ii =  cv_int64_get(cv);
+		reti = range_check(ii, cv1, cv2, int64);
+		break;
+	    case CGV_UINT8:
+		uu =  cv_uint8_get(cv);
+		retu = range_check(uu, cv1, cv2, uint8);
+		break;
+	    case CGV_UINT16:
+		uu =  cv_uint16_get(cv);
+		retu = range_check(uu, cv1, cv2, uint16);
+		break;
+	    case CGV_UINT32:
+		uu =  cv_uint32_get(cv);
+		retu = range_check(uu, cv1, cv2, uint32);
+		break;
+	    case CGV_UINT64:
+		uu =  cv_uint32_get(cv);
+		retu = range_check(uu, cv1, cv2, uint64);
+		break;
+	    case CGV_STRING:
+	    case CGV_REST:
+		if ((str = cv_string_get(cv)) == NULL)
+		    break;
+		uu = strlen(str);
+		rets = range_check(uu, cv1, cv2, uint64);
+		break;
+	    default:
+		break;
+	    }
+	    /* Error handling for signed and unsigned, strings in switch 
+	     * OK: if check OK
+	     * Failure: check fails and it is the last
+	     */
+	    if ((reti==0 && retu==0 && rets == 0))
+		goto step1ok;
+	    /* Check fails */
+	    if (i==cvec_len(cvv)){ /* And it is last */
+		if (reason){
+		    if (reti)
+			*reason = cligen_reason("Number out of range: %"
+						PRId64,	ii);
+		    else if (retu)
+			*reason = cligen_reason("Number out of range: %"
+						PRIu64, uu);
+		    else 
+			*reason = cligen_reason("string length out of range: %" PRIu64, uu);
+		}
+		goto fail;
+	    }
+	} /* while i<cvec_len(cvv) */
     }
+ step1ok:
     /* then check options for others */
     switch (cvtype){
     case CGV_STRING:
diff --git a/test/test_type.sh b/test/test_type.sh
index 4f887a55..b9671830 100755
--- a/test/test_type.sh
+++ b/test/test_type.sh
@@ -129,9 +129,9 @@ module example{
        range "1";
       }
    }
-   leaf num2 {
+   leaf num2 { /* range and blanks */
        type int32 {
-         range "4..4000";
+         range " 4 .. 4000 ";
       }
    }
    leaf num3 {
@@ -139,9 +139,9 @@ module example{
          range "min..max";
       }
    }
-   leaf num4 { /* XXX multiple ranges not supported yet - only first*/
+   leaf num4 { 
        type uint8 {
-         range "1  ..  2 |  42";
+         range "1..2 |  42";
       }
    }
    leaf len1 {
@@ -151,7 +151,7 @@ module example{
    }
    leaf len2 {
        type string {
-         length "4..4000";
+         length " 4 .. 4000 ";
       }
    }
    leaf len3 {
@@ -304,7 +304,7 @@ expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><can
 new "cli bits validate"
 expectfn "$clixon_cli -1f $cfg -l o -y $fyang validate" 0 "^$"
 
-#----------------int ranges---------------------
+#-------- num1 single range (1)
 
 new "cli range test num1 1 OK"
 expectfn "$clixon_cli -1f $cfg -l o -y $fyang set num1 1" 0 "^$"
@@ -321,24 +321,97 @@ expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><can
 new "netconf validate num1 -1 wrong"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>num1</bad-element></error-info><error-severity>error</error-severity><error-message>Number out of range: -1</error-message></rpc-error></rpc-reply>]]>]]>$'
 
-new "cli range test num2 1000 ok"
-expectfn "$clixon_cli -1f $cfg -l o -y $fyang set num2 1000" 0 "^$"
+new "netconf discard-changes"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+#-------- num2 range and blanks
 
 new "cli range test num2 3 error"
 expectfn "$clixon_cli -1f $cfg -l o -y $fyang set num2 3" 255 "^$"
 
+new "cli range test num2 1000 ok"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set num2 1000" 0 "^$"
+
 new "cli range test num2 5000 error"
 expectfn "$clixon_cli -1f $cfg -l o -y $fyang set num2 5000" 255 "^$"
 
+new "netconf range set num2 3 fail"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><num2 xmlns="urn:example:clixon">3</num2></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "netconf validate num2 3 fail"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>num2</bad-element></error-info><error-severity>error</error-severity><error-message>Number out of range: 3</error-message></rpc-error></rpc-reply>]]>]]>$'
+
+new "netconf range set num2 1000 ok"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><num2 xmlns="urn:example:clixon">1000</num2></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "netconf validate num2 1000 ok"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+
+new "netconf range set num2 5000 fail"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><num2 xmlns="urn:example:clixon">5000</num2></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "netconf validate num2 5000 fail"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>num2</bad-element></error-info><error-severity>error</error-severity><error-message>Number out of range: 5000</error-message></rpc-error></rpc-reply>]]>]]>$'
+
+new "netconf discard-changes"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+#-------- num3 min max range
+
 new "cli range test num3 42 ok"
 expectfn "$clixon_cli -1f $cfg -l o -y $fyang set num3 42" 0 "^$"
 
-new "cli range test num3 260 error"
+new "cli range test num3 260 fail"
 expectfn "$clixon_cli -1f $cfg -l o -y $fyang set num3 260" 255 "^$"
 
-#----------------string ranges---------------------
+new "cli range test num3 -1 fail"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set num3 -1" 255 "^$"
 
-new "cli length test len1 1 error"
+new "netconf range set num3 260 fail"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><num3 xmlns="urn:example:clixon">260</num3></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "netconf validate num3 260 fail"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>num3</bad-element></error-info><error-severity>error</error-severity><error-message>260 is out of range(type is uint8)</error-message></rpc-error></rpc-reply>]]>]]>$'
+
+new "netconf discard-changes"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+#-------- num4 multiple ranges 1..2 |  42
+
+new "cli range test num4 multiple 2 ok"
+expectfn "$clixon_cli -1f $cfg -l e -y $fyang set num4 2" 0 "^$"
+
+new "cli range test num4 multiple 99 fail"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set num4 99" 255 "^$"
+
+# See https://github.com/clicon/clixon/issues/59
+#new "cli range test num4 multiple 42 ok"
+#expectfn "$clixon_cli -1f $cfg -l o -y $fyang set num4 42" 0 "^$"
+
+new "netconf range set num4 multiple 2"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><num4 xmlns="urn:example:clixon">42</num4></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "netconf validate num4 OK"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+
+new "netconf range set num4 multiple 20"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><num4 xmlns="urn:example:clixon">42</num4></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "netconf validate num4 fail"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+
+new "netconf range set num4 multiple 42"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><num4 xmlns="urn:example:clixon">42</num4></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+new "netconf validate num4 fail"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+
+new "netconf discard-changes"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+
+#----------------string ranges---------------------
+#-------- len1 single range (2)
+new "cli length test len1 1 fail"
 expectfn "$clixon_cli -1f $cfg -l o -y $fyang set len1 x" 255 "^$"
 
 new "cli length test len1 2 OK"
@@ -356,18 +429,33 @@ expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><can
 new "netconf validate len1 1 wrong"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>len1</bad-element></error-info><error-severity>error</error-severity><error-message>string length out of range: 1</error-message></rpc-error></rpc-reply>]]>]]>$'
 
+#-------- len2 range and blanks
+
+new "cli length test len2 3 error"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set len2 ab" 255 "^$"
+
 new "cli length test len2 42 ok"
 expectfn "$clixon_cli -1f $cfg -l o -y $fyang set len2 hejhophdsakjhkjsadhkjsahdkjsad" 0 "^$"
 
 new "netconf discard-changes"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
-new "cli length test len2 3 error"
-expectfn "$clixon_cli -1f $cfg -l o -y $fyang set len2 ab" 255 "^$"
+#-------- len3 min max range
 
 new "cli range test len3 42 ok"
 expectfn "$clixon_cli -1f $cfg -l o -y $fyang set len3 hsakjdhkjsahdkjsahdksahdksajdhsakjhd" 0 "^$"
 
+#-------- len4 multiple ranges 1..2 |  42 (only first range)
+new "cli length test len4 3 error"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set len4 abc" 255 "^$"
+
+new "cli length test len4 2 ok"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set len4 ab" 255 "^$"
+
+# See https://github.com/clicon/clixon/issues/59
+#new "cli length test len4 42 ok"
+#expectfn "$clixon_cli -1f $cfg -l o -y $fyang set len4 hsakjdhkjsahdkjsahdksahdksajdhsakjhd" 0 "^$"
+
 # XSD schema -> POSIX ECE translation
 new "cli yang pattern \d ok"
 expectfn "$clixon_cli -1f $cfg -l o -y $fyang set digit4 0123" 0 "^$"

From 3a5a4fde3645d7a66a1004850a760b4446484777 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Tue, 5 Feb 2019 14:35:35 +0100
Subject: [PATCH 72/72] Cleaned up changelog and roadmap

---
 CHANGELOG.md | 89 ++++++++++++++++++++++++++--------------------------
 DEVELOP.md   |  5 ++-
 ROADMAP.md   | 18 +++++------
 3 files changed, 55 insertions(+), 57 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d05c962d..a3bab479 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,19 +1,19 @@
 # Clixon Changelog
 
-## 3.9.0 (Preliminary Target: Mid-January 2019)
-
-### Planned new features
-* [Roadmap](ROADMAP.md)
+## 3.9.0 (Preliminary Target: February 2019)
 
 ### Major New features
-* Correct XML namespace handling
-  * XML multiple modules was based on non-strict semantics so that yang modules were found by iterating thorugh namespaces until a match was made. This did not adhere to proper [XML namespace handling](https://www.w3.org/TR/2009/REC-xml-names-20091208) as well as strict Netconf and Restconf namespace handling, which causes problems with overlapping names and false positives, and most importantly, with standard conformance.
-  * There are still the following non-strict namespace handling:
-    * Everything in ietf-netconf base syntax with namespace `urn:ietf:params:xml:ns:netconf:base:1.0` is default and need not be explicitly given
+1. Correct XML namespace handling
+  * According to [XML 1.0](https://www.w3.org/TR/2009/REC-xml-names-20091208) in restconf and Netconf.
+  * Remaining deviations from strict namespace handling:
     * edit-config xpath select statement does not support namespaces
     * notifications do not support namespaces.
-  * Below see netconf old (but wrong) netconf RPC:
-  ```
+    * ietf-netconf base syntax is default  `urn:ietf:params:xml:ns:netconf:base:1.0` and may not be explicitly given. However, in future versions this may be mandatory.
+    * CLI syntax (ie generated commands) do not have namespaces.
+
+  * The following example shows changes in netconf and restconf:
+    * Wrong Netconf RPC:
+    ```
      <rpc>
        <my-own-method/>
      </rpc> 
@@ -22,9 +22,9 @@
          <address-family>ipv4</address-family>
        </route>
      </rpc-reply>
-  ```
-  This is the currently correct Netconf RPC:
-  ```
+    ```
+    * Correct Netconf RPC:
+    ```
      <rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"> # xmlns may be ommitted
        <my-own-method xmlns="urn:example:my-own">
      </rpc>
@@ -33,9 +33,9 @@
          <address-family>ipv4</address-family>
        </route>
      </rpc-reply>
-  ```
-  * Another example for restconf rpc with new correct syntax. Note that while Netconf uses xmlns attribute syntax, Restconf uses module name prefix. First the request:
-  ```
+    ```
+    * Example: Correct restconf request:
+    ```
     POST http://localhost/restconf/operations/example:example)
     Content-Type: application/yang-data+json
     {
@@ -43,9 +43,9 @@
         "x":0
       }
     }
-  ```
-  then the reply:
-  ```
+    ```
+    * Example: correct Restconf reply:
+    ```
     HTTP/1.1 200 OK
     {
       "example:output": {
@@ -53,10 +53,10 @@
         "y": "42"
       }
     }
-  ```
+    ```
   * To keep previous non-strict namespace handling (backwards compatible), set CLICON_XML_NS_STRICT to false.
-  * See https://github.com/clicon/clixon/issues/49
-* Yang code upgrade (RFC7950)
+  * See [https://github.com/clicon/clixon/issues/49]
+1. Yang upgrade (RFC7950)
   * YANG parser cardinality checked (https://github.com/clicon/clixon/issues/48)
     * See https://github.com/clicon/clixon/issues/84
   * RPC method input parameters validated
@@ -76,7 +76,7 @@
       * Note CLIXON_DATADIR (=/usr/local/share/clixon) need to be in the list
     * CLICON_YANG_MAIN_FILE Provides a filename with a single module filename.
     * CLICON_YANG_MAIN_DIR Provides a directory where all yang modules should be loaded.
-* NACM (RFC8341)
+1. NACM (RFC8341)
   * Experimental support, no performance enhancements and need further testing
   * Incoming RPC Message validation is supported (3.4.4)
   * Data Node Access validation is supported (3.4.5), except:
@@ -89,7 +89,7 @@
   * Recovery user "_nacm_recovery" added.
 	
 ### API changes on existing features (you may need to change your code)
-* Added `username` argument on `xmldb_put()` datastore function for NACM data-node write checks
+* Added `username` argument to `xmldb_put()` datastore function for NACM data-node write checks
 * Rearranged yang files
   * Moved and updated all standard ietf and iana yang files from example and yang/ to `yang/standard`.
   * Moved clixon yang files from yang to `yang/clixon`
@@ -98,19 +98,19 @@
   * Renamed example yang from example.yang -> clixon-example.yang
 * clixon_cli -p (printspec) changed semantics to add new yang path dir (see minor changes).
 * Date-and-time type now properly uses ISO 8601 UTC timezone designators.
-  * Eg 2008-09-21T18:57:21.003456 is changed to 2008-09-21T18:57:21.003456Z
-* Renamed yang file `ietf-netconf-notification@2008-07-01.yang` to `clixon-rfc5277`.
+  * Eg `2008-09-21T18:57:21.003456` is changed to `2008-09-21T18:57:21.003456Z`
+* Renamed yang file `ietf-netconf-notification.yang` to `clixon-rfc5277.yang`.
   * Fixed validation problems, see [https://github.com/clicon/clixon/issues/62]
   * Name confusion, the file is manually constructed from the rfc.
   * Changed prefix to `ncevent`
-* Stricter YANG choice validation leads to enforcement of structures like: `choice c{ mandatory true; leaf x` statements. `x` was not previously enforced.
+* Stricter YANG choice validation leads to enforcement of structures
+  * Example: In `choice c{ mandatory true; leaf x; }`, `x` was not previously enforced but is now.
 * Many hand-crafted validation messages have been removed and replaced with generic validations, which may lead to changed rpc-error messages.
 * CLICON_XML_SORT option (in clixon-config.yang) has been removed and set to true permanently. Unsorted XML lists leads to slower performance and old obsolete code can be removed.
 * Strict namespace setting can be a problem when upgrading existing database files, such as startup-db or persistent running-db, or any other saved XML file.
 * Removed `delete-config` support for candidate db since it is not supported in RFC6241.
 * Switched the order of `error-type` and `error-tag` in all netconf and restconf error messages to comply to RFC order.
-* Yang parser is stricter (see above) which may break parsing of existing yang specs.
-* XML namespace handling is corrected (see above)
+* XML namespace handling is corrected (see major changes)
   * For backward compatibility set config option  CLICON_XML_NS_LOOSE
 * Yang parser functions have changed signatures. Please check the source if you call these functions.
 * Add `<CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>` to your configuration file, or corresponding CLICON_DATADIR directory for Clixon system yang files.
@@ -119,33 +119,35 @@
   * For backward compatibility, define CLICON_CLI_MODEL_TREENAME_PATCH in clixon_custom.h
 
 ### Minor changes
-* Added make test from top-level
+* Change GIT branch handling to a single working master branch
+  * Develop branched abandoned
+  * Travis CI supported, see [https://travis-ci.org/clicon/clixon]
+* XML parser conformance to W3 spec
+  * Names lexically correct (NCName)
+  * Syntactically Correct handling of '<?' (processing instructions) and '<?xml' (XML declaration)
+  * XML prolog syntax for 'well-formed' XML
+  * `<!DOCTYPE` (ie DTD) is not supported.
+* Added `make test` from top-level Makefile
 * Added `xml_rootchild_node()` lib function as variant of `xml_rootchild()`
 * Added -o "<option>=<value>" command-line option to all programs: backend, cli, netconf, restconf.
   * Any config option from file can be overrided by giving them on command-line.
 * Added -p <dir> command-line option to all programs: backend, cli, netconf, restconf.
   * -p adds a new dir to the yang path dir. (same as -o CLICON_YAN_DIR=<dir>)
-* Cligen uses posix regex while yang uses XSD. It differs in some aspects. A translator function has been added for `\d` -> `[0-9]` translation, there may be more.
+* Cligen uses posix regex while yang uses XSD. It differs in some aspects. A translator function has been added for `\d` -> `[0-9]` translation, there may be more. This fixes the most acute problems, but there may be more.
 * Added new clixon-lib yang module for internal netconf protocol. Currently only extends the standard with a debug RPC.
 * Added three-valued return values for several validate functions where -1 is fatal error, 0 is validation failed and 1 is validation OK.
   * This includes: `xmldb_put`, `xml_yang_validate_all`, `xml_yang_validate_add`, `xml_yang_validate_rpc`, `api_path2xml`, `api_path2xpath`
 * Added new xml functions for specific types: `xml_child_nr_notype`, `xml_child_nr_notype`, `xml_child_i_type`, `xml_find_type`.
-* Added example_rpc RPC to example backend
-* Renamed xml_namespace[_set]() to xml_prefix[_set]()
+* Added `example_rpc` RPC to example backend
+* Renamed `xml_namespace()` and `xml_namespace_set()` to `xml_prefix()` and `xml_prefix_set()`, respectively.
 * Changed all make tags --> make TAGS
 * Keyvalue datastore removed (it has been disabled since 3.3.3)
-* Removed return value ymodp from yang parse functions (eg yang_parse()).
 * New config option: CLICON_CLI_MODEL_TREENAME defining name of generated syntax tree if CLIXON_CLI_GENMODEL is set.
-* XML parser conformance to W3 spec
-  * Names lexically correct (NCName)
-  * Syntactically Correct handling of '<?' (processing instructions) and '<?xml' (XML declaration)
-  * XML prolog syntax for 'well-formed' XML
-  * <!DOCTYPE (ie DTD) is not supported.
 
 ### Corrected Bugs
 * Partially corrected: [yang type range statement does not support multiple values](https://github.com/clicon/clixon/issues/59).
   * Should work for netconf and restconf, but not for CLI.
-* Fixed again: [Range parsing is not RFC 7950 compliant](https://github.com/clicon/clixon/issues/71)
+* Fixed: [Range parsing is not RFC 7950 compliant](https://github.com/clicon/clixon/issues/71)
 * xml_cmp() compares numeric nodes based on string value [https://github.com/clicon/clixon/issues/64]
 * xml_cmp() respects 'ordered-by user' for state nodes, which violates RFC 7950 [https://github.com/clicon/clixon/issues/63]. (Thanks JDL)
 * XML<>JSON conversion problems [https://github.com/clicon/clixon/issues/66]
@@ -154,18 +156,15 @@
 * xsd regular expression support for character classes [https://github.com/clicon/clixon/issues/68]
   * added support for \c, \d, \w, \W, \s, \S.
 * Removing newlines from XML data [https://github.com/clicon/clixon/issues/65]
-* [ietf-netconf-notification@2008-07-01.yang validation problem #62](https://github.com/clicon/clixon/issues/62)
+* Fixed [ietf-netconf-notification@2008-07-01.yang validation problem #62](https://github.com/clicon/clixon/issues/62)
 * Ignore CR(\r) in yang files for DOS files
 * Keyword "min" (not only "max") can be used in built-in types "range" and "length" statements.
 * Support for empty yang string added, eg `default "";`
 * Removed CLI generation for yang notifications (and other non-data yang nodes)
-* Some restconf error messages contained "rpc-reply" or "rpc-error" which have now been removed.
+* Some restconf error messages contained `rpc-reply` or `rpc-error` which have now been removed.
 * getopt return value changed from char to int (https://github.com/clicon/clixon/issues/58)
 * Netconf/Restconf RPC extra input arguments are ignored (https://github.com/clicon/clixon/issues/47)
 	
-### Known issues
-* debug rpc added in example application (should be in clixon-config).
-
 ## 3.8.0 (6 Nov 2018)
 
 ### Major New features
diff --git a/DEVELOP.md b/DEVELOP.md
index 74d7f4ef..1755effa 100644
--- a/DEVELOP.md
+++ b/DEVELOP.md
@@ -31,10 +31,9 @@ How to document the code
 ## Branching
 How to work in git (branching)
 
-Basically follows: http://nvie.com/posts/a-successful-git-branching-model/
-only somewhat simplified:
+Try to keep a single master branch always working. Currently testing is made using [Travis CI](https://travis-ci.org/clicon/clixon).
 
-Do commits in develop branch. When done, merge with master.
+However, releases are made periodically (ca every 3 months) which is more tested.
 
 ## How the meta-configure stuff works
 ```
diff --git a/ROADMAP.md b/ROADMAP.md
index 3e91e1a3..2b884845 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -1,23 +1,23 @@
 # Clixon roadmap
 
 ## High prio
-- NACM (RFC 8341) 
-  - Module rules (done)
-  - Data node rules (read/create/delete/update/execute)
 - Special handling of the initial startup transaction to avoid exit at startup
   - Possibly - draft-wu-netconf-restconf-factory-restore-03
 - Handle revisions to data model.
   - Possibly draft-wang-netmod-module-revision-management-01
-- XML [Namespace handling](https://github.com/clicon/clixon/issues/49)
+- (DONE) NACM (RFC 8341) 
+  - NACM support for create, read, update, delete operations 
+  - ACM support for specifying a module name other than '*' 
+- (DONE)XML [Namespace handling](https://github.com/clicon/clixon/issues/49) (DONE)
 
 ## Medium prio:
-- Input validation on custom RPCs/ (done)
-  - [Sanity checks](https://github.com/clicon/clixon/issues/47)
-- Support for XML regex's.
-  - Currently Posix extended regular expressions
 - Support a plugin callback that is invoked when copy-config is called.
 - Preserve CLI command history across sessions. The up/down arrows
-
+- (DONE)Support for XML regex's.
+  - Currently Posix extended regular expressions
+- (DONE) Input validation on custom RPCs/
+  - [Sanity checks](https://github.com/clicon/clixon/issues/47)
+  
 ## Low prio:
 - Provide a client library to access netconf APIs provided by system services.
   - Netconf backend (Clixon acts as netconf controller)