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/basic/src/main/resources/Makefile b/pipelines/basic/src/main/resources/Makefile
index 67b9355..64b3ea2 100644
--- a/pipelines/basic/src/main/resources/Makefile
+++ b/pipelines/basic/src/main/resources/Makefile
@@ -2,18 +2,18 @@
basic: basic.p4
p4c-bm2-ss --arch v1model -o p4c-out/bmv2/basic.json \
- --p4runtime-file p4c-out/bmv2/basic.p4info \
- --p4runtime-format text basic.p4
+ --p4runtime-files p4c-out/bmv2/basic_p4info.txt \
+ basic.p4
int: int.p4
p4c-bm2-ss --arch v1model -o p4c-out/bmv2/int.json "-DTARGET_BMV2" \
- --p4runtime-file p4c-out/bmv2/int.p4info \
- --p4runtime-format text int.p4
+ --p4runtime-files p4c-out/bmv2/int_p4info.txt \
+ int.p4
constants:
onos-gen-p4-constants \
-o $(ONOS_ROOT)/pipelines/basic/src/main/java/org/onosproject/pipelines/basic/BasicConstants.java \
- basic p4c-out/bmv2/basic.p4info
+ basic p4c-out/bmv2/basic_p4info.txt
clean:
rm -rf p4c-out/bmv2/*