WIP Add comments to P4 program

Author: ccascone

Makefile

@@ -90,6 +90,7 @@ p4-build:
 p4-test:
 	@cd ptf && ./run_tests
 
+# Create container once, use it many times to preserve mvn repo cache.
 _create_mvn_container:
 	@if ! docker container ls -a --format '{{.Names}}' | grep -q ${app_build_container_name} ; then \
 		docker create -v ${curr_dir}/app:/mvn-src -w /mvn-src --name ${app_build_container_name} ${MAVEN_IMG} mvn clean package; \

app/src/main/java/org/p4/p4d2/tutorial/Ipv6RoutingComponent.java

@@ -190,7 +190,7 @@ private void setUpMyStationTable(DeviceId deviceId) {
         // Modify P4Runtime entity names to match content of P4Info file (look
         // for the fully qualified name of tables, match fields, and actions.
         // ---- START SOLUTION ----
-        final String tableId = "IngressPipeImpl.l2_my_station";
+        final String tableId = "IngressPipeImpl.my_station_table";
 
         final PiCriterion match = PiCriterion.builder()
                 .matchExact(
@@ -235,10 +235,10 @@ private GroupDescription createNextHopGroup(int groupId,
         // Modify P4Runtime entity names to match content of P4Info file (look
         // for the fully qualified name of tables, match fields, and actions.
         // ---- START SOLUTION ----
-        final String tableId = "IngressPipeImpl.l3_table";
+        final String tableId = "IngressPipeImpl.routing_v6_table";
         for (MacAddress nextHopMac : nextHopMacs) {
             final PiAction action = PiAction.builder()
-                    .withId(PiActionId.of("IngressPipeImpl.set_l2_next_hop"))
+                    .withId(PiActionId.of("IngressPipeImpl.set_next_hop"))
                     .withParameter(new PiActionParam(
                             // Action param name.
                             PiActionParamId.of("dmac"),
@@ -270,7 +270,7 @@ private FlowRule createRoutingRule(DeviceId deviceId, Ip6Prefix ip6Prefix,
         // Modify P4Runtime entity names to match content of P4Info file (look
         // for the fully qualified name of tables, match fields, and actions.
         // ---- START SOLUTION ----
-        final String tableId = "IngressPipeImpl.l3_table";
+        final String tableId = "IngressPipeImpl.routing_v6_table";
         final PiCriterion match = PiCriterion.builder()
                 .matchLpm(
                         PiMatchFieldId.of("hdr.ipv6.dst_addr"),

app/src/main/java/org/p4/p4d2/tutorial/pipeconf/InterpreterImpl.java

@@ -75,9 +75,8 @@ public class InterpreterImpl extends AbstractHandlerBehaviour
                     .put(Criterion.Type.ETH_SRC, "hdr.ethernet.src_addr")
                     .put(Criterion.Type.ETH_TYPE, "hdr.ethernet.ether_type")
                     .put(Criterion.Type.IPV6_DST, "hdr.ipv6.dst_addr")
-                    .put(Criterion.Type.IP_PROTO, "local_metadata.ip_proto")
-                    .put(Criterion.Type.ICMPV4_TYPE, "local_metadata.icmp_type")
-                    .put(Criterion.Type.ICMPV6_TYPE, "local_metadata.icmp_type")
+                    .put(Criterion.Type.IP_PROTO, "hdr.ipv6.next_hdr")
+                    .put(Criterion.Type.ICMPV6_TYPE, "hdr.icmpv6.type")
                     .build();
 
     /**