commit 15693a23e86e15d93f931ff2453b00f4b713e8e9
author Carmelo Cascone <carmelo@opennetworking.org> Wed Dec 12 19:06:57 2018 -0800
committer Carmelo Cascone <carmelo@opennetworking.org> Wed Dec 12 22:19:38 2018 -0800
tree a0410b23dfa3fe7f9b39b8d432102b5e0e9a8d4c
parent 4277d4f553d902bf23144232bf71214959a5e3f7

Alias to quickly start Mininet with BMv2 in cell network machines

Also do not generate bmv-thrift netcfg in bmv2.py

Change-Id: Iebb84ab1b6f007ad42366ec676cce6b08e5fc27c

tools/dev/bash_profile

diff --git a/tools/dev/bash_profile b/tools/dev/bash_profile
index 9f363a9..885717c 100644
--- a/tools/dev/bash_profile
+++ b/tools/dev/bash_profile
@@ -342,3 +342,6 @@
 
 # Load UK topo GEO data
 alias uktopo='onos-netcfg $OCI $ONOS_ROOT/tools/test/topos/uk-cfg.json'
+
+# Mininet command that uses BMv2 instead of OVS
+alias mn-p4='sudo -E mn --custom $BMV2_MN_PY --switch onosbmv2 --controller remote,ip=$OC1'

tools/dev/mininet/bmv2.py

diff --git a/tools/dev/mininet/bmv2.py b/tools/dev/mininet/bmv2.py
index eafb482..5df07b6 100644
--- a/tools/dev/mininet/bmv2.py
+++ b/tools/dev/mininet/bmv2.py
@@ -1,14 +1,14 @@
-import json
 import multiprocessing
 import os
+
+import json
 import random
 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
 
@@ -148,10 +148,10 @@
                     "deviceId": BMV2_DEFAULT_DEVICE_ID,
                     "deviceKeyId": "p4runtime:%s" % self.onosDeviceId
                 },
-                "bmv2-thrift": {
-                    "ip": srcIP,
-                    "port": self.thriftPort
-                }
+                # "bmv2-thrift": {
+                #     "ip": srcIP,
+                #     "port": self.thriftPort
+                # }
             },
             "piPipeconf": {
                 "piPipeconfId": self.pipeconfId