summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2017-03-15 23:08:34 +0100
committerMarek Gradzki <mgradzki@cisco.com>2017-04-07 11:14:05 +0000
commit870b2ed334d446c2c3224a1df883aa25f7f5011e (patch)
tree8cc683d0a9d688248ef3d0b2d6708a3ea9035db1
parent0602a776d88508f838697d844f9a2ba3cc19e28a (diff)
Bump ODL dependencies to Boron-SR3
Boron SR3 contains fixes for HC2VPP-62,HC2VPP-69,HC2VPP-68 Change-Id: I06ad40da6fe2f702c735bfa5413de19ba3132046 Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
-rw-r--r--common/honeycomb-parent/pom.xml22
-rw-r--r--infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfMonitoringMapperProvider.java12
-rw-r--r--infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfNotificationMapperProvider.java18
-rw-r--r--infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/restconf/RestconfProvider.java2
-rw-r--r--infra/translate-utils/src/test/resources/expected-persisted-output.txt4
5 files changed, 35 insertions, 23 deletions
diff --git a/common/honeycomb-parent/pom.xml b/common/honeycomb-parent/pom.xml
index cc4ea6b88..d1d00b479 100644
--- a/common/honeycomb-parent/pom.xml
+++ b/common/honeycomb-parent/pom.xml
@@ -43,13 +43,13 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- ODL dependencies -->
- <yangtools.version>0.8.4-Beryllium-SR4</yangtools.version>
- <mdsal.version>2.0.4-Beryllium-SR4</mdsal.version>
- <mdsal.controller.version>1.3.4-Beryllium-SR4</mdsal.controller.version>
- <mdsalmodel.version>0.8.4-Beryllium-SR4</mdsalmodel.version>
- <netconf.version>1.0.4-Beryllium-SR4</netconf.version>
- <restconf.version>1.3.4-Beryllium-SR4</restconf.version>
- <salGenerator.version>0.8.4-Beryllium-SR4</salGenerator.version>
+ <yangtools.version>1.0.3-Boron-SR3</yangtools.version>
+ <mdsal.version>2.1.3-Boron-SR3</mdsal.version>
+ <mdsal.controller.version>1.4.3-Boron-SR3</mdsal.controller.version>
+ <mdsalmodel.version>0.9.3-Boron-SR3</mdsalmodel.version>
+ <netconf.version>1.1.3-Boron-SR3</netconf.version>
+ <restconf.version>1.4.3-Boron-SR3</restconf.version>
+ <salGenerator.version>0.9.3-Boron-SR3</salGenerator.version>
<salGeneratorPath>target/generated-sources/mdsal-binding</salGeneratorPath>
<!-- dependencies -->
@@ -59,7 +59,7 @@
<guava.version>18.0</guava.version>
<!-- plugins -->
- <checkstyle.plugin.version>2.16</checkstyle.plugin.version>
+ <checkstyle.plugin.version>2.17</checkstyle.plugin.version>
<checkstyle.version>7.1.2</checkstyle.version>
<maven.javadoc.version>2.10.3</maven.javadoc.version>
<jacoco.version>0.7.2.201409121644</jacoco.version>
@@ -273,6 +273,12 @@
<artifactId>checkstyle-logging</artifactId>
<version>${yangtools.version}</version>
</dependency>
+ <!-- Needed by ODL's checkstyle-logging -->
+ <dependency>
+ <groupId>com.puppycrawl.tools</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>${checkstyle.version}</version>
+ </dependency>
</dependencies>
</plugin>
<!-- Deactivate strict java8 checks -->
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<Netconf
Constructor<?> 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<Netconf
final Class<?> 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<NetconfOper
bindingAwareBroker.registerProvider(writer);
final Class<?> 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<Capabilities> publisher =
+ (DataTreeChangeListener<Capabilities>) declaredConstructor.newInstance(
+ notificationCollector.registerBaseNotificationPublisher());
- ListenerRegistration<DataChangeListener> capabilityChangeListenerRegistration = dataBroker
- .registerDataChangeListener(LogicalDatastoreType.OPERATIONAL, capabilitiesIdentifier,
- publisher, AsyncDataBroker.DataChangeScope.SUBTREE);
+ ListenerRegistration<DataTreeChangeListener<Capabilities>> 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/restconf/RestconfProvider.java b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/restconf/RestconfProvider.java
index 94d508c99..6664c7d33 100644
--- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/restconf/RestconfProvider.java
+++ b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/restconf/RestconfProvider.java
@@ -22,7 +22,7 @@ import io.fd.honeycomb.infra.distro.cfgattrs.HoneycombConfiguration;
import org.opendaylight.controller.sal.core.api.Broker;
import org.opendaylight.netconf.sal.rest.api.RestConnector;
import org.opendaylight.netconf.sal.restconf.impl.RestconfProviderImpl;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.PortNumber;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
final class RestconfProvider extends ProviderTrait<RestConnector> {
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