Add default VLAN 4094 tag to all untagged traffic in fabric.p4
Also fix nop action in ingres_port_vlan table not invoking direct
counter.
This allows processing LLDP packets before any SR-related flow rule is
pushed
Change-Id: Ic6c33ff0c74e643d9e7c853e029bff924ba6f2ac
(cherry picked from commit 0433a9d002c6a9533ffd55de709aba5a6ca26f04)
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt
index 0768913..2787013 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt
@@ -29,13 +29,12 @@
id: 16793253
}
action_refs {
- id: 16819938
- annotations: "@defaultonly()"
- }
- action_refs {
id: 16798734
}
- const_default_action_id: 16819938
+ action_refs {
+ id: 16833700
+ }
+ const_default_action_id: 16835546
direct_resource_ids: 318815501
size: 1024
idle_timeout_behavior: NO_TIMEOUT
@@ -390,16 +389,16 @@
}
actions {
preamble {
- id: 16819938
- name: "nop"
- alias: "nop"
+ id: 16800567
+ name: "NoAction"
+ alias: "NoAction"
}
}
actions {
preamble {
- id: 16800567
- name: "NoAction"
- alias: "NoAction"
+ id: 16819938
+ name: "nop"
+ alias: "nop"
}
}
actions {
@@ -435,6 +434,13 @@
}
actions {
preamble {
+ id: 16833700
+ name: "FabricIngress.filtering.nop_ingress_port_vlan"
+ alias: "nop_ingress_port_vlan"
+ }
+}
+actions {
+ preamble {
id: 16840921
name: "FabricIngress.filtering.set_forwarding_type"
alias: "set_forwarding_type"