Fixes to fabric.p4 pipeline
- Fix ethernet matching fields in ACL (dst and src were inverted)
- When doing punt_to_cpu after setting a multicast group clear the mcast_grp metadata field
Change-Id: I456566929b118188a1b2a40ff3f4de4c6c63d5bb
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
index a3e31ff..cb56bf0 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
@@ -1362,7 +1362,7 @@
"id" : 0,
"source_info" : {
"filename" : "include/parser.p4",
- "line" : 265,
+ "line" : 269,
"column" : 8,
"source_fragment" : "FabricDeparser"
},
@@ -12295,13 +12295,13 @@
},
{
"match_type" : "ternary",
- "name" : "eth_src",
+ "name" : "eth_dst",
"target" : ["ethernet", "dst_addr"],
"mask" : null
},
{
"match_type" : "ternary",
- "name" : "eth_dst",
+ "name" : "eth_src",
"target" : ["ethernet", "src_addr"],
"mask" : null
},
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
index a41f4f9..e99b94e 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
@@ -252,13 +252,13 @@
}
match_fields {
id: 5
- name: "eth_src"
+ name: "eth_dst"
bitwidth: 48
match_type: TERNARY
}
match_fields {
id: 6
- name: "eth_dst"
+ name: "eth_src"
bitwidth: 48
match_type: TERNARY
}