fix for BUG 587

- reduced tripple registered salFlowListener to one instance
- removed "flow" from message - this listeners catches all error messages

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

diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowPluginBulkGroupTransactionProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowPluginBulkGroupTransactionProvider.java
index 55a4eb281a7ca68a3848dbf7e41fcb964beaccea..1c33bbe159ba4eed237b7cabc89bbdef2c397a17 100644 (file)
--- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowPluginBulkGroupTransactionProvider.java
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowPluginBulkGroupTransactionProvider.java
@@ -110,7 +110,6 @@ public class OpenflowPluginBulkGroupTransactionProvider implements CommandProvid
     private ProviderContext pc;
     private FlowBuilder testFlow;
     private final String originalFlowName = "Foo";
-    private final SalFlowListener flowEventListener = new FlowEventListenerLoggingImpl();
     private final NodeErrorListener nodeErrorListener = new NodeErrorListenerLoggingImpl();
     private Registration<org.opendaylight.yangtools.yang.binding.NotificationListener> listener1Reg;
     private Registration<org.opendaylight.yangtools.yang.binding.NotificationListener> listener2Reg;
@@ -127,7 +126,6 @@ public class OpenflowPluginBulkGroupTransactionProvider implements CommandProvid
     public void onSessionInitiated(ProviderContext session) {
         pc = session;
         notificationService = session.getSALService(NotificationService.class);
-        listener1Reg = notificationService.registerNotificationListener(flowEventListener);
         listener2Reg = notificationService.registerNotificationListener(nodeErrorListener);
         dataBrokerService = session.getSALService(DataBrokerService.class);
         ctx.registerService(CommandProvider.class.getName(), this, null);

diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowPluginBulkTransactionProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowPluginBulkTransactionProvider.java
index 64b211a137a4fb5d28b0ebec48dcec915fdc552c..1559775ed8867d7ec88615bbe70b25caa9f241d2 100644 (file)
--- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowPluginBulkTransactionProvider.java
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowPluginBulkTransactionProvider.java
@@ -122,7 +122,6 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider {
     private ProviderContext pc;
     private FlowBuilder testFlow;
     private final String originalFlowName = "Foo";
-    private final SalFlowListener flowEventListener = new FlowEventListenerLoggingImpl();
     private final NodeErrorListener nodeErrorListener = new NodeErrorListenerLoggingImpl();
     private Registration<org.opendaylight.yangtools.yang.binding.NotificationListener> listener1Reg;
     private Registration<org.opendaylight.yangtools.yang.binding.NotificationListener> listener2Reg;
@@ -137,7 +136,6 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider {
     public void onSessionInitiated(ProviderContext session) {
         pc = session;
         notificationService = session.getSALService(NotificationService.class);
-        listener1Reg = notificationService.registerNotificationListener(flowEventListener);
         listener2Reg = notificationService.registerNotificationListener(nodeErrorListener);
         dataBrokerService = session.getSALService(DataBrokerService.class);
         ctx.registerService(CommandProvider.class.getName(), this, null);