From 38addf2e24840a10fcee88308fe9a41ee0b4c559 Mon Sep 17 00:00:00 2001
From: Bob Lantz <rlantz@cs.stanford.edu>
Date: Thu, 10 Jul 2014 01:28:40 -0700
Subject: [PATCH] Add alias + switch: { 'ovs': OVSSwitch, 'lxbr': LinuxBridge }

---
 bin/mn             | 10 +++++++---
 mininet/nodelib.py |  5 ++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/bin/mn b/bin/mn
index 71c76ec..567e213 100755
--- a/bin/mn
+++ b/bin/mn
@@ -25,8 +25,9 @@ from mininet.cli import CLI
 from mininet.log import lg, LEVELS, info, debug, error
 from mininet.net import Mininet, MininetWithControlNet, VERSION
 from mininet.node import ( Host, CPULimitedHost, Controller, OVSController,
-                           NOX, RemoteController, UserSwitch, OVSKernelSwitch,
+                           NOX, RemoteController, UserSwitch, OVSSwitch,
                            OVSLegacyKernelSwitch, IVSSwitch )
+from mininet.nodelib import LinuxBridge
 from mininet.link import Link, TCLink
 from mininet.topo import SingleSwitchTopo, LinearTopo, SingleSwitchReversedTopo
 from mininet.topolib import TreeTopo
@@ -44,9 +45,12 @@ TOPOS = { 'minimal': lambda: SingleSwitchTopo( k=2 ),
 
 SWITCHDEF = 'ovsk'
 SWITCHES = { 'user': UserSwitch,
-             'ovsk': OVSKernelSwitch,
+             'ovs':  OVSSwitch,
+             # Keep ovsk for compatibility with 2.0
+             'ovsk': OVSSwitch,
              'ovsl': OVSLegacyKernelSwitch,
-             'ivs': IVSSwitch }
+             'ivs': IVSSwitch,
+             'lxbr': LinuxBridge }
 
 HOSTDEF = 'proc'
 HOSTS = { 'proc': Host,
diff --git a/mininet/nodelib.py b/mininet/nodelib.py
index 6c27f28..df6154c 100644
--- a/mininet/nodelib.py
+++ b/mininet/nodelib.py
@@ -1,9 +1,7 @@
 """
-Package: nodelib
-
 Node Library for Mininet
 
-This contains additional node types which you may find to be useful
+This contains additional Node types which you may find to be useful
 """
 
 from mininet.net import Mininet
@@ -11,6 +9,7 @@ from mininet.topo import Topo
 from mininet.node import Switch
 from mininet.log import setLogLevel, info
 
+
 class LinuxBridge( Switch ):
     "Linux Bridge (with optional spanning tree)"