projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #65 from mpeuster/master
[osm/vim-emu.git]
/
src
/
emuvim
/
test
/
base.py
diff --git
a/src/emuvim/test/base.py
b/src/emuvim/test/base.py
index
f652259
..
d5329a9
100644
(file)
--- a/
src/emuvim/test/base.py
+++ b/
src/emuvim/test/base.py
@@
-8,6
+8,7
@@
import subprocess
import docker
from emuvim.dcemulator.net import DCNetwork
from mininet.clean import cleanup
import docker
from emuvim.dcemulator.net import DCNetwork
from mininet.clean import cleanup
+from mininet.node import Controller
class SimpleTestTopology(unittest.TestCase):
"""
class SimpleTestTopology(unittest.TestCase):
"""
@@
-27,12
+28,16
@@
class SimpleTestTopology(unittest.TestCase):
def createNet(
self,
nswitches=0, ndatacenter=0, nhosts=0, ndockers=0,
def createNet(
self,
nswitches=0, ndatacenter=0, nhosts=0, ndockers=0,
- autolinkswitches=False):
+ autolinkswitches=False
, controller=Controller
):
"""
Creates a Mininet instance and automatically adds some
nodes to it.
"""
Creates a Mininet instance and automatically adds some
nodes to it.
+
+ Attention, we should always use Mininet's default controller
+ for our tests. Only use other controllers if you want to test
+ specific controller functionality.
"""
"""
- self.net =
net = DCNetwork(
)
+ self.net =
DCNetwork(controller=controller
)
# add some switches
for i in range(0, nswitches):
# add some switches
for i in range(0, nswitches):