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 <martin.ciglan@pantheon.tech>

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 19ca3cd92865b42ec3e8f7c92a1017c513a5f921..2484b4a80bdade6b4fba7f832cee747841c17d9b 100644 (file)
--- 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 b4b6a307443b5a7ae1f3322dd11ba621abf73709..09af041abfe80c794bda9c1efed3ca6667ad73b6 100644 (file)
--- 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 dc26e328bedfc019161c81d17990f5cd015b27fe..a1a441653e85d29873ac38113f12205f49900abc 100644 (file)
--- 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 {
     }