Bug 2407 - learning switch fails to install learnt flows

Change-Id: Ifdc121ffd9fa01bec2e6ce56c4054435a316e8d5
Signed-off-by: Martin Bobak <mbobak@cisco.com>

diff --git a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/FlowCommitWrapperImpl.java b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/FlowCommitWrapperImpl.java
index b8af120fce888fbd72a9e0ba424b00e382602df0..4652a4e01a899e4a0aa19fb64d59265f924691e6 100644 (file)
--- a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/FlowCommitWrapperImpl.java
+++ b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/FlowCommitWrapperImpl.java
@@ -9,15 +9,12 @@
 package org.opendaylight.openflowplugin.learningswitch;
 
 import com.google.common.util.concurrent.CheckedFuture;
 package org.opendaylight.openflowplugin.learningswitch;
 
 import com.google.common.util.concurrent.CheckedFuture;

-import java.util.concurrent.Future;

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;

-import org.opendaylight.controller.md.sal.common.api.TransactionStatus;

 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.Flow;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.Flow;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;

-import org.opendaylight.yangtools.yang.common.RpcResult;

 
 /**
  *
 
 /**
  *


@@ -35,9 +32,9 @@ public class FlowCommitWrapperImpl implements FlowCommitWrapper {
 
     @Override
     public CheckedFuture<Void, TransactionCommitFailedException> writeFlowToConfig(InstanceIdentifier<Flow> flowPath,
 
     @Override
     public CheckedFuture<Void, TransactionCommitFailedException> writeFlowToConfig(InstanceIdentifier<Flow> flowPath,

-                                                                  Flow flowBody) {
+                                                                                   Flow flowBody) {

         ReadWriteTransaction addFlowTransaction = dataBrokerService.newReadWriteTransaction();
         ReadWriteTransaction addFlowTransaction = dataBrokerService.newReadWriteTransaction();

-        addFlowTransaction.put(LogicalDatastoreType.CONFIGURATION, flowPath, flowBody);
+        addFlowTransaction.put(LogicalDatastoreType.CONFIGURATION, flowPath, flowBody, true);

         return addFlowTransaction.submit();
     }
 
         return addFlowTransaction.submit();
     }
 

diff --git a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/multi/LearningSwitchManagerMultiImpl.java b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/multi/LearningSwitchManagerMultiImpl.java
index 5c6ac52850b634033e6e970b6fe67e593f5ae2a8..b196558c0dd583160752ce81e7cc0d4c4d92a848 100644 (file)
--- a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/multi/LearningSwitchManagerMultiImpl.java
+++ b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/multi/LearningSwitchManagerMultiImpl.java
@@ -113,11 +113,12 @@ public class LearningSwitchManagerMultiImpl implements DataChangeListenerRegistr
         try {
             packetInRegistration.close();
         } catch (Exception e) {
         try {
             packetInRegistration.close();
         } catch (Exception e) {

-            LOG.error(e.getMessage(), e);
+            LOG.error("Error unregistering packet in listener, cause %s ", e.getMessage());

         }
         try {
             dataChangeListenerRegistration.close();
         } catch (Exception e) {
         }
         try {
             dataChangeListenerRegistration.close();
         } catch (Exception e) {

+            LOG.error("Error unregistering data change listener, cause %s ", e.getMessage());

             LOG.error(e.getMessage(), e);
         }
         LOG.debug("stop() <--");
             LOG.error(e.getMessage(), e);
         }
         LOG.debug("stop() <--");