[ONOS-7607] Update fabric.p4 bmv2 json w/ new p4c compiler
Change-Id: I0ba33a0773bd32b2108a0e7d163ad1e2c758078b
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 8759f96..d8db593 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
@@ -87,74 +87,94 @@
}
// Table IDs
+ public static final PiTableId TBL_ACL_ID =
+ PiTableId.of("FabricIngress.forwarding.acl");
+ public static final PiTableId TBL_HASHED_ID =
+ PiTableId.of("FabricIngress.next.hashed");
+ public static final PiTableId TBL_MPLS_ID =
+ PiTableId.of("FabricIngress.forwarding.mpls");
+ public static final PiTableId TBL_MULTICAST_ID =
+ PiTableId.of("FabricIngress.next.multicast");
public static final PiTableId TBL_MULTICAST_V4_ID =
- PiTableId.of("forwarding.multicast_v4");
+ PiTableId.of("FabricIngress.forwarding.multicast_v4");
public static final PiTableId TBL_MULTICAST_V6_ID =
- PiTableId.of("forwarding.multicast_v6");
- public static final PiTableId TBL_ACL_ID = PiTableId.of("forwarding.acl");
- public static final PiTableId TBL_BROADCAST_ID =
- PiTableId.of("next.broadcast");
- public static final PiTableId TBL_HASHED_ID = PiTableId.of("next.hashed");
- public static final PiTableId TBL_INGRESS_PORT_VLAN_ID =
- PiTableId.of("filtering.ingress_port_vlan");
- public static final PiTableId TBL_FWD_CLASSIFIER_ID =
- PiTableId.of("filtering.fwd_classifier");
- public static final PiTableId TBL_UNICAST_V6_ID =
- PiTableId.of("forwarding.unicast_v6");
- public static final PiTableId TBL_SIMPLE_ID = PiTableId.of("next.simple");
- public static final PiTableId TBL_BRIDGING_ID =
- PiTableId.of("forwarding.bridging");
+ PiTableId.of("FabricIngress.forwarding.multicast_v6");
public static final PiTableId TBL_UNICAST_V4_ID =
- PiTableId.of("forwarding.unicast_v4");
- public static final PiTableId TBL_MPLS_ID = PiTableId.of("forwarding.mpls");
+ PiTableId.of("FabricIngress.forwarding.unicast_v4");
+ public static final PiTableId TBL_FWD_CLASSIFIER_ID =
+ PiTableId.of("FabricIngress.filtering.fwd_classifier");
+ public static final PiTableId TBL_BRIDGING_ID =
+ PiTableId.of("FabricIngress.forwarding.bridging");
+ public static final PiTableId TBL_INGRESS_PORT_VLAN_ID =
+ PiTableId.of("FabricIngress.filtering.ingress_port_vlan");
+ public static final PiTableId TBL_UNICAST_V6_ID =
+ PiTableId.of("FabricIngress.forwarding.unicast_v6");
+ public static final PiTableId TBL_SIMPLE_ID =
+ PiTableId.of("FabricIngress.next.simple");
// Indirect Counter IDs
public static final PiCounterId CNT_EGRESS_PORT_COUNTER_ID =
- PiCounterId.of("port_counters_control.egress_port_counter");
+ PiCounterId.of("FabricIngress.port_counters_control.egress_port_counter");
public static final PiCounterId CNT_INGRESS_PORT_COUNTER_ID =
- PiCounterId.of("port_counters_control.ingress_port_counter");
+ PiCounterId.of("FabricIngress.port_counters_control.ingress_port_counter");
// Direct Counter IDs
- public static final PiCounterId CNT_UNICAST_V4_COUNTER_ID = PiCounterId.of("forwarding.unicast_v4_counter");
+ public static final PiCounterId CNT_ACL_COUNTER_ID =
+ PiCounterId.of("FabricIngress.forwarding.acl_counter");
+ public static final PiCounterId CNT_MULTICAST_COUNTER_ID =
+ PiCounterId.of("FabricIngress.next.multicast_counter");
+ public static final PiCounterId CNT_SIMPLE_COUNTER_ID =
+ PiCounterId.of("FabricIngress.next.simple_counter");
+ public static final PiCounterId CNT_FWD_CLASSIFIER_COUNTER_ID =
+ PiCounterId.of("FabricIngress.filtering.fwd_classifier_counter");
+ public static final PiCounterId CNT_BRIDGING_COUNTER_ID =
+ PiCounterId.of("FabricIngress.forwarding.bridging_counter");
+ public static final PiCounterId CNT_MULTICAST_V6_COUNTER_ID =
+ PiCounterId.of("FabricIngress.forwarding.multicast_v6_counter");
+ public static final PiCounterId CNT_MULTICAST_V4_COUNTER_ID =
+ PiCounterId.of("FabricIngress.forwarding.multicast_v4_counter");
+ public static final PiCounterId CNT_UNICAST_V6_COUNTER_ID =
+ PiCounterId.of("FabricIngress.forwarding.unicast_v6_counter");
+ public static final PiCounterId CNT_UNICAST_V4_COUNTER_ID =
+ PiCounterId.of("FabricIngress.forwarding.unicast_v4_counter");
public static final PiCounterId CNT_INGRESS_PORT_VLAN_COUNTER_ID =
- PiCounterId.of("filtering.ingress_port_vlan_counter");
- public static final PiCounterId CNT_FWD_CLASSIFIER_COUNTER_ID = PiCounterId.of("filtering.fwd_classifier_counter");
- public static final PiCounterId CNT_BRIDGING_COUNTER_ID = PiCounterId.of("forwarding.bridging_counter");
- public static final PiCounterId CNT_SIMPLE_COUNTER_ID = PiCounterId.of("next.simple_counter");
- public static final PiCounterId CNT_HASHED_COUNTER_ID = PiCounterId.of("next.hashed_counter");
- public static final PiCounterId CNT_MPLS_COUNTER_ID = PiCounterId.of("forwarding.mpls_counter");
+ PiCounterId.of("FabricIngress.filtering.ingress_port_vlan_counter");
+ public static final PiCounterId CNT_MPLS_COUNTER_ID =
+ PiCounterId.of("FabricIngress.forwarding.mpls_counter");
+ public static final PiCounterId CNT_HASHED_COUNTER_ID =
+ PiCounterId.of("FabricIngress.next.hashed_counter");
// Action IDs
- public static final PiActionId ACT_NEXT_SET_MCAST_GROUP_ID =
- PiActionId.of("next.set_mcast_group");
- public static final PiActionId ACT_FORWARDING_DUPLICATE_TO_CONTROLLER_ID =
- PiActionId.of("forwarding.duplicate_to_controller");
- public static final PiActionId ACT_NEXT_MPLS_ROUTING_V4_ID =
- PiActionId.of("next.mpls_routing_v4");
- public static final PiActionId ACT_FILTERING_PUSH_INTERNAL_VLAN_ID =
- PiActionId.of("filtering.push_internal_vlan");
- public static final PiActionId ACT_NEXT_SET_VLAN_OUTPUT_ID =
- PiActionId.of("next.set_vlan_output");
- public static final PiActionId ACT_NOACTION_ID = PiActionId.of("NoAction");
- public static final PiActionId ACT_FILTERING_DROP_ID =
- PiActionId.of("filtering.drop");
- public static final PiActionId ACT_NEXT_MPLS_ROUTING_V6_ID =
- PiActionId.of("next.mpls_routing_v6");
- public static final PiActionId ACT_FILTERING_SET_FORWARDING_TYPE_ID =
- PiActionId.of("filtering.set_forwarding_type");
- public static final PiActionId ACT_FORWARDING_DROP_ID =
- PiActionId.of("forwarding.drop");
- public static final PiActionId ACT_NEXT_L3_ROUTING_ID =
- PiActionId.of("next.l3_routing");
- public static final PiActionId ACT_NEXT_OUTPUT_ID =
- PiActionId.of("next.output");
+ public static final PiActionId ACT_FABRICINGRESS_FILTERING_DROP_ID =
+ PiActionId.of("FabricIngress.filtering.drop");
+ public static final PiActionId ACT_FABRICINGRESS_FORWARDING_POP_MPLS_AND_NEXT_ID =
+ PiActionId.of("FabricIngress.forwarding.pop_mpls_and_next");
+ public static final PiActionId ACT_FABRICINGRESS_FILTERING_SET_FORWARDING_TYPE_ID =
+ PiActionId.of("FabricIngress.filtering.set_forwarding_type");
public static final PiActionId ACT_NOP_ID = PiActionId.of("nop");
- public static final PiActionId ACT_FORWARDING_SET_NEXT_ID_ID =
- PiActionId.of("forwarding.set_next_id");
- public static final PiActionId ACT_FILTERING_SET_VLAN_ID =
- PiActionId.of("filtering.set_vlan");
- public static final PiActionId ACT_FORWARDING_POP_MPLS_AND_NEXT_ID =
- PiActionId.of("forwarding.pop_mpls_and_next");
+ public static final PiActionId ACT_FABRICINGRESS_FILTERING_SET_VLAN_ID =
+ PiActionId.of("FabricIngress.filtering.set_vlan");
+ public static final PiActionId ACT_FABRICINGRESS_NEXT_MPLS_ROUTING_V6_ID =
+ PiActionId.of("FabricIngress.next.mpls_routing_v6");
+ public static final PiActionId ACT_NOACTION_ID = PiActionId.of("NoAction");
+ public static final PiActionId ACT_FABRICINGRESS_NEXT_SET_MCAST_GROUP_ID =
+ PiActionId.of("FabricIngress.next.set_mcast_group");
+ public static final PiActionId ACT_FABRICINGRESS_FORWARDING_DUPLICATE_TO_CONTROLLER_ID =
+ PiActionId.of("FabricIngress.forwarding.duplicate_to_controller");
+ public static final PiActionId ACT_FABRICINGRESS_NEXT_L3_ROUTING_ID =
+ PiActionId.of("FabricIngress.next.l3_routing");
+ public static final PiActionId ACT_FABRICINGRESS_NEXT_MPLS_ROUTING_V4_ID =
+ PiActionId.of("FabricIngress.next.mpls_routing_v4");
+ public static final PiActionId ACT_FABRICINGRESS_NEXT_SET_VLAN_OUTPUT_ID =
+ PiActionId.of("FabricIngress.next.set_vlan_output");
+ public static final PiActionId ACT_FABRICINGRESS_FORWARDING_SET_NEXT_ID_ID =
+ PiActionId.of("FabricIngress.forwarding.set_next_id");
+ public static final PiActionId ACT_FABRICINGRESS_FILTERING_PUSH_INTERNAL_VLAN_ID =
+ PiActionId.of("FabricIngress.filtering.push_internal_vlan");
+ public static final PiActionId ACT_FABRICINGRESS_FORWARDING_DROP_ID =
+ PiActionId.of("FabricIngress.forwarding.drop");
+ public static final PiActionId ACT_FABRICINGRESS_NEXT_OUTPUT_ID =
+ PiActionId.of("FabricIngress.next.output");
// Action Param IDs
public static final PiActionParamId ACT_PRM_DMAC_ID =
@@ -175,8 +195,8 @@
PiActionParamId.of("next_id");
// Action Profile IDs
- public static final PiActionProfileId ACT_PRF_NEXT_ECMP_SELECTOR_ID =
- PiActionProfileId.of("next.ecmp_selector");
+ public static final PiActionProfileId ACT_PRF_FABRICINGRESS_NEXT_ECMP_SELECTOR_ID =
+ PiActionProfileId.of("FabricIngress.next.ecmp_selector");
// Packet Metadata IDs
public static final PiControlMetadataId CTRL_META_INGRESS_PORT_ID =
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricInterpreter.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricInterpreter.java
index 3b0a2f8..ef011ee 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricInterpreter.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricInterpreter.java
@@ -76,7 +76,7 @@
// Next
.put(9, FabricConstants.TBL_SIMPLE_ID)
.put(10, FabricConstants.TBL_HASHED_ID)
- .put(11, FabricConstants.TBL_BROADCAST_ID)
+ .put(11, FabricConstants.TBL_MULTICAST_ID)
.build();
private static final Set<PiTableId> FILTERING_CTRL_TBLS = ImmutableSet.of(FabricConstants.TBL_INGRESS_PORT_VLAN_ID,
@@ -90,7 +90,7 @@
FabricConstants.TBL_ACL_ID);
private static final Set<PiTableId> NEXT_CTRL_TBLS = ImmutableSet.of(FabricConstants.TBL_SIMPLE_ID,
FabricConstants.TBL_HASHED_ID,
- FabricConstants.TBL_BROADCAST_ID);
+ FabricConstants.TBL_MULTICAST_ID);
private static final ImmutableMap<Criterion.Type, PiMatchFieldId> CRITERION_MAP =
ImmutableMap.<Criterion.Type, PiMatchFieldId>builder()
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricTreatmentInterpreter.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricTreatmentInterpreter.java
index 00c4047..3dc2f41 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricTreatmentInterpreter.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricTreatmentInterpreter.java
@@ -103,9 +103,9 @@
PiActionId actionId;
if (pushVlanInst != null) {
// push_internal_vlan
- actionId = FabricConstants.ACT_FILTERING_PUSH_INTERNAL_VLAN_ID;
+ actionId = FabricConstants.ACT_FABRICINGRESS_FILTERING_PUSH_INTERNAL_VLAN_ID;
} else {
- actionId = FabricConstants.ACT_FILTERING_SET_VLAN_ID;
+ actionId = FabricConstants.ACT_FABRICINGRESS_FILTERING_SET_VLAN_ID;
}
// set_vlan
@@ -150,7 +150,7 @@
}
return PiAction.builder()
- .withId(FabricConstants.ACT_FORWARDING_DUPLICATE_TO_CONTROLLER_ID)
+ .withId(FabricConstants.ACT_FABRICINGRESS_FORWARDING_DUPLICATE_TO_CONTROLLER_ID)
.build();
}
@@ -225,13 +225,13 @@
ImmutableByteSequence.copyFrom(vlanId.toShort()));
// set_vlan_output
return PiAction.builder()
- .withId(FabricConstants.ACT_NEXT_SET_VLAN_OUTPUT_ID)
+ .withId(FabricConstants.ACT_FABRICINGRESS_NEXT_SET_VLAN_OUTPUT_ID)
.withParameters(ImmutableList.of(portNumParam, vlanParam))
.build();
} else {
// output
return PiAction.builder()
- .withId(FabricConstants.ACT_NEXT_OUTPUT_ID)
+ .withId(FabricConstants.ACT_FABRICINGRESS_NEXT_OUTPUT_ID)
.withParameter(portNumParam)
.build();
}
@@ -254,7 +254,7 @@
PiActionParam mplsParam = new PiActionParam(FabricConstants.ACT_PRM_LABEL_ID, mplsValue);
return PiAction.builder()
// FIXME: fins a way to determine v4 or v6
- .withId(FabricConstants.ACT_NEXT_MPLS_ROUTING_V4_ID)
+ .withId(FabricConstants.ACT_FABRICINGRESS_NEXT_MPLS_ROUTING_V4_ID)
.withParameters(ImmutableList.of(portNumParam,
srcMacParam,
dstMacParam,
@@ -269,7 +269,7 @@
// L3 routing
return PiAction.builder()
- .withId(FabricConstants.ACT_NEXT_L3_ROUTING_ID)
+ .withId(FabricConstants.ACT_FABRICINGRESS_NEXT_L3_ROUTING_ID)
.withParameters(ImmutableList.of(portNumParam,
srcMacParam,
dstMacParam))
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricFilteringPipeliner.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricFilteringPipeliner.java
index 36cfcaf..d46d354 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricFilteringPipeliner.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricFilteringPipeliner.java
@@ -16,7 +16,7 @@
package org.onosproject.pipelines.fabric.pipeliner;
-import com.google.common.collect.Sets;
+import com.google.common.collect.Lists;
import org.onlab.packet.Ethernet;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
@@ -156,7 +156,7 @@
private Collection<FlowRule> createFwdClassifierRules(PortCriterion inPortCriterion,
EthCriterion ethDstCriterion,
FilteringObjective filterObjective) {
- Collection<FlowRule> flowRules = Sets.newHashSet();
+ Collection<FlowRule> flowRules = Lists.newArrayList();
if (ethDstCriterion == null) {
// Bridging table, do nothing
return flowRules;
@@ -192,7 +192,7 @@
private Collection<FlowRule> createIpFwdClassifierRules(PortNumber inPort,
MacAddress dstMac,
FilteringObjective filterObjective) {
- Collection<FlowRule> flowRules = Sets.newHashSet();
+ Collection<FlowRule> flowRules = Lists.newArrayList();
TrafficTreatment treatment;
treatment = createFwdClassifierTreatment(FWD_IPV4_UNICAST);
flowRules.add(createFwdClassifierRule(inPort, Ethernet.TYPE_IPV4, dstMac, treatment, filterObjective));
@@ -233,7 +233,7 @@
PiActionParam param = new PiActionParam(FabricConstants.ACT_PRM_FWD_TYPE_ID,
ImmutableByteSequence.copyFrom(fwdType));
PiAction action = PiAction.builder()
- .withId(FabricConstants.ACT_FILTERING_SET_FORWARDING_TYPE_ID)
+ .withId(FabricConstants.ACT_FABRICINGRESS_FILTERING_SET_FORWARDING_TYPE_ID)
.withParameter(param)
.build();
return DefaultTrafficTreatment.builder()
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipeliner.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipeliner.java
index 5424a49..6f87e79 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipeliner.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipeliner.java
@@ -254,7 +254,7 @@
PiActionParam nextIdParam = new PiActionParam(FabricConstants.ACT_PRM_NEXT_ID_ID,
ImmutableByteSequence.copyFrom(fwd.nextId().byteValue()));
PiAction nextIdAction = PiAction.builder()
- .withId(FabricConstants.ACT_FORWARDING_POP_MPLS_AND_NEXT_ID)
+ .withId(FabricConstants.ACT_FABRICINGRESS_FORWARDING_POP_MPLS_AND_NEXT_ID)
.withParameter(nextIdParam)
.build();
treatment = DefaultTrafficTreatment.builder()
@@ -290,7 +290,7 @@
PiActionParam nextIdParam = new PiActionParam(FabricConstants.ACT_PRM_NEXT_ID_ID,
ImmutableByteSequence.copyFrom(nextId.byteValue()));
PiAction nextIdAction = PiAction.builder()
- .withId(FabricConstants.ACT_FORWARDING_SET_NEXT_ID_ID)
+ .withId(FabricConstants.ACT_FABRICINGRESS_FORWARDING_SET_NEXT_ID_ID)
.withParameter(nextIdParam)
.build();
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricNextPipeliner.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricNextPipeliner.java
index ed10839..c7c7647 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricNextPipeliner.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricNextPipeliner.java
@@ -42,7 +42,7 @@
import java.util.List;
import java.util.stream.Collectors;
-import static org.onosproject.pipelines.fabric.FabricConstants.ACT_PRF_NEXT_ECMP_SELECTOR_ID;
+import static org.onosproject.pipelines.fabric.FabricConstants.ACT_PRF_FABRICINGRESS_NEXT_ECMP_SELECTOR_ID;
import static org.onosproject.pipelines.fabric.FabricConstants.HF_FABRIC_METADATA_NEXT_ID_ID;
import static org.onosproject.pipelines.fabric.FabricConstants.TBL_HASHED_ID;
import static org.onosproject.pipelines.fabric.FabricConstants.TBL_SIMPLE_ID;
@@ -159,7 +159,7 @@
GroupBuckets buckets = new GroupBuckets(bucketList);
PiGroupKey groupKey = new PiGroupKey(TBL_HASHED_ID,
- ACT_PRF_NEXT_ECMP_SELECTOR_ID,
+ ACT_PRF_FABRICINGRESS_NEXT_ECMP_SELECTOR_ID,
groupId);
resultBuilder.addGroup(new DefaultGroupDescription(deviceId,