Validation of mandatory choice and recursive mandatory containers.

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");

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;
 	}

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;

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:
 ```