Update install-p4-tools.sh to use P4Runtime v1.0
Includes also various improvements to the p4vm scripts, such as:
- Choose to build VM with Ubuntu 16.04 or 18.04 (experimental)
- Allow users to specify version of protobuf and grpc to use
- Avoid building protobuf and grpc if already installed in the system
- Install Bazel 0.22
Also:
- Remove check for invalid group member weights (now PI always returns
members with weight 1)
- Re-compiled all P4 programs and fixed missing padding in controller
packet headers
Change-Id: I0e672fcebbaba63354c749f0c774af251f3cbc6c
diff --git a/pipelines/fabric/src/main/resources/bmv2-compile.sh b/pipelines/fabric/src/main/resources/bmv2-compile.sh
index a249aa0..d9ea018 100755
--- a/pipelines/fabric/src/main/resources/bmv2-compile.sh
+++ b/pipelines/fabric/src/main/resources/bmv2-compile.sh
@@ -18,8 +18,7 @@
(set -x; p4c-bm2-ss --arch v1model \
-o ${OUT_DIR}/bmv2.json \
${BMV2_PP_FLAGS} ${OTHER_PP_FLAGS} \
- --p4runtime-file ${OUT_DIR}/p4info.txt \
- --p4runtime-format text \
+ --p4runtime-files ${OUT_DIR}/p4info.txt \
fabric.p4)
(set -x; p4c-graphs ${BMV2_PP_FLAGS} ${OTHER_PP_FLAGS} --graphs-dir ${OUT_DIR}/graphs fabric.p4)
for f in ${OUT_DIR}/graphs/*.dot; do