Migrate l2switch-main notification integration

Use registerListner instead of registerNotificationListener,
since the latter one has been deprecated.

Signed-off-by: David Arjona <darjona@yahoo.com>
Change-Id: I0a582879011d1c00e30b55269e0a5aaef32f70c4

diff --git a/l2switch-main/src/main/java/org/opendaylight/l2switch/L2SwitchMainProvider.java b/l2switch-main/src/main/java/org/opendaylight/l2switch/L2SwitchMainProvider.java
index 0ef61cbf2c5a79e57457fdf5ef9895bbfaa7b593..b62f53ff1ba233ae9ec50cee73ab574e1edd9df8 100644 (file)
--- a/l2switch-main/src/main/java/org/opendaylight/l2switch/L2SwitchMainProvider.java
+++ b/l2switch-main/src/main/java/org/opendaylight/l2switch/L2SwitchMainProvider.java
@@ -15,6 +15,7 @@ import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.NotificationService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.SalFlowService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.l2switch.l2switch.config.rev140528.L2switchConfig;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.arp.rev140528.ArpPacketReceived;
 import org.opendaylight.yangtools.concepts.Registration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -70,7 +71,7 @@ public class L2SwitchMainProvider {
             // Setup reactive flow writer
             LOG.info("L2Switch will react to network traffic and install flows");
             ReactiveFlowWriter reactiveFlowWriter = new ReactiveFlowWriter(inventoryReader, flowWriterService);
-            reactFlowWriterReg = notificationService.registerNotificationListener(reactiveFlowWriter);
+            reactFlowWriterReg = notificationService.registerListener(ArpPacketReceived.class, reactiveFlowWriter);
         }
         LOG.info("L2SwitchMain initialized.");
     }

diff --git a/l2switch-main/src/main/java/org/opendaylight/l2switch/flow/ReactiveFlowWriter.java b/l2switch-main/src/main/java/org/opendaylight/l2switch/flow/ReactiveFlowWriter.java
index 13af60c85c73ea9b91c6a62f6c73f6cffce4747e..c8564a25115dc898405c359cfc81a7aef6c7c091 100644 (file)
--- a/l2switch-main/src/main/java/org/opendaylight/l2switch/flow/ReactiveFlowWriter.java
+++ b/l2switch-main/src/main/java/org/opendaylight/l2switch/flow/ReactiveFlowWriter.java
@@ -8,10 +8,10 @@
 package org.opendaylight.l2switch.flow;
 
 import org.opendaylight.l2switch.inventory.InventoryReader;
+import org.opendaylight.mdsal.binding.api.NotificationService.Listener;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorRef;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.arp.rev140528.ArpPacketListener;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.arp.rev140528.ArpPacketReceived;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.arp.rev140528.arp.packet.received.packet.chain.packet.ArpPacket;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.basepacket.rev140528.packet.chain.grp.PacketChain;
@@ -22,7 +22,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.ethernet.rev140528.e
 /**
  * This class listens to certain type of packets and writes a mac to mac flows.
  */
-public class ReactiveFlowWriter implements ArpPacketListener {
+public class ReactiveFlowWriter implements Listener<ArpPacketReceived> {
     private final InventoryReader inventoryReader;
     private final FlowWriterService flowWriterService;
 
@@ -57,7 +57,7 @@ public class ReactiveFlowWriter implements ArpPacketListener {
     }
 
     @Override
-    public void onArpPacketReceived(ArpPacketReceived packetReceived) {
+    public void onNotification(ArpPacketReceived packetReceived) {
         if (packetReceived == null || packetReceived.getPacketChain() == null) {
             return;
         }

diff --git a/l2switch-main/src/test/java/org/opendaylight/l2switch/flow/ReactiveFlowWriterTest.java b/l2switch-main/src/test/java/org/opendaylight/l2switch/flow/ReactiveFlowWriterTest.java
index 1def7b5d34c01bd513bade0028c4f66de50197b3..3b12d8610fbfee4e53b06b05fd64e970e7aeda7a 100644 (file)
--- a/l2switch-main/src/test/java/org/opendaylight/l2switch/flow/ReactiveFlowWriterTest.java
+++ b/l2switch-main/src/test/java/org/opendaylight/l2switch/flow/ReactiveFlowWriterTest.java
@@ -74,7 +74,7 @@ public class ReactiveFlowWriterTest {
     public void onArpPacketReceivedTest() {
 
         ArpPacketReceived arpPacketReceived = new ArpPacketReceivedBuilder().setPacketChain(packetChainList).build();
-        reactiveFlowWriter.onArpPacketReceived(arpPacketReceived);
+        reactiveFlowWriter.onNotification(arpPacketReceived);
 
     }