Bug 5540 - PortConvertor, MatchConvertor

[openflowplugin.git] / openflowplugin / src / test / java / org / opendaylight / openflowplugin / openflow / md / core / sal / convertor / match / MatchResponseConvertorTest.java

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImplTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchResponseConvertorTest.java
similarity index 84%
rename from openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImplTest.java
rename to openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchResponseConvertorTest.java
index 956f1e74aaa8d28524524eb7a7236ed96c9b14b3..b806e1263c7e8f6cc26bfa9d6ec016b172dcb27f 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImplTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchResponseConvertorTest.java
@@ -9,13 +9,18 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion;
+import org.opendaylight.openflowplugin.api.OFConstants;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManager;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.data.VersionDatapathIdConvertorData;
 import org.opendaylight.openflowplugin.openflow.md.util.OpenflowPortsUtil;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
@@ -55,9 +60,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc
 /**
  * Unit test for {@link MatchConvertorImpl}.
  */
-public class MatchConvertorImplTest {
+public class MatchResponseConvertorTest {
     private static final BigInteger DPID = BigInteger.TEN;
-    private static final Long IN_PORT = Long.valueOf(6);
+    private static final Long IN_PORT = 6L;
     private static final String URI_IN_PORT =
             "openflow:" + DPID + ":" + IN_PORT;
     private static final MacAddress MAC_SRC =
@@ -79,9 +84,8 @@ public class MatchConvertorImplTest {
     }
 
     /**
-     * Test method for {@link MatchConvertorImpl#fromOFMatchToSALMatch(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match, java.math.BigInteger, org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion)}.
+     * Test method for {@link org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.MatchResponseConvertor#convert(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchEntriesGrouping, org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.data.VersionDatapathIdConvertorData)} }.
      */
-
     @Test
     public void testFromOFMatchToSALMatch() {
         List<MatchEntry> entries = createDefaultMatchEntry();
@@ -104,12 +108,13 @@ public class MatchConvertorImplTest {
             org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match ofMatch =
                     createOFMatch(MatchEntry);
 
-            MatchBuilder builder = MatchConvertorImpl.
-                    fromOFMatchToSALMatch(ofMatch, DPID, OpenflowVersion.OF13);
+            final VersionDatapathIdConvertorData data = new VersionDatapathIdConvertorData(OFConstants.OFP_VERSION_1_3);
+            data.setDatapathId(DPID);
+            final MatchBuilder builder = convert(ofMatch, data);
             checkDefault(builder);
             VlanMatch vlanMatch = builder.getVlanMatch();
             int expectedVid = (vid < 0) ? 0 : vid;
-            Boolean expectedCfi = Boolean.valueOf(vid != 0);
+            Boolean expectedCfi = vid != 0;
             assertEquals(expectedVid, vlanMatch.getVlanId().getVlanId().
                     getValue().intValue());
             assertEquals(expectedCfi, vlanMatch.getVlanId().isVlanIdPresent());
@@ -118,9 +123,8 @@ public class MatchConvertorImplTest {
     }
 
     /**
-     * Test method for {@link MatchConvertorImpl#fromOFMatchV10ToSALMatch(MatchV10, BigInteger, OpenflowVersion)}.
+     * Test method for {@link org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.MatchV10ResponseConvertor#convert(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.v10.grouping.MatchV10, org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.data.VersionDatapathIdConvertorData)} }.
      */
-
     @Test
     public void testFromOFMatchV10ToSALMatch() {
         int[] vids = {
@@ -151,8 +155,9 @@ public class MatchConvertorImplTest {
 
                 FlowWildcardsV10 wc = wcBuilder.build();
                 MatchV10 ofMatch = builder.setWildcards(wc).build();
-                Match match = MatchConvertorImpl.fromOFMatchV10ToSALMatch(
-                        ofMatch, DPID, OpenflowVersion.OF10).build();
+                final VersionDatapathIdConvertorData data = new VersionDatapathIdConvertorData(OFConstants.OFP_VERSION_1_0);
+                data.setDatapathId(DPID);
+                Match match = convert(ofMatch, data).build();
                 checkDefaultV10(match, wc, vid);
 
                 IpMatch ipMatch = match.getIpMatch();
@@ -163,8 +168,7 @@ public class MatchConvertorImplTest {
                 // Set all wildcard bits.
                 wc = wcBuilder.setAll(true).build();
                 ofMatch = builder.setWildcards(wc).build();
-                match = MatchConvertorImpl.fromOFMatchV10ToSALMatch(
-                        ofMatch, DPID, OpenflowVersion.OF10).build();
+                match = convert(ofMatch, data).build();
                 checkDefaultV10(match, wc, vid);
                 assertEquals(null, match.getIpMatch());
             }
@@ -249,7 +253,7 @@ public class MatchConvertorImplTest {
     private static MatchEntry toOfVlanVid(final int vid) {
         MatchEntryBuilder builder = new MatchEntryBuilder();
         boolean cfi = true;
-        Integer vidValue = Integer.valueOf(vid);
+        Integer vidValue = vid;
         byte[] mask = null;
         builder.setOxmClass(OpenflowBasicClass.class);
         builder.setOxmMatchField(VlanVid.class);
@@ -260,7 +264,7 @@ public class MatchConvertorImplTest {
         } else if (vid < 0) {
             // Match packet with VLAN tag regardless of its value.
             mask = new byte[]{0x10, 0x00};
-            vidValue = Integer.valueOf(0);
+            vidValue = 0;
         }
 
         VlanVidBuilder vlanVidBuilder = new VlanVidBuilder();
@@ -278,7 +282,7 @@ public class MatchConvertorImplTest {
 
     private static void checkDefaultV10(final Match match, final FlowWildcardsV10 wc, final int vid) {
         EthernetMatch ethMatch = match.getEthernetMatch();
-        if (wc.isDLSRC().booleanValue()) {
+        if (wc.isDLSRC()) {
             if (ethMatch != null) {
                 assertEquals(null, ethMatch.getEthernetSource());
             }
@@ -286,21 +290,23 @@ public class MatchConvertorImplTest {
             assertEquals(MAC_SRC, ethMatch.getEthernetSource().getAddress());
         }
 
-        if (wc.isDLDST().booleanValue()) {
-            if (ethMatch != null) {
+        if (ethMatch != null) {
+            if (wc.isDLDST()) {
                 assertEquals(null, ethMatch.getEthernetDestination());
+            } else {
+                assertNotEquals(null, ethMatch.getEthernetDestination());
+                assertEquals(MAC_DST,
+                        ethMatch.getEthernetDestination().getAddress());
             }
-        } else {
-            assertEquals(MAC_DST,
-                    ethMatch.getEthernetDestination().getAddress());
         }
 
-        if (wc.isDLTYPE().booleanValue()) {
+        if (wc.isDLTYPE()) {
             if (ethMatch != null) {
                 assertEquals(null, ethMatch.getEthernetType());
             }
             assertEquals(null, match.getLayer3Match());
         } else {
+            assert ethMatch != null;
             assertEquals(ETHTYPE_IPV4, ethMatch.getEthernetType().getType().
                     getValue().intValue());
 
@@ -312,7 +318,7 @@ public class MatchConvertorImplTest {
         }
 
         VlanMatch vlanMatch = match.getVlanMatch();
-        if (wc.isDLVLAN().booleanValue()) {
+        if (wc.isDLVLAN()) {
             assertEquals(null, vlanMatch);
         } else {
             int expectedVid;
@@ -328,7 +334,7 @@ public class MatchConvertorImplTest {
                     getValue().intValue());
             assertEquals(expectedCfi, vlanMatch.getVlanId().isVlanIdPresent());
 
-            if (wc.isDLVLANPCP().booleanValue()) {
+            if (wc.isDLVLANPCP()) {
                 assertEquals(null, vlanMatch.getVlanPcp());
             } else {
                 assertEquals(VLAN_PCP,
@@ -336,4 +342,16 @@ public class MatchConvertorImplTest {
             }
         }
     }
+
+    private MatchBuilder convert(MatchV10 match, VersionDatapathIdConvertorData data) {
+        final Optional<MatchBuilder> salMatchOptional = ConvertorManager.getInstance().convert(match, data);
+
+        return salMatchOptional.orElse(new MatchBuilder());
+    }
+
+    private MatchBuilder convert(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match match, VersionDatapathIdConvertorData data) {
+        final Optional<MatchBuilder> salMatchOptional = ConvertorManager.getInstance().convert(match, data);
+
+        return salMatchOptional.orElse(new MatchBuilder());
+    }
 }