commit c32976e7d59a72b32a390737a296dad3e239651f
author Carmelo Cascone <carmelo@opennetworking.org> Mon Apr 08 14:50:52 2019 -0700
committer Carmelo Cascone <carmelo@opennetworking.org> Mon Apr 08 23:00:54 2019 +0000
tree c9540e4dddfcbc39cd32c22b73cc13922ca579b9
parent b48533e3f7cae7bea21af3589af114873251b030

Various fixes in preparation of Stratum demo at ONS 2019

- Do not read counters with table entries for Barefoot drivers
- If driver behavior setup fails, log which operation we are aborting
- Remove unnecessary setup steps in Stratum-related drivers
- Always get clients by their key in gRPC-based drivers
- Log when P4Runtime group operation fails because of missing group in
store
- Fix polling of table entry counters for P4Runtime driver

Change-Id: Ic9bf19b76d8cb5a191aec24852af4410fea8b998

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 9603241..d14b917 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
@@ -81,8 +81,8 @@
     private PiGroupTranslator groupTranslator;
 
     @Override
-    protected boolean setupBehaviour() {
-        if (!super.setupBehaviour()) {
+    protected boolean setupBehaviour(String opName) {
+        if (!super.setupBehaviour(opName)) {
             return false;
         }
         groupMirror = this.handler().get(P4RuntimeActionProfileGroupMirror.class);
@@ -95,7 +95,7 @@
     @Override
     public void performGroupOperation(DeviceId deviceId,
                                       GroupOperations groupOps) {
-        if (!setupBehaviour()) {
+        if (!setupBehaviour("performGroupOperation()")) {
             return;
         }
 
@@ -107,8 +107,8 @@
                     // 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());
+                        log.warn("Unable to find group {} in store, aborting {} operation [{}]",
+                                 op.groupId(), op.opType(), op);
                         return;
                     }
                     GroupDescription groupDesc = new DefaultGroupDescription(
@@ -121,7 +121,7 @@
 
     @Override
     public Collection<Group> getGroups() {
-        if (!setupBehaviour()) {
+        if (!setupBehaviour("getGroups()")) {
             return Collections.emptyList();
         }