From 556a0f59abc9b09005d40945bc20948d69e4f98e Mon Sep 17 00:00:00 2001
From: Michal Cmarada <michal.cmarada@pantheon.tech>
Date: Tue, 25 Sep 2018 11:15:35 +0200
Subject: Bump ODL dependencies to Fluorine (HONEYCOMB-433)

Change-Id: I142ebd2899272feff00abe7d4bae708f093ee3ec
Signed-off-by: Michal Cmarada <michal.cmarada@pantheon.tech>
---
 .../netconf/HoneycombNotification2NetconfProvider.java         |  8 ++++----
 .../northbound/netconf/NetconfMdsalMapperProvider.java         | 10 ++++------
 .../honeycomb-minimal-resources/config/netconf-whitelist.xml   |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'infra/northbound/netconf')

diff --git a/infra/northbound/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/HoneycombNotification2NetconfProvider.java b/infra/northbound/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/HoneycombNotification2NetconfProvider.java
index 26ecf3a44..287629288 100644
--- a/infra/northbound/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/HoneycombNotification2NetconfProvider.java
+++ b/infra/northbound/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/HoneycombNotification2NetconfProvider.java
@@ -28,7 +28,7 @@ import javax.annotation.Nonnull;
 import org.opendaylight.controller.md.sal.dom.api.DOMNotification;
 import org.opendaylight.controller.md.sal.dom.api.DOMNotificationListener;
 import org.opendaylight.controller.md.sal.dom.broker.impl.DOMNotificationRouter;
-import org.opendaylight.controller.sal.core.api.model.SchemaService;
+import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.netconf.notifications.NetconfNotificationCollector;
 import org.opendaylight.netconf.notifications.NotificationPublisherRegistration;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.StreamNameType;
@@ -46,7 +46,7 @@ public final class HoneycombNotification2NetconfProvider
     @Inject
     private DOMNotificationRouter notificationRouter;
     @Inject
-    private SchemaService schemaService;
+    private DOMSchemaService schemaService;
     @Inject
     private NetconfConfiguration cfgAttributes;
     @Inject
@@ -112,10 +112,10 @@ public final class HoneycombNotification2NetconfProvider
 
         private final NotificationPublisherRegistration netconfNotifReg;
         private final StreamNameType streamType;
-        private final SchemaService schemaService;
+        private final DOMSchemaService schemaService;
 
         TranslatingNotificationListener(final NotificationPublisherRegistration netconfNotifReg,
-                                               final StreamNameType streamType, final SchemaService schemaService) {
+                                               final StreamNameType streamType, final DOMSchemaService schemaService) {
             this.netconfNotifReg = netconfNotifReg;
             this.streamType = streamType;
             this.schemaService = schemaService;
diff --git a/infra/northbound/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMdsalMapperProvider.java b/infra/northbound/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMdsalMapperProvider.java
index bb9264684..da092b21c 100644
--- a/infra/northbound/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMdsalMapperProvider.java
+++ b/infra/northbound/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMdsalMapperProvider.java
@@ -23,8 +23,7 @@ import com.google.inject.name.Named;
 import io.fd.honeycomb.binding.init.ProviderTrait;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcService;
-import org.opendaylight.controller.sal.core.api.model.SchemaService;
-import org.opendaylight.mdsal.binding.generator.impl.ModuleInfoBackedContext;
+import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory;
 import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactoryListener;
 import org.opendaylight.netconf.mdsal.connector.MdsalNetconfOperationServiceFactory;
@@ -32,12 +31,10 @@ import org.opendaylight.netconf.mdsal.connector.MdsalNetconfOperationServiceFact
 public final class NetconfMdsalMapperProvider extends ProviderTrait<NetconfOperationServiceFactory> {
 
     @Inject
-    private SchemaService schemaService;
+    private DOMSchemaService schemaService;
     @Inject
     private NetconfOperationServiceFactoryListener aggregator;
     @Inject
-    private ModuleInfoBackedContext moduleInfoBackedContext;
-    @Inject
     @Named(HONEYCOMB_CONFIG)
     private DOMDataBroker domBroker;
     @Inject
@@ -48,7 +45,8 @@ public final class NetconfMdsalMapperProvider extends ProviderTrait<NetconfOpera
     @Override
     protected MdsalNetconfOperationServiceFactory create() {
         MdsalNetconfOperationServiceFactory mdsalNetconfOperationServiceFactory =
-                new MdsalNetconfOperationServiceFactory(schemaService, moduleInfoBackedContext, netconfOperationServiceFactoryListener, domBroker, rpcService);
+                new MdsalNetconfOperationServiceFactory(schemaService, netconfOperationServiceFactoryListener,
+                        domBroker, rpcService);
         return mdsalNetconfOperationServiceFactory;
     }
 }
diff --git a/infra/northbound/netconf/src/main/resources/honeycomb-minimal-resources/config/netconf-whitelist.xml b/infra/northbound/netconf/src/main/resources/honeycomb-minimal-resources/config/netconf-whitelist.xml
index 371ee2b18..32e5ed07d 100644
--- a/infra/northbound/netconf/src/main/resources/honeycomb-minimal-resources/config/netconf-whitelist.xml
+++ b/infra/northbound/netconf/src/main/resources/honeycomb-minimal-resources/config/netconf-whitelist.xml
@@ -40,7 +40,7 @@
             </description>
         </module>
         <module>
-            <package>org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev130712</package>
+            <package>org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021</package>
             <description>
                 Required for mounting of netconf devices(Operational read does not work without it)
             </description>
-- 
cgit 1.2.3-korg