BUG-2399: fixup tests

The test model specifies the top-level container as structural, yet the
tests expect it to exist when empty. Mark the container as presence,
restoring behavior expected by tests.

Change-Id: Ided99720468a8bee14d5c66342e524450f5a9050
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/resources/cars.yang b/opendaylight/md-sal/sal-distributed-datastore/src/test/resources/cars.yang
index d83135ee6415a5b348f2fbc0c99a5667e69e9589..401e46857314149c7fe472bbaabba034e1295d2d 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/resources/cars.yang
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/resources/cars.yang
@@ -8,6 +8,7 @@ module cars {
     }
 
     container cars {
     }
 
     container cars {

+        presence "expected to exist when empty";

         list car {
             key name;
             leaf name {
         list car {
             key name;
             leaf name {

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/resources/odl-datastore-test.yang b/opendaylight/md-sal/sal-distributed-datastore/src/test/resources/odl-datastore-test.yang
index 0834c73f64bf963fa5d6b42549ff386f521c022d..ec1e5a14111be5ed92a403380794a9ec77f825e4 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/resources/odl-datastore-test.yang
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/resources/odl-datastore-test.yang
@@ -8,6 +8,8 @@ module odl-datastore-test {
     }
 
     container test {
     }
 
     container test {

+        presence "needs to be present when empty";
+

         leaf name {
             type string;
         }
         leaf name {
             type string;
         }


@@ -52,5 +54,6 @@ module odl-datastore-test {
     }
     
     container test2 {
     }
     
     container test2 {

+        presence "needs to be present when empty";

     }
     }

-}
\ No newline at end of file
+}

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/resources/people.yang b/opendaylight/md-sal/sal-distributed-datastore/src/test/resources/people.yang
index 7ede0e65cbf5c3f328f9a07b2bda7478c9b1814b..93ace64fccc06cf197c3306dedd93ff9d5aa4c63 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/resources/people.yang
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/resources/people.yang
@@ -8,6 +8,7 @@ module people {
     }
 
     container people {
     }
 
     container people {

+        presence "expected to exist when empty";

         list person {
             key name;
             leaf name {
         list person {
             key name;
             leaf name {

diff --git a/opendaylight/md-sal/sal-dom-broker/src/test/resources/odl-datastore-test.yang b/opendaylight/md-sal/sal-dom-broker/src/test/resources/odl-datastore-test.yang
index 5fbf470f090e44e9e3c080998baa1c1a3a948c46..a0bf157e356a9085af4ca2a084f99cafa3b500d8 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/src/test/resources/odl-datastore-test.yang
+++ b/opendaylight/md-sal/sal-dom-broker/src/test/resources/odl-datastore-test.yang
@@ -8,6 +8,8 @@ module odl-datastore-test {
     }
 
     container test {
     }
 
     container test {

+        presence "needs to be present when empty";
+

         list outer-list {
             key id;
             leaf id {
         list outer-list {
             key id;
             leaf id {


@@ -42,4 +44,4 @@ module odl-datastore-test {
 
     container test2 {
     }
 
     container test2 {
     }

-}
\ No newline at end of file
+}

diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/test/resources/odl-datastore-test.yang b/opendaylight/md-sal/sal-inmemory-datastore/src/test/resources/odl-datastore-test.yang
index 17541fecab02c62f35c7a64cd679ad3ca52849e6..2d7601e0b85a29434385ef36db290d230712abb9 100644 (file)
--- a/opendaylight/md-sal/sal-inmemory-datastore/src/test/resources/odl-datastore-test.yang
+++ b/opendaylight/md-sal/sal-inmemory-datastore/src/test/resources/odl-datastore-test.yang
@@ -8,6 +8,8 @@ module odl-datastore-test {
     }
 
     container test {
     }
 
     container test {

+        presence "needs to be present when empty";
+

         list outer-list {
             key id;
             leaf id {
         list outer-list {
             key id;
             leaf id {


@@ -39,4 +41,4 @@ module odl-datastore-test {
             }
         }
     }
             }
         }
     }

-}
\ No newline at end of file
+}