commit 556c8d4b40e7049140972c14797c1c77eb3ab524
author Yi Tseng <yi@opennetworking.org> Tue Apr 16 18:07:00 2019 -0700
committer Yi Tseng <a86487817@gmail.com> Wed Apr 17 02:20:54 2019 +0000
tree 61c79564d1045591b3963805fbbb454e77afc965
parent 4b2ff04ad8d0b6e72cea9ab7c080ef5a7b1cf1e4

Fix NPE of P4Runtime device when deleting a group

Change-Id: I98b87beddc6b1b7afec537d4d618185006c31aeb

drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/P4RuntimeActionGroupProgrammable.java

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 612394f..97a721b 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
@@ -112,8 +112,8 @@
                         return;
                     }
                     GroupDescription groupDesc = new DefaultGroupDescription(
-                            deviceId, op.groupType(), op.buckets(), groupOnStore.appCookie(),
-                            op.groupId().id(), groupOnStore.appId());
+                            deviceId, groupOnStore.type(), groupOnStore.buckets(), groupOnStore.appCookie(),
+                            groupOnStore.id().id(), groupOnStore.appId());
                     DefaultGroup groupToApply = new DefaultGroup(op.groupId(), groupDesc);
                     processPdGroup(groupToApply, op.opType());
                 });