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
/
api
/
zerorpcapi_DCNetwork.py
diff --git
a/emuvim/api/zerorpcapi_DCNetwork.py
b/emuvim/api/zerorpcapi_DCNetwork.py
old mode 100644
(file)
new mode 100755
(executable)
index
24becd3
..
b60093d
--- a/
emuvim/api/zerorpcapi_DCNetwork.py
+++ b/
emuvim/api/zerorpcapi_DCNetwork.py
@@
-34,9
+34,12
@@
class ZeroRpcApiEndpointDCNetwork(object):
python_install_path = site.getsitepackages()[0]
\r
ryu_path = python_install_path + '/ryu/app/simple_switch_13.py'
\r
ryu_path2 = python_install_path + '/ryu/app/ofctl_rest.py'
\r
python_install_path = site.getsitepackages()[0]
\r
ryu_path = python_install_path + '/ryu/app/simple_switch_13.py'
\r
ryu_path2 = python_install_path + '/ryu/app/ofctl_rest.py'
\r
+ # change the default Openflow controller port to 6653 (official IANA-assigned port number), as used by Mininet
\r
+ # Ryu still uses 6633 as default
\r
+ ryu_option = '--ofp-tcp-listen-port'
\r
+ ryu_of_port = '6653'
\r
ryu_cmd = 'ryu-manager'
\r
ryu_cmd = 'ryu-manager'
\r
- self.ryu_process = Popen([ryu_cmd, ryu_path, ryu_path2])
\r
-
\r
+ self.ryu_process = Popen([ryu_cmd, ryu_path, ryu_path2, ryu_option, ryu_of_port])
\r
\r
def connectDCNetwork(self, net):
\r
self.net = net
\r
\r
def connectDCNetwork(self, net):
\r
self.net = net
\r