Fixed ingress timestamp issue in INT
Change-Id: Ib564e0270551a6d117866af8ef501f7ad24875d0
diff --git a/pipelines/fabric-pro/src/main/resources/Makefile b/pipelines/fabric-pro/src/main/resources/Makefile
index 04dfa2c..76323c2 100644
--- a/pipelines/fabric-pro/src/main/resources/Makefile
+++ b/pipelines/fabric-pro/src/main/resources/Makefile
@@ -33,17 +33,39 @@
--p4runtime-file p4c-out/tofino/fabric-spgw/montara/fabric.p4info \
--p4runtime-format text main.p4
-fabric-spgw-int-tofino:
+fabric-spgw-int-tofino: fabric-spgw-int-1-tofino fabric-spgw-int-2-tofino
+
+fabric-spgw-int-1-tofino:
p4c -x p4-16 -b tofino-v1model-barefoot \
-I $(P4_SRC_DIR) \
- $(MAVERICKS_OPTIONS) -DWITH_SPGW -DWITH_INT_TRANSIT -o p4c-out/tofino/fabric-spgw-int/mavericks \
- --p4runtime-file p4c-out/tofino/fabric-spgw-int/mavericks/fabric.p4info \
+ $(MAVERICKS_OPTIONS) -DWITH_SPGW -DWITH_INT_TRANSIT -DINT_SWITCH_ID=100 -o p4c-out/tofino/fabric-spgw-int-1/mavericks \
+ --p4runtime-file p4c-out/tofino/fabric-spgw-int-1/mavericks/fabric.p4info \
--p4runtime-format text main.p4
p4c -x p4-16 -b tofino-v1model-barefoot \
-I $(P4_SRC_DIR) \
- $(MONTARA_OPTIONS) -DWITH_SPGW -DWITH_INT_TRANSIT -o p4c-out/tofino/fabric-spgw-int/montara \
- --p4runtime-file p4c-out/tofino/fabric-spgw-int/montara/fabric.p4info \
+ $(MONTARA_OPTIONS) -DWITH_SPGW -DWITH_INT_TRANSIT -DINT_SWITCH_ID=100 -o p4c-out/tofino/fabric-spgw-int-1/montara \
+ --p4runtime-file p4c-out/tofino/fabric-spgw-int-1/montara/fabric.p4info \
--p4runtime-format text main.p4
+ sed -i 's/FabricIngress\.//g' p4c-out/tofino/fabric-spgw-int-1/*/*.p4info
+ sed -i 's/FabricEgress\.//g' p4c-out/tofino/fabric-spgw-int-1/*/*.p4info
+ sed -i 's/FabricIngress\.//g' p4c-out/tofino/fabric-spgw-int-1/*/context.json
+ sed -i 's/FabricEgress\.//g' p4c-out/tofino/fabric-spgw-int-1/*/context.json
+
+fabric-spgw-int-2-tofino:
+ p4c -x p4-16 -b tofino-v1model-barefoot \
+ -I $(P4_SRC_DIR) \
+ $(MAVERICKS_OPTIONS) -DWITH_SPGW -DWITH_INT_TRANSIT -DINT_SWITCH_ID=200 -o p4c-out/tofino/fabric-spgw-int-2/mavericks \
+ --p4runtime-file p4c-out/tofino/fabric-spgw-int-2/mavericks/fabric.p4info \
+ --p4runtime-format text main.p4
+ p4c -x p4-16 -b tofino-v1model-barefoot \
+ -I $(P4_SRC_DIR) \
+ $(MONTARA_OPTIONS) -DWITH_SPGW -DWITH_INT_TRANSIT -DINT_SWITCH_ID=200 -o p4c-out/tofino/fabric-spgw-int-2/montara \
+ --p4runtime-file p4c-out/tofino/fabric-spgw-int-2/montara/fabric.p4info \
+ --p4runtime-format text main.p4
+ sed -i 's/FabricIngress\.//g' p4c-out/tofino/fabric-spgw-int-2/*/*.p4info
+ sed -i 's/FabricEgress\.//g' p4c-out/tofino/fabric-spgw-int-2/*/*.p4info
+ sed -i 's/FabricIngress\.//g' p4c-out/tofino/fabric-spgw-int-2/*/context.json
+ sed -i 's/FabricEgress\.//g' p4c-out/tofino/fabric-spgw-int-2/*/context.json
fabric-int-tofino:
p4c -x p4-16 -b tofino-v1model-barefoot \