Backport fabric-spgw TNA changes to v1model
Allow building fabric.p4 with custom S1U_SGW_PREFIX
Change-Id: I4fcaf3f2b56e6d024e54f8897467c280be73e001
Backport fabric-spgw TNA changes to v1model
This branch ports the SPGW pipeline of fabric-tna back to v1model to
make the tables and actions consistent across the two versions. This
consistency will allow for testing of ONOS apps on both software and
hardware targets, since the only available software target that works
with ONOS requires v1model p4 programs. Changes to the fabric testing
suite (fabric-p4test) will be pushed in parallel.
Change-Id: Iad393b27f08a4fcd29f82e59d181871475ef2b10
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
index c152abf..01c4571 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
@@ -835,7 +835,7 @@
"id" : 0,
"source_info" : {
"filename" : "include/parser.p4",
- "line" : 267,
+ "line" : 268,
"column" : 8,
"source_fragment" : "FabricDeparser"
},
@@ -2387,7 +2387,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 115,
+ "line" : 126,
"column" : 31,
"source_fragment" : "0x8847; ..."
}
@@ -2466,7 +2466,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 114,
+ "line" : 125,
"column" : 31,
"source_fragment" : "0x8100; ..."
}
@@ -3565,7 +3565,7 @@
"id" : 3,
"source_info" : {
"filename" : "fabric.p4",
- "line" : 71,
+ "line" : 69,
"column" : 12,
"source_fragment" : "fabric_metadata.skip_forwarding == false"
},
@@ -3676,7 +3676,7 @@
"id" : 7,
"source_info" : {
"filename" : "fabric.p4",
- "line" : 75,
+ "line" : 73,
"column" : 12,
"source_fragment" : "fabric_metadata.skip_next == false"
},
@@ -3763,7 +3763,7 @@
"id" : 1,
"source_info" : {
"filename" : "fabric.p4",
- "line" : 93,
+ "line" : 91,
"column" : 8,
"source_fragment" : "FabricEgress"
},