X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fnetconf-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fimpl%2Fmapping%2Foperations%2FDefaultCommit.java;h=d6940a1a453fcaaf14f4e6e30292f8dbc427256d;hp=9069e87a935784419e0c573f8721d8e31c1b3af8;hb=9c9f6e506395f806978a955a8cf51ba736b978ad;hpb=f467b1de7ed7a25d19d9210c0372bfb8b8fd697f

diff --git a/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/mapping/operations/DefaultCommit.java b/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/mapping/operations/DefaultCommit.java
index 9069e87a93..d6940a1a45 100644
--- a/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/mapping/operations/DefaultCommit.java
+++ b/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/mapping/operations/DefaultCommit.java
@@ -8,16 +8,14 @@
 
 package org.opendaylight.controller.netconf.impl.mapping.operations;
 
-import java.io.InputStream;
-import java.util.Map;
-
+import com.google.common.base.Preconditions;
 import org.opendaylight.controller.netconf.api.NetconfDocumentedException;
-import org.opendaylight.controller.netconf.api.NetconfOperationRouter;
+import org.opendaylight.controller.netconf.impl.osgi.NetconfOperationRouter;
 import org.opendaylight.controller.netconf.impl.DefaultCommitNotificationProducer;
 import org.opendaylight.controller.netconf.impl.mapping.CapabilityProvider;
-import org.opendaylight.controller.netconf.mapping.api.NetconfOperationFilter;
-import org.opendaylight.controller.netconf.mapping.api.NetconfOperationFilterChain;
-import org.opendaylight.controller.netconf.util.mapping.AbstractNetconfOperation.OperationNameAndNamespace;
+import org.opendaylight.controller.netconf.mapping.api.HandlingPriority;
+import org.opendaylight.controller.netconf.mapping.api.NetconfOperationChainedExecution;
+import org.opendaylight.controller.netconf.util.mapping.AbstractNetconfOperation;
 import org.opendaylight.controller.netconf.util.xml.XmlElement;
 import org.opendaylight.controller.netconf.util.xml.XmlNetconfConstants;
 import org.opendaylight.controller.netconf.util.xml.XmlUtil;
@@ -26,9 +24,9 @@ import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-import com.google.common.collect.Maps;
+import java.io.InputStream;
 
