commit 35e4d196eb61104e7f96c62361a100bb454ee1cf
author Robert MacDavid <robert@opennetworking.org> Tue Oct 20 13:36:12 2020 -0400
committer Robert MacDavid <robert@opennetworking.org> Tue Oct 20 18:21:44 2020 -0400
tree 68f3b8e7314b35b529d9498bee96dab1cee2b858
parent 84e2ecffb63420ac8b8221bbe9cb353c0176a5cd

Update SPGW p4 namespace to match fabric-tna

Change-Id: If97062655590150b06f8375080db2e12c9ef8cd7

pipelines/fabric/impl/src/main/resources/fabric.p4

diff --git a/pipelines/fabric/impl/src/main/resources/fabric.p4 b/pipelines/fabric/impl/src/main/resources/fabric.p4
index 9f6b27d..ad3857d 100644
--- a/pipelines/fabric/impl/src/main/resources/fabric.p4
+++ b/pipelines/fabric/impl/src/main/resources/fabric.p4
@@ -56,14 +56,14 @@
     PortCountersControl() port_counters_control;
 #endif // WITH_PORT_COUNTER
 #ifdef WITH_SPGW
-    SpgwIngress() spgw_ingress;
+    SpgwIngress() spgw;
 #endif // WITH_SPGW
 
     apply {
         _PRE_INGRESS
         pkt_io_ingress.apply(hdr, fabric_metadata, standard_metadata);
 #ifdef WITH_SPGW
-        spgw_ingress.apply(hdr, fabric_metadata, standard_metadata);
+        spgw.apply(hdr, fabric_metadata, standard_metadata);
 #endif // WITH_SPGW
         filtering.apply(hdr, fabric_metadata, standard_metadata);
         if (fabric_metadata.skip_forwarding == _FALSE) {
@@ -95,7 +95,7 @@
     PacketIoEgress() pkt_io_egress;
     EgressNextControl() egress_next;
 #ifdef WITH_SPGW
-    SpgwEgress() spgw_egress;
+    SpgwEgress() spgw;
 #endif // WITH_SPGW
 
     apply {
@@ -103,7 +103,7 @@
         pkt_io_egress.apply(hdr, fabric_metadata, standard_metadata);
         egress_next.apply(hdr, fabric_metadata, standard_metadata);
 #ifdef WITH_SPGW
-        spgw_egress.apply(hdr, fabric_metadata);
+        spgw.apply(hdr, fabric_metadata);
 #endif // WITH_SPGW
 #ifdef WITH_BNG
         bng_egress.apply(hdr, fabric_metadata, standard_metadata);