Merge "Refactoring of 'extractIpv4Mask' method"

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

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImpl.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImpl.java
index db2e1c1b161eec8d9495da3ed686828fc7156294..a6240b35ef97c8d4a6d5c8c6e441e44b81320e16 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImpl.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImpl.java
@@ -65,7 +65,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.MetadataBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.ProtocolMatchFields;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.ProtocolMatchFieldsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.TcpFlagMatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.TunnelBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.VlanMatch;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.VlanMatchBuilder;
@@ -392,7 +391,7 @@ public class MatchConvertorImpl implements MatchConvertor<List<MatchEntry>> {
                     Ipv4Address ipv4Address = new Ipv4Address(addressParts.next());
                     ipv4SrcBuilder.setIpv4Address(ipv4Address);
                     boolean hasMask = false;
-                    byte[] mask = extractIpv4Mask(hasMask, addressParts);
+                    byte[] mask = extractIpv4Mask(addressParts);
                     if (null != mask) {
                         ipv4SrcBuilder.setMask(mask);
                         hasMask = true;
@@ -415,7 +414,7 @@ public class MatchConvertorImpl implements MatchConvertor<List<MatchEntry>> {
                     Ipv4Address ipv4Address = new Ipv4Address(addressParts.next());
                     ipv4DstBuilder.setIpv4Address(ipv4Address);
                     boolean hasMask = false;
-                    byte[] mask = extractIpv4Mask(hasMask, addressParts);
+                    byte[] mask = extractIpv4Mask(addressParts);
                     if (null != mask) {
                         ipv4DstBuilder.setMask(mask);
                         hasMask = true;
@@ -441,7 +440,7 @@ public class MatchConvertorImpl implements MatchConvertor<List<MatchEntry>> {
                     Ipv4Address ipv4Address = new Ipv4Address(addressParts.next());
                     ipv4SrcBuilder.setIpv4Address(ipv4Address);
                     boolean hasMask = false;
-                    byte[] mask = extractIpv4Mask(hasMask, addressParts);
+                    byte[] mask = extractIpv4Mask(addressParts);
                     if (null != mask) {
                         ipv4SrcBuilder.setMask(mask);
                         hasMask = true;
@@ -464,7 +463,7 @@ public class MatchConvertorImpl implements MatchConvertor<List<MatchEntry>> {
                     Ipv4Address ipv4Address = new Ipv4Address(addressParts.next());
                     ipv4DstBuilder.setIpv4Address(ipv4Address);
                     boolean hasMask = false;
-                    byte[] mask = extractIpv4Mask(hasMask, addressParts);
+                    byte[] mask = extractIpv4Mask(addressParts);
                     if (null != mask) {
                         ipv4DstBuilder.setMask(mask);
                         hasMask = true;
@@ -493,7 +492,7 @@ public class MatchConvertorImpl implements MatchConvertor<List<MatchEntry>> {
                     Ipv4Address ipv4Address = new Ipv4Address(addressParts.next());
                     arpSpaBuilder.setIpv4Address(ipv4Address);
                     boolean hasMask = false;
-                    byte[] mask = extractIpv4Mask(hasMask, addressParts);
+                    byte[] mask = extractIpv4Mask(addressParts);
                     if (null != mask) {
                         arpSpaBuilder.setMask(mask);
                         hasMask = true;
@@ -517,7 +516,7 @@ public class MatchConvertorImpl implements MatchConvertor<List<MatchEntry>> {
                     Ipv4Address ipv4Address = new Ipv4Address(addressParts.next());
                     arpTpaBuilder.setIpv4Address(ipv4Address);
                     boolean hasMask = false;
-                    byte[] mask = extractIpv4Mask(hasMask, addressParts);
+                    byte[] mask = extractIpv4Mask(addressParts);
                     if (null != mask) {
                         arpTpaBuilder.setMask(mask);
                         hasMask = true;
@@ -890,7 +889,7 @@ public class MatchConvertorImpl implements MatchConvertor<List<MatchEntry>> {
     }
 
 
-    private static byte[] extractIpv4Mask(boolean hasMask, final Iterator<String> addressParts) {
+    private static byte[] extractIpv4Mask(final Iterator<String> addressParts) {
         final int prefix;
         if (addressParts.hasNext()) {
             int potentionalPrefix = Integer.parseInt(addressParts.next());
@@ -903,7 +902,6 @@ public class MatchConvertorImpl implements MatchConvertor<List<MatchEntry>> {
             int mask = 0xffffffff << (32 - prefix);
             byte[] maskBytes = new byte[]{(byte) (mask >>> 24), (byte) (mask >>> 16), (byte) (mask >>> 8),
                     (byte) mask};
-            hasMask = true;
             return maskBytes;
         }
         return null;
@@ -1103,7 +1101,6 @@ public class MatchConvertorImpl implements MatchConvertor<List<MatchEntry>> {
         ArpMatchBuilder arpMatchBuilder = new ArpMatchBuilder();
         Ipv6MatchBuilder ipv6MatchBuilder = new Ipv6MatchBuilder();
         ProtocolMatchFieldsBuilder protocolMatchFieldsBuilder = new ProtocolMatchFieldsBuilder();
-        TcpFlagMatchBuilder tcpFlagMatchBuilder = new TcpFlagMatchBuilder();
         TunnelIpv4MatchBuilder tunnelIpv4MatchBuilder = new TunnelIpv4MatchBuilder();
 
         for (MatchEntry ofMatch : swMatchList) {
@@ -1766,33 +1763,6 @@ public class MatchConvertorImpl implements MatchConvertor<List<MatchEntry>> {
         return matchEntryBuilder.build();
     }
 
-    private static MatchEntry toOfVlanVid(final VlanId vlanId) {
-        // TODO: verify
-        boolean hasmask = false;
-        boolean setCfiBit = false;
-        Integer vidEntryValue = 0;
-        MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
-        matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
-        matchEntryBuilder.setOxmMatchField(VlanVid.class);
-        VlanVidCaseBuilder vlanVidCaseBuilder = new VlanVidCaseBuilder();
-        VlanVidBuilder vlanVidBuilder = new VlanVidBuilder();
-        if (Boolean.TRUE.equals(vlanId.isVlanIdPresent())) {
-            setCfiBit = true;
-            if (vlanId.getVlanId() != null) {
-                vidEntryValue = vlanId.getVlanId().getValue();
-            }
-            hasmask = (vidEntryValue == 0);
-        }
-        vlanVidBuilder.setCfiBit(setCfiBit);
-        vlanVidBuilder.setVlanVid(vidEntryValue);
-        if (hasmask) {
-            vlanVidBuilder.setMask(VLAN_VID_MASK);
-        }
-        vlanVidCaseBuilder.setVlanVid(vlanVidBuilder.build());
-        matchEntryBuilder.setMatchEntryValue(vlanVidCaseBuilder.build());
-        matchEntryBuilder.setHasMask(hasmask);
-        return matchEntryBuilder.build();
-    }
 
     private static MatchEntry toOfIpProto(final Short ipProtocol) {
         MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();