-public class DefaultCommit implements NetconfOperationFilter {
+public class DefaultCommit extends AbstractNetconfOperation {
 
     private static final Logger logger = LoggerFactory.getLogger(DefaultCommit.class);
 
@@ -36,13 +34,14 @@ public class DefaultCommit implements NetconfOperationFilter {
 
     private final DefaultCommitNotificationProducer notificationProducer;
     private final CapabilityProvider cap;
-    private final String netconfSessionIdForReporting;
+    private final NetconfOperationRouter operationRouter;
 
     public DefaultCommit(DefaultCommitNotificationProducer notifier, CapabilityProvider cap,
-            String netconfSessionIdForReporting) {
+                         String netconfSessionIdForReporting, NetconfOperationRouter netconfOperationRouter) {
+        super(netconfSessionIdForReporting);
         this.notificationProducer = notifier;
         this.cap = cap;
-        this.netconfSessionIdForReporting = netconfSessionIdForReporting;
+        this.operationRouter = netconfOperationRouter;
         this.getConfigMessage = loadGetConfigMessage();
     }
 
@@ -59,40 +58,36 @@ public class DefaultCommit implements NetconfOperationFilter {
     }
 
     @Override
-    public Document doFilter(Document message, NetconfOperationRouter operationRouter,
-            NetconfOperationFilterChain filterChain) throws NetconfDocumentedException {
-        OperationNameAndNamespace operationNameAndNamespace = new OperationNameAndNamespace(message);
-        if (canHandle(operationNameAndNamespace)) {
-            if (isCommitWithoutNotification(message)) {
-                message = removePersisterAttributes(message);
-                logger.debug("Skipping commit notification");
-                // fall back to filter chain
-            } else {
-                Document innerResult = filterChain.execute(message, operationRouter);
-                Element cfgSnapshot = getConfigSnapshot(operationRouter);
-                logger.debug("Config snapshot retrieved successfully {}", cfgSnapshot);
-                notificationProducer.sendCommitNotification("ok", cfgSnapshot, cap.getCapabilities());
-                return innerResult;
-            }
-        }
-        return filterChain.execute(message, operationRouter);
+    protected String getOperationName() {
+        return XmlNetconfConstants.COMMIT;
     }
 
     @Override
-    public int getSortingOrder() {
-        return 0;
+    public Document handle(Document requestMessage, NetconfOperationChainedExecution subsequentOperation) throws NetconfDocumentedException {
+        Preconditions.checkArgument(subsequentOperation.isExecutionTermination() == false,
+                "Subsequent netconf operation expected by %s", this);
+
+        if (isCommitWithoutNotification(requestMessage)) {
+            logger.debug("Skipping commit notification");
+        } else {
+            // Send commit notification if commit was not issued by persister
+            requestMessage = removePersisterAttributes(requestMessage);
+            Element cfgSnapshot = getConfigSnapshot(operationRouter);
+            logger.debug("Config snapshot retrieved successfully {}", cfgSnapshot);
+            notificationProducer.sendCommitNotification("ok", cfgSnapshot, cap.getCapabilities());
+        }
+
+        return subsequentOperation.execute(requestMessage);
     }
 
     @Override
-    public int compareTo(NetconfOperationFilter o) {
-        return Integer.compare(getSortingOrder(), o.getSortingOrder());
+    protected Element handle(Document document, XmlElement message, NetconfOperationChainedExecution subsequentOperation) throws NetconfDocumentedException {
+        throw new UnsupportedOperationException("Never gets called");
     }
 
-    private boolean canHandle(OperationNameAndNamespace operationNameAndNamespace) {
-        if (operationNameAndNamespace.getOperationName().equals("commit") == false)
-            return false;
-        return operationNameAndNamespace.getNamespace().equals(
-                XmlNetconfConstants.URN_IETF_PARAMS_XML_NS_NETCONF_BASE_1_0);
+    @Override
+    protected HandlingPriority getHandlingPriority() {
+        return HandlingPriority.HANDLE_WITH_DEFAULT_PRIORITY.increasePriority(1);
     }
 
     private Document removePersisterAttributes(Document message) {
@@ -102,8 +97,14 @@ public class DefaultCommit implements NetconfOperationFilter {
     }
 
     private boolean isCommitWithoutNotification(Document message) {
-        XmlElement xmlElement = XmlElement.fromDomElementWithExpected(message.getDocumentElement(),
-                XmlNetconfConstants.RPC_KEY, XmlNetconfConstants.URN_IETF_PARAMS_XML_NS_NETCONF_BASE_1_0);
+        XmlElement xmlElement = null;
+        try {
+            xmlElement = XmlElement.fromDomElementWithExpected(message.getDocumentElement(),
+                    XmlNetconfConstants.RPC_KEY, XmlNetconfConstants.URN_IETF_PARAMS_XML_NS_NETCONF_BASE_1_0);
+        } catch (NetconfDocumentedException e) {
+            logger.trace("Commit operation is not valid due to  {}",e);
+            return false;
+        }
 
         String attr = xmlElement.getAttribute(NOTIFY_ATTR);
 
@@ -122,25 +123,10 @@ public class DefaultCommit implements NetconfOperationFilter {
                 getConfigMessage, null);
 
         XmlElement dataElement;
-        try {
-            XmlElement xmlElement = XmlElement.fromDomElementWithExpected(responseDocument.getDocumentElement(),
-                    XmlNetconfConstants.RPC_REPLY_KEY, XmlNetconfConstants.URN_IETF_PARAMS_XML_NS_NETCONF_BASE_1_0);
-            dataElement = xmlElement.getOnlyChildElement(XmlNetconfConstants.DATA_KEY);
-        } catch (IllegalArgumentException e) {
-            final String msg = "Unexpected response from get-config operation";
-            logger.warn(msg, e);
-            Map<String, String> info = Maps.newHashMap();
-            info.put(NetconfDocumentedException.ErrorTag.operation_failed.toString(), e.getMessage());
-            throw new NetconfDocumentedException(msg, e, NetconfDocumentedException.ErrorType.application,
-                    NetconfDocumentedException.ErrorTag.operation_failed,
-                    NetconfDocumentedException.ErrorSeverity.error, info);
-        }
-
+        XmlElement xmlElement = XmlElement.fromDomElementWithExpected(responseDocument.getDocumentElement(),
+                XmlNetconfConstants.RPC_REPLY_KEY, XmlNetconfConstants.URN_IETF_PARAMS_XML_NS_NETCONF_BASE_1_0);
+        dataElement = xmlElement.getOnlyChildElement(XmlNetconfConstants.DATA_KEY);
         return dataElement.getDomElement();
     }
 
-    @Override
-    public String toString() {
-        return "DefaultCommit{" + netconfSessionIdForReporting + '}';
-    }
 }