summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--common/api-parent/pom.xml2
-rw-r--r--common/honeycomb-parent/pom.xml20
-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
6 files changed, 23 insertions, 35 deletions
diff --git a/common/api-parent/pom.xml b/common/api-parent/pom.xml
index ed08aee..2f22449 100644
--- a/common/api-parent/pom.xml
+++ b/common/api-parent/pom.xml
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>maven-sal-api-gen-plugin</artifactId>
- <version>0.9.2-Boron-SR2</version>
+ <version>0.8.4-Beryllium-SR4</version>
<type>jar</type>
</dependency>
</dependencies>
diff --git a/common/honeycomb-parent/pom.xml b/common/honeycomb-parent/pom.xml
index 7c90117..3f03475 100644
--- a/common/honeycomb-parent/pom.xml
+++ b/common/honeycomb-parent/pom.xml
@@ -43,12 +43,12 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- ODL dependencies -->
- <yangtools.version>1.0.2-Boron-SR2</yangtools.version>
- <mdsal.version>2.1.2-Boron-SR2</mdsal.version>
- <mdsal.controller.version>1.4.2-Boron-SR2</mdsal.controller.version>
- <mdsalmodel.version>0.9.2-Boron-SR2</mdsalmodel.version>
- <netconf.version>1.1.2-Boron-SR2</netconf.version>
- <restconf.version>1.4.2-Boron-SR2</restconf.version>
+ <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>
<salGeneratorPath>target/generated-sources/mdsal-binding</salGeneratorPath>
<!-- dependencies -->
@@ -58,7 +58,7 @@
<guava.version>18.0</guava.version>
<!-- plugins -->
- <checkstyle.plugin.version>2.17</checkstyle.plugin.version>
+ <checkstyle.plugin.version>2.16</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>
@@ -272,12 +272,6 @@
<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 f617ded..46a46ba 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,11 +50,9 @@ public final class NetconfMonitoringMapperProvider extends ProviderTrait<Netconf
Constructor<?> declaredConstructor =
monitoringWriterCls.getDeclaredConstructor(NetconfMonitoringService.class);
declaredConstructor.setAccessible(true);
- final BindingAwareProvider writer = (BindingAwareProvider) declaredConstructor.newInstance(monitoringService);
- bindingAwareBroker.registerProvider(writer);
+ final BindingAwareProvider o = (BindingAwareProvider) declaredConstructor.newInstance(monitoringService);
+ bindingAwareBroker.registerProvider(o);
- 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 =
@@ -66,12 +64,10 @@ 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, moduleClass, monitoringWriterCls);
+ monitoringMpperFactory.getDeclaredConstructor(NetconfOperationService.class);
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, null, writer);
+ (NetconfOperationServiceFactory) declaredConstructor.newInstance(mdSalMonitoringMapper);
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 2554d02..2c2631b 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.DataTreeChangeListener;
-import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
+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.common.api.data.LogicalDatastoreType;
import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
@@ -72,18 +72,16 @@ public class NetconfNotificationMapperProvider extends ProviderTrait<NetconfOper
bindingAwareBroker.registerProvider(writer);
final Class<?> notifPublisherCls = Class.forName(
- "org.opendaylight.controller.config.yang.netconf.mdsal.notification.CapabilityChangeNotificationProducer");
+ "org.opendaylight.controller.config.yang.netconf.mdsal.notification.BaseCapabilityChangeNotificationPublisher");
declaredConstructor =
notifPublisherCls.getDeclaredConstructor(BaseNotificationPublisherRegistration.class);
declaredConstructor.setAccessible(true);
- final DataTreeChangeListener<Capabilities> publisher =
- (DataTreeChangeListener<Capabilities>) declaredConstructor.newInstance(
- notificationCollector.registerBaseNotificationPublisher());
+ final DataChangeListener publisher = (DataChangeListener) declaredConstructor.newInstance(
+ notificationCollector.registerBaseNotificationPublisher());
- ListenerRegistration<DataTreeChangeListener<Capabilities>> capabilityChangeListenerRegistration = dataBroker
- .registerDataTreeChangeListener(
- new DataTreeIdentifier<>(LogicalDatastoreType.OPERATIONAL, capabilitiesIdentifier),
- publisher);
+ ListenerRegistration<DataChangeListener> capabilityChangeListenerRegistration = dataBroker
+ .registerDataChangeListener(LogicalDatastoreType.OPERATIONAL, capabilitiesIdentifier,
+ publisher, AsyncDataBroker.DataChangeScope.SUBTREE);
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 6664c7d..94d508c 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.rev130715.PortNumber;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.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 3e588c3..f0f5902 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-container2": {
+ "test-persistence:top-container": {
"string": "testing"
},
- "test-persistence:top-container": {
+ "test-persistence:top-container2": {
"string": "testing"
}
} \ No newline at end of file