commit 76e6386d41c714f30ef55b842a8819d41fea34b6
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:19 2018 +0000
tree 9286f249429edf0de7967b60bae4f54e536f882b
parent 4f32fe275225d3c8670f8c19580fb75a67068ea7

Bump version of BMv2 and disable nanomsg

To match what used in Stratum

Change-Id: Ic4b87bcad6c3da36030fa01ee4135f60c05fcd78
(cherry picked from commit 1a16f00d8ddfb47c6423e5bc70f5d362230debb7)

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)