Fixes for with-defaults processing

In _merge_gnode_nodes, don't continue when the child1 node has no
children. This is to allow the recursive call which, while it will have
no effect in the loop over node1's children, may have an effect in the
loop over node2's children.

Change schemas to allow the new tests in apteryx-netconf. The test5 schema
is meant to mimic the structure of the interfaces/ethernet/poe models
in openconfig.

models/test.xml

@@ -107,7 +107,7 @@
               <REFRESH>Sample REFRESH node</REFRESH>
           </NODE>
           <NODE name="config" >
-            <NODE name="type" mode="rw">
+            <NODE name="type" mode="rw" default="big">
               <VALUE name="big" value="1"/>
               <VALUE name="little" value="2"/>
             </NODE>
@@ -137,6 +137,29 @@
     <NODE name="patterns">
       <NODE name="variable_1" mode="rw" help="variable to test /(flash|card|usb):/?[\.A-Za-z0-9_\-]{1,251}\.cfg/" pattern="(flash|card|usb):/?[\.A-Za-z0-9_\-]{1,251}\.cfg"/>
     </NODE>
+    <NODE name="objects" help="A generic object">
+      <NODE name="object" mode="rw" help="One object in a list">
+        <NODE name="*" help="The object's key - the name variable below">
+          <NODE name="name" mode="rw" help="This is the name of the object"/>
+          <NODE name="top-container" mode="rw" help="The top container in the object">
+            <NODE name="conf" mode="rw" help="The config for the top container">
+              <NODE name="enabled" mode="rw" help="Whether the top container is enabled" default="true">
+                <VALUE name="true" value="1"/>
+                <VALUE name="false" value="2"/>
+              </NODE>
+            </NODE>
+            <NODE name="inner-container" mode="rw" help="The inner container in the object">
+              <NODE name="conf" mode="rw" help="The config for the top container">
+                <NODE name="enabled" mode="rw" help="Whether the top container is enabled" default="false">
+                  <VALUE name="true" value="1"/>
+                  <VALUE name="false" value="2"/>
+                </NODE>
+              </NODE>
+            </NODE>
+          </NODE>
+        </NODE>
+      </NODE>
+    </NODE>
   </NODE>
   <NODE name="test-list" help="This is top-level list">
     <NODE name="*" help="The list entry with key index">

schema.c

@@ -3517,9 +3517,6 @@ _merge_gnode_nodes (GNode *node1, GNode *node2)
 
     for (child1 = node1->children; child1; child1 = child1->next)
     {
-        if (!child1->children)
-            continue;
-
         /* Match child1 to a child of node2. If matched descend down the tree. */
         for (child2 = node2->children; child2; child2 = child2->next)
         {