From: Jakub Morvay <jmorvay@frinx.io>
Date: Thu, 25 Oct 2018 17:28:58 +0000 (+0200)
Subject: Fix mounting logic in clustered topology
X-Git-Tag: release/neon~118^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=4685af5ad0d723e1aaaacba29b577d37a59a1043;p=netconf.git

Fix mounting logic in clustered topology

https://git.opendaylight.org/gerrit/#/c/75655/ prepared netconf
southbound plugin to support action statements, but it missed to adjust
clustered netconf topology MasterSalFacade to the changes.

Fix that.

JIRA: NETCONF-575
Change-Id: I0b2fa9258cf362d1227f62127c2c3b44126677f3
Signed-off-by: Jakub Morvay <jmorvay@frinx.io>
---

diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/MasterSalFacade.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/MasterSalFacade.java
index 3a70ed700c..8e13f630d8 100644
--- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/MasterSalFacade.java
+++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/MasterSalFacade.java
@@ -18,6 +18,7 @@ import com.google.common.base.Preconditions;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.dom.api.DOMActionService;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
 import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService;
 import org.opendaylight.controller.md.sal.dom.api.DOMNotification;
@@ -66,6 +67,19 @@ class MasterSalFacade implements AutoCloseable, RemoteDeviceHandler<NetconfSessi
         this.actorResponseWaitTime = actorResponseWaitTime;
     }
 
+    @Override
+    public void onDeviceConnected(final SchemaContext remoteSchemaContext,
+                                  final NetconfSessionPreferences sessionPreferences,
+                                  final DOMRpcService domRpcService, final DOMActionService domActionService) {
+        // We do not support actions in clustered topology yet
+        if (domActionService != null) {
+            LOG.warn("{}: YANG 1.1 actions are not supported in clustered netconf topology, "
+                    + "DOMActionService will not be exposed for the device");
+        }
+
+        onDeviceConnected(remoteSchemaContext, sessionPreferences, domRpcService);
+    }
+
     @Override
     public void onDeviceConnected(final SchemaContext remoteSchemaContext,
                                   final NetconfSessionPreferences sessionPreferences,