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-bng/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json
index 5e458c2..a44e179 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json
@@ -1435,7 +1435,7 @@
],
"source_info" : {
"filename" : "include/control/../header.p4",
- "line" : 163,
+ "line" : 161,
"column" : 36,
"source_fragment" : "2w0x0; ..."
}
@@ -1476,7 +1476,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 128,
+ "line" : 118,
"column" : 31,
"source_fragment" : "0x0800; ..."
}
@@ -1541,7 +1541,7 @@
],
"source_info" : {
"filename" : "include/control/../header.p4",
- "line" : 165,
+ "line" : 163,
"column" : 39,
"source_fragment" : "2w0x2;; ..."
}
@@ -1605,7 +1605,7 @@
],
"source_info" : {
"filename" : "include/control/../header.p4",
- "line" : 165,
+ "line" : 163,
"column" : 39,
"source_fragment" : "2w0x2;; ..."
}
@@ -2963,7 +2963,7 @@
],
"source_info" : {
"filename" : "include/control/../header.p4",
- "line" : 164,
+ "line" : 162,
"column" : 37,
"source_fragment" : "2w0x1; ..."
}
@@ -3200,7 +3200,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 132,
+ "line" : 122,
"column" : 33,
"source_fragment" : "0x8864; ..."
}
@@ -3371,7 +3371,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 134,
+ "line" : 124,
"column" : 35,
"source_fragment" : "0x0021; ..."
}
@@ -3529,7 +3529,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 126,
+ "line" : 116,
"column" : 31,
"source_fragment" : "0x8847; ..."
}
@@ -3608,7 +3608,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 125,
+ "line" : 115,
"column" : 31,
"source_fragment" : "0x8100; ..."
}
@@ -3706,7 +3706,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 125,
+ "line" : 115,
"column" : 31,
"source_fragment" : "0x8100; ..."
}
@@ -3823,7 +3823,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 125,
+ "line" : 115,
"column" : 31,
"source_fragment" : "0x8100; ..."
}
@@ -3842,7 +3842,7 @@
],
"source_info" : {
"filename" : "include/control/../define.p4",
- "line" : 125,
+ "line" : 115,
"column" : 31,
"source_fragment" : "0x8100; ..."
}