Bug 5524: NPE in BA->BI serialization

added check to RuntimeContext, tests

Change-Id: I5574469506cd6a7df5a54b47e3cdca34a68c7834
Signed-off-by: Filip Gregor <fgregor@cisco.com>

diff --git a/binding/mdsal-binding-test-model/src/main/yang/opendaylight-bug-5524-module1.yang b/binding/mdsal-binding-test-model/src/main/yang/opendaylight-bug-5524-module1.yang
new file mode 100644 (file)
index 0000000..81380b1
--- /dev/null
+++ b/binding/mdsal-binding-test-model/src/main/yang/opendaylight-bug-5524-module1.yang
@@ -0,0 +1,53 @@
+module opendaylight-bug-5524-module1 {
+    namespace "urn:test:opendaylight-bug-5524-module1";
+    prefix module1;
+
+    revision 2016-01-01 {
+    }
+
+    notification notification-module1 {
+        uses grouping-module1;
+    }
+
+    grouping grouping-module1 {
+        list list-module1-1 {
+            list list-module1-2 {
+                container container-module1 {
+                }
+            }
+        }
+    }
+
+    grouping uses-grouping-augmet-testgrouping-inner {
+        container container-augmet-1 {
+        }
+    }
+
+    grouping uses-grouping-augmet-testgrouping-outer {
+        uses uses-grouping-augmet-testgrouping-inner {
+            augment "container-augmet-1" {
+                container container-2 {
+                }
+            }
+        }
+    }
+
+    grouping uses-grouping-testgrouping-inner {
+        container container-1 {
+            container container-2 {
+            }
+        }
+    }
+
+    grouping uses-grouping-testgrouping-outer {
+        uses uses-grouping-testgrouping-inner;
+    }
+
+    container container-augment {
+        uses uses-grouping-augmet-testgrouping-outer;
+    }
+
+    container container-manual {
+        uses uses-grouping-testgrouping-outer;
+    }
+}
\ No newline at end of file

diff --git a/binding/mdsal-binding-test-model/src/main/yang/opendaylight-bug-5524-module2.yang b/binding/mdsal-binding-test-model/src/main/yang/opendaylight-bug-5524-module2.yang
new file mode 100644 (file)
index 0000000..2861591
--- /dev/null
+++ b/binding/mdsal-binding-test-model/src/main/yang/opendaylight-bug-5524-module2.yang
@@ -0,0 +1,21 @@
+module opendaylight-bug-5524-module2 {
+    namespace "urn:test:opendaylight-bug-5524-module2";
+    prefix module2;
+
+    revision 2016-01-01 {
+    }
+
+    import opendaylight-bug-5524-module1 {
+        prefix mod1;
+        revision-date 2016-01-01;
+    }
+
+    grouping grouping-module2 {
+        container container-module2 {
+        }
+    }
+
+    augment "/mod1:notification-module1/mod1:list-module1-1/mod1:list-module1-2/mod1:container-module1" {
+        uses grouping-module2;
+    }
+}
\ No newline at end of file

diff --git a/binding/mdsal-binding-test-model/src/main/yang/opendaylight-bug-5524-module3.yang b/binding/mdsal-binding-test-model/src/main/yang/opendaylight-bug-5524-module3.yang
new file mode 100644 (file)
index 0000000..380cea2
--- /dev/null
+++ b/binding/mdsal-binding-test-model/src/main/yang/opendaylight-bug-5524-module3.yang
@@ -0,0 +1,51 @@
+module opendaylight-bug-5524-module3 {
+    namespace "urn:test:opendaylight-bug-5524-module3";
+    prefix module3;
+
+    revision 2016-01-01 {
+    }
+
+    import opendaylight-bug-5524-module1 {
+        prefix mod1;
+        revision-date 2016-01-01;
+    }
+
+    import opendaylight-bug-5524-module2 {
+        prefix mod2;
+        revision-date 2016-01-01;
+    }
+
+    grouping grouping-module3 {
+        list container-manual-list-module1-1 {
+            list container-manual-list-module1-2 {
+                container container-manual-container-module1 {
+                    container container-manual-container-module2 {
+                    }
+                }
+            }
+        }
+        list manual-list-module1-1 {
+            list manual-list-module1-2 {
+                container manual-container-module1 {
+                }
+            }
+        }
+        uses mod1:grouping-module1 {
+            augment "list-module1-1/list-module1-2/container-module1" {
+                uses mod2:grouping-module2;
+            }
+        }
+    }
+
+    container module3-main {
+        container container-module-3 {
+            uses grouping-module3;
+        }
+    }
+
+    grouping grouping-module3-main {
+        container container-module3 {
+            uses grouping-module3;
+        }
+    }
+}
\ No newline at end of file

diff --git a/binding/mdsal-binding-test-model/src/main/yang/opendaylight-bug-5524-module4.yang b/binding/mdsal-binding-test-model/src/main/yang/opendaylight-bug-5524-module4.yang
new file mode 100644 (file)
index 0000000..4741754
--- /dev/null
+++ b/binding/mdsal-binding-test-model/src/main/yang/opendaylight-bug-5524-module4.yang
@@ -0,0 +1,27 @@
+module opendaylight-bug-5524-module4 {
+    namespace "urn:test:opendaylight-bug-5524-module4";
+    prefix module4;
+
+    revision 2016-01-01 {
+    }
+
+    import opendaylight-bug-5524-module3 {
+        prefix mod3;
+        revision-date 2016-01-01;
+    }
+
+    import opendaylight-bug-5524-module2 {
+        prefix mod2;
+        revision-date 2016-01-01;
+    }
+
+    container module4-main {
+        container container-module-4 {
+            uses mod3:grouping-module3 {
+                augment "manual-list-module1-1/manual-list-module1-2/manual-container-module1" {
+                    uses mod2:grouping-module2;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file