[ONOS-5693] YTB upgrade and defect fixes
Change-Id: I10d690bfd6e135a048c24946bfdd3839a0dae579
diff --git a/apps/yms/ut/src/test/resources/ytbTestYangFiles/YtbDataType.yang b/apps/yms/ut/src/test/resources/ytbTestYangFiles/YtbDataType.yang
new file mode 100644
index 0000000..3d2e7c8
--- /dev/null
+++ b/apps/yms/ut/src/test/resources/ytbTestYangFiles/YtbDataType.yang
@@ -0,0 +1,48 @@
+module YtbDataType {
+ yang-version 1;
+ namespace "yms:test:ytb:data:type";
+ prefix "data";
+ revision "2016-08-26";
+ // Enum with all combinations.
+ typedef enum-der-1 {
+ type enum-der-2;
+ }
+ typedef enum-der-2 {
+ type enumeration {
+ enum ten { value "10";}
+ enum hundred { value "100";}
+ enum thousand { value "1000"; }
+ }
+ }
+ leaf enum {
+ type enum-der-1;
+ }
+ leaf-list enum-leaf-list {
+ type union {
+ type uint64;
+ type enumeration {
+ enum ten { value "10";}
+ enum hundred { value "100";}
+ enum thousand { value "1000"; }
+ }
+ }
+ }
+ leaf union-enum {
+ type union {
+ type enumeration {
+ enum ten { value "10";}
+ enum hundred { value "100";}
+ enum thousand { value "1000"; }
+ }
+ type enum-der-1;
+ }
+ }
+ leaf-list leaf-ref-enum {
+ type leafref {
+ path "/enum";
+ }
+ }
+
+
+
+}
diff --git a/apps/yms/ut/src/test/resources/ytbTestYangFiles/YtbEmptyType.yang b/apps/yms/ut/src/test/resources/ytbTestYangFiles/YtbEmptyType.yang
new file mode 100644
index 0000000..8fcb277
--- /dev/null
+++ b/apps/yms/ut/src/test/resources/ytbTestYangFiles/YtbEmptyType.yang
@@ -0,0 +1,45 @@
+module YtbEmptyType {
+ yang-version 1;
+ namespace "yms:test:ytb:empty:type";
+ prefix "data";
+ revision "2016-08-26";
+ typedef emp-type {
+ type emp-type2;
+ }
+ typedef emp-type2 {
+ type empty;
+ }
+ typedef emp-type3 {
+ type leafref {
+ path "/empty";
+ }
+ }
+ leaf empty {
+ type empty;
+ }
+ leaf-list empty-list {
+ type empty;
+ }
+ leaf empty-ref {
+ type leafref {
+ path "/empty";
+ }
+ }
+ leaf-list empty-list-ref {
+ type leafref {
+ path "/empty-list";
+ }
+ }
+ leaf empty-type {
+ type emp-type;
+ }
+ leaf-list empty-list-type {
+ type emp-type;
+ }
+ leaf empty-ref-type {
+ type emp-type3;
+ }
+ leaf-list empty-list-ref-type {
+ type emp-type3;
+ }
+}