Fabric.p4 cherry-picks from onos-2.2
Publish fabric.p4 constants with fabric-api artifact
For consumption by third-party apps who wish to operate directly on
fabric.p4 tables and other entities.
(cherry picked from commit 8f6b5cdabf7828f6f7c017f288aad87c7bd0911a)
Backport fabric-tna dbuf support to v1model
(cherry picked from commit 4d1d67fa3abb4d7517e5836fbb82c899acffa951)
Update SPGW p4 namespace to match fabric-tna
(cherry picked from commit 35e4d196eb61104e7f96c62361a100bb454ee1cf)
Change-Id: I3230a508a601180060e1041d4369a54f519658e1
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
index 1d379f5..dd55cde 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
@@ -697,9 +697,9 @@
}
tables {
preamble {
- id: 33584493
- name: "FabricIngress.spgw_ingress.interface_lookup"
- alias: "interface_lookup"
+ id: 33557250
+ name: "FabricIngress.spgw.interfaces"
+ alias: "interfaces"
}
match_fields {
id: 1
@@ -714,16 +714,21 @@
match_type: EXACT
}
action_refs {
- id: 16797935
+ id: 16810012
}
- const_default_action_id: 16797935
+ action_refs {
+ id: 16783042
+ annotations: "@defaultonly"
+ scope: DEFAULT_ONLY
+ }
+ const_default_action_id: 16783042
size: 128
}
tables {
preamble {
- id: 33586958
- name: "FabricIngress.spgw_ingress.downlink_pdr_lookup"
- alias: "downlink_pdr_lookup"
+ id: 33566601
+ name: "FabricIngress.spgw.downlink_pdrs"
+ alias: "downlink_pdrs"
}
match_fields {
id: 1
@@ -732,16 +737,20 @@
match_type: EXACT
}
action_refs {
- id: 16799934
+ id: 16800614
}
- const_default_action_id: 16799934
+ action_refs {
+ id: 16800567
+ annotations: "@defaultonly"
+ scope: DEFAULT_ONLY
+ }
size: 1024
}
tables {
preamble {
- id: 33587070
- name: "FabricIngress.spgw_ingress.uplink_pdr_lookup"
- alias: "uplink_pdr_lookup"
+ id: 33606410
+ name: "FabricIngress.spgw.uplink_pdrs"
+ alias: "uplink_pdrs"
}
match_fields {
id: 1
@@ -756,16 +765,20 @@
match_type: EXACT
}
action_refs {
- id: 16799934
+ id: 16800614
}
- const_default_action_id: 16799934
+ action_refs {
+ id: 16800567
+ annotations: "@defaultonly"
+ scope: DEFAULT_ONLY
+ }
size: 1024
}
tables {
preamble {
- id: 33613200
- name: "FabricIngress.spgw_ingress.far_lookup"
- alias: "far_lookup"
+ id: 33599560
+ name: "FabricIngress.spgw.fars"
+ alias: "fars"
}
match_fields {
id: 1
@@ -774,12 +787,15 @@
match_type: EXACT
}
action_refs {
- id: 16834935
+ id: 16820307
}
action_refs {
- id: 16787606
+ id: 16814785
}
- const_default_action_id: 16834935
+ action_refs {
+ id: 16814681
+ }
+ const_default_action_id: 16820307
size: 2048
}
tables {
@@ -902,6 +918,13 @@
}
actions {
preamble {
+ id: 16800567
+ name: "NoAction"
+ alias: "NoAction"
+ }
+}
+actions {
+ preamble {
id: 16778827
name: "FabricIngress.process_set_source_sink.int_set_source"
alias: "int_set_source"
@@ -1314,31 +1337,28 @@
}
actions {
preamble {
- id: 16797935
- name: "FabricIngress.spgw_ingress.set_source_iface"
- alias: "set_source_iface"
+ id: 16810012
+ name: "FabricIngress.spgw.load_iface"
+ alias: "load_iface"
}
params {
id: 1
name: "src_iface"
bitwidth: 8
}
- params {
- id: 2
- name: "direction"
- bitwidth: 2
- }
- params {
- id: 3
- name: "skip_spgw"
- bitwidth: 1
+}
+actions {
+ preamble {
+ id: 16783042
+ name: "FabricIngress.spgw.iface_miss"
+ alias: "iface_miss"
}
}
actions {
preamble {
- id: 16799934
- name: "FabricIngress.spgw_ingress.set_pdr_attributes"
- alias: "set_pdr_attributes"
+ id: 16800614
+ name: "FabricIngress.spgw.load_pdr"
+ alias: "load_pdr"
}
params {
id: 1
@@ -1358,9 +1378,9 @@
}
actions {
preamble {
- id: 16834935
- name: "FabricIngress.spgw_ingress.load_normal_far_attributes"
- alias: "load_normal_far_attributes"
+ id: 16820307
+ name: "FabricIngress.spgw.load_normal_far"
+ alias: "load_normal_far"
}
params {
id: 1
@@ -1375,9 +1395,9 @@
}
actions {
preamble {
- id: 16787606
- name: "FabricIngress.spgw_ingress.load_tunnel_far_attributes"
- alias: "load_tunnel_far_attributes"
+ id: 16814785
+ name: "FabricIngress.spgw.load_tunnel_far"
+ alias: "load_tunnel_far"
}
params {
id: 1
@@ -1412,37 +1432,39 @@
}
actions {
preamble {
- id: 16829280
- name: "FabricIngress.spgw_ingress.decap_inner_tcp"
- alias: "decap_inner_tcp"
+ id: 16814681
+ name: "FabricIngress.spgw.load_dbuf_far"
+ alias: "load_dbuf_far"
}
-}
-actions {
- preamble {
- id: 16815878
- name: "FabricIngress.spgw_ingress.decap_inner_udp"
- alias: "decap_inner_udp"
+ params {
+ id: 1
+ name: "drop"
+ bitwidth: 1
}
-}
-actions {
- preamble {
- id: 16801274
- name: "FabricIngress.spgw_ingress.decap_inner_icmp"
- alias: "decap_inner_icmp"
+ params {
+ id: 2
+ name: "notify_cp"
+ bitwidth: 1
}
-}
-actions {
- preamble {
- id: 16830582
- name: "FabricIngress.spgw_ingress.decap_inner_unknown"
- alias: "decap_inner_unknown"
+ params {
+ id: 3
+ name: "tunnel_src_port"
+ bitwidth: 16
}
-}
-actions {
- preamble {
- id: 16800567
- name: "NoAction"
- alias: "NoAction"
+ params {
+ id: 4
+ name: "tunnel_src_addr"
+ bitwidth: 32
+ }
+ params {
+ id: 5
+ name: "tunnel_dst_addr"
+ bitwidth: 32
+ }
+ params {
+ id: 6
+ name: "teid"
+ bitwidth: 32
}
}
actions {
@@ -1616,9 +1638,9 @@
}
counters {
preamble {
- id: 302029884
- name: "FabricIngress.spgw_ingress.pdr_counter"
- alias: "spgw_ingress.pdr_counter"
+ id: 302043952
+ name: "FabricIngress.spgw.pdr_counter"
+ alias: "FabricIngress.spgw.pdr_counter"
}
spec {
unit: BOTH
@@ -1638,9 +1660,9 @@
}
counters {
preamble {
- id: 302012289
- name: "FabricEgress.spgw_egress.pdr_counter"
- alias: "spgw_egress.pdr_counter"
+ id: 302049491
+ name: "FabricEgress.spgw.pdr_counter"
+ alias: "FabricEgress.spgw.pdr_counter"
}
spec {
unit: BOTH