diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63c5c63f..57ab07c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,15 @@
## 3.10.0/4.0.0 (Upcoming)
### Major New features
+* Yang "min-element" and "max-element" feature supported
+ * According to RFC 7950 7.7.4 and 7.7.5
+ * See (tests)[test/test_minmax.sh]
+ * The following cornercases are not supported:
+ * Check for min-elements>0 for empty lists on top-level
+ * Check for min-elements>0 for empty lists in choice/case
+* Yang "unique" feature supported
+ * According to RFC 7950 7.8.3
+ * See (tests)[test/test_unique.sh]
* Persistent CLI history: [Preserve CLI command history across sessions. The up/down arrows](https://github.com/clicon/clixon/issues/79)
* The design is similar to bash history:
* The CLI loads/saves its complete history to a file on entry and exit, respectively
@@ -45,6 +54,11 @@
### API changes on existing features (you may need to change your code)
* Non-key list now not accepted in edit-config (before only on validation)
+* Changed return values in internal functions
+ * These functions are affected: `netconf_trymerge`, `startup_module_state`, `yang_modules_state_get`
+ * They now comply to Clixon validation: Error: -1; Invalid: 0; OK: 1.
+* New Clixon Yang RPC: ping. To check if backup is running.
+ * Try with `ietf-netconf:startup `, or use `*:*`
@@ -116,6 +130,8 @@
### Minor changes
* New XMLDB_FORMAT added: `tree`. An experimental record-based tree database for direct access of records.
+* Netconf error handling modified
+ * New option -e added. If set, the netconf client returns -1 on error.
* A new minimal "hello world" example has been added
* Experimental customized error output strings, see [lib/clixon/clixon_err_string.h]
* Empty leaf values, eg ..., ");
+ return 0;
+}
+
/*! 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.
@@ -1277,10 +1319,13 @@ backend_rpc_init(clicon_handle h)
if (rpc_callback_register(h, from_client_create_subscription, NULL,
"urn:ietf:params:xml:ns:netmod:notification", "create-subscription") < 0)
goto done;
- /* In backend_client.? Clixon RPC */
+ /* Clixon RPC */
if (rpc_callback_register(h, from_client_debug, NULL,
"http://clicon.org/lib", "debug") < 0)
goto done;
+ if (rpc_callback_register(h, from_client_ping, NULL,
+ "http://clicon.org/lib", "ping") < 0)
+ goto done;
retval =0;
done:
return retval;
diff --git a/apps/backend/backend_plugin.c b/apps/backend/backend_plugin.c
index 19b98c7e..de04d161 100644
--- a/apps/backend/backend_plugin.c
+++ b/apps/backend/backend_plugin.c
@@ -115,8 +115,8 @@ clixon_plugin_reset(clicon_handle h,
* @param[in] xpath String with XPATH syntax. or NULL for all
* @param[in,out] xtop State XML tree is merged with existing tree.
* @retval -1 Error
- * @retval 0 OK
- * @retval 1 Statedata callback failed (xret set with netconf-error)
+ * @retval 0 Statedata callback failed (xret set with netconf-error)
+ * @retval 1 OK
* @note xtop can be replaced
*/
int
@@ -136,24 +136,25 @@ clixon_plugin_statedata(clicon_handle h,
continue;
if ((x = xml_new("config", NULL, NULL)) == NULL)
goto done;
- if (fn(h, xpath, x) < 0){
- retval = 1;
- goto done; /* Dont quit here on user callbacks */
- }
- if ((ret = netconf_trymerge(x, yspec, xret)) != 0){
- retval = ret;
+ if (fn(h, xpath, x) < 0)
+ goto fail; /* Dont quit here on user callbacks */
+ if ((ret = netconf_trymerge(x, yspec, xret)) < 0)
goto done;
- }
+ if (ret == 0)
+ goto fail;
if (x){
xml_free(x);
x = NULL;
}
}
- retval = 0;
+ retval = 1;
done:
if (x)
xml_free(x);
return retval;
+ fail:
+ retval = 0;
+ goto done;
}
/*! Create and initialize transaction */
diff --git a/apps/backend/backend_startup.c b/apps/backend/backend_startup.c
index 96195f31..f2270644 100644
--- a/apps/backend/backend_startup.c
+++ b/apps/backend/backend_startup.c
@@ -331,6 +331,8 @@ startup_failsafe(clicon_handle h)
/*! Init modules state of the backend (server). To compare with startup XML
* Set the modules state as setopt to the datastore module.
* Only if CLICON_XMLDB_MODSTATE is enabled
+ * @retval -1 Error
+ * @retval 0 OK
*/
int
startup_module_state(clicon_handle h,
@@ -338,17 +340,23 @@ startup_module_state(clicon_handle h,
{
int retval = -1;
cxobj *x = NULL;
+ int ret;
if (!clicon_option_bool(h, "CLICON_XMLDB_MODSTATE"))
goto ok;
/* Set up cache
* Now, access brief module cache with clicon_modst_cache_get(h, 1) */
- if (yang_modules_state_get(h, yspec, NULL, 1, &x) < 0)
+ if ((ret = yang_modules_state_get(h, yspec, NULL, 1, &x)) < 0)
goto done;
+ if (ret == 0)
+ goto fail;
ok:
- retval = 0;
+ retval = 1;
done:
if (x)
xml_free(x);
return retval;
+ fail:
+ retval = 0;
+ goto done;
}
diff --git a/apps/netconf/netconf_main.c b/apps/netconf/netconf_main.c
index f85bba32..68d82705 100644
--- a/apps/netconf/netconf_main.c
+++ b/apps/netconf/netconf_main.c
@@ -71,10 +71,13 @@
#include "netconf_rpc.h"
/* Command line options to be passed to getopt(3) */
-#define NETCONF_OPTS "hD:f:l:qa:u:d:p:y:U:t:o:"
+#define NETCONF_OPTS "hD:f:l:qa:u:d:p:y:U:t:eo:"
#define NETCONF_LOGFILE "/tmp/clixon_netconf.log"
+/*! Ignore errors on packet errors: continue */
+static int ignore_packet_errors = 1;
+
/*! Process incoming packet
* @param[in] h Clicon handle
* @param[in] cb Packet buffer
@@ -235,8 +238,9 @@ 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 (netconf_input_packet(h, cb) < 0)
- ; //goto done; // ignore errors
+ if (netconf_input_packet(h, cb) < 0 &&
+ !ignore_packet_errors) // default is to ignore errors
+ goto done;
if (cc_closed)
break;
cbuf_reset(cb);
@@ -338,6 +342,7 @@ usage(clicon_handle h,
"\t-y \tLoad yang spec file (override yang main module)\n"
"\t-U \tOver-ride unix user with a pseudo user for NACM.\n"
"\t-t \tTimeout in seconds. Quit after this time.\n"
+ "\t-e \tDont ignore errors on packet input.\n"
"\t-o \"=\"\tGive configuration option overriding config file (see clixon-config.yang)\n",
argv0,
clicon_netconf_dir(h)
@@ -349,6 +354,7 @@ int
main(int argc,
char **argv)
{
+ int retval = -1;
int c;
char *argv0 = argv[0];
int quiet = 0;
@@ -455,6 +461,9 @@ main(int argc,
case 't': /* timeout in seconds */
tv.tv_sec = atoi(optarg);
break;
+ case 'e': /* dont ignore packet errors */
+ ignore_packet_errors = 0;
+ break;
case 'o':{ /* Configuration option */
char *val;
if ((val = index(optarg, '=')) == NULL)
@@ -528,9 +537,12 @@ main(int argc,
}
if (event_loop() < 0)
goto done;
+ retval = 0;
done:
+ if (ignore_packet_errors)
+ retval = 0;
netconf_terminate(h);
clicon_log_init(__PROGRAM__, LOG_INFO, 0); /* Log on syslog no stderr */
clicon_log(LOG_NOTICE, "%s: %u Terminated", __PROGRAM__, getpid());
- return 0;
+ return retval;
}
diff --git a/apps/restconf/restconf_methods.c b/apps/restconf/restconf_methods.c
index d9df89cd..c2290331 100644
--- a/apps/restconf/restconf_methods.c
+++ b/apps/restconf/restconf_methods.c
@@ -588,6 +588,10 @@ api_data_post(clicon_handle h,
goto done;
goto ok;
}
+ if (xretcom){ /* Clear: can be reused again below */
+ xml_free(xretcom);
+ xretcom = NULL;
+ }
if (if_feature(yspec, "ietf-netconf", "startup")){
/* RFC8040 Sec 1.4:
* If the NETCONF server supports :startup, the RESTCONF server MUST
@@ -933,6 +937,10 @@ api_data_put(clicon_handle h,
goto done;
goto ok;
}
+ if (xretcom){ /* Clear: can be reused again below */
+ xml_free(xretcom);
+ xretcom = NULL;
+ }
if (if_feature(yspec, "ietf-netconf", "startup")){
/* RFC8040 Sec 1.4:
* If the NETCONF server supports :startup, the RESTCONF server MUST
@@ -1108,6 +1116,10 @@ api_data_delete(clicon_handle h,
goto done;
goto ok;
}
+ if (xretcom){ /* Clear: can be reused again below */
+ xml_free(xretcom);
+ xretcom = NULL;
+ }
if (if_feature(yspec, "ietf-netconf", "startup")){
/* RFC8040 Sec 1.4:
* If the NETCONF server supports :startup, the RESTCONF server MUST
diff --git a/lib/clixon/clixon_netconf_lib.h b/lib/clixon/clixon_netconf_lib.h
index 01a7ee2f..2953ab5f 100644
--- a/lib/clixon/clixon_netconf_lib.h
+++ b/lib/clixon/clixon_netconf_lib.h
@@ -66,6 +66,8 @@ int netconf_operation_failed(cbuf *cb, char *type, char *message);
int netconf_operation_failed_xml(cxobj **xret, char *type, char *message);
int netconf_malformed_message(cbuf *cb, char *message);
int netconf_malformed_message_xml(cxobj **xret, char *message);
+int netconf_data_not_unique(cbuf *cb, cxobj *x, cvec *cvk);
+int netconf_minmax_elements(cbuf *cb, cxobj *x, int max);
int netconf_trymerge(cxobj *x, yang_stmt *yspec, cxobj **xret);
int netconf_module_load(clicon_handle h);
char *netconf_db_find(cxobj *xn, char *name);
diff --git a/lib/src/clixon_netconf_lib.c b/lib/src/clixon_netconf_lib.c
index 45956aa9..b02fa04d 100644
--- a/lib/src/clixon_netconf_lib.c
+++ b/lib/src/clixon_netconf_lib.c
@@ -966,13 +966,90 @@ netconf_malformed_message_xml(cxobj **xret,
return retval;
}
+/*! Create Netconf data-not-unique error message according to RFC 7950 15.1
+ *
+ * A NETCONF operation would result in configuration data where a
+ * "unique" constraint is invalidated.
+ * @param[out] cb CLIgen buf. Error XML is written in this buffer
+ * @param[in] x List element containing duplicate
+ * @param[in] cvk List of comonents in x that are non-unique
+ * @see RFC7950 Sec 15.1
+ */
+int
+netconf_data_not_unique(cbuf *cb,
+ cxobj *x,
+ cvec *cvk)
+{
+ int retval = -1;
+ cg_var *cvi = NULL;
+ cxobj *xi;
+
+ if (cprintf(cb, ""
+ "protocol "
+ "operation-failed "
+ "data-not-unique "
+ "error "
+ "") < 0)
+ goto err;
+ while ((cvi = cvec_each(cvk, cvi)) != NULL){
+ if ((xi = xml_find(x, cv_string_get(cvi))) == NULL)
+ continue; /* ignore, shouldnt happen */
+ cprintf(cb, "");
+ clicon_xml2cbuf(cb, xi, 0, 0);
+ cprintf(cb, " ");
+ }
+ if (cprintf(cb, " "
+ "protocol "
+ "operation-failed "
+ "too-%s-elements "
+ "error "
+ "%s "
+ " 0 && /* 0 means unbounded */
+ nr > cv_uint32_get(cv)){
+ if (netconf_minmax_elements(cbret, x, 1) < 0)
+ goto done;
+ goto fail;
+ }
+ }
+ retval = 1;
+ done:
+ return retval;
+ fail:
+ retval = 0;
+ goto done;
+}
+
+/*! Detect unique constraint for duplicates from parent node and minmax
+ * @param[in] xt XML parent (may have lists w unique constraints as child)
+ * @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
+ * Assume xt:s children are sorted and yang populated.
+ * The function does two different things of the children of an XML node:
+ * (1) Check min/max element constraints
+ * (2) Check unique constraints
+ *
+ * The routine uses a node traversing mechanism as the following example, where
+ * two lists [x1,..] and [x2,..] are embedded:
+ * xt: {a, b, [x1, x1, x1], d, e, f, [x2, x2, x2], g}
+ * The function does this using a single iteration and uses the fact that the
+ * xml symbols share yang symbols: ie [x1..] has yang y1 and d has yd.
+ *
+ * Unique constraints:
+ * Lists are identified, then check_unique_list is called on each list.
+ * Example, x has an associated yang list node with list of unique constraints
+ * y-list->y-unique - "a"
+ * xt->x -> ab
+ * x -> bc
+ * x -> ab
+ *
+ * Min-max constraints:
+ * Find upper and lower bound of existing lists and report violations
+ * Somewhat tricky to find violation of min-elements of empty
+ * lists, but this is done by a "gap-detection" mechanism, which detects
+ * gaps in the xml nodes given the ancestor Yang structure.
+ * But no gap analysis is done if the yang spec of the top-level xml is unknown
+ * Example:
+ * Yang structure:y1, y2, y3,
+ * XML structure: [x1, x1], [x3, x3] where [x2] list is missing
+ * @note min-element constraints on empty lists are not detected on top-level.
+ * Or more specifically, if no yang spec if associated with the top-level
+ * XML node. This may not be a large problem since it would mean empty configs
+ * are not allowed.
+ */
+static int
+check_list_unique_minmax(cxobj *xt,
+ cbuf *cbret)
+{
+ int retval = -1;
+ cxobj *x = NULL;
+ yang_stmt *y;
+ yang_stmt *yt;
+ yang_stmt *yp = NULL; /* previous in list */
+ yang_stmt *ye = NULL; /* yang each list to catch emtpy */
+ yang_stmt *ych; /* y:s parent node (if choice that ye can compare to) */
+ cxobj *xp = NULL; /* previous in list */
+ yang_stmt *yu; /* yang unique */
+ int ret;
+ int nr=0; /* Nr of list elements for min/max check */
+ enum rfc_6020 keyw;
+
+ /* RFC 7950 7.7.5: regarding min-max elements check
+ * The behavior of the constraint depends on the type of the
+ * leaf-list's or list's closest ancestor node in the schema tree
+ * that is not a non-presence container (see Section 7.5.1):
+ * o If no such ancestor exists in the schema tree, the constraint
+ * is enforced.
+ * o Otherwise, if this ancestor is a case node, the constraint is
+ * enforced if any other node from the case exists.
+ * o Otherwise, it is enforced if the ancestor node exists.
+ */
+ yt = xml_spec(xt); /* If yt == NULL, then no gap-analysis is done */
+ /* Traverse all elemenents */
+ while ((x = xml_child_each(xt, x, CX_ELMNT)) != NULL) {
+ if ((y = xml_spec(x)) == NULL)
+ continue;
+ if ((ych=yang_choice(y)) == NULL)
+ ych = y;
+ keyw = yang_keyword_get(y);
+ if (keyw != Y_LIST && keyw != Y_LEAF_LIST)
+ continue;
+ if (yp != NULL){ /* There exists a previous (leaf)list */
+ if (y == yp){ /* If same yang as previous x, then skip (eg same list) */
+ nr++;
+ continue;
+ }
+ else {
+ /* Check if the list length violates min/max */
+ if ((ret = check_min_max(xp, yp, nr, cbret)) < 0)
+ goto done;
+ if (ret == 0)
+ goto fail;
+ }
+ }
+ yp = y; /* Restart min/max count */
+ xp = x; /* Need a reference to the XML as well */
+ nr = 1;
+ /* Gap analysis: Check if there is any empty list between y and yp
+ * Note, does not detect empty choice list (too complicated)
+ */
+ if (yt != NULL && ych != ye){
+ /* Skip analysis if Yang spec is unknown OR
+ * if we are still iterating the same Y_CASE w multiple lists
+ */
+ ye = yn_each(yt, ye);
+ if (ye && ych != ye)
+ do {
+ if (yang_keyword_get(ye) == Y_LIST || yang_keyword_get(ye) == Y_LEAF_LIST){
+ /* Check if the list length violates min/max */
+ if ((ret = check_min_max(xt, ye, 0, cbret)) < 0)
+ goto done;
+ if (ret == 0)
+ goto fail;
+ }
+ ye = yn_each(yt, ye);
+ } while(ye != NULL && /* to avoid livelock (shouldnt happen) */
+ ye != ych);
+ }
+ if (keyw != Y_LIST)
+ continue;
+ /* Here only lists. test unique constraints */
+ yu = NULL;
+ while ((yu = yn_each(y, yu)) != NULL) {
+ if (yang_keyword_get(yu) != Y_UNIQUE)
+ continue;
+ /* Here is a list w unique constraints identified by:
+ * its first element x, its yang spec y, its parent xt, and
+ * a unique yang spec yu,
+ */
+ if ((ret = check_unique_list(x, xt, y, yu, cbret)) < 0)
+ goto done;
+ if (ret == 0)
+ goto fail;
+ }
+ }
+ /* yp if set, is a list that has been traversed
+ * This check is made in the loop as well - this is for the last list
+ */
+ if (yp){
+ /* Check if the list length violates min/max */
+ if ((ret = check_min_max(xp, yp, nr, cbret)) < 0)
+ goto done;
+ if (ret == 0)
+ goto fail;
+ }
+ /* Check if there is any empty list between after last non-empty list
+ * Note, does not detect empty lists within choice/case (too complicated)
+ */
+ if ((ye = yn_each(yt, ye)) != NULL)
+ do {
+ if (yang_keyword_get(ye) == Y_LIST || yang_keyword_get(ye) == Y_LEAF_LIST){
+ /* Check if the list length violates min/max */
+ if ((ret = check_min_max(xt, ye, 0, cbret)) < 0)
+ goto done;
+ if (ret == 0)
+ goto fail;
+ }
+ } while((ye = yn_each(yt, ye)) != NULL);
+ 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.
@@ -850,9 +1188,9 @@ xml_yang_validate_all(cxobj *xt,
goto done;
goto fail;
}
- if (ys != NULL && yang_config(ys) != 0){
+ if (yang_config(ys) != 0){
/* Node-specific validation */
- switch (ys->ys_keyword){
+ switch (yang_keyword_get(ys)){
case Y_ANYXML:
case Y_ANYDATA:
goto ok;
@@ -872,33 +1210,6 @@ xml_yang_validate_all(cxobj *xt,
if (validate_identityref(xt, ys, yc, cbret) < 0)
goto done;
}
- }
- if ((yc = yang_find(ys, Y_MIN_ELEMENTS, NULL)) != NULL){
- /* The behavior of the constraint depends on the type of the
- * leaf-list's or list's closest ancestor node in the schema tree
- * that is not a non-presence container (see Section 7.5.1):
- * o If no such ancestor exists in the schema tree, the constraint
- * is enforced.
- * o Otherwise, if this ancestor is a case node, the constraint is
- * enforced if any other node from the case exists.
- * o Otherwise, it is enforced if the ancestor node exists.
- */
-#if 0
- cxobj *xp;
- cxobj *x;
- int i;
-
- if ((xp = xml_parent(xt)) != NULL){
- nr = atoi(yc->ys_argument);
- x = NULL;
- i = 0;
- while ((x = xml_child_each(xt, x, CX_ELMNT)) != NULL)
- i++;
- }
-#endif
- }
- if ((yc = yang_find(ys, Y_MAX_ELEMENTS, NULL)) != NULL){
-
}
break;
default:
@@ -941,6 +1252,14 @@ xml_yang_validate_all(cxobj *xt,
if (ret == 0)
goto fail;
}
+ /* Check unique and min-max after choice test for example*/
+ if (yang_config(ys) != 0){
+ /* Checks if next level contains any unique list constraints */
+ if ((ret = check_list_unique_minmax(xt, cbret)) < 0)
+ goto done;
+ if (ret == 0)
+ goto fail;
+ }
ok:
retval = 1;
done:
@@ -961,12 +1280,14 @@ xml_yang_validate_all_top(cxobj *xt,
{
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;
}
+ if ((ret = check_list_unique_minmax(xt, cbret)) < 1)
+ return ret;
return 1;
}
diff --git a/lib/src/clixon_xml_sort.c b/lib/src/clixon_xml_sort.c
index fb063250..e3cef110 100644
--- a/lib/src/clixon_xml_sort.c
+++ b/lib/src/clixon_xml_sort.c
@@ -416,11 +416,9 @@ xml_search1(cxobj *xp,
cmp = yangi-yang_order(y);
/* Here is right yang order == same yang? */
if (cmp == 0){
- if (userorder){
+ cmp = xml_cmp(x1, xc, 0);
+ if (cmp && userorder) /* Ordered by user (if not equal) */
return xml_search_userorder(xp, x1, y, yangi, mid);
- }
- else /* Ordered by system */
- cmp = xml_cmp(x1, xc, 0);
}
if (cmp == 0)
return xc;
diff --git a/lib/src/clixon_yang.c b/lib/src/clixon_yang.c
index 525fc51b..07e5eea4 100644
--- a/lib/src/clixon_yang.c
+++ b/lib/src/clixon_yang.c
@@ -759,12 +759,12 @@ yang_choice(yang_stmt *y)
yang_stmt *yp;
if ((yp = y->ys_parent) != NULL){
- switch (yp->ys_keyword){
+ switch (yang_keyword_get(yp)){
case Y_CHOICE:
return yp;
break;
case Y_CASE:
- return yp->ys_parent;
+ return yang_parent_get(yp);
break;
default:
break;
@@ -773,31 +773,57 @@ yang_choice(yang_stmt *y)
return NULL;
}
+/*! Find matching y in yp:s children, "yang order" of y when y is choice
+ * @param[in] yp Choice node
+ * @param[in] y Yang datanode to find
+ * @param[out] index Index of y in yp:s list of children
+ * @retval 0 not found (must be datanode)
+ * @retval 1 found
+ * @see order1 the main function
+ * There are two distinct cases, either (1) the choice has case statements, or
+ * (2) it uses shortcut mode without case statements.
+ * In (1) we need to count how many sub-statements and keep a max
+ * In (2) we increment with only 1.
+ */
static int
order1_choice(yang_stmt *yp,
- yang_stmt *y)
+ yang_stmt *y,
+ int *index)
{
yang_stmt *ys;
yang_stmt *yc;
int i;
int j;
+ int shortcut=0;
+ int max=0;
- for (i=0; iys_len; i++){
+ for (i=0; iys_len; i++){ /* Loop through choice */
ys = yp->ys_stmt[i];
- if (ys->ys_keyword == Y_CASE){
+ if (ys->ys_keyword == Y_CASE){ /* Loop through case */
for (j=0; jys_len; j++){
yc = ys->ys_stmt[j];
- if (yang_datanode(yc) && yc == y)
+ if (yang_datanode(yc) && yc == y){
+ *index += j;
return 1;
+ }
}
+ if (j>max)
+ max = j;
+ }
+ else {
+ shortcut = 1; /* Shortcut, no case */
+ if (yang_datanode(ys) && ys == y)
+ return 1;
}
- else if (yang_datanode(ys) && ys == y)
- return 1;
}
+ if (shortcut)
+ (*index)++;
+ else
+ *index += max;
return 0;
}
-/*! Find matching y in yp:s children, return 0 and index or -1 if not found.
+/*! Find matching y in yp:s children, return "yang order" of y or -1 if not found
* @param[in] yp Parent
* @param[in] y Yang datanode to find
* @param[out] index Index of y in yp:s list of children
@@ -815,7 +841,7 @@ order1(yang_stmt *yp,
for (i=0; iys_len; i++){
ys = yp->ys_stmt[i];
if (ys->ys_keyword == Y_CHOICE){
- if (order1_choice(ys, y) == 1) /* If one of the choices is "y" */
+ if (order1_choice(ys, y, index) == 1) /* If one of the choices is "y" */
return 1;
}
else {
@@ -823,8 +849,8 @@ order1(yang_stmt *yp,
continue;
if (ys==y)
return 1;
+ (*index)++;
}
- (*index)++;
}
return 0;
}
@@ -848,7 +874,7 @@ yang_order(yang_stmt *y)
if (y == NULL)
return -1;
- /* Some special handling if yp is choice (or case) and maybe union?
+ /* Some special handling if yp is choice (or case)
* if so, the real parent (from an xml point of view) is the parents
* parent.
*/
@@ -1213,7 +1239,6 @@ yang_print_cbuf(cbuf *cb,
return 0;
}
-
/*! Populate yang leafs after parsing. Create cv and fill it in.
*
* Populate leaf in 2nd round of yang parsing, now that context is complete:
@@ -1308,7 +1333,8 @@ ys_populate_list(yang_stmt *ys,
if ((ykey = yang_find(ys, Y_KEY, NULL)) == NULL)
return 0;
- cvec_free(ys->ys_cvec);
+ if (ys->ys_cvec)
+ cvec_free(ys->ys_cvec);
if ((ys->ys_cvec = yang_arg2cvec(ykey, " ")) == NULL)
return -1;
return 0;
@@ -1681,6 +1707,18 @@ ys_populate_feature(clicon_handle h,
return retval;
}
+/*! Populate the unique statement with a cvec
+ */
+static int
+ys_populate_unique(yang_stmt *ys)
+{
+ if (ys->ys_cvec)
+ cvec_free(ys->ys_cvec);
+ if ((ys->ys_cvec = yang_arg2cvec(ys, " ")) == NULL)
+ return -1;
+ return 0;
+}
+
/*! Populate unknown node with extension
*/
static int
@@ -1770,6 +1808,10 @@ ys_populate(yang_stmt *ys,
if (ys_populate_identity(ys, NULL) < 0)
goto done;
break;
+ case Y_UNIQUE:
+ if (ys_populate_unique(ys) < 0)
+ goto done;
+ break;
case Y_UNKNOWN:
if (ys_populate_unknown(ys) < 0)
goto done;
@@ -3202,7 +3244,9 @@ ys_parse(yang_stmt *ys,
*
* The cv:s created in parse-tree as follows:
* fraction-digits : Create cv as uint8, check limits [1:8] (must be made in 1st pass)
- *
+ * revision: cv as uint32 date: Integer version as YYYYMMDD
+ * min-elements: cv as uint32
+ * max-elements: cv as uint32, '0' means unbounded
* @see ys_populate
*/
int
@@ -3212,8 +3256,15 @@ ys_parse_sub(yang_stmt *ys,
int retval = -1;
uint8_t fd;
uint32_t date = 0;
-
- switch (ys->ys_keyword){
+ char *arg;
+ enum rfc_6020 keyword;
+ char *reason = NULL;
+ int ret;
+ uint32_t minmax;
+
+ arg = yang_argument_get(ys);
+ keyword = yang_keyword_get(ys);
+ switch (keyword){
case Y_FRACTION_DIGITS:
if (ys_parse(ys, CGV_UINT8) == NULL)
goto done;
@@ -3225,7 +3276,7 @@ ys_parse_sub(yang_stmt *ys,
break;
case Y_REVISION:
case Y_REVISION_DATE: /* YYYY-MM-DD encoded as uint32 YYYYMMDD */
- if (ys_parse_date_arg(ys->ys_argument, &date) < 0)
+ if (ys_parse_date_arg(arg, &date) < 0)
goto done;
if ((ys->ys_cv = cv_new(CGV_UINT32)) == NULL){
clicon_err(OE_YANG, errno, "cv_new");
@@ -3234,14 +3285,37 @@ ys_parse_sub(yang_stmt *ys,
cv_uint32_set(ys->ys_cv, date);
break;
case Y_STATUS: /* RFC7950 7.21.2: "current", "deprecated", or "obsolete". */
- if (strcmp(ys->ys_argument, "current") &&
- strcmp(ys->ys_argument, "deprecated") &&
- strcmp(ys->ys_argument, "obsolete")){
- clicon_err(OE_YANG, errno, "Invalid status: \"%s\", expected current, deprecated, or obsolete", ys->ys_argument);
+ if (strcmp(arg, "current") &&
+ strcmp(arg, "deprecated") &&
+ strcmp(arg, "obsolete")){
+ clicon_err(OE_YANG, errno, "Invalid status: \"%s\", expected current, deprecated, or obsolete", arg);
goto done;
}
break;
+ case Y_MAX_ELEMENTS:
+ case Y_MIN_ELEMENTS:
+ if ((ys->ys_cv = cv_new(CGV_UINT32)) == NULL){
+ clicon_err(OE_YANG, errno, "cv_new");
+ goto done;
+ }
+ if (keyword == Y_MAX_ELEMENTS &&
+ strcmp(arg, "unbounded") == 0)
+ cv_uint32_set(ys->ys_cv, 0); /* 0 means unbounded for max */
+ else{
+ if ((ret = parse_uint32(arg, &minmax, &reason)) < 0){
+ clicon_err(OE_YANG, errno, "parse_uint32");
+ goto done;
+ }
+ if (ret == 0){
+ clicon_err(OE_YANG, EINVAL, "element-min/max parse error: %s", reason);
+ if (reason)
+ free(reason);
+ goto done;
+ }
+ cv_uint32_set(ys->ys_cv, minmax);
+ }
+ break;
case Y_UNKNOWN: /* XXX This code assumes ymod already loaded
but it may not be */
if (extra == NULL)
@@ -3273,8 +3347,7 @@ int
yang_mandatory(yang_stmt *ys)
{
yang_stmt *ym;
- char *reason = NULL;
- uint8_t min_elements; /* XXX change to 32 (need new cligen version) */
+ cg_var *cv;
/* 1) A leaf, choice, anydata, or anyxml node with a "mandatory"
* statement with the value "true". */
@@ -3289,12 +3362,8 @@ yang_mandatory(yang_stmt *ys)
* value greater than zero. */
else if (ys->ys_keyword == Y_LIST || ys->ys_keyword == Y_LEAF_LIST){
if ((ym = yang_find(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;
+ cv = yang_cv_get(ym);
+ return cv_uint32_get(cv) > 0;
}
}
/* 3) A container node without a "presence" statement and that has at
diff --git a/lib/src/clixon_yang_module.c b/lib/src/clixon_yang_module.c
index 96593246..d9303061 100644
--- a/lib/src/clixon_yang_module.c
+++ b/lib/src/clixon_yang_module.c
@@ -255,8 +255,8 @@ yms_build(clicon_handle h,
* @param[in] brief Just name, revision and uri (no cache)
* @param[in,out] xret Existing XML tree, merge x into this
* @retval -1 Error (fatal)
- * @retval 0 OK
- * @retval 1 Statedata callback failed
+ * @retval 0 Statedata callback failed
+ * @retval 1 OK
* @notes NYI: schema, deviation
x +--ro modules-state
x +--ro module-set-id string
@@ -288,6 +288,7 @@ yang_modules_state_get(clicon_handle h,
char *msid; /* modules-set-id */
cxobj *x1;
cbuf *cb = NULL;
+ int ret;
msid = clicon_option_str(h, "CLICON_MODULE_SET_ID");
if ((x = clicon_modst_cache_get(h, brief)) != NULL){
@@ -313,8 +314,7 @@ yang_modules_state_get(clicon_handle h,
if (xml_parse_string(cbuf_get(cb), yspec, &x) < 0){
if (netconf_operation_failed_xml(xret, "protocol", clicon_err_reason)< 0)
goto done;
- retval = 1;
- goto done;
+ goto fail;
}
if (xml_rootchild(x, 0, &x) < 0)
goto done;
@@ -326,10 +326,12 @@ yang_modules_state_get(clicon_handle h,
/* Wrap x (again) with new top-level node "top" which merge wants */
if ((x = xml_wrap(x, "top")) < 0)
goto done;
- if (netconf_trymerge(x, yspec, xret) < 0)
+ if ((ret = netconf_trymerge(x, yspec, xret)) < 0)
goto done;
+ if (ret == 0)
+ goto fail;
}
- retval = 0;
+ retval = 1;
done:
clicon_debug(1, "%s %d", __FUNCTION__, retval);
if (cb)
@@ -337,6 +339,9 @@ yang_modules_state_get(clicon_handle h,
if (x)
xml_free(x);
return retval;
+ fail:
+ retval = 0;
+ goto done;
}
/*! For single module state with namespace, get revisions and send upgrade callbacks
diff --git a/test/lib.sh b/test/lib.sh
index f2a9d32c..b53fb45e 100755
--- a/test/lib.sh
+++ b/test/lib.sh
@@ -72,8 +72,8 @@ testname=
# eg logging to a file: RCLOG="-l f/www-data/restconf.log"
: ${RCLOG:=}
-# Wait after daemons (backend/restconf) start. Set to 10 if valgrind
-: ${RCWAIT:=1}
+# Wait after daemons (backend/restconf) start. See mem.sh for valgrind
+: ${RCWAIT:=2}
# Parse yangmodels from https://github.com/YangModels/yang
# Recommended: checkout yangmodels elsewhere in the tree and set the env
@@ -168,6 +168,21 @@ stop_backend(){
fi
}
+# Wait for restconf to stop sending 502 Bad Gateway
+wait_backend(){
+ reply=$(echo ' $cfg
$dir
/usr/local/share/clixon
$IETFRFC
- system
+ $fyang
/usr/local/lib/$APPNAME/clispec
/usr/local/lib/$APPNAME/cli
$APPNAME
@@ -83,11 +83,27 @@ module system{
}
}
}
+ /* Choice with multiple items */
+ choice mch {
+ case first{
+ leaf-list ma {
+ type int32;
+ }
+ leaf mb {
+ type int32;
+ }
+ }
+ case second{
+ leaf-list mc {
+ type int32;
+ }
+ }
+ }
}
}
EOF
-new "test params: -f $cfg -y $fyang"
+new "test params: -f $cfg"
if [ $BE -ne 0 ]; then
new "kill old backend"
@@ -97,55 +113,55 @@ if [ $BE -ne 0 ]; then
fi
sudo pkill clixon_backend # to be sure
- new "start backend -s init -f $cfg -y $fyang"
- start_backend -s init -f $cfg -y $fyang
+ new "start backend -s init -f $cfg"
+ start_backend -s init -f $cfg
fi
new "kill old restconf daemon"
sudo pkill -u www-data clixon_restconf
new "start restconf daemon"
-start_restconf -f $cfg -y $fyang
+start_restconf -f $cfg
new "waiting"
sleep $RCWAIT
# First vanilla (protocol) case
new "netconf validate empty"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "application bad-element udp error Element in choice statement already exists application bad-element udp error Element in choice statement already exists application bad-element udp error Element in choice statement already exists application bad-element udp error Element in choice statement already exists application data-missing missing-choice name error application data-missing missing-choice name error
+ 0
+ 1
+ 2
+
+ 0
+ 1
+
+ 0
+ 2
+ 2
+ application bad-element mc error Element in choice statement already exists $cfg
-
- $cfg
- /usr/local/share/clixon
- $IETFRFC
- $fyang
- /usr/local/lib/$APPNAME/clispec
- /usr/local/lib/$APPNAME/cli
- $APPNAME
- /usr/local/var/$APPNAME/$APPNAME.sock
- /usr/local/var/$APPNAME/$APPNAME.pidfile
- 1
- /usr/local/var/$APPNAME
-
-EOF
-
-cat < $fyang
-module $APPNAME{
- yang-version 1.1;
- namespace "urn:example:clixon";
- prefix ex;
- container c{
- presence true;
- list a0{
- key k;
- leaf k {
- type string;
- }
- min-elements 0;
- max-elements "unbounded";
- }
- list a1{
- key k;
- leaf k {
- type string;
- }
- description "There must be at least one of these";
- min-elements 1;
- max-elements 2;
- }
- leaf-list b0{
- type string;
- min-elements 0;
- max-elements "unbounded";
- }
- leaf-list b1{
- description "There must be at least one of these";
- type string;
- min-elements 1;
- max-elements 2;
- }
- }
-}
-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
- start_backend -s init -f $cfg
-
- new "waiting"
- sleep $RCWAIT
-fi
-
-new "minmax: minimal"
-expecteof "$clixon_netconf -qf $cfg" 0 'replace 0 0 replace 0 1 unbounded 0 1 0 1 unbounded 0 1 replace replace 0 replace 0 replace 0 1 2 0 replace 0 0 1 2 $cfg
+
+ $cfg
+ /usr/local/share/clixon
+ $IETFRFC
+ $fyang
+ /usr/local/lib/$APPNAME/clispec
+ /usr/local/lib/$APPNAME/cli
+ $APPNAME
+ /usr/local/var/$APPNAME/$APPNAME.sock
+ /usr/local/var/$APPNAME/$APPNAME.pidfile
+ 1
+ /usr/local/var/$APPNAME
+
+EOF
+
+cat < $fyang
+module $APPNAME{
+ yang-version 1.1;
+ namespace "urn:example:clixon";
+ prefix ex;
+ container c{
+ presence true;
+ list a0{
+ key k;
+ leaf k {
+ type string;
+ }
+ min-elements 0;
+ max-elements "unbounded";
+ }
+ list a1{
+ key k;
+ leaf k {
+ type string;
+ }
+ description "There must be at least one of these";
+ min-elements 1;
+ max-elements 2;
+ }
+ leaf-list b0{
+ type string;
+ min-elements 0;
+ max-elements "unbounded";
+ }
+ leaf-list b1{
+ description "There must be at least one of these";
+ type string;
+ min-elements 1;
+ max-elements 2;
+ }
+ }
+ container c2{
+ description "with choices";
+ choice ch1{
+ case x{
+ list a1{
+ key k;
+ leaf k {
+ type string;
+ }
+ min-elements 1;
+ max-elements 2;
+ }
+ }
+ case y{
+ list a2{
+ key k;
+ leaf k {
+ type string;
+ }
+ min-elements 0;
+ max-elements 3;
+ }
+ }
+ }
+ choice ch2{
+ leaf-list b1{
+ type string;
+ min-elements 1;
+ max-elements 2;
+ }
+ }
+ }
+ leaf-list b3{
+ description "top-level";
+ type int32;
+ min-elements 1;
+ max-elements 2;
+ }
+}
+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
+ start_backend -s init -f $cfg
+
+ new "waiting"
+ sleep $RCWAIT
+fi
+
+new "minmax: minimal"
+expecteof "$clixon_netconf -qf $cfg" 0 'replace
+ 0 0
+ replace 0 1 unbounded 0 1 0 1 unbounded 0 1 replace protocol operation-failed too-few-elements error c replace 0 protocol operation-failed too-few-elements error c replace 0 protocol operation-failed too-few-elements error c replace 0 1 2 0 protocol operation-failed too-many-elements error a1 replace 0 0 1 2 protocol operation-failed too-many-elements error b1 replace
+ 0 0
+ replace
+ 0 1 2 0
+ replace
+ 0 1 2 0
+ protocol operation-failed too-many-elements error a1 replace
+ 0
+ 1
+ replace
+ 0
+ 1
+ 2
+ protocol operation-failed too-many-elements error b3 c bar b foo a fie
+c newc
+
+b newb
+
+a newa
+ c newc b newb a newa $cfg
+
+ $cfg
+ /usr/local/share/clixon
+ $fyang
+ /usr/local/lib/$APPNAME/clispec
+ /usr/local/lib/$APPNAME/cli
+ $APPNAME
+ /usr/local/var/$APPNAME/$APPNAME.sock
+ /usr/local/var/$APPNAME/$APPNAME.pidfile
+ 1
+ /usr/local/var/$APPNAME
+
+EOF
+
+# Example (the list server part) from RFC7950 Sec 7.8.3.1 w changed types
+cat < $fyang
+module unique{
+ yang-version 1.1;
+ namespace "urn:example:clixon";
+ prefix un;
+ container c{
+ leaf a{
+ type string;
+ }
+ list server {
+ description "RFC7950 7.8.3.1";
+ key "name";
+ unique "ip port";
+ leaf name {
+ type string;
+ }
+ leaf ip {
+ type string;
+ }
+ leaf port {
+ type uint16;
+ }
+ }
+ list other {
+ description "random inserted data";
+ key a;
+ leaf a{
+ type string;
+ }
+ }
+ list single {
+ description "similar with just a single unique field";
+ key "name";
+ unique "ip";
+ leaf name {
+ type string;
+ }
+ leaf ip {
+ type string;
+ }
+ }
+ leaf b{
+ 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
+ start_backend -s init -f $cfg
+
+ new "waiting"
+ sleep $RCWAIT
+fi
+
+# RFC test two-field caes
+new "Add not valid example"
+expecteof "$clixon_netconf -qf $cfg" 0 'replace
+ smtp
+ 192.0.2.1
+ 25
+
+
+ http
+ 192.0.2.1
+ 25
+
+protocol operation-failed data-not-unique error 192.0.2.1 25 replace
+ smtp
+ 192.0.2.1
+ 25
+
+
+ http
+ 192.0.2.1
+
+
+ ftp
+ 192.0.2.1
+
+none ftp 25 protocol operation-failed data-not-unique error 192.0.2.1 25 none smtp 25 replace
+ smtp
+ 192.0.2.1
+
+
+ http
+ 192.0.2.1
+
+protocol operation-failed data-not-unique error 192.0.2.1 none http 178.23.34.1 replace
+ other
+
+ smtp
+ 192.0.2.1
+
+ other
+
+ smtp
+ 192.0.2.1
+ 25
+
+
+ http
+ 192.0.2.1
+
+ xx
+ http
+ 192.0.2.1
+ 25
+
+ protocol operation-failed data-not-unique error 192.0.2.1 25