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 <jatoth@cisco.com>
(cherry picked from commit 6047f7d9e4f6dbd22666718fcd2d62b91cd245d7)

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 (file)
index a19d948..0000000
--- 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 (file)
index 320ee05..0000000
--- 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 (file)
index b61a8a8..0000000
--- 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 (file)
index f0f5540..0000000
--- 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 (file)
index 0000000..995b3c6
--- /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 (file)
index 0000000..88cd6b4
--- /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 6a78e9fc877c9971645a6d365c4d0d0e6cca0d2d..828154683649d81a1e6830198d56b0ea1a12331e 100644 (file)
--- 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":"module<Name:value lf1",
        "lf2":"module>Name: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 a9d5d29b44a82cad849c098185abaed1ad15c5fd..df5bcefc8dbe21a698699e4df97f96f96d85bc41 100644 (file)
--- 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 8e882664cdb5aeb08e35953bbe6d86ba399bed2d..7702b8860ffb34bd2e09234232d3229b55f76ea1 100644 (file)
--- 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 (file)
index 0000000..d8f0ce6
--- /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 (file)
index 0000000..dcc17d5
--- /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 (file)
index 0000000..869e406
--- /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 fee6baab1a079fee67a11f061e099b35a6e4529e..d18ecc007e1223d4d6045ba301b61e50b9bea305 100644 (file)
--- 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 3ae3a72f4df0a0886e376a05fdb3551f49b4f955..594a802c0e796e6e96a49bd21ff3656e00b1a672 100644 (file)
--- 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 (file)
index 0000000..af75a47
--- /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