Integrating INT into fabric pipeline
Change-Id: I9555de0852de79d1a3c7302ecaa17ff112fc5107
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 258e414..2a4b730 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
@@ -33,81 +33,101 @@
}
// Header field IDs
- public static final PiMatchFieldId FABRIC_METADATA_L4_SRC_PORT =
- PiMatchFieldId.of("fabric_metadata.l4_src_port");
public static final PiMatchFieldId SPGW_META_S1U_SGW_ADDR =
PiMatchFieldId.of("spgw_meta.s1u_sgw_addr");
- public static final PiMatchFieldId HDR_IPV4_SRC_ADDR =
- PiMatchFieldId.of("hdr.ipv4.src_addr");
public static final PiMatchFieldId HDR_VLAN_TAG_VLAN_ID =
PiMatchFieldId.of("hdr.vlan_tag.vlan_id");
public static final PiMatchFieldId HDR_MPLS_LABEL =
PiMatchFieldId.of("hdr.mpls.label");
- public static final PiMatchFieldId HDR_IPV6_DST_ADDR =
- PiMatchFieldId.of("hdr.ipv6.dst_addr");
+ public static final PiMatchFieldId STANDARD_METADATA_EGRESS_PORT =
+ PiMatchFieldId.of("standard_metadata.egress_port");
+ public static final PiMatchFieldId STANDARD_METADATA_INGRESS_PORT =
+ PiMatchFieldId.of("standard_metadata.ingress_port");
+ public static final PiMatchFieldId HDR_VLAN_TAG_IS_VALID =
+ 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_ETHERNET_SRC_ADDR =
PiMatchFieldId.of("hdr.ethernet.src_addr");
public static final PiMatchFieldId HDR_ICMP_ICMP_TYPE =
PiMatchFieldId.of("hdr.icmp.icmp_type");
- public static final PiMatchFieldId STANDARD_METADATA_EGRESS_PORT =
- PiMatchFieldId.of("standard_metadata.egress_port");
- public static final PiMatchFieldId FABRIC_METADATA_NEXT_ID =
- PiMatchFieldId.of("fabric_metadata.next_id");
- public static final PiMatchFieldId FABRIC_METADATA_L4_DST_PORT =
- PiMatchFieldId.of("fabric_metadata.l4_dst_port");
public static final PiMatchFieldId HDR_VLAN_TAG_ETHER_TYPE =
PiMatchFieldId.of("hdr.vlan_tag.ether_type");
- public static final PiMatchFieldId STANDARD_METADATA_INGRESS_PORT =
- PiMatchFieldId.of("standard_metadata.ingress_port");
public static final PiMatchFieldId HDR_IPV4_DST_ADDR =
PiMatchFieldId.of("hdr.ipv4.dst_addr");
- public static final PiMatchFieldId IPV4_DST_ADDR =
- PiMatchFieldId.of("ipv4.dst_addr");
- public static final PiMatchFieldId HDR_VLAN_TAG_IS_VALID =
- PiMatchFieldId.of("hdr.vlan_tag.is_valid");
+ public static final PiMatchFieldId HDR_INT_HEADER_INSTRUCTION_MASK_0003 =
+ PiMatchFieldId.of("hdr.int_header.instruction_mask_0003");
+ public static final PiMatchFieldId FABRIC_METADATA_L4_SRC_PORT =
+ PiMatchFieldId.of("fabric_metadata.l4_src_port");
+ public static final PiMatchFieldId FABRIC_METADATA_L4_DST_PORT =
+ PiMatchFieldId.of("fabric_metadata.l4_dst_port");
+ public static final PiMatchFieldId STANDARD_METADATA_EGRESS_SPEC =
+ PiMatchFieldId.of("standard_metadata.egress_spec");
public static final PiMatchFieldId FABRIC_METADATA_IP_PROTO =
PiMatchFieldId.of("fabric_metadata.ip_proto");
+ public static final PiMatchFieldId FABRIC_METADATA_NEXT_ID =
+ PiMatchFieldId.of("fabric_metadata.next_id");
+ public static final PiMatchFieldId HDR_IPV4_SRC_ADDR =
+ PiMatchFieldId.of("hdr.ipv4.src_addr");
+ public static final PiMatchFieldId HDR_INT_HEADER_INSTRUCTION_MASK_0407 =
+ PiMatchFieldId.of("hdr.int_header.instruction_mask_0407");
+ public static final PiMatchFieldId HDR_IPV6_DST_ADDR =
+ PiMatchFieldId.of("hdr.ipv6.dst_addr");
+ public static final PiMatchFieldId IPV4_DST_ADDR =
+ PiMatchFieldId.of("ipv4.dst_addr");
public static final PiMatchFieldId HDR_ETHERNET_DST_ADDR =
PiMatchFieldId.of("hdr.ethernet.dst_addr");
- public static final PiMatchFieldId HDR_ICMP_ICMP_CODE =
- PiMatchFieldId.of("hdr.icmp.icmp_code");
// Table IDs
- public static final PiTableId FABRIC_INGRESS_FORWARDING_ACL =
- PiTableId.of("FabricIngress.forwarding.acl");
public static final PiTableId FABRIC_INGRESS_NEXT_HASHED =
PiTableId.of("FabricIngress.next.hashed");
- public static final PiTableId FABRIC_EGRESS_EGRESS_NEXT_EGRESS_VLAN =
- PiTableId.of("FabricEgress.egress_next.egress_vlan");
- public static final PiTableId FABRIC_INGRESS_FORWARDING_MPLS =
- PiTableId.of("FabricIngress.forwarding.mpls");
- public static final PiTableId FABRIC_INGRESS_NEXT_MULTICAST =
- PiTableId.of("FabricIngress.next.multicast");
- public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_UE_CDR_TABLE =
- PiTableId.of("FabricIngress.spgw_ingress.ue_cdr_table");
- public static final PiTableId FABRIC_INGRESS_FORWARDING_MULTICAST_V6 =
- PiTableId.of("FabricIngress.forwarding.multicast_v6");
- public static final PiTableId FABRIC_INGRESS_FORWARDING_UNICAST_V4 =
- PiTableId.of("FabricIngress.forwarding.unicast_v4");
- public static final PiTableId FABRIC_INGRESS_FILTERING_FWD_CLASSIFIER =
- PiTableId.of("FabricIngress.filtering.fwd_classifier");
- public static final PiTableId FABRIC_INGRESS_NEXT_SIMPLE =
- PiTableId.of("FabricIngress.next.simple");
- public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_UE_FILTER_TABLE =
- PiTableId.of("FabricIngress.spgw_ingress.ue_filter_table");
- public static final PiTableId FABRIC_INGRESS_FORWARDING_BRIDGING =
- PiTableId.of("FabricIngress.forwarding.bridging");
- public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_S1U_FILTER_TABLE =
- PiTableId.of("FabricIngress.spgw_ingress.s1u_filter_table");
public static final PiTableId FABRIC_INGRESS_FORWARDING_MULTICAST_V4 =
PiTableId.of("FabricIngress.forwarding.multicast_v4");
- public static final PiTableId FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN =
- PiTableId.of("FabricIngress.filtering.ingress_port_vlan");
- public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_DL_SESS_LOOKUP =
- PiTableId.of("FabricIngress.spgw_ingress.dl_sess_lookup");
+ public static final PiTableId FABRIC_INGRESS_FORWARDING_MULTICAST_V6 =
+ PiTableId.of("FabricIngress.forwarding.multicast_v6");
+ public static final PiTableId FABRIC_EGRESS_PROCESS_INT_SOURCE_TB_INT_SOURCE =
+ PiTableId.of("FabricEgress.process_int_source.tb_int_source");
+ public static final PiTableId FABRIC_INGRESS_FILTERING_FWD_CLASSIFIER =
+ PiTableId.of("FabricIngress.filtering.fwd_classifier");
+ public static final PiTableId FABRIC_INGRESS_FORWARDING_UNICAST_V4 =
+ PiTableId.of("FabricIngress.forwarding.unicast_v4");
public static final PiTableId FABRIC_INGRESS_FORWARDING_UNICAST_V6 =
PiTableId.of("FabricIngress.forwarding.unicast_v6");
+ public static final PiTableId FABRIC_INGRESS_NEXT_SIMPLE =
+ PiTableId.of("FabricIngress.next.simple");
+ public static final PiTableId FABRIC_INGRESS_NEXT_MULTICAST =
+ PiTableId.of("FabricIngress.next.multicast");
+ public static final PiTableId FABRIC_INGRESS_FORWARDING_MPLS =
+ PiTableId.of("FabricIngress.forwarding.mpls");
+ public static final PiTableId FABRIC_EGRESS_PROCESS_INT_TRANSIT_TB_INT_INST_0003 =
+ PiTableId.of("FabricEgress.process_int_transit.tb_int_inst_0003");
+ public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_S1U_FILTER_TABLE =
+ PiTableId.of("FabricIngress.spgw_ingress.s1u_filter_table");
+ public static final PiTableId FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN =
+ PiTableId.of("FabricIngress.filtering.ingress_port_vlan");
+ public static final PiTableId FABRIC_INGRESS_FORWARDING_ACL =
+ PiTableId.of("FabricIngress.forwarding.acl");
+ public static final PiTableId FABRIC_EGRESS_PROCESS_INT_REPORT_TB_GENERATE_REPORT =
+ PiTableId.of("FabricEgress.process_int_report.tb_generate_report");
+ public static final PiTableId FABRIC_EGRESS_PROCESS_INT_TRANSIT_TB_INT_INST_0407 =
+ PiTableId.of("FabricEgress.process_int_transit.tb_int_inst_0407");
+ public static final PiTableId FABRIC_INGRESS_FORWARDING_BRIDGING =
+ PiTableId.of("FabricIngress.forwarding.bridging");
+ public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_DL_SESS_LOOKUP =
+ PiTableId.of("FabricIngress.spgw_ingress.dl_sess_lookup");
+ public static final PiTableId FABRIC_EGRESS_PROCESS_INT_TRANSIT_TB_INT_INSERT =
+ PiTableId.of("FabricEgress.process_int_transit.tb_int_insert");
public static final PiTableId FABRIC_INGRESS_NEXT_VLAN_META =
PiTableId.of("FabricIngress.next.vlan_meta");
+ public static final PiTableId FABRIC_EGRESS_EGRESS_NEXT_EGRESS_VLAN =
+ PiTableId.of("FabricEgress.egress_next.egress_vlan");
+ public static final PiTableId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_TB_SET_SINK =
+ PiTableId.of("FabricIngress.process_set_source_sink.tb_set_sink");
+ public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_UE_CDR_TABLE =
+ PiTableId.of("FabricIngress.spgw_ingress.ue_cdr_table");
+ public static final PiTableId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_TB_SET_SOURCE =
+ PiTableId.of("FabricIngress.process_set_source_sink.tb_set_source");
+ public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_UE_FILTER_TABLE =
+ PiTableId.of("FabricIngress.spgw_ingress.ue_filter_table");
// Indirect Counter IDs
public static final PiCounterId FABRIC_INGRESS_PORT_COUNTERS_CONTROL_EGRESS_PORT_COUNTER =
PiCounterId.of("FabricIngress.port_counters_control.egress_port_counter");
@@ -118,6 +138,8 @@
PiCounterId.of("FabricIngress.forwarding.acl_counter");
public static final PiCounterId FABRIC_INGRESS_NEXT_MULTICAST_COUNTER =
PiCounterId.of("FabricIngress.next.multicast_counter");
+ public static final PiCounterId FABRIC_EGRESS_PROCESS_INT_TRANSIT_COUNTER_INT_INST_0407 =
+ PiCounterId.of("FabricEgress.process_int_transit.counter_int_inst_0407");
public static final PiCounterId FABRIC_INGRESS_FORWARDING_UNICAST_V6_COUNTER =
PiCounterId.of("FabricIngress.forwarding.unicast_v6_counter");
public static final PiCounterId FABRIC_INGRESS_FILTERING_FWD_CLASSIFIER_COUNTER =
@@ -126,47 +148,101 @@
PiCounterId.of("FabricIngress.forwarding.bridging_counter");
public static final PiCounterId FABRIC_INGRESS_FORWARDING_MULTICAST_V6_COUNTER =
PiCounterId.of("FabricIngress.forwarding.multicast_v6_counter");
+ public static final PiCounterId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_COUNTER_SET_SOURCE =
+ PiCounterId.of("FabricIngress.process_set_source_sink.counter_set_source");
public static final PiCounterId FABRIC_INGRESS_FORWARDING_MULTICAST_V4_COUNTER =
PiCounterId.of("FabricIngress.forwarding.multicast_v4_counter");
public static final PiCounterId FABRIC_INGRESS_SPGW_INGRESS_UE_COUNTER =
PiCounterId.of("FabricIngress.spgw_ingress.ue_counter");
- public static final PiCounterId FABRIC_INGRESS_NEXT_VLAN_META_COUNTER =
- PiCounterId.of("FabricIngress.next.vlan_meta_counter");
public static final PiCounterId FABRIC_EGRESS_EGRESS_NEXT_EGRESS_VLAN_COUNTER =
PiCounterId.of("FabricEgress.egress_next.egress_vlan_counter");
+ public static final PiCounterId FABRIC_EGRESS_PROCESS_INT_TRANSIT_COUNTER_INT_INSERT =
+ PiCounterId.of("FabricEgress.process_int_transit.counter_int_insert");
+ public static final PiCounterId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_COUNTER_SET_SINK =
+ PiCounterId.of("FabricIngress.process_set_source_sink.counter_set_sink");
+ public static final PiCounterId FABRIC_INGRESS_NEXT_VLAN_META_COUNTER =
+ PiCounterId.of("FabricIngress.next.vlan_meta_counter");
+ public static final PiCounterId FABRIC_EGRESS_PROCESS_INT_SOURCE_COUNTER_INT_SOURCE =
+ PiCounterId.of("FabricEgress.process_int_source.counter_int_source");
public static final PiCounterId FABRIC_INGRESS_FORWARDING_UNICAST_V4_COUNTER =
PiCounterId.of("FabricIngress.forwarding.unicast_v4_counter");
public static final PiCounterId FABRIC_INGRESS_NEXT_SIMPLE_COUNTER =
PiCounterId.of("FabricIngress.next.simple_counter");
public static final PiCounterId FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN_COUNTER =
PiCounterId.of("FabricIngress.filtering.ingress_port_vlan_counter");
+ public static final PiCounterId FABRIC_EGRESS_PROCESS_INT_TRANSIT_COUNTER_INT_INST_0003 =
+ PiCounterId.of("FabricEgress.process_int_transit.counter_int_inst_0003");
public static final PiCounterId FABRIC_INGRESS_FORWARDING_MPLS_COUNTER =
PiCounterId.of("FabricIngress.forwarding.mpls_counter");
public static final PiCounterId FABRIC_INGRESS_NEXT_HASHED_COUNTER =
PiCounterId.of("FabricIngress.next.hashed_counter");
// Action IDs
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I14 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0003_i14");
public static final PiActionId FABRIC_INGRESS_SPGW_INGRESS_UPDATE_UE_CDR =
PiActionId.of("FabricIngress.spgw_ingress.update_ue_cdr");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I12 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0003_i12");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I13 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0003_i13");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I10 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0003_i10");
public static final PiActionId FABRIC_INGRESS_NEXT_MPLS_ROUTING_V6_SIMPLE =
PiActionId.of("FabricIngress.next.mpls_routing_v6_simple");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_UPDATE_TOTAL_HOP_CNT =
+ PiActionId.of("FabricEgress.process_int_transit.int_update_total_hop_cnt");
public static final PiActionId FABRIC_INGRESS_NEXT_MPLS_ROUTING_V6_HASHED =
PiActionId.of("FabricIngress.next.mpls_routing_v6_hashed");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I14 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0407_i14");
public static final PiActionId FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_BRIDGING =
PiActionId.of("FabricIngress.forwarding.set_next_id_bridging");
public static final PiActionId FABRIC_INGRESS_FORWARDING_PUNT_TO_CPU =
PiActionId.of("FabricIngress.forwarding.punt_to_cpu");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I2 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0407_i2");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_OUTER_ENCAP_INT_UPDATE_IPV4 =
+ PiActionId.of("FabricEgress.process_int_outer_encap.int_update_ipv4");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I4 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0003_i4");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_SINK_INT_SINK =
+ PiActionId.of("FabricEgress.process_int_sink.int_sink");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I3 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0003_i3");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I13 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0407_i13");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I7 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0407_i7");
public static final PiActionId FABRIC_INGRESS_NEXT_SET_VLAN =
PiActionId.of("FabricIngress.next.set_vlan");
- public static final PiActionId FABRIC_EGRESS_SPGW_EGRESS_GTPU_ENCAP =
- PiActionId.of("FabricEgress.spgw_egress.gtpu_encap");
public static final PiActionId FABRIC_EGRESS_PKT_IO_EGRESS_POP_VLAN =
PiActionId.of("FabricEgress.pkt_io_egress.pop_vlan");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I8 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0407_i8");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I9 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0407_i9");
+ public static final PiActionId FABRIC_EGRESS_SPGW_EGRESS_GTPU_ENCAP =
+ PiActionId.of("FabricEgress.spgw_egress.gtpu_encap");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I4 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0407_i4");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I5 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0407_i5");
public static final PiActionId FABRIC_INGRESS_FILTERING_SET_VLAN =
PiActionId.of("FabricIngress.filtering.set_vlan");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I11 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0003_i11");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I0 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0407_i0");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I1 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0407_i1");
public static final PiActionId FABRIC_INGRESS_NEXT_L3_ROUTING_SIMPLE =
PiActionId.of("FabricIngress.next.l3_routing_simple");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I3 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0407_i3");
public static final PiActionId FABRIC_INGRESS_NEXT_SET_MCAST_GROUP =
PiActionId.of("FabricIngress.next.set_mcast_group");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_OUTER_ENCAP_INT_UPDATE_UDP =
+ PiActionId.of("FabricEgress.process_int_outer_encap.int_update_udp");
public static final PiActionId FABRIC_INGRESS_SPGW_INGRESS_SET_DL_SESS_INFO =
PiActionId.of("FabricIngress.spgw_ingress.set_dl_sess_info");
public static final PiActionId FABRIC_INGRESS_FILTERING_PUSH_INTERNAL_VLAN =
@@ -175,17 +251,35 @@
PiActionId.of("FabricIngress.forwarding.clone_to_cpu");
public static final PiActionId FABRIC_INGRESS_SPGW_INGRESS_GTPU_DECAP =
PiActionId.of("FabricIngress.spgw_ingress.gtpu_decap");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I15 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0407_i15");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I12 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0407_i12");
public static final PiActionId FABRIC_INGRESS_FORWARDING_POP_MPLS_AND_NEXT =
PiActionId.of("FabricIngress.forwarding.pop_mpls_and_next");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I10 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0407_i10");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I11 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0407_i11");
public static final PiActionId DROP_NOW = PiActionId.of("drop_now");
public static final PiActionId FABRIC_INGRESS_NEXT_L3_ROUTING_HASHED =
PiActionId.of("FabricIngress.next.l3_routing_hashed");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_SOURCE_INT_SOURCE_DSCP =
+ PiActionId.of("FabricEgress.process_int_source.int_source_dscp");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_REPORT_DO_REPORT_ENCAPSULATION =
+ PiActionId.of("FabricEgress.process_int_report.do_report_encapsulation");
public static final PiActionId FABRIC_EGRESS_EGRESS_NEXT_POP_VLAN =
PiActionId.of("FabricEgress.egress_next.pop_vlan");
+ public static final PiActionId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_INT_SET_SINK =
+ PiActionId.of("FabricIngress.process_set_source_sink.int_set_sink");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_OUTER_ENCAP_INT_UPDATE_SHIM =
+ PiActionId.of("FabricEgress.process_int_outer_encap.int_update_shim");
public static final PiActionId FABRIC_INGRESS_NEXT_MPLS_ROUTING_V4_HASHED =
PiActionId.of("FabricIngress.next.mpls_routing_v4_hashed");
public static final PiActionId FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_UNICAST_V6 =
PiActionId.of("FabricIngress.forwarding.set_next_id_unicast_v6");
+ public static final PiActionId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_INT_SET_SOURCE =
+ PiActionId.of("FabricIngress.process_set_source_sink.int_set_source");
public static final PiActionId FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_UNICAST_V4 =
PiActionId.of("FabricIngress.forwarding.set_next_id_unicast_v4");
public static final PiActionId NOP = PiActionId.of("nop");
@@ -195,24 +289,53 @@
PiActionId.of("FabricIngress.next.output_simple");
public static final PiActionId FABRIC_INGRESS_FILTERING_DROP =
PiActionId.of("FabricIngress.filtering.drop");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I8 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0003_i8");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I9 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0003_i9");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_SINK_RESTORE_HEADER =
+ PiActionId.of("FabricEgress.process_int_sink.restore_header");
public static final PiActionId FABRIC_INGRESS_FILTERING_SET_FORWARDING_TYPE =
PiActionId.of("FabricIngress.filtering.set_forwarding_type");
public static final PiActionId FABRIC_INGRESS_NEXT_SET_VLAN_OUTPUT =
PiActionId.of("FabricIngress.next.set_vlan_output");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I6 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0003_i6");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I7 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0003_i7");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I0 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0003_i0");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I1 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0003_i1");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I2 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0003_i2");
public static final PiActionId NO_ACTION = PiActionId.of("NoAction");
public static final PiActionId FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_MULTICAST_V6 =
PiActionId.of("FabricIngress.forwarding.set_next_id_multicast_v6");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_TRANSIT =
+ PiActionId.of("FabricEgress.process_int_transit.int_transit");
public static final PiActionId FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_MULTICAST_V4 =
PiActionId.of("FabricIngress.forwarding.set_next_id_multicast_v4");
public static final PiActionId FABRIC_INGRESS_NEXT_MPLS_ROUTING_V4_SIMPLE =
PiActionId.of("FabricIngress.next.mpls_routing_v4_simple");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I5 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0003_i5");
public static final PiActionId FABRIC_INGRESS_NEXT_L3_ROUTING_VLAN =
PiActionId.of("FabricIngress.next.l3_routing_vlan");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I15 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0003_i15");
public static final PiActionId FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_ACL =
PiActionId.of("FabricIngress.forwarding.set_next_id_acl");
+ public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I6 =
+ PiActionId.of("FabricEgress.process_int_transit.int_set_header_0407_i6");
// Action Param IDs
public static final PiActionParamId DMAC = PiActionParamId.of("dmac");
+ public static final PiActionParamId MON_IP = PiActionParamId.of("mon_ip");
public static final PiActionParamId TEID = PiActionParamId.of("teid");
+ public static final PiActionParamId INS_MASK0407 =
+ PiActionParamId.of("ins_mask0407");
+ public static final PiActionParamId INS_MASK0003 =
+ PiActionParamId.of("ins_mask0003");
public static final PiActionParamId S1U_ENB_ADDR =
PiActionParamId.of("s1u_enb_addr");
public static final PiActionParamId PORT_NUM =
@@ -221,12 +344,21 @@
PiActionParamId.of("s1u_sgw_addr");
public static final PiActionParamId LABEL = PiActionParamId.of("label");
public static final PiActionParamId SMAC = PiActionParamId.of("smac");
+ public static final PiActionParamId MON_PORT =
+ PiActionParamId.of("mon_port");
public static final PiActionParamId GID = PiActionParamId.of("gid");
public static final PiActionParamId NEW_VLAN_ID =
PiActionParamId.of("new_vlan_id");
public static final PiActionParamId FWD_TYPE =
PiActionParamId.of("fwd_type");
+ public static final PiActionParamId MON_MAC = PiActionParamId.of("mon_mac");
+ public static final PiActionParamId SRC_MAC = PiActionParamId.of("src_mac");
public static final PiActionParamId NEXT_ID = PiActionParamId.of("next_id");
+ public static final PiActionParamId INS_CNT = PiActionParamId.of("ins_cnt");
+ public static final PiActionParamId SWITCH_ID =
+ PiActionParamId.of("switch_id");
+ public static final PiActionParamId MAX_HOP = PiActionParamId.of("max_hop");
+ public static final PiActionParamId SRC_IP = PiActionParamId.of("src_ip");
// Action Profile IDs
public static final PiActionProfileId FABRIC_INGRESS_NEXT_ECMP_SELECTOR =
PiActionProfileId.of("FabricIngress.next.ecmp_selector");
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
new file mode 100644
index 0000000..2019b3e
--- /dev/null
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/IntProgrammableImpl.java
@@ -0,0 +1,520 @@
+/*
+ * Copyright 2017-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.pipelines.fabric;
+
+import com.google.common.collect.ImmutableBiMap;
+import com.google.common.collect.Sets;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.ReferenceCardinality;
+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.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.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.flow.criteria.Criterion;
+import org.onosproject.net.flow.criteria.IPCriterion;
+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.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 static org.slf4j.LoggerFactory.getLogger;
+
+public class IntProgrammableImpl extends AbstractHandlerBehaviour implements IntProgrammable {
+ // TODO: change this value to the value of diameter of a network.
+ 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,
+ Criterion.Type.UDP_SRC, Criterion.Type.UDP_DST,
+ Criterion.Type.TCP_SRC, Criterion.Type.TCP_DST,
+ Criterion.Type.IP_PROTO);
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+ private FlowRuleService flowRuleService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+ private DeviceService deviceService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+ private HostService hostService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+ private CoreService coreService;
+
+ 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_TRANSIT_INT_SET_HEADER_0003_I0)
+ .put(1, FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I1)
+ .put(2, FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I2)
+ .put(3, FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I3)
+ .put(4, FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I4)
+ .put(5, FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I5)
+ .put(6, FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I6)
+ .put(7, FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I7)
+ .put(8, FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I8)
+ .put(9, FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I9)
+ .put(10, FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I10)
+ .put(11, FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I11)
+ .put(12, FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I12)
+ .put(13, FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I13)
+ .put(14, FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I14)
+ .put(15, FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I15)
+ .build();
+
+ private static final ImmutableBiMap<Integer, PiActionId> INST_0407_ACTION_MAP =
+ ImmutableBiMap.<Integer, PiActionId>builder()
+ .put(0, FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I0)
+ .put(1, FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I1)
+ .put(2, FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I2)
+ .put(3, FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I3)
+ .put(4, FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I4)
+ .put(5, FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I5)
+ .put(6, FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I6)
+ .put(7, FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I7)
+ .put(8, FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I8)
+ .put(9, FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I9)
+ .put(10, FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I10)
+ .put(11, FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I11)
+ .put(12, FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I12)
+ .put(13, FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I13)
+ .put(14, FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I14)
+ .put(15, FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I15)
+ .build();
+
+ @Override
+ public void init() {
+ deviceId = this.data().deviceId();
+ flowRuleService = handler().get(FlowRuleService.class);
+ deviceService = handler().get(DeviceService.class);
+ hostService = handler().get(HostService.class);
+ 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;
+ }
+
+ 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<>();
+
+ // process_int_transit.tb_int_insert
+ PiActionParam transitIdParam = new PiActionParam(
+ FabricConstants.SWITCH_ID,
+ ImmutableByteSequence.copyFrom(
+ Integer.parseInt(deviceId.toString().substring(
+ deviceId.toString().length() - 2))));
+ PiAction transitAction = PiAction.builder()
+ .withId(FabricConstants.FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_TRANSIT)
+ .withParameter(transitIdParam)
+ .build();
+ TrafficTreatment treatment = DefaultTrafficTreatment.builder()
+ .piTableAction(transitAction)
+ .build();
+
+ FlowRule transitFlowRule = DefaultFlowRule.builder()
+ .withTreatment(treatment)
+ .fromApp(appId)
+ .withPriority(DEFAULT_PRIORITY)
+ .makePermanent()
+ .forDevice(deviceId)
+ .forTable(FabricConstants.FABRIC_EGRESS_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);
+
+ // 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);
+ }
+ 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_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_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)
+ .build();
+ TrafficSelector instSelector = DefaultTrafficSelector.builder()
+ .matchPi(instCriterion)
+ .build();
+ PiAction instAction = PiAction.builder()
+ .withId(actionId)
+ .build();
+ TrafficTreatment instTreatment = DefaultTrafficTreatment.builder()
+ .piTableAction(instAction)
+ .build();
+
+ FlowRule instFlowRule = DefaultFlowRule.builder()
+ .withSelector(instSelector)
+ .withTreatment(instTreatment)
+ .withPriority(DEFAULT_PRIORITY)
+ .makePermanent()
+ .forDevice(deviceId)
+ .forTable(tableId)
+ .fromApp(appId)
+ .build();
+
+ flowRuleService.applyFlowRules(instFlowRule);
+ }
+
+ 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));
+ PiActionParam instCntParam = new PiActionParam(
+ FabricConstants.INS_CNT,
+ ImmutableByteSequence.copyFrom(Integer.bitCount(instructionBitmap)));
+ PiActionParam inst0003Param = new PiActionParam(
+ FabricConstants.INS_MASK0003,
+ ImmutableByteSequence.copyFrom((instructionBitmap >> 12) & 0xF));
+ PiActionParam inst0407Param = new PiActionParam(
+ FabricConstants.INS_MASK0407,
+ ImmutableByteSequence.copyFrom((instructionBitmap >> 8) & 0xF));
+
+ PiAction intSourceAction = PiAction.builder()
+ .withId(FabricConstants.FABRIC_EGRESS_PROCESS_INT_SOURCE_INT_SOURCE_DSCP)
+ .withParameter(maxHopParam)
+ .withParameter(instCntParam)
+ .withParameter(inst0003Param)
+ .withParameter(inst0407Param)
+ .build();
+
+ TrafficTreatment instTreatment = DefaultTrafficTreatment.builder()
+ .piTableAction(intSourceAction)
+ .build();
+
+ TrafficSelector.Builder sBuilder = DefaultTrafficSelector.builder();
+ for (Criterion criterion : obj.selector().criteria()) {
+ switch (criterion.type()) {
+ case IPV4_SRC:
+ sBuilder.matchIPSrc(((IPCriterion) criterion).ip());
+ break;
+ case IPV4_DST:
+ sBuilder.matchIPDst(((IPCriterion) criterion).ip());
+ break;
+ case TCP_SRC:
+ sBuilder.matchPi(
+ PiCriterion.builder().matchTernary(
+ FabricConstants.FABRIC_METADATA_L4_SRC_PORT,
+ ((TcpPortCriterion) criterion).tcpPort().toInt(), PORTMASK)
+ .build());
+ break;
+ case UDP_SRC:
+ sBuilder.matchPi(
+ PiCriterion.builder().matchTernary(
+ FabricConstants.FABRIC_METADATA_L4_SRC_PORT,
+ ((UdpPortCriterion) criterion).udpPort().toInt(), PORTMASK)
+ .build());
+ break;
+ case TCP_DST:
+ sBuilder.matchPi(
+ PiCriterion.builder().matchTernary(
+ FabricConstants.FABRIC_METADATA_L4_DST_PORT,
+ ((TcpPortCriterion) criterion).tcpPort().toInt(), PORTMASK)
+ .build());
+ break;
+ case UDP_DST:
+ sBuilder.matchPi(
+ PiCriterion.builder().matchTernary(
+ FabricConstants.FABRIC_METADATA_L4_DST_PORT,
+ ((UdpPortCriterion) criterion).udpPort().toInt(), PORTMASK)
+ .build());
+ break;
+ default:
+ log.warn("Unsupported criterion type: {}", criterion.type());
+ }
+ }
+
+ return DefaultFlowRule.builder()
+ .forDevice(this.data().deviceId())
+ .withSelector(sBuilder.build())
+ .withTreatment(instTreatment)
+ .withPriority(DEFAULT_PRIORITY)
+ .forTable(FabricConstants.FABRIC_EGRESS_PROCESS_INT_SOURCE_TB_INT_SOURCE)
+ .fromApp(appId)
+ .withIdleTimeout(IDLE_TIMEOUT)
+ .build();
+ }
+
+ private int buildInstructionBitmap(Set<IntIntent.IntMetadataType> metadataTypes) {
+ int instBitmap = 0;
+ for (IntIntent.IntMetadataType metadataType : metadataTypes) {
+ switch (metadataType) {
+ case SWITCH_ID:
+ instBitmap |= (1 << 15);
+ break;
+ case L1_PORT_ID:
+ instBitmap |= (1 << 14);
+ break;
+ case HOP_LATENCY:
+ instBitmap |= (1 << 13);
+ break;
+ case QUEUE_OCCUPANCY:
+ instBitmap |= (1 << 12);
+ break;
+ case INGRESS_TIMESTAMP:
+ instBitmap |= (1 << 11);
+ break;
+ case EGRESS_TIMESTAMP:
+ instBitmap |= (1 << 10);
+ break;
+ case L2_PORT_ID:
+ instBitmap |= (1 << 9);
+ break;
+ case EGRESS_TX_UTIL:
+ instBitmap |= (1 << 8);
+ break;
+ default:
+ log.info("Unsupported metadata type {}. Ignoring...", metadataType);
+ break;
+ }
+ }
+ return instBitmap;
+ }
+
+ /**
+ * Returns a subset of Criterion from given selector,
+ * which is unsupported by this INT pipeline.
+ *
+ * @param selector a traffic selector
+ * @return a subset of Criterion from given selector, unsupported by this INT pipeline,
+ * empty if all criteria are supported.
+ */
+ private Set<Criterion> unsupportedSelectors(TrafficSelector selector) {
+ return selector.criteria().stream()
+ .filter(criterion -> !SUPPORTED_CRITERION.contains(criterion.type()))
+ .collect(Collectors.toSet());
+ }
+
+ 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()));
+ return false;
+ }
+
+ FlowRule flowRule = buildWatchlistEntry(obj);
+ if (flowRule != null) {
+ if (install) {
+ flowRuleService.applyFlowRules(flowRule);
+ } else {
+ flowRuleService.removeFlowRules(flowRule);
+ }
+ log.debug("IntObjective {} has been {} {}",
+ obj, install ? "installed to" : "removed from", deviceId);
+ return true;
+ } else {
+ log.warn("Failed to {} IntObjective {} on {}",
+ install ? "install" : "remove", obj, deviceId);
+ return false;
+ }
+ }
+
+ 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;
+ }
+ }
+
+ 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.");
+ return null;
+ }
+
+ PiActionParam srcMacParam = new PiActionParam(
+ FabricConstants.SRC_MAC,
+ ImmutableByteSequence.copyFrom(cfg.sinkMac().toBytes()));
+ PiActionParam nextHopMacParam = new PiActionParam(
+ FabricConstants.MON_MAC,
+ ImmutableByteSequence.copyFrom(cfg.collectorNextHopMac().toBytes()));
+ PiActionParam srcIpParam = new PiActionParam(
+ FabricConstants.SRC_IP,
+ ImmutableByteSequence.copyFrom(cfg.sinkIp().toOctets()));
+ PiActionParam monIpParam = new PiActionParam(
+ FabricConstants.MON_IP,
+ ImmutableByteSequence.copyFrom(cfg.collectorIp().toOctets()));
+ PiActionParam monPortParam = new PiActionParam(
+ FabricConstants.MON_PORT,
+ ImmutableByteSequence.copyFrom(cfg.collectorPort().toInt()));
+ PiAction reportAction = PiAction.builder()
+ .withId(FabricConstants.FABRIC_EGRESS_PROCESS_INT_REPORT_DO_REPORT_ENCAPSULATION)
+ .withParameter(srcMacParam)
+ .withParameter(nextHopMacParam)
+ .withParameter(srcIpParam)
+ .withParameter(monIpParam)
+ .withParameter(monPortParam)
+ .build();
+ TrafficTreatment treatment = DefaultTrafficTreatment.builder()
+ .piTableAction(reportAction)
+ .build();
+
+ return DefaultFlowRule.builder()
+ .withTreatment(treatment)
+ .fromApp(appId)
+ .withPriority(DEFAULT_PRIORITY)
+ .makePermanent()
+ .forDevice(this.data().deviceId())
+ .forTable(FabricConstants.FABRIC_EGRESS_PROCESS_INT_REPORT_TB_GENERATE_REPORT)
+ .build();
+ }
+
+}
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 72614c2..3d04426 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
@@ -21,6 +21,8 @@
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
+import org.onosproject.core.CoreService;
+import org.onosproject.inbandtelemetry.api.IntProgrammable;
import org.onosproject.net.PortNumber;
import org.onosproject.net.behaviour.Pipeliner;
import org.onosproject.net.device.PortStatisticsDiscovery;
@@ -66,6 +68,8 @@
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/";
@@ -77,6 +81,8 @@
private static final String P4INFO_TXT = "p4info.txt";
private static final String TOFINO_BIN = "tofino.bin";
private static final String TOFINO_CTX_JSON = "context.json";
+ private static final String INT_PROFILE_SUFFIX = "-int";
+ private static final String FULL_PROFILE_SUFFIX = "-full";
private static final int BMV2_CPU_PORT = 255;
@@ -85,8 +91,12 @@
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
private PiPipeconfService piPipeconfService;
+ @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+ private CoreService coreService;
+
@Activate
public void activate() {
+ coreService.registerApplication(PIPELINE_APP_NAME);
// Registers all pipeconf at component activation.
PIPECONFS.forEach(piPipeconfService::register);
}
@@ -148,10 +158,15 @@
if (bmv2JsonUrl == null || p4InfoUrl == null) {
throw new FileNotFoundException();
}
- return basePipeconfBuilder(
+
+ DefaultPiPipeconf.Builder builder = basePipeconfBuilder(
profile, platform, p4InfoUrl, Bmv2FabricInterpreter.class)
- .addExtension(ExtensionType.BMV2_JSON, bmv2JsonUrl)
- .build();
+ .addExtension(ExtensionType.BMV2_JSON, bmv2JsonUrl);
+ // Add IntProgrammable behaviour for INT-enabled profiles.
+ if (profile.endsWith(INT_PROFILE_SUFFIX) || profile.endsWith(FULL_PROFILE_SUFFIX)) {
+ builder.addBehaviour(IntProgrammable.class, IntProgrammableImpl.class);
+ }
+ return builder.build();
}
private static PiPipeconf buildTofinoPipeconf(String profile, String platform)