Bug 6050 - TcpSrcCodec is not maskable

	Removed mask from implementation base on specification
	- TcpSrcCodec
	- TcpDstCodec
	- UdpSrcCodec
	- UdpDstCodec

Change-Id: I29ebecf77d1e832de6b5441cbd31efcc07fb13f4
Signed-off-by: miroslav.macko <miroslav.macko@pantheon.tech>

diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/TcpDstCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/TcpDstCodec.java
index 38d3fd208f4d97f45aaf88af436095869862dcb7..ad46e6abf94abcfb1366423de4b86d4cc1269a49 100644 (file)
--- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/TcpDstCodec.java
+++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/TcpDstCodec.java
@@ -44,20 +44,15 @@ public class TcpDstCodec extends AbstractMatchCodec {
         serializeHeader(input, outBuffer);
         TcpDstCaseValue tcpDstCase = ((TcpDstCaseValue) input.getMatchEntryValue());
         outBuffer.writeShort(tcpDstCase.getTcpDstValues().getPort().getValue());
-        outBuffer.writeShort(tcpDstCase.getTcpDstValues().getMask());
     }
 
     @Override
     public MatchEntry deserialize(ByteBuf message) {
         MatchEntryBuilder matchEntryBuilder = deserializeHeader(message);
-        matchEntryBuilder.setHasMask(true);
         int portNo = message.readUnsignedShort();
-        int mask = message.readUnsignedShort();
-        message.readBytes(mask);
         TcpDstCaseValueBuilder caseBuilder = new TcpDstCaseValueBuilder();
         TcpDstValuesBuilder tcpDstValuesBuilder = new TcpDstValuesBuilder();
         tcpDstValuesBuilder.setPort(new PortNumber(portNo));
-        tcpDstValuesBuilder.setMask(portNo);
         caseBuilder.setTcpDstValues(tcpDstValuesBuilder.build());
         matchEntryBuilder.setMatchEntryValue(caseBuilder.build());
         return matchEntryBuilder.build();
@@ -79,9 +74,7 @@ public class TcpDstCodec extends AbstractMatchCodec {
     }
 
     @Override
-    public Class<? extends MatchField> getNxmField() {
-        return NxmOfTcpDst.class;
-    }
+    public Class<? extends MatchField> getNxmField() { return NxmOfTcpDst.class; }
 
     @Override
     public Class<? extends OxmClassBase> getOxmClass() {

diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/TcpSrcCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/TcpSrcCodec.java
index 5c483870a09dc64ed3a07ae5cd467f6bd98e14cb..ec7f57c2be5991da1b9d06b6ee10a25938f09f91 100644 (file)
--- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/TcpSrcCodec.java
+++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/TcpSrcCodec.java
@@ -43,20 +43,16 @@ public class TcpSrcCodec extends AbstractMatchCodec {
         serializeHeader(input, outBuffer);
         TcpSrcCaseValue tcpSrcCase = ((TcpSrcCaseValue) input.getMatchEntryValue());
         outBuffer.writeShort(tcpSrcCase.getTcpSrcValues().getPort().getValue());
-        outBuffer.writeShort(tcpSrcCase.getTcpSrcValues().getMask());
     }
 
     @Override
     public MatchEntry deserialize(ByteBuf message) {
         MatchEntryBuilder matchEntryBuilder = deserializeHeader(message);
-        matchEntryBuilder.setHasMask(true);
+        matchEntryBuilder.setHasMask(false);
         int portNo = message.readUnsignedShort();
-        int mask = message.readUnsignedShort();
-        message.readBytes(mask);
         TcpSrcCaseValueBuilder caseBuilder = new TcpSrcCaseValueBuilder();
         TcpSrcValuesBuilder tcpSrcValuesBuilder = new TcpSrcValuesBuilder();
         tcpSrcValuesBuilder.setPort(new PortNumber(portNo));
-        tcpSrcValuesBuilder.setMask(portNo);
         caseBuilder.setTcpSrcValues(tcpSrcValuesBuilder.build());
         matchEntryBuilder.setMatchEntryValue(caseBuilder.build());
         return matchEntryBuilder.build();

diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/UdpDstCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/UdpDstCodec.java
index 9347dcd7d0fa5b2ee8ec5d3b080bf9eba9c16c88..3bf3d374fea87678f37ea8048f85aa53ac4def9a 100644 (file)
--- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/UdpDstCodec.java
+++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/UdpDstCodec.java
@@ -45,20 +45,16 @@ public class UdpDstCodec extends AbstractMatchCodec {
         serializeHeader(input, outBuffer);
         UdpDstCaseValue udpDstCase = ((UdpDstCaseValue) input.getMatchEntryValue());
         outBuffer.writeShort(udpDstCase.getUdpDstValues().getPort().getValue());
-        outBuffer.writeShort(udpDstCase.getUdpDstValues().getMask());
     }
 
     @Override
     public MatchEntry deserialize(ByteBuf message) {
         MatchEntryBuilder matchEntryBuilder = deserializeHeader(message);
-        matchEntryBuilder.setHasMask(true);
+        matchEntryBuilder.setHasMask(false);
         int portNo = message.readUnsignedShort();
-        int mask = message.readUnsignedShort();
-        message.readBytes(mask);
         UdpDstCaseValueBuilder caseBuilder = new UdpDstCaseValueBuilder();
         UdpDstValuesBuilder udpDstValuesBuilder = new UdpDstValuesBuilder();
         udpDstValuesBuilder.setPort(new PortNumber(portNo));
-        udpDstValuesBuilder.setMask(portNo);
         caseBuilder.setUdpDstValues(udpDstValuesBuilder.build());
         matchEntryBuilder.setMatchEntryValue(caseBuilder.build());
         return matchEntryBuilder.build();

diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/UdpSrcCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/UdpSrcCodec.java
index 44c2e64ea76a811c2125760f0c8a89b9ab371112..0e1ba3ee3d16dce5915039e2615ed03861f96547 100644 (file)
--- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/UdpSrcCodec.java
+++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/UdpSrcCodec.java
@@ -45,20 +45,16 @@ public class UdpSrcCodec extends AbstractMatchCodec {
         serializeHeader(input, outBuffer);
         UdpSrcCaseValue udpSrcCase = ((UdpSrcCaseValue) input.getMatchEntryValue());
         outBuffer.writeShort(udpSrcCase.getUdpSrcValues().getPort().getValue());
-        outBuffer.writeShort(udpSrcCase.getUdpSrcValues().getMask());
     }
 
     @Override
     public MatchEntry deserialize(ByteBuf message) {
         MatchEntryBuilder matchEntryBuilder = deserializeHeader(message);
-        matchEntryBuilder.setHasMask(true);
+        matchEntryBuilder.setHasMask(false);
         int portNo = message.readUnsignedShort();
-        int mask = message.readUnsignedShort();
-        message.readBytes(mask);
         UdpSrcCaseValueBuilder caseBuilder = new UdpSrcCaseValueBuilder();
         UdpSrcValuesBuilder udpSrcValuesBuilder = new UdpSrcValuesBuilder();
         udpSrcValuesBuilder.setPort(new PortNumber(portNo));
-        udpSrcValuesBuilder.setMask(portNo);
         caseBuilder.setUdpSrcValues(udpSrcValuesBuilder.build());
         matchEntryBuilder.setMatchEntryValue(caseBuilder.build());
         return matchEntryBuilder.build();