Fixed: [Multiple deviations to same grouping when CLICON_YANG_USE_ORIGINAL doesnt work](#629)

Author: olofhagsand

CHANGELOG.md

@@ -75,6 +75,7 @@ Developers may need to change their code
 
 ### Corrected Bugs
 
+* Fixed: [Multiple deviations to same grouping when CLICON_YANG_USE_ORIGINAL doesnt work](https://github.com/clicon/clixon/issues/629)
 * Fixed: [YANG identityref from uses/grouping from separate module does not work](https://github.com/clicon/clixon/issues/628)
 * Fixed: YANG error-app-tag identifies as error-message causing false duplicate
 * Fixed: YANG error-app-tag not in range and length as it should

lib/src/clixon_yang.c

@@ -1531,6 +1531,8 @@ yn_iter(yang_stmt *yparent,
  * Special case: look in imported INPUTs as well (for (sub)modules.
  * This could need an optimized lookup, especially the INPUT case.
  * Most common use for the special case, ie in openconfig, is grouping and identity
+ * Note also in the case of the use-orig optimization that uses the child of
+ * the original if that exists rather than the actual child.
  * @param[in]  yn         Yang node, current context node.
  * @param[in]  keyword    if 0 match any keyword. Actual type: enum rfc_6020
  * @param[in]  argument   String compare w argument. if NULL, match any.
@@ -1556,13 +1558,6 @@ yang_find(yang_stmt  *yn,
     if (yang_flag_get(yn, YANG_FLAG_FIND) != 0x0)
         return NULL;
     yang_flag_set(yn, YANG_FLAG_FIND);
-    if (_yang_use_orig &&
-        (yorig = yang_orig_get(yn)) != NULL &&
-        uses_orig_ptr(keyword)){
-        yret = yang_find(yorig, keyword, argument);
-        yang_flag_reset(yn, YANG_FLAG_FIND);
-        return yret;
-    }
     for (i=0; i<yn->ys_len; i++){
         ys = yn->ys_stmt[i];
         if (keyword == 0 || ys->ys_keyword == keyword){
@@ -1572,7 +1567,6 @@ yang_find(yang_stmt  *yn,
                 break;
             }
         }
-#if 1
         /* Special case: if not match and yang node is module or submodule, extend
          * search to include submodules 
          * It would be nice to get rid of this special case, and then also remove
@@ -1589,7 +1583,18 @@ yang_find(yang_stmt  *yn,
                 yretsub = yang_find(ym, keyword, argument);
             }
         }
-#endif
+    }
+
+    if (yret != NULL && yang_flag_get(yret, YANG_FLAG_REFINE))
+        ;
+    else {
+        if (_yang_use_orig &&
+            (yorig = yang_orig_get(yn)) != NULL &&
+            uses_orig_ptr(keyword)){
+            yret = yang_find(yorig, keyword, argument);
+            yang_flag_reset(yn, YANG_FLAG_FIND);
+            return yret;
+        }
     }
     yang_flag_reset(yn, YANG_FLAG_FIND);
     return yret?yret:yretsub;
@@ -2732,7 +2737,9 @@ yang_deviation(yang_stmt *ys,
                     }
                     break;
                 }
-                if (ytc){
+                if (_yang_use_orig && yang_orig_get(ytarget) != NULL)
+                    ;
+                else {
                     /* Remove old */
                     if (ys_prune_self(ytc) < 0)
                         goto done;

test/test_yang_deviation.sh

@@ -64,10 +64,14 @@ module example-base{
             leaf my {
                 /* deviate replaces with int and default -42 */
                 type uint16;
+                mandatory false;
             }
         }
     }
     uses system-top;
+    container again {
+       uses system-top;
+    }
 }
 EOF
 
@@ -95,7 +99,7 @@ function testrun()
         start_backend -s init -f "$cfg"
     fi
 
-    new "wait backend"
+    new "wait backend 1"
     wait_backend
 
     new "Add user bob"
@@ -280,7 +284,7 @@ if [ "$BE" -ne 0 ]; then
     start_backend -s init -f "$cfg"
 fi
 
-new "wait backend"
+new "wait backend 2"
 wait_backend
 
 new "show default value, expect deviated"
@@ -340,7 +344,7 @@ if [ "$BE" -ne 0 ]; then
     start_backend -s init -f "$cfg"
 fi
 
-new "wait backend"
+new "wait backend 3"
 wait_backend
 
 new "set negative value"
@@ -355,6 +359,56 @@ expecteof_netconf "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO" "<rpc $DEFAULTNS>
 new "netconf validate expect fail"
 expecteof_netconf "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO" "<rpc $DEFAULTNS><validate><source><candidate/></source></validate></rpc>" "" "<rpc-reply $DEFAULTNS><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>my</bad-element></error-info><error-severity>error</error-severity><error-message>Number 98735 out of range: -128 - 127</error-message></rpc-error></rpc-reply>"
 
+cat <<EOF > $fyangdev
+module example-deviations{
+   yang-version 1.1;
+   prefix ed;
+   namespace "urn:example:deviations";
+   import example-base {
+         prefix base;
+   }
+   typedef mytype {
+      type int8;
+   }
+   deviation /base:system/base:my {
+      deviate replace {
+         mandatory true;
+      }
+   }
+   deviation /base:again/base:system/base:my {
+      deviate replace {
+         mandatory true;
+      }
+   }
+}
+EOF
+
+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 -o CLICON_YANG_USE_ORIGINAL=true"
+    start_backend -s init -f "$cfg -o CLICON_YANG_USE_ORIGINAL=true"
+fi
+
+# use-original optimization and two deviations with separate uses to same grouping
+new "wait backend 4"
+wait_backend
+
+new "set system without my"
+expecteof_netconf "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO" "<rpc $DEFAULTNS><edit-config><target><candidate/></target><config><system xmlns=\"urn:example:base\"><daytime>Sept17</daytime></system></config></edit-config></rpc>" "" "<rpc-reply $DEFAULTNS><ok/></rpc-reply>"
+
+new "netconf validate fail"
+expecteof_netconf "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO" "<rpc $DEFAULTNS><validate><source><candidate/></source></validate></rpc>" "" "<rpc-reply $DEFAULTNS><rpc-error><error-type>application</error-type><error-tag>missing-element</error-tag><error-info><bad-element>my</bad-element></error-info><error-severity>error</error-severity><error-message>Mandatory variable of system in module example-base</error-message></rpc-error></rpc-reply>"
+
+new "set system my"
+expecteof_netconf "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO" "<rpc $DEFAULTNS><edit-config><target><candidate/></target><config><system xmlns=\"urn:example:base\"><my>17</my></system></config></edit-config></rpc>" "" "<rpc-reply $DEFAULTNS><ok/></rpc-reply>"
+
+new "netconf validate ok"
+expecteof_netconf "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO" "<rpc $DEFAULTNS><validate><source><candidate/></source></validate></rpc>" "" "<rpc-reply $DEFAULTNS><ok/></rpc-reply>"
+
 if [ "$BE" -ne 0 ]; then
     new "Kill backend"
     # Check if premature kill