From a2b3935b6de669cc016eb131b2d4ab215a84edca Mon Sep 17 00:00:00 2001 From: Jakub Toth Date: Mon, 1 Jun 2015 09:19:22 +0200 Subject: [PATCH] Bug 2358 - Resources for tests nn to xml 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 xmls files * rename base folder of cnsn-to-xml to nn-to-xml Change-Id: I6ad16f4e12c5f79089eda824d7b4879cdff14e6f Signed-off-by: Jakub Toth (cherry picked from commit cfdf1580b9a00e592ef79dc682ca234a97705413) --- .../choice/module-with-choice.yang | 0 .../data-of-several-modules/yang/module1.yang | 20 +++++++++++++++++++ .../data-of-several-modules/yang/module2.yang | 20 +++++++++++++++++++ .../aug-referenced-elements-module.yang | 0 .../eferenced-elements-module.yang | 0 .../rinstance-identifier-module.yang | 0 .../yang/basic-module.yang | 0 .../yang/referenced-module.yang | 0 8 files changed, 40 insertions(+) rename opendaylight/md-sal/sal-rest-connector/src/test/resources/{cnsn-to-xml => nn-to-xml}/choice/module-with-choice.yang (100%) create mode 100644 opendaylight/md-sal/sal-rest-connector/src/test/resources/nn-to-xml/data-of-several-modules/yang/module1.yang create mode 100644 opendaylight/md-sal/sal-rest-connector/src/test/resources/nn-to-xml/data-of-several-modules/yang/module2.yang rename opendaylight/md-sal/sal-rest-connector/src/test/resources/{cnsn-to-xml => nn-to-xml}/instance_identifier/aug-referenced-elements-module.yang (100%) rename opendaylight/md-sal/sal-rest-connector/src/test/resources/{cnsn-to-xml => nn-to-xml}/instance_identifier/eferenced-elements-module.yang (100%) rename opendaylight/md-sal/sal-rest-connector/src/test/resources/{cnsn-to-xml => nn-to-xml}/instance_identifier/rinstance-identifier-module.yang (100%) rename opendaylight/md-sal/sal-rest-connector/src/test/resources/{cnsn-to-xml => nn-to-xml}/yang/basic-module.yang (100%) rename opendaylight/md-sal/sal-rest-connector/src/test/resources/{cnsn-to-xml => nn-to-xml}/yang/referenced-module.yang (100%) diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/cnsn-to-xml/choice/module-with-choice.yang b/opendaylight/md-sal/sal-rest-connector/src/test/resources/nn-to-xml/choice/module-with-choice.yang similarity index 100% rename from opendaylight/md-sal/sal-rest-connector/src/test/resources/cnsn-to-xml/choice/module-with-choice.yang rename to opendaylight/md-sal/sal-rest-connector/src/test/resources/nn-to-xml/choice/module-with-choice.yang diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/nn-to-xml/data-of-several-modules/yang/module1.yang b/opendaylight/md-sal/sal-rest-connector/src/test/resources/nn-to-xml/data-of-several-modules/yang/module1.yang new file mode 100644 index 0000000000..72a82caec4 --- /dev/null +++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/nn-to-xml/data-of-several-modules/yang/module1.yang @@ -0,0 +1,20 @@ +module module1 { + namespace "module:one"; + + prefix "m1"; + revision 2014-01-17 { + } + + container cont_m1 { + leaf lf1_m1 { + type string; + } + uses confB_gr; + } + + grouping confB_gr { + container contB_m1 { + } + } + +} \ No newline at end of file diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/nn-to-xml/data-of-several-modules/yang/module2.yang b/opendaylight/md-sal/sal-rest-connector/src/test/resources/nn-to-xml/data-of-several-modules/yang/module2.yang new file mode 100644 index 0000000000..521d9c0e63 --- /dev/null +++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/nn-to-xml/data-of-several-modules/yang/module2.yang @@ -0,0 +1,20 @@ +module module2 { + namespace "module:two"; + + prefix "m2"; + revision 2014-01-17 { + } + + container cont_m2 { + leaf lf1_m2 { + type string; + } + uses confB_gr; + } + + grouping confB_gr { + container contB_m2 { + } + } + +} \ No newline at end of file diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/cnsn-to-xml/instance_identifier/aug-referenced-elements-module.yang b/opendaylight/md-sal/sal-rest-connector/src/test/resources/nn-to-xml/instance_identifier/aug-referenced-elements-module.yang similarity index 100% rename from opendaylight/md-sal/sal-rest-connector/src/test/resources/cnsn-to-xml/instance_identifier/aug-referenced-elements-module.yang rename to opendaylight/md-sal/sal-rest-connector/src/test/resources/nn-to-xml/instance_identifier/aug-referenced-elements-module.yang diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/cnsn-to-xml/instance_identifier/eferenced-elements-module.yang b/opendaylight/md-sal/sal-rest-connector/src/test/resources/nn-to-xml/instance_identifier/eferenced-elements-module.yang similarity index 100% rename from opendaylight/md-sal/sal-rest-connector/src/test/resources/cnsn-to-xml/instance_identifier/eferenced-elements-module.yang rename to opendaylight/md-sal/sal-rest-connector/src/test/resources/nn-to-xml/instance_identifier/eferenced-elements-module.yang diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/cnsn-to-xml/instance_identifier/rinstance-identifier-module.yang b/opendaylight/md-sal/sal-rest-connector/src/test/resources/nn-to-xml/instance_identifier/rinstance-identifier-module.yang similarity index 100% rename from opendaylight/md-sal/sal-rest-connector/src/test/resources/cnsn-to-xml/instance_identifier/rinstance-identifier-module.yang rename to opendaylight/md-sal/sal-rest-connector/src/test/resources/nn-to-xml/instance_identifier/rinstance-identifier-module.yang diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/cnsn-to-xml/yang/basic-module.yang b/opendaylight/md-sal/sal-rest-connector/src/test/resources/nn-to-xml/yang/basic-module.yang similarity index 100% rename from opendaylight/md-sal/sal-rest-connector/src/test/resources/cnsn-to-xml/yang/basic-module.yang rename to opendaylight/md-sal/sal-rest-connector/src/test/resources/nn-to-xml/yang/basic-module.yang diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/cnsn-to-xml/yang/referenced-module.yang b/opendaylight/md-sal/sal-rest-connector/src/test/resources/nn-to-xml/yang/referenced-module.yang similarity index 100% rename from opendaylight/md-sal/sal-rest-connector/src/test/resources/cnsn-to-xml/yang/referenced-module.yang rename to opendaylight/md-sal/sal-rest-connector/src/test/resources/nn-to-xml/yang/referenced-module.yang -- 2.36.6