Migrate addresstracker notification integration

Do not use generated interface and use NotificationService.Listener
instead.

Change-Id: Iccac559d0fa4b342c976cf9790eb55a94e318af0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingArp.java b/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingArp.java
index 9a12d47c2bfb5aee46b2839260c76a8dd16e764e..85166080dd474509fc2ea23be41ed3dabeffdb25 100644 (file)
--- a/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingArp.java
+++ b/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingArp.java
@@ -7,8 +7,8 @@
  */
 package org.opendaylight.l2switch.addresstracker.addressobserver;
 
+import org.opendaylight.mdsal.binding.api.NotificationService.Listener;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
-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;
@@ -21,7 +21,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.ethernet.rev140528.e
  * these address observations for each node-connector. These packets are
  * returned to the network after the addresses are learned.
  */
-public class AddressObserverUsingArp implements ArpPacketListener {
+public class AddressObserverUsingArp implements Listener<ArpPacketReceived> {
 
     private final AddressObservationWriter addressObservationWriter;
 
@@ -36,7 +36,7 @@ public class AddressObserverUsingArp implements ArpPacketListener {
      *            The incoming packet.
      */
     @Override
-    public void onArpPacketReceived(ArpPacketReceived packetReceived) {
+    public void onNotification(ArpPacketReceived packetReceived) {
         if (packetReceived == null || packetReceived.getPacketChain() == null) {
             return;
         }

diff --git a/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv4.java b/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv4.java
index c3544f7aed60af965aa2776280e3f7bb83ad2a01..eaa337a72e90b45798af9102a5eeedd249a81509 100644 (file)
--- a/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv4.java
+++ b/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv4.java
@@ -7,12 +7,12 @@
  */
 package org.opendaylight.l2switch.addresstracker.addressobserver;
 
+import org.opendaylight.mdsal.binding.api.NotificationService.Listener;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.basepacket.rev140528.packet.chain.grp.PacketChain;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.basepacket.rev140528.packet.chain.grp.packet.chain.packet.RawPacket;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.basepacket.rev140528.packet.chain.grp.packet.chain.packet.raw.packet.RawPacketFields;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.ethernet.rev140528.ethernet.packet.received.packet.chain.packet.EthernetPacket;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.ipv4.rev140528.Ipv4PacketListener;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.ipv4.rev140528.Ipv4PacketReceived;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.ipv4.rev140528.ipv4.packet.received.packet.chain.packet.Ipv4Packet;
 
@@ -22,7 +22,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.ipv4.rev140528.ipv4.
  * these address observations for each node-connector. These packets are
  * returned to the network after the addresses are learned.
  */
-public class AddressObserverUsingIpv4 implements Ipv4PacketListener {
+public class AddressObserverUsingIpv4 implements Listener<Ipv4PacketReceived> {
     private static final String IPV4_IP_TO_IGNORE = "0.0.0.0";
 
     private final AddressObservationWriter addressObservationWriter;
@@ -38,7 +38,7 @@ public class AddressObserverUsingIpv4 implements Ipv4PacketListener {
      *            The incoming packet.
      */
     @Override
-    public void onIpv4PacketReceived(Ipv4PacketReceived packetReceived) {
+    public void onNotification(Ipv4PacketReceived packetReceived) {
         if (packetReceived == null || packetReceived.getPacketChain() == null) {
             return;
         }

diff --git a/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv6.java b/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv6.java
index cdf20fa2f920ed7afb54d7db984464d7c0bf5f81..ba6ab0f5c6c63306f8947be44f9b17f5c62830d0 100644 (file)
--- a/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv6.java
+++ b/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv6.java
@@ -7,12 +7,12 @@
  */
 package org.opendaylight.l2switch.addresstracker.addressobserver;
 
+import org.opendaylight.mdsal.binding.api.NotificationService.Listener;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.basepacket.rev140528.packet.chain.grp.PacketChain;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.basepacket.rev140528.packet.chain.grp.packet.chain.packet.RawPacket;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.basepacket.rev140528.packet.chain.grp.packet.chain.packet.raw.packet.RawPacketFields;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.ethernet.rev140528.ethernet.packet.received.packet.chain.packet.EthernetPacket;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.ipv6.rev140528.Ipv6PacketListener;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.ipv6.rev140528.Ipv6PacketReceived;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.ipv6.rev140528.ipv6.packet.received.packet.chain.packet.Ipv6Packet;
 
@@ -21,7 +21,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.ipv6.rev140528.ipv6.
  * these address observations for each node-connector. These packets are
  * returned to the network after the addresses are learned.
  */
-public class AddressObserverUsingIpv6 implements Ipv6PacketListener {
+public class AddressObserverUsingIpv6 implements Listener<Ipv6PacketReceived> {
     private static final String IPV6_IP_TO_IGNORE = "0:0:0:0:0:0:0:0";
 
     private final AddressObservationWriter addressObservationWriter;
@@ -37,7 +37,7 @@ public class AddressObserverUsingIpv6 implements Ipv6PacketListener {
      *            The incoming packet.
      */
     @Override
-    public void onIpv6PacketReceived(Ipv6PacketReceived packetReceived) {
+    public void onNotification(Ipv6PacketReceived packetReceived) {
         if (packetReceived == null || packetReceived.getPacketChain() == null) {
             return;
         }

diff --git a/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressTrackerProvider.java b/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressTrackerProvider.java
index 3027b286d798987c198fa85848a19cf858abf6a2..b7f272472192a65d6df133317db0fa1625c82403 100644 (file)
--- a/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressTrackerProvider.java
+++ b/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressTrackerProvider.java
@@ -15,6 +15,9 @@ import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.NotificationService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.address.tracker.config.rev160621.AddressTrackerConfig;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.arp.rev140528.ArpPacketReceived;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.ipv4.rev140528.Ipv4PacketReceived;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.ipv6.rev140528.Ipv6PacketReceived;
 import org.opendaylight.yangtools.concepts.Registration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -51,20 +54,20 @@ public class AddressTrackerProvider {
         }
 
         if (packetTypes.contains(ARP_PACKET_TYPE)) {
-            AddressObserverUsingArp addressObserverUsingArp = new AddressObserverUsingArp(addressObservationWriter);
             // Register AddressObserver for notifications
-            this.listenerRegistrations.add(notificationService.registerNotificationListener(addressObserverUsingArp));
+            this.listenerRegistrations.add(notificationService.registerListener(ArpPacketReceived.class,
+                new AddressObserverUsingArp(addressObservationWriter)));
         }
 
         if (packetTypes.contains(IPV4_PACKET_TYPE)) {
-            AddressObserverUsingIpv4 addressObserverUsingIpv4 = new AddressObserverUsingIpv4(addressObservationWriter);
             // Register AddressObserver for notifications
-            this.listenerRegistrations.add(notificationService.registerNotificationListener(addressObserverUsingIpv4));
+            this.listenerRegistrations.add(notificationService.registerListener(Ipv4PacketReceived.class,
+                new AddressObserverUsingIpv4(addressObservationWriter)));
         }
         if (packetTypes.contains(IPV6_PACKET_TYPE)) {
-            AddressObserverUsingIpv6 addressObserverUsingIpv6 = new AddressObserverUsingIpv6(addressObservationWriter);
             // Register AddressObserver for notifications
-            this.listenerRegistrations.add(notificationService.registerNotificationListener(addressObserverUsingIpv6));
+            this.listenerRegistrations.add(notificationService.registerListener(Ipv6PacketReceived.class,
+                new AddressObserverUsingIpv6(addressObservationWriter)));
         }
         LOG.info("AddressTracker initialized.");
     }

diff --git a/addresstracker/implementation/src/test/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingArpTest.java b/addresstracker/implementation/src/test/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingArpTest.java
index 39097b7b4b6bc1a4694baf1c59829b5573cefd97..0666df7d4a8324e329bdeeb0dd84065ab746b2a5 100644 (file)
--- a/addresstracker/implementation/src/test/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingArpTest.java
+++ b/addresstracker/implementation/src/test/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingArpTest.java
@@ -50,7 +50,7 @@ public class AddressObserverUsingArpTest {
 
         ArpPacketReceived arpReceived = new ArpPacketReceivedBuilder().setPacketChain(packetChainList).build();
         AddressObserverUsingArp addressOberserverArp = new AddressObserverUsingArp(addressObservationWriterMock);
-        addressOberserverArp.onArpPacketReceived(arpReceived);
+        addressOberserverArp.onNotification(arpReceived);
 
         verify(addressObservationWriterMock, times(1)).addAddress(any(MacAddress.class), any(IpAddress.class), any());
     }
@@ -60,7 +60,7 @@ public class AddressObserverUsingArpTest {
 
         ArpPacketReceived arpReceived = new ArpPacketReceivedBuilder().setPacketChain(null).build();
         AddressObserverUsingArp addressOberserverArp = new AddressObserverUsingArp(addressObservationWriterMock);
-        addressOberserverArp.onArpPacketReceived(arpReceived);
+        addressOberserverArp.onNotification(arpReceived);
 
         verify(addressObservationWriterMock, times(0)).addAddress(any(MacAddress.class), any(IpAddress.class),
                 any(NodeConnectorRef.class));
@@ -77,7 +77,7 @@ public class AddressObserverUsingArpTest {
 
         ArpPacketReceived arpReceived = new ArpPacketReceivedBuilder().setPacketChain(packetChainList).build();
         AddressObserverUsingArp addressOberserverArp = new AddressObserverUsingArp(addressObservationWriterMock);
-        addressOberserverArp.onArpPacketReceived(arpReceived);
+        addressOberserverArp.onNotification(arpReceived);
 
         verify(addressObservationWriterMock, times(0)).addAddress(any(MacAddress.class), any(IpAddress.class),
                 any(NodeConnectorRef.class));

diff --git a/addresstracker/implementation/src/test/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv4Test.java b/addresstracker/implementation/src/test/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv4Test.java
index 0ca9c56bf5364a41bf6c526de197eb38be96df84..3e7ab8ca6407da7d63401feabbd7e23d2432cf7a 100644 (file)
--- a/addresstracker/implementation/src/test/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv4Test.java
+++ b/addresstracker/implementation/src/test/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv4Test.java
@@ -51,7 +51,7 @@ public class AddressObserverUsingIpv4Test {
 
         Ipv4PacketReceived ipv4PktReceived = new Ipv4PacketReceivedBuilder().setPacketChain(packetChainList).build();
         AddressObserverUsingIpv4 addressObserverIpv4 = new AddressObserverUsingIpv4(addressObservationWriterMock);
-        addressObserverIpv4.onIpv4PacketReceived(ipv4PktReceived);
+        addressObserverIpv4.onNotification(ipv4PktReceived);
 
         verify(addressObservationWriterMock, times(1)).addAddress(any(MacAddress.class), any(IpAddress.class), any());
     }
@@ -61,7 +61,7 @@ public class AddressObserverUsingIpv4Test {
 
         Ipv4PacketReceived ipv4PktReceived = new Ipv4PacketReceivedBuilder().setPacketChain(null).build();
         AddressObserverUsingIpv4 addressObserverIpv4 = new AddressObserverUsingIpv4(addressObservationWriterMock);
-        addressObserverIpv4.onIpv4PacketReceived(ipv4PktReceived);
+        addressObserverIpv4.onNotification(ipv4PktReceived);
 
         verify(addressObservationWriterMock, times(0)).addAddress(any(MacAddress.class), any(IpAddress.class),
                 any(NodeConnectorRef.class));
@@ -78,7 +78,7 @@ public class AddressObserverUsingIpv4Test {
 
         Ipv4PacketReceived ipv4PktReceived = new Ipv4PacketReceivedBuilder().setPacketChain(packetChainList).build();
         AddressObserverUsingIpv4 addressObserverIpv4 = new AddressObserverUsingIpv4(addressObservationWriterMock);
-        addressObserverIpv4.onIpv4PacketReceived(ipv4PktReceived);
+        addressObserverIpv4.onNotification(ipv4PktReceived);
 
         verify(addressObservationWriterMock, times(0)).addAddress(any(MacAddress.class), any(IpAddress.class),
                 any(NodeConnectorRef.class));
@@ -97,7 +97,7 @@ public class AddressObserverUsingIpv4Test {
 
         Ipv4PacketReceived ipv4PktReceived = new Ipv4PacketReceivedBuilder().setPacketChain(packetChainList).build();
         AddressObserverUsingIpv4 addressObserverIpv4 = new AddressObserverUsingIpv4(addressObservationWriterMock);
-        addressObserverIpv4.onIpv4PacketReceived(ipv4PktReceived);
+        addressObserverIpv4.onNotification(ipv4PktReceived);
 
         verify(addressObservationWriterMock, times(0)).addAddress(any(MacAddress.class), any(IpAddress.class),
                 any(NodeConnectorRef.class));

diff --git a/addresstracker/implementation/src/test/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv6Test.java b/addresstracker/implementation/src/test/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv6Test.java
index 9cb5646d88182f5e06abd186cb7977f15a0359fd..3224be46112416e31f5de17f2b41a20eb08ec628 100644 (file)
--- a/addresstracker/implementation/src/test/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv6Test.java
+++ b/addresstracker/implementation/src/test/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv6Test.java
@@ -54,7 +54,7 @@ public class AddressObserverUsingIpv6Test {
 
         Ipv6PacketReceived ipv6PktReceived = new Ipv6PacketReceivedBuilder().setPacketChain(packetChainList).build();
         AddressObserverUsingIpv6 addressObserverIpv6 = new AddressObserverUsingIpv6(addressObservationWriterMock);
-        addressObserverIpv6.onIpv6PacketReceived(ipv6PktReceived);
+        addressObserverIpv6.onNotification(ipv6PktReceived);
 
         verify(addressObservationWriterMock, times(1)).addAddress(any(MacAddress.class), any(IpAddress.class), any());
     }
@@ -64,7 +64,7 @@ public class AddressObserverUsingIpv6Test {
 
         Ipv6PacketReceived ipv6PktReceived = new Ipv6PacketReceivedBuilder().setPacketChain(null).build();
         AddressObserverUsingIpv6 addressObserverIpv6 = new AddressObserverUsingIpv6(addressObservationWriterMock);
-        addressObserverIpv6.onIpv6PacketReceived(ipv6PktReceived);
+        addressObserverIpv6.onNotification(ipv6PktReceived);
 
         verify(addressObservationWriterMock, times(0)).addAddress(any(MacAddress.class), any(IpAddress.class),
                 any(NodeConnectorRef.class));
@@ -81,7 +81,7 @@ public class AddressObserverUsingIpv6Test {
 
         Ipv6PacketReceived ipv6PktReceived = new Ipv6PacketReceivedBuilder().setPacketChain(packetChainList).build();
         AddressObserverUsingIpv6 addressObserverIpv6 = new AddressObserverUsingIpv6(addressObservationWriterMock);
-        addressObserverIpv6.onIpv6PacketReceived(ipv6PktReceived);
+        addressObserverIpv6.onNotification(ipv6PktReceived);
 
         verify(addressObservationWriterMock, times(0)).addAddress(any(MacAddress.class), any(IpAddress.class),
                 any(NodeConnectorRef.class));
@@ -100,7 +100,7 @@ public class AddressObserverUsingIpv6Test {
 
         Ipv6PacketReceived ipv6PktReceived = new Ipv6PacketReceivedBuilder().setPacketChain(packetChainList).build();
         AddressObserverUsingIpv6 addressObserverIpv6 = new AddressObserverUsingIpv6(addressObservationWriterMock);
-        addressObserverIpv6.onIpv6PacketReceived(ipv6PktReceived);
+        addressObserverIpv6.onNotification(ipv6PktReceived);
 
         verify(addressObservationWriterMock, times(0)).addAddress(any(MacAddress.class), any(IpAddress.class),
                 any(NodeConnectorRef.class));