* New backend startup and upgrade support, see [doc/startup.md] for details

* Datastore files contain RFC7895 module-state information

example/README.md

@@ -288,8 +288,9 @@ static clixon_plugin_api api = {
     clixon_plugin_init, 
     plugin_start,       
     plugin_exit,        
-    .ca_reset=plugin_reset,/* reset */          
+    .ca_reset=plugin_reset,/* reset for extra XML at startup*/          
     .ca_statedata=plugin_statedata, /* statedata */
+    .ca_upgrade=example_upgrade,            /* upgrade configuration */
     .ca_trans_begin=NULL, /* trans begin */
     .ca_trans_validate=transaction_validate,/* trans validate */
     .ca_trans_complete=NULL,                /* trans complete */

example/example_backend.c

@@ -39,6 +39,7 @@
 #include <signal.h>
 #include <unistd.h>
 #include <assert.h>
+#include <syslog.h>
 #include <sys/time.h>
 
 /* clicon */
@@ -50,6 +51,13 @@
 /* These include signatures for plugin and transaction callbacks. */
 #include <clixon/clixon_backend.h> 
 
+/* Variable to control if reset code is run.
+ * The reset code inserts "extra XML" which assumes ietf-interfaces is
+ * loaded, and this is not always the case.
+ * Therefore, the backend must be started with -- -r to enable the reset function
+ */
+static int _reset = 0;
+
 /* forward */
 static int example_stream_timer_setup(clicon_handle h);
 
@@ -212,6 +220,26 @@ example_statedata(clicon_handle h,
     return retval;
 }
 
+/*! Upgrade configuration from one version to another
+ * @param[in]  h      Clicon handle
+ * @param[in]  xms    Module state differences
+ * @retval     0      OK
+ * @retval    -1      Error
+ */
+int 
+example_upgrade(clicon_handle       h, 
+		cxobj              *xms)
+{
+    int     retval = -1;
+	
+    if (xms)
+	clicon_log_xml(LOG_NOTICE, xms, "%s", __FUNCTION__);
+    retval = 0;
+    // done:
+    return retval;
+}
+
+
 /*! Plugin state reset. Add xml or set state in backend machine.
  * Called in each backend plugin. plugin_reset is called after all plugins
  * have been initialized. This give the application a chance to reset
@@ -223,6 +251,7 @@ example_statedata(clicon_handle h,
  * @param[in] db  Name of database. Not may be other than "running"
  * In this example, a loopback interface is added
  * @note This assumes example yang with interfaces/interface
+ * @see example_start which sets the _reset varaible
  */
 int
 example_reset(clicon_handle h,
@@ -233,6 +262,8 @@ example_reset(clicon_handle h,
     int    ret;
     cbuf  *cbret = NULL;
 
+    if (!_reset)
+	goto ok;
     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)
@@ -252,6 +283,7 @@ example_reset(clicon_handle h,
 		   cbuf_get(cbret));
 	goto done;
     }
+ ok:
     retval = 0;
  done:
     if (cbret)
@@ -267,7 +299,8 @@ example_reset(clicon_handle h,
  * @param[in]  argv  Argument vector 
  *
  * plugin_start is called once everything has been initialized, right before 
- * the main event loop is entered. Command line options can be passed to the 
+ * the main event loop is entered. 
+ * From the CLI, command line options can be passed to the 
  * plugins by using "-- <args>" where <args> is any choice of 
  * options specific to the application. These options are passed to the
  * plugin_start function via the argc and argv arguments which
@@ -278,6 +311,16 @@ example_start(clicon_handle h,
 	     int           argc,
 	     char        **argv)
 {
+    char c;
+    
+    opterr = 0;
+    optind = 1;
+    while ((c = getopt(argc, argv, "r")) != -1)
+	switch (c) {
+	case 'r':
+	    _reset = 1;
+	    break;
+	}
     return 0;
 }
 
@@ -296,6 +339,7 @@ static clixon_plugin_api api = {
     example_exit,                           /* exit */
     .ca_reset=example_reset,                /* reset */
     .ca_statedata=example_statedata,        /* statedata */
+    .ca_upgrade=example_upgrade,            /* upgrade configuration */
     .ca_trans_begin=NULL,                   /* trans begin */
     .ca_trans_validate=transaction_validate,/* trans validate */
     .ca_trans_complete=NULL,                /* trans complete */

example/example_backend_nacm.c

@@ -120,7 +120,7 @@ clixon_plugin_init(clicon_handle h)
     clicon_debug(1, "%s backend nacm", __FUNCTION__);
     nacm_mode = clicon_option_str(h, "CLICON_NACM_MODE");
     if (nacm_mode==NULL || strcmp(nacm_mode, "disabled") == 0){
-	clicon_log(LOG_WARNING, "%s CLICON_NACM_MODE not enabled: example nacm module disabled", __FUNCTION__);
+	clicon_log(LOG_DEBUG, "%s CLICON_NACM_MODE not enabled: example nacm module disabled", __FUNCTION__);
 	return NULL;
     }
     return &api;