Update SPGW p4 namespace to match fabric-tna
Change-Id: If97062655590150b06f8375080db2e12c9ef8cd7
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
index c96bbda..13a2236 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
@@ -365,9 +365,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
@@ -382,16 +382,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
@@ -400,16 +405,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
@@ -424,16 +433,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
@@ -442,15 +455,15 @@
match_type: EXACT
}
action_refs {
- id: 16834935
+ id: 16820307
}
action_refs {
- id: 16787606
+ id: 16814785
}
action_refs {
- id: 16801146
+ id: 16814681
}
- const_default_action_id: 16834935
+ const_default_action_id: 16820307
size: 2048
}
tables {
@@ -492,6 +505,13 @@
}
actions {
preamble {
+ id: 16800567
+ name: "NoAction"
+ alias: "NoAction"
+ }
+}
+actions {
+ preamble {
id: 16836487
name: "FabricIngress.filtering.deny"
alias: "deny"
@@ -727,31 +747,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
@@ -771,9 +788,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
@@ -788,9 +805,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
@@ -825,9 +842,9 @@
}
actions {
preamble {
- id: 16801146
- name: "FabricIngress.spgw_ingress.load_dbuf_far_attributes"
- alias: "load_dbuf_far_attributes"
+ id: 16814681
+ name: "FabricIngress.spgw.load_dbuf_far"
+ alias: "load_dbuf_far"
}
params {
id: 1
@@ -902,9 +919,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
@@ -913,9 +930,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