From: Robert Varga Date: Tue, 20 Aug 2019 14:37:14 +0000 (+0200) Subject: Bump mdsal to 5.0.2 X-Git-Tag: release/magnesium~55 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=41c10e8423c8f0fa88a7f7180dfbb582fabcbb8b Bump mdsal to 5.0.2 This bumps mdsal to 5.0.2 as part of Magnesium MRI. Change-Id: I93e10e95b7a241d678829afb732e2adef82c1a24 Signed-off-by: Robert Varga --- diff --git a/benchmark/api/pom.xml b/benchmark/api/pom.xml index 6c82382d6a..7530e26064 100644 --- a/benchmark/api/pom.xml +++ b/benchmark/api/pom.xml @@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 4.0.6 + 5.0.2 diff --git a/benchmark/dsbenchmark/pom.xml b/benchmark/dsbenchmark/pom.xml index 5b297dd6f1..19d97e3074 100644 --- a/benchmark/dsbenchmark/pom.xml +++ b/benchmark/dsbenchmark/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 4.0.6 + 5.0.2 diff --git a/benchmark/ntfbenchmark/pom.xml b/benchmark/ntfbenchmark/pom.xml index 39f5b5862a..0c4a53cb90 100644 --- a/benchmark/ntfbenchmark/pom.xml +++ b/benchmark/ntfbenchmark/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 4.0.6 + 5.0.2 diff --git a/benchmark/rpcbenchmark/pom.xml b/benchmark/rpcbenchmark/pom.xml index 966ce5fa86..deb8c6b42c 100644 --- a/benchmark/rpcbenchmark/pom.xml +++ b/benchmark/rpcbenchmark/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 4.0.6 + 5.0.2 diff --git a/features/benchmark/odl-benchmark-api/pom.xml b/features/benchmark/odl-benchmark-api/pom.xml index 06941863ea..4fdaacd0f5 100644 --- a/features/benchmark/odl-benchmark-api/pom.xml +++ b/features/benchmark/odl-benchmark-api/pom.xml @@ -27,7 +27,7 @@ org.opendaylight.mdsal odl-mdsal-binding-base - 4.0.6 + 5.0.2 xml features diff --git a/features/mdsal/odl-clustering-test-app/pom.xml b/features/mdsal/odl-clustering-test-app/pom.xml index 79d8ca50f4..17a490a465 100644 --- a/features/mdsal/odl-clustering-test-app/pom.xml +++ b/features/mdsal/odl-clustering-test-app/pom.xml @@ -26,7 +26,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.6 + 5.0.2 import pom diff --git a/features/mdsal/odl-controller-binding-api/pom.xml b/features/mdsal/odl-controller-binding-api/pom.xml index 9de5f56ea3..ef855f734a 100644 --- a/features/mdsal/odl-controller-binding-api/pom.xml +++ b/features/mdsal/odl-controller-binding-api/pom.xml @@ -29,7 +29,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.6 + 5.0.2 pom import diff --git a/features/mdsal/odl-controller-binding-api/src/main/feature/feature.xml b/features/mdsal/odl-controller-binding-api/src/main/feature/feature.xml index 4557829b98..815e9a5100 100644 --- a/features/mdsal/odl-controller-binding-api/src/main/feature/feature.xml +++ b/features/mdsal/odl-controller-binding-api/src/main/feature/feature.xml @@ -8,6 +8,6 @@ --> - odl-mdsal-binding-api + odl-mdsal-binding-api diff --git a/features/mdsal/odl-controller-dom-api/pom.xml b/features/mdsal/odl-controller-dom-api/pom.xml index 3560bda655..4fec589e46 100644 --- a/features/mdsal/odl-controller-dom-api/pom.xml +++ b/features/mdsal/odl-controller-dom-api/pom.xml @@ -29,7 +29,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.6 + 5.0.2 pom import diff --git a/features/mdsal/odl-controller-dom-api/src/main/feature/feature.xml b/features/mdsal/odl-controller-dom-api/src/main/feature/feature.xml index f3f8161fca..b6c03f124b 100644 --- a/features/mdsal/odl-controller-dom-api/src/main/feature/feature.xml +++ b/features/mdsal/odl-controller-dom-api/src/main/feature/feature.xml @@ -8,6 +8,6 @@ --> - odl-mdsal-dom-api + odl-mdsal-dom-api diff --git a/features/mdsal/odl-controller-mdsal-common/pom.xml b/features/mdsal/odl-controller-mdsal-common/pom.xml index 5aa669d791..5037ac01f3 100644 --- a/features/mdsal/odl-controller-mdsal-common/pom.xml +++ b/features/mdsal/odl-controller-mdsal-common/pom.xml @@ -28,7 +28,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.6 + 5.0.2 pom import diff --git a/features/mdsal/odl-controller-mdsal-common/src/main/feature/feature.xml b/features/mdsal/odl-controller-mdsal-common/src/main/feature/feature.xml index b01808ce93..f8859f6be3 100644 --- a/features/mdsal/odl-controller-mdsal-common/src/main/feature/feature.xml +++ b/features/mdsal/odl-controller-mdsal-common/src/main/feature/feature.xml @@ -8,7 +8,7 @@ --> - odl-mdsal-common - odl-mdsal-binding-runtime + odl-mdsal-common + odl-mdsal-binding-runtime diff --git a/features/mdsal/odl-controller-model-topology/pom.xml b/features/mdsal/odl-controller-model-topology/pom.xml index 3b0d22fe68..e2c04ef4de 100644 --- a/features/mdsal/odl-controller-model-topology/pom.xml +++ b/features/mdsal/odl-controller-model-topology/pom.xml @@ -27,7 +27,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.6 + 5.0.2 pom import diff --git a/features/mdsal/odl-mdsal-broker-local/pom.xml b/features/mdsal/odl-mdsal-broker-local/pom.xml index 7dafb4d2eb..da5b6dd974 100644 --- a/features/mdsal/odl-mdsal-broker-local/pom.xml +++ b/features/mdsal/odl-mdsal-broker-local/pom.xml @@ -44,7 +44,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.6 + 5.0.2 pom import diff --git a/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml b/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml index de89213397..af96237bfe 100644 --- a/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml +++ b/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml @@ -8,9 +8,9 @@ --> - odl-mdsal-dom - odl-mdsal-eos-binding - odl-mdsal-eos-dom - odl-mdsal-singleton-dom + odl-mdsal-dom + odl-mdsal-eos-binding + odl-mdsal-eos-dom + odl-mdsal-singleton-dom diff --git a/features/mdsal/odl-mdsal-broker/pom.xml b/features/mdsal/odl-mdsal-broker/pom.xml index c1721b05cd..9ae7e57f4a 100644 --- a/features/mdsal/odl-mdsal-broker/pom.xml +++ b/features/mdsal/odl-mdsal-broker/pom.xml @@ -29,7 +29,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.6 + 5.0.2 pom import diff --git a/features/mdsal/odl-mdsal-broker/src/main/feature/feature.xml b/features/mdsal/odl-mdsal-broker/src/main/feature/feature.xml index d6c1382349..68f4daa2f2 100644 --- a/features/mdsal/odl-mdsal-broker/src/main/feature/feature.xml +++ b/features/mdsal/odl-mdsal-broker/src/main/feature/feature.xml @@ -8,7 +8,7 @@ --> - odl-mdsal-singleton-dom - odl-mdsal-eos-binding + odl-mdsal-singleton-dom + odl-mdsal-eos-binding diff --git a/features/mdsal/odl-mdsal-distributed-datastore/pom.xml b/features/mdsal/odl-mdsal-distributed-datastore/pom.xml index d07dd9da0a..dd55127849 100644 --- a/features/mdsal/odl-mdsal-distributed-datastore/pom.xml +++ b/features/mdsal/odl-mdsal-distributed-datastore/pom.xml @@ -36,7 +36,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.6 + 5.0.2 pom import diff --git a/features/mdsal/odl-mdsal-distributed-datastore/src/main/feature/feature.xml b/features/mdsal/odl-mdsal-distributed-datastore/src/main/feature/feature.xml index 089d7683b8..b313b584d9 100644 --- a/features/mdsal/odl-mdsal-distributed-datastore/src/main/feature/feature.xml +++ b/features/mdsal/odl-mdsal-distributed-datastore/src/main/feature/feature.xml @@ -10,9 +10,9 @@ odl-apache-commons-text odl-yangtools-codec - odl-mdsal-eos-dom - odl-mdsal-dom-broker - odl-mdsal-binding-dom-adapter + odl-mdsal-eos-dom + odl-mdsal-dom-broker + odl-mdsal-binding-dom-adapter mvn:org.opendaylight.controller/sal-clustering-config/${project.version}/xml/akkaconf diff --git a/features/mdsal/odl-mdsal-model-inventory/pom.xml b/features/mdsal/odl-mdsal-model-inventory/pom.xml index d14fa5a769..252537a726 100644 --- a/features/mdsal/odl-mdsal-model-inventory/pom.xml +++ b/features/mdsal/odl-mdsal-model-inventory/pom.xml @@ -28,7 +28,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.6 + 5.0.2 pom import diff --git a/features/mdsal/odl-message-bus-collector/pom.xml b/features/mdsal/odl-message-bus-collector/pom.xml index 5564292b3d..b6c25c3abc 100644 --- a/features/mdsal/odl-message-bus-collector/pom.xml +++ b/features/mdsal/odl-message-bus-collector/pom.xml @@ -37,7 +37,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.6 + 5.0.2 pom import diff --git a/features/mdsal/odl-toaster/pom.xml b/features/mdsal/odl-toaster/pom.xml index e526bddfa6..6331db4052 100644 --- a/features/mdsal/odl-toaster/pom.xml +++ b/features/mdsal/odl-toaster/pom.xml @@ -27,7 +27,7 @@ org.opendaylight.mdsal odl-mdsal-binding-runtime - 4.0.6 + 5.0.2 xml features diff --git a/karaf/pom.xml b/karaf/pom.xml index 52f70c591b..0fc6257a54 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -55,7 +55,7 @@ org.opendaylight.mdsal features-mdsal - 4.0.6 + 5.0.2 features xml runtime diff --git a/opendaylight/blueprint/pom.xml b/opendaylight/blueprint/pom.xml index e672ef168b..a6980ae488 100644 --- a/opendaylight/blueprint/pom.xml +++ b/opendaylight/blueprint/pom.xml @@ -27,7 +27,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.6 + 5.0.2 pom import diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml index 140f770cd9..034eef99fd 100644 --- a/opendaylight/config/pom.xml +++ b/opendaylight/config/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.mdsal binding-parent - 4.0.6 + 5.0.2 diff --git a/opendaylight/md-sal/parent/pom.xml b/opendaylight/md-sal/parent/pom.xml index 4c646b93b8..d7e51df943 100644 --- a/opendaylight/md-sal/parent/pom.xml +++ b/opendaylight/md-sal/parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 4.0.6 + 5.0.2 diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingBrokerTestFactory.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingBrokerTestFactory.java index e0a332f593..cd4e4101d9 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingBrokerTestFactory.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingBrokerTestFactory.java @@ -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; - } } diff --git a/opendaylight/md-sal/sal-binding-dom-it/pom.xml b/opendaylight/md-sal/sal-binding-dom-it/pom.xml index 21cf3df976..3a7ea72485 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/pom.xml +++ b/opendaylight/md-sal/sal-binding-dom-it/pom.xml @@ -25,7 +25,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.6 + 5.0.2 pom import diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/CarProvider.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/CarProvider.java index a6f154bfcd..1daef6eeb1 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/CarProvider.java +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/CarProvider.java @@ -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.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; } diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/MdsalLowLevelTestProvider.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/MdsalLowLevelTestProvider.java index 8c4e9716f0..f4fb21b6dd 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/MdsalLowLevelTestProvider.java +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/MdsalLowLevelTestProvider.java @@ -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); diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/AbstractTransactionHandler.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/AbstractTransactionHandler.java index 1a0f39e693..de4f3efa03 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/AbstractTransactionHandler.java +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/AbstractTransactionHandler.java @@ -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() { diff --git a/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java b/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java index 4b94182d6d..ab91aaba3a 100644 --- a/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java +++ b/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java @@ -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> 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> 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"); diff --git a/opendaylight/model/model-inventory/pom.xml b/opendaylight/model/model-inventory/pom.xml index dea7718a5f..bcbe93c3b0 100644 --- a/opendaylight/model/model-inventory/pom.xml +++ b/opendaylight/model/model-inventory/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.mdsal binding-parent - 4.0.6 + 5.0.2 diff --git a/opendaylight/model/model-topology/pom.xml b/opendaylight/model/model-topology/pom.xml index ad038b77ff..1b8fc12e55 100644 --- a/opendaylight/model/model-topology/pom.xml +++ b/opendaylight/model/model-topology/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.mdsal binding-parent - 4.0.6 + 5.0.2