Fix P4Runtime driver ignoring CLONE groups
Change-Id: I24d9b52bc5ea89320d9ef6afa5f82c4778edfc21
diff --git a/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/P4RuntimeActionGroupProgrammable.java b/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/P4RuntimeActionGroupProgrammable.java
index 97a721b..e0805a6 100644
--- a/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/P4RuntimeActionGroupProgrammable.java
+++ b/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/P4RuntimeActionGroupProgrammable.java
@@ -99,24 +99,22 @@
return;
}
- groupOps.operations().stream()
- .filter(op -> !op.groupType().equals(GroupDescription.Type.ALL))
- .forEach(op -> {
- // ONOS-7785 We need the group app cookie (which includes
- // the action profile ID) but this is not part of the
- // GroupDescription.
- Group groupOnStore = groupStore.getGroup(deviceId, op.groupId());
- if (groupOnStore == null) {
- log.warn("Unable to find group {} in store, aborting {} operation [{}]",
- op.groupId(), op.opType(), op);
- return;
- }
- GroupDescription groupDesc = new DefaultGroupDescription(
- deviceId, groupOnStore.type(), groupOnStore.buckets(), groupOnStore.appCookie(),
- groupOnStore.id().id(), groupOnStore.appId());
- DefaultGroup groupToApply = new DefaultGroup(op.groupId(), groupDesc);
- processPdGroup(groupToApply, op.opType());
- });
+ groupOps.operations().forEach(op -> {
+ // ONOS-7785 We need the group app cookie (which includes
+ // the action profile ID) but this is not part of the
+ // GroupDescription.
+ Group groupOnStore = groupStore.getGroup(deviceId, op.groupId());
+ if (groupOnStore == null) {
+ log.warn("Unable to find group {} in store, aborting {} operation [{}]",
+ op.groupId(), op.opType(), op);
+ return;
+ }
+ GroupDescription groupDesc = new DefaultGroupDescription(
+ deviceId, groupOnStore.type(), groupOnStore.buckets(), groupOnStore.appCookie(),
+ groupOnStore.id().id(), groupOnStore.appId());
+ DefaultGroup groupToApply = new DefaultGroup(op.groupId(), groupDesc);
+ processPdGroup(groupToApply, op.opType());
+ });
}
@Override