Fix for bug 290/291

Change-Id: I6cb31435031868757ac2dc8dce42abc9b8120f94
Signed-off-by: Anilkumar Vishnoi <avishnoi@in.ibm.com>

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 860a2ef1fcf125a7b7ea2d57378c403153b1d4a0..ef057f824b25c95956a5cac9d55fd76780d944a2 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
@@ -451,7 +451,7 @@ public class MatchConvertorImpl implements MatchConvertor<List<MatchEntries>> {
                     swMatch.getDlVlanPcp()));
             matchBuilder.setVlanMatch(vlanMatchBuilder.build());
         }
-        if (!swMatch.getWildcards().isNWPROTO().booleanValue() && swMatch.getNwSrc() != null) {
+        if (!swMatch.getWildcards().isDLTYPE().booleanValue() && swMatch.getNwSrc() != null) {
             String ipv4PrefixStr = swMatch.getNwSrc().getValue();
             if (swMatch.getNwSrcMask() != null) {
                 ipv4PrefixStr += PREFIX_SEPARATOR + swMatch.getNwSrcMask();
@@ -461,7 +461,7 @@ public class MatchConvertorImpl implements MatchConvertor<List<MatchEntries>> {
                 matchBuilder.setLayer3Match(ipv4MatchBuilder.build());
             }
         }
-        if (!swMatch.getWildcards().isNWPROTO().booleanValue() && swMatch.getNwDst() != null) {
+        if (!swMatch.getWildcards().isDLTYPE().booleanValue() && swMatch.getNwDst() != null) {
             String ipv4PrefixStr = swMatch.getNwDst().getValue();
             if (swMatch.getNwDstMask() != null) {
                 ipv4PrefixStr += PREFIX_SEPARATOR + swMatch.getNwDstMask();

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorV10Impl.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorV10Impl.java
index 323c1f050afd69c8e166f2c01bcb806a0a545283..bb0e53e2cc513ebaa4bea3f25569db3304d33705 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorV10Impl.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorV10Impl.java
@@ -247,7 +247,7 @@ public class MatchConvertorV10Impl implements MatchConvertor<MatchV10> {
      * @return
      */
     private static int buildPrefix(String[] addressParts) {
-        int prefix = 0;
+        int prefix = 32;
         if (addressParts.length > 1) {
             prefix = Integer.parseInt(addressParts[1]);
         }