X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflowplugin%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fopenflow%2Fmd%2Fcore%2Fsession%2FMessageDispatchServiceImplTest.java;h=7636e919ab8ae8bc9bee0e7b315d0df7d6a0a8a6;hb=27aed9a50ceeffc36468ff9610d6183c3aed14df;hp=80aaf253e8c4766d171b5829ef4193d750d85678;hpb=bb7fd2c7f9ec10554b134dbf2d216cd89e1b8445;p=openflowplugin.git 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 80aaf253e8..7636e919ab 100644 --- 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 @@ -1,59 +1,86 @@ +/** + * Copyright IBM Corporation, 2013. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ package org.opendaylight.openflowplugin.openflow.md.core.session; -import java.math.BigInteger; +import java.net.InetSocketAddress; import java.util.HashMap; +import java.util.Iterator; 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 junit.framework.Assert; - -import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.opendaylight.openflowjava.protocol.api.connection.ConnectionAdapter; import org.opendaylight.openflowjava.protocol.api.connection.ConnectionReadyListener; -import org.opendaylight.openflowplugin.openflow.md.core.ConnectionConductor; -import org.opendaylight.openflowplugin.openflow.md.core.ErrorHandler; -import org.opendaylight.openflowplugin.openflow.md.core.SwitchConnectionDistinguisher; -import org.opendaylight.openflowplugin.openflow.md.queue.QueueKeeper; +import org.opendaylight.openflowplugin.api.openflow.md.core.session.IMessageDispatchService; +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.ModelDrivenSwitch; +import org.opendaylight.openflowplugin.api.OFConstants; +import org.opendaylight.openflowplugin.api.openflow.md.core.ConnectionConductor; +import org.opendaylight.openflowplugin.api.openflow.md.core.ErrorHandler; +import org.opendaylight.openflowplugin.api.openflow.md.core.NotificationEnqueuer; +import org.opendaylight.openflowplugin.api.openflow.md.core.NotificationQueueWrapper; +import org.opendaylight.openflowplugin.api.openflow.md.core.SwitchConnectionDistinguisher; +import org.opendaylight.openflowplugin.api.openflow.md.queue.QueueProcessor; 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; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoReplyInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ExperimenterInput; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ExperimenterInputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.FlowModInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetAsyncInput; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetAsyncInputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetAsyncOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetConfigInput; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetConfigInputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetConfigOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetFeaturesInput; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetFeaturesInputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetFeaturesOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetQueueConfigInput; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetQueueConfigInputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetQueueConfigOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GroupModInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.HelloInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MeterModInput; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartRequestInput; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartRequestInputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OpenflowProtocolListener; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PacketOutInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PacketOutInputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.Port; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortGrouping; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortModInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortStatus; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.RoleRequestInput; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.RoleRequestInputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.RoleRequestOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.SendMultipartRequestMessageInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.SetAsyncInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.SetConfigInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.TableModInput; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.TableModInputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.system.rev130927.SystemNotificationsListener; +import org.opendaylight.yangtools.concepts.CompositeObjectRegistration; import org.opendaylight.yangtools.yang.binding.DataObject; +import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.common.RpcResult; +/** + * test for {@link MessageDispatchServiceImpl} + */ public class MessageDispatchServiceImplTest { MockSessionContext session; @@ -67,14 +94,6 @@ public class MessageDispatchServiceImplTest { } - /** - * @throws java.lang.Exception - */ - @After - public void tearDown() throws Exception { - - } - /** * Test barrier message for null cookie * @@ -82,10 +101,110 @@ public class MessageDispatchServiceImplTest { */ @Test public void testBarrierMessageForPrimary() throws Exception { - session.getMessageDispatchService().barrier(null, null); + MockConnectionConductor conductor = new MockConnectionConductor(1); + SwitchConnectionDistinguisher cookie = conductor.getAuxiliaryKey(); + BarrierInputBuilder barrierMsg = new BarrierInputBuilder(); + session.getMessageDispatchService().barrier(barrierMsg.build(), cookie); Assert.assertEquals(MessageType.BARRIER, session.getPrimaryConductor().getMessageType()); } + /** + * Test experimenter message for null cookie + */ + @Test + public void testExperimenter() { + MockConnectionConductor conductor = new MockConnectionConductor(1); + SwitchConnectionDistinguisher cookie = conductor.getAuxiliaryKey(); + ExperimenterInputBuilder experimenterInputBuilder = new ExperimenterInputBuilder(); + session.getMessageDispatchService().experimenter(experimenterInputBuilder.build(), cookie); + Assert.assertEquals(MessageType.NONE, session.getPrimaryConductor().getMessageType()); + } + + /** + * Test get async input with null cookie + */ + @Test + public void testGetAsync() throws ExecutionException, InterruptedException { + MockConnectionConductor conductor = new MockConnectionConductor(1); + SwitchConnectionDistinguisher cookie = conductor.getAuxiliaryKey(); + GetAsyncInputBuilder getAsyncInputBuilder = new GetAsyncInputBuilder(); + session.getMessageDispatchService().getAsync(getAsyncInputBuilder.build(), cookie); + Assert.assertEquals(MessageType.NONE, session.getPrimaryConductor().getMessageType()); + } + + /** + * Test get async output with null cookie + */ + @Test + public void testGetConfig() { + MockConnectionConductor conductor = new MockConnectionConductor(1); + SwitchConnectionDistinguisher cookie = conductor.getAuxiliaryKey(); + GetConfigInputBuilder getConfigInputBuilder = new GetConfigInputBuilder(); + session.getMessageDispatchService().getConfig(getConfigInputBuilder.build(), cookie); + Assert.assertEquals(MessageType.NONE, session.getPrimaryConductor().getMessageType()); + } + + /** + * Test get features with null cookie + */ + @Test + public void testGetFeatures() { + MockConnectionConductor conductor = new MockConnectionConductor(1); + SwitchConnectionDistinguisher cookie = conductor.getAuxiliaryKey(); + GetFeaturesInputBuilder getFeaturesInputBuilder = new GetFeaturesInputBuilder(); + session.getMessageDispatchService().getFeatures(getFeaturesInputBuilder.build(), cookie); + Assert.assertEquals(MessageType.NONE, session.getPrimaryConductor().getMessageType()); + } + + /** + * Test get queue config with null cookie + */ + @Test + public void testGetQueueConfig() { + MockConnectionConductor conductor = new MockConnectionConductor(1); + SwitchConnectionDistinguisher cookie = conductor.getAuxiliaryKey(); + GetQueueConfigInputBuilder getQueueConfigInputBuilder = new GetQueueConfigInputBuilder(); + session.getMessageDispatchService().getQueueConfig(getQueueConfigInputBuilder.build(), cookie); + Assert.assertEquals(MessageType.NONE, session.getPrimaryConductor().getMessageType()); + } + + /** + * Test multipart request with null cookie + */ + @Test + public void testGetMultipart() { + MockConnectionConductor conductor = new MockConnectionConductor(1); + SwitchConnectionDistinguisher cookie = conductor.getAuxiliaryKey(); + MultipartRequestInputBuilder multipartRequestInputBuilder = new MultipartRequestInputBuilder(); + session.getMessageDispatchService().multipartRequest(multipartRequestInputBuilder.build(), cookie); + Assert.assertEquals(MessageType.NONE, session.getPrimaryConductor().getMessageType()); + } + + /** + * Test role request with null cookie + */ + @Test + public void testRoleRequest() { + MockConnectionConductor conductor = new MockConnectionConductor(1); + SwitchConnectionDistinguisher cookie = conductor.getAuxiliaryKey(); + RoleRequestInputBuilder roleRequestInputBuilder = new RoleRequestInputBuilder(); + session.getMessageDispatchService().roleRequest(roleRequestInputBuilder.build(), cookie); + Assert.assertEquals(MessageType.NONE, session.getPrimaryConductor().getMessageType()); + } + + /** + * Test table mod with null cookie + */ + @Test + public void testTableMod() { + MockConnectionConductor conductor = new MockConnectionConductor(1); + SwitchConnectionDistinguisher cookie = conductor.getAuxiliaryKey(); + TableModInputBuilder tableModInputBuilder = new TableModInputBuilder(); + session.getMessageDispatchService().tableMod(tableModInputBuilder.build(), cookie); + Assert.assertEquals(MessageType.TABLEMOD, session.getPrimaryConductor().getMessageType()); + } + + /** * Test packet out message for primary connection * @@ -154,11 +273,17 @@ public class MessageDispatchServiceImplTest { @Test public void testInvalidSession() throws Exception { session.setValid(false); - try { - session.getMessageDispatchService().packetOut(null, null); - Assert.assertTrue(false); - } catch (IllegalArgumentException ex) { - Assert.assertTrue(true); + Future> resultFuture = session.getMessageDispatchService().packetOut(null, null); + if (resultFuture.isDone()) { + RpcResult rpcResult = resultFuture.get(); + Assert.assertTrue(!rpcResult.getErrors().isEmpty()); + + Iterator it = rpcResult.getErrors().iterator(); + RpcError rpcError = it.next(); + + Assert.assertTrue(rpcError.getApplicationTag().equals(OFConstants.APPLICATION_TAG)); + Assert.assertTrue(rpcError.getTag().equals(OFConstants.ERROR_TAG_TIMEOUT)); + Assert.assertTrue(rpcError.getErrorType().equals(RpcError.ErrorType.TRANSPORT)); } } @@ -169,6 +294,8 @@ class MockSessionContext implements SessionContext { private Map map; private IMessageDispatchService messageService; private boolean isValid = true; + private CompositeObjectRegistration registration; + private int seed; MockSessionContext(int conductorNum) { conductor = new MockConnectionConductor(conductorNum); @@ -201,8 +328,8 @@ class MockSessionContext implements SessionContext { } @Override - public void addAuxiliaryConductor(SwitchConnectionDistinguisher auxiliaryKey, ConnectionConductor conductor) { - map.put(auxiliaryKey, conductor); + public void addAuxiliaryConductor(SwitchConnectionDistinguisher auxiliaryKey, ConnectionConductor conductorArg) { + map.put(auxiliaryKey, conductorArg); } @Override @@ -222,7 +349,7 @@ class MockSessionContext implements SessionContext { } @Override - public SwitchConnectionDistinguisher getSessionKey() { + public SwitchSessionKeyOF getSessionKey() { // TODO Auto-generated method stub return null; } @@ -240,7 +367,7 @@ class MockSessionContext implements SessionContext { } @Override - public Map getPhysicalPorts() { + public Map getPhysicalPorts() { // TODO Auto-generated method stub return null; } @@ -252,7 +379,7 @@ class MockSessionContext implements SessionContext { } @Override - public Port getPhysicalPort(Long portNumber) { + public PortGrouping getPhysicalPort(Long portNumber) { // TODO Auto-generated method stub return null; } @@ -270,26 +397,53 @@ class MockSessionContext implements SessionContext { } @Override - public boolean isPortEnabled(Port port) { + public boolean isPortEnabled(PortGrouping port) { // TODO Auto-generated method stub return false; } @Override - public List getEnabledPorts() { + public List getEnabledPorts() { // TODO Auto-generated method stub return null; } @Override - public void processPortStatusMsg(PortStatus arg0) { + public Map getPortsBandwidth() { // TODO Auto-generated method stub + return null; + } + @Override + public CompositeObjectRegistration getProviderRegistration() { + return registration; } + @Override + public void setProviderRegistration( + CompositeObjectRegistration registration) { + this.registration = registration; + } + + @Override + public int getSeed() { + return seed; + } + + /** + * @param seed the seed to set + */ + public void setSeed(int seed) { + this.seed = seed; + } + + @Override + public NotificationEnqueuer getNotificationEnqueuer() { + return conductor; + } } -class MockConnectionConductor implements ConnectionConductor { +class MockConnectionConductor implements ConnectionConductor, NotificationEnqueuer { private int conductorNum; private MockConnectionAdapter adapter; @@ -351,9 +505,8 @@ class MockConnectionConductor implements ConnectionConductor { public SwitchConnectionDistinguisher getAuxiliaryKey() { if (0 != conductorNum) { SwitchConnectionCookieOFImpl key = new SwitchConnectionCookieOFImpl(); - key.setDatapathId(BigInteger.valueOf(10L)); key.setAuxiliaryId((short) conductorNum); - key.initId(); + key.init(42); return key; } return null; @@ -370,12 +523,23 @@ class MockConnectionConductor implements ConnectionConductor { } @Override - public void setQueueKeeper(QueueKeeper queueKeeper) { + public void setQueueProcessor(QueueProcessor queueKeeper) { // NOOP } @Override public void setErrorHandler(ErrorHandler errorHandler) { + // NOOP + } + + @Override + public void setId(int conductorId) { + // NOOP + } + + @Override + public void enqueueNotification(NotificationQueueWrapper notification) { + // NOOP } } @@ -538,8 +702,7 @@ class MockConnectionAdapter implements ConnectionAdapter { } /** - * @param messageType - * the messageType to set + * @param messageType the messageType to set */ public void setMessageType(MessageType messageType) { this.messageType = messageType; @@ -547,7 +710,7 @@ class MockConnectionAdapter implements ConnectionAdapter { @Override public void fireConnectionReadyNotification() { - connectionReadyListener.onConnectionReady(); + connectionReadyListener.onConnectionReady(); } @Override @@ -557,10 +720,18 @@ class MockConnectionAdapter implements ConnectionAdapter { } @Override - public Future> sendMultipartRequestMessage( - SendMultipartRequestMessageInput input) { + public Future> multipartRequest( + MultipartRequestInput input) { // TODO Auto-generated method stub return null; } + /* (non-Javadoc) + * @see org.opendaylight.openflowjava.protocol.api.connection.ConnectionAdapter#getRemoteAddress() + */ + @Override + public InetSocketAddress getRemoteAddress() { + // TODO Auto-generated method stub + return null; + } }