From 9803d0a5e7b214ac90191f4d41fb98d26643a168 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 19 Oct 2019 14:43:00 +0200 Subject: [PATCH] Fix invalid augmentations choice/case structures are collapsed to their parent data tree node, hence it is invalid to define (in same namespace) the equivalent of: container { leaf foo { type string; } choice some { case foo { leaf foo { type string; } } } } Fix up the testing model. Change-Id: I1e3ef8f9b38016e0290221f22b8233fba176bc0e Signed-off-by: Robert Varga (cherry picked from commit 4e4bb47c41728c15220203602068a5754efbd62f) --- .../src/main/yang/opendaylight-mdsal-augment-test.yang | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/binding/mdsal-binding-test-model/src/main/yang/opendaylight-mdsal-augment-test.yang b/binding/mdsal-binding-test-model/src/main/yang/opendaylight-mdsal-augment-test.yang index 4f45299733..5a5dae9e80 100644 --- a/binding/mdsal-binding-test-model/src/main/yang/opendaylight-mdsal-augment-test.yang +++ b/binding/mdsal-binding-test-model/src/main/yang/opendaylight-mdsal-augment-test.yang @@ -29,6 +29,12 @@ module opendaylight-mdsal-augment-test { } } + grouping leaf2-from-grouping { + leaf leaf2-from-grouping { + type string; + } + } + grouping complex-from-grouping { container container-with-uses { uses leaf-from-grouping; @@ -125,7 +131,7 @@ module opendaylight-mdsal-augment-test { augment "/test:top/test:top-level-list/test:choice-in-list" { case simple-via-uses { - uses leaf-from-grouping; + uses leaf2-from-grouping; } case empty-leaf { leaf empty-type { @@ -136,7 +142,7 @@ module opendaylight-mdsal-augment-test { augment "/test:put-top/test:input/test:top-level-list/test:choice-in-list" { case simple-via-uses { - uses leaf-from-grouping; + uses leaf2-from-grouping; } } -- 2.36.6