Bump upstreams

Adopt:
- odlparent-12.0.0
- yangtools-10.0.0
- mdsal-11.0.0-SNAPSHOT

Update toaster test to not use the same transaction for both config
and oper access.

Update RPC invocation paths to assume ContainerNode as opposed to a
plain NormalizedNode.

Change-Id: I31c6350746be4e176a389d8a14a12de89119a78b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/akka/pom.xml b/akka/pom.xml
index 03dc41525407a0ff1b828121e5a497c8a4ec599f..9216338c5168b805096879318e66c7e088a1c268 100644 (file)
--- a/akka/pom.xml
+++ b/akka/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.2</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/akka/repackaged-akka-jar/pom.xml b/akka/repackaged-akka-jar/pom.xml
index 0b3c531e0a4fba23c1926dede791144316eff055..449afdf2c9ac9d7b0c10c89ac6c09b3cc7046e83 100644 (file)
--- a/akka/repackaged-akka-jar/pom.xml
+++ b/akka/repackaged-akka-jar/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>11.0.2</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 9026b82d0d8970458aea96582b88b5c021f270db..5dfc9ca4eacdbbcb4258d7ecf45e37b28601e046 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.2</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index 28f0e5b784ac06fadb1aeceb05d6bdc1aa7affee..26205a7119b6390ae56bee30878c9e1b1f1c534d 100644 (file)
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>11.0.2</version>
+    <version>12.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml
index 124f941e398df478d63d7f60269da94220255b9a..14975c071db830b6e08720f1c4e3c5c0bc9c8124 100644 (file)
--- a/bundle-parent/pom.xml
+++ b/bundle-parent/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>dom-parent</artifactId>
-        <version>10.0.3</version>
+        <version>11.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/docs/pom.xml b/docs/pom.xml
index fa1ad9deef1745dee9082da1bac1164bd8c3bdd3..87323d794d004d480faffad7296f84c48ebfbf18 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>11.0.2</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 
@@ -229,9 +229,9 @@
                         <link>http://netty.io/4.1/api/</link>
                         <link>https://commons.apache.org/proper/commons-lang/javadocs/api-release/</link>
 
-                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/11.0.2/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/9.0.2/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/10.0.3/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/12.0.0/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/10.0.0/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/11.0.0-SNAPSHOT/</link>
                     </links>
                     <groups>
                         <group>

diff --git a/features/features-controller-experimental/pom.xml b/features/features-controller-experimental/pom.xml
index ac072739d3c0fe83a48688de0d08b08b7da23de7..bcd13960bb64f24c94f83ca07070f48b46cd8195 100644 (file)
--- a/features/features-controller-experimental/pom.xml
+++ b/features/features-controller-experimental/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>11.0.2</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/features-controller-testing/pom.xml b/features/features-controller-testing/pom.xml
index e141bf32f8378d2d26d11e438c72724a1eaf9c90..7f7a890640afc6a2ab9c3638a952aa6b89c405ee 100644 (file)
--- a/features/features-controller-testing/pom.xml
+++ b/features/features-controller-testing/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>11.0.2</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/features-controller/pom.xml b/features/features-controller/pom.xml
index b57d0ce2e69e80fc49c6e4e661fbcc2c0131ad58..e84c71fb0fbf0f92b705e23a80b26bcb706e1848 100644 (file)
--- a/features/features-controller/pom.xml
+++ b/features/features-controller/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>11.0.2</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-clustering-test-app/src/main/feature/feature.xml b/features/odl-clustering-test-app/src/main/feature/feature.xml
index e31d50148ba2de38e722988241280739de99e42a..1a4c7ad2b80aefb0f6188136f834390ca37f6de7 100644 (file)
--- a/features/odl-clustering-test-app/src/main/feature/feature.xml
+++ b/features/odl-clustering-test-app/src/main/feature/feature.xml
@@ -8,6 +8,6 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-clustering-test-app-${project.version}">
     <feature name="odl-clustering-test-app" version="${project.version}">
-        <feature version="[10,11)">odl-mdsal-model-rfc6991</feature>
+        <feature version="[11,12)">odl-mdsal-model-rfc6991</feature>
     </feature>
 </features>

diff --git a/features/odl-controller-blueprint/src/main/feature/feature.xml b/features/odl-controller-blueprint/src/main/feature/feature.xml
index e0e9c955d3f7b038cb20780052916dbdeb1e6834..b339ffa8e60cac7d830b3ddb394a303a2afa86e8 100644 (file)
--- a/features/odl-controller-blueprint/src/main/feature/feature.xml
+++ b/features/odl-controller-blueprint/src/main/feature/feature.xml
@@ -8,10 +8,10 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-controller-blueprint-${project.version}">
     <feature name="odl-controller-blueprint" version="${project.version}">
-        <feature version="[9,10)">odl-yangtools-codec</feature>
-        <feature version="[10,11)">odl-mdsal-binding-api</feature>
-        <feature version="[10,11)">odl-mdsal-binding-runtime</feature>
-        <feature version="[10,11)">odl-mdsal-dom-api</feature>
+        <feature version="[10,11)">odl-yangtools-codec</feature>
+        <feature version="[11,12)">odl-mdsal-binding-api</feature>
+        <feature version="[11,12)">odl-mdsal-binding-runtime</feature>
+        <feature version="[11,12)">odl-mdsal-dom-api</feature>
         <bundle start-level="40">mvn:org.opendaylight.controller/blueprint/${project.version}</bundle>
     </feature>
 </features>

diff --git a/features/odl-controller-broker-local/src/main/feature/feature.xml b/features/odl-controller-broker-local/src/main/feature/feature.xml
index d5fe32cb9619b30d0d9f4ab923233eb39d0ff03f..d2c697508ff3baee288123e5824cceca60261f6b 100644 (file)
--- a/features/odl-controller-broker-local/src/main/feature/feature.xml
+++ b/features/odl-controller-broker-local/src/main/feature/feature.xml
@@ -8,9 +8,9 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-mdsal-${project.version}">
     <feature name="odl-controller-broker-local" version="${project.version}">
-        <feature version="[10,11)">odl-mdsal-dom</feature>
-        <feature version="[10,11)">odl-mdsal-eos-binding</feature>
-        <feature version="[10,11)">odl-mdsal-eos-dom</feature>
-        <feature version="[10,11)">odl-mdsal-singleton-dom</feature>
+        <feature version="[11,12)">odl-mdsal-dom</feature>
+        <feature version="[11,12)">odl-mdsal-eos-binding</feature>
+        <feature version="[11,12)">odl-mdsal-eos-dom</feature>
+        <feature version="[11,12)">odl-mdsal-singleton-dom</feature>
     </feature>
 </features>

diff --git a/features/odl-controller-exp-netty-config/src/main/feature/feature.xml b/features/odl-controller-exp-netty-config/src/main/feature/feature.xml
index 5e6bc3c088d6c737a51e224767e3f9b07ed831a2..9b07644cc0b2505dbb1142f05efb4b05eb6b4d0c 100644 (file)
--- a/features/odl-controller-exp-netty-config/src/main/feature/feature.xml
+++ b/features/odl-controller-exp-netty-config/src/main/feature/feature.xml
@@ -8,6 +8,6 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-controller-exp-netty-config">
     <feature name="odl-controller-exp-netty-config">
-        <feature version="[11,12)">odl-netty-4</feature>
+        <feature version="[12,13)">odl-netty-4</feature>
     </feature>
 </features>

diff --git a/features/odl-controller-mdsal-common/src/main/feature/feature.xml b/features/odl-controller-mdsal-common/src/main/feature/feature.xml
index 567080d1d9e7b9de627c13b120e87a9160579d79..48c9fe5cfe51bf654ccfeda43de0269a55d0e4a0 100644 (file)
--- a/features/odl-controller-mdsal-common/src/main/feature/feature.xml
+++ b/features/odl-controller-mdsal-common/src/main/feature/feature.xml
@@ -8,7 +8,7 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-controller-mdsal-common-${project.version}">
     <feature name="odl-controller-mdsal-common" version="${project.version}">
-        <feature version="[10,11)">odl-mdsal-common</feature>
-        <feature version="[10,11)">odl-mdsal-binding-runtime</feature>
+        <feature version="[11,12)">odl-mdsal-common</feature>
+        <feature version="[11,12)">odl-mdsal-binding-runtime</feature>
     </feature>
 </features>

diff --git a/features/odl-mdsal-broker/src/main/feature/feature.xml b/features/odl-mdsal-broker/src/main/feature/feature.xml
index f10a915c9a2c8d88c5bec860b8d2994e5207b7ca..215415b961536d72b675ba77d55c8b4cad2c2229 100644 (file)
--- a/features/odl-mdsal-broker/src/main/feature/feature.xml
+++ b/features/odl-mdsal-broker/src/main/feature/feature.xml
@@ -8,7 +8,7 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-mdsal-${project.version}">
     <feature name="odl-mdsal-broker" version="${project.version}">
-        <feature version="[10,11)">odl-mdsal-singleton-dom</feature>
-        <feature version="[10,11)">odl-mdsal-eos-binding</feature>
+        <feature version="[11,12)">odl-mdsal-singleton-dom</feature>
+        <feature version="[11,12)">odl-mdsal-eos-binding</feature>
     </feature>
 </features>

diff --git a/features/odl-mdsal-clustering-commons/src/main/feature/feature.xml b/features/odl-mdsal-clustering-commons/src/main/feature/feature.xml
index b206e7f439b3f5851ec5c8b250674802f349d2af..d2d5c009f9972fdeedca01d4bffc880a33e8a672 100644 (file)
--- a/features/odl-mdsal-clustering-commons/src/main/feature/feature.xml
+++ b/features/odl-mdsal-clustering-commons/src/main/feature/feature.xml
@@ -8,10 +8,10 @@
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-controller-${project.version}">
     <feature name="odl-mdsal-clustering-commons" version="${project.version}">
-        <feature version="[11,12)">odl-apache-commons-lang3</feature>
-        <feature version="[11,12)">odl-dropwizard-metrics</feature>
-        <feature version="[11,12)">odl-servlet-api</feature>
-        <feature version="[9,10)">odl-yangtools-data</feature>
-        <feature version="[9,10)">odl-yangtools-codec</feature>
+        <feature version="[12,13)">odl-apache-commons-lang3</feature>
+        <feature version="[12,13)">odl-dropwizard-metrics</feature>
+        <feature version="[12,13)">odl-servlet-api</feature>
+        <feature version="[10,11)">odl-yangtools-data</feature>
+        <feature version="[10,11)">odl-yangtools-codec</feature>
     </feature>
 </features>

diff --git a/features/odl-mdsal-distributed-datastore/src/main/feature/feature.xml b/features/odl-mdsal-distributed-datastore/src/main/feature/feature.xml
index d5c676706561d723e09e9b0ab1522935bba7a10c..0fd16bd9aae4821cd6101e99f0a8d5519ac72714 100644 (file)
--- a/features/odl-mdsal-distributed-datastore/src/main/feature/feature.xml
+++ b/features/odl-mdsal-distributed-datastore/src/main/feature/feature.xml
@@ -8,11 +8,11 @@
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-controller-${project.version}">
     <feature name="odl-mdsal-distributed-datastore" version="${project.version}">
-        <feature version="[11,12)">odl-apache-commons-text</feature>
-        <feature version="[9,10)">odl-yangtools-codec</feature>
-        <feature version="[10,11)">odl-mdsal-eos-dom</feature>
-        <feature version="[10,11)">odl-mdsal-dom-broker</feature>
-        <feature version="[10,11)">odl-mdsal-binding-dom-adapter</feature>
+        <feature version="[12,13)">odl-apache-commons-text</feature>
+        <feature version="[10,11)">odl-yangtools-codec</feature>
+        <feature version="[11,12)">odl-mdsal-eos-dom</feature>
+        <feature version="[11,12)">odl-mdsal-dom-broker</feature>
+        <feature version="[11,12)">odl-mdsal-binding-dom-adapter</feature>
         <configfile finalname="configuration/initial/akka.conf">
             mvn:org.opendaylight.controller/sal-clustering-config/${project.version}/xml/akkaconf
         </configfile>

diff --git a/features/odl-toaster/src/main/feature/feature.xml b/features/odl-toaster/src/main/feature/feature.xml
index cb2bf7e3017a325683776ebd54e465891109a809..9a8e7aad42761e7cfb987156ae8bffd07400c0c9 100644 (file)
--- a/features/odl-toaster/src/main/feature/feature.xml
+++ b/features/odl-toaster/src/main/feature/feature.xml
@@ -8,6 +8,6 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-toaster-${project.version}">
     <feature name="odl-toaster" version="${project.version}">
-        <feature version="[10,11)">odl-mdsal-binding-runtime</feature>
+        <feature version="[11,12)">odl-mdsal-binding-runtime</feature>
     </feature>
 </features>

diff --git a/features/pom.xml b/features/pom.xml
index ebb20e6b540a99c69aa62d015e934f40c6effec2..654978eaddcb0dab5a4f27bb6adcb4b0e5b597e6 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>11.0.2</version>
+    <version>12.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/features/single-feature-parent/pom.xml b/features/single-feature-parent/pom.xml
index 36f3983573c3ba757908d3f4212822cda08578d0..4de91aa52fbb483f9918e2c0bee7d869bae3b83f 100644 (file)
--- a/features/single-feature-parent/pom.xml
+++ b/features/single-feature-parent/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>11.0.2</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/jolokia/pom.xml b/jolokia/pom.xml
index cfa8697e99f37ba1b1e9a550681efdccebad598c..797d1f02f5b8fa27ccad7e0be490082d9c73d7c1 100644 (file)
--- a/jolokia/pom.xml
+++ b/jolokia/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>11.0.2</version>
+    <version>12.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 65b84ac2cbe10e5ef7b8c0d760bb1bf7f25adcd4..34d2cd91bb190af7ebf1ba4b435c60a2f07f1b6a 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>11.0.2</version>
+    <version>12.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/blueprint/pom.xml b/opendaylight/blueprint/pom.xml
index 9c9c94ad69cb8bfc9b4f6ccee6cb0e39ee95e578..b15b276477401c8ae463ddaf7e29a521aa4750b1 100644 (file)
--- a/opendaylight/blueprint/pom.xml
+++ b/opendaylight/blueprint/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>11.0.2</version>
+    <version>12.0.0</version>
     <relativePath/>
   </parent>
 
@@ -27,14 +27,14 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>9.0.2</version>
+        <version>10.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>10.0.3</version>
+        <version>11.0.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/opendaylight/config/netty-event-executor-config/pom.xml b/opendaylight/config/netty-event-executor-config/pom.xml
index d93b078cc18fe0f6bbc0ed43a8c262f693afd26d..c012c836d4890a0672a1584e42e3b02a38a418ea 100644 (file)
--- a/opendaylight/config/netty-event-executor-config/pom.xml
+++ b/opendaylight/config/netty-event-executor-config/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>11.0.2</version>
+    <version>12.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/config/netty-threadgroup-config/pom.xml b/opendaylight/config/netty-threadgroup-config/pom.xml
index 10856142665ee3f7a11c237e12eb13efc23afd99..0e8d6325cdc90e5782d75a64ac934271d8112d42 100644 (file)
--- a/opendaylight/config/netty-threadgroup-config/pom.xml
+++ b/opendaylight/config/netty-threadgroup-config/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>11.0.2</version>
+    <version>12.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/config/netty-timer-config/pom.xml b/opendaylight/config/netty-timer-config/pom.xml
index 578c5fc7dd84eb898c43531785b5f20d24e2883d..01c3e638647922e20abcaf9203be99ae3774b40b 100644 (file)
--- a/opendaylight/config/netty-timer-config/pom.xml
+++ b/opendaylight/config/netty-timer-config/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>11.0.2</version>
+    <version>12.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml
index 148696fa2052b71557ccf2b92d6c9da59283ad3e..31ca9c90ff08f98c0453882ed662f76244b3dc2d 100644 (file)
--- a/opendaylight/config/pom.xml
+++ b/opendaylight/config/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>11.0.2</version>
+    <version>12.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/config/threadpool-config-api/pom.xml b/opendaylight/config/threadpool-config-api/pom.xml
index 49a9f418855ee198b1dc7071f874a5653d3af7a6..955934318ba3deb9ea338c63d9e3b6c9f19281bd 100644 (file)
--- a/opendaylight/config/threadpool-config-api/pom.xml
+++ b/opendaylight/config/threadpool-config-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>11.0.2</version>
+    <version>12.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/config/threadpool-config-impl/pom.xml b/opendaylight/config/threadpool-config-impl/pom.xml
index 47f55afcda493d80696e7147140bc54c3e7d7533..69c4381fc689f9d56631532a1ce0d21d9f7d64ef 100644 (file)
--- a/opendaylight/config/threadpool-config-impl/pom.xml
+++ b/opendaylight/config/threadpool-config-impl/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>11.0.2</version>
+    <version>12.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/mdsal-it-base/pom.xml b/opendaylight/md-sal/mdsal-it-base/pom.xml
index d3fc071a077a96ceab25a1159a1571d2e4f610ee..c93f86436b7fe69ffc9cdc0cec0a94c6f968275b 100644 (file)
--- a/opendaylight/md-sal/mdsal-it-base/pom.xml
+++ b/opendaylight/md-sal/mdsal-it-base/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>11.0.2</version>
+    <version>12.0.0</version>
     <relativePath/>
   </parent>
 
@@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>10.0.3</version>
+        <version>11.0.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/opendaylight/md-sal/mdsal-it-parent/pom.xml b/opendaylight/md-sal/mdsal-it-parent/pom.xml
index 925df5e1b8c92b6a73f91f56f8498cacb246759c..4e1eb5bb24bf7d5f13f74766f80a445930537bc1 100644 (file)
--- a/opendaylight/md-sal/mdsal-it-parent/pom.xml
+++ b/opendaylight/md-sal/mdsal-it-parent/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>11.0.2</version>
+    <version>12.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/parent/pom.xml b/opendaylight/md-sal/parent/pom.xml
index e730a89dd97b59ca36f04b6ff23649d09e45b387..9d5a26bf2bbbc34f1cd49d1f52c5957ec165ec32 100644 (file)
--- a/opendaylight/md-sal/parent/pom.xml
+++ b/opendaylight/md-sal/parent/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>10.0.3</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index b53d20cbf0f99c1870d4efaf154a76fb8d25b2b0..07dabe99e2a5c6510497d2ee78cabc737f98b103 100644 (file)
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>11.0.2</version>
+    <version>12.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/sal-clustering-config/pom.xml b/opendaylight/md-sal/sal-clustering-config/pom.xml
index 4f6724024b552b6c875f0ee8fd6a6760117d430b..5301e3a66f586dbba50e72a6a16bb818a59d0f46 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-config/pom.xml
+++ b/opendaylight/md-sal/sal-clustering-config/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>11.0.2</version>
+    <version>12.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/OpsInvoker.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/OpsInvoker.java
index 4ac3867d67382fe00587378b4a37d1ed42c1d9d1..9c47e68faa6a95bf5ba9a2861ad4295bedd219f8 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/OpsInvoker.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/OpsInvoker.java
@@ -33,7 +33,6 @@ import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute;
 
 /**
@@ -102,8 +101,8 @@ final class OpsInvoker extends AbstractUntypedActor {
 
             @Override
             Object response(final QName type, final DOMRpcResult result) {
-                final Collection<? extends RpcError> errors = result.getErrors();
-                return errors.isEmpty() ? new RpcResponse(result.getResult())
+                final Collection<? extends RpcError> errors = result.errors();
+                return errors.isEmpty() ? new RpcResponse(result.value())
                         // This is legacy (wrong) behavior, which ignores the fact that errors may be just warnings,
                         // discarding any output
                         : new Failure(new RpcErrorsException(String.format("Execution of rpc %s failed", type),

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcImplementation.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcImplementation.java
index 67da0963ee48df4e9190c5872f0f6f9bb54b5104..3046f7e6dde0284fefa3f6e5bbbc07d3e1a9a374 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcImplementation.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcImplementation.java
@@ -13,7 +13,7 @@ import org.opendaylight.controller.remote.rpc.messages.ExecuteRpc;
 import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier;
 import org.opendaylight.mdsal.dom.api.DOMRpcImplementation;
 import org.opendaylight.mdsal.dom.api.DOMRpcResult;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 
 /**
  * A {@link DOMRpcImplementation} which routes invocation requests to a remote invoker actor.
@@ -26,8 +26,7 @@ final class RemoteRpcImplementation extends AbstractRemoteImplementation<Execute
     }
 
     @Override
-    public ListenableFuture<DOMRpcResult> invokeRpc(final DOMRpcIdentifier rpc,
-            final NormalizedNode input) {
+    public ListenableFuture<DOMRpcResult> invokeRpc(final DOMRpcIdentifier rpc, final ContainerNode input) {
         return new RemoteDOMRpcFuture(rpc.getType(), ask(ExecuteRpc.from(rpc, input)));
     }
 

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteRpc.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteRpc.java
index 873c5b89015ef3f9b4dc8a8279b2a6a9eed3d4c6..d9f6a67b5f2ac7efcd53fab50d258ff8484b96ef 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteRpc.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteRpc.java
@@ -17,20 +17,20 @@ import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeDataInput;
 import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeDataOutput;
 import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeStreamVersion;
 
-public final class ExecuteRpc extends AbstractExecute<QName, @Nullable NormalizedNode> {
+public final class ExecuteRpc extends AbstractExecute<QName, @Nullable ContainerNode> {
     private static final long serialVersionUID = 1128904894827335676L;
 
-    private ExecuteRpc(final @NonNull QName type, final @Nullable NormalizedNode input) {
+    private ExecuteRpc(final @NonNull QName type, final @Nullable ContainerNode input) {
         super(type, input);
     }
 
     public static @NonNull ExecuteRpc from(final @NonNull DOMRpcIdentifier rpc,
-            final @Nullable NormalizedNode input) {
+            final @Nullable ContainerNode input) {
         return new ExecuteRpc(rpc.getType(), input);
     }
 
@@ -67,7 +67,7 @@ public final class ExecuteRpc extends AbstractExecute<QName, @Nullable Normalize
         public void readExternal(final ObjectInput in) throws IOException {
             final NormalizedNodeDataInput stream = NormalizedNodeDataInput.newDataInput(in);
             final QName type = stream.readQName();
-            final NormalizedNode input = stream.readOptionalNormalizedNode().orElse(null);
+            final ContainerNode input = RpcResponse.unmaskContainer(stream.readOptionalNormalizedNode());
             executeRpc = new ExecuteRpc(type, input);
         }
 

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/RpcResponse.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/RpcResponse.java
index 97a515514001f5f8e1aa079886d2c955b5adbb10..bb308203ddd789fcf783c7ab6e8e0abadd2ca63a 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/RpcResponse.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/RpcResponse.java
@@ -9,16 +9,19 @@ package org.opendaylight.controller.remote.rpc.messages;
 
 import java.io.Externalizable;
 import java.io.IOException;
+import java.io.InvalidObjectException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
+import java.util.Optional;
 import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.controller.cluster.datastore.node.utils.stream.SerializationUtils;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
-public class RpcResponse extends AbstractResponse<NormalizedNode> {
+public class RpcResponse extends AbstractResponse<ContainerNode> {
     private static final long serialVersionUID = -4211279498688989245L;
 
-    public RpcResponse(final @Nullable NormalizedNode output) {
+    public RpcResponse(final @Nullable ContainerNode output) {
         super(output);
     }
 
@@ -27,6 +30,18 @@ public class RpcResponse extends AbstractResponse<NormalizedNode> {
         return new Proxy(this);
     }
 
+    static @Nullable ContainerNode unmaskContainer(final Optional<NormalizedNode> optNode)
+            throws InvalidObjectException {
+        if (optNode.isEmpty()) {
+            return null;
+        }
+        final var node = optNode.orElseThrow();
+        if (node instanceof ContainerNode container) {
+            return container;
+        }
+        throw new InvalidObjectException("Unexpected data " + node.contract().getSimpleName());
+    }
+
     private static class Proxy implements Externalizable {
         private static final long serialVersionUID = 1L;
 
@@ -49,7 +64,7 @@ public class RpcResponse extends AbstractResponse<NormalizedNode> {
 
         @Override
         public void readExternal(final ObjectInput in) throws IOException {
-            rpcResponse = new RpcResponse(SerializationUtils.readNormalizedNode(in).orElse(null));
+            rpcResponse = new RpcResponse(unmaskContainer(SerializationUtils.readNormalizedNode(in)));
         }
 
         private Object readResolve() {

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/AbstractOpsTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/AbstractOpsTest.java
index 8947d2e70527afad42743b25ee3097a8b73a47d0..643e50e895d55b7914a469b2126215075e8c0fed 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/AbstractOpsTest.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/AbstractOpsTest.java
@@ -156,7 +156,7 @@ public class AbstractOpsTest {
                                       final ErrorType errorType, final String tag, final String message,
                                       final String applicationTag, final String info, final String causeMsg) {
         assertNotNull("RpcResult was null", rpcResult);
-        final Collection<? extends RpcError> rpcErrors = rpcResult.getErrors();
+        final Collection<? extends RpcError> rpcErrors = rpcResult.errors();
         assertEquals("RpcErrors count", 1, rpcErrors.size());
         assertRpcErrorEquals(rpcErrors.iterator().next(), severity, errorType, tag, message,
                 applicationTag, info, causeMsg);
@@ -164,7 +164,7 @@ public class AbstractOpsTest {
 
     static void assertSuccessfulRpcResult(final DOMRpcResult rpcResult, final NormalizedNode expOutput) {
         assertNotNull("RpcResult was null", rpcResult);
-        assertCompositeNodeEquals(expOutput, rpcResult.getResult());
+        assertCompositeNodeEquals(expOutput, rpcResult.value());
     }
 
     static class TestException extends Exception {

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/OpsBrokerTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/OpsBrokerTest.java
index a4e00591d1fd422612e4b6e4a8809d8047917a84..8e6d17edc7b50f4eb744d574e983afec2a6b6776 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/OpsBrokerTest.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/OpsBrokerTest.java
@@ -40,7 +40,7 @@ public class OpsBrokerTest extends AbstractOpsTest {
 
         final RpcResponse rpcResponse = rpcRegistry1Probe.expectMsgClass(Duration.ofSeconds(5), RpcResponse.class);
 
-        assertEquals(rpcResult.getResult(), rpcResponse.getOutput());
+        assertEquals(rpcResult.value(), rpcResponse.getOutput());
     }
 
     @Test

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteOpsImplementationTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteOpsImplementationTest.java
index 6af91a1ee8989568c561c717f683c39695092276..259655976d69a59c636853a667f26c620d04885e 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteOpsImplementationTest.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteOpsImplementationTest.java
@@ -52,9 +52,8 @@ public class RemoteOpsImplementationTest extends AbstractOpsTest {
         final ContainerNode rpcOutput = makeRPCOutput("bar");
         final DOMRpcResult rpcResult = new DefaultDOMRpcResult(rpcOutput);
 
-        final NormalizedNode invokeRpcInput = makeRPCInput("foo");
-        final ArgumentCaptor<NormalizedNode> inputCaptor =
-                ArgumentCaptor.forClass(NormalizedNode.class);
+        final ContainerNode invokeRpcInput = makeRPCInput("foo");
+        final ArgumentCaptor<ContainerNode> inputCaptor = ArgumentCaptor.forClass(ContainerNode.class);
 
         doReturn(FluentFutures.immediateFluentFuture(rpcResult)).when(domRpcService2)
             .invokeRpc(eq(TEST_RPC), inputCaptor.capture());
@@ -63,7 +62,7 @@ public class RemoteOpsImplementationTest extends AbstractOpsTest {
         assertThat(frontEndFuture, instanceOf(RemoteDOMRpcFuture.class));
 
         final DOMRpcResult result = frontEndFuture.get(5, TimeUnit.SECONDS);
-        assertEquals(rpcOutput, result.getResult());
+        assertEquals(rpcOutput, result.value());
     }
 
     /**
@@ -93,7 +92,7 @@ public class RemoteOpsImplementationTest extends AbstractOpsTest {
         final ContainerNode rpcOutput = makeRPCOutput("bar");
         final DOMRpcResult rpcResult = new DefaultDOMRpcResult(rpcOutput);
 
-        final ArgumentCaptor<NormalizedNode> inputCaptor = ArgumentCaptor.forClass(NormalizedNode.class);
+        final ArgumentCaptor<ContainerNode> inputCaptor = ArgumentCaptor.forClass(ContainerNode.class);
 
         doReturn(FluentFutures.immediateFluentFuture(rpcResult)).when(domRpcService2)
             .invokeRpc(eq(TEST_RPC), inputCaptor.capture());
@@ -102,7 +101,7 @@ public class RemoteOpsImplementationTest extends AbstractOpsTest {
         assertThat(frontEndFuture, instanceOf(RemoteDOMRpcFuture.class));
 
         final DOMRpcResult result = frontEndFuture.get(5, TimeUnit.SECONDS);
-        assertEquals(rpcOutput, result.getResult());
+        assertEquals(rpcOutput, result.value());
     }
 
     /**
@@ -133,8 +132,8 @@ public class RemoteOpsImplementationTest extends AbstractOpsTest {
         final ContainerNode rpcOutput = null;
         final DOMRpcResult rpcResult = new DefaultDOMRpcResult(rpcOutput);
 
-        final NormalizedNode invokeRpcInput = makeRPCInput("foo");
-        final ArgumentCaptor<NormalizedNode> inputCaptor = ArgumentCaptor.forClass(NormalizedNode.class);
+        final ContainerNode invokeRpcInput = makeRPCInput("foo");
+        final ArgumentCaptor<ContainerNode> inputCaptor = ArgumentCaptor.forClass(ContainerNode.class);
 
         doReturn(FluentFutures.immediateFluentFuture(rpcResult)).when(domRpcService2)
             .invokeRpc(eq(TEST_RPC), inputCaptor.capture());
@@ -143,7 +142,7 @@ public class RemoteOpsImplementationTest extends AbstractOpsTest {
         assertThat(frontEndFuture, instanceOf(RemoteDOMRpcFuture.class));
 
         final DOMRpcResult result = frontEndFuture.get(5, TimeUnit.SECONDS);
-        assertNull(result.getResult());
+        assertNull(result.value());
     }
 
     /**
@@ -151,8 +150,8 @@ public class RemoteOpsImplementationTest extends AbstractOpsTest {
      */
     @Test
     public void testInvokeRpcWithRemoteFailedFuture() {
-        final NormalizedNode invokeRpcInput = makeRPCInput("foo");
-        final ArgumentCaptor<NormalizedNode> inputCaptor = ArgumentCaptor.forClass(NormalizedNode.class);
+        final ContainerNode invokeRpcInput = makeRPCInput("foo");
+        final ArgumentCaptor<ContainerNode> inputCaptor = ArgumentCaptor.forClass(ContainerNode.class);
 
         doReturn(FluentFutures.immediateFailedFluentFuture(new RemoteDOMRpcException("Test Exception", null)))
             .when(domRpcService2).invokeRpc(eq(TEST_RPC), inputCaptor.capture());
@@ -190,7 +189,7 @@ public class RemoteOpsImplementationTest extends AbstractOpsTest {
     @Ignore
     @Test
     public void testInvokeRpcWithAkkaTimeoutException() {
-        final NormalizedNode invokeRpcInput = makeRPCInput("foo");
+        final ContainerNode invokeRpcInput = makeRPCInput("foo");
         final ListenableFuture<DOMRpcResult> frontEndFuture = remoteRpcImpl1.invokeRpc(TEST_RPC_ID, invokeRpcInput);
         assertThat(frontEndFuture, instanceOf(RemoteDOMRpcFuture.class));
 
@@ -202,10 +201,10 @@ public class RemoteOpsImplementationTest extends AbstractOpsTest {
      */
     @Test
     public void testInvokeRpcWithLookupException() {
-        final NormalizedNode invokeRpcInput = makeRPCInput("foo");
+        final ContainerNode invokeRpcInput = makeRPCInput("foo");
 
         doThrow(new RuntimeException("test")).when(domRpcService2).invokeRpc(any(QName.class),
-            any(NormalizedNode.class));
+            any(ContainerNode.class));
 
         final ListenableFuture<DOMRpcResult> frontEndFuture = remoteRpcImpl1.invokeRpc(TEST_RPC_ID, invokeRpcInput);
         assertThat(frontEndFuture, instanceOf(RemoteDOMRpcFuture.class));

diff --git a/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml
index 2d6bdc79fd7d41b201b6cdf386729317a9266280..5f40825c2abd8a7dfe05361b84871063904a7caf 100644 (file)
--- a/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml
+++ b/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.2</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/AbstractDOMRpcAction.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/AbstractDOMRpcAction.java
index ab2269eb5bf5bf518a1a025e886fd67bdcf77260..b8fcf74319314efcea64df4211df21b372ffcb87 100644 (file)
--- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/AbstractDOMRpcAction.java
+++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/AbstractDOMRpcAction.java
@@ -17,12 +17,12 @@ public abstract class AbstractDOMRpcAction implements Action {
     @SuppressWarnings("checkstyle:RegexpSinglelineJava")
     public final Object execute() throws InterruptedException, ExecutionException {
         final DOMRpcResult result = invokeRpc().get();
-        if (!result.getErrors().isEmpty()) {
+        if (!result.errors().isEmpty()) {
             // FIXME: is there a better way to report errors?
-            System.out.println("Invocation failed: " + result.getErrors());
+            System.out.println("Invocation failed: " + result.errors());
             return null;
         } else {
-            return result.getResult().prettyTree().get();
+            return result.value().prettyTree().get();
         }
     }
 

diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/tgt/GetConstantCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/tgt/GetConstantCommand.java
index 86866db9e36e960d6012c114827a7bda24403ef3..8cc874a9b2df8bfd209b3f77c42d8bd2404e7790 100644 (file)
--- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/tgt/GetConstantCommand.java
+++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/tgt/GetConstantCommand.java
@@ -18,7 +18,7 @@ import org.opendaylight.mdsal.dom.api.DOMRpcService;
 import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.target.rev170215.GetConstantInput;
 import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.target.rev170215.GetConstantInputBuilder;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 
 @Service
 @Command(scope = "test-app", name = "get-constant", description = "Run an get-constant test")
@@ -30,7 +30,7 @@ public class GetConstantCommand extends AbstractDOMRpcAction {
 
     @Override
     protected ListenableFuture<? extends DOMRpcResult> invokeRpc() {
-        final NormalizedNode input = serializer.toNormalizedNodeRpcData(new GetConstantInputBuilder().build());
+        final ContainerNode input = serializer.toNormalizedNodeRpcData(new GetConstantInputBuilder().build());
         return rpcService.invokeRpc(QName.create(GetConstantInput.QNAME, "get-constant"), input);
     }
 }

diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/tgt/GetContextedConstantCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/tgt/GetContextedConstantCommand.java
index 75ebec4f63389d65fb4880e4f40160e99c05b99a..762daad4c310fe0d296331fb301bbe858727beb4 100644 (file)
--- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/tgt/GetContextedConstantCommand.java
+++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/tgt/GetContextedConstantCommand.java
@@ -20,7 +20,7 @@ import org.opendaylight.mdsal.dom.api.DOMRpcService;
 import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.target.rev170215.GetContextedConstantInput;
 import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.target.rev170215.GetContextedConstantInputBuilder;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 
 @Service
 @Command(scope = "test-app", name = "get-contexted-constant", description = "Run an get-contexted-constant test")
@@ -36,7 +36,7 @@ public class GetContextedConstantCommand extends AbstractDOMRpcAction {
 
     @Override
     protected ListenableFuture<? extends DOMRpcResult> invokeRpc() {
-        final NormalizedNode inputNode = serializer.toNormalizedNodeRpcData(new GetContextedConstantInputBuilder()
+        final ContainerNode inputNode = serializer.toNormalizedNodeRpcData(new GetContextedConstantInputBuilder()
             .setContext(iidSupport.parseArgument(context))
             .build());
         return rpcService.invokeRpc(QName.create(GetContextedConstantInput.QNAME, "get-contexted-constant"), inputNode);

diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/tgt/GetSingletonConstantCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/tgt/GetSingletonConstantCommand.java
index 466f2e3795333d2ba0f4b2ed02cb5ce4ad95a2eb..1713ecc9ab02749bcd47776a4b51018ef60a1700 100644 (file)
--- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/tgt/GetSingletonConstantCommand.java
+++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/tgt/GetSingletonConstantCommand.java
@@ -18,7 +18,7 @@ import org.opendaylight.mdsal.dom.api.DOMRpcService;
 import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.target.rev170215.GetSingletonConstantInput;
 import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.target.rev170215.GetSingletonConstantInputBuilder;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 
 @Service
 @Command(scope = "test-app", name = "get-singleton-constant", description = "Run an get-singleton-constant test")
@@ -30,7 +30,7 @@ public class GetSingletonConstantCommand extends AbstractDOMRpcAction {
 
     @Override
     protected ListenableFuture<? extends DOMRpcResult> invokeRpc() {
-        final NormalizedNode inputNode =
+        final ContainerNode inputNode =
                 serializer.toNormalizedNodeRpcData(new GetSingletonConstantInputBuilder().build());
         return rpcService.invokeRpc(QName.create(GetSingletonConstantInput.QNAME, "get-singleton-constant"), inputNode);
     }

diff --git a/opendaylight/md-sal/samples/clustering-test-app/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/pom.xml
index 16258cc4bd5613095db3968464c23158b0edabea..988034b9e8a3913f0caad924a85a112ef2889bb1 100644 (file)
--- a/opendaylight/md-sal/samples/clustering-test-app/pom.xml
+++ b/opendaylight/md-sal/samples/clustering-test-app/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.2</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/GetConstantService.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/GetConstantService.java
index 284586c1cfb1e248fefbce6415033a67c5beaa3f..0ab114ba8bdc7427cb4e75d5ade46bb0da451ba9 100644 (file)
--- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/GetConstantService.java
+++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/GetConstantService.java
@@ -21,7 +21,7 @@ import org.opendaylight.yangtools.yang.common.Revision;
 import org.opendaylight.yangtools.yang.common.XMLNamespace;
 import org.opendaylight.yangtools.yang.common.YangConstants;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
 import org.slf4j.Logger;
@@ -52,7 +52,7 @@ public final class GetConstantService implements DOMRpcImplementation {
     }
 
     @Override
-    public ListenableFuture<DOMRpcResult> invokeRpc(final DOMRpcIdentifier rpc, final NormalizedNode input) {
+    public ListenableFuture<DOMRpcResult> invokeRpc(final DOMRpcIdentifier rpc, final ContainerNode input) {
         LOG.debug("get-constant invoked, current value: {}", constant);
 
         return Futures.immediateFuture(new DefaultDOMRpcResult(Builders.containerBuilder()

diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/RoutedGetConstantService.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/RoutedGetConstantService.java
index 34a333521b9aeb05401f2ee0d5ee7375d5c16245..2e8a355ca5e8f619f34890954cb6691d44cd1031 100644 (file)
--- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/RoutedGetConstantService.java
+++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/RoutedGetConstantService.java
@@ -24,7 +24,7 @@ import org.opendaylight.yangtools.yang.common.XMLNamespace;
 import org.opendaylight.yangtools.yang.common.YangConstants;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
 import org.slf4j.Logger;
@@ -59,7 +59,7 @@ public final class RoutedGetConstantService implements DOMRpcImplementation {
     }
 
     @Override
-    public ListenableFuture<DOMRpcResult> invokeRpc(final DOMRpcIdentifier rpc, final NormalizedNode input) {
+    public ListenableFuture<DOMRpcResult> invokeRpc(final DOMRpcIdentifier rpc, final ContainerNode input) {
         LOG.debug("get-contexted-constant invoked, current value: {}", constant);
 
         return Futures.immediateFuture(new DefaultDOMRpcResult(Builders.containerBuilder()

diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/SingletonGetConstantService.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/SingletonGetConstantService.java
index d53b89e903826f929efc959cf27d9762864016a0..577981f4fc855172bc57ae0c84e6f66d4d76028c 100644 (file)
--- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/SingletonGetConstantService.java
+++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/SingletonGetConstantService.java
@@ -25,7 +25,7 @@ import org.opendaylight.yangtools.yang.common.Revision;
 import org.opendaylight.yangtools.yang.common.XMLNamespace;
 import org.opendaylight.yangtools.yang.common.YangConstants;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
 import org.slf4j.Logger;
@@ -65,7 +65,7 @@ public final class SingletonGetConstantService implements DOMRpcImplementation,
     }
 
     @Override
-    public ListenableFuture<DOMRpcResult> invokeRpc(final DOMRpcIdentifier rpc, final NormalizedNode input) {
+    public ListenableFuture<DOMRpcResult> invokeRpc(final DOMRpcIdentifier rpc, final ContainerNode input) {
         LOG.debug("get-singleton-constant invoked, current value: {}", constant);
 
         return Futures.immediateFuture(new DefaultDOMRpcResult(Builders.containerBuilder()

diff --git a/opendaylight/md-sal/samples/pom.xml b/opendaylight/md-sal/samples/pom.xml
index 254798e4e81d7eb351fda6eefbd08f3da021f257..a77ccfa15e3b82c9f62becb4ee52b42327e8ccad 100644 (file)
--- a/opendaylight/md-sal/samples/pom.xml
+++ b/opendaylight/md-sal/samples/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>11.0.2</version>
+    <version>12.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/samples/toaster-provider/src/test/java/org/opendaylight/controller/sample/toaster/provider/OpenDaylightToasterTest.java b/opendaylight/md-sal/samples/toaster-provider/src/test/java/org/opendaylight/controller/sample/toaster/provider/OpenDaylightToasterTest.java
index 4851522cb81a691d6bc538dc9a6e9374fc05901b..b703a2b20bb3a19ec35948d7051f487ee6a62788 100644 (file)
--- a/opendaylight/md-sal/samples/toaster-provider/src/test/java/org/opendaylight/controller/sample/toaster/provider/OpenDaylightToasterTest.java
+++ b/opendaylight/md-sal/samples/toaster-provider/src/test/java/org/opendaylight/controller/sample/toaster/provider/OpenDaylightToasterTest.java
@@ -54,8 +54,10 @@ public class OpenDaylightToasterTest extends AbstractConcurrentDataBrokerTest {
     public void testToasterInitOnStartUp() throws Exception {
         DataBroker broker = getDataBroker();
 
-        ReadTransaction readTx = broker.newReadOnlyTransaction();
-        Optional<Toaster> optional = readTx.read(LogicalDatastoreType.OPERATIONAL, TOASTER_IID).get();
+        Optional<Toaster> optional;
+        try (ReadTransaction readTx = broker.newReadOnlyTransaction()) {
+            optional = readTx.read(LogicalDatastoreType.OPERATIONAL, TOASTER_IID).get();
+        }
         assertNotNull(optional);
         assertTrue("Operational toaster not present", optional.isPresent());
 
@@ -65,8 +67,10 @@ public class OpenDaylightToasterTest extends AbstractConcurrentDataBrokerTest {
         assertEquals(new DisplayString("Opendaylight"), toasterData.getToasterManufacturer());
         assertEquals(new DisplayString("Model 1 - Binding Aware"), toasterData.getToasterModelNumber());
 
-        Optional<Toaster> configToaster = readTx.read(LogicalDatastoreType.CONFIGURATION, TOASTER_IID).get();
-        assertFalse("Didn't expect config data for toaster.", configToaster.isPresent());
+        try (ReadTransaction readTx = broker.newReadOnlyTransaction()) {
+            Boolean configToaster = readTx.exists(LogicalDatastoreType.CONFIGURATION, TOASTER_IID).get();
+            assertFalse("Didn't expect config data for toaster.", configToaster);
+        }
     }
 
     @Test

diff --git a/pom.xml b/pom.xml
index 18fe8c37af8dd70bd7787586834ffa476462d89d..84d0528e17e894cf1accef7c70cf5767292c7f6c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>11.0.2</version>
+    <version>12.0.0</version>
     <relativePath/>
   </parent>