From 8df2cadfab2f2928c8bb984391f3986d0f323ee0 Mon Sep 17 00:00:00 2001 From: Martin Ciglan Date: Fri, 19 May 2017 12:14:56 +0200 Subject: [PATCH] Bug 8307: Add the option for activating deviation statements - follow-up patch for Yangtools changes: https://git.opendaylight.org/gerrit/#/c/56452/ Change-Id: Ia78b119fee3bdf12be90dbb95d8d811576df57ed Signed-off-by: Martin Ciglan --- .../binding/javav2/generator/impl/YangTemplateTest.java | 2 -- .../test/resources/yang-template/yang-template-import.yang | 6 ------ .../test/resources/yang-template/yang-template-test.yang | 6 ++++++ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/YangTemplateTest.java b/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/YangTemplateTest.java index 19ca3cd928..2484b4a80b 100644 --- a/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/YangTemplateTest.java +++ b/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/YangTemplateTest.java @@ -40,8 +40,6 @@ public class YangTemplateTest { String moduleBody = yangTemplateForModule.render(iterator.next()).body().trim(); String cleanedModuleBody = YangSnippetCleaner.clean(moduleBody); assertTrue(cleanedModuleBody.contains("yang-template-import")); - assertTrue(cleanedModuleBody.contains(" deviation /yti:yti-leaf {")); - assertTrue(cleanedModuleBody.contains(" default \"def\";")); assertTrue(cleanedModuleBody.contains(" extension ext;")); assertTrue(cleanedModuleBody.contains(" yti:ext;")); assertTrue(cleanedModuleBody.contains(" yti:ext-arg \"arg\"")); diff --git a/binding2/mdsal-binding2-generator-impl/src/test/resources/yang-template/yang-template-import.yang b/binding2/mdsal-binding2-generator-impl/src/test/resources/yang-template/yang-template-import.yang index b4b6a30744..09af041abf 100644 --- a/binding2/mdsal-binding2-generator-impl/src/test/resources/yang-template/yang-template-import.yang +++ b/binding2/mdsal-binding2-generator-impl/src/test/resources/yang-template/yang-template-import.yang @@ -11,12 +11,6 @@ module yang-template-import { type string; } - deviation /yti:yti-leaf { - deviate add { - default "def"; - } - } - extension ext; extension ext-arg { diff --git a/binding2/mdsal-binding2-generator-impl/src/test/resources/yang-template/yang-template-test.yang b/binding2/mdsal-binding2-generator-impl/src/test/resources/yang-template/yang-template-test.yang index dc26e328be..a1a441653e 100644 --- a/binding2/mdsal-binding2-generator-impl/src/test/resources/yang-template/yang-template-test.yang +++ b/binding2/mdsal-binding2-generator-impl/src/test/resources/yang-template/yang-template-test.yang @@ -14,6 +14,12 @@ module yang-template-test { default "simple-typedef"; } + deviation /yti:yti-leaf { + deviate add { + default "def"; + } + } + container simple-container { } -- 2.36.6