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/p4c-out/fabric-spgw/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
index a0fe167..c76efb0 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
@@ -1,3 +1,6 @@
+pkg_info {
+ arch: "v1model"
+}
tables {
preamble {
id: 33582731
@@ -15,7 +18,8 @@
}
action_refs {
id: 16819938
- annotations: "@defaultonly()"
+ annotations: "@defaultonly"
+ scope: DEFAULT_ONLY
}
const_default_action_id: 16819938
direct_resource_ids: 318781522
@@ -130,7 +134,8 @@
}
action_refs {
id: 16819938
- annotations: "@defaultonly()"
+ annotations: "@defaultonly"
+ scope: DEFAULT_ONLY
}
const_default_action_id: 16819938
direct_resource_ids: 318770289
@@ -153,7 +158,8 @@
}
action_refs {
id: 16819938
- annotations: "@defaultonly()"
+ annotations: "@defaultonly"
+ scope: DEFAULT_ONLY
}
const_default_action_id: 16819938
direct_resource_ids: 318830507
@@ -179,7 +185,8 @@
}
action_refs {
id: 16819938
- annotations: "@defaultonly()"
+ annotations: "@defaultonly"
+ scope: DEFAULT_ONLY
}
const_default_action_id: 16819938
direct_resource_ids: 318811107
@@ -299,7 +306,8 @@
}
action_refs {
id: 16819938
- annotations: "@defaultonly()"
+ annotations: "@defaultonly"
+ scope: DEFAULT_ONLY
}
const_default_action_id: 16819938
direct_resource_ids: 318768144
@@ -331,7 +339,8 @@
}
action_refs {
id: 16819938
- annotations: "@defaultonly()"
+ annotations: "@defaultonly"
+ scope: DEFAULT_ONLY
}
const_default_action_id: 16819938
direct_resource_ids: 318778156
@@ -360,7 +369,8 @@
}
action_refs {
id: 16819938
- annotations: "@defaultonly()"
+ annotations: "@defaultonly"
+ scope: DEFAULT_ONLY
}
const_default_action_id: 16819938
implementation_id: 285217164
@@ -384,7 +394,8 @@
}
action_refs {
id: 16819938
- annotations: "@defaultonly()"
+ annotations: "@defaultonly"
+ scope: DEFAULT_ONLY
}
const_default_action_id: 16819938
direct_resource_ids: 318801752
@@ -413,7 +424,8 @@
}
action_refs {
id: 16819938
- annotations: "@defaultonly()"
+ annotations: "@defaultonly"
+ scope: DEFAULT_ONLY
}
const_default_action_id: 16819938
direct_resource_ids: 318827144
@@ -853,6 +865,7 @@
preamble {
id: 67146229
name: "packet_in"
+ alias: "packet_in"
annotations: "@controller_header(\"packet_in\")"
}
metadata {
@@ -870,6 +883,7 @@
preamble {
id: 67121543
name: "packet_out"
+ alias: "packet_out"
annotations: "@controller_header(\"packet_out\")"
}
metadata {