Refactored INT service impl to support multi-instance ONOS and fabric.p4
Change-Id: Ic82a3ab72d71a774606b25997e283b93aedc6ec9
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java
index 7c7f3fb..07bb862 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java
@@ -45,6 +45,8 @@
PiMatchFieldId.of("hdr.vlan_tag.is_valid");
public static final PiMatchFieldId HDR_ICMP_ICMP_CODE =
PiMatchFieldId.of("hdr.icmp.icmp_code");
+ public static final PiMatchFieldId HDR_INT_HEADER_IS_VALID =
+ PiMatchFieldId.of("hdr.int_header.is_valid");
public static final PiMatchFieldId HDR_ETHERNET_SRC_ADDR =
PiMatchFieldId.of("hdr.ethernet.src_addr");
public static final PiMatchFieldId HDR_ICMP_ICMP_TYPE =
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/IntProgrammableImpl.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/IntProgrammableImpl.java
index 5d95abd..15e3f01 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/IntProgrammableImpl.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/IntProgrammableImpl.java
@@ -15,27 +15,23 @@
*/
package org.onosproject.pipelines.fabric;
-import com.google.common.collect.ImmutableBiMap;
import com.google.common.collect.Sets;
-import org.onlab.util.ImmutableByteSequence;
-import org.onlab.util.SharedExecutors;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
import org.onosproject.inbandtelemetry.api.IntConfig;
import org.onosproject.inbandtelemetry.api.IntIntent;
import org.onosproject.inbandtelemetry.api.IntObjective;
import org.onosproject.inbandtelemetry.api.IntProgrammable;
-import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DeviceId;
-import org.onosproject.net.Port;
import org.onosproject.net.PortNumber;
-import org.onosproject.net.device.DeviceService;
+import org.onosproject.net.config.NetworkConfigService;
import org.onosproject.net.driver.AbstractHandlerBehaviour;
import org.onosproject.net.flow.DefaultFlowRule;
import org.onosproject.net.flow.DefaultTrafficSelector;
import org.onosproject.net.flow.DefaultTrafficTreatment;
import org.onosproject.net.flow.FlowRule;
import org.onosproject.net.flow.FlowRuleService;
+import org.onosproject.net.flow.TableId;
import org.onosproject.net.flow.TrafficSelector;
import org.onosproject.net.flow.TrafficTreatment;
import org.onosproject.net.flow.criteria.Criterion;
@@ -43,32 +39,32 @@
import org.onosproject.net.flow.criteria.PiCriterion;
import org.onosproject.net.flow.criteria.TcpPortCriterion;
import org.onosproject.net.flow.criteria.UdpPortCriterion;
-import org.onosproject.net.host.HostService;
-import org.onosproject.net.pi.model.PiActionId;
-import org.onosproject.net.pi.model.PiMatchFieldId;
import org.onosproject.net.pi.model.PiTableId;
import org.onosproject.net.pi.runtime.PiAction;
import org.onosproject.net.pi.runtime.PiActionParam;
+import org.onosproject.provider.general.device.api.GeneralProviderDeviceConfig;
import org.slf4j.Logger;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Set;
-import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+import static org.onlab.util.ImmutableByteSequence.copyFrom;
import static org.slf4j.LoggerFactory.getLogger;
+/**
+ * Implementation of INT programmable behavior for fabric.p4. Currently supports
+ * only SOURCE and TRANSIT functionalities.
+ */
public class IntProgrammableImpl extends AbstractHandlerBehaviour implements IntProgrammable {
+
+ private final Logger log = getLogger(getClass());
+
// TODO: change this value to the value of diameter of a network.
+ private static final int DEFAULT_PRIORITY = 10000;
private static final int MAXHOP = 64;
private static final int PORTMASK = 0xffff;
- private static final int IDLE_TIMEOUT = 100;
private static final int PKT_INSTANCE_TYPE_INGRESS_CLONE = 1;
- // Application name of the pipeline which adds this implementation to the pipeconf
- private static final String PIPELINE_APP_NAME = "org.onosproject.pipelines.fabric";
- private final Logger log = getLogger(getClass());
- private ApplicationId appId;
private static final Set<Criterion.Type> SUPPORTED_CRITERION = Sets.newHashSet(
Criterion.Type.IPV4_DST, Criterion.Type.IPV4_SRC,
@@ -76,77 +72,65 @@
Criterion.Type.TCP_SRC, Criterion.Type.TCP_DST,
Criterion.Type.IP_PROTO);
+ private static final Set<PiTableId> TABLES_TO_CLEANUP = Sets.newHashSet(
+ FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_TB_INT_INSERT,
+ FabricConstants.FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_TB_SET_SOURCE,
+ FabricConstants.FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_TB_SET_SINK,
+ FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_SOURCE_TB_INT_SOURCE,
+ FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_REPORT_TB_GENERATE_REPORT
+ );
+
private FlowRuleService flowRuleService;
- private HostService hostService;
private CoreService coreService;
-
+ private NetworkConfigService cfgService;
private DeviceId deviceId;
- private static final int DEFAULT_PRIORITY = 10000;
- private static final ImmutableBiMap<Integer, PiActionId> INST_0003_ACTION_MAP =
- ImmutableBiMap.<Integer, PiActionId>builder()
- .put(0, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I0)
- .put(1, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I1)
- .put(2, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I2)
- .put(3, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I3)
- .put(4, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I4)
- .put(5, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I5)
- .put(6, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I6)
- .put(7, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I7)
- .put(8, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I8)
- .put(9, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I9)
- .put(10, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I10)
- .put(11, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I11)
- .put(12, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I12)
- .put(13, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I13)
- .put(14, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I14)
- .put(15, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I15)
- .build();
+ private ApplicationId appId;
- private static final ImmutableBiMap<Integer, PiActionId> INST_0407_ACTION_MAP =
- ImmutableBiMap.<Integer, PiActionId>builder()
- .put(0, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I0)
- .put(1, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I1)
- .put(2, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I2)
- .put(3, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I3)
- .put(4, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I4)
- .put(5, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I5)
- .put(6, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I6)
- .put(7, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I7)
- .put(8, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I8)
- .put(9, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I9)
- .put(10, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I10)
- .put(11, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I11)
- .put(12, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I12)
- .put(13, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I13)
- .put(14, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I14)
- .put(15, FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I15)
- .build();
-
- @Override
- public void init() {
+ private boolean setupBehaviour() {
deviceId = this.data().deviceId();
flowRuleService = handler().get(FlowRuleService.class);
- DeviceService deviceService = handler().get(DeviceService.class);
- hostService = handler().get(HostService.class);
coreService = handler().get(CoreService.class);
- appId = coreService.getAppId(PIPELINE_APP_NAME);
+ cfgService = handler().get(NetworkConfigService.class);
+ appId = coreService.getAppId(PipeconfLoader.PIPELINE_APP_NAME);
if (appId == null) {
- log.warn("Application ID is null. Cannot initialize INT-pipeline.");
- return;
+ log.warn("Application ID is null. Cannot initialize behaviour.");
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ public boolean init() {
+
+ if (!setupBehaviour()) {
+ return false;
}
- Set<PortNumber> hostPorts = deviceService.getPorts(deviceId).stream()
- .filter(port -> hostService.getConnectedHosts(
- new ConnectPoint(deviceId, port.number())).size() > 0
- ).map(Port::number).collect(Collectors.toSet());
- List<FlowRule> flowRules = new ArrayList<>();
+ final GeneralProviderDeviceConfig cfg = cfgService.getConfig(
+ deviceId, GeneralProviderDeviceConfig.class);
+ if (cfg == null) {
+ log.warn("Missing GeneralProviderDevice config for {}", deviceId);
+ return false;
+ }
+ final String switchId = cfg.protocolsInfo().containsKey("int") ?
+ cfg.protocolsInfo().get("int").configValues().get("switchId")
+ : null;
+ if (switchId == null || switchId.isEmpty()) {
+ log.warn("Missing INT device config for {}", deviceId);
+ return false;
+ }
- // process_int_transit.tb_int_insert
- PiActionParam transitIdParam = new PiActionParam(
- FabricConstants.SWITCH_ID,
- ImmutableByteSequence.copyFrom(
- Integer.parseInt(deviceId.toString().substring(
- deviceId.toString().length() - 2))));
+ PiActionParam transitIdParam;
+ try {
+ transitIdParam = new PiActionParam(
+ FabricConstants.SWITCH_ID,
+ // FIXME set switch ID from netcfg
+ copyFrom(Integer.parseInt(switchId)));
+ } catch (NumberFormatException e) {
+ log.warn("Invalid INT switch ID for {}: {}", deviceId, switchId);
+ return false;
+ }
+
PiAction transitAction = PiAction.builder()
.withId(FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INIT_METADATA)
.withParameter(transitIdParam)
@@ -154,8 +138,14 @@
TrafficTreatment treatment = DefaultTrafficTreatment.builder()
.piTableAction(transitAction)
.build();
+ TrafficSelector selector = DefaultTrafficSelector.builder()
+ .matchPi(PiCriterion.builder().matchExact(
+ FabricConstants.HDR_INT_HEADER_IS_VALID, (byte) 0x01)
+ .build())
+ .build();
FlowRule transitFlowRule = DefaultFlowRule.builder()
+ .withSelector(selector)
.withTreatment(treatment)
.fromApp(appId)
.withPriority(DEFAULT_PRIORITY)
@@ -163,149 +153,139 @@
.forDevice(deviceId)
.forTable(FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_TB_INT_INSERT)
.build();
- flowRules.add(transitFlowRule);
- for (PortNumber portNumber : hostPorts) {
- // process_set_source_sink.tb_set_source for each host-facing port
- PiCriterion ingressCriterion = PiCriterion.builder()
- .matchExact(FabricConstants.STANDARD_METADATA_INGRESS_PORT, portNumber.toLong())
- .build();
- TrafficSelector srcSelector = DefaultTrafficSelector.builder()
- .matchPi(ingressCriterion)
- .build();
- PiAction setSourceAct = PiAction.builder()
- .withId(FabricConstants.FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_INT_SET_SOURCE)
- .build();
- TrafficTreatment srcTreatment = DefaultTrafficTreatment.builder()
- .piTableAction(setSourceAct)
- .build();
- FlowRule srcFlowRule = DefaultFlowRule.builder()
- .withSelector(srcSelector)
- .withTreatment(srcTreatment)
- .fromApp(appId)
- .withPriority(DEFAULT_PRIORITY)
- .makePermanent()
- .forDevice(deviceId)
- .forTable(FabricConstants.FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_TB_SET_SOURCE)
- .build();
- flowRules.add(srcFlowRule);
+ flowRuleService.applyFlowRules(transitFlowRule);
+ return true;
+ }
- // process_set_source_sink.tb_set_sink
- PiCriterion egressCriterion = PiCriterion.builder()
- .matchExact(FabricConstants.STANDARD_METADATA_EGRESS_PORT, portNumber.toLong())
- .build();
- TrafficSelector sinkSelector = DefaultTrafficSelector.builder()
- .matchPi(egressCriterion)
- .build();
- PiAction setSinkAct = PiAction.builder()
- .withId(FabricConstants.FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_INT_SET_SINK)
- .build();
- TrafficTreatment sinkTreatment = DefaultTrafficTreatment.builder()
- .piTableAction(setSinkAct)
- .build();
- FlowRule sinkFlowRule = DefaultFlowRule.builder()
- .withSelector(sinkSelector)
- .withTreatment(sinkTreatment)
- .fromApp(appId)
- .withPriority(DEFAULT_PRIORITY)
- .makePermanent()
- .forDevice(deviceId)
- .forTable(FabricConstants.FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_TB_SET_SINK)
- .build();
- flowRules.add(sinkFlowRule);
+ @Override
+ public boolean setSourcePort(PortNumber port) {
+
+ if (!setupBehaviour()) {
+ return false;
}
- flowRules.forEach(flowRule -> flowRuleService.applyFlowRules(flowRule));
- // Populate tb_int_inst_0003 table
- INST_0003_ACTION_MAP.forEach((matchValue, actionId) -> populateInstTableEntry(
- FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_TB_INT_INST_0003,
- FabricConstants.HDR_INT_HEADER_INSTRUCTION_MASK_0003,
- matchValue,
- actionId,
- appId));
- // Populate tb_int_inst_0407 table
- INST_0407_ACTION_MAP.forEach((matchValue, actionId) -> populateInstTableEntry(
- FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_TB_INT_INST_0407,
- FabricConstants.HDR_INT_HEADER_INSTRUCTION_MASK_0407,
- matchValue,
- actionId,
- appId));
- }
-
- @Override
- public CompletableFuture<Boolean> addIntObjective(IntObjective obj) {
- // TODO: support different types of watchlist other than flow watchlist
-
- return CompletableFuture.supplyAsync(
- () -> processIntObjective(obj, true),
- SharedExecutors.getPoolThreadExecutor()
- );
- }
-
- @Override
- public CompletableFuture<Boolean> removeIntObjective(IntObjective obj) {
- return CompletableFuture.supplyAsync(
- () -> processIntObjective(obj, false),
- SharedExecutors.getPoolThreadExecutor()
- );
- }
-
- @Override
- public CompletableFuture<Boolean> setupIntConfig(IntConfig config) {
- return CompletableFuture.supplyAsync(
- () -> setupIntReportInternal(config),
- SharedExecutors.getPoolThreadExecutor()
- );
- }
-
- private void populateInstTableEntry(PiTableId tableId, PiMatchFieldId matchFieldId,
- int matchValue, PiActionId actionId, ApplicationId appId) {
- PiCriterion instCriterion = PiCriterion.builder()
- .matchExact(matchFieldId, matchValue)
+ PiCriterion ingressCriterion = PiCriterion.builder()
+ .matchExact(FabricConstants.STANDARD_METADATA_INGRESS_PORT, port.toLong())
.build();
- TrafficSelector instSelector = DefaultTrafficSelector.builder()
- .matchPi(instCriterion)
+ TrafficSelector srcSelector = DefaultTrafficSelector.builder()
+ .matchPi(ingressCriterion)
.build();
- PiAction instAction = PiAction.builder()
- .withId(actionId)
+ PiAction setSourceAct = PiAction.builder()
+ .withId(FabricConstants.FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_INT_SET_SOURCE)
.build();
- TrafficTreatment instTreatment = DefaultTrafficTreatment.builder()
- .piTableAction(instAction)
+ TrafficTreatment srcTreatment = DefaultTrafficTreatment.builder()
+ .piTableAction(setSourceAct)
.build();
-
- FlowRule instFlowRule = DefaultFlowRule.builder()
- .withSelector(instSelector)
- .withTreatment(instTreatment)
+ FlowRule srcFlowRule = DefaultFlowRule.builder()
+ .withSelector(srcSelector)
+ .withTreatment(srcTreatment)
+ .fromApp(appId)
.withPriority(DEFAULT_PRIORITY)
.makePermanent()
.forDevice(deviceId)
- .forTable(tableId)
- .fromApp(appId)
+ .forTable(FabricConstants.FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_TB_SET_SOURCE)
.build();
+ flowRuleService.applyFlowRules(srcFlowRule);
+ return true;
+ }
- flowRuleService.applyFlowRules(instFlowRule);
+ @Override
+ public boolean setSinkPort(PortNumber port) {
+
+ if (!setupBehaviour()) {
+ return false;
+ }
+
+ PiCriterion egressCriterion = PiCriterion.builder()
+ .matchExact(FabricConstants.STANDARD_METADATA_EGRESS_PORT, port.toLong())
+ .build();
+ TrafficSelector sinkSelector = DefaultTrafficSelector.builder()
+ .matchPi(egressCriterion)
+ .build();
+ PiAction setSinkAct = PiAction.builder()
+ .withId(FabricConstants.FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_INT_SET_SINK)
+ .build();
+ TrafficTreatment sinkTreatment = DefaultTrafficTreatment.builder()
+ .piTableAction(setSinkAct)
+ .build();
+ FlowRule sinkFlowRule = DefaultFlowRule.builder()
+ .withSelector(sinkSelector)
+ .withTreatment(sinkTreatment)
+ .fromApp(appId)
+ .withPriority(DEFAULT_PRIORITY)
+ .makePermanent()
+ .forDevice(deviceId)
+ .forTable(FabricConstants.FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_TB_SET_SINK)
+ .build();
+ flowRuleService.applyFlowRules(sinkFlowRule);
+ return true;
+ }
+
+ @Override
+ public boolean addIntObjective(IntObjective obj) {
+
+ if (!setupBehaviour()) {
+ return false;
+ }
+
+ return processIntObjective(obj, true);
+ }
+
+ @Override
+ public boolean removeIntObjective(IntObjective obj) {
+
+ if (!setupBehaviour()) {
+ return false;
+ }
+
+ return processIntObjective(obj, false);
+ }
+
+ @Override
+ public boolean setupIntConfig(IntConfig config) {
+
+ if (!setupBehaviour()) {
+ return false;
+ }
+
+ return setupIntReportInternal(config);
+ }
+
+ @Override
+ public void cleanup() {
+
+ if (!setupBehaviour()) {
+ return;
+ }
+
+ StreamSupport.stream(flowRuleService.getFlowEntries(
+ data().deviceId()).spliterator(), false)
+ .filter(f -> f.table().type() == TableId.Type.PIPELINE_INDEPENDENT)
+ .filter(f -> TABLES_TO_CLEANUP.contains((PiTableId) f.table()))
+ .forEach(flowRuleService::removeFlowRules);
+ }
+
+ @Override
+ public boolean supportsFunctionality(IntFunctionality functionality) {
+ // Sink not fully supported yet.
+ return functionality == IntFunctionality.SOURCE || functionality == IntFunctionality.TRANSIT;
}
private FlowRule buildWatchlistEntry(IntObjective obj) {
- coreService = handler().get(CoreService.class);
- appId = coreService.getAppId(PIPELINE_APP_NAME);
- if (appId == null) {
- log.warn("Application ID is null. Cannot initialize INT-pipeline.");
- return null;
- }
int instructionBitmap = buildInstructionBitmap(obj.metadataTypes());
PiActionParam maxHopParam = new PiActionParam(
FabricConstants.MAX_HOP,
- ImmutableByteSequence.copyFrom(MAXHOP));
+ copyFrom(MAXHOP));
PiActionParam instCntParam = new PiActionParam(
FabricConstants.INS_CNT,
- ImmutableByteSequence.copyFrom(Integer.bitCount(instructionBitmap)));
+ copyFrom(Integer.bitCount(instructionBitmap)));
PiActionParam inst0003Param = new PiActionParam(
FabricConstants.INS_MASK0003,
- ImmutableByteSequence.copyFrom((instructionBitmap >> 12) & 0xF));
+ copyFrom((instructionBitmap >> 12) & 0xF));
PiActionParam inst0407Param = new PiActionParam(
FabricConstants.INS_MASK0407,
- ImmutableByteSequence.copyFrom((instructionBitmap >> 8) & 0xF));
+ copyFrom((instructionBitmap >> 8) & 0xF));
PiAction intSourceAction = PiAction.builder()
.withId(FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_SOURCE_INT_SOURCE_DSCP)
@@ -362,13 +342,13 @@
}
return DefaultFlowRule.builder()
- .forDevice(this.data().deviceId())
+ .forDevice(deviceId)
.withSelector(sBuilder.build())
.withTreatment(instTreatment)
.withPriority(DEFAULT_PRIORITY)
.forTable(FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_SOURCE_TB_INT_SOURCE)
.fromApp(appId)
- .withIdleTimeout(IDLE_TIMEOUT)
+ .makePermanent()
.build();
}
@@ -423,11 +403,9 @@
}
private boolean processIntObjective(IntObjective obj, boolean install) {
- flowRuleService = handler().get(FlowRuleService.class);
- deviceId = this.data().deviceId();
if (install && !unsupportedSelectors(obj.selector()).isEmpty()) {
- log.warn("Device {} does not support criteria {} for INT.",
- deviceId, unsupportedSelectors(obj.selector()));
+ log.warn("Criteria {} not supported by {} for INT watchlist",
+ unsupportedSelectors(obj.selector()), deviceId);
return false;
}
@@ -449,42 +427,40 @@
}
private boolean setupIntReportInternal(IntConfig cfg) {
- flowRuleService = handler().get(FlowRuleService.class);
-
- FlowRule reportRule = buildReportEntry(cfg, PKT_INSTANCE_TYPE_INGRESS_CLONE);
- if (reportRule != null) {
- flowRuleService.applyFlowRules(reportRule);
- log.info("Report entry {} has been added to {}", reportRule, this.data().deviceId());
- return true;
- } else {
- log.warn("Failed to add report entry on {}", this.data().deviceId());
- return false;
- }
+ // Report not fully supported yet.
+ return true;
+ // FlowRule reportRule = buildReportEntry(cfg, PKT_INSTANCE_TYPE_INGRESS_CLONE);
+ // if (reportRule != null) {
+ // flowRuleService.applyFlowRules(reportRule);
+ // log.info("Report entry {} has been added to {}", reportRule, this.data().deviceId());
+ // return true;
+ // } else {
+ // log.warn("Failed to add report entry on {}", this.data().deviceId());
+ // return false;
+ // }
}
private FlowRule buildReportEntry(IntConfig cfg, int type) {
- coreService = handler().get(CoreService.class);
- appId = coreService.getAppId(PIPELINE_APP_NAME);
- if (appId == null) {
- log.warn("Application ID is null. Cannot build report entry.");
+
+ if (!setupBehaviour()) {
return null;
}
PiActionParam srcMacParam = new PiActionParam(
FabricConstants.SRC_MAC,
- ImmutableByteSequence.copyFrom(cfg.sinkMac().toBytes()));
+ copyFrom(cfg.sinkMac().toBytes()));
PiActionParam nextHopMacParam = new PiActionParam(
FabricConstants.MON_MAC,
- ImmutableByteSequence.copyFrom(cfg.collectorNextHopMac().toBytes()));
+ copyFrom(cfg.collectorNextHopMac().toBytes()));
PiActionParam srcIpParam = new PiActionParam(
FabricConstants.SRC_IP,
- ImmutableByteSequence.copyFrom(cfg.sinkIp().toOctets()));
+ copyFrom(cfg.sinkIp().toOctets()));
PiActionParam monIpParam = new PiActionParam(
FabricConstants.MON_IP,
- ImmutableByteSequence.copyFrom(cfg.collectorIp().toOctets()));
+ copyFrom(cfg.collectorIp().toOctets()));
PiActionParam monPortParam = new PiActionParam(
FabricConstants.MON_PORT,
- ImmutableByteSequence.copyFrom(cfg.collectorPort().toInt()));
+ copyFrom(cfg.collectorPort().toInt()));
PiAction reportAction = PiAction.builder()
.withId(FabricConstants.FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_REPORT_DO_REPORT_ENCAPSULATION)
.withParameter(srcMacParam)
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/PipeconfLoader.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/PipeconfLoader.java
index 9b54dfc..1609794 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/PipeconfLoader.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/PipeconfLoader.java
@@ -62,12 +62,11 @@
private static Logger log = getLogger(PipeconfLoader.class);
+ static final String PIPELINE_APP_NAME = "org.onosproject.pipelines.fabric";
+
private static final String BASE_PIPECONF_ID = "org.onosproject.pipelines";
-
private static final String P4C_OUT_PATH = "/p4c-out";
- private static final String PIPELINE_APP_NAME = "org.onosproject.pipelines.fabric";
-
// profile/target/platform
private static final String P4C_RES_BASE_PATH = P4C_OUT_PATH + "/%s/%s/%s/";
diff --git a/pipelines/fabric/src/main/resources/fabric.p4 b/pipelines/fabric/src/main/resources/fabric.p4
index 0aee32b..95b9bc8 100644
--- a/pipelines/fabric/src/main/resources/fabric.p4
+++ b/pipelines/fabric/src/main/resources/fabric.p4
@@ -50,6 +50,7 @@
#endif // WITH_PORT_COUNTER
apply {
+ _PRE_INGRESS
#ifdef WITH_SPGW
spgw_normalizer.apply(hdr.gtpu.isValid(), hdr.gtpu_ipv4, hdr.gtpu_udp,
hdr.ipv4, hdr.udp, hdr.inner_ipv4, hdr.inner_udp);
@@ -83,6 +84,7 @@
EgressNextControl() egress_next;
apply {
+ _PRE_EGRESS
pkt_io_egress.apply(hdr, fabric_metadata, standard_metadata);
egress_next.apply(hdr, fabric_metadata, standard_metadata);
#ifdef WITH_SPGW
diff --git a/pipelines/fabric/src/main/resources/include/define.p4 b/pipelines/fabric/src/main/resources/include/define.p4
index 26d3167..dfde323 100644
--- a/pipelines/fabric/src/main/resources/include/define.p4
+++ b/pipelines/fabric/src/main/resources/include/define.p4
@@ -37,6 +37,14 @@
#define _PKT_OUT_HDR_ANNOT
#endif
+#ifndef _PRE_INGRESS
+#define _PRE_INGRESS
+#endif
+
+#ifndef _PRE_EGRESS
+#define _PRE_EGRESS
+#endif
+
#ifndef IP_VER_LENGTH
#define IP_VER_LENGTH 4
#endif
diff --git a/pipelines/fabric/src/main/resources/include/int/int_header.p4 b/pipelines/fabric/src/main/resources/include/int/int_header.p4
index f339995..4e352ee 100644
--- a/pipelines/fabric/src/main/resources/include/int/int_header.p4
+++ b/pipelines/fabric/src/main/resources/include/int/int_header.p4
@@ -26,6 +26,8 @@
bit<32> switch_id;
bit<8> new_words;
bit<16> new_bytes;
+ bit<32> ig_tstamp;
+ bit<32> eg_tstamp;
}
// INT headers - 8 bytes
diff --git a/pipelines/fabric/src/main/resources/include/int/int_transit.p4 b/pipelines/fabric/src/main/resources/include/int/int_transit.p4
index 4d4568b..579fa07 100644
--- a/pipelines/fabric/src/main/resources/include/int/int_transit.p4
+++ b/pipelines/fabric/src/main/resources/include/int/int_transit.p4
@@ -269,11 +269,17 @@
// Default action used to set switch ID.
table tb_int_insert {
- key = {}
+ // We don't really need a key here, however we add a dummy one as a
+ // workaround to ONOS inability to properly support default actions.
+ key = {
+ hdr.int_header.isValid(): exact @name("hdr.int_header.is_valid");
+ }
actions = {
init_metadata;
+ @defaultonly nop;
}
- size = 0;
+ const default_action = nop;
+ size = 1;
}
// Table to process instruction bits 0-3.
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
index 246401b..c7d78e8 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
@@ -5013,7 +5013,7 @@
"primitives" : []
},
{
- "name" : "NoAction",
+ "name" : "nop",
"id" : 79,
"runtime_data" : [],
"primitives" : []
@@ -13300,7 +13300,7 @@
],
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 370,
+ "line" : 374,
"column" : 12,
"source_fragment" : "return"
}
@@ -13349,7 +13349,7 @@
],
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 378,
+ "line" : 382,
"column" : 12,
"source_fragment" : "hdr.ipv4.total_len = hdr.ipv4.total_len + fmeta.int_meta.new_bytes"
}
@@ -13398,7 +13398,7 @@
],
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 375,
+ "line" : 379,
"column" : 8,
"source_fragment" : "hdr.int_header.total_hop_cnt = hdr.int_header.total_hop_cnt + 1"
}
@@ -13447,7 +13447,7 @@
],
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 381,
+ "line" : 385,
"column" : 12,
"source_fragment" : "hdr.udp.len = hdr.udp.len + fmeta.int_meta.new_bytes"
}
@@ -13496,7 +13496,7 @@
],
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 384,
+ "line" : 388,
"column" : 12,
"source_fragment" : "hdr.intl4_shim.len_words = hdr.intl4_shim.len_words + fmeta.int_meta.new_words"
}
@@ -15829,25 +15829,32 @@
"column" : 10,
"source_fragment" : "tb_int_insert"
},
- "key" : [],
+ "key" : [
+ {
+ "match_type" : "exact",
+ "name" : "hdr.int_header.is_valid",
+ "target" : ["int_header", "$valid$"],
+ "mask" : null
+ }
+ ],
"match_type" : "exact",
"type" : "simple",
- "max_size" : 1024,
+ "max_size" : 1,
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [85, 76],
- "actions" : ["FabricEgress.process_int_main.process_int_transit.init_metadata", "NoAction"],
+ "action_ids" : [85, 79],
+ "actions" : ["FabricEgress.process_int_main.process_int_transit.init_metadata", "nop"],
"base_default_next" : "node_94",
"next_tables" : {
"FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_94",
- "NoAction" : "node_94"
+ "nop" : "node_94"
},
"default_entry" : {
- "action_id" : 76,
- "action_const" : false,
+ "action_id" : 79,
+ "action_const" : true,
"action_data" : [],
- "action_entry_const" : false
+ "action_entry_const" : true
}
},
{
@@ -15878,7 +15885,7 @@
"id" : 59,
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 280,
+ "line" : 284,
"column" : 10,
"source_fragment" : "tb_int_inst_0003"
},
@@ -15896,7 +15903,7 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 77],
+ "action_ids" : [86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 76],
"actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15", "NoAction"],
"base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
"next_tables" : {
@@ -15919,7 +15926,7 @@
"NoAction" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407"
},
"default_entry" : {
- "action_id" : 77,
+ "action_id" : 76,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -16140,7 +16147,7 @@
"id" : 60,
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 324,
+ "line" : 328,
"column" : 10,
"source_fragment" : "tb_int_inst_0407"
},
@@ -16158,7 +16165,7 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 78],
+ "action_ids" : [102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 77],
"actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15", "NoAction"],
"base_default_next" : "tbl_act_34",
"next_tables" : {
@@ -16181,7 +16188,7 @@
"NoAction" : "tbl_act_34"
},
"default_entry" : {
- "action_id" : 78,
+ "action_id" : 77,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -16505,7 +16512,7 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [118, 79],
+ "action_ids" : [118, 78],
"actions" : ["FabricEgress.process_int_main.process_int_report.do_report_encapsulation", "NoAction"],
"base_default_next" : "node_108",
"next_tables" : {
@@ -16513,7 +16520,7 @@
"NoAction" : "node_108"
},
"default_entry" : {
- "action_id" : 79,
+ "action_id" : 78,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -16957,7 +16964,7 @@
"id" : 32,
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 369,
+ "line" : 373,
"column" : 12,
"source_fragment" : "fmeta.int_meta.transit == false"
},
@@ -17014,7 +17021,7 @@
"id" : 34,
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 377,
+ "line" : 381,
"column" : 12,
"source_fragment" : "hdr.ipv4.isValid()"
},
@@ -17037,7 +17044,7 @@
"id" : 35,
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 380,
+ "line" : 384,
"column" : 12,
"source_fragment" : "hdr.udp.isValid()"
},
@@ -17060,7 +17067,7 @@
"id" : 36,
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 383,
+ "line" : 387,
"column" : 12,
"source_fragment" : "hdr.intl4_shim.isValid()"
},
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
index 5fcf0f6..943fb1c1 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
@@ -518,14 +518,21 @@
name: "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
alias: "tb_int_insert"
}
+ match_fields {
+ id: 1
+ name: "hdr.int_header.is_valid"
+ bitwidth: 1
+ match_type: EXACT
+ }
action_refs {
id: 16780783
}
action_refs {
- id: 16800567
+ id: 16819938
annotations: "@defaultonly()"
}
- size: 1024
+ const_default_action_id: 16819938
+ size: 1
idle_timeout_behavior: NO_TIMEOUT
}
tables {
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
index a179079..293212f 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
@@ -3608,7 +3608,7 @@
"primitives" : []
},
{
- "name" : "NoAction",
+ "name" : "nop",
"id" : 53,
"runtime_data" : [],
"primitives" : []
@@ -10280,7 +10280,7 @@
],
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 370,
+ "line" : 374,
"column" : 12,
"source_fragment" : "return"
}
@@ -10329,7 +10329,7 @@
],
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 378,
+ "line" : 382,
"column" : 12,
"source_fragment" : "hdr.ipv4.total_len = hdr.ipv4.total_len + fmeta.int_meta.new_bytes"
}
@@ -10378,7 +10378,7 @@
],
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 375,
+ "line" : 379,
"column" : 8,
"source_fragment" : "hdr.int_header.total_hop_cnt = hdr.int_header.total_hop_cnt + 1"
}
@@ -10427,7 +10427,7 @@
],
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 381,
+ "line" : 385,
"column" : 12,
"source_fragment" : "hdr.udp.len = hdr.udp.len + fmeta.int_meta.new_bytes"
}
@@ -10476,7 +10476,7 @@
],
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 384,
+ "line" : 388,
"column" : 12,
"source_fragment" : "hdr.intl4_shim.len_words = hdr.intl4_shim.len_words + fmeta.int_meta.new_words"
}
@@ -11971,25 +11971,32 @@
"column" : 10,
"source_fragment" : "tb_int_insert"
},
- "key" : [],
+ "key" : [
+ {
+ "match_type" : "exact",
+ "name" : "hdr.int_header.is_valid",
+ "target" : ["int_header", "$valid$"],
+ "mask" : null
+ }
+ ],
"match_type" : "exact",
"type" : "simple",
- "max_size" : 1024,
+ "max_size" : 1,
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [58, 51],
- "actions" : ["FabricEgress.process_int_main.process_int_transit.init_metadata", "NoAction"],
+ "action_ids" : [58, 53],
+ "actions" : ["FabricEgress.process_int_main.process_int_transit.init_metadata", "nop"],
"base_default_next" : "node_60",
"next_tables" : {
"FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_60",
- "NoAction" : "node_60"
+ "nop" : "node_60"
},
"default_entry" : {
- "action_id" : 51,
- "action_const" : false,
+ "action_id" : 53,
+ "action_const" : true,
"action_data" : [],
- "action_entry_const" : false
+ "action_entry_const" : true
}
},
{
@@ -12020,7 +12027,7 @@
"id" : 36,
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 280,
+ "line" : 284,
"column" : 10,
"source_fragment" : "tb_int_inst_0003"
},
@@ -12038,7 +12045,7 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 52],
+ "action_ids" : [59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 51],
"actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15", "NoAction"],
"base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
"next_tables" : {
@@ -12061,7 +12068,7 @@
"NoAction" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407"
},
"default_entry" : {
- "action_id" : 52,
+ "action_id" : 51,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -12282,7 +12289,7 @@
"id" : 37,
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 324,
+ "line" : 328,
"column" : 10,
"source_fragment" : "tb_int_inst_0407"
},
@@ -12300,7 +12307,7 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 53],
+ "action_ids" : [75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 52],
"actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15", "NoAction"],
"base_default_next" : "tbl_act_18",
"next_tables" : {
@@ -12323,7 +12330,7 @@
"NoAction" : "tbl_act_18"
},
"default_entry" : {
- "action_id" : 53,
+ "action_id" : 52,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -12997,7 +13004,7 @@
"id" : 21,
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 369,
+ "line" : 373,
"column" : 12,
"source_fragment" : "fmeta.int_meta.transit == false"
},
@@ -13054,7 +13061,7 @@
"id" : 23,
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 377,
+ "line" : 381,
"column" : 12,
"source_fragment" : "hdr.ipv4.isValid()"
},
@@ -13077,7 +13084,7 @@
"id" : 24,
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 380,
+ "line" : 384,
"column" : 12,
"source_fragment" : "hdr.udp.isValid()"
},
@@ -13100,7 +13107,7 @@
"id" : 25,
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 383,
+ "line" : 387,
"column" : 12,
"source_fragment" : "hdr.intl4_shim.isValid()"
},
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
index cc19487..6213234 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
@@ -431,14 +431,21 @@
name: "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
alias: "tb_int_insert"
}
+ match_fields {
+ id: 1
+ name: "hdr.int_header.is_valid"
+ bitwidth: 1
+ match_type: EXACT
+ }
action_refs {
id: 16780783
}
action_refs {
- id: 16800567
+ id: 16819938
annotations: "@defaultonly()"
}
- size: 1024
+ const_default_action_id: 16819938
+ size: 1
idle_timeout_behavior: NO_TIMEOUT
}
tables {
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
index c4f0634..97da4eb 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
@@ -4602,7 +4602,7 @@
"primitives" : []
},
{
- "name" : "NoAction",
+ "name" : "nop",
"id" : 72,
"runtime_data" : [],
"primitives" : []
@@ -11866,7 +11866,7 @@
],
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 370,
+ "line" : 374,
"column" : 12,
"source_fragment" : "return"
}
@@ -11915,7 +11915,7 @@
],
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 378,
+ "line" : 382,
"column" : 12,
"source_fragment" : "hdr.ipv4.total_len = hdr.ipv4.total_len + fmeta.int_meta.new_bytes"
}
@@ -11964,7 +11964,7 @@
],
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 375,
+ "line" : 379,
"column" : 8,
"source_fragment" : "hdr.int_header.total_hop_cnt = hdr.int_header.total_hop_cnt + 1"
}
@@ -12013,7 +12013,7 @@
],
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 381,
+ "line" : 385,
"column" : 12,
"source_fragment" : "hdr.udp.len = hdr.udp.len + fmeta.int_meta.new_bytes"
}
@@ -12062,7 +12062,7 @@
],
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 384,
+ "line" : 388,
"column" : 12,
"source_fragment" : "hdr.intl4_shim.len_words = hdr.intl4_shim.len_words + fmeta.int_meta.new_words"
}
@@ -14193,25 +14193,32 @@
"column" : 10,
"source_fragment" : "tb_int_insert"
},
- "key" : [],
+ "key" : [
+ {
+ "match_type" : "exact",
+ "name" : "hdr.int_header.is_valid",
+ "target" : ["int_header", "$valid$"],
+ "mask" : null
+ }
+ ],
"match_type" : "exact",
"type" : "simple",
- "max_size" : 1024,
+ "max_size" : 1,
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [78, 70],
- "actions" : ["FabricEgress.process_int_main.process_int_transit.init_metadata", "NoAction"],
+ "action_ids" : [78, 72],
+ "actions" : ["FabricEgress.process_int_main.process_int_transit.init_metadata", "nop"],
"base_default_next" : "node_87",
"next_tables" : {
"FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_87",
- "NoAction" : "node_87"
+ "nop" : "node_87"
},
"default_entry" : {
- "action_id" : 70,
- "action_const" : false,
+ "action_id" : 72,
+ "action_const" : true,
"action_data" : [],
- "action_entry_const" : false
+ "action_entry_const" : true
}
},
{
@@ -14242,7 +14249,7 @@
"id" : 55,
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 280,
+ "line" : 284,
"column" : 10,
"source_fragment" : "tb_int_inst_0003"
},
@@ -14260,7 +14267,7 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 71],
+ "action_ids" : [79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 70],
"actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15", "NoAction"],
"base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
"next_tables" : {
@@ -14283,7 +14290,7 @@
"NoAction" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407"
},
"default_entry" : {
- "action_id" : 71,
+ "action_id" : 70,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -14504,7 +14511,7 @@
"id" : 56,
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 324,
+ "line" : 328,
"column" : 10,
"source_fragment" : "tb_int_inst_0407"
},
@@ -14522,7 +14529,7 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 72],
+ "action_ids" : [95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 71],
"actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15", "NoAction"],
"base_default_next" : "tbl_act_32",
"next_tables" : {
@@ -14545,7 +14552,7 @@
"NoAction" : "tbl_act_32"
},
"default_entry" : {
- "action_id" : 72,
+ "action_id" : 71,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -15245,7 +15252,7 @@
"id" : 29,
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 369,
+ "line" : 373,
"column" : 12,
"source_fragment" : "fmeta.int_meta.transit == false"
},
@@ -15302,7 +15309,7 @@
"id" : 31,
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 377,
+ "line" : 381,
"column" : 12,
"source_fragment" : "hdr.ipv4.isValid()"
},
@@ -15325,7 +15332,7 @@
"id" : 32,
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 380,
+ "line" : 384,
"column" : 12,
"source_fragment" : "hdr.udp.isValid()"
},
@@ -15348,7 +15355,7 @@
"id" : 33,
"source_info" : {
"filename" : "include/int/int_transit.p4",
- "line" : 383,
+ "line" : 387,
"column" : 12,
"source_fragment" : "hdr.intl4_shim.isValid()"
},
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
index f9bc88d..be3e607 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
@@ -472,14 +472,21 @@
name: "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
alias: "tb_int_insert"
}
+ match_fields {
+ id: 1
+ name: "hdr.int_header.is_valid"
+ bitwidth: 1
+ match_type: EXACT
+ }
action_refs {
id: 16780783
}
action_refs {
- id: 16800567
+ id: 16819938
annotations: "@defaultonly()"
}
- size: 1024
+ const_default_action_id: 16819938
+ size: 1
idle_timeout_behavior: NO_TIMEOUT
}
tables {