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 branch 'master' of https://github.com/stevenvanrossem/son-emu
[osm/vim-emu.git]
/
emuvim
/
dcemulator
/
net.py
diff --git
a/emuvim/dcemulator/net.py
b/emuvim/dcemulator/net.py
index
f3c7a68
..
324c4d3
100755
(executable)
--- a/
emuvim/dcemulator/net.py
+++ b/
emuvim/dcemulator/net.py
@@
-27,9
+27,11
@@
class DCNetwork(Dockernet):
self.dcs = {}
# create a Mininet/Dockernet network
# call original Docker.__init__ and setup default controller
self.dcs = {}
# create a Mininet/Dockernet network
# call original Docker.__init__ and setup default controller
+ #Dockernet.__init__(
+ # self, controller=RemoteController, switch=OVSKernelSwitch, **kwargs)
Dockernet.__init__(
self, controller=RemoteController, switch=OVSKernelSwitch, **kwargs)
Dockernet.__init__(
self, controller=RemoteController, switch=OVSKernelSwitch, **kwargs)
-
#self.addController('c0'
)
+
self.addController('c0', controller=RemoteController
)
# graph of the complete DC network
self.DCNetwork_graph=nx.DiGraph()
# graph of the complete DC network
self.DCNetwork_graph=nx.DiGraph()