Bug-2827: role switch proposal

[openflowplugin.git] / openflowplugin / src / test / java / org / opendaylight / openflowplugin / openflow / md / core / session / MessageDispatchServiceImplTest.java

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/session/MessageDispatchServiceImplTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/session/MessageDispatchServiceImplTest.java
index 09a532ababb8337b5ee5e259acd6782594255c1d..bb20b31aa1bd5b6d216b3d5f8325de5e47b2246b 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/session/MessageDispatchServiceImplTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/session/MessageDispatchServiceImplTest.java
@@ -15,7 +15,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
 import org.junit.Assert;
@@ -34,6 +33,7 @@ import org.opendaylight.openflowplugin.api.openflow.md.core.session.IMessageDisp
 import org.opendaylight.openflowplugin.api.openflow.md.core.session.SessionContext;
 import org.opendaylight.openflowplugin.api.openflow.md.core.session.SwitchSessionKeyOF;
 import org.opendaylight.openflowplugin.api.openflow.md.queue.QueueProcessor;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ControllerRole;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierOutput;
@@ -128,7 +128,7 @@ public class MessageDispatchServiceImplTest {
      * Test get async input with null cookie
      */
     @Test
-    public void testGetAsync() throws ExecutionException, InterruptedException {
+    public void testGetAsync() {
         MockConnectionConductor conductor = new MockConnectionConductor(1);
         SwitchConnectionDistinguisher cookie = conductor.getAuxiliaryKey();
         GetAsyncInputBuilder getAsyncInputBuilder = new GetAsyncInputBuilder();
@@ -328,7 +328,7 @@ class MockSessionContext implements SessionContext {
 
     MockSessionContext(int conductorNum) {
         conductor = new MockConnectionConductor(conductorNum);
-        map = new HashMap<SwitchConnectionDistinguisher, ConnectionConductor>();
+        map = new HashMap<>();
         messageService = new MessageDispatchServiceImpl(this);
         sessionKey = new SwitchSessionKeyOF();
         sessionKey.setDatapathId(new BigInteger("0"));
@@ -476,6 +476,16 @@ class MockSessionContext implements SessionContext {
     public NotificationEnqueuer getNotificationEnqueuer() {
         return conductor;
     }
+
+    @Override
+    public ControllerRole getRoleOnDevice() {
+        return null;
+    }
+
+    @Override
+    public void setRoleOnDevice(ControllerRole roleOnDevice) {
+        // NOOP
+    }
 }
 
 class MockConnectionConductor implements ConnectionConductor,