New P4RuntimeClient implementation that supports batching and error reporting
The new client API supports batching and provides detailed response for
write requests (e.g. if entity already exists when inserting), which was
not possible with the old one.
This patch includes:
- New more efficient implementation of P4RuntimeClient (no more locking,
use native gRPC executor, use stub deadlines)
- Ported all codecs to new AbstractCodec-based implementation (needed to
implement codec cache in the future)
- Uses batching in P4RuntimeFlowRuleProgrammable and
P4RuntimeGroupActionProgrammable
- Minor changes to PI framework runtime classes
Change-Id: I3fac42057bb4e1389d761006a32600c786598683
diff --git a/protocols/p4runtime/model/src/main/java/org/onosproject/p4runtime/model/P4ControlMetadataModel.java b/protocols/p4runtime/model/src/main/java/org/onosproject/p4runtime/model/P4ControlMetadataModel.java
index 45e7edc..a6e2a43 100644
--- a/protocols/p4runtime/model/src/main/java/org/onosproject/p4runtime/model/P4ControlMetadataModel.java
+++ b/protocols/p4runtime/model/src/main/java/org/onosproject/p4runtime/model/P4ControlMetadataModel.java
@@ -16,26 +16,26 @@
package org.onosproject.p4runtime.model;
-import org.onosproject.net.pi.model.PiControlMetadataId;
-import org.onosproject.net.pi.model.PiControlMetadataModel;
+import org.onosproject.net.pi.model.PiPacketMetadataId;
+import org.onosproject.net.pi.model.PiPacketMetadataModel;
import java.util.Objects;
/**
- * Implementation of PiControlMetadataModel for P4Runtime.
+ * Implementation of PiPacketMetadataModel for P4Runtime.
*/
-final class P4ControlMetadataModel implements PiControlMetadataModel {
+final class P4PacketMetadataModel implements PiPacketMetadataModel {
- private final PiControlMetadataId id;
+ private final PiPacketMetadataId id;
private final int bitWidth;
- P4ControlMetadataModel(PiControlMetadataId id, int bitWidth) {
+ P4PacketMetadataModel(PiPacketMetadataId id, int bitWidth) {
this.id = id;
this.bitWidth = bitWidth;
}
@Override
- public PiControlMetadataId id() {
+ public PiPacketMetadataId id() {
return id;
}
@@ -57,7 +57,7 @@
if (obj == null || getClass() != obj.getClass()) {
return false;
}
- final P4ControlMetadataModel other = (P4ControlMetadataModel) obj;
+ final P4PacketMetadataModel other = (P4PacketMetadataModel) obj;
return Objects.equals(this.id, other.id)
&& Objects.equals(this.bitWidth, other.bitWidth);
}
diff --git a/protocols/p4runtime/model/src/main/java/org/onosproject/p4runtime/model/P4InfoParser.java b/protocols/p4runtime/model/src/main/java/org/onosproject/p4runtime/model/P4InfoParser.java
index c69cd0b..6160881 100644
--- a/protocols/p4runtime/model/src/main/java/org/onosproject/p4runtime/model/P4InfoParser.java
+++ b/protocols/p4runtime/model/src/main/java/org/onosproject/p4runtime/model/P4InfoParser.java
@@ -28,8 +28,8 @@
import org.onosproject.net.pi.model.PiActionParamModel;
import org.onosproject.net.pi.model.PiActionProfileId;
import org.onosproject.net.pi.model.PiActionProfileModel;
-import org.onosproject.net.pi.model.PiControlMetadataId;
-import org.onosproject.net.pi.model.PiControlMetadataModel;
+import org.onosproject.net.pi.model.PiPacketMetadataId;
+import org.onosproject.net.pi.model.PiPacketMetadataModel;
import org.onosproject.net.pi.model.PiCounterId;
import org.onosproject.net.pi.model.PiCounterModel;
import org.onosproject.net.pi.model.PiCounterType;
@@ -362,10 +362,10 @@
throws P4InfoParserException {
final Map<PiPacketOperationType, PiPacketOperationModel> packetOpMap = Maps.newHashMap();
for (ControllerPacketMetadata ctrlPktMetaMsg : p4info.getControllerPacketMetadataList()) {
- final ImmutableList.Builder<PiControlMetadataModel> metadataListBuilder =
+ final ImmutableList.Builder<PiPacketMetadataModel> metadataListBuilder =
ImmutableList.builder();
ctrlPktMetaMsg.getMetadataList().forEach(metadataMsg -> metadataListBuilder.add(
- new P4ControlMetadataModel(PiControlMetadataId.of(metadataMsg.getName()),
+ new P4PacketMetadataModel(PiPacketMetadataId.of(metadataMsg.getName()),
metadataMsg.getBitwidth())));
packetOpMap.put(
mapPacketOpType(ctrlPktMetaMsg.getPreamble().getName()),
diff --git a/protocols/p4runtime/model/src/main/java/org/onosproject/p4runtime/model/P4PacketOperationModel.java b/protocols/p4runtime/model/src/main/java/org/onosproject/p4runtime/model/P4PacketOperationModel.java
index 84e2fe4..e29553f 100644
--- a/protocols/p4runtime/model/src/main/java/org/onosproject/p4runtime/model/P4PacketOperationModel.java
+++ b/protocols/p4runtime/model/src/main/java/org/onosproject/p4runtime/model/P4PacketOperationModel.java
@@ -17,7 +17,7 @@
package org.onosproject.p4runtime.model;
import com.google.common.collect.ImmutableList;
-import org.onosproject.net.pi.model.PiControlMetadataModel;
+import org.onosproject.net.pi.model.PiPacketMetadataModel;
import org.onosproject.net.pi.model.PiPacketOperationModel;
import org.onosproject.net.pi.model.PiPacketOperationType;
@@ -30,10 +30,10 @@
final class P4PacketOperationModel implements PiPacketOperationModel {
private final PiPacketOperationType type;
- private final ImmutableList<PiControlMetadataModel> metadatas;
+ private final ImmutableList<PiPacketMetadataModel> metadatas;
P4PacketOperationModel(PiPacketOperationType type,
- ImmutableList<PiControlMetadataModel> metadatas) {
+ ImmutableList<PiPacketMetadataModel> metadatas) {
this.type = type;
this.metadatas = metadatas;
}
@@ -44,7 +44,7 @@
}
@Override
- public List<PiControlMetadataModel> metadatas() {
+ public List<PiPacketMetadataModel> metadatas() {
return metadatas;
}