[ONOS-5003][ONOS-5004][ONOS-5005]Generated Code modification for YangUtils+added interface for augmentation method and other api changes.
Change-Id: I954b9c99e182f21d01fcc5cd76fbac7d61a6c3aa
diff --git a/utils/yangutils/plugin/src/test/resources/augmentTranslator/test.yang b/utils/yangutils/plugin/src/test/resources/augmentTranslator/test.yang
index 76ea6c9..3fa36b9 100644
--- a/utils/yangutils/plugin/src/test/resources/augmentTranslator/test.yang
+++ b/utils/yangutils/plugin/src/test/resources/augmentTranslator/test.yang
@@ -31,6 +31,19 @@
}
}
+ choice choice1 {
+ case case1 {
+ leaf case-leaf {
+ type int32;
+ }
+ container case-container3 {
+ leaf leafs {
+ type int64;
+ }
+ }
+ }
+ }
+
augment /cont3 {
leaf leaf1 {
@@ -39,10 +52,28 @@
}
augment /cont1/cont2 {
- leaf leaf2 {
+ leaf-list leaf2 {
type int32;
}
}
+ augment /choice1 {
+ leaf-list leaf2 {
+ type int32;
+ }
+ leaf leaf1 {
+ type int32;
+ }
+ container case-container {
+ leaf leafs {
+ type int64;
+ }
+ }
+ container case-container2 {
+ leaf leafs {
+ type int64;
+ }
+ }
+ }
augment /test1:cont1/test1:cont2 {
leaf a {
@@ -57,10 +88,25 @@
}
augment /test1:cont1/test1:cont2/test1:cont1s/test1:cont1s/test2:aa {
- leaf a {
+ leaf name {
+ type string;
+ }
+ leaf surname {
+ type string;
+ }
+ leaf-list aleaflist {
type int32;
}
- container aa {
+ container cont1 {
+ }
+ list alist {
+ key "name";
+ leaf name {
+ type string;
+ }
+ leaf-list surname {
+ type string;
+ }
}
}
diff --git a/utils/yangutils/plugin/src/test/resources/xPathLinker/Case/uses/test.yang b/utils/yangutils/plugin/src/test/resources/xPathLinker/Case/uses/test.yang
index e57a468..b326024 100644
--- a/utils/yangutils/plugin/src/test/resources/xPathLinker/Case/uses/test.yang
+++ b/utils/yangutils/plugin/src/test/resources/xPathLinker/Case/uses/test.yang
@@ -2,9 +2,7 @@
namespace "xpath:intra:single";
prefix test ;
- include test1;
include test2;
- include test4;
organization "";
contact "";
@@ -21,11 +19,5 @@
type int32;
}
}
-
- augment /group1/cont3/cont4/cont8 {
- leaf a {
- type int32;
- }
- }
}
diff --git a/utils/yangutils/plugin/src/test/resources/xPathLinker/Case/uses/test1.yang b/utils/yangutils/plugin/src/test/resources/xPathLinker/Case/uses/test1.yang
index 2c5dc20..bd75dba 100644
--- a/utils/yangutils/plugin/src/test/resources/xPathLinker/Case/uses/test1.yang
+++ b/utils/yangutils/plugin/src/test/resources/xPathLinker/Case/uses/test1.yang
@@ -4,8 +4,6 @@
prefix test;
}
- include test4;
-
organization "";
contact "";
@@ -35,13 +33,5 @@
}
}
- augment /group1/cont3/cont4 {
- container cont8 {
- leaf leaf8 {
- type int32;
- }
- }
- }
-
}
diff --git a/utils/yangutils/plugin/src/test/resources/xPathLinker/Case/uses/test2.yang b/utils/yangutils/plugin/src/test/resources/xPathLinker/Case/uses/test2.yang
index fedb0aa..e42101e 100644
--- a/utils/yangutils/plugin/src/test/resources/xPathLinker/Case/uses/test2.yang
+++ b/utils/yangutils/plugin/src/test/resources/xPathLinker/Case/uses/test2.yang
@@ -3,8 +3,8 @@
prefix test;
}
+ include test3;
include test1;
- include test4;
organization "";
contact "";
@@ -52,5 +52,13 @@
}
}
+
+ augment /group1/cont3/cont4 {
+ container cont8 {
+ leaf leaf8 {
+ type int32;
+ }
+ }
+ }
}
diff --git a/utils/yangutils/plugin/src/test/resources/xPathLinker/Case/uses/test4.yang b/utils/yangutils/plugin/src/test/resources/xPathLinker/Case/uses/test4.yang
index 589179d..b45bb7d 100644
--- a/utils/yangutils/plugin/src/test/resources/xPathLinker/Case/uses/test4.yang
+++ b/utils/yangutils/plugin/src/test/resources/xPathLinker/Case/uses/test4.yang
@@ -1,10 +1,9 @@
-submodule test4 {
+submodule test3 {
belongs-to test {
prefix test;
}
-
- include test2;
+
organization "";
contact "";
@@ -27,11 +26,5 @@
}
}
}
-
- augment /ethernet/cont11 {
- leaf leaf11 {
- type int32;
- }
- }
}