SDFAB-193 Add packet-out routing feature to fabric-v1model
This is a port from fabric-tna:
https://github.com/stratum/fabric-tna/pull/262
By default, all packet-outs are sent straight to the egress port passed
as a controller packet-out metadata, bypassing the forwarding tables in
the ingress pipe. With this change, the control plane can set a new
packet-out metadata named `do_forwarding` to instruct the parser to
forward packet-outs as regular packets.
When handling `OutboundPacket` in ONOS, the pipeconf (interpreter) uses
the `OUTPUT` instruction with logical port `TABLE` to enable forwarding.
This is consistent with the OpenFlow behavior, from the spec:
Required: TABLE: Represents the start of the OpenFlow pipeline (see
5.1). This port is only valid in an output action in the action list
of a packet-out message (see 7.3.7), and submits the packet to the
first flow table so that the packet can be processed through the
regular OpenFlow pipeline.
We also rename some test classes for consistency with main classes.
Before we had a FabricPipelinerTest class that was used for a different
purpose than testing FabricPipeliner.
Change-Id: I1b47c4b4f233df5b67d1a6dc743dea27c54772b2
(cherry picked from commit db347377bec8bf6f71fb9828f4dc552731e562f7)
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
index add34cf..09d2757 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
@@ -3,7 +3,7 @@
}
tables {
preamble {
- id: 33581620
+ id: 44526132
name: "FabricIngress.process_set_source_sink.tb_set_source"
alias: "tb_set_source"
}
@@ -14,20 +14,20 @@
match_type: EXACT
}
action_refs {
- id: 16778827
+ id: 21235275
}
action_refs {
- id: 16819938
+ id: 28485346
annotations: "@defaultonly"
scope: DEFAULT_ONLY
}
- const_default_action_id: 16819938
- direct_resource_ids: 318787614
+ const_default_action_id: 28485346
+ direct_resource_ids: 318984222
size: 511
}
tables {
preamble {
- id: 33611649
+ id: 43310977
name: "FabricIngress.filtering.ingress_port_vlan"
alias: "ingress_port_vlan"
}
@@ -50,21 +50,21 @@
match_type: TERNARY
}
action_refs {
- id: 16836487
+ id: 17164167
}
action_refs {
- id: 16818236
+ id: 24158268
}
action_refs {
- id: 16794911
+ id: 24266015
}
- const_default_action_id: 16836487
- direct_resource_ids: 318815501
+ const_default_action_id: 17164167
+ direct_resource_ids: 326221069
size: 1024
}
tables {
preamble {
- id: 33596298
+ id: 49718154
name: "FabricIngress.filtering.fwd_classifier"
alias: "fwd_classifier"
}
@@ -93,15 +93,15 @@
match_type: EXACT
}
action_refs {
- id: 16840921
+ id: 25032921
}
- const_default_action_id: 16840921
- direct_resource_ids: 318827326
+ const_default_action_id: 25032921
+ direct_resource_ids: 335473470
size: 1024
}
tables {
preamble {
- id: 33596749
+ id: 43623757
name: "FabricIngress.forwarding.bridging"
alias: "bridging"
}
@@ -118,20 +118,20 @@
match_type: TERNARY
}
action_refs {
- id: 16811012
+ id: 21791748
}
action_refs {
- id: 16819938
+ id: 28485346
annotations: "@defaultonly"
scope: DEFAULT_ONLY
}
- const_default_action_id: 16819938
- direct_resource_ids: 318770289
+ const_default_action_id: 28485346
+ direct_resource_ids: 330959985
size: 1024
}
tables {
preamble {
- id: 33574274
+ id: 37768578
name: "FabricIngress.forwarding.mpls"
alias: "mpls"
}
@@ -142,20 +142,20 @@
match_type: EXACT
}
action_refs {
- id: 16827758
+ id: 30066030
}
action_refs {
- id: 16819938
+ id: 28485346
annotations: "@defaultonly"
scope: DEFAULT_ONLY
}
- const_default_action_id: 16819938
- direct_resource_ids: 318830507
+ const_default_action_id: 28485346
+ direct_resource_ids: 318961579
size: 1024
}
tables {
preamble {
- id: 33562650
+ id: 41754650
name: "FabricIngress.forwarding.routing_v4"
alias: "routing_v4"
}
@@ -166,13 +166,13 @@
match_type: LPM
}
action_refs {
- id: 16777434
+ id: 19792090
}
action_refs {
- id: 16804187
+ id: 29124955
}
action_refs {
- id: 16819938
+ id: 28485346
annotations: "@defaultonly"
scope: DEFAULT_ONLY
}
@@ -180,7 +180,7 @@
}
tables {
preamble {
- id: 33618978
+ id: 44104738
name: "FabricIngress.acl.acl"
alias: "acl"
}
@@ -257,27 +257,27 @@
match_type: TERNARY
}
action_refs {
- id: 16807382
+ id: 23623126
}
action_refs {
- id: 16829684
+ id: 23579892
}
action_refs {
- id: 16781601
+ id: 16912673
}
action_refs {
- id: 16820765
+ id: 23570973
}
action_refs {
- id: 16827694
+ id: 29607214
}
- const_default_action_id: 16827694
- direct_resource_ids: 318801025
+ const_default_action_id: 29607214
+ direct_resource_ids: 319194241
size: 1024
}
tables {
preamble {
- id: 33599709
+ id: 35696861
name: "FabricIngress.next.next_vlan"
alias: "next_vlan"
}
@@ -288,20 +288,20 @@
match_type: EXACT
}
action_refs {
- id: 16790685
+ id: 22099101
}
action_refs {
- id: 16819938
+ id: 28485346
annotations: "@defaultonly"
scope: DEFAULT_ONLY
}
- const_default_action_id: 16819938
- direct_resource_ids: 318768144
+ const_default_action_id: 28485346
+ direct_resource_ids: 326370320
size: 1024
}
tables {
preamble {
- id: 33596977
+ id: 48735793
name: "FabricIngress.next.xconnect"
alias: "xconnect"
}
@@ -318,23 +318,23 @@
match_type: EXACT
}
action_refs {
- id: 16842190
+ id: 24640974
}
action_refs {
- id: 16837052
+ id: 30599612
}
action_refs {
- id: 16819938
+ id: 28485346
annotations: "@defaultonly"
scope: DEFAULT_ONLY
}
- const_default_action_id: 16819938
- direct_resource_ids: 318778156
+ const_default_action_id: 28485346
+ direct_resource_ids: 321989420
size: 1024
}
tables {
preamble {
- id: 33608588
+ id: 47960972
name: "FabricIngress.next.hashed"
alias: "hashed"
}
@@ -345,27 +345,27 @@
match_type: EXACT
}
action_refs {
- id: 16815357
+ id: 27301117
}
action_refs {
- id: 16791402
+ id: 20985706
}
action_refs {
- id: 16779255
+ id: 27920375
}
action_refs {
- id: 16819938
+ id: 28485346
annotations: "@defaultonly"
scope: DEFAULT_ONLY
}
- const_default_action_id: 16819938
- implementation_id: 285217164
- direct_resource_ids: 318800532
+ const_default_action_id: 28485346
+ implementation_id: 291115404
+ direct_resource_ids: 322798228
size: 1024
}
tables {
preamble {
- id: 33606828
+ id: 40619180
name: "FabricIngress.next.multicast"
alias: "multicast"
}
@@ -376,20 +376,20 @@
match_type: EXACT
}
action_refs {
- id: 16779917
+ id: 21629581
}
action_refs {
- id: 16819938
+ id: 28485346
annotations: "@defaultonly"
scope: DEFAULT_ONLY
}
- const_default_action_id: 16819938
- direct_resource_ids: 318801752
+ const_default_action_id: 28485346
+ direct_resource_ids: 319194968
size: 1024
}
tables {
preamble {
- id: 33612258
+ id: 44818914
name: "FabricEgress.process_int_main.process_int_source.tb_int_source"
alias: "tb_int_source"
}
@@ -418,20 +418,20 @@
match_type: TERNARY
}
action_refs {
- id: 16785857
+ id: 20062657
}
action_refs {
- id: 16819938
+ id: 28485346
annotations: "@defaultonly"
scope: DEFAULT_ONLY
}
- const_default_action_id: 16819938
- direct_resource_ids: 318800047
+ const_default_action_id: 28485346
+ direct_resource_ids: 322470063
size: 1024
}
tables {
preamble {
- id: 33599867
+ id: 34910587
name: "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
alias: "tb_int_insert"
}
@@ -442,19 +442,19 @@
match_type: EXACT
}
action_refs {
- id: 16780783
+ id: 29232623
}
action_refs {
- id: 16819938
+ id: 28485346
annotations: "@defaultonly"
scope: DEFAULT_ONLY
}
- const_default_action_id: 16819938
+ const_default_action_id: 28485346
size: 1
}
tables {
preamble {
- id: 33599342
+ id: 49262446
name: "FabricEgress.egress_next.egress_vlan"
alias: "egress_vlan"
}
@@ -471,51 +471,51 @@
match_type: EXACT
}
action_refs {
- id: 16807339
+ id: 30307755
}
action_refs {
- id: 16790030
+ id: 17183246
}
action_refs {
- id: 16787838
+ id: 30812542
annotations: "@defaultonly"
scope: DEFAULT_ONLY
}
- const_default_action_id: 16787838
- direct_resource_ids: 318827144
+ const_default_action_id: 30812542
+ direct_resource_ids: 318892680
size: 1024
}
actions {
preamble {
- id: 16819938
+ id: 28485346
name: "nop"
alias: "nop"
}
}
actions {
preamble {
- id: 16778827
+ id: 21235275
name: "FabricIngress.process_set_source_sink.int_set_source"
alias: "int_set_source"
}
}
actions {
preamble {
- id: 16836487
+ id: 17164167
name: "FabricIngress.filtering.deny"
alias: "deny"
}
}
actions {
preamble {
- id: 16818236
+ id: 24158268
name: "FabricIngress.filtering.permit"
alias: "permit"
}
}
actions {
preamble {
- id: 16794911
+ id: 24266015
name: "FabricIngress.filtering.permit_with_internal_vlan"
alias: "permit_with_internal_vlan"
}
@@ -527,7 +527,7 @@
}
actions {
preamble {
- id: 16840921
+ id: 25032921
name: "FabricIngress.filtering.set_forwarding_type"
alias: "set_forwarding_type"
}
@@ -539,7 +539,7 @@
}
actions {
preamble {
- id: 16811012
+ id: 21791748
name: "FabricIngress.forwarding.set_next_id_bridging"
alias: "set_next_id_bridging"
}
@@ -551,7 +551,7 @@
}
actions {
preamble {
- id: 16827758
+ id: 30066030
name: "FabricIngress.forwarding.pop_mpls_and_next"
alias: "pop_mpls_and_next"
}
@@ -563,7 +563,7 @@
}
actions {
preamble {
- id: 16777434
+ id: 19792090
name: "FabricIngress.forwarding.set_next_id_routing_v4"
alias: "set_next_id_routing_v4"
}
@@ -575,14 +575,14 @@
}
actions {
preamble {
- id: 16804187
+ id: 29124955
name: "FabricIngress.forwarding.nop_routing_v4"
alias: "nop_routing_v4"
}
}
actions {
preamble {
- id: 16807382
+ id: 23623126
name: "FabricIngress.acl.set_next_id_acl"
alias: "set_next_id_acl"
}
@@ -594,14 +594,14 @@
}
actions {
preamble {
- id: 16829684
+ id: 23579892
name: "FabricIngress.acl.punt_to_cpu"
alias: "punt_to_cpu"
}
}
actions {
preamble {
- id: 16781601
+ id: 16912673
name: "FabricIngress.acl.set_clone_session_id"
alias: "set_clone_session_id"
}
@@ -613,21 +613,21 @@
}
actions {
preamble {
- id: 16820765
+ id: 23570973
name: "FabricIngress.acl.drop"
alias: "acl.drop"
}
}
actions {
preamble {
- id: 16827694
+ id: 29607214
name: "FabricIngress.acl.nop_acl"
alias: "nop_acl"
}
}
actions {
preamble {
- id: 16790685
+ id: 22099101
name: "FabricIngress.next.set_vlan"
alias: "set_vlan"
}
@@ -639,7 +639,7 @@
}
actions {
preamble {
- id: 16842190
+ id: 24640974
name: "FabricIngress.next.output_xconnect"
alias: "output_xconnect"
}
@@ -651,7 +651,7 @@
}
actions {
preamble {
- id: 16837052
+ id: 30599612
name: "FabricIngress.next.set_next_id_xconnect"
alias: "set_next_id_xconnect"
}
@@ -663,7 +663,7 @@
}
actions {
preamble {
- id: 16815357
+ id: 27301117
name: "FabricIngress.next.output_hashed"
alias: "output_hashed"
}
@@ -675,7 +675,7 @@
}
actions {
preamble {
- id: 16791402
+ id: 20985706
name: "FabricIngress.next.routing_hashed"
alias: "routing_hashed"
}
@@ -697,7 +697,7 @@
}
actions {
preamble {
- id: 16779255
+ id: 27920375
name: "FabricIngress.next.mpls_routing_hashed"
alias: "mpls_routing_hashed"
}
@@ -724,7 +724,7 @@
}
actions {
preamble {
- id: 16779917
+ id: 21629581
name: "FabricIngress.next.set_mcast_group_id"
alias: "set_mcast_group_id"
}
@@ -736,14 +736,15 @@
}
actions {
preamble {
- id: 16800567
+ id: 21257015
name: "NoAction"
alias: "NoAction"
+ annotations: "@noWarn(\"unused\")"
}
}
actions {
preamble {
- id: 16785857
+ id: 20062657
name: "FabricEgress.process_int_main.process_int_source.int_source_dscp"
alias: "int_source_dscp"
}
@@ -770,7 +771,7 @@
}
actions {
preamble {
- id: 16780783
+ id: 29232623
name: "FabricEgress.process_int_main.process_int_transit.init_metadata"
alias: "init_metadata"
}
@@ -782,39 +783,39 @@
}
actions {
preamble {
- id: 16807339
+ id: 30307755
name: "FabricEgress.egress_next.push_vlan"
alias: "push_vlan"
}
}
actions {
preamble {
- id: 16790030
+ id: 17183246
name: "FabricEgress.egress_next.pop_vlan"
alias: "pop_vlan"
}
}
actions {
preamble {
- id: 16787838
+ id: 30812542
name: "FabricEgress.egress_next.drop"
alias: "egress_next.drop"
}
}
action_profiles {
preamble {
- id: 285217164
+ id: 291115404
name: "FabricIngress.next.hashed_selector"
alias: "hashed_selector"
}
- table_ids: 33608588
+ table_ids: 47960972
with_selector: true
size: 1024
max_group_size: 16
}
counters {
preamble {
- id: 302011205
+ id: 314528581
name: "FabricIngress.port_counters_control.egress_port_counter"
alias: "egress_port_counter"
}
@@ -825,7 +826,7 @@
}
counters {
preamble {
- id: 302002771
+ id: 312947283
name: "FabricIngress.port_counters_control.ingress_port_counter"
alias: "ingress_port_counter"
}
@@ -836,139 +837,139 @@
}
direct_counters {
preamble {
- id: 318787614
+ id: 318984222
name: "FabricIngress.process_set_source_sink.counter_set_source"
alias: "counter_set_source"
}
spec {
unit: BOTH
}
- direct_table_id: 33581620
+ direct_table_id: 44526132
}
direct_counters {
preamble {
- id: 318815501
+ id: 326221069
name: "FabricIngress.filtering.ingress_port_vlan_counter"
alias: "ingress_port_vlan_counter"
}
spec {
unit: BOTH
}
- direct_table_id: 33611649
+ direct_table_id: 43310977
}
direct_counters {
preamble {
- id: 318827326
+ id: 335473470
name: "FabricIngress.filtering.fwd_classifier_counter"
alias: "fwd_classifier_counter"
}
spec {
unit: BOTH
}
- direct_table_id: 33596298
+ direct_table_id: 49718154
}
direct_counters {
preamble {
- id: 318770289
+ id: 330959985
name: "FabricIngress.forwarding.bridging_counter"
alias: "bridging_counter"
}
spec {
unit: BOTH
}
- direct_table_id: 33596749
+ direct_table_id: 43623757
}
direct_counters {
preamble {
- id: 318830507
+ id: 318961579
name: "FabricIngress.forwarding.mpls_counter"
alias: "mpls_counter"
}
spec {
unit: BOTH
}
- direct_table_id: 33574274
+ direct_table_id: 37768578
}
direct_counters {
preamble {
- id: 318801025
+ id: 319194241
name: "FabricIngress.acl.acl_counter"
alias: "acl_counter"
}
spec {
unit: BOTH
}
- direct_table_id: 33618978
+ direct_table_id: 44104738
}
direct_counters {
preamble {
- id: 318768144
+ id: 326370320
name: "FabricIngress.next.next_vlan_counter"
alias: "next_vlan_counter"
}
spec {
unit: BOTH
}
- direct_table_id: 33599709
+ direct_table_id: 35696861
}
direct_counters {
preamble {
- id: 318778156
+ id: 321989420
name: "FabricIngress.next.xconnect_counter"
alias: "xconnect_counter"
}
spec {
unit: BOTH
}
- direct_table_id: 33596977
+ direct_table_id: 48735793
}
direct_counters {
preamble {
- id: 318800532
+ id: 322798228
name: "FabricIngress.next.hashed_counter"
alias: "hashed_counter"
}
spec {
unit: BOTH
}
- direct_table_id: 33608588
+ direct_table_id: 47960972
}
direct_counters {
preamble {
- id: 318801752
+ id: 319194968
name: "FabricIngress.next.multicast_counter"
alias: "multicast_counter"
}
spec {
unit: BOTH
}
- direct_table_id: 33606828
+ direct_table_id: 40619180
}
direct_counters {
preamble {
- id: 318800047
+ id: 322470063
name: "FabricEgress.process_int_main.process_int_source.counter_int_source"
alias: "counter_int_source"
}
spec {
unit: BOTH
}
- direct_table_id: 33612258
+ direct_table_id: 44818914
}
direct_counters {
preamble {
- id: 318827144
+ id: 318892680
name: "FabricEgress.egress_next.egress_vlan_counter"
alias: "egress_vlan_counter"
}
spec {
unit: BOTH
}
- direct_table_id: 33599342
+ direct_table_id: 49262446
}
controller_packet_metadata {
preamble {
- id: 67146229
+ id: 81826293
name: "packet_in"
alias: "packet_in"
annotations: "@controller_header(\"packet_in\")"
@@ -986,7 +987,7 @@
}
controller_packet_metadata {
preamble {
- id: 67121543
+ id: 76689799
name: "packet_out"
alias: "packet_out"
annotations: "@controller_header(\"packet_out\")"
@@ -998,8 +999,13 @@
}
metadata {
id: 2
+ name: "do_forwarding"
+ bitwidth: 1
+ }
+ metadata {
+ id: 3
name: "_pad"
- bitwidth: 7
+ bitwidth: 6
}
}
type_info {