Bump mdsal to 5.0.2 03/83803/53
authorRobert Varga <robert.varga@pantheon.tech>
Tue, 20 Aug 2019 14:37:14 +0000 (16:37 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Thu, 10 Oct 2019 09:07:01 +0000 (11:07 +0200)
This bumps mdsal to 5.0.2 as part of Magnesium MRI.

Change-Id: I93e10e95b7a241d678829afb732e2adef82c1a24
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
34 files changed:
benchmark/api/pom.xml
benchmark/dsbenchmark/pom.xml
benchmark/ntfbenchmark/pom.xml
benchmark/rpcbenchmark/pom.xml
features/benchmark/odl-benchmark-api/pom.xml
features/mdsal/odl-clustering-test-app/pom.xml
features/mdsal/odl-controller-binding-api/pom.xml
features/mdsal/odl-controller-binding-api/src/main/feature/feature.xml
features/mdsal/odl-controller-dom-api/pom.xml
features/mdsal/odl-controller-dom-api/src/main/feature/feature.xml
features/mdsal/odl-controller-mdsal-common/pom.xml
features/mdsal/odl-controller-mdsal-common/src/main/feature/feature.xml
features/mdsal/odl-controller-model-topology/pom.xml
features/mdsal/odl-mdsal-broker-local/pom.xml
features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml
features/mdsal/odl-mdsal-broker/pom.xml
features/mdsal/odl-mdsal-broker/src/main/feature/feature.xml
features/mdsal/odl-mdsal-distributed-datastore/pom.xml
features/mdsal/odl-mdsal-distributed-datastore/src/main/feature/feature.xml
features/mdsal/odl-mdsal-model-inventory/pom.xml
features/mdsal/odl-message-bus-collector/pom.xml
features/mdsal/odl-toaster/pom.xml
karaf/pom.xml
opendaylight/blueprint/pom.xml
opendaylight/config/pom.xml
opendaylight/md-sal/parent/pom.xml
opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingBrokerTestFactory.java
opendaylight/md-sal/sal-binding-dom-it/pom.xml
opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/CarProvider.java
opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/MdsalLowLevelTestProvider.java
opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/AbstractTransactionHandler.java
opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java
opendaylight/model/model-inventory/pom.xml
opendaylight/model/model-topology/pom.xml

index 6c82382..7530e26 100644 (file)
@@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>4.0.6</version>
+    <version>5.0.2</version>
     <relativePath/>
   </parent>
 
index 5b297dd..19d97e3 100644 (file)
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>4.0.6</version>
+    <version>5.0.2</version>
     <relativePath/>
   </parent>
 
index 39f5b58..0c4a53c 100644 (file)
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>4.0.6</version>
+    <version>5.0.2</version>
     <relativePath/>
   </parent>
 
index 966ce5f..deb8c6b 100644 (file)
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>4.0.6</version>
+    <version>5.0.2</version>
     <relativePath/>
   </parent>
 
index 0694186..4fdaacd 100644 (file)
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-base</artifactId>
-            <version>4.0.6</version>
+            <version>5.0.2</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
index 79d8ca5..17a490a 100644 (file)
@@ -26,7 +26,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>4.0.6</version>
+                <version>5.0.2</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
index 9de5f56..ef855f7 100644 (file)
@@ -29,7 +29,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>4.0.6</version>
+                <version>5.0.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
index 4557829..815e9a5 100644 (file)
@@ -8,6 +8,6 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-controller-binding-api-${project.version}">
     <feature name="odl-controller-binding-api" version="${project.version}">
-        <feature version="[4,5)">odl-mdsal-binding-api</feature>
+        <feature version="[5,6)">odl-mdsal-binding-api</feature>
     </feature>
 </features>
index 3560bda..4fec589 100644 (file)
@@ -29,7 +29,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>4.0.6</version>
+                <version>5.0.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
index f3f8161..b6c03f1 100644 (file)
@@ -8,6 +8,6 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-controller-dom-api-${project.version}">
     <feature name="odl-controller-dom-api" version="${project.version}">
-        <feature version="[4,5)">odl-mdsal-dom-api</feature>
+        <feature version="[5,6)">odl-mdsal-dom-api</feature>
     </feature>
 </features>
index 5aa669d..5037ac0 100644 (file)
@@ -28,7 +28,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>4.0.6</version>
+                <version>5.0.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
index b01808c..f8859f6 100644 (file)
@@ -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="[4,5)">odl-mdsal-common</feature>
-        <feature version="[4,5)">odl-mdsal-binding-runtime</feature>
+        <feature version="[5,6)">odl-mdsal-common</feature>
+        <feature version="[5,6)">odl-mdsal-binding-runtime</feature>
     </feature>
 </features>
index 3b0d22f..e2c04ef 100644 (file)
@@ -27,7 +27,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>4.0.6</version>
+                <version>5.0.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
index 7dafb4d..da5b6dd 100644 (file)
@@ -44,7 +44,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>4.0.6</version>
+                <version>5.0.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
index de89213..af96237 100644 (file)
@@ -8,9 +8,9 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-mdsal-${project.version}">
     <feature name="odl-mdsal-broker-local" version="${project.version}">
-        <feature version="[4,5)">odl-mdsal-dom</feature>
-        <feature version="[4,5)">odl-mdsal-eos-binding</feature>
-        <feature version="[4,5)">odl-mdsal-eos-dom</feature>
-        <feature version="[4,5)">odl-mdsal-singleton-dom</feature>
+        <feature version="[5,6)">odl-mdsal-dom</feature>
+        <feature version="[5,6)">odl-mdsal-eos-binding</feature>
+        <feature version="[5,6)">odl-mdsal-eos-dom</feature>
+        <feature version="[5,6)">odl-mdsal-singleton-dom</feature>
     </feature>
 </features>
index c1721b0..9ae7e57 100644 (file)
@@ -29,7 +29,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>4.0.6</version>
+                <version>5.0.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
index d6c1382..68f4daa 100644 (file)
@@ -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="[4,5)">odl-mdsal-singleton-dom</feature>
-        <feature version="[4,5)">odl-mdsal-eos-binding</feature>
+        <feature version="[5,6)">odl-mdsal-singleton-dom</feature>
+        <feature version="[5,6)">odl-mdsal-eos-binding</feature>
     </feature>
 </features>
index d07dd9d..dd55127 100644 (file)
@@ -36,7 +36,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>4.0.6</version>
+                <version>5.0.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
index 089d768..b313b58 100644 (file)
@@ -10,9 +10,9 @@
     <feature name="odl-mdsal-distributed-datastore" version="${project.version}">
         <feature version="[6,7)">odl-apache-commons-text</feature>
         <feature version="[4,5)">odl-yangtools-codec</feature>
-        <feature version="[4,5)">odl-mdsal-eos-dom</feature>
-        <feature version="[4,5)">odl-mdsal-dom-broker</feature>
-        <feature version="[4.0.1,5)">odl-mdsal-binding-dom-adapter</feature>
+        <feature version="[5,6)">odl-mdsal-eos-dom</feature>
+        <feature version="[5,6)">odl-mdsal-dom-broker</feature>
+        <feature version="[5,6)">odl-mdsal-binding-dom-adapter</feature>
         <configfile finalname="configuration/initial/akka.conf">
             mvn:org.opendaylight.controller/sal-clustering-config/${project.version}/xml/akkaconf
         </configfile>
index d14fa5a..252537a 100644 (file)
@@ -28,7 +28,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>4.0.6</version>
+                <version>5.0.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
index 5564292..b6c25c3 100644 (file)
@@ -37,7 +37,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>4.0.6</version>
+                <version>5.0.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
index e526bdd..6331db4 100644 (file)
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-runtime</artifactId>
-            <version>4.0.6</version>
+            <version>5.0.2</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
index 52f70c5..0fc6257 100644 (file)
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>features-mdsal</artifactId>
-      <version>4.0.6</version>
+      <version>5.0.2</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
index e672ef1..a6980ae 100644 (file)
@@ -27,7 +27,7 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>4.0.6</version>
+        <version>5.0.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
index 140f770..034eef9 100644 (file)
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>4.0.6</version>
+    <version>5.0.2</version>
     <relativePath/>
   </parent>
 
index 4c646b9..d7e51df 100644 (file)
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>4.0.6</version>
+    <version>5.0.2</version>
     <relativePath/>
   </parent>
 
index e0a332f..cd4e410 100644 (file)
@@ -12,16 +12,12 @@ import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 import java.util.concurrent.ExecutorService;
-import javassist.ClassPool;
 
 @Beta
 @Deprecated
 public class BindingBrokerTestFactory {
-
-    private static final ClassPool CLASS_POOL = ClassPool.getDefault();
     private boolean startWithParsedSchema = true;
     private ExecutorService executor;
-    private ClassPool classPool;
 
 
     public boolean isStartWithParsedSchema() {
@@ -45,18 +41,4 @@ public class BindingBrokerTestFactory {
         ListeningExecutorService listenableExecutor = MoreExecutors.listeningDecorator(executor);
         return new BindingTestContext(listenableExecutor, startWithParsedSchema);
     }
-
-    @Deprecated
-    public ClassPool getClassPool() {
-        if (classPool == null) {
-            return CLASS_POOL;
-        }
-
-        return classPool;
-    }
-
-    @Deprecated
-    public void setClassPool(final ClassPool classPool) {
-        this.classPool = classPool;
-    }
 }
index 21cf3df..3a7ea72 100644 (file)
@@ -25,7 +25,7 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>4.0.6</version>
+        <version>5.0.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
index a6f154b..1daef6e 100644 (file)
@@ -138,16 +138,16 @@ public class CarProvider implements CarService {
         final long inputCount;
 
         // If rate is not provided, or given as zero, then just return.
-        if (input.getRate() == null || input.getRate() == 0) {
+        if (input.getRate() == null || input.getRate().toJava() == 0) {
             LOG_PURCHASE_CAR.info("Exiting stress test as no rate is given.");
             return Futures.immediateFuture(RpcResultBuilder.<StressTestOutput>failed()
                     .withError(ErrorType.PROTOCOL, "invalid rate")
                     .build());
         }
 
-        inputRate = input.getRate();
+        inputRate = input.getRate().toJava();
         if (input.getCount() != null) {
-            inputCount = input.getCount();
+            inputCount = input.getCount().toJava();
         } else {
             inputCount = 0;
         }
index 8c4e971..f4fb21b 100644 (file)
@@ -258,7 +258,7 @@ public class MdsalLowLevelTestProvider implements OdlMdsalLowlevelControlService
         LOG.info("In startPublishNotifications - input: {}", input);
 
         final PublishNotificationsTask task = new PublishNotificationsTask(notificationPublishService, input.getId(),
-                input.getSeconds(), input.getNotificationsPerSecond());
+                input.getSeconds().toJava(), input.getNotificationsPerSecond().toJava());
 
         publishNotificationsTasks.put(input.getId(), task);
 
index 1a0f39e..de4f3ef 100644 (file)
@@ -81,8 +81,8 @@ abstract class AbstractTransactionHandler {
     private volatile State state;
 
     AbstractTransactionHandler(final TransactionsParams params) {
-        runtimeNanos = TimeUnit.SECONDS.toNanos(params.getSeconds());
-        delayNanos = SECOND_AS_NANO / params.getTransactionsPerSecond();
+        runtimeNanos = TimeUnit.SECONDS.toNanos(params.getSeconds().toJava());
+        delayNanos = SECOND_AS_NANO / params.getTransactionsPerSecond().toJava();
     }
 
     final synchronized void doStart() {
index 4b94182..ab91aab 100644 (file)
@@ -66,6 +66,7 @@ import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.common.RpcError.ErrorType;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
+import org.opendaylight.yangtools.yang.common.Uint32;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -184,9 +185,9 @@ public class OpendaylightToaster extends AbstractMXBean
                         + "old Toaster: {}, new Toaster: {}", change.getRootPath().getRootIdentifier(),
                         oldToaster, newToaster);
 
-                Long darkness = newToaster.getDarknessFactor();
+                Uint32 darkness = newToaster.getDarknessFactor();
                 if (darkness != null) {
-                    darknessFactor.set(darkness);
+                    darknessFactor.set(darkness.toJava());
                 }
             } else if (rootNode.getModificationType() == DELETE) {
                 LOG.info("onDataTreeChanged - Toaster config with path {} was deleted: old Toaster: {}",
@@ -218,7 +219,7 @@ public class OpendaylightToaster extends AbstractMXBean
 
         final SettableFuture<RpcResult<MakeToastOutput>> futureResult = SettableFuture.create();
 
-        checkStatusAndMakeToast(input, futureResult, toasterAppConfig.getMaxMakeToastTries());
+        checkStatusAndMakeToast(input, futureResult, toasterAppConfig.getMaxMakeToastTries().toJava());
 
         return futureResult;
     }
@@ -323,7 +324,7 @@ public class OpendaylightToaster extends AbstractMXBean
     public ListenableFuture<RpcResult<RestockToasterOutput>> restockToaster(final RestockToasterInput input) {
         LOG.info("restockToaster: {}", input);
 
-        amountOfBreadInStock.set(input.getAmountOfBreadToStock());
+        amountOfBreadInStock.set(input.getAmountOfBreadToStock().toJava());
 
         if (amountOfBreadInStock.get() > 0) {
             ToasterRestocked reStockedNotification = new ToasterRestockedBuilder()
@@ -398,7 +399,8 @@ public class OpendaylightToaster extends AbstractMXBean
         public Void call() {
             try {
                 // make toast just sleeps for n seconds per doneness level.
-                Thread.sleep(OpendaylightToaster.this.darknessFactor.get() * toastRequest.getToasterDoneness());
+                Thread.sleep(OpendaylightToaster.this.darknessFactor.get()
+                        * toastRequest.getToasterDoneness().toJava());
 
             } catch (InterruptedException e) {
                 LOG.info("Interrupted while making the toast");
index dea7718..bcbe93c 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>4.0.6</version>
+        <version>5.0.2</version>
         <relativePath/>
     </parent>
 
index ad038b7..1b8fc12 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>4.0.6</version>
+        <version>5.0.2</version>
         <relativePath/>
     </parent>
 

©2013 OpenDaylight, A Linux Foundation Collaborative Project. All Rights Reserved.
OpenDaylight is a registered trademark of The OpenDaylight Project, Inc.
Linux Foundation and OpenDaylight are registered trademarks of the Linux Foundation.
Linux is a registered trademark of Linus Torvalds.