From 6047f7d9e4f6dbd22666718fcd2d62b91cd245d7 Mon Sep 17 00:00:00 2001 From: ary Date: Wed, 29 Apr 2015 11:45:31 +0200 Subject: [PATCH] Bug 2358 - Resources for tests json to nn Tests of codecs are included in codecs yangtools yang-data-codec-gson and yang-data-impl but we test codec on input data and also with presentation of Rest path. * fix and add yang files for tests * fix json files * rename base folder of json-to-cnsn to json-to-nn Change-Id: Id0a23e655c3ddaaeb60f8652d57a7a5d1458063a Signed-off-by: ary --- .../json-to-cnsn/array-with-null.json | 5 ---- .../json-to-cnsn/identityref/json/data.json | 10 ------- .../json-to-cnsn/multiple-leaflist-items.json | 5 ---- .../json-to-cnsn/wrong-top-level2.json | 9 ------- .../resources/json-to-nn/array-with-null.json | 5 ++++ .../empty-data.json | 0 .../empty-data1.json | 0 .../identityref/identity-module.yang | 0 .../identityref/identityref-module.yang | 0 .../json-to-nn/identityref/json/data.json | 10 +++++++ .../invalid-uri-character-in-value.json | 2 +- .../leafref/augment-leafref-module.yang} | 0 .../leafref/json/data.json | 2 +- .../leafref/leafref-module.yang} | 0 .../multiple-items-in-list.json | 2 +- .../json-to-nn/multiple-leaflist-items.json | 5 ++++ .../simple-container.yang | 0 .../simple-container.json | 0 .../simple-list-yang/1/simple-list1.yang | 0 .../simple-list-yang/2/simple-list2.yang | 0 .../simple-list-yang/3/multiple-items.yang | 24 +++++++++++++++++ .../simple-list-yang/4/array-with-null.yang | 26 +++++++++++++++++++ .../simple-list.json | 2 +- .../unsupported-json-format.json | 0 .../wrong-top-level1.json | 2 +- .../json-to-nn/wrong-top-level2.json | 9 +++++++ .../wrong-top-level3.json | 0 27 files changed, 84 insertions(+), 34 deletions(-) delete mode 100644 opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/array-with-null.json delete mode 100644 opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/identityref/json/data.json delete mode 100644 opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/multiple-leaflist-items.json delete mode 100644 opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/wrong-top-level2.json create mode 100644 opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/array-with-null.json rename opendaylight/md-sal/sal-rest-connector/src/test/resources/{json-to-cnsn => json-to-nn}/empty-data.json (100%) rename opendaylight/md-sal/sal-rest-connector/src/test/resources/{json-to-cnsn => json-to-nn}/empty-data1.json (100%) rename opendaylight/md-sal/sal-rest-connector/src/test/resources/{json-to-cnsn => json-to-nn}/identityref/identity-module.yang (100%) rename opendaylight/md-sal/sal-rest-connector/src/test/resources/{json-to-cnsn => json-to-nn}/identityref/identityref-module.yang (100%) create mode 100644 opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/identityref/json/data.json rename opendaylight/md-sal/sal-rest-connector/src/test/resources/{json-to-cnsn => json-to-nn}/invalid-uri-character-in-value.json (75%) rename opendaylight/md-sal/sal-rest-connector/src/test/resources/{json-to-cnsn/leafref/augment-leafref-module => json-to-nn/leafref/augment-leafref-module.yang} (100%) rename opendaylight/md-sal/sal-rest-connector/src/test/resources/{json-to-cnsn => json-to-nn}/leafref/json/data.json (73%) rename opendaylight/md-sal/sal-rest-connector/src/test/resources/{json-to-cnsn/leafref/leafref-module => json-to-nn/leafref/leafref-module.yang} (100%) rename opendaylight/md-sal/sal-rest-connector/src/test/resources/{json-to-cnsn => json-to-nn}/multiple-items-in-list.json (88%) create mode 100644 opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/multiple-leaflist-items.json rename opendaylight/md-sal/sal-rest-connector/src/test/resources/{json-to-cnsn => json-to-nn}/simple-container-yang/simple-container.yang (100%) rename opendaylight/md-sal/sal-rest-connector/src/test/resources/{json-to-cnsn => json-to-nn}/simple-container.json (100%) rename opendaylight/md-sal/sal-rest-connector/src/test/resources/{json-to-cnsn => json-to-nn}/simple-list-yang/1/simple-list1.yang (100%) rename opendaylight/md-sal/sal-rest-connector/src/test/resources/{json-to-cnsn => json-to-nn}/simple-list-yang/2/simple-list2.yang (100%) create mode 100644 opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/simple-list-yang/3/multiple-items.yang create mode 100644 opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/simple-list-yang/4/array-with-null.yang rename opendaylight/md-sal/sal-rest-connector/src/test/resources/{json-to-cnsn => json-to-nn}/simple-list.json (85%) rename opendaylight/md-sal/sal-rest-connector/src/test/resources/{json-to-cnsn => json-to-nn}/unsupported-json-format.json (100%) rename opendaylight/md-sal/sal-rest-connector/src/test/resources/{json-to-cnsn => json-to-nn}/wrong-top-level1.json (67%) create mode 100644 opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/wrong-top-level2.json rename opendaylight/md-sal/sal-rest-connector/src/test/resources/{json-to-cnsn => json-to-nn}/wrong-top-level3.json (100%) diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/array-with-null.json b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/array-with-null.json deleted file mode 100644 index a19d9485f6..0000000000 --- a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/array-with-null.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "cont": { - "lf":[null] - } -} \ No newline at end of file diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/identityref/json/data.json b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/identityref/json/data.json deleted file mode 100644 index 320ee05eff..0000000000 --- a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/identityref/json/data.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "cont":{ - "cont1":{ - "lf11":"identity-module:iden", - "lf12":"iden_local", - "identityref-module:lf13":"iden_local", - "identityref-module:lf14":"identity-module:iden_local" - } - } -} \ No newline at end of file diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/multiple-leaflist-items.json b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/multiple-leaflist-items.json deleted file mode 100644 index b61a8a8f2e..0000000000 --- a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/multiple-leaflist-items.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "cont": { - "lflst1":[45,55,66] - } -} \ No newline at end of file diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/wrong-top-level2.json b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/wrong-top-level2.json deleted file mode 100644 index f0f5540cbf..0000000000 --- a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/wrong-top-level2.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - - "cont": { - }, - "lst":[ - { - } - ] -} \ No newline at end of file diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/array-with-null.json b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/array-with-null.json new file mode 100644 index 0000000000..995b3c6189 --- /dev/null +++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/array-with-null.json @@ -0,0 +1,5 @@ +{ + "array-with-null-yang:cont": { + "lf":null + } +} \ No newline at end of file diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/empty-data.json b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/empty-data.json similarity index 100% rename from opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/empty-data.json rename to opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/empty-data.json diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/empty-data1.json b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/empty-data1.json similarity index 100% rename from opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/empty-data1.json rename to opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/empty-data1.json diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/identityref/identity-module.yang b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/identityref/identity-module.yang similarity index 100% rename from opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/identityref/identity-module.yang rename to opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/identityref/identity-module.yang diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/identityref/identityref-module.yang b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/identityref/identityref-module.yang similarity index 100% rename from opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/identityref/identityref-module.yang rename to opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/identityref/identityref-module.yang diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/identityref/json/data.json b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/identityref/json/data.json new file mode 100644 index 0000000000..88cd6b43c3 --- /dev/null +++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/identityref/json/data.json @@ -0,0 +1,10 @@ +{ + "identityref:cont":{ + "cont1":{ + "lf11":"identity-module:iden", + "lf12":"identityref-module:iden_local", + "identityref-module:lf13":"identityref-module:iden_local", + "identityref-module:lf14":"identity-module:iden" + } + } +} \ No newline at end of file diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/invalid-uri-character-in-value.json b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/invalid-uri-character-in-value.json similarity index 75% rename from opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/invalid-uri-character-in-value.json rename to opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/invalid-uri-character-in-value.json index 6a78e9fc87..8281546836 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/invalid-uri-character-in-value.json +++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/invalid-uri-character-in-value.json @@ -1,5 +1,5 @@ { - "moduleName:cont":{ + "cont":{ "lf1":"moduleName:value lf2" } diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/leafref/augment-leafref-module b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/leafref/augment-leafref-module.yang similarity index 100% rename from opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/leafref/augment-leafref-module rename to opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/leafref/augment-leafref-module.yang diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/leafref/json/data.json b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/leafref/json/data.json similarity index 73% rename from opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/leafref/json/data.json rename to opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/leafref/json/data.json index a9d5d29b44..df5bcefc8d 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/leafref/json/data.json +++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/leafref/json/data.json @@ -1,5 +1,5 @@ { - "cont":{ + "leafref-module:cont":{ "lf1":121, "lf2":121, "lf4":"pcc://39.39.39.39" diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/leafref/leafref-module b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/leafref/leafref-module.yang similarity index 100% rename from opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/leafref/leafref-module rename to opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/leafref/leafref-module.yang diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/multiple-items-in-list.json b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/multiple-items-in-list.json similarity index 88% rename from opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/multiple-items-in-list.json rename to opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/multiple-items-in-list.json index 8e882664cd..7702b8860f 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/multiple-items-in-list.json +++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/multiple-items-in-list.json @@ -1,5 +1,5 @@ { - "lst":[ + "multiple-items:lst":[ { "lst1": [ { diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/multiple-leaflist-items.json b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/multiple-leaflist-items.json new file mode 100644 index 0000000000..d8f0ce6654 --- /dev/null +++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/multiple-leaflist-items.json @@ -0,0 +1,5 @@ +{ + "multiple-leaflist:lst": { + "lflst1":[45,55,66] + } +} \ No newline at end of file diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/simple-container-yang/simple-container.yang b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/simple-container-yang/simple-container.yang similarity index 100% rename from opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/simple-container-yang/simple-container.yang rename to opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/simple-container-yang/simple-container.yang diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/simple-container.json b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/simple-container.json similarity index 100% rename from opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/simple-container.json rename to opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/simple-container.json diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/simple-list-yang/1/simple-list1.yang b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/simple-list-yang/1/simple-list1.yang similarity index 100% rename from opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/simple-list-yang/1/simple-list1.yang rename to opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/simple-list-yang/1/simple-list1.yang diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/simple-list-yang/2/simple-list2.yang b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/simple-list-yang/2/simple-list2.yang similarity index 100% rename from opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/simple-list-yang/2/simple-list2.yang rename to opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/simple-list-yang/2/simple-list2.yang diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/simple-list-yang/3/multiple-items.yang b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/simple-list-yang/3/multiple-items.yang new file mode 100644 index 0000000000..dcc17d53aa --- /dev/null +++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/simple-list-yang/3/multiple-items.yang @@ -0,0 +1,24 @@ +module multiple-items-yang { + namespace "multiple:items:yang"; + + prefix "mltitmsyg"; + revision 2013-11-12 { + } + + list lst { + list lst1 { + leaf lf11{ + type string; + } + leaf-list lflst11{ + type string; + } + container cont11{ + + } + list lst11{ + + } + } + } +} \ No newline at end of file diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/simple-list-yang/4/array-with-null.yang b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/simple-list-yang/4/array-with-null.yang new file mode 100644 index 0000000000..869e406555 --- /dev/null +++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/simple-list-yang/4/array-with-null.yang @@ -0,0 +1,26 @@ +module array-with-null-yang { + namespace "array:with:null:yang"; + + prefix "arwnlyn"; + revision 2013-11-12 { + } + + container cont{ + leaf lf{ + type empty; + } + leaf lf1{ + type string; + } + leaf lf2{ + type string; + } + leaf-list lflst1{ + type empty; + } + + leaf-list lflst2{ + type string; + } + } +} \ No newline at end of file diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/simple-list.json b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/simple-list.json similarity index 85% rename from opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/simple-list.json rename to opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/simple-list.json index fee6baab1a..d18ecc007e 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/simple-list.json +++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/simple-list.json @@ -1,5 +1,5 @@ { - "lst":[ + "simple-list:lst":[ { "cont1":{ }, diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/unsupported-json-format.json b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/unsupported-json-format.json similarity index 100% rename from opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/unsupported-json-format.json rename to opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/unsupported-json-format.json diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/wrong-top-level1.json b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/wrong-top-level1.json similarity index 67% rename from opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/wrong-top-level1.json rename to opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/wrong-top-level1.json index 3ae3a72f4d..594a802c0e 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/wrong-top-level1.json +++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/wrong-top-level1.json @@ -1,6 +1,6 @@ { - "lst":[ + "cont":[ { }, { diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/wrong-top-level2.json b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/wrong-top-level2.json new file mode 100644 index 0000000000..af75a47e8b --- /dev/null +++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/wrong-top-level2.json @@ -0,0 +1,9 @@ +{ + + "lst": { + }, + "lst1":[ + { + } + ] +} \ No newline at end of file diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/wrong-top-level3.json b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/wrong-top-level3.json similarity index 100% rename from opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/wrong-top-level3.json rename to opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-nn/wrong-top-level3.json -- 2.36.6