From 4273f4e051b5f25ebe932e49e72388e56ef0ffd8 Mon Sep 17 00:00:00 2001 From: Maros Marsalek Date: Thu, 13 Oct 2016 17:37:54 +0200 Subject: HONEYCOMB-225 Bump ODL to Boron Change-Id: I45e30b4815737dd4bafe39d839d90c9799ad3cb7 Signed-off-by: Maros Marsalek --- common/api-parent/pom.xml | 2 +- common/honeycomb-parent/pom.xml | 31 +++++++++++++--------- .../netconf/NetconfMonitoringMapperProvider.java | 12 ++++++--- .../netconf/NetconfNotificationMapperProvider.java | 18 +++++++------ .../netconf/NetconfServerDispatcherProvider.java | 14 +++++++++- .../infra/distro/restconf/RestconfProvider.java | 2 +- .../test/resources/expected-persisted-output.txt | 4 +-- 7 files changed, 54 insertions(+), 29 deletions(-) diff --git a/common/api-parent/pom.xml b/common/api-parent/pom.xml index 531e47009..8baec3694 100644 --- a/common/api-parent/pom.xml +++ b/common/api-parent/pom.xml @@ -40,7 +40,7 @@ org.opendaylight.mdsal maven-sal-api-gen-plugin - 0.8.2-Beryllium-SR2 + 0.9.0-Boron jar diff --git a/common/honeycomb-parent/pom.xml b/common/honeycomb-parent/pom.xml index 5843d4144..511e685ff 100644 --- a/common/honeycomb-parent/pom.xml +++ b/common/honeycomb-parent/pom.xml @@ -43,27 +43,28 @@ UTF-8 - 0.8.2-Beryllium-SR2 - 2.0.2-Beryllium-SR2 - 1.3.2-Beryllium-SR2 - 0.8.2-Beryllium-SR2 - 1.0.2-Beryllium-SR2 - 1.3.2-Beryllium-SR2 + 1.0.0-Boron + 2.1.0-Boron + 1.4.0-Boron + 0.9.0-Boron + 1.1.0-Boron + 1.4.0-Boron target/generated-sources/mdsal-binding 4.11 - 1.9.5 + 1.10.19 1.3 18.0 - 2.16 + 2.17 + 6.16 2.10.3 0.7.2.201409121644 1.4 - 3.3 - 3.0.0 + 3.5.1 + 3.0.1 APACHE_HEADER.txt @@ -72,7 +73,7 @@ false 2.9 - 2.6 + 3.0.1 3.4 1.5.3 @@ -202,7 +203,7 @@ maven-checkstyle-plugin - ${checkstyle.version} + ${checkstyle.plugin.version} honeycomb-checkstyle.xml @@ -273,6 +274,12 @@ checkstyle-logging ${yangtools.version} + + + com.puppycrawl.tools + checkstyle + ${checkstyle.version} + diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfMonitoringMapperProvider.java b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfMonitoringMapperProvider.java index 46a46ba47..f617ded44 100644 --- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfMonitoringMapperProvider.java +++ b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfMonitoringMapperProvider.java @@ -50,9 +50,11 @@ public final class NetconfMonitoringMapperProvider extends ProviderTrait declaredConstructor = monitoringWriterCls.getDeclaredConstructor(NetconfMonitoringService.class); declaredConstructor.setAccessible(true); - final BindingAwareProvider o = (BindingAwareProvider) declaredConstructor.newInstance(monitoringService); - bindingAwareBroker.registerProvider(o); + final BindingAwareProvider writer = (BindingAwareProvider) declaredConstructor.newInstance(monitoringService); + bindingAwareBroker.registerProvider(writer); + final Class moduleClass = Class.forName( + "org.opendaylight.controller.config.yang.netconf.mdsal.monitoring.NetconfMdsalMonitoringMapperModule"); final Class monitoringMapperCls = Class.forName( "org.opendaylight.controller.config.yang.netconf.mdsal.monitoring.NetconfMdsalMonitoringMapperModule$MdsalMonitoringMapper"); declaredConstructor = @@ -64,10 +66,12 @@ public final class NetconfMonitoringMapperProvider extends ProviderTrait monitoringMpperFactory = Class.forName( "org.opendaylight.controller.config.yang.netconf.mdsal.monitoring.NetconfMdsalMonitoringMapperModule$MdSalMonitoringMapperFactory"); declaredConstructor = - monitoringMpperFactory.getDeclaredConstructor(NetconfOperationService.class); + monitoringMpperFactory.getDeclaredConstructor(NetconfOperationService.class, moduleClass, monitoringWriterCls); declaredConstructor.setAccessible(true); + // The second argument is null, it should be the parent cfg-subsystem module class instance, that we dont have + // it's used only during close so dont close the factory using its close() method final NetconfOperationServiceFactory mdSalMonitoringMapperFactory = - (NetconfOperationServiceFactory) declaredConstructor.newInstance(mdSalMonitoringMapper); + (NetconfOperationServiceFactory) declaredConstructor.newInstance(mdSalMonitoringMapper, null, writer); aggregator.onAddNetconfOperationServiceFactory(mdSalMonitoringMapperFactory); return mdSalMonitoringMapperFactory; } catch (final ReflectiveOperationException e) { diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfNotificationMapperProvider.java b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfNotificationMapperProvider.java index 2c2631b0b..2554d026c 100644 --- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfNotificationMapperProvider.java +++ b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfNotificationMapperProvider.java @@ -21,8 +21,8 @@ import com.google.inject.name.Named; import io.fd.honeycomb.infra.distro.ProviderTrait; import java.lang.reflect.Constructor; import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.DataChangeListener; -import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker; +import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener; +import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; import org.opendaylight.controller.sal.binding.api.BindingAwareProvider; @@ -72,16 +72,18 @@ public class NetconfNotificationMapperProvider extends ProviderTrait notifPublisherCls = Class.forName( - "org.opendaylight.controller.config.yang.netconf.mdsal.notification.BaseCapabilityChangeNotificationPublisher"); + "org.opendaylight.controller.config.yang.netconf.mdsal.notification.CapabilityChangeNotificationProducer"); declaredConstructor = notifPublisherCls.getDeclaredConstructor(BaseNotificationPublisherRegistration.class); declaredConstructor.setAccessible(true); - final DataChangeListener publisher = (DataChangeListener) declaredConstructor.newInstance( - notificationCollector.registerBaseNotificationPublisher()); + final DataTreeChangeListener publisher = + (DataTreeChangeListener) declaredConstructor.newInstance( + notificationCollector.registerBaseNotificationPublisher()); - ListenerRegistration capabilityChangeListenerRegistration = dataBroker - .registerDataChangeListener(LogicalDatastoreType.OPERATIONAL, capabilitiesIdentifier, - publisher, AsyncDataBroker.DataChangeScope.SUBTREE); + ListenerRegistration> capabilityChangeListenerRegistration = dataBroker + .registerDataTreeChangeListener( + new DataTreeIdentifier<>(LogicalDatastoreType.OPERATIONAL, capabilitiesIdentifier), + publisher); NetconfNotificationOperationServiceFactory netconfNotificationOperationServiceFactory = new NetconfNotificationOperationServiceFactory(notificationRegistry); aggregator.onAddNetconfOperationServiceFactory(netconfNotificationOperationServiceFactory); diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfServerDispatcherProvider.java b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfServerDispatcherProvider.java index 1f3caafa1..00c2d1617 100644 --- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfServerDispatcherProvider.java +++ b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfServerDispatcherProvider.java @@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit; import org.opendaylight.netconf.api.NetconfServerDispatcher; import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService; import org.opendaylight.netconf.impl.NetconfServerDispatcherImpl; -import org.opendaylight.netconf.impl.NetconfServerSessionNegotiatorFactory; import org.opendaylight.netconf.impl.SessionIdProvider; import org.opendaylight.netconf.impl.osgi.AggregatedNetconfOperationServiceFactory; import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory; @@ -57,4 +56,17 @@ public final class NetconfServerDispatcherProvider extends ProviderTrait { diff --git a/infra/translate-utils/src/test/resources/expected-persisted-output.txt b/infra/translate-utils/src/test/resources/expected-persisted-output.txt index f0f5902e2..3e588c381 100644 --- a/infra/translate-utils/src/test/resources/expected-persisted-output.txt +++ b/infra/translate-utils/src/test/resources/expected-persisted-output.txt @@ -1,8 +1,8 @@ { - "test-persistence:top-container": { + "test-persistence:top-container2": { "string": "testing" }, - "test-persistence:top-container2": { + "test-persistence:top-container": { "string": "testing" } } \ No newline at end of file -- cgit 1.2.3-korg