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 #90 from stevenvanrossem/master
[osm/vim-emu.git]
/
src
/
emuvim
/
dcemulator
/
net.py
diff --git
a/src/emuvim/dcemulator/net.py
b/src/emuvim/dcemulator/net.py
index
f237cb5
..
dbfde5c
100755
(executable)
--- a/
src/emuvim/dcemulator/net.py
+++ b/
src/emuvim/dcemulator/net.py
@@
-26,7
+26,7
@@
class DCNetwork(Dockernet):
This class is used by topology definition scripts.
"""
This class is used by topology definition scripts.
"""
- def __init__(self, controller=RemoteController, monitor=
Tru
e,
+ def __init__(self, controller=RemoteController, monitor=
Fals
e,
dc_emulation_max_cpu=1.0, # fraction of overall CPU time for emulation
dc_emulation_max_mem=512, # emulation max mem in MB
**kwargs):
dc_emulation_max_cpu=1.0, # fraction of overall CPU time for emulation
dc_emulation_max_mem=512, # emulation max mem in MB
**kwargs):
@@
-282,7
+282,9
@@
class DCNetwork(Dockernet):
#logging.info("add flow in switch: {0} in_port: {1} out_port: {2}".format(current_node.name, switch_inport, switch_outport))
# set of entry via ovs-ofctl
#logging.info("add flow in switch: {0} in_port: {1} out_port: {2}".format(current_node.name, switch_inport, switch_outport))
# set of entry via ovs-ofctl
- # TODO use rest API of ryu to set flow entries to correct witch dpid
+ # TODO use rest API of ryu to set flow entries to correct dpid
+ # TODO this only sets port in to out, no match, so this will give trouble when multiple services are deployed...
+ # TODO need multiple matches to do this (VLAN tags)
if isinstance( current_node, OVSSwitch ):
match = 'in_port=%s' % switch_inport
if isinstance( current_node, OVSSwitch ):
match = 'in_port=%s' % switch_inport