commit a1506970376349a82b5f7063422ee37984eb9d4d
author Carmelo Cascone <carmelo@opennetworking.org> Tue Sep 04 14:25:49 2018 -0700
committer Carmelo Cascone <carmelo@opennetworking.org> Wed Sep 05 05:17:11 2018 +0000
tree 4ce728d03912bfee73c0b61603955defd872f8ed
parent 2e4ca98f2a615950207e821c98a4cf1d6cae2482

Bump version of BMv2 and disable nanomsg

To match what used in Stratum

Change-Id: Ic4b87bcad6c3da36030fa01ee4135f60c05fcd78

tools/dev/mininet/bmv2.py

diff --git a/tools/dev/mininet/bmv2.py b/tools/dev/mininet/bmv2.py
index 0c0fc15..296d672 100644
--- a/tools/dev/mininet/bmv2.py
+++ b/tools/dev/mininet/bmv2.py
@@ -5,9 +5,10 @@
 import re
 import socket
 import threading
-import time
 import urllib2
 from contextlib import closing
+
+import time
 from mininet.log import info, warn
 from mininet.node import Switch, Host
 
@@ -82,7 +83,7 @@
     mininet_exception = multiprocessing.Value('i', 0)
 
     def __init__(self, name, json=None, debugger=False, loglevel="warn",
-                 elogger=False, grpcport=None, cpuport=255,
+                 elogger=False, grpcport=None, cpuport=255, notifications=False,
                  thriftport=None, netcfg=True, dryrun=False, pipeconf="",
                  pktdump=False, valgrind=False, gnmi=False,
                  portcfg=True, onosdevid=None, **kwargs):
@@ -92,6 +93,7 @@
         self.cpuPort = cpuport
         self.json = json
         self.debugger = parseBoolean(debugger)
+        self.notifications = parseBoolean(notifications)
         self.loglevel = loglevel
         # Important: Mininet removes all /tmp/*.log files in case of exceptions.
         # We want to be able to see the bmv2 log if anything goes wrong, hence
@@ -266,8 +268,9 @@
             if not intf.IP():
                 args.append('-i %d@%s' % (port, intf.name))
         args.append('--thrift-port %s' % self.thriftPort)
-        ntfaddr = 'ipc:///tmp/bmv2-%s-notifications.ipc' % self.name
-        args.append('--notifications-addr %s' % ntfaddr)
+        if self.notifications:
+            ntfaddr = 'ipc:///tmp/bmv2-%s-notifications.ipc' % self.name
+            args.append('--notifications-addr %s' % ntfaddr)
         if self.elogger:
             nanologaddr = 'ipc:///tmp/bmv2-%s-nanolog.ipc' % self.name
             args.append('--nanolog %s' % nanologaddr)

tools/dev/p4vm/install-p4-tools.sh

diff --git a/tools/dev/p4vm/install-p4-tools.sh b/tools/dev/p4vm/install-p4-tools.sh
index 015f42d..4f9582a 100755
--- a/tools/dev/p4vm/install-p4-tools.sh
+++ b/tools/dev/p4vm/install-p4-tools.sh
@@ -21,7 +21,7 @@
 BUILD_DIR=~/p4tools
 # in case BMV2_COMMIT value is updated, the same variable in
 # protocols/bmv2/thrift-api/BUCK file should also be updated
-BMV2_COMMIT="a3f0ebe4c0f10a656f8aa1ad68cb20402a62b0ee"
+BMV2_COMMIT="13370aaf9329fcb369a3ea3989722eb5f61c07f3"
 PI_COMMIT="7e94b025bac6db63bc8534e5dd21a008984e38bc"
 P4C_COMMIT="2d089af757212a057c6690998861ef67439305f4"
 PROTOBUF_COMMIT="tags/v3.2.0"
@@ -293,7 +293,7 @@
 
     ./autogen.sh
     if [ "${DEBUG_FLAGS}" = true ] ; then
-        ./configure --with-pi --enable-debugger --disable-elogger "CXXFLAGS=-O0 -g"
+        ./configure --with-pi --disable-elogger --without-nanomsg "CXXFLAGS=-O0 -g"
     else
         ./configure --with-pi --disable-logging-macros --disable-elogger --without-nanomsg
     fi