Downgrade ODL dependencies to Beryllium-SR4

Workaround for HC2VPP-62
until
https://bugs.opendaylight.org/show_bug.cgi?id=7759
is fixed.

Change-Id: I0e9c82378865bf99c1843b0399940a53350e2d76
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>

4 files changed, 15 insertions, 21 deletions

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 f617ded44..46a46ba47 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 2554d026c..2c2631b0b 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 6664c7d33..94d508c99 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 3e588c381..f0f5902e2 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