group statistics request asks for ALL not ANY

Change-Id: I53d60fd4d4c35159471eba03dcb436dcbd97841e
Signed-off-by: Martin Bobak <mbobak@cisco.com>
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>

diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/OFConstants.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/OFConstants.java
index f405a9dcd19a17289a83d32778bb6f5df65180b6..b0de6ddf2fe1326d9e266d52aada18ed9deb9afd 100644 (file)
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/OFConstants.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/OFConstants.java
@@ -42,6 +42,8 @@ public final class OFConstants {
     /** enum ofp_group: For OFPFC_DELETE* commands, require matching entries to include this as an
      *  output group. A value of OFPG_ANY indicates no restriction. */
     public static final Long OFPG_ANY = ANY;
+    /** enum ofp_group: Represents all groups for group delete commands. */
+    public static final Long OFPG_ALL = 0xfffffffcL;
     /** Refers to all queues configured at the specified port. */
     public static final Long OFPQ_ALL = ANY;
     public static final BigInteger DEFAULT_COOKIE = BigInteger.ZERO;

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/common/MultipartRequestInputFactory.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/common/MultipartRequestInputFactory.java
index 32c83e742d889f5167ec2ec79fb0ca88043a8680..276bf111d8e05a05c1da5ef31314f9469c4eb530 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/common/MultipartRequestInputFactory.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/common/MultipartRequestInputFactory.java
@@ -12,6 +12,7 @@ import com.google.common.base.Preconditions;
 import java.math.BigInteger;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
+import org.opendaylight.openflowjava.protocol.api.util.BinContent;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.GroupId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MeterId;
@@ -199,7 +200,7 @@ public final class MultipartRequestInputFactory {
             case OFPMPGROUP:
                 MultipartRequestGroupCaseBuilder multipartRequestGroupCaseBuilder = new MultipartRequestGroupCaseBuilder();
                 MultipartRequestGroupBuilder multipartRequestGroupBuilder = new MultipartRequestGroupBuilder();
-                GroupId groupId = new GroupId(OFConstants.OFPG_ANY);
+                GroupId groupId = new GroupId(OFConstants.OFPG_ALL);
                 multipartRequestGroupBuilder.setGroupId(groupId);
                 multipartRequestGroupCaseBuilder.setMultipartRequestGroup(multipartRequestGroupBuilder.build());
                 return multipartRequestGroupCaseBuilder.build();