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

Changed cl:ignore-compare to also include core diff algorithm

Browse source
This commit is contained in:
Olof hagsand 2024-02-09 16:18:47 +01:00
parent 4ee6b48abe
commit 6ff1588397
4 changed files with 127 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

96
lib/src/clixon_text_syntax.c
View file

@ -694,68 +694,66 @@ text_diff2cbuf(cbuf *cb,
x0c = x1c = NULL; x0c = x1c = NULL;
x0c = xml_child_each(x0, x0c, CX_ELMNT); x0c = xml_child_each(x0, x0c, CX_ELMNT);
x1c = xml_child_each(x1, x1c, CX_ELMNT); x1c = xml_child_each(x1, x1c, CX_ELMNT);
for (;;){ for (;;) {
/* Check if one or both subtrees are NULL */ /* Check if one or both subtrees are NULL */
if (x0c == NULL && x1c == NULL) if (x0c == NULL && x1c == NULL)
goto ok; goto ok;
else { y0c = NULL;
y0c = NULL; y1c = NULL;
y1c = NULL; /* If cl:ignore-compare extension, skip */
/* If cl:ignore-compare extension, skip */ if (x0c && (y0c = xml_spec(x0c)) != NULL){
if (x0c && (y0c = xml_spec(x0c)) != NULL){ if (yang_extension_value(y0c, "ignore-compare", CLIXON_LIB_NS, &extflag, NULL) < 0)
if (yang_extension_value(y0c, "ignore-compare", CLIXON_LIB_NS, &extflag, NULL) < 0) goto done;
goto done; if (extflag){ /* skip */
if (extflag){ /* skip */
x0c = xml_child_each(x0, x0c, CX_ELMNT);
continue;
}
}
if (x1c && (y1c = xml_spec(x1c)) != NULL){
if (yang_extension_value(y1c, "ignore-compare", CLIXON_LIB_NS, &extflag, NULL) < 0)
goto done;
if (extflag){ /* skip */
x1c = xml_child_each(x1, x1c, CX_ELMNT);
continue;
}
}
if (x0c == NULL){
if (nr==0 && skiptop==0){
cprintf(cb, "%*s", level1, "");
if (prefix)
cprintf(cb, "%s:", prefix);
cprintf(cb, "%s", xml_name(x1));
text_diff_keys(cb, x1, y0);
cprintf(cb, " {\n");
nr++;
}
if (text2cbuf(cb, x1c, level+1, "+", 0, &leafl, &leaflname) < 0)
goto done;
x1c = xml_child_each(x1, x1c, CX_ELMNT);
continue;
}
else if (x1c == NULL){
if (nr==0 && skiptop==0){
cprintf(cb, "%*s", level1, "");
if (prefix)
cprintf(cb, "%s:", prefix);
cprintf(cb, "%s", xml_name(x0));
text_diff_keys(cb, x0, y0);
cprintf(cb, "{\n");
nr++;
}
if (text2cbuf(cb, x0c, level+1, "-", 0, &leafl, &leaflname) < 0)
goto done;
x0c = xml_child_each(x0, x0c, CX_ELMNT); x0c = xml_child_each(x0, x0c, CX_ELMNT);
continue; continue;
} }
} }
if (x1c && (y1c = xml_spec(x1c)) != NULL){
if (yang_extension_value(y1c, "ignore-compare", CLIXON_LIB_NS, &extflag, NULL) < 0)
goto done;
if (extflag){ /* skip */
x1c = xml_child_each(x1, x1c, CX_ELMNT);
continue;
}
}
if (x0c == NULL){
if (nr==0 && skiptop==0){
cprintf(cb, "%*s", level1, "");
if (prefix)
cprintf(cb, "%s:", prefix);
cprintf(cb, "%s", xml_name(x1));
text_diff_keys(cb, x1, y0);
cprintf(cb, " {\n");
nr++;
}
if (text2cbuf(cb, x1c, level+1, "+", 0, &leafl, &leaflname) < 0)
goto done;
x1c = xml_child_each(x1, x1c, CX_ELMNT);
continue;
}
else if (x1c == NULL){
if (nr==0 && skiptop==0){
cprintf(cb, "%*s", level1, "");
if (prefix)
cprintf(cb, "%s:", prefix);
cprintf(cb, "%s", xml_name(x0));
text_diff_keys(cb, x0, y0);
cprintf(cb, "{\n");
nr++;
}
if (text2cbuf(cb, x0c, level+1, "-", 0, &leafl, &leaflname) < 0)
goto done;
x0c = xml_child_each(x0, x0c, CX_ELMNT);
continue;
}
/* Both x0c and x1c exists, check if they are yang-equal. */ /* Both x0c and x1c exists, check if they are yang-equal. */
eq = xml_cmp(x0c, x1c, 0, 0, NULL); eq = xml_cmp(x0c, x1c, 0, 0, NULL);
b0 = xml_body(x0c); b0 = xml_body(x0c);
b1 = xml_body(x1c); b1 = xml_body(x1c);
if (eq && y0c && y1c && y0c == y1c && yang_find(y0c, Y_ORDERED_BY, "user")){ if (eq && y0c && y1c && y0c == y1c && yang_find(y0c, Y_ORDERED_BY, "user")){
if (text_diff2cbuf_ordered_by_user(cb, x0, x1, x0c, x1c, y0c, if (text_diff2cbuf_ordered_by_user(cb, x0, x1, x0c, x1c, y0c,
level, skiptop) < 0) level, skiptop) < 0)
goto done; goto done;
/* Add all in x0 marked as DELETE in x0vec /* Add all in x0 marked as DELETE in x0vec
* Flags can remain: XXX should apply to all * Flags can remain: XXX should apply to all

78
lib/src/clixon_xml_io.c
View file

@ -1379,50 +1379,48 @@ xml_diff2cbuf(cbuf *cb,
for (;;){ for (;;){
if (x0c == NULL && x1c == NULL) if (x0c == NULL && x1c == NULL)
goto ok; goto ok;
else { y0c = NULL;
y0c = NULL; y1c = NULL;
y1c = NULL; /* If cl:ignore-compare extension, skip */
/* If cl:ignore-compare extension, skip */ if (x0c && (y0c = xml_spec(x0c)) != NULL){
if (x0c && (y0c = xml_spec(x0c)) != NULL){ if (yang_extension_value(y0c, "ignore-compare", CLIXON_LIB_NS, &extflag, NULL) < 0)
if (yang_extension_value(y0c, "ignore-compare", CLIXON_LIB_NS, &extflag, NULL) < 0) goto done;
goto done; if (extflag){ /* skip */
if (extflag){ /* skip */
x0c = xml_child_each(x0, x0c, CX_ELMNT);
continue;
}
}
if (x1c && (y1c = xml_spec(x1c)) != NULL){
if (yang_extension_value(y1c, "ignore-compare", CLIXON_LIB_NS, &extflag, NULL) < 0)
goto done;
if (extflag){ /* skip */
x1c = xml_child_each(x1, x1c, CX_ELMNT);
continue;
}
}
if (x0c == NULL){
/* Check if one or both subtrees are NULL */
if (nr==0 && skiptop==0){
xml_diff_context(cb, x1, level1);
xml_diff_keys(cb, x1, y0, (level+1)*PRETTYPRINT_INDENT);
nr++;
}
if (clixon_xml2cbuf(cb, x1c, level+1, 1, "+", -1, 0) < 0)
goto done;
x1c = xml_child_each(x1, x1c, CX_ELMNT);
continue;
}
else if (x1c == NULL){
if (nr==0 && skiptop==0){
xml_diff_context(cb, x0, level1);
xml_diff_keys(cb, x0, y0, (level+1)*PRETTYPRINT_INDENT);
nr++;
}
if (clixon_xml2cbuf(cb, x0c, level+1, 1, "-", -1, 0) < 0)
goto done;
x0c = xml_child_each(x0, x0c, CX_ELMNT); x0c = xml_child_each(x0, x0c, CX_ELMNT);
continue; continue;
} }
} }
if (x1c && (y1c = xml_spec(x1c)) != NULL){
if (yang_extension_value(y1c, "ignore-compare", CLIXON_LIB_NS, &extflag, NULL) < 0)
goto done;
if (extflag){ /* skip */
x1c = xml_child_each(x1, x1c, CX_ELMNT);
continue;
}
}
if (x0c == NULL){
/* Check if one or both subtrees are NULL */
if (nr==0 && skiptop==0){
xml_diff_context(cb, x1, level1);
xml_diff_keys(cb, x1, y0, (level+1)*PRETTYPRINT_INDENT);
nr++;
}
if (clixon_xml2cbuf(cb, x1c, level+1, 1, "+", -1, 0) < 0)
goto done;
x1c = xml_child_each(x1, x1c, CX_ELMNT);
continue;
}
else if (x1c == NULL){
if (nr==0 && skiptop==0){
xml_diff_context(cb, x0, level1);
xml_diff_keys(cb, x0, y0, (level+1)*PRETTYPRINT_INDENT);
nr++;
}
if (clixon_xml2cbuf(cb, x0c, level+1, 1, "-", -1, 0) < 0)
goto done;
x0c = xml_child_each(x0, x0c, CX_ELMNT);
continue;
}
/* Both x0c and x1c exists, check if yang equal */ /* Both x0c and x1c exists, check if yang equal */
eq = xml_cmp(x0c, x1c, 0, 0, NULL); eq = xml_cmp(x0c, x1c, 0, 0, NULL);
b0 = xml_body(x0c); b0 = xml_body(x0c);

51
lib/src/clixon_xml_map.c
View file

@ -373,8 +373,9 @@ xml_diff_ordered_by_user(cxobj *x0,
* (*) "comparing" a&b here is made by xml_cmp() which judges equality from a structural * (*) "comparing" a&b here is made by xml_cmp() which judges equality from a structural
* perspective, ie both have the same yang spec, if they are lists, they have the * perspective, ie both have the same yang spec, if they are lists, they have the
* the same keys. NOT that the values are equal! * the same keys. NOT that the values are equal!
* @see xml_diff API function, this one is internal and recursive
* @see xml_diff2cbuf, clixon_text_diff2cbuf for +/- diff for XML and TEXT formats * @see xml_diff2cbuf, clixon_text_diff2cbuf for +/- diff for XML and TEXT formats
* @see text_diff2cbuf for curly
* @see xml_tree_equal Equal or not
* @note reordering in ordered-by user is NOT supported * @note reordering in ordered-by user is NOT supported
*/ */
static int static int
@ -391,13 +392,14 @@ xml_diff1(cxobj *x0,
int retval = -1; int retval = -1;
cxobj *x0c = NULL; /* x0 child */ cxobj *x0c = NULL; /* x0 child */
cxobj *x1c = NULL; /* x1 child */ cxobj *x1c = NULL; /* x1 child */
yang_stmt *yc0; yang_stmt *y0c;
yang_stmt *yc1; yang_stmt *y1c;
char *b0; char *b0;
char *b1; char *b1;
int eq; int eq;
cxobj *xi; cxobj *xi;
cxobj *xj; cxobj *xj;
int extflag;
/* Traverse x0 and x1 in lock-step */ /* Traverse x0 and x1 in lock-step */
x0c = x1c = NULL; x0c = x1c = NULL;
@ -406,7 +408,32 @@ xml_diff1(cxobj *x0,
for (;;){ for (;;){
if (x0c == NULL && x1c == NULL) if (x0c == NULL && x1c == NULL)
goto ok; goto ok;
else if (x0c == NULL){ /* If cl:ignore-compare extension, return equal */
if (x0c && (y0c = xml_spec(x0c)) != NULL){
if (yang_extension_value(y0c, "ignore-compare", CLIXON_LIB_NS, &extflag, NULL) < 0)
goto done;
if (extflag){ /* skip */
if (x1c) {
x0c = xml_child_each(x0, x0c, CX_ELMNT);
continue;
}
else
goto ok;
}
}
if (x1c && (y1c = xml_spec(x1c)) != NULL){
if (yang_extension_value(y1c, "ignore-compare", CLIXON_LIB_NS, &extflag, NULL) < 0)
goto done;
if (extflag){ /* skip */
if (x1c) {
x1c = xml_child_each(x1, x1c, CX_ELMNT);
continue;
}
else
goto ok;
}
}
if (x0c == NULL){
if (cxvec_append(x1c, x1vec, x1veclen) < 0) if (cxvec_append(x1c, x1vec, x1veclen) < 0)
goto done; goto done;
x1c = xml_child_each(x1, x1c, CX_ELMNT); x1c = xml_child_each(x1, x1c, CX_ELMNT);
@ -420,11 +447,9 @@ xml_diff1(cxobj *x0,
} }
/* Both x0c and x1c exists, check if they are yang-equal. */ /* Both x0c and x1c exists, check if they are yang-equal. */
eq = xml_cmp(x0c, x1c, 0, 0, NULL); eq = xml_cmp(x0c, x1c, 0, 0, NULL);
yc0 = xml_spec(x0c);
yc1 = xml_spec(x1c);
/* override ordered-by user with special look-ahead checks */ /* override ordered-by user with special look-ahead checks */
if (eq && yc0 && yc1 && yc0 == yc1 && yang_find(yc0, Y_ORDERED_BY, "user")){ if (eq && y0c && y1c && y0c == y1c && yang_find(y0c, Y_ORDERED_BY, "user")){
if (xml_diff_ordered_by_user(x0, x1, x0c, x1c, yc0, if (xml_diff_ordered_by_user(x0, x1, x0c, x1c, y0c,
x0vec, x0veclen, x1vec, x1veclen, x0vec, x0veclen, x1vec, x1veclen,
changed_x0, changed_x1, changedlen) < 0) changed_x0, changed_x1, changedlen) < 0)
goto done; goto done;
@ -439,7 +464,7 @@ xml_diff1(cxobj *x0,
} }
} }
while ((xi = xml_child_each(x0, xi, CX_ELMNT)) != NULL && while ((xi = xml_child_each(x0, xi, CX_ELMNT)) != NULL &&
xml_spec(xi) == yc0); xml_spec(xi) == y0c);
x0c = xi; x0c = xi;
/* Add all in x1 marked as ADD in x1vec */ /* Add all in x1 marked as ADD in x1vec */
@ -450,7 +475,7 @@ xml_diff1(cxobj *x0,
goto done; goto done;
} }
while ((xj = xml_child_each(x1, xj, CX_ELMNT)) != NULL && while ((xj = xml_child_each(x1, xj, CX_ELMNT)) != NULL &&
xml_spec(xj) == yc1); xml_spec(xj) == y1c);
x1c = xj; x1c = xj;
continue; continue;
} }
@ -470,13 +495,13 @@ xml_diff1(cxobj *x0,
/* xml-spec NULL could happen with anydata children for example, /* xml-spec NULL could happen with anydata children for example,
* if so, continute compare children but without yang * if so, continute compare children but without yang
*/ */
if (yc0 && yc1 && yc0 != yc1){ /* choice */ if (y0c && y1c && y0c != y1c){ /* choice */
if (cxvec_append(x0c, x0vec, x0veclen) < 0) if (cxvec_append(x0c, x0vec, x0veclen) < 0)
goto done; goto done;
if (cxvec_append(x1c, x1vec, x1veclen) < 0) if (cxvec_append(x1c, x1vec, x1veclen) < 0)
goto done; goto done;
} }
else if (yc0 && yang_keyword_get(yc0) == Y_LEAF){ else if (y0c && yang_keyword_get(y0c) == Y_LEAF){
/* if x0c and x1c are leafs w bodies, then they may be changed */ /* if x0c and x1c are leafs w bodies, then they may be changed */
b0 = xml_body(x0c); b0 = xml_body(x0c);
b1 = xml_body(x1c); b1 = xml_body(x1c);
@ -594,6 +619,8 @@ xml_tree_equal(cxobj *x0,
for (;;){ for (;;){
if (x0c == NULL && x1c == NULL) if (x0c == NULL && x1c == NULL)
goto ok; goto ok;
y0c = NULL;
y1c = NULL;
/* If cl:ignore-compare extension, return equal */ /* If cl:ignore-compare extension, return equal */
if (x0c && (y0c = xml_spec(x0c)) != NULL){ if (x0c && (y0c = xml_spec(x0c)) != NULL){
if (yang_extension_value(y0c, "ignore-compare", CLIXON_LIB_NS, &extflag, NULL) < 0) if (yang_extension_value(y0c, "ignore-compare", CLIXON_LIB_NS, &extflag, NULL) < 0)

5
yang/clixon/clixon-lib@2024-01-01.yang
View file

@ -202,8 +202,9 @@ module clixon-lib {
extension ignore-compare { extension ignore-compare {
description description
"The object should be ignored when comparing device configs for equality. "The object should be ignored when comparing device configs for equality.
One example is auto-created objects by the server, such as uid. The object should never be added, modified, or deleted on target.
Another example is a plain-text password is changed to an encrypted by the server."; Essentially a read-only object
One example is auto-created objects by the , such as uid.";
} }
md:annotation creator { md:annotation creator {
type string; type string;