diff: add support for node type changes

rjarry · rjarry · commit 23a274cb8593 · 2019-11-26T17:59:37.000+01:00
Do not blindly assume that changing the node type is the same than
removing and creating a new node. It may be useful to know that only the
node type has changed.

Signed-off-by: Robin Jarry &lt;robin@jarry.cc&gt;
diff --git a/libyang/diff.py b/libyang/diff.py
@@ -131,6 +131,8 @@ class MandatoryRemoved(SNodeAttributeChanged): pass
 class MandatoryAdded(SNodeAttributeChanged): pass
 class MustRemoved(SNodeAttributeChanged): pass
 class MustAdded(SNodeAttributeChanged): pass
+class NodeTypeAdded(SNodeAttributeChanged): pass
+class NodeTypeRemoved(SNodeAttributeChanged): pass
 class RangeRemoved(SNodeAttributeChanged): pass
 class RangeAdded(SNodeAttributeChanged): pass
 class OrderedByUserRemoved(SNodeAttributeChanged): pass
@@ -151,11 +153,8 @@ class UnitsAdded(SNodeAttributeChanged): pass  # noqa: E302, E701
 def snode_changes(old, new):
 
     if old.nodetype() != new.nodetype():
-        # Changing node type is almost the same as removing and creating a new
-        # node in the schema.
-        yield SNodeRemoved(old)
-        yield SNodeAdded(new)
-        return
+        yield NodeTypeRemoved(old, new, old.keyword())
+        yield NodeTypeAdded(old, new, new.keyword())
 
     if old.description() != new.description():
         if old.description() is not None:
diff --git a/tests/test_diff.py b/tests/test_diff.py
@@ -7,6 +7,8 @@
 from libyang import Context
 from libyang.diff import BaseTypeAdded
 from libyang.diff import BaseTypeRemoved
+from libyang.diff import NodeTypeAdded
+from libyang.diff import NodeTypeRemoved
 from libyang.diff import StatusAdded
 from libyang.diff import StatusRemoved
 from libyang.diff import schema_diff
@@ -24,13 +26,17 @@ class DiffTest(unittest.TestCase):
         (BaseTypeAdded, '/yolo-system:state/yolo-system:speed'),
         (BaseTypeRemoved, '/yolo-system:conf/yolo-system:speed'),
         (BaseTypeRemoved, '/yolo-system:state/yolo-system:speed'),
+        (NodeTypeAdded, '/yolo-system:conf/yolo-system:number'),
+        (NodeTypeAdded, '/yolo-system:state/yolo-system:number'),
+        (NodeTypeRemoved, '/yolo-system:conf/yolo-system:number'),
+        (NodeTypeRemoved, '/yolo-system:state/yolo-system:number'),
         (StatusAdded, '/yolo-system:conf/yolo-system:deprecated-leaf'),
-        (StatusRemoved, '/yolo-system:conf/yolo-system:deprecated-leaf'),
         (StatusAdded, '/yolo-system:conf/yolo-system:obsolete-leaf'),
-        (StatusRemoved, '/yolo-system:conf/yolo-system:obsolete-leaf'),
         (StatusAdded, '/yolo-system:state/yolo-system:deprecated-leaf'),
-        (StatusRemoved, '/yolo-system:state/yolo-system:deprecated-leaf'),
         (StatusAdded, '/yolo-system:state/yolo-system:obsolete-leaf'),
+        (StatusRemoved, '/yolo-system:conf/yolo-system:deprecated-leaf'),
+        (StatusRemoved, '/yolo-system:conf/yolo-system:obsolete-leaf'),
+        (StatusRemoved, '/yolo-system:state/yolo-system:deprecated-leaf'),
         (StatusRemoved, '/yolo-system:state/yolo-system:obsolete-leaf'),
     ))
 
diff --git a/tests/yang-old/yolo/yolo-system.yang b/tests/yang-old/yolo/yolo-system.yang
@@ -70,7 +70,7 @@ module yolo-system {
       }
     }
 
-    leaf-list number {
+    leaf number {
       description
         "A number.";
       type types:number;

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ module yolo-system {`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`
`73`		`- leaf-list number {`
	`73`	`+ leaf number {`
`74`	`74`	`description`
`75`	`75`	`"A number.";`
`76`	`76`	`type types:number;`