Modernize test-common's use of NotificationService

[openflowplugin.git] / test-common / src / main / java / org / opendaylight / openflowplugin / testcommon / DropTestRpcSender.java

diff --git a/test-common/src/main/java/org/opendaylight/openflowplugin/testcommon/DropTestRpcSender.java b/test-common/src/main/java/org/opendaylight/openflowplugin/testcommon/DropTestRpcSender.java
index 9a75f9f63095652b993229e0c4890c37decc6e54..f1b263e4a1391c9e32c5abaab38d7bd84b7f0332 100644 (file)
--- a/test-common/src/main/java/org/opendaylight/openflowplugin/testcommon/DropTestRpcSender.java
+++ b/test-common/src/main/java/org/opendaylight/openflowplugin/testcommon/DropTestRpcSender.java
@@ -23,7 +23,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.I
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.Match;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketReceived;
+import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.Uint64;
@@ -62,7 +63,7 @@ public class DropTestRpcSender extends AbstractDropTest {
 
     private NotificationService notificationService;
 
-    private ListenerRegistration<DropTestRpcSender> notificationRegistration;
+    private Registration notificationRegistration;
 
     /**
      * Start listening on packetIn.
@@ -73,7 +74,7 @@ public class DropTestRpcSender extends AbstractDropTest {
                 STARTUP_LOOP_MAX_RETRIES);
         try {
             notificationRegistration = looper.loopUntilNoException(
-                () -> notificationService.registerNotificationListener(DropTestRpcSender.this));
+                () -> notificationService.registerListener(PacketReceived.class, this));
         } catch (Exception e) {
             LOG.warn("DropTest sender notification listener registration fail!");
             LOG.debug("DropTest sender notification listener registration fail! ..", e);