Fixed invalid value in TestFromSalConversionsUtils.

Casting 0x84 to byte created invalid input (-124) for uint8 field.

Change-Id: Id3594149b26b3a6de76c1209681cac2c0d1e230f
Signed-off-by: Martin Vitez <mvitez@cisco.com>

diff --git a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/FromSalConversionsUtils.java b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/FromSalConversionsUtils.java
index cc86659657883ad48d01ef45609d076d6cf7e590..ad6009c827a365ff40ebdce31cb1c87e92efb7f8 100644 (file)
--- a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/FromSalConversionsUtils.java
+++ b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/FromSalConversionsUtils.java
@@ -9,7 +9,6 @@ import java.net.Inet6Address;
 import java.net.InetAddress;
 
 
-import org.opendaylight.controller.sal.compatibility.MDFlowMapping;
 import org.opendaylight.controller.sal.core.NodeConnector;
 
 
@@ -118,7 +117,7 @@ public class FromSalConversionsUtils {
                 return Layer4MatchAsTcp(sourceMatch);
             case UDP:
                 return Layer4MatchAsUdp(sourceMatch);
-            case SCTP:
+            case CRUDP:
                 return Layer4MatchAsSctp(sourceMatch);
             }
         }

diff --git a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ProtocolConstants.java b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ProtocolConstants.java
index 7392f5c7631035b83aefc6c26aecd9c625e1f818..92a1aa947647df796eb268d8dcae24f1b309d6ab 100644 (file)
--- a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ProtocolConstants.java
+++ b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ProtocolConstants.java
@@ -7,7 +7,7 @@ public class ProtocolConstants {
     // source: http://en.wikipedia.org/wiki/List_of_IP_protocol_numbers
     public static final byte TCP = (byte) 0x06;
     public static final byte UDP = (byte) 0x11;
-    public static final byte SCTP = (byte) 0x84;
+    public static final byte CRUDP = (byte) 0x7F;
 
     private ProtocolConstants() {
 

diff --git a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ToSalConversionsUtils.java b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ToSalConversionsUtils.java
index 064b920640fb970afc49c5034554800d6b80f389..b5ed3fe4c2ca0c1979fd50d5f2580927c51c6b81 100644 (file)
--- a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ToSalConversionsUtils.java
+++ b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ToSalConversionsUtils.java
@@ -93,7 +93,7 @@ import java.util.Collections;
 import java.util.List;
 
 import static org.opendaylight.controller.sal.compatibility.ProtocolConstants.ETHERNET_ARP;
-import static org.opendaylight.controller.sal.compatibility.ProtocolConstants.SCTP;
+import static org.opendaylight.controller.sal.compatibility.ProtocolConstants.CRUDP;
 import static org.opendaylight.controller.sal.compatibility.ProtocolConstants.TCP;
 import static org.opendaylight.controller.sal.compatibility.ProtocolConstants.UDP;
 import static org.opendaylight.controller.sal.match.MatchType.DL_DST;
@@ -464,7 +464,7 @@ public class ToSalConversionsUtils {
             }
         }
 
-        target.setField(NW_PROTO, SCTP);
+        target.setField(NW_PROTO, CRUDP);
 
     }
 

diff --git a/opendaylight/md-sal/compatibility/sal-compatibility/src/test/java/org/opendaylight/controller/sal/compatibility/test/TestFromSalConversionsUtils.java b/opendaylight/md-sal/compatibility/sal-compatibility/src/test/java/org/opendaylight/controller/sal/compatibility/test/TestFromSalConversionsUtils.java
index 96b8cafdf8ca3ed512c1ab65fedf0e4d3919ba3d..cb70174103802005e9cd0d73d88da9344138697d 100644 (file)
--- a/opendaylight/md-sal/compatibility/sal-compatibility/src/test/java/org/opendaylight/controller/sal/compatibility/test/TestFromSalConversionsUtils.java
+++ b/opendaylight/md-sal/compatibility/sal-compatibility/src/test/java/org/opendaylight/controller/sal/compatibility/test/TestFromSalConversionsUtils.java
@@ -11,7 +11,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.opendaylight.controller.sal.compatibility.ProtocolConstants.ETHERNET_ARP;
-import static org.opendaylight.controller.sal.compatibility.ProtocolConstants.SCTP;
+import static org.opendaylight.controller.sal.compatibility.ProtocolConstants.CRUDP;
 import static org.opendaylight.controller.sal.compatibility.ProtocolConstants.TCP;
 import static org.opendaylight.controller.sal.compatibility.ProtocolConstants.UDP;
 
@@ -134,7 +134,7 @@ public class TestFromSalConversionsUtils {
             break;
         case sctp:
             boolean sctpFound = false;
-            assertEquals("Wrong protocol", SCTP, match.getIpMatch().getIpProtocol().byteValue());
+            assertEquals("Wrong protocol", CRUDP, match.getIpMatch().getIpProtocol().byteValue());
             Layer4Match layer4Match = match.getLayer4Match();
             if (layer4Match instanceof SctpMatch) {
                 assertEquals("Sctp source port is incorrect.", 0xffff, (int) ((SctpMatch) layer4Match)
@@ -325,7 +325,7 @@ public class TestFromSalConversionsUtils {
             salMatch.setField(MatchType.NW_TOS, (byte) 0x3f);
             break;
         case sctp:
-            salMatch.setField(MatchType.NW_PROTO, SCTP);
+            salMatch.setField(MatchType.NW_PROTO, CRUDP);
             salMatch.setField(MatchType.TP_SRC, (short) 0xffff);
             salMatch.setField(MatchType.TP_DST, (short) 0xfffe);
             break;

diff --git a/opendaylight/md-sal/compatibility/sal-compatibility/src/test/java/org/opendaylight/controller/sal/compatibility/test/TestToSalConversionsUtils.java b/opendaylight/md-sal/compatibility/sal-compatibility/src/test/java/org/opendaylight/controller/sal/compatibility/test/TestToSalConversionsUtils.java
index 8108074ed74dc759314238ba7aec9e6836958632..97e1660443449bbb7ff8ce4364b844ab23b65c0f 100644 (file)
--- a/opendaylight/md-sal/compatibility/sal-compatibility/src/test/java/org/opendaylight/controller/sal/compatibility/test/TestToSalConversionsUtils.java
+++ b/opendaylight/md-sal/compatibility/sal-compatibility/src/test/java/org/opendaylight/controller/sal/compatibility/test/TestToSalConversionsUtils.java
@@ -60,7 +60,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instru
 import com.google.common.net.InetAddresses;
 
 import static org.opendaylight.controller.sal.compatibility.ProtocolConstants.ETHERNET_ARP;
-import static org.opendaylight.controller.sal.compatibility.ProtocolConstants.SCTP;
+import static org.opendaylight.controller.sal.compatibility.ProtocolConstants.CRUDP;
 import static org.opendaylight.controller.sal.compatibility.ProtocolConstants.TCP;
 import static org.opendaylight.controller.sal.compatibility.ProtocolConstants.UDP;
 
@@ -142,7 +142,7 @@ public class TestToSalConversionsUtils {
         case sctp:
             assertEquals("TP_SRC isn't equal.", 31, (short) match.getField(MatchType.TP_SRC).getValue());
             assertEquals("TP_DST isn't equal.", 32, (short) match.getField(MatchType.TP_DST).getValue());
-            assertEquals("NW_PROTO isn't equal.", SCTP, (byte) match.getField(MatchType.NW_PROTO).getValue());
+            assertEquals("NW_PROTO isn't equal.", CRUDP, (byte) match.getField(MatchType.NW_PROTO).getValue());
             break;
         case tcp:
             assertEquals("TP_SRC isn't equal.", 21, (short) match.getField(MatchType.TP_SRC).getValue());