Add support for P4Runtime clone sessions via Group API
Clone sessions can now be created by defining groups with new type CLONE
The PI framework has been refactored to abstract commonality between
multicast groups and clone sessions as both are managed as part of the
P4Runtime packet replication engine (PRE).
Change-Id: I2f23c629b7de1931d5cab96ec76aef26130ce418
diff --git a/core/net/src/main/java/org/onosproject/net/pi/impl/PiMulticastGroupTranslatorImpl.java b/core/net/src/main/java/org/onosproject/net/pi/impl/PiReplicationGroupTranslatorImpl.java
similarity index 79%
rename from core/net/src/main/java/org/onosproject/net/pi/impl/PiMulticastGroupTranslatorImpl.java
rename to core/net/src/main/java/org/onosproject/net/pi/impl/PiReplicationGroupTranslatorImpl.java
index 7d48209..1f562a4 100644
--- a/core/net/src/main/java/org/onosproject/net/pi/impl/PiMulticastGroupTranslatorImpl.java
+++ b/core/net/src/main/java/org/onosproject/net/pi/impl/PiReplicationGroupTranslatorImpl.java
@@ -26,7 +26,9 @@
import org.onosproject.net.group.GroupDescription;
import org.onosproject.net.pi.model.PiPipeconf;
import org.onosproject.net.pi.model.PiPipelineInterpreter;
+import org.onosproject.net.pi.runtime.PiCloneSessionEntry;
import org.onosproject.net.pi.runtime.PiMulticastGroupEntry;
+import org.onosproject.net.pi.runtime.PiPreEntry;
import org.onosproject.net.pi.runtime.PiPreReplica;
import org.onosproject.net.pi.service.PiTranslationException;
@@ -41,19 +43,20 @@
import static java.lang.String.format;
/**
- * Implementation of multicast group translation logic.
+ * Implementation of replication group translation logic.
*/
-final class PiMulticastGroupTranslatorImpl {
+final class PiReplicationGroupTranslatorImpl {
- private PiMulticastGroupTranslatorImpl() {
+ private PiReplicationGroupTranslatorImpl() {
// Hides constructor.
}
/**
- * Returns a PI PRE multicast group entry equivalent to the given group, for
- * the given pipeconf and device.
+ * Returns a PI PRE entry equivalent to the given group, for the given
+ * pipeconf and device.
* <p>
- * The passed group is expected to have type {@link GroupDescription.Type#ALL}.
+ * The passed group is expected to have type {@link GroupDescription.Type#ALL}
+ * or {@link GroupDescription.Type#CLONE}.
*
* @param group group
* @param pipeconf pipeconf
@@ -61,16 +64,11 @@
* @return PI PRE entry
* @throws PiTranslationException if the group cannot be translated
*/
- static PiMulticastGroupEntry translate(Group group, PiPipeconf pipeconf, Device device)
+ static PiPreEntry translate(Group group, PiPipeconf pipeconf, Device device)
throws PiTranslationException {
checkNotNull(group);
- if (!group.type().equals(GroupDescription.Type.ALL)) {
- throw new PiTranslationException(format(
- "group type %s not supported", group.type()));
- }
-
final List<Instruction> instructions = group.buckets().buckets().stream()
.flatMap(b -> b.treatment().allInstructions().stream())
.collect(Collectors.toList());
@@ -88,10 +86,21 @@
.map(i -> (OutputInstruction) i)
.collect(Collectors.toList());
- return PiMulticastGroupEntry.builder()
- .withGroupId(group.id().id())
- .addReplicas(getReplicas(outInstructions, device))
- .build();
+ switch (group.type()) {
+ case ALL:
+ return PiMulticastGroupEntry.builder()
+ .withGroupId(group.id().id())
+ .addReplicas(getReplicas(outInstructions, device))
+ .build();
+ case CLONE:
+ return PiCloneSessionEntry.builder()
+ .withSessionId(group.id().id())
+ .addReplicas(getReplicas(outInstructions, device))
+ .build();
+ default:
+ throw new PiTranslationException(format(
+ "group type %s not supported", group.type()));
+ }
}
private static Set<PiPreReplica> getReplicas(
diff --git a/core/net/src/main/java/org/onosproject/net/pi/impl/PiTranslationServiceImpl.java b/core/net/src/main/java/org/onosproject/net/pi/impl/PiTranslationServiceImpl.java
index 510ad01..18746d3 100644
--- a/core/net/src/main/java/org/onosproject/net/pi/impl/PiTranslationServiceImpl.java
+++ b/core/net/src/main/java/org/onosproject/net/pi/impl/PiTranslationServiceImpl.java
@@ -25,7 +25,7 @@
import org.onosproject.net.pi.model.PiPipeconf;
import org.onosproject.net.pi.runtime.PiActionProfileGroup;
import org.onosproject.net.pi.runtime.PiMeterCellConfig;
-import org.onosproject.net.pi.runtime.PiMulticastGroupEntry;
+import org.onosproject.net.pi.runtime.PiPreEntry;
import org.onosproject.net.pi.runtime.PiTableEntry;
import org.onosproject.net.pi.service.PiFlowRuleTranslationStore;
import org.onosproject.net.pi.service.PiFlowRuleTranslator;
@@ -33,8 +33,8 @@
import org.onosproject.net.pi.service.PiGroupTranslator;
import org.onosproject.net.pi.service.PiMeterTranslationStore;
import org.onosproject.net.pi.service.PiMeterTranslator;
-import org.onosproject.net.pi.service.PiMulticastGroupTranslationStore;
-import org.onosproject.net.pi.service.PiMulticastGroupTranslator;
+import org.onosproject.net.pi.service.PiReplicationGroupTranslationStore;
+import org.onosproject.net.pi.service.PiReplicationGroupTranslator;
import org.onosproject.net.pi.service.PiTranslationException;
import org.onosproject.net.pi.service.PiTranslationService;
import org.osgi.service.component.annotations.Activate;
@@ -67,21 +67,21 @@
private PiGroupTranslationStore groupTranslationStore;
@Reference(cardinality = ReferenceCardinality.MANDATORY)
- private PiMulticastGroupTranslationStore mcGroupTranslationStore;
+ private PiReplicationGroupTranslationStore repGroupTranslationStore;
@Reference(cardinality = ReferenceCardinality.MANDATORY)
private PiMeterTranslationStore meterTranslationStore;
private PiFlowRuleTranslator flowRuleTranslator;
private PiGroupTranslator groupTranslator;
- private PiMulticastGroupTranslator mcGroupTranslator;
+ private PiReplicationGroupTranslator repGroupTranslator;
private PiMeterTranslator meterTranslator;
@Activate
public void activate() {
flowRuleTranslator = new InternalFlowRuleTranslator(flowRuleTranslationStore);
groupTranslator = new InternalGroupTranslator(groupTranslationStore);
- mcGroupTranslator = new InternalMulticastGroupTranslator(mcGroupTranslationStore);
+ repGroupTranslator = new InternalReplicationGroupTranslator(repGroupTranslationStore);
meterTranslator = new InternalMeterTranslator(meterTranslationStore);
log.info("Started");
}
@@ -110,8 +110,8 @@
}
@Override
- public PiMulticastGroupTranslator multicastGroupTranslator() {
- return mcGroupTranslator;
+ public PiReplicationGroupTranslator replicationGroupTranslator() {
+ return repGroupTranslator;
}
private Device getDevice(DeviceId deviceId) throws PiTranslationException {
@@ -158,20 +158,20 @@
}
}
- private final class InternalMulticastGroupTranslator
- extends AbstractPiTranslatorImpl<Group, PiMulticastGroupEntry>
- implements PiMulticastGroupTranslator {
+ private final class InternalReplicationGroupTranslator
+ extends AbstractPiTranslatorImpl<Group, PiPreEntry>
+ implements PiReplicationGroupTranslator {
- private InternalMulticastGroupTranslator(PiMulticastGroupTranslationStore store) {
+ private InternalReplicationGroupTranslator(PiReplicationGroupTranslationStore store) {
super(store);
}
@Override
- public PiMulticastGroupEntry translate(Group original, PiPipeconf pipeconf)
+ public PiPreEntry translate(Group original, PiPipeconf pipeconf)
throws PiTranslationException {
checkNotNull(original);
checkNotNull(pipeconf);
- return PiMulticastGroupTranslatorImpl.translate(
+ return PiReplicationGroupTranslatorImpl.translate(
original, pipeconf, getDevice(original.deviceId()));
}
}