commit 8bcd5863ffc61cbfe682d34bea36bd6d7104578c
author Andrea Campanella <andrea@opennetworking.org> Mon Dec 11 11:34:45 2017 +0100
committer Carmelo Cascone <carmelo@opennetworking.org> Tue Dec 12 14:03:36 2017 -0800
tree 985e294396172fdb82dddb0c4536a705bebd7eaf
parent 61881df1ee24c627192b522f779cb075277a2dd7

[ONOS-7311] and [ONOS-7197] Update ONOS to support most recent version of BMv2 and PI

Change-Id: Ie69cfe1946f3c9241dc7f59a64bd40005a063931

apps/p4runtime-test/BUCK

diff --git a/apps/p4runtime-test/BUCK b/apps/p4runtime-test/BUCK
index 9ad0926..521f7c2 100644
--- a/apps/p4runtime-test/BUCK
+++ b/apps/p4runtime-test/BUCK
@@ -1,5 +1,5 @@
 GRPC_VER = '1.3.0'
-PROTOBUF_VER = '3.0.2'
+PROTOBUF_VER = '3.2.0'
 
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',

apps/p4runtime-test/src/test/java/org/onosproject/p4runtime/test/P4RuntimeTest.java

diff --git a/apps/p4runtime-test/src/test/java/org/onosproject/p4runtime/test/P4RuntimeTest.java b/apps/p4runtime-test/src/test/java/org/onosproject/p4runtime/test/P4RuntimeTest.java
index bfef373..319afec 100644
--- a/apps/p4runtime-test/src/test/java/org/onosproject/p4runtime/test/P4RuntimeTest.java
+++ b/apps/p4runtime-test/src/test/java/org/onosproject/p4runtime/test/P4RuntimeTest.java
@@ -25,7 +25,6 @@
 import org.onlab.util.ImmutableByteSequence;
 import org.onosproject.grpc.ctl.GrpcControllerImpl;
 import org.onosproject.net.DeviceId;
-import org.onosproject.net.pi.model.PiActionGroupType;
 import org.onosproject.net.pi.model.PiActionId;
 import org.onosproject.net.pi.model.PiActionParamId;
 import org.onosproject.net.pi.model.PiActionProfileId;
@@ -64,7 +63,6 @@
 import static org.onosproject.net.pi.model.PiPacketOperationType.PACKET_OUT;
 import static org.onosproject.net.pi.model.PiPipeconf.ExtensionType.BMV2_JSON;
 import static org.slf4j.LoggerFactory.getLogger;
-import static p4.P4RuntimeOuterClass.ActionProfileGroup.Type.SELECT;
 import static p4.P4RuntimeOuterClass.Update.Type.INSERT;
 
 /**
@@ -170,7 +168,6 @@
         P4RuntimeOuterClass.ActionProfileGroup groupMsg = P4RuntimeOuterClass.ActionProfileGroup.newBuilder()
                 .setActionProfileId(actionProfileId)
                 .setGroupId(1)
-                .setType(SELECT)
                 .addMembers(P4RuntimeOuterClass.ActionProfileGroup.Member.newBuilder()
                                     .setMemberId(1)
                                     .setWeight(1)
@@ -269,7 +266,6 @@
             members.add(member);
         }
         PiActionGroup actionGroup = PiActionGroup.builder()
-                .withType(PiActionGroupType.SELECT)
                 .withActionProfileId(actionProfileId)
                 .withId(groupId)
                 .addMembers(members)