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/include/define.p4 b/pipelines/fabric/impl/src/main/resources/include/define.p4
index bfb7b44..8b1fd9d 100644
--- a/pipelines/fabric/impl/src/main/resources/include/define.p4
+++ b/pipelines/fabric/impl/src/main/resources/include/define.p4
@@ -108,17 +108,7 @@
const spgw_interface_t SPGW_IFACE_UNKNOWN = 8w0;
const spgw_interface_t SPGW_IFACE_ACCESS = 8w1;
const spgw_interface_t SPGW_IFACE_CORE = 8w2;
-const direction_t SPGW_DIR_UNKNOWN = 2w0;
-const direction_t SPGW_DIR_UPLINK = 2w1;
-const direction_t SPGW_DIR_DOWNLINK = 2w2;
-
-#ifndef S1U_SGW_PREFIX
-// By default spgw.p4 expects uplink packets with IP dst matching 140.0.0.0/8
-// FIXME: refactor pipeline to remove dependency on this value or allow setting it at runtime
-// (e.g. via parser value sets)
-#define S1U_SGW_PREFIX (8w140++8w0++8w0++8w0)
-#define S1U_SGW_PREFIX_LEN 8
-#endif
+const spgw_interface_t SPGW_IFACE_FROM_DBUF = 8w3;
const bit<16> ETHERTYPE_QINQ = 0x88A8;
const bit<16> ETHERTYPE_QINQ_NON_STD = 0x9100;