commit 569d4ad93f96201722ca190444695d3e6417a393
author Carmelo Cascone <carmelo@onlab.us> Mon Jul 10 16:09:00 2017 -0400
committer Carmelo Cascone <carmelo@onlab.us> Mon Jul 10 16:24:53 2017 -0400
tree b2685c0d140c9d36de2c29c6624eae1069aab15d
parent d2a9dd3a6bd67a25fe257ff4aa9d23dc88ff9152

Bumped version of P4Runtime and P4 tools for dev VM

+fixed protobuf version according to p4c documentation.

Change-Id: I16471b70b9b2ebc0e0a30c733f1e6ce47d40e30b

tools/dev/mininet/bmv2.py

diff --git a/tools/dev/mininet/bmv2.py b/tools/dev/mininet/bmv2.py
index 64be413..e1d51a5 100644
--- a/tools/dev/mininet/bmv2.py
+++ b/tools/dev/mininet/bmv2.py
@@ -13,7 +13,7 @@
 
 BMV2_TARGET = 'simple_switch_grpc'
 ONOS_ROOT = os.environ["ONOS_ROOT"]
-INIT_BMV2_JSON = '%s/tools/test/p4src/p4-16/p4c-out/empty.json' % ONOS_ROOT
+CPU_PORT = 255
 
 
 class ONOSBmv2Switch(Switch):
@@ -118,12 +118,11 @@
         if self.debugger:
             args.append('--debugger')
         args.append('-L%s' % self.loglevel)
-
-        args.append(INIT_BMV2_JSON)
+        args.append('--no-p4')
 
         # gRPC target-specific options.
         args.append('--')
-        args.append('--enable-swap')
+        args.append('--cpu-port %d' % CPU_PORT)
         args.append('--grpc-server-addr 0.0.0.0:%d' % self.grpcPort)
 
         bmv2cmd = " ".join(args)