Coverage - PacketReceivedTranslator

Change-Id: I42ce751aeadd49d7fa079a0c28bb4bb500adc266
Signed-off-by: Michal Rehak <mirehak@cisco.com>

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/PacketReceivedTranslator.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/PacketReceivedTranslator.java
index 2bec9398761b6e85753bdcc66b6d87fda3e03f70..4fe8119b873029735cac08cd614b6ad397d997b9 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/PacketReceivedTranslator.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/PacketReceivedTranslator.java
@@ -7,6 +7,7 @@
  */
 package org.opendaylight.openflowplugin.impl.translator;
 
+import com.google.common.annotations.VisibleForTesting;
 import java.math.BigInteger;
 import java.util.List;
 import org.opendaylight.openflowplugin.api.OFConstants;
@@ -81,7 +82,8 @@ public class PacketReceivedTranslator implements MessageTranslator<PacketInMessa
         return packetReceivedBuilder.build();
     }
 
-    private static org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.packet.received.Match getPacketInMatch(final PacketInMessage input, final BigInteger datapathId) {
+    @VisibleForTesting
+    static org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.packet.received.Match getPacketInMatch(final PacketInMessage input, final BigInteger datapathId) {
         Match match = MatchConvertorImpl.fromOFMatchToSALMatch(input.getMatch(),
                 datapathId,
                 OpenflowVersion.get(input.getVersion().shortValue())).build();
@@ -96,7 +98,8 @@ public class PacketReceivedTranslator implements MessageTranslator<PacketInMessa
         return matchBuilder.build();
     }
 
-    private static Long getPortNumberFromMatch(final List<MatchEntry> entries) {
+    @VisibleForTesting
+    static Long getPortNumberFromMatch(final List<MatchEntry> entries) {
         Long port = null;
         for (MatchEntry entry : entries) {
             if (InPortCase.class.equals(entry.getMatchEntryValue().getImplementedInterface())) {

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/translator/PacketReceivedTranslatorTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/translator/PacketReceivedTranslatorTest.java
index 803aafbbe5d0b90c5dfb78de39488a3e6907d40d..2c87f2522137c2c88dee281df83f07c00d157840 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/translator/PacketReceivedTranslatorTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/translator/PacketReceivedTranslatorTest.java
@@ -1,5 +1,6 @@
 package org.opendaylight.openflowplugin.impl.translator;
 
+import com.google.common.collect.Lists;
 import java.math.BigInteger;
 import org.junit.Assert;
 import org.junit.Before;
@@ -13,11 +14,29 @@ import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceState;
+import org.opendaylight.openflowplugin.openflow.md.util.OpenflowPortsUtil;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnector;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnectorKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PacketInReason;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortNumber;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.TableId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.InPort;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OpenflowBasicClass;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.InPortCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.in.port._case.InPortBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.MatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.FeaturesReply;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PacketInMessage;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PacketInMessageBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketReceived;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.packet.received.Match;
+import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
 
 /**
  * Created by tkubas on 4/1/15.
@@ -36,31 +55,100 @@ public class PacketReceivedTranslatorTest {
     DataBroker dataBroker;
     @Mock
     DeviceContext deviceContext;
-    String data = "Test_Data";
+
+    final String data = "Test_Data";
+
+    public PacketReceivedTranslatorTest() {
+        OpenflowPortsUtil.init();
+    }
 
     @Before
     public void setUp() throws Exception {
         Mockito.when(deviceContext.getPrimaryConnectionContext()).thenReturn(connectionContext);
         Mockito.when(connectionContext.getFeatures()).thenReturn(featuresReply);
         Mockito.when(featuresReply.getDatapathId()).thenReturn(BigInteger.TEN);
+        Mockito.when(deviceContext.getDeviceState()).thenReturn(deviceState);
     }
 
     @Test
     public void testTranslate() throws Exception {
+        final KeyedInstanceIdentifier<Node, NodeKey> nodePath = KeyedInstanceIdentifier
+                .create(Nodes.class)
+                .child(Node.class, new NodeKey(new NodeId("openflow:10")));
         final PacketReceivedTranslator packetReceivedTranslator = new PacketReceivedTranslator();
-        final PacketInMessage packetInMessage = createPacketInMessage(data.getBytes(), 5);
+        final PacketInMessage packetInMessage = createPacketInMessage(data.getBytes(), 5L);
+        Mockito.when(deviceState.getNodeInstanceIdentifier()).thenReturn(nodePath);
+
         final PacketReceived packetReceived = packetReceivedTranslator.translate(packetInMessage, deviceContext, null);
+
         Assert.assertArrayEquals(packetInMessage.getData(), packetReceived.getPayload());
         Assert.assertEquals("org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.SendToController",
-                             packetReceived.getPacketInReason().getName());
+                packetReceived.getPacketInReason().getName());
+        Assert.assertEquals("openflow:10:5",
+                packetReceived.getIngress().getValue().firstKeyOf(NodeConnector.class, NodeConnectorKey.class)
+                        .getId().getValue());
+        Assert.assertEquals(0L, packetReceived.getFlowCookie().getValue().longValue());
+        Assert.assertEquals(42L, packetReceived.getTableId().getValue().longValue());
     }
 
     private static PacketInMessage createPacketInMessage(final byte[] data,
-                                                         final java.lang.Integer port) {
+                                                         final long port) {
         final PacketInReason reason = PacketInReason.OFPRACTION;
+
+        MatchEntryBuilder matchEntryBuilder = assembleMatchEntryBld(port);
+        MatchBuilder packetInMatchBld = new MatchBuilder()
+                .setMatchEntry(Lists.newArrayList(matchEntryBuilder.build()));
+
         return new PacketInMessageBuilder()
                 .setVersion(OFConstants.OFP_VERSION_1_0)
-                .setData(data).setReason(reason).build();
+                .setData(data).setReason(reason)
+                .setMatch(packetInMatchBld.build())
+                .setVersion(OFConstants.OFP_VERSION_1_3)
+                .setCookie(BigInteger.ZERO)
+                .setTableId(new TableId(42L))
+                .build();
+
+    }
+
+    @Test
+    public void testGetPacketInMatch() throws Exception {
+        final long portNumValue = 11L;
 
+        MatchEntryBuilder matchEntryBuilder = assembleMatchEntryBld(portNumValue);
+        MatchBuilder packetInMatchBld = new MatchBuilder()
+                .setMatchEntry(Lists.newArrayList(matchEntryBuilder.build()));
+        PacketInMessageBuilder inputBld = new PacketInMessageBuilder()
+                .setMatch(packetInMatchBld.build())
+                .setVersion(OFConstants.OFP_VERSION_1_3);
+        BigInteger dpid = BigInteger.TEN;
+
+        final Match packetInMatch = PacketReceivedTranslator.getPacketInMatch(inputBld.build(), dpid);
+
+        Assert.assertNotNull(packetInMatch.getInPort());
+        Assert.assertEquals("openflow:10:11", packetInMatch.getInPort().getValue());
+    }
+
+    private static MatchEntryBuilder assembleMatchEntryBld(long portNumValue) {
+        MatchEntryBuilder matchEntryBuilder = prepareHeader(InPort.class, false);
+        InPortBuilder inPortBld = new InPortBuilder().setPortNumber(new PortNumber(portNumValue));
+        InPortCaseBuilder caseBuilder = new InPortCaseBuilder();
+        caseBuilder.setInPort(inPortBld.build());
+        matchEntryBuilder.setMatchEntryValue(caseBuilder.build());
+        return matchEntryBuilder;
+    }
+
+    private static MatchEntryBuilder prepareHeader(Class<? extends MatchField> oxmMatchField, boolean hasMask) {
+        MatchEntryBuilder builder = new MatchEntryBuilder();
+        builder.setOxmClass(OpenflowBasicClass.class);
+        builder.setOxmMatchField(oxmMatchField);
+        builder.setHasMask(hasMask);
+        return builder;
+    }
+
+
+    @Test
+    public void testGetPortNumberFromMatch() throws Exception {
+        final Long portNumber = PacketReceivedTranslator.getPortNumberFromMatch(Lists.newArrayList(assembleMatchEntryBld(11L).build()));
+        Assert.assertEquals(11L, portNumber.longValue());
     }
 }
\ No newline at end of